From a010f2e7e29b4661fe478522f2272c2a467380f7 Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Fri, 12 Apr 2019 23:46:35 +0200
Subject: [PATCH 01/11] whoops

---
 code/controllers/subsystem/tickets/tickets.dm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm
index 99130025786..73279033849 100644
--- a/code/controllers/subsystem/tickets/tickets.dm
+++ b/code/controllers/subsystem/tickets/tickets.dm
@@ -367,26 +367,26 @@ UI STUFF
 	if(href_list["resolve"])
 		var/indexNum = text2num(href_list["resolve"])
 		if(resolveTicket(indexNum))
-			message_staff("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]")
+			message_staff("[span_text][usr.client] / ([usr]) resolved [ticket_name] number [indexNum]</span>")
 			to_chat_safe(returnClient(indexNum), "[span_text]Your [ticket_name] has now been resolved.</span>")
 			showUI(usr)
 
 	if(href_list["detailresolve"])
 		var/indexNum = text2num(href_list["detailresolve"])
 		if(resolveTicket(indexNum))
-			message_staff("[usr.client] / ([usr]) resolved [ticket_name] number [indexNum]")
+			message_staff("[span_text][usr.client] / ([usr]) resolved [ticket_name] number [indexNum]</span>")
 			to_chat_safe(returnClient(indexNum), "[span_text]Your [ticket_name] has now been resolved.</span>")
 			showDetailUI(usr, indexNum)
 
 	if(href_list["detailclose"])
 		var/indexNum = text2num(href_list["detailclose"])
 		if(!check_rights(close_rights))
-			to_chat(usr, "Not enough rights to close this ticket.")
+			to_chat(usr, "<span class='warning'>Not enough rights to close this ticket.</span>")
 			return
 		if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes")
 			return
 		if(closeTicket(indexNum))
-			message_staff("[usr.client] / ([usr]) closed [ticket_name] number [indexNum]")
+			message_staff("[span_text][usr.client] / ([usr]) closed [ticket_name] number [indexNum]</span>")
 			to_chat_safe(returnClient(indexNum), close_messages)
 			showDetailUI(usr, indexNum)
 			
@@ -394,7 +394,7 @@ UI STUFF
 	if(href_list["detailreopen"])
 		var/indexNum = text2num(href_list["detailreopen"])
 		if(openTicket(indexNum))
-			message_staff("[usr.client] / ([usr]) re-opened [ticket_name] number [indexNum]")
+			message_staff("[span_text][usr.client] / ([usr]) re-opened [ticket_name] number [indexNum]</span>")
 			showDetailUI(usr, indexNum)
 
 	if(href_list["assignstaff"])
@@ -404,5 +404,5 @@ UI STUFF
 
 /datum/controller/subsystem/tickets/proc/takeTicket(var/index)
 	if(assignStaffToTicket(usr.client, index))
-		message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]")
-		to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].")
+		message_staff("[span_text][usr.client] / ([usr]) has taken [ticket_name] number [index]</span>")
+		to_chat_safe(returnClient(index), "[span_text]Your [ticket_name] is being handled by [usr.client].</span>")

From 9598dcac5ee9f935ec30a210d9ead20c656e6479 Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Sat, 13 Apr 2019 00:57:59 +0200
Subject: [PATCH 02/11] fixed PM's

---
 code/modules/client/client procs.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index ac9a88aaa08..a0e2629dd20 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -78,6 +78,9 @@
 			C = M.client
 		if(!C) // Might be a stealthmin ID, so pass it in straight
 			C = href_list["priv_msg"]
+		else if(C.UID() != href_list["priv_msg"])
+			to_chat(src, "<span class='danger'>Error: Private-Message: Client not found.</span>")
+			return
 		cmd_admin_pm(C, null, href_list["type"])
 		return
 

From 36f5c8ea14730db8e7415d9710422982e6d3e261 Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Sat, 13 Apr 2019 10:42:08 +0200
Subject: [PATCH 03/11] let cmd_admin_pm handle the null client

---
 code/modules/client/client procs.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index a0e2629dd20..a6216c87b1a 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -79,8 +79,7 @@
 		if(!C) // Might be a stealthmin ID, so pass it in straight
 			C = href_list["priv_msg"]
 		else if(C.UID() != href_list["priv_msg"])
