Merge pull request #129 from MistakeNot4892/pyrelight

Updating from Neb dev

Author: MistakeNot4892

.editorconfig

@@ -19,6 +19,7 @@ indent_size = 4
 [*.yml]
 indent_style = space
 indent_size = 2
+end_of_line = crlf
 
 [*.txt]
 end_of_line = crlf

.gitattributes

@@ -13,4 +13,5 @@ html/changelog.html merge=union
 *.dm text eol=crlf
 *.dmm text eol=crlf
 *.txt text eol=crlf
-*.md text eol=crlf
+*.md text eol=crlf
+*.yml text eol=crlf

.gitignore

@@ -1,62 +1,62 @@
-# ignore misc BYOND files
-*.log
-*.int
-*.rsc
-*.dmb
-*.lk
-*.backup
-*.before
-data/
-dmdoc/
-cfg/
-build_log.txt
-use_map
-stopserver
-reboot_called
-atupdate
-
-# ignore config, but not subdirs
-!config/*/
-config/*
-sql/test_db
-
-# misc OS garbage
-Thumbs.db
-Thumbs.db:encryptable
-.DS_Store
-
-# vscode
-.vscode/*
-*.code-workspace
-.history
-
-# git/kdiff4
-*.orig
-
-# swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-v][a-z]
-[._]sw[a-p]
-
-# session
-Session.vim
-
-# temporary
-.netrwhist
-*~
-
-# auto-generated tag files
-tags
-
-# ignore built libs
-lib/*.dll
-lib/*.so
-/prof.dll
-
-# python
-*.pyc
-__pycache__
-
-# Running OpenDream locally
-nebula.json
+# ignore misc BYOND files
+*.log
+*.int
+*.rsc
+*.dmb
+*.lk
+*.backup
+*.before
+data/
+dmdoc/
+cfg/
+build_log.txt
+use_map
+stopserver
+reboot_called
+atupdate
+
+# ignore config, but not subdirs
+!config/*/
+config/*
+sql/test_db
+
+# misc OS garbage
+Thumbs.db
+Thumbs.db:encryptable
+.DS_Store
+
+# vscode
+.vscode/*
+*.code-workspace
+.history
+
+# git/kdiff4
+*.orig
+
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+
+# session
+Session.vim
+
+# temporary
+.netrwhist
+*~
+
+# auto-generated tag files
+tags
+
+# ignore built libs
+lib/*.dll
+lib/*.so
+/prof.dll
+
+# python
+*.pyc
+__pycache__
+
+# Running OpenDream locally
+nebula.json

README.md

@@ -1,99 +1,99 @@
-<h1 align="center">
-  <br>
-  <a href="https://github.com/PyrelightSS13/Pyrelight"><img src="https://avatars1.githubusercontent.com/u/128199108" alt="Pyrelight" width="200"></a>
-  <br>
-  Pyrelight
-  <br>
-</h1>
-
-<p align="center">
-  <a href="https://github.com/PyrelightSS13/Pyrelight/actions">
-    <img src="https://github.com/PyrelightSS13/Pyrelight/workflows/Run%20Tests/badge.svg"
-         alt="Build Status">
-  </a>
-  <a href="https://www.codefactor.io/repository/github/PyrelightSS13/Pyrelight">
-    <img src="https://www.codefactor.io/repository/github/PyrelightSS13/Pyrelight/badge"
-         alt="CodeFactor">
-  </a>
-  <a href="https://github.com/PyrelightSS13/Pyrelight/commits/dev">
-    <img src="https://img.shields.io/github/last-commit/PyrelightSS13/Pyrelight"
-         alt="Last Commit">
-  </a>
-  <a href="https://github.com/PyrelightSS13/Pyrelight/issues">
-    <img src="https://img.shields.io/github/issues/PyrelightSS13/Pyrelight"
-         alt="Issues">
-  </a>
-  <a href="https://github.com/NebulaSS13/Nebula/issues">
-    <img src="https://img.shields.io/github/issues/NebulaSS13/Nebula"
-         alt="Upstream Issues">
-  </a>
-  <a href="https://discord.gg/Ddw58yF">
-    <img src="https://img.shields.io/discord/678820025355862045?style=plastic"
-         alt="Discord">
-  </a>
-  <a href="https://github.com/PyrelightSS13/Pyrelight/blob/dev/LICENSE">
-    <img src="https://img.shields.io/github/license/PyrelightSS13/Pyrelight"
-         alt="License">
-  </a>
-</p>
-
-| Website                   | Link                                              |
-|---------------------------|---------------------------------------------------|
-| Code                      | [https://github.com/PyrelightSS13/Pyrelight](https://github.com/PyrelightSS13/Pyrelight)        |
-| Issues                    | [https://github.com/PyrelightSS13/Pyrelight/issues](https://github.com/PyrelightSS13/Pyrelight/issues) |
-| Upstream Issues           | [https://github.com/NebulaSS13/Nebula/issues](https://github.com/NebulaSS13/Nebula/issues)       |
-| Discord                   | [https://discord.gg/BqXq6Mkys5](https://discord.gg/BqXq6Mkys5)                       |
-| Nebula Discord            | [https://discord.gg/DYGXkN2S](https://discord.gg/DYGXkN2S)                       |
-
-This is the codebase for Pyrelight, a middle-fantasy total conversion project for Space Station 13, derived from Nebula SS13.
-
-A round of this game intends to represent a lived day (or days) in the life of someone in a remote fantasy village, whether it's a day where they struck it rich or where their house burnt down and they caught the plague.
-
-An emphasis is placed on interconnected, generalized systems that allow for unique, emergent gameplay. Boil your tea with fire magic, forage herbs to concoct medicinal tinctures, or hunt in the woods and use your prey's bones and pelt to make your own equipment; what will *you* do?
-
-<p align="center">
-  <a href="#contributing-guidelines">Contributing Guidelines</a> •
-  <a href="#security">Security</a> •
-  <a href="#license">License</a> •
-  <a href="#getting-the-code-and-installing">Getting the Code and Installing</a>
-</p>
-
----
-
-### NOTICE OF MODIFICATION
-
-This project was forked from [Nebula SS13](https://github.com/NebulaSS13/Nebula) on 15 Jul 2024. Nebula SS13 was forked from [Baystation 12](https://github.com/Baystation12/Baystation12) on 6 Jan 2020.
-
----
-
-### CONTRIBUTING GUIDELINES
-
-All users are expected to review [/docs/CODE_OF_CONDUCT.md](/docs/CODE_OF_CONDUCT.md) before interacting with the repository or other users.
-
----
-
-### SECURITY
-
-Please see [/docs/SECURITY.md](/docs/SECURITY.md) for this repository's security policy, and how to report security issues.
-
----
-
-### LICENSE
-
-The code for Pyrelight is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in [/LICENSE](/LICENSE).
-
-Code with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00 GMT) is licensed under the GNU General Public License version 3, which can be found in full in [/docs/GPL3.txt](/docs/GPL3.txt)
-
-All code where the authorship dates on or after `1420675200 +0000` is assumed to be licensed under AGPL v3, if you wish to license under GPL v3 please make this clear in the commit message and any added files.
-
-If you wish to develop and host this codebase in a closed source manner you may use all commits prior to `1420675200 +0000`, which are licensed under GPL v3.  The major change here is that if you host a server using any code licensed under AGPLv3 you are required to provide full source code for your servers users as well including addons and modifications you have made.
-
-See [here](https://www.gnu.org/licenses/why-affero-gpl.html) for more information.
-
-All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](http://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.
-
----
-
-### GETTING THE CODE AND INSTALLING
-
-Please see [/docs/installation.md](/docs/installation.md) for instructions on obtaining, installing, updating, and running this code.
+<h1 align="center">
+  <br>
+  <a href="https://github.com/PyrelightSS13/Pyrelight"><img src="https://avatars1.githubusercontent.com/u/128199108" alt="Pyrelight" width="200"></a>
+  <br>
+  Pyrelight
+  <br>
+</h1>
+
+<p align="center">
+  <a href="https://github.com/PyrelightSS13/Pyrelight/actions">
+    <img src="https://github.com/PyrelightSS13/Pyrelight/workflows/Run%20Tests/badge.svg"
+         alt="Build Status">
+  </a>
+  <a href="https://www.codefactor.io/repository/github/PyrelightSS13/Pyrelight">
+    <img src="https://www.codefactor.io/repository/github/PyrelightSS13/Pyrelight/badge"
+         alt="CodeFactor">
+  </a>
+  <a href="https://github.com/PyrelightSS13/Pyrelight/commits/dev">
+    <img src="https://img.shields.io/github/last-commit/PyrelightSS13/Pyrelight"
+         alt="Last Commit">
+  </a>
+  <a href="https://github.com/PyrelightSS13/Pyrelight/issues">
+    <img src="https://img.shields.io/github/issues/PyrelightSS13/Pyrelight"
+         alt="Issues">
+  </a>
+  <a href="https://github.com/NebulaSS13/Nebula/issues">
+    <img src="https://img.shields.io/github/issues/NebulaSS13/Nebula"
+         alt="Upstream Issues">
+  </a>
+  <a href="https://discord.gg/Ddw58yF">
+    <img src="https://img.shields.io/discord/678820025355862045?style=plastic"
+         alt="Discord">
+  </a>
+  <a href="https://github.com/PyrelightSS13/Pyrelight/blob/dev/LICENSE">
+    <img src="https://img.shields.io/github/license/PyrelightSS13/Pyrelight"
+         alt="License">
+  </a>
+</p>
+
+| Website                   | Link                                              |
+|---------------------------|---------------------------------------------------|
+| Code                      | [https://github.com/PyrelightSS13/Pyrelight](https://github.com/PyrelightSS13/Pyrelight)        |
+| Issues                    | [https://github.com/PyrelightSS13/Pyrelight/issues](https://github.com/PyrelightSS13/Pyrelight/issues) |
+| Upstream Issues           | [https://github.com/NebulaSS13/Nebula/issues](https://github.com/NebulaSS13/Nebula/issues)       |
+| Discord                   | [https://discord.gg/BqXq6Mkys5](https://discord.gg/BqXq6Mkys5)                       |
+| Nebula Discord            | [https://discord.gg/DYGXkN2S](https://discord.gg/DYGXkN2S)                       |
+
+This is the codebase for Pyrelight, a middle-fantasy total conversion project for Space Station 13, derived from Nebula SS13.
+
+A round of this game intends to represent a lived day (or days) in the life of someone in a remote fantasy village, whether it's a day where they struck it rich or where their house burnt down and they caught the plague.
+
+An emphasis is placed on interconnected, generalized systems that allow for unique, emergent gameplay. Boil your tea with fire magic, forage herbs to concoct medicinal tinctures, or hunt in the woods and use your prey's bones and pelt to make your own equipment; what will *you* do?
+
+<p align="center">
+  <a href="#contributing-guidelines">Contributing Guidelines</a> •
+  <a href="#security">Security</a> •
+  <a href="#license">License</a> •
+  <a href="#getting-the-code-and-installing">Getting the Code and Installing</a>
+</p>
+
+---
+
+### NOTICE OF MODIFICATION
+
+This project was forked from [Nebula SS13](https://github.com/NebulaSS13/Nebula) on 15 Jul 2024. Nebula SS13 was forked from [Baystation 12](https://github.com/Baystation12/Baystation12) on 6 Jan 2020.
+
+---
+
+### CONTRIBUTING GUIDELINES
+
+All users are expected to review [/docs/CODE_OF_CONDUCT.md](/docs/CODE_OF_CONDUCT.md) before interacting with the repository or other users.
+
+---
+
+### SECURITY
+
+Please see [/docs/SECURITY.md](/docs/SECURITY.md) for this repository's security policy, and how to report security issues.
+
+---
+
+### LICENSE
+
+The code for Pyrelight is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in [/LICENSE](/LICENSE).
+
+Code with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00 GMT) is licensed under the GNU General Public License version 3, which can be found in full in [/docs/GPL3.txt](/docs/GPL3.txt)
+
+All code where the authorship dates on or after `1420675200 +0000` is assumed to be licensed under AGPL v3, if you wish to license under GPL v3 please make this clear in the commit message and any added files.
+
+If you wish to develop and host this codebase in a closed source manner you may use all commits prior to `1420675200 +0000`, which are licensed under GPL v3.  The major change here is that if you host a server using any code licensed under AGPLv3 you are required to provide full source code for your servers users as well including addons and modifications you have made.
+
+See [here](https://www.gnu.org/licenses/why-affero-gpl.html) for more information.
+
+All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](http://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.
+
+---
+
+### GETTING THE CODE AND INSTALLING
+
+Please see [/docs/installation.md](/docs/installation.md) for instructions on obtaining, installing, updating, and running this code.

code/__defines/machinery_public_vars.dm

@@ -0,0 +1,11 @@
+// Displayed along with the pin name to show what type of pin it is.
+#define VAR_FORMAT_ANY			"\<ANY\>"
+#define VAR_FORMAT_STRING		"\<TEXT\>"
+#define VAR_FORMAT_CHAR			"\<CHAR\>"
+#define VAR_FORMAT_COLOR		"\<COLOR\>"
+#define VAR_FORMAT_NUMBER		"\<NUM\>"
+#define VAR_FORMAT_DIR			"\<DIR\>"
+#define VAR_FORMAT_BOOLEAN		"\<BOOL\>"
+#define VAR_FORMAT_REF			"\<REF\>"
+#define VAR_FORMAT_LIST			"\<LIST\>"
+#define VAR_FORMAT_INDEX		"\<INDEX\>"

code/__defines/misc.dm

@@ -53,7 +53,7 @@
 #define      STATUS_HUD 2 // Alive, dead, diseased, etc.
 #define          ID_HUD 3 // The job asigned to your ID.
 #define      WANTED_HUD 4 // Wanted, released, paroled, security status.
-#define    IMPLOYAL_HUD 5 // Loyality implant.
+#define    IMPLOYAL_HUD 5 // Loyalty implant.
 #define     IMPCHEM_HUD 6 // Chemical implant.
 #define    IMPTRACK_HUD 7 // Tracking implant.
 #define SPECIALROLE_HUD 8 // AntagHUD image.

code/controllers/subsystems/configuration.dm

@@ -15,7 +15,7 @@ SUBSYSTEM_DEF(configuration)
 
 	load_files()
 	load_sql()
-	load_event()
+	load_event(load_event_from)
 
 	for(var/client/C)
 		C.update_post_config_load()

code/controllers/subsystems/jobs.dm

@@ -387,7 +387,7 @@ SUBSYSTEM_DEF(jobs)
 		if(player.client.prefs.alternate_option == BE_ASSISTANT)
 			var/datum/job/ass = global.using_map.default_job_type
 			if((global.using_map.flags & MAP_HAS_BRANCH) && player.client.prefs.branches[initial(ass.title)])
-				var/datum/mil_branch/branch = mil_branches.get_branch(player.client.prefs.branches[initial(ass.title)])
+				var/datum/mil_branch/branch = global.using_map.get_branch(player.client.prefs.branches[initial(ass.title)])
 				ass = branch.assistant_job
 			assign_role(player, initial(ass.title), mode = mode)
 	//For ones returning to lobby
@@ -475,9 +475,9 @@ SUBSYSTEM_DEF(jobs)
 	if(job)
 		if(H.client)
 			if(global.using_map.flags & MAP_HAS_BRANCH)
-				H.char_branch = mil_branches.get_branch(H.client.prefs.branches[job_title])
+				H.char_branch = global.using_map.get_branch(H.client.prefs.branches[job_title])
 			if(global.using_map.flags & MAP_HAS_RANK)
-				H.char_rank = mil_branches.get_rank(H.client.prefs.branches[job_title], H.client.prefs.ranks[job_title])
+				H.char_rank = global.using_map.get_rank(H.client.prefs.branches[job_title], H.client.prefs.ranks[job_title])
 
 		// Transfers the skill settings for the job to the mob
 		H.skillset.obtain_from_client(job, H.client)