From 1538fb129b76a7132489d780a11a70e422026de2 Mon Sep 17 00:00:00 2001 From: Gabby <59633984+feartheblackout@users.noreply.github.com> Date: Sat, 1 Feb 2025 01:37:24 -0600 Subject: [PATCH 1/2] fixes firefighter helmets; gives bulwarks high pressure protection --- code/modules/clothing/head/hardhat.dm | 3 + .../station/vaurca/vaurca_subspecies.dm | 3 + .../changelogs/SimpleMaroon-firewarkbuffs.yml | 59 +++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 html/changelogs/SimpleMaroon-firewarkbuffs.yml diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 6c46b24d60a..67f9d3acf5f 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -63,6 +63,7 @@ icon_supported_species_tags = list("una", "taj") contained_sprite = TRUE min_pressure_protection = FIRESUIT_MIN_PRESSURE + heat_protection = HEAD /obj/item/clothing/head/hardhat/paramedic name = "medical helmet" @@ -91,6 +92,8 @@ cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE flash_protection = FLASH_PROTECTION_MODERATE + heat_protection = HEAD + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/head/hardhat/firefighter/chief name = "chief firefighter helmet" 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 c73734242ce..437895d3f2e 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 @@ -380,6 +380,9 @@ Bulwarks are much larger and have significantly thicker carapaces than most Vaur heat_level_2 = 400 //Default 400 heat_level_3 = 800 //Default 1000 + hazard_high_pressure = 3000 + warning_high_pressure = 2775 + sprint_speed_factor = 1.0 stamina = 50 possible_external_organs_modifications = list("Normal", "Amputated") //We don't have any limb modfications for this species, yet diff --git a/html/changelogs/SimpleMaroon-firewarkbuffs.yml b/html/changelogs/SimpleMaroon-firewarkbuffs.yml new file mode 100644 index 00000000000..16345e1cdcd --- /dev/null +++ b/html/changelogs/SimpleMaroon-firewarkbuffs.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Firefighter helmets now have proper defense against high heat, meaning that wearing a whole firesuit works again." + - qol: "Vaurca Bulwarks now have higher pressure protection, since they can work in Engineering but can't wear voidsuits and have to rely on firesuits." From 81b330be89da349bdff7855088d0e777df5085c9 Mon Sep 17 00:00:00 2001 From: Gabby <59633984+feartheblackout@users.noreply.github.com> Date: Sat, 1 Feb 2025 14:14:08 -0600 Subject: [PATCH 2/2] no pressure resist for bulwarks ... --- .../carbon/human/species/station/vaurca/vaurca_subspecies.dm | 3 --- html/changelogs/SimpleMaroon-firewarkbuffs.yml | 1 - 2 files changed, 4 deletions(-) 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 437895d3f2e..c73734242ce 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 @@ -380,9 +380,6 @@ Bulwarks are much larger and have significantly thicker carapaces than most Vaur heat_level_2 = 400 //Default 400 heat_level_3 = 800 //Default 1000 - hazard_high_pressure = 3000 - warning_high_pressure = 2775 - sprint_speed_factor = 1.0 stamina = 50 possible_external_organs_modifications = list("Normal", "Amputated") //We don't have any limb modfications for this species, yet diff --git a/html/changelogs/SimpleMaroon-firewarkbuffs.yml b/html/changelogs/SimpleMaroon-firewarkbuffs.yml index 16345e1cdcd..c20806760c4 100644 --- a/html/changelogs/SimpleMaroon-firewarkbuffs.yml +++ b/html/changelogs/SimpleMaroon-firewarkbuffs.yml @@ -56,4 +56,3 @@ delete-after: True # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - bugfix: "Firefighter helmets now have proper defense against high heat, meaning that wearing a whole firesuit works again." - - qol: "Vaurca Bulwarks now have higher pressure protection, since they can work in Engineering but can't wear voidsuits and have to rely on firesuits."