Merge remote-tracking branch 'upstream/master'

Author: SyncIt21

code/_onclick/hud/new_player.dm

@@ -776,41 +776,46 @@
 	if(!hud || !show_static)
 		maptext = null
 		return
+
+	var/round_started = SSticker.HasRoundStarted()
 	if(!MC_RUNNING())
-		maptext = MAPTEXT("<span style='text-align: center; vertical-align: middle'>Loading...</span>")
+		maptext = MAPTEXT("<span style='text-align: center; vertical-align: middle'>[(round_started ? null : "[time_remaining_str()]<br />")]Loading...</span>")
 		return
 	if(SSticker.IsPostgame())
 		maptext = MAPTEXT("<span style='text-align: center; vertical-align: middle'>Game ended, <br /> \
 			restart soon</span>")
 		return
 
 	var/new_maptext
-	var/round_started = SSticker.HasRoundStarted()
 	if(round_started)
 		new_maptext = "<span style='text-align: center; vertical-align: middle'>[SSmapping.current_map.map_name]<br /> \
 			[LAZYLEN(GLOB.clients)] player\s online<br /> \
 			[ROUND_TIME()] in<br />"
 		new_maptext += "</span>"
 	else
-		var/time_remaining = SSticker.GetTimeLeft()
-		if(time_remaining > 0)
-			time_remaining = "[round(time_remaining/10)]s"
-		else if(time_remaining == -10)
-			time_remaining = "DELAYED"
-		else
-			time_remaining = "SOON"
 
 		if(hud.mymob.client?.holder)
-			new_maptext = "<span style='text-align: center; vertical-align: middle'>Starting in [time_remaining]<br /> \
+			new_maptext = "<span style='text-align: center; vertical-align: middle'>[time_remaining_str()]<br /> \
 				[LAZYLEN(GLOB.clients)] player\s<br /> \
 				[SSticker.totalPlayersReady] players ready<br /> \
 				[SSticker.total_admins_ready] / [length(GLOB.admins)] admins ready</span>"
 		else
-			new_maptext = "<span style='text-align: center; vertical-align: middle; font-size: 18px'>[time_remaining]</span><br /> \
+			new_maptext = "<span style='text-align: center; vertical-align: middle; font-size: 18px'>[time_remaining_str()]</span><br /> \
 				<span style='text-align: center; vertical-align: middle'>[LAZYLEN(GLOB.clients)] player\s</span>"
 
 	maptext = MAPTEXT(new_maptext)
 
+/atom/movable/screen/lobby/new_player_info/proc/time_remaining_str()
+	var/time_remaining = SSticker.GetTimeLeft()
+	if(time_remaining > 0)
+		time_remaining = "[round(time_remaining/10)]s"
+	else if(time_remaining == -10)
+		time_remaining = "DELAYED"
+	else
+		time_remaining = "SOON"
+
+	return "Starting in [time_remaining]"
+
 #undef OVERLAY_X_DIFF
 #undef OVERLAY_Y_DIFF
 

code/datums/components/plumbing/chemical_acclimator.dm

@@ -15,6 +15,7 @@
 			. = ..()
 			if(!reagents.holder_full())
 				return
+		reagents.flags &= ~NO_REACT
 		myacclimator.acclimate_state = reagents.chem_temp > myacclimator.target_temperature ? AC_COOLING : AC_HEATING
 		myacclimator.update_appearance(UPDATE_ICON_STATE)
 

code/datums/wires/r_n_d.dm

@@ -33,6 +33,7 @@
 			R.hacked = !R.hacked
 		if(WIRE_DISABLE)
 			R.disabled = !R.disabled
+
 /datum/wires/rnd/on_cut(wire, mend, source)
 	var/obj/machinery/rnd/R = holder
 	switch(wire)

code/game/objects/items/rcd/RPLD.dm

@@ -44,7 +44,6 @@
 			/obj/machinery/plumbing/fermenter = 30,
 			/obj/machinery/plumbing/liquid_pump = 35, //extracting chemicals from ground is one way of creation
 			/obj/machinery/plumbing/disposer = 10,
-			/obj/machinery/plumbing/buffer = 10, //creates chemicals as it waits for other buffers containing other chemicals and when mixed creates new chemicals
 		),
 
 		//category 2 distributors i.e devices which inject , move around , remove chemicals from the network