-			to_chat(src, "<span class='danger'>Error: Private-Message: Client not found.</span>")
-			return
+			C = null // 404 client not found. Let cmd_admin_pm handle the error
 		cmd_admin_pm(C, null, href_list["type"])
 		return
 

From 6ca7ebe3df690836088cb74bafb88e7dab96b1fe Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 14 Apr 2019 00:23:02 -0400
Subject: [PATCH 04/11] Automatic changelog generation for PR #11296 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-11296.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-11296.yml

diff --git a/html/changelogs/AutoChangeLog-pr-11296.yml b/html/changelogs/AutoChangeLog-pr-11296.yml
new file mode 100644
index 00000000000..42a9ce1a063
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11296.yml
@@ -0,0 +1,4 @@
+author: "farie82"
+delete-after: True
+changes: 
+  - bugfix: "PM's now shouldn't go to the wrong client anymore when the target left."

From 5054a30038103c4cabc24dee1b6a19e15e55aeed Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 14 Apr 2019 00:23:34 -0400
Subject: [PATCH 05/11] Automatic changelog generation for PR #11294 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-11294.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-11294.yml

diff --git a/html/changelogs/AutoChangeLog-pr-11294.yml b/html/changelogs/AutoChangeLog-pr-11294.yml
new file mode 100644
index 00000000000..0088263303b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11294.yml
@@ -0,0 +1,4 @@
+author: "farie82"
+delete-after: True
+changes: 
+  - bugfix: "Ticket messages now have their corresponding span classes. Making them easier to notice"

From 2304cf0f6f6f0808b23d378f441cc72e59e35cd0 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <josephcase55@hotmail.com>
Date: Sat, 23 Mar 2019 11:06:19 +0000
Subject: [PATCH 06/11] SSMapping

---
 code/controllers/master_controller.dm | 22 ----------------
 code/controllers/subsystem/mapping.dm | 37 +++++++++++++++++++++++++++
 paradise.dme                          |  1 +
 3 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 code/controllers/subsystem/mapping.dm

diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 1fd81402544..7a078a67970 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -36,29 +36,7 @@ var/global/pipe_processing_killed = 0
 	return QDEL_HINT_HARDDEL_NOW
 
 /datum/controller/game_controller/proc/setup()
-	preloadTemplates()
-	if(!config.disable_away_missions)
-		createRandomZlevel()
-	// Create 6 extra space levels to put space ruins on
-	if(!config.disable_space_ruins)
-		var/timer = start_watch()
-		log_startup_progress("Creating random space levels...")
-		seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates)
-		log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.")
-
-		// load in extra levels of space ruins
-
-		var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
-		for(var/i = 1, i <= num_extra_space, i++)
-			var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED)
-			seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates)
-
-	space_manager.do_transition_setup()
-
 	setupfactions()
 	setup_economy()
 
-	for(var/i=0, i<max_secret_rooms, i++)
-		make_mining_asteroid_secret()
-
 	populate_spawn_points()
\ No newline at end of file
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
new file mode 100644
index 00000000000..6bf2b38e21f
--- /dev/null
+++ b/code/controllers/subsystem/mapping.dm
@@ -0,0 +1,37 @@
+SUBSYSTEM_DEF(mapping)
+   	name = "Mapping"
+   	init_order = 12
+   	flags = SS_NO_FIRE
+
+/datum/controller/subsystem/mapping/New()
+   	NEW_SS_GLOBAL(SSmapping)
+   	return ..()
+
+/datum/controller/subsystem/mapping/Initialize(timeofday)
+   	// Load all Z level templates
+    preloadTemplates()
+    // Pick a random away mission.
+   	if(!config.disable_away_missions)
+   	   	createRandomZlevel()
+    // Seed space ruins
+   	if(!config.disable_space_ruins)
+   	   	var/timer = start_watch()
+   	   	log_startup_progress("Creating random space levels...")
+   	   	seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates)
+   	   	log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.")
+
+   	   	// load in extra levels of space ruins
+
+   	   	var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
+   	   	for(var/i = 1, i <= num_extra_space, i++)
+   	   	   	var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED)
+   	   	   	seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates)
+
+    // Setup the Z-level linkage
+    space_manager.do_transition_setup()
+   	// Populate mining Z-level hidden rooms
+    for(var/i=0, i<max_secret_rooms, i++)
+   	   	make_mining_asteroid_secret()
+
+/datum/controller/subsystem/mapping/Recover()
+   	flags |= SS_NO_INIT 
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index a2faec5c589..1811d3a9c25 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -215,6 +215,7 @@
 #include "code\controllers\subsystem\garbage.dm"
 #include "code\controllers\subsystem\icon_smooth.dm"
 #include "code\controllers\subsystem\machinery.dm"
