stops xeno strains

cmss13-devs · Oct 26, 2023 · eda7236 · eda7236
1 parent 0350592
commit eda7236
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -58,7 +58,7 @@
 #define MODE_RANDOM_HIVE (1<<12)// Makes Join-as-Xeno choose a hive to join as burrowed larva at random rather than at user's input..
 #define MODE_THUNDERSTORM (1<<13)// Enables thunderstorm effects on maps that are compatible with it. (Lit exterior tiles, rain effects)
 #define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses
-#define MODE_NO_XENO_EVOLVE (1<<15) // Stops all xenos from evolving
+#define MODE_NO_XENO_EVOLVE (1<<15) // Stops all xenos from evolving or straining
 
 // Gamemode Toggleable Flags
 #define MODE_NO_SNIPER_SENTRY (1<<0) /// Upgrade kits will no longer allow you to select long-range upgrades

diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm
@@ -202,7 +202,7 @@
 		to_chat(src, SPAN_WARNING("Nuh-uh."))
 		return FALSE
 
-	if(SSticker?.mode?.flags_round_type & MODE_NO_XENO_EVOLVE)
+	if(SSticker.mode?.flags_round_type & MODE_NO_XENO_EVOLVE)
 		to_chat(src, SPAN_WARNING("This mode disallows xeno evolution."))
 		return FALSE
 

diff --git a/code/modules/mob/living/carbon/xenomorph/XenoMutatorSets.dm b/code/modules/mob/living/carbon/xenomorph/XenoMutatorSets.dm
@@ -25,6 +25,10 @@
 	return FALSE
 
 /datum/mutator_set/proc/list_and_purchase_mutators()
+	if(SSticker.mode?.flags_round_type & MODE_NO_XENO_EVOLVE)
+		to_chat(usr, SPAN_WARNING("This mode disallows xeno mutators."))
+		return FALSE
+
 	var/list/mutators_for_purchase = available_mutators()
 	var/mob/living/carbon/xenomorph/Xeno = usr
 	if(mutators_for_purchase.len == 0)