[PORT] Removes overlay queuing, saves 6/7 seconds of initialize. Lightly modifies stat tracking macros (+some sprite error fix)

code/__DEFINES/flags.dm

@@ -27,18 +27,24 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define DF_ISPROCESSING (1<<2)
 
 //! ## FLAGS BITMASK
-#define CONDUCT_1					(1<<5)		//!  conducts electricity (iron etc.)
-#define NODECONSTRUCT_1				(1<<7)		//!  For machines and structures that should not break into parts, eg, holodeck stuff
-#define OVERLAY_QUEUED_1			(1<<8)		//!  atom queued to SSoverlay
-#define ON_BORDER_1					(1<<9)		//!  item has priority to check when entering or leaving
-#define PREVENT_CLICK_UNDER_1		(1<<11)		//! Prevent clicking things below it on the same turf eg. doors/ fulltile windows
-#define HOLOGRAM_1					(1<<12)
-#define TESLA_IGNORE_1				(1<<13) 	//! TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
-#define INITIALIZED_1				(1<<14)  	//! Whether /atom/Initialize(mapload) has already run for the object
-#define ADMIN_SPAWNED_1				(1<<15) 		//! was this spawned by an admin? used for stat tracking stuff.
-#define PREVENT_CONTENTS_EXPLOSION_1 (1<<16)
-#define UNPAINTABLE_1 				(1<<17)
-#define HTML_USE_INITAL_ICON_1		(1<<18) 			//! Should we use the initial icon for display? Mostly used by overlay only objects
+#define CONDUCT_1					(1<<0)		//!  conducts electricity (iron etc.)
+#define NODECONSTRUCT_1				(1<<1)		//!  For machines and structures that should not break into parts, eg, holodeck stuff
+#define ON_BORDER_1					(1<<2)		//!  item has priority to check when entering or leaving
+#define PREVENT_CLICK_UNDER_1		(1<<3)		//! Prevent clicking things below it on the same turf eg. doors/ fulltile windows
+#define HOLOGRAM_1					(1<<4)
+#define TESLA_IGNORE_1				(1<<5) 	//! TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
+#define INITIALIZED_1				(1<<6)  	//! Whether /atom/Initialize(mapload) has already run for the object
+#define ADMIN_SPAWNED_1				(1<<7) 		//! was this spawned by an admin? used for stat tracking stuff.
+#define PREVENT_CONTENTS_EXPLOSION_1 (1<<8)
+#define UNPAINTABLE_1 				(1<<9)
+#define HTML_USE_INITAL_ICON_1		(1<<10) 			//! Should we use the initial icon for display? Mostly used by overlay only objects
+
+//turf-only flags
+#define NOJAUNT_1					(1<<11)
+#define UNUSED_RESERVATION_TURF_1	(1<<12)
+#define CAN_BE_DIRTY_1				(1<<13) 	//! If a turf can be made dirty at roundstart. This is also used in areas.
+#define NO_LAVA_GEN_1				(1<<13) 	//! Blocks lava rivers being generated on the turf
+#define NO_RUINS_1					(1<<14) //! Blocks ruins spawning on the turf
 
 // Update flags for [/atom/proc/update_appearance]
 /// Update the atom's name
@@ -61,13 +67,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 /// If the thing can reflect matter (bullets/bomb shrapnel)
 #define RICOCHET_HARD			(1<<1)
 
-//turf-only flags
-#define NOJAUNT_1					(1<<0)
-#define UNUSED_RESERVATION_TURF_1	(1<<1)
-#define CAN_BE_DIRTY_1				(1<<2) 	//! If a turf can be made dirty at roundstart. This is also used in areas.
-#define NO_LAVA_GEN_1				(1<<6) 	//! Blocks lava rivers being generated on the turf
-#define NO_RUINS_1					(1<<10) //! Blocks ruins spawning on the turf
-
 ////////////////Area flags\\\\\\\\\\\\\\
 /// If it's a valid territory for cult summoning or the CRAB-17 phone to spawn
 #define VALID_TERRITORY				(1<<0)

code/__DEFINES/stat_tracking.dm

@@ -8,10 +8,4 @@
 #define STAT_LOG_ENTRY(entrylist, entryname) \
 	var/list/STAT_ENTRY = entrylist[entryname] || (entrylist[entryname] = new /list(STAT_ENTRY_LENGTH));\
 	STAT_ENTRY[STAT_ENTRY_TIME] += STAT_TIME;\
-	var/STAT_INCR_AMOUNT = min(1, 2**round((STAT_ENTRY[STAT_ENTRY_COUNT] || 0)/SHORT_REAL_LIMIT));\
-	if (STAT_INCR_AMOUNT == 1 || prob(100/STAT_INCR_AMOUNT)) {\
-		STAT_ENTRY[STAT_ENTRY_COUNT] += STAT_INCR_AMOUNT;\
-	};\
-
-
-
+	STAT_ENTRY[STAT_ENTRY_COUNT] += 1;

