Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes firefighter helmets #20435

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/modules/clothing/head/hardhat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considering they have other advantages, I don't see why they would also need to be resistant to high pressure?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If they're going to be an engineer, they need to be able to survive issues engineers will run into. Bulwarks are also heavy duty units, they have some advantages and some weaknesses, and i don't think an instant death situation they could run into on the job is exactly fair or logical

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On second pass, Bulwarks' standard high pressure resistance seems to be enough combined with a firesuit to handle the pressure created by a phoron fire, so I'll retract that part of the PR for now.

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
Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/SimpleMaroon-firewarkbuffs.yml
Original file line number Diff line number Diff line change
@@ -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."
Loading