Merge remote-tracking branch 'upstream/main'

code/__DEFINES/flags.dm

@@ -41,21 +41,19 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define CONDUCT_1					(1<<5)
 /// For machines and structures that should not break into parts, eg, holodeck stuff
 #define NODECONSTRUCT_1				(1<<7)
-/// atom queued to SSoverlay
-#define OVERLAY_QUEUED_1			(1<<8)
 /// item has priority to check when entering or leaving
-#define ON_BORDER_1					(1<<9)
+#define ON_BORDER_1					(1<<8)
 /// Prevent clicking things below it on the same turf eg. doors/ fulltile windows
-#define PREVENT_CLICK_UNDER_1		(1<<11)
-#define HOLOGRAM_1					(1<<12)
+#define PREVENT_CLICK_UNDER_1		(1<<9)
+#define HOLOGRAM_1					(1<<10)
 /// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
-#define TESLA_IGNORE_1				(1<<13)
+#define TESLA_IGNORE_1				(1<<11)
 ///Whether /atom/Initialize() has already run for the object
-#define INITIALIZED_1				(1<<14)
+#define INITIALIZED_1				(1<<12)
 /// was this spawned by an admin? used for stat tracking stuff.
-#define ADMIN_SPAWNED_1			    (1<<15)
+#define ADMIN_SPAWNED_1			    (1<<13)
 /// should not get harmed if this gets caught by an explosion?
-#define PREVENT_CONTENTS_EXPLOSION_1 (1<<16)
+#define PREVENT_CONTENTS_EXPLOSION_1 (1<<14)
 
 //turf-only flags
 #define NOJAUNT_1					(1<<0)

code/__DEFINES/sexcon_defines.dm

@@ -0,0 +1,46 @@
+GLOBAL_LIST_INIT(sex_actions, build_sex_actions())
+
+#define SEX_ACTION(sex_action_type) GLOB.sex_actions[sex_action_type]
+
+#define MAX_AROUSAL 150
+#define PASSIVE_EJAC_THRESHOLD 100
+#define ACTIVE_EJAC_THRESHOLD 100
+#define SEX_MAX_CHARGE 300
+#define CHARGE_FOR_CLIMAX 100
+#define AROUSAL_HARD_ON_THRESHOLD 20
+#define CHARGE_RECHARGE_RATE (CHARGE_FOR_CLIMAX / (5 MINUTES))
+#define AROUSAL_TIME_TO_UNHORNY (5 SECONDS)
+#define SPENT_AROUSAL_RATE (3 / (1 SECONDS))
+#define IMPOTENT_AROUSAL_LOSS_RATE (3 / (1 SECONDS))
+
+
+#define AROUSAL_HIGH_UNHORNY_RATE (1.5 / (1 SECONDS))
+#define AROUSAL_MID_UNHORNY_RATE (0.4 / (1 SECONDS))
+#define AROUSAL_LOW_UNHORNY_RATE (0.2 / (1 SECONDS))
+
+#define MOAN_COOLDOWN 3 SECONDS
+
+#define SEX_SPEED_LOW 1
+#define SEX_SPEED_MID 2
+#define SEX_SPEED_HIGH 3
+
+#define SEX_SPEED_MIN 1
+#define SEX_SPEED_MAX 3
+
+#define SEX_FORCE_LOW 1
+#define SEX_FORCE_MID 2
+#define SEX_FORCE_HIGH 3
+
+#define SEX_FORCE_MIN 1
+#define SEX_FORCE_MAX 3
+
+#define BLUEBALLS_GAIN_THRESHOLD 15
+#define BLUEBALLS_LOOSE_THRESHOLD 10
+
+/proc/build_sex_actions()
+	. = list()
+	for(var/path in typesof(/datum/sex_action))
+		if(is_abstract(path))
+			continue
+		.[path] = new path()
+	return .

code/__DEFINES/stat_tracking.dm

@@ -8,10 +8,6 @@
 #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

@@ -195,29 +195,25 @@
 
 
 //! ## Overlays subsystem
+// A reasonable number of maximum overlays an object needs
+// If you think you need more, rethink it
+#define MAX_ATOM_OVERLAYS 200
 
 ///Compile all the overlays for an atom from the cache lists
-#define COMPILE_OVERLAYS(A)\
-	do {\
-		var/list/ad = A.add_overlays;\
-		var/list/rm = A.remove_overlays;\
-		var/list/po = A.priority_overlays;\
-		if(LAZYLEN(rm)){\
-			A.overlays -= rm;\
-			rm.Cut();\
-		}\
-		if(LAZYLEN(ad)){\
-			A.overlays |= ad;\
-			ad.Cut();\
-		}\
-		if(LAZYLEN(po)){\
-			A.overlays |= po;\
-		}\
-		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;\
-	} while (FALSE)
+		} \
+	}
+

code/__DEFINES/traits.dm

@@ -55,7 +55,7 @@
 #define TRAIT_VAMPMANSION "vampiremansion"
 #define TRAIT_INHUMENCAMP "inhumencamp"
 #define TRAIT_LIMPDICK "limp_dick"
-#define TRAIT_MINCED "minced" // Punishment that exists only because I am evil. Try NOT using the mouth of MONSTER PEOPLE THAT EATS FLESH ON A WHIM next time.
+#define TRAIT_MINCED "minced" // from monochrome/catalaria. your dick fell off
 #define TRAIT_SEXPASS "sexpass"
 #define TRAIT_INTRAINING "intraining" //allows certain roles to bypass the average skill limitation of training dummies
 #define TRAIT_STEELHEARTED "steelhearted" //no bad mood from dismembering or seeing this

code/__HELPERS/icons.dm

@@ -1036,7 +1036,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)
 

code/_globalvars/bitfields.dm

@@ -126,7 +126,6 @@ GLOBAL_LIST_INIT(bitfields, 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,