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.

Sign up for GitHub

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

SWAT Gear Buffs #2517

Merged
merged 4 commits into from
Jul 11, 2024
Merged

SWAT Gear Buffs #2517

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cebfe60
Removes NT SWAT Helmet mouth coverage.
SirNightKnight Jul 3, 2024
a8c4fa0
oops should be clothing
SirNightKnight Jul 3, 2024
0074412
oops again, first time doing this
SirNightKnight Jul 3, 2024
6ddeadc
SirNightKnight Jul 9, 2024
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
10 changes: 7 additions & 3 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,12 @@
clothing_flags = STOPSPRESSUREDAMAGE | PLASMAMAN_HELMET_EXEMPT
strip_delay = 80
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEHAIR
dog_fashion = null

/datum/armor/helmet_swat
melee = 40
bullet = 30
bullet = 40
laser = 30
energy = 40
bomb = 50
Expand All @@ -260,13 +261,16 @@
desc = "An extremely robust helmet with the Nanotrasen logo emblazoned on the top."
icon_state = "swat"
inhand_icon_state = "swat_helmet"
clothing_flags = PLASMAMAN_HELMET_EXEMPT
clothing_flags = PLASMAMAN_HELMET_EXEMPT | SNUG_FIT
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
flags_cover = HEADCOVERSEYES | PEPPERPROOF

/obj/item/clothing/head/helmet/swat/nanotrasen/Initialize(mapload)
. = ..()
AddComponent(/datum/component/seclite_attachable, light_icon_state = "flight")

/obj/item/clothing/head/helmet/thunderdome
name = "\improper Thunderdome helmet"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,14 +342,14 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT_OFF
heat_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
slowdown = 0.7
slowdown = 0.5
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS

//All of the armor below is mostly unused

/datum/armor/armor_swat
melee = 40
bullet = 30
bullet = 40
laser = 30
energy = 40
bomb = 50
Expand Down
Binary file modified icons/mob/clothing/head/helmet.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/head/helmet.dmi
View file
Open in desktop
Binary file not shown.
Loading