From 3df0cc381fc27c6c3071a7e5303242f7c22bda03 Mon Sep 17 00:00:00 2001 From: spaghetti Date: Thu, 5 Dec 2024 06:16:17 +0300 Subject: [PATCH] acid blood --- .../carbon/xenomorph/castes/behemoth/castedatum_behemoth.dm | 2 +- .../mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm | 2 +- .../carbon/xenomorph/castes/carrier/castedatum_carrier.dm | 2 +- .../carbon/xenomorph/castes/chimera/castedatum_chimera.dm | 2 +- .../carbon/xenomorph/castes/defender/castedatum_defender.dm | 2 +- .../carbon/xenomorph/castes/defiler/castedatum_defiler.dm | 2 +- .../living/carbon/xenomorph/castes/drone/castedatum_drone.dm | 2 +- .../mob/living/carbon/xenomorph/castes/hellhound/hellhound.dm | 2 +- .../carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm | 2 +- .../living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm | 2 +- .../mob/living/carbon/xenomorph/castes/king/castedatum_king.dm | 2 +- .../living/carbon/xenomorph/castes/larva/castedatum_larva.dm | 2 +- code/modules/mob/living/carbon/xenomorph/castes/larva/larva.dm | 2 +- .../carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm | 1 + .../carbon/xenomorph/castes/ravager/castedatum_ravager.dm | 2 +- .../living/carbon/xenomorph/castes/runner/castedatum_runner.dm | 2 +- .../living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm | 2 +- .../carbon/xenomorph/castes/warlock/castedatum_warlock.dm | 2 +- .../carbon/xenomorph/castes/warrior/castedatum_warrior.dm | 2 +- 19 files changed, 19 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/castedatum_behemoth.dm b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/castedatum_behemoth.dm index c637430f43e..acae7a1d41f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/castedatum_behemoth.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/castedatum_behemoth.dm @@ -23,7 +23,7 @@ max_health = 750 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_STRONG|CASTE_STAGGER_RESISTANT|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_STRONG|CASTE_STAGGER_RESISTANT can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm b/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm index b25f20c7742..9fa72b2183e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm @@ -28,7 +28,7 @@ evolution_threshold = 225 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm index 516630e40a3..4f765ad68aa 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm @@ -27,7 +27,7 @@ evolution_threshold = 225 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED can_hold_eggs = CAN_HOLD_ONE_HAND can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_JELLY caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/chimera/castedatum_chimera.dm b/code/modules/mob/living/carbon/xenomorph/castes/chimera/castedatum_chimera.dm index 320f4822045..5d3a34488ab 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/chimera/castedatum_chimera.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/chimera/castedatum_chimera.dm @@ -23,7 +23,7 @@ max_health = 350 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm index d03e76c13cf..f1a0fe9ec83 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm @@ -27,7 +27,7 @@ evolution_threshold = 100 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_HOLD_JELLY caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm index e3b9f5f3e5c..b5b42e8e978 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm @@ -27,7 +27,7 @@ sunder_multiplier = 0.8 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED can_hold_eggs = CAN_HOLD_ONE_HAND can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_JELLY caste_traits = list(TRAIT_CAN_VENTCRAWL) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm index 449b4850f6f..2778a6b853b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm @@ -29,7 +29,7 @@ evolution_threshold = 100 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_BUILDER|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_BUILDER can_hold_eggs = CAN_HOLD_TWO_HANDS can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_JELLY|CASTE_CAN_RIDE_CRUSHER caste_traits = list(TRAIT_CAN_VENTCRAWL) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hellhound/hellhound.dm b/code/modules/mob/living/carbon/xenomorph/castes/hellhound/hellhound.dm index 9e66cb44ad6..fdab28b8b3b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hellhound/hellhound.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hellhound/hellhound.dm @@ -8,7 +8,7 @@ wound_type = "" upgrade_name = "" - caste_flags = CASTE_INNATE_HEALING|CASTE_INNATE_PLASMA_REGEN|CASTE_ACID_BLOOD + caste_flags = CASTE_INNATE_HEALING|CASTE_INNATE_PLASMA_REGEN // *** Melee Attacks *** // melee_damage = 35 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm index 556e9d73035..f73f6340c0d 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm @@ -27,7 +27,7 @@ evolution_threshold = 225 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_BUILDER|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_BUILDER can_hold_eggs = CAN_HOLD_TWO_HANDS can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_JELLY caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm b/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm index e800c3a099c..12c65c549a1 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm @@ -31,7 +31,7 @@ evolution_threshold = 225 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_HOLD_JELLY caste_traits = list(TRAIT_CAN_VENTCRAWL) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/castedatum_king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/castedatum_king.dm index 8893b4c653c..6fd7f4176ec 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/king/castedatum_king.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/king/castedatum_king.dm @@ -31,7 +31,7 @@ death_evolution_delay = 7 MINUTES // *** Flags *** // - caste_flags = CASTE_IS_INTELLIGENT|CASTE_STAGGER_RESISTANT|CASTE_LEADER_TYPE|CASTE_INSTANT_EVOLUTION|CASTE_ACID_BLOOD + caste_flags = CASTE_IS_INTELLIGENT|CASTE_STAGGER_RESISTANT|CASTE_LEADER_TYPE|CASTE_INSTANT_EVOLUTION can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_CORRUPT_GENERATOR|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_HOLD_JELLY caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm index b3ebdc2ed85..5eaad6751e5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm @@ -28,7 +28,7 @@ evolution_threshold = 50 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_INNATE_HEALING|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_INNATE_HEALING can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_RIDE_CRUSHER caste_traits = list(TRAIT_CAN_VENTCRAWL) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/larva/larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/larva/larva.dm index fa7aaaca7c5..8ab84dd1a33 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/larva/larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/larva/larva.dm @@ -131,7 +131,7 @@ evolution_threshold = 50 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_INNATE_HEALING|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_INNATE_HEALING can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_RIDE_CRUSHER caste_traits = list(TRAIT_CAN_VENTCRAWL) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm index d455a1fa1a5..056b30b5ed5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm @@ -24,6 +24,7 @@ // *** Flags *** // can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_HOLD_JELLY caste_traits = null + caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD // *** Defense *** // soft_armor = list(MELEE = 45, BULLET = 25, LASER = 15, ENERGY = 50, BOMB = 10, BIO = 40, FIRE = 20, ACID = 40) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm index f664ffaa5ef..bdc42b7f001 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm @@ -25,7 +25,7 @@ max_health = 350 // *** Flags *** // - caste_flags = CASTE_INNATE_PLASMA_REGEN|CASTE_PLASMADRAIN_IMMUNE|CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_INNATE_PLASMA_REGEN|CASTE_PLASMADRAIN_IMMUNE|CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_LEADER caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm index de779a05336..c0ea6a08265 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm @@ -29,7 +29,7 @@ evolution_threshold = 100 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_RIDE_CRUSHER caste_traits = list(TRAIT_CAN_VENTCRAWL) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm b/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm index a2107b74ae4..317064f7cfe 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm @@ -27,7 +27,7 @@ maximum_active_caste = 1 // *** Flags *** // - caste_flags = CASTE_IS_INTELLIGENT|CASTE_IS_STRONG|CASTE_IS_BUILDER|CASTE_INSTANT_EVOLUTION|CASTE_EVOLUTION_ALLOWED|CASTE_LEADER_TYPE|CASTE_ACID_BLOOD + caste_flags = CASTE_IS_INTELLIGENT|CASTE_IS_STRONG|CASTE_IS_BUILDER|CASTE_INSTANT_EVOLUTION|CASTE_EVOLUTION_ALLOWED|CASTE_LEADER_TYPE can_hold_eggs = CAN_HOLD_TWO_HANDS can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_CORRUPT_GENERATOR|CASTE_CAN_HOLD_JELLY caste_traits = null diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm b/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm index 8cd84249642..409eeb19c2f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm @@ -15,7 +15,7 @@ max_health = 375 spit_types = list(/datum/ammo/energy/xeno/psy_blast) - can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_ACID_BLOOD + can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER caste_traits = null soft_armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 10, BIO = 35, FIRE = 10, ACID = 35) shield_strength = 650 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm index 3b10cf1f75a..73601de48a2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm @@ -28,7 +28,7 @@ evolution_threshold = 225 // *** Flags *** // - caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_STRONG|CASTE_ACID_BLOOD + caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_STRONG can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_HOLD_JELLY caste_traits = null