+#include "code\controllers\subsystem\mapping.dm"
 #include "code\controllers\subsystem\mobs.dm"
 #include "code\controllers\subsystem\nano_mob_hunter.dm"
 #include "code\controllers\subsystem\nanoui.dm"

From ae285001561166224cb7c70365bc9c7354c71658 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <josephcase55@hotmail.com>
Date: Sat, 23 Mar 2019 13:27:06 +0000
Subject: [PATCH 07/11] Init order changes

---
 code/__DEFINES/subsystems.dm          | 60 +++++++++++++--------------
 code/controllers/subsystem/mapping.dm |  2 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 5ade3b0baef..7bb51b1dddb 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -45,39 +45,39 @@
 // Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.
 
-#define INIT_ORDER_GARBAGE 19
-#define INIT_ORDER_DBCORE 18
-#define INIT_ORDER_BLACKBOX 17
-#define INIT_ORDER_SERVER_MAINT 16
-#define INIT_ORDER_INPUT 15
-#define INIT_ORDER_RESEARCH 14
-#define INIT_ORDER_EVENTS 13
-#define INIT_ORDER_JOBS 12
-#define INIT_ORDER_TRAITS 11
-#define INIT_ORDER_TICKER 10
-#define INIT_ORDER_MAPPING 9
-#define INIT_ORDER_NETWORKS 8
-#define INIT_ORDER_ATOMS 7
-#define INIT_ORDER_LANGUAGE 6
-#define INIT_ORDER_MACHINES 5
-#define INIT_ORDER_CIRCUIT 4
-#define INIT_ORDER_TIMER 1
-#define INIT_ORDER_DEFAULT 0
-#define INIT_ORDER_AIR -1
-#define INIT_ORDER_MINIMAP -3
-#define INIT_ORDER_ASSETS -4
-#define INIT_ORDER_ICON_SMOOTHING -5
-#define INIT_ORDER_OVERLAY -6
+#define INIT_ORDER_PERSISTENCE -100
+#define INIT_ORDER_PATH -50
+#define INIT_ORDER_SQUEAK -40
+#define INIT_ORDER_NANOMOB -23
+#define INIT_ORDER_NIGHTSHIFT -22
+#define INIT_ORDER_SHUTTLE -21
+#define INIT_ORDER_LIGHTING -20
 #define INIT_ORDER_XKEYSCORE -10
 #define INIT_ORDER_STICKY_BAN -10
 #define INIT_ORDER_TICKETS -10
-#define INIT_ORDER_LIGHTING -20
-#define INIT_ORDER_SHUTTLE -21
-#define INIT_ORDER_NIGHTSHIFT -22
-#define INIT_ORDER_NANOMOB -23
-#define INIT_ORDER_SQUEAK -40
-#define INIT_ORDER_PATH -50
-#define INIT_ORDER_PERSISTENCE -100
+#define INIT_ORDER_OVERLAY -6
+#define INIT_ORDER_ICON_SMOOTHING -5
+#define INIT_ORDER_ASSETS -4
+#define INIT_ORDER_MINIMAP -3
+#define INIT_ORDER_AIR -1
+#define INIT_ORDER_DEFAULT 0
+#define INIT_ORDER_TIMER 1
+#define INIT_ORDER_CIRCUIT 4
+#define INIT_ORDER_MACHINES 5
+#define INIT_ORDER_LANGUAGE 6
+#define INIT_ORDER_ATOMS 7
+#define INIT_ORDER_NETWORKS 8
+#define INIT_ORDER_MAPPING 9
+#define INIT_ORDER_TICKER 10
+#define INIT_ORDER_TRAITS 11
+#define INIT_ORDER_JOBS 12
+#define INIT_ORDER_EVENTS 13
+#define INIT_ORDER_RESEARCH 14
+#define INIT_ORDER_INPUT 15
+#define INIT_ORDER_SERVER_MAINT 16
+#define INIT_ORDER_BLACKBOX 17
+#define INIT_ORDER_DBCORE 18
+#define INIT_ORDER_GARBAGE 19
 
 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 6bf2b38e21f..a870bd689b8 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(mapping)
    	name = "Mapping"
