Merge remote-tracking branch 'refs/remotes/origin/master' into changelog-memes

code/controllers/subsystem/air.dm

@@ -1,6 +1,6 @@
 #define SSAIR_PIPENETS 1
 #define SSAIR_ATMOSMACHINERY 2
-#define SSAIR_ACTIVETURFS 3
+#define SSAIR_REACTQUEUE 3
 #define SSAIR_EXCITEDGROUPS 4
 #define SSAIR_HIGHPRESSURE 5
 #define SSAIR_HOTSPOTS 6
@@ -14,7 +14,7 @@ SUBSYSTEM_DEF(air)
 	flags = SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
-	var/cost_turfs = 0
+	var/cost_turf_reactions = 0
 	var/cost_groups = 0
 	var/cost_highpressure = 0
 	var/cost_hotspots = 0
@@ -24,6 +24,7 @@ SUBSYSTEM_DEF(air)
 
 	var/list/excited_groups = list()
 	var/list/active_turfs = list()
+	var/list/turf_react_queue = list()
 	var/list/hotspots = list()
 	var/list/networks = list()
 	var/list/obj/machinery/atmos_machinery = list()
@@ -45,7 +46,7 @@ SUBSYSTEM_DEF(air)
 
 /datum/controller/subsystem/air/stat_entry(msg)
 	msg += "C:{"
-	msg += "AT:[round(cost_turfs,1)]|"
+	msg += "RQ:[round(cost_turf_reactions,1)]|"
 	msg += "EG:[round(cost_groups,1)]|"
 	msg += "HP:[round(cost_highpressure,1)]|"
 	msg += "HS:[round(cost_hotspots,1)]|"
@@ -54,6 +55,7 @@ SUBSYSTEM_DEF(air)
 	msg += "AM:[round(cost_atmos_machinery,1)]"
 	msg += "} "
 	msg += "AT:[active_turfs.len]|"
+	msg += "RQ:[turf_react_queue.len]|"
 	msg += "EG:[excited_groups.len]|"
 	msg += "HS:[hotspots.len]|"
 	msg += "PN:[networks.len]|"
@@ -90,12 +92,12 @@ SUBSYSTEM_DEF(air)
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
-		currentpart = SSAIR_ACTIVETURFS
+		currentpart = SSAIR_REACTQUEUE
 
-	if(currentpart == SSAIR_ACTIVETURFS)
+	if(currentpart == SSAIR_REACTQUEUE)
 		timer = TICK_USAGE_REAL
-		process_active_turfs(resumed)
-		cost_turfs = MC_AVERAGE(cost_turfs, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		process_react_queue(resumed)
+		cost_turf_reactions = MC_AVERAGE(cost_turf_reactions, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
@@ -170,6 +172,19 @@ SUBSYSTEM_DEF(air)
 			return
 
 
+/datum/controller/subsystem/air/proc/process_react_queue(resumed = 0)
+	if(!resumed)
+		src.currentrun = turf_react_queue.Copy()
+	var/list/currentrun = src.currentrun
+	while(currentrun.len)
+		var/turf/open/T = currentrun[currentrun.len]
+		currentrun.len--
+		if(T)
+			T.process_cell_reaction()
+		if(MC_TICK_CHECK)
+			return
+
+
 /datum/controller/subsystem/air/proc/process_super_conductivity(resumed = 0)
 	if (!resumed)
 		src.currentrun = active_super_conductivity.Copy()
@@ -207,21 +222,6 @@ SUBSYSTEM_DEF(air)
 		if(MC_TICK_CHECK)
 			return
 
-/datum/controller/subsystem/air/proc/process_active_turfs(resumed = 0)
-	//cache for sanic speed
-	var/fire_count = times_fired
-	if (!resumed)
-		src.currentrun = active_turfs.Copy()
-	//cache for sanic speed (lists are references anyways)
-	var/list/currentrun = src.currentrun
-	while(currentrun.len)
-		var/turf/open/T = currentrun[currentrun.len]
-		currentrun.len--
-		if (T)
-			T.process_cell(fire_count)
-		if (MC_TICK_CHECK)
-			return
-
 /datum/controller/subsystem/air/proc/process_excited_groups(resumed = 0)
 	if (!resumed)
 		src.currentrun = excited_groups.Copy()
@@ -242,8 +242,7 @@ SUBSYSTEM_DEF(air)
 
 /datum/controller/subsystem/air/proc/remove_from_active(turf/open/T)
 	active_turfs -= T
-	if(currentpart == SSAIR_ACTIVETURFS)
-		currentrun -= T
+	SSair_turfs.currentrun -= T
 	#ifdef VISUALIZE_ACTIVE_TURFS
 	T.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#00ff00")
 	#endif
@@ -251,6 +250,7 @@ SUBSYSTEM_DEF(air)
 		T.excited = 0
 		if(T.excited_group)
 			T.excited_group.garbage_collect()
+	remove_from_react_queue(T)
 
 /datum/controller/subsystem/air/proc/add_to_active(turf/open/T, blockchanges = 1)
 	if(istype(T) && T.air)
@@ -259,10 +259,10 @@ SUBSYSTEM_DEF(air)
 		#endif
 		T.excited = 1
 		active_turfs |= T
-		if(currentpart == SSAIR_ACTIVETURFS)
-			currentrun |= T
+		SSair_turfs.currentrun |= T
 		if(blockchanges && T.excited_group)
 			T.excited_group.garbage_collect()
+		add_to_react_queue(T)
 	else if(T.flags_1 & INITIALIZED_1)
 		for(var/turf/S in T.atmos_adjacent_turfs)
 			add_to_active(S)
@@ -273,6 +273,18 @@ SUBSYSTEM_DEF(air)
 	else
 		T.requires_activation = TRUE
 
+/datum/controller/subsystem/air/proc/add_to_react_queue(turf/open/T)
+	if(istype(T) && T.air)
+		turf_react_queue |= T
+		if(currentpart == SSAIR_REACTQUEUE)
+			currentrun |= T
+	return
+
+/datum/controller/subsystem/air/proc/remove_from_react_queue(turf/open/T)
+	turf_react_queue -= T
+	if(currentpart == SSAIR_REACTQUEUE)
+		currentrun -= T
+
 /datum/controller/subsystem/air/StartLoadingMap()
 	LAZYINITLIST(queued_for_activation)
 	map_loading = TRUE

code/controllers/subsystem/air_turfs.dm

@@ -0,0 +1,27 @@
+//WHAT IF WE TAKE THE ACTIVE TURF PROCESSING AND PUSH IT SOMEWHERE ELSE!!!
+
+SUBSYSTEM_DEF(air_turfs)
+	name = "Atmospherics - Turfs"
+	init_order = INIT_ORDER_AIR_TURFS
+	priority = FIRE_PRIORITY_AIR_TURFS
+	wait = 1
+	flags = SS_BACKGROUND
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+	var/list/currentrun = list()
+
+/datum/controller/subsystem/air_turfs/fire(resumed = 0)
+	var/fire_count = times_fired
+	//cache for sanic speed
+	if (!resumed)
+		src.currentrun = SSair.active_turfs.Copy()
+	//cache for sanic speed (lists are references anyways)
+	var/list/currentrun = src.currentrun
+	while(currentrun.len)
+		var/turf/open/T = currentrun[currentrun.len]
+		currentrun.len--
+		if (T)
+			T.process_cell(fire_count)
+		if (MC_TICK_CHECK)
+			return
+	resumed = 0
+	return

code/controllers/subsystem/job.dm

@@ -433,6 +433,8 @@ SUBSYSTEM_DEF(job)
 		to_chat(M, "<b>To speak on your departments radio, use the :h button. To see others, look closely at your headset.</b>")
 		if(job.req_admin_notify)
 			to_chat(M, "<b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b>")
+		if(job.custom_spawn_text)
+			to_chat(M, "<b>[job.custom_spawn_text]</b>")
 		if(CONFIG_GET(number/minimal_access_threshold))
 			to_chat(M, "<FONT color='blue'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></font>")
 

code/controllers/subsystem/research.dm

@@ -17,10 +17,30 @@ SUBSYSTEM_DEF(research)
 	var/list/techweb_boost_items = list()		//associative double-layer path = list(id = list(point_type = point_discount))
 	var/list/techweb_nodes_hidden = list()		//Nodes that should be hidden by default.
 	var/list/techweb_point_items = list(		//path = list(point type = value)
-	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000),   // Cit three more anomalys anomalys
+	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 2500),   
+	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 5000),   // Cit three more anomalys anomalys
 	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 7500),   