code/__DEFINES/subsystems.dm

@@ -140,7 +140,7 @@
 #define INIT_ORDER_PERSISTENCE		-2 //before assets because some assets take data from SSPersistence
 #define INIT_ORDER_ASSETS			-4
 #define INIT_ORDER_ICON_SMOOTHING	-5
-#define INIT_ORDER_OVERLAY			-6
+//#define INIT_ORDER_OVERLAY		-6 // unused but just in case
 #define INIT_ORDER_STAT				-7
 #define INIT_ORDER_XKEYSCORE		-10
 #define INIT_ORDER_STICKY_BAN		-10
@@ -193,7 +193,7 @@
 #define FIRE_PRIORITY_ATMOS_ADJACENCY	300
 #define FIRE_PRIORITY_CHAT			400
 #define FIRE_PRIORITY_RUNECHAT		410
-#define FIRE_PRIORITY_OVERLAYS		500
+//#define FIRE_PRIORITY_OVERLAYS	500 // unused but just in case
 #define FIRE_PRIORITY_CALLBACKS		600
 #define FIRE_PRIORITY_EXPLOSIONS	666
 #define FIRE_PRIORITY_PREFERENCES	690
@@ -244,27 +244,21 @@
 #define GAME_STATE_FINISHED 4
 
 //! ## Overlays subsystem
-
-/// Compile all the overlays for an atom from the cache lists
-#define COMPILE_OVERLAYS(A)\
-	if (A) {\
-		var/list/ad = A.add_overlays;\
-		var/list/rm = A.remove_overlays;\
-		if(LAZYLEN(rm)){\
-			A.overlays -= rm;\
-			rm.Cut();\
-		}\
-		if(LAZYLEN(ad)){\
-			A.overlays |= ad;\
-			ad.Cut();\
-		}\
-		for(var/I in A.alternate_appearances){\
-			var/datum/atom_hud/alternate_appearance/AA = A.alternate_appearances[I];\
+#define POST_OVERLAY_CHANGE(changed_on) \
+	if(length(changed_on.overlays) >= MAX_ATOM_OVERLAYS) { \
+		var/text_lays = overlays2text(changed_on.overlays); \
+		stack_trace("Too many overlays on [changed_on.type] - [length(changed_on.overlays)], refusing to update and cutting.\
+			\n What follows is a printout of all existing overlays at the time of the overflow \n[text_lays]"); \
+		changed_on.overlays.Cut(); \
+		changed_on.add_overlay(mutable_appearance('icons/testing/greyscale_error.dmi')); \
+	} \
+	if(alternate_appearances) { \
+		for(var/I in changed_on.alternate_appearances){\
+			var/datum/atom_hud/alternate_appearance/AA = changed_on.alternate_appearances[I];\
 			if(AA.transfer_overlays){\
-				AA.copy_overlays(A, TRUE);\
+				AA.copy_overlays(changed_on, TRUE);\
 			}\
-		}\
-		A.flags_1 &= ~OVERLAY_QUEUED_1;\
+		} \
 	}
 
 /**

code/__HELPERS/icons.dm

@@ -1125,7 +1125,6 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 		var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing")
 		for(var/D in showDirs)
 			body.setDir(D)
-			COMPILE_OVERLAYS(body)
 			var/icon/partial = getFlatIcon(body)
 			out_icon.Insert(partial,dir=D)
 
@@ -1155,7 +1154,6 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 	var/initial_human_dir = existing_human.dir
 	existing_human.dir = SOUTH
 	var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing")
-	COMPILE_OVERLAYS(existing_human)
 	for(var/direction in directions_to_output)
 		var/icon/partial = getFlatIcon(existing_human, defdir = direction)
 		out_icon.Insert(partial, dir = direction)

code/_globalvars/bitfields.dm

@@ -174,7 +174,6 @@ DEFINE_BITFIELD(flags_1, list(
 	"CONDUCT_1" = CONDUCT_1,
 	"NO_LAVA_GEN_1" = NO_LAVA_GEN_1,
 	"NODECONSTRUCT_1" = NODECONSTRUCT_1,
-	"OVERLAY_QUEUED_1" = OVERLAY_QUEUED_1,
 	"ON_BORDER_1" = ON_BORDER_1,
 	"NO_RUINS_1" = NO_RUINS_1,
 	"PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1,
@@ -184,6 +183,7 @@ DEFINE_BITFIELD(flags_1, list(
 	"ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1,
 	"PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1,
 	"UNPAINTABLE_1" = UNPAINTABLE_1,
+	"HTML_USE_INITAL_ICON_1" = HTML_USE_INITAL_ICON_1,
 ))
 
 DEFINE_BITFIELD(flags_ricochet, list(