TGS Test Merge (#16711)

tgstation · Nov 15, 2024 · 44cc952 · 44cc952
2 parents 02dedf7 + 8cd05a2
commit 44cc952
Show file tree

Hide file tree

Showing 32 changed files with 1,111 additions and 17 deletions.
diff --git a/code/__DEFINES/dcs/signals/signals.dm b/code/__DEFINES/dcs/signals/signals.dm
@@ -726,6 +726,11 @@
 
 #define COMSIG_XENOMORPH_LEAP_BUMP "xenomorph_leap_bump" //from /mob/living/carbon/xenomorph/bump
 
+// Xeno upgrade chambers
+#define COMSIG_UPGRADE_CHAMBER_SURVIVAL "upgrade_chamber_survival"
+#define COMSIG_UPGRADE_CHAMBER_ATTACK "upgrade_chamber_attack"
+#define COMSIG_UPGRADE_CHAMBER_UTILITY "upgrade_chamber_utility"
+
 //human signals
 #define COMSIG_CLICK_QUICKEQUIP "click_quickequip"
 

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -589,12 +589,13 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
 #define CASTE_STAGGER_RESISTANT (1<<15) //Resistant to some forms of stagger, such as projectiles
 #define CASTE_HAS_WOUND_MASK (1<<16) //uses an alpha mask for wounded states
 #define CASTE_EXCLUDE_STRAINS (1<<17) // denotes castes/basetypes that should be excluded from being evoable as a strain
+#define CASTE_NO_BIOMASS (1<<18) // Xenos are excluded from getting any biomass
 
 // Xeno defines that affect evolution, considering making a new var for these
-#define CASTE_LEADER_TYPE (1<<16) //Whether we are a leader type caste, such as the queen, shrike or ?king?, and is affected by queen ban and playtime restrictions
-#define CASTE_CANNOT_EVOLVE_IN_CAPTIVITY (1<<17) //Whether we cannot evolve in the research lab
-#define CASTE_REQUIRES_FREE_TILE (1<<18) //Whether we require a free tile to evolve
-#define CASTE_INSTANT_EVOLUTION (1<<19) //Whether we require no evolution progress to evolve to this caste
+#define CASTE_LEADER_TYPE (1<<19) //Whether we are a leader type caste, such as the queen, shrike or ?king?, and is affected by queen ban and playtime restrictions
+#define CASTE_CANNOT_EVOLVE_IN_CAPTIVITY (1<<20) //Whether we cannot evolve in the research lab
+#define CASTE_REQUIRES_FREE_TILE (1<<21) //Whether we require a free tile to evolve
+#define CASTE_INSTANT_EVOLUTION (1<<22) //Whether we require no evolution progress to evolve to this caste
 
 #define CASTE_CAN_HOLD_FACEHUGGERS (1<<0)
 #define CASTE_CAN_BE_QUEEN_HEALED (1<<1)

diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm
@@ -32,6 +32,7 @@
 #define MOVESPEED_ID_WARLOCK_CHANNELING "WARLOCK_CHANNELING"
 #define MOVESPEED_ID_XENO_DREAD "DREADXENO"
 #define MOVESPEED_ID_BEHEMOTH_PRIMAL_WRATH "BEHEMOTH_PRIMAL_WRATH"
+#define MOVESPEED_ID_CELERITY_BUFF "UPGRADE_CHAMBER_CELERITY_BUFF"
 #define MOVESPEED_ID_PRAETORIAN_DANCER_DODGE_SPEED "PRAETORIAN_DANCER_DODGE_SPEED"
 
 #define MOVESPEED_ID_SIMPLEMOB_VARSPEED "SIMPLEMOB_VARSPEED_MODIFIER"

diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
@@ -39,6 +39,24 @@
 
 #define STATUS_EFFECT_DRAIN_SURGE /datum/status_effect/drain_surge
 
+#define STATUS_EFFECT_UPGRADE_CARAPACE /datum/status_effect/mutation_upgrade/carapace
+
+#define STATUS_EFFECT_UPGRADE_REGENERATION /datum/status_effect/mutation_upgrade/regeneration
+
+#define STATUS_EFFECT_UPGRADE_VAMPIRISM /datum/status_effect/mutation_upgrade/vampirism
+
+#define STATUS_EFFECT_UPGRADE_CELERITY /datum/status_effect/mutation_upgrade/celerity
+
+#define STATUS_EFFECT_UPGRADE_ADRENALINE /datum/status_effect/mutation_upgrade/adrenaline
+
+#define STATUS_EFFECT_UPGRADE_CRUSH /datum/status_effect/mutation_upgrade/crush
+
+#define STATUS_EFFECT_UPGRADE_TOXIN /datum/status_effect/mutation_upgrade/toxin
+
+#define STATUS_EFFECT_UPGRADE_PHERO /datum/status_effect/mutation_upgrade/pheromones
+
+#define STATUS_EFFECT_UPGRADE_TRAIL /datum/status_effect/mutation_upgrade/trail
+
 #define STATUS_EFFECT_MINDMEND /datum/status_effect/mindmeld
 
 #define STATUS_EFFECT_REKNIT_FORM /datum/status_effect/reknit_form

diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
@@ -92,6 +92,14 @@ GLOBAL_LIST_INIT(defiler_toxin_type_list, list(
 	/datum/reagent/toxin/xeno_ozelomelyn,
 ))
 
+//List of Defiler toxin images
+GLOBAL_LIST_INIT(defiler_toxin_images_list, list(
+	DEFILER_OZELOMELYN = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_OZELOMELYN),
+	DEFILER_HEMODILE = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_HEMODILE),
+	DEFILER_TRANSVITOX = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_TRANSVITOX),
+	DEFILER_NEUROTOXIN = image('icons/Xeno/actions/defiler.dmi', icon_state = DEFILER_NEUROTOXIN)
+))
+
 //List of toxins improving defile's damage
 GLOBAL_LIST_INIT(defiler_toxins_typecache_list, typecacheof(list(
 	/datum/reagent/toxin/xeno_ozelomelyn,
@@ -210,3 +218,31 @@ GLOBAL_LIST_INIT(xeno_ai_spawnable, list(
 
 /// Life runs every 2 seconds, but we don't want to multiply all healing by 2 due to seconds_per_tick
 #define XENO_PER_SECOND_LIFE_MOD 0.5
+
+// Mutations
+GLOBAL_DATUM_INIT(mutation_selector, /datum/mutation_datum, new)
+
+GLOBAL_LIST_INIT(mutation_upgrades_buyable, list(
+	/datum/mutation_upgrade/survival/carapace,
+	/datum/mutation_upgrade/survival/regeneration,
+	/datum/mutation_upgrade/survival/vampirism,
+	/datum/mutation_upgrade/attack/celerity,
+	/datum/mutation_upgrade/attack/adrenaline,
+	/datum/mutation_upgrade/attack/crush,
+	/datum/mutation_upgrade/utility/toxin,
+	/datum/mutation_upgrade/utility/pheromones,
+	/datum/mutation_upgrade/utility/trail
+))
+
+#define MUTATION_CATEGORY_SURVIVAL "Survival"
+#define MUTATION_CATEGORY_ATTACK "Attack"
+#define MUTATION_CATEGORY_UTILITY "Utility"
+
+#define MUTATION_STRUCTURE_CHAMBER "shell"
+#define MUTATION_STRUCTURE_SPUR "spur"
+#define MUTATION_STRUCTURE_VEIL "veil"
+
+#define	XENO_UPGRADE_BIOMASS_COST_T1 15
+#define	XENO_UPGRADE_BIOMASS_COST_T2 20
+#define	XENO_UPGRADE_BIOMASS_COST_T3 25
+#define	XENO_UPGRADE_BIOMASS_COST_T4 30