-	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 5000),
-	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 2500)     // End of Cit changes
+	/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000),
+	/obj/item/slime_extract/grey = list(TECHWEB_POINT_TYPE_GENERIC = 500),    // Adds in slime core deconing
+	/obj/item/slime_extract/metal = list(TECHWEB_POINT_TYPE_GENERIC = 750),
+	/obj/item/slime_extract/purple = list(TECHWEB_POINT_TYPE_GENERIC = 750),
+	/obj/item/slime_extract/orange = list(TECHWEB_POINT_TYPE_GENERIC = 750),
+	/obj/item/slime_extract/blue = list(TECHWEB_POINT_TYPE_GENERIC = 750),
+	/obj/item/slime_extract/yellow = list(TECHWEB_POINT_TYPE_GENERIC = 1000),
+	/obj/item/slime_extract/silver = list(TECHWEB_POINT_TYPE_GENERIC = 1000),
+	/obj/item/slime_extract/darkblue = list(TECHWEB_POINT_TYPE_GENERIC = 1000),
+	/obj/item/slime_extract/darkpurple = list(TECHWEB_POINT_TYPE_GENERIC = 1000),
+	/obj/item/slime_extract/bluespace = list(TECHWEB_POINT_TYPE_GENERIC = 1250),
+	/obj/item/slime_extract/cerulean = list(TECHWEB_POINT_TYPE_GENERIC = 1250),
+	/obj/item/slime_extract/pyrite = list(TECHWEB_POINT_TYPE_GENERIC = 1250),
+	/obj/item/slime_extract/green = list(TECHWEB_POINT_TYPE_GENERIC = 1250),
+	/obj/item/slime_extract/pink = list(TECHWEB_POINT_TYPE_GENERIC = 1250),
+	/obj/item/slime_extract/gold = list(TECHWEB_POINT_TYPE_GENERIC = 1250),
+	/obj/item/slime_extract/black = list(TECHWEB_POINT_TYPE_GENERIC = 1500),
+	/obj/item/slime_extract/adamantine =list (TECHWEB_POINT_TYPE_GENERIC = 1500),
+	/obj/item/slime_extract/oil = list(TECHWEB_POINT_TYPE_GENERIC = 1500),
+	/obj/item/slime_extract/lightpink = list(TECHWEB_POINT_TYPE_GENERIC = 1500),
+	/obj/item/slime_extract/rainbow = list(TECHWEB_POINT_TYPE_GENERIC = 2500)      // End of Cit changes	
 	)
 	var/list/errored_datums = list()
 	var/list/point_types = list()				//typecache style type = TRUE list