@@ -62,9 +61,10 @@
 		"Storage" = list(
 			/obj/machinery/plumbing/tank = 20,
 			/obj/machinery/plumbing/acclimator = 10,
+			/obj/machinery/plumbing/buffer = 10,
 			/obj/machinery/plumbing/bottler = 50,
 			/obj/machinery/plumbing/pill_press = 20,
-			/obj/machinery/iv_drip/plumbing = 20
+			/obj/machinery/iv_drip/plumbing = 20,
 		),
 	)
 

code/modules/asset_cache/assets/plumbing.dm

@@ -24,7 +24,7 @@
 			"manifold",
 			"pipe_input",
 			"filter",
-			"splitter_tri",
+			"splitter",
 			"beacon",
 			"pipe_output",
 			"tank",

code/modules/plumbing/plumbers/_plumb_machinery.dm

@@ -17,7 +17,7 @@
 	///Plumbing machinery is always gonna need reagents, so we might aswell put it here
 	var/buffer = 50
 	///Flags for reagents, like INJECTABLE, TRANSPARENT bla bla everything thats in DEFINES/reagents.dm
-	var/reagent_flags = TRANSPARENT
+	var/reagent_flags = TRANSPARENT | NO_REACT
 
 /obj/machinery/plumbing/Initialize(mapload)
 	. = ..()

code/modules/plumbing/plumbers/_plumb_reagents.dm

@@ -52,9 +52,6 @@
 	if(amount <= 0)
 		return FALSE
 
-	//Set up new reagents to inherit the old ongoing reactions
-	transfer_reactions(target_holder)
-
 	var/list/cached_reagents = reagent_list
 	var/transfer_amount
 	var/transfered_amount
@@ -100,10 +97,6 @@
 			break
 	update_total()
 
-	//handle reactions
-	target_holder.handle_reactions()
-	handle_reactions()
-
 	return total_transfered_amount
 
 ///Excludes catalysts during the emptying process
@@ -190,9 +183,6 @@
 	if(amount <= 0)
 		return FALSE
 
-	//Set up new reagents to inherit the old ongoing reactions
-	transfer_reactions(target_holder)
-
 	var/working_volume
 	var/catalyst_volume
 	var/transfer_amount
@@ -247,10 +237,6 @@
 			break
 	update_total()
 
-	//handle reactions
-	target_holder.handle_reactions()
-	handle_reactions()
-
 	return total_transfered_amount
 
 
@@ -302,9 +288,6 @@
 	if(amount <= 0)
 		return FALSE
 
-	//Set up new reagents to inherit the old ongoing reactions
-	transfer_reactions(target_holder)
-
 	var/transfer_amount
 	var/transfered_amount
 	var/total_transfered_amount = 0
@@ -342,8 +325,4 @@
 		reagent.volume -= transfered_amount
 	update_total()
 
-	//handle reactions
-	target_holder.handle_reactions()
-	handle_reactions()
-
 	return total_transfered_amount

code/modules/plumbing/plumbers/acclimator.dm

@@ -82,6 +82,7 @@
 
 	if(acclimate_state == AC_EMPTYING && !reagents.total_volume)
 		acclimate_state = AC_FILLING
+		reagents.flags |= NO_REACT
 		update_appearance(UPDATE_ICON_STATE)
 
 /obj/machinery/plumbing/acclimator/ui_interact(mob/user, datum/tgui/ui)

code/modules/plumbing/plumbers/bottler.dm

@@ -5,7 +5,7 @@
 	reagents = /datum/reagents
 	layer = ABOVE_ALL_MOB_LAYER
 	plane = ABOVE_GAME_PLANE
-	reagent_flags = TRANSPARENT | DRAINABLE
+	reagent_flags = /obj/machinery/plumbing::reagent_flags | DRAINABLE
 	buffer = 100
 
 	///how much do we fill

code/modules/plumbing/plumbers/fermenter.dm

@@ -4,7 +4,7 @@
 	icon_state = "fermenter"
 	layer = ABOVE_ALL_MOB_LAYER
 	plane = ABOVE_GAME_PLANE
-	reagent_flags = TRANSPARENT | DRAINABLE
+	reagent_flags = /obj/machinery/plumbing::reagent_flags | DRAINABLE
 	buffer = 400
 
 	///input dir