bugfix: Fixes icon smoothing for sure (#6167)

ss220-space · Nov 12, 2024 · 4ec90a8 · 4ec90a8
1 parent 2cb2dc3
commit 4ec90a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(icon_smooth)
 	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/icon_smooth/proc/add_halt_source(datum/source)
-	halt_sources |= source
+	halt_sources += source
 
 /datum/controller/subsystem/icon_smooth/proc/remove_halt_source(datum/source)
 	halt_sources -= source
diff --git a/code/controllers/subsystem/non-firing/atoms.dm b/code/controllers/subsystem/non-firing/atoms.dm
@@ -27,6 +27,7 @@ SUBSYSTEM_DEF(atoms)
 	if(initialized == INITIALIZATION_INSSATOMS)
 		return
 
+	SSicon_smooth.add_halt_source(src)
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 
 	LAZYINITLIST(late_loaders)
@@ -79,6 +80,7 @@ SUBSYSTEM_DEF(atoms)
 			log_debug("	Late initialized [length(late_loaders)] atoms in [stop_watch(watch)]s")
 		late_loaders.Cut()
 
+	SSicon_smooth.remove_halt_source(src)
 
 /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments)
 	var/the_type = A.type
@@ -127,11 +129,12 @@ SUBSYSTEM_DEF(atoms)
 /datum/controller/subsystem/atoms/proc/map_loader_begin()
 	old_initialized = initialized
 	initialized = INITIALIZATION_INSSATOMS
+	SSicon_smooth.add_halt_source(src)
 
 
 /datum/controller/subsystem/atoms/proc/map_loader_stop()
 	initialized = old_initialized
-
+	SSicon_smooth.remove_halt_source(src)
 
 /datum/controller/subsystem/atoms/Recover()
 	initialized = SSatoms.initialized

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
@@ -50,6 +50,7 @@
 /obj/machinery/disposal/Initialize(mapload, obj/structure/disposalconstruct/made_from)
 	// this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
 	. = ..()
+	air_contents = new
 	if(made_from)
 		setDir(made_from.dir)
 	return INITIALIZE_HINT_LATELOAD
@@ -60,7 +61,6 @@
 	var/datum/gas_mixture/env = new
 	env.copy_from(loc.return_air())
 	var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
-	air_contents = new
 	air_contents.merge(removed)
 	trunk_check()
 	update()