-   	init_order = 12
+   	init_order = INIT_ORDER_MAPPING // 9
    	flags = SS_NO_FIRE
 
 /datum/controller/subsystem/mapping/New()

From 57fb39016c56db7ddd15d169dea5c337f43463ae Mon Sep 17 00:00:00 2001
From: AffectedArc07 <josephcase55@hotmail.com>
Date: Sun, 24 Mar 2019 09:37:39 +0000
Subject: [PATCH 08/11] Stick it on my tab, barkeep

---
 code/controllers/subsystem/mapping.dm | 48 ++++++++++++---------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index a870bd689b8..065e4b03e82 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -3,35 +3,31 @@ SUBSYSTEM_DEF(mapping)
    	init_order = INIT_ORDER_MAPPING // 9
    	flags = SS_NO_FIRE
 
-/datum/controller/subsystem/mapping/New()
-   	NEW_SS_GLOBAL(SSmapping)
-   	return ..()
-
 /datum/controller/subsystem/mapping/Initialize(timeofday)
-   	// Load all Z level templates
-    preloadTemplates()
-    // Pick a random away mission.
-   	if(!config.disable_away_missions)
-   	   	createRandomZlevel()
-    // Seed space ruins
-   	if(!config.disable_space_ruins)
-   	   	var/timer = start_watch()
-   	   	log_startup_progress("Creating random space levels...")
-   	   	seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates)
-   	   	log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.")
+	// Load all Z level templates
+	preloadTemplates()
+	// Pick a random away mission.
+	if(!config.disable_away_missions)
+		createRandomZlevel()
+	// Seed space ruins
+	if(!config.disable_space_ruins)
+		var/timer = start_watch()
+		log_startup_progress("Creating random space levels...")
+		seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates)
+		log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.")
 
-   	   	// load in extra levels of space ruins
+		// load in extra levels of space ruins
 
-   	   	var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
-   	   	for(var/i = 1, i <= num_extra_space, i++)
-   	   	   	var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED)
-   	   	   	seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates)
+		var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
+		for(var/i = 1, i <= num_extra_space, i++)
+			var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED)
+			seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates)
 
-    // Setup the Z-level linkage
-    space_manager.do_transition_setup()
-   	// Populate mining Z-level hidden rooms
-    for(var/i=0, i<max_secret_rooms, i++)
-   	   	make_mining_asteroid_secret()
+	// Setup the Z-level linkage
+	space_manager.do_transition_setup()
+	// Populate mining Z-level hidden rooms
+	for(var/i=0, i<max_secret_rooms, i++)
+		make_mining_asteroid_secret()
 
 /datum/controller/subsystem/mapping/Recover()
-   	flags |= SS_NO_INIT 
\ No newline at end of file
+	flags |= SS_NO_INIT 
\ No newline at end of file

From 15e549fd7e09deb1fb4e4db3db273e9acaa02d83 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <josephcase55@hotmail.com>
Date: Sun, 24 Mar 2019 10:45:30 +0000
Subject: [PATCH 09/11] Supers seem super useful

---
 code/controllers/subsystem/mapping.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 065e4b03e82..43c2f406365 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -28,6 +28,7 @@ SUBSYSTEM_DEF(mapping)
 	// Populate mining Z-level hidden rooms
 	for(var/i=0, i<max_secret_rooms, i++)
 		make_mining_asteroid_secret()
+	..()
 
 /datum/controller/subsystem/mapping/Recover()
 	flags |= SS_NO_INIT 
\ No newline at end of file

From 4b493730511bdc5e9e755dec736e2d4cd8ace506 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <josephcase55@hotmail.com>
Date: Sun, 14 Apr 2019 16:58:29 +0100
Subject: [PATCH 10/11] Hopefully resets this

