From 4e670d9759d9d41368d78844c285dfe212c849e0 Mon Sep 17 00:00:00 2001 From: Sniblet <36427443+Sniblet@users.noreply.github.com> Date: Mon, 6 Mar 2023 20:17:48 -0500 Subject: [PATCH] Vaurcae aren't slowed by cold (#15944) * the pr let's see how this goes wrong * breeders and warforms too --- code/__defines/species_languages.dm | 3 ++- code/modules/mob/living/carbon/human/human_movement.dm | 4 ++-- .../living/carbon/human/species/station/vaurca/vaurca.dm | 2 +- .../human/species/station/vaurca/vaurca_subspecies.dm | 4 ++-- html/changelogs/sniblet-coldbugs.yml | 9 +++++++++ 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/sniblet-coldbugs.yml diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index 6bb86bad5b5..f70deb13dfd 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -13,10 +13,11 @@ #define NO_ARTERIES BITFLAG(12) // This species does not have arteries. #define PHORON_IMMUNE BITFLAG(13) // species doesn't suffer the negative effects of phoron contamination #define CAN_SWEAT BITFLAG(14) // Forgive me. +#define NO_COLD_SLOWDOWN BITFLAG(15) //Doesn't slow down in the cold. // unused: 0x8000(32768) - higher than this will overflow // Base flags for IPCs. -#define IS_IPC (NO_BREATHE|NO_SCAN|NO_BLOOD|NO_PAIN|NO_POISON|IS_MECHANICAL|NO_CHUBBY|PHORON_IMMUNE) +#define IS_IPC (NO_BREATHE|NO_SCAN|NO_BLOOD|NO_PAIN|NO_POISON|IS_MECHANICAL|NO_CHUBBY|PHORON_IMMUNE|NO_COLD_SLOWDOWN) // Species spawn flags #define IS_WHITELISTED 0x1 // Must be whitelisted to play. diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index ed80a949afc..e456c1d08f3 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -40,7 +40,7 @@ if (is_drowsy()) tally += 6 - if (!(species.flags & IS_MECHANICAL)) // Machines don't move slower when cold. + if (!(species.flags & NO_COLD_SLOWDOWN)) // Bugs and machines don't move slower when cold. if(HAS_FLAG(mutations, FAT)) tally += 1.5 if (bodytemperature < 283.222) @@ -55,7 +55,7 @@ var/obj/item/I = get_active_hand() if(istype(I)) tally += I.slowdown - + if(isitem(pulling)) var/obj/item/P = pulling tally += P.slowdown diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm index 65a8dde860d..c633e60be03 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm @@ -71,7 +71,7 @@ heat_level_1 = 330 //Default 360 heat_level_2 = 380 //Default 400 heat_level_3 = 600 //Default 1000 - flags = NO_SLIP | NO_CHUBBY | NO_ARTERIES | PHORON_IMMUNE + flags = NO_SLIP | NO_CHUBBY | NO_ARTERIES | PHORON_IMMUNE | NO_COLD_SLOWDOWN spawn_flags = CAN_JOIN | IS_WHITELISTED | NO_AGE_MINIMUM appearance_flags = HAS_SKIN_COLOR | HAS_HAIR_COLOR blood_color = COLOR_VAURCA_BLOOD // dark yellow diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index 0d2237cdb11..7989863a01a 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -91,7 +91,7 @@ sprint_cost_factor = 0.80 stamina_recovery = 3 - flags = NO_SLIP | NO_ARTERIES | PHORON_IMMUNE + flags = NO_SLIP | NO_ARTERIES | PHORON_IMMUNE | NO_COLD_SLOWDOWN possible_cultures = list( /singleton/origin_item/culture/zora_breeder, @@ -164,7 +164,7 @@ warning_high_pressure = 3250 //Default 325 spawn_flags = IS_RESTRICTED - flags = NO_SCAN | NO_SLIP | NO_PAIN | NO_BREATHE | NO_ARTERIES | PHORON_IMMUNE + flags = NO_SCAN | NO_SLIP | NO_PAIN | NO_BREATHE | NO_ARTERIES | PHORON_IMMUNE | NO_COLD_SLOWDOWN inherent_verbs = list( /mob/living/carbon/human/proc/rebel_yell, diff --git a/html/changelogs/sniblet-coldbugs.yml b/html/changelogs/sniblet-coldbugs.yml new file mode 100644 index 00000000000..79e99ba92cb --- /dev/null +++ b/html/changelogs/sniblet-coldbugs.yml @@ -0,0 +1,9 @@ +# Your name. +author: Sniblet + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +changes: + - tweak: "Vaurcae aren't slowed by cold." + - backend: "Adds the NO_COLD_SLOWDOWN species flag, only used by IPCs and vaurcae."