Погребок

code/__DEFINES/dcs/signals_subsystem.dm

@@ -19,6 +19,9 @@
 /// Called when the round has started, but before GAME_STATE_PLAYING.
 #define COMSIG_TICKER_ROUND_STARTING "comsig_ticker_round_starting"
 
+/// Called when the round has started, but before GAME_STATE_PLAYING.
+#define COMSIG_TICKER_ROUND_ENDING "comsig_ticker_round_ending"
+
 /// SSexplosions from base of /datum/controller/subsystem/explosions/proc/propagate_blastwave: (turf/epicenter, devastation_range, heavy_impact_range, light_impact_range)
 #define COMSIG_EXPLOSIONS_EXPLODE "comsig_explosions_explode"
 

code/controllers/subsystem/ticker.dm

@@ -121,6 +121,7 @@ SUBSYSTEM_DEF(ticker)
 
 				current_state = GAME_STATE_FINISHED
 				Master.SetRunLevel(RUNLEVEL_POSTGAME)
+				SEND_SIGNAL(src, COMSIG_TICKER_ROUND_ENDING)
 				declare_completion()
 				spawn(50)
 					for(var/client/C in clients)

code/datums/components/roundstart_roundend.dm

@@ -0,0 +1,39 @@
+// A component you put on things you want to have roundstart/roundend procs calls.
+/datum/component/roundstart_roundend
+	var/datum/callback/roundstart_callback
+	var/datum/callback/roundend_callback
+	var/datum/callback/destroyed_callback
+
+/datum/component/roundstart_roundend/Initialize(datum/callback/roundstart_callback, datum/callback/roundend_callback, datum/callback/destroyed_callback)
+	src.roundstart_callback = roundstart_callback
+	src.roundend_callback = roundend_callback
+	src.destroyed_callback = destroyed_callback
+
+	RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_destroyed))
+
+	RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, PROC_REF(on_roundstart))
+	RegisterSignal(SSticker, COMSIG_TICKER_ROUND_ENDING, PROC_REF(on_roundend))
+
+/datum/component/roundstart_roundend/proc/on_roundstart()
+	if(roundstart_callback)
+		roundstart_callback.Invoke(parent)
+	UnregisterSignal(parent, COMSIG_TICKER_ROUND_STARTING)
+
+/datum/component/roundstart_roundend/proc/on_roundend()
+	if(roundend_callback)
+		roundend_callback.Invoke(parent)
+	UnregisterSignal(parent, COMSIG_TICKER_ROUND_ENDING)
+
+/datum/component/roundstart_roundend/proc/on_destroyed()
+	if(destroyed_callback)
+		destroyed_callback.Invoke(parent)
+	qdel(src)
+
+/datum/component/roundstart_roundend/Destroy()
+	UnregisterSignal(parent, list(COMSIG_TICKER_ROUND_ENDING, COMSIG_TICKER_ROUND_STARTING, COMSIG_PARENT_QDELETING))
+
+	QDEL_NULL(roundstart_callback)
+	QDEL_NULL(roundend_callback)
+	QDEL_NULL(destroyed_callback)
+
+	return ..()

code/game/atoms.dm

@@ -307,7 +307,7 @@
 	if(reagents && is_open_container()) //is_open_container() isn't really the right proc for this, but w/e
 		msg += "<br>It contains:"
 		if(reagents.reagent_list.len)
-			if(istype(src, /obj/structure/reagent_dispensers)) //watertanks, fueltanks
+			if(istype(src, /obj/structure/reagent_dispensers) || istype(src, /obj/structure/preservation_barrel)) //watertanks, fueltanks, fermenting barrel
 				for(var/datum/reagent/R in reagents.reagent_list)
 					msg += "<br><span class='info'>[R.volume] units of [R.name]</span>"
 			else if (is_skill_competent(user, list(/datum/skill/chemistry = SKILL_LEVEL_MASTER)))