---
 code/__DEFINES/subsystems.dm | 60 ++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 7bb51b1dddb..5ade3b0baef 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -45,39 +45,39 @@
 // Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.
 
-#define INIT_ORDER_PERSISTENCE -100
-#define INIT_ORDER_PATH -50
-#define INIT_ORDER_SQUEAK -40
-#define INIT_ORDER_NANOMOB -23
-#define INIT_ORDER_NIGHTSHIFT -22
-#define INIT_ORDER_SHUTTLE -21
-#define INIT_ORDER_LIGHTING -20
+#define INIT_ORDER_GARBAGE 19
+#define INIT_ORDER_DBCORE 18
+#define INIT_ORDER_BLACKBOX 17
+#define INIT_ORDER_SERVER_MAINT 16
+#define INIT_ORDER_INPUT 15
+#define INIT_ORDER_RESEARCH 14
+#define INIT_ORDER_EVENTS 13
+#define INIT_ORDER_JOBS 12
+#define INIT_ORDER_TRAITS 11
+#define INIT_ORDER_TICKER 10
+#define INIT_ORDER_MAPPING 9
+#define INIT_ORDER_NETWORKS 8
+#define INIT_ORDER_ATOMS 7
+#define INIT_ORDER_LANGUAGE 6
+#define INIT_ORDER_MACHINES 5
+#define INIT_ORDER_CIRCUIT 4
+#define INIT_ORDER_TIMER 1
+#define INIT_ORDER_DEFAULT 0
+#define INIT_ORDER_AIR -1
+#define INIT_ORDER_MINIMAP -3
+#define INIT_ORDER_ASSETS -4
+#define INIT_ORDER_ICON_SMOOTHING -5
+#define INIT_ORDER_OVERLAY -6
 #define INIT_ORDER_XKEYSCORE -10
 #define INIT_ORDER_STICKY_BAN -10
 #define INIT_ORDER_TICKETS -10
-#define INIT_ORDER_OVERLAY -6
-#define INIT_ORDER_ICON_SMOOTHING -5
-#define INIT_ORDER_ASSETS -4
-#define INIT_ORDER_MINIMAP -3
-#define INIT_ORDER_AIR -1
-#define INIT_ORDER_DEFAULT 0
-#define INIT_ORDER_TIMER 1
-#define INIT_ORDER_CIRCUIT 4
-#define INIT_ORDER_MACHINES 5
-#define INIT_ORDER_LANGUAGE 6
-#define INIT_ORDER_ATOMS 7
-#define INIT_ORDER_NETWORKS 8
-#define INIT_ORDER_MAPPING 9
-#define INIT_ORDER_TICKER 10
-#define INIT_ORDER_TRAITS 11
-#define INIT_ORDER_JOBS 12
-#define INIT_ORDER_EVENTS 13
-#define INIT_ORDER_RESEARCH 14
-#define INIT_ORDER_INPUT 15
-#define INIT_ORDER_SERVER_MAINT 16
-#define INIT_ORDER_BLACKBOX 17
-#define INIT_ORDER_DBCORE 18
-#define INIT_ORDER_GARBAGE 19
+#define INIT_ORDER_LIGHTING -20
+#define INIT_ORDER_SHUTTLE -21
+#define INIT_ORDER_NIGHTSHIFT -22
+#define INIT_ORDER_NANOMOB -23
+#define INIT_ORDER_SQUEAK -40
+#define INIT_ORDER_PATH -50
+#define INIT_ORDER_PERSISTENCE -100
 
 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)

From 72b9957533a518b16afb493ecabd891df1d96927 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <paradisess13gitbot@gmail.com>
Date: Sun, 14 Apr 2019 12:09:35 -0400
Subject: [PATCH 11/11] Automatic changelog generation for PR #11102 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-11102.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-11102.yml

diff --git a/html/changelogs/AutoChangeLog-pr-11102.yml b/html/changelogs/AutoChangeLog-pr-11102.yml
new file mode 100644
index 00000000000..7e54f5268ab
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11102.yml
@@ -0,0 +1,5 @@
+author: "AffectedArc07"
+delete-after: True
+changes: 
+  - rscadd: "ssMapping"
+  - tweak: "Gateway and space ruins are now loaded with ssMapping"