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

Jump to bottom

Buffs (myself) firesuit #2491

Merged
merged 3 commits into from
Mar 6, 2024
Merged

Buffs (myself) firesuit #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5ee544
Le thing
Sparrowbird611 Jan 31, 2024
1864b6c
Update armor.dm
Sparrowbird611 Feb 23, 2024
f24170b
fixing...
Sparrowbird611 Feb 23, 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
14 changes: 13 additions & 1 deletion mojave/items/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@
ENERGY = 0, \
FIRE = CLASS5_FIRE)
max_integrity = 260
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, fire = 95, acid = 0, wound = 0) //No wound armor
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, fire = 100, acid = 0, wound = 0) //No wound armor
heat_protection = HEAD
resistance_flags = FIRE_PROOF
flags_cover = HEADCOVERSEYES // Built in protection from the dust. yippie.
Expand All @@ -1332,6 +1332,18 @@
equip_delay_self = 2 SECONDS
equip_delay_other = 4 SECONDS

/obj/item/clothing/head/helmet/ms13/firehood/equipped(mob/living/user, slot)
..()
if(slot_flags & slot)
var/mob/living/carbon/human/H = user
if(istype(H.wear_suit, /obj/item/clothing/suit/armor/ms13/firesuit))
ADD_TRAIT(user, TRAIT_NON_FLAMMABLE, "fire_suit")

/obj/item/clothing/head/helmet/ms13/firehood/dropped(mob/living/user)
..()
if(istype(user))
REMOVE_TRAIT(user, TRAIT_NON_FLAMMABLE, "fire_suit")

/obj/item/clothing/head/helmet/ms13/radiationhood
name = "radiation suit hood"
desc = "A hood to go along with your radiation suit. It's got a broken geiger counter mounted near the filter."
Expand Down
14 changes: 13 additions & 1 deletion mojave/items/clothing/suits/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,12 +538,24 @@
ENERGY = 0, \
FIRE = CLASS5_FIRE)
max_integrity = 450
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, fire = 95, acid = 0, wound = 0)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, fire = 100, acid = 0, wound = 0)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
resistance_flags = FIRE_PROOF
equip_delay_self = 3.5 SECONDS
equip_delay_other = 5 SECONDS

/obj/item/clothing/suit/armor/ms13/firesuit/equipped(mob/living/carbon/human/user, slot)
..()
if(slot_flags & slot)
var/mob/living/carbon/human/H = user
if(istype(H.head, /obj/item/clothing/head/helmet/ms13/firehood))
ADD_TRAIT(user, TRAIT_NON_FLAMMABLE, "fire_suit")

/obj/item/clothing/suit/armor/ms13/firesuit/dropped(mob/living/carbon/human/user)
..()
if(istype(user))
REMOVE_TRAIT(user, TRAIT_NON_FLAMMABLE, "fire_suit")

/obj/item/clothing/suit/armor/ms13/radsuit
name = "radiation suit"
desc = "A lead lined suit, designed with the sole purpose of blocking radiation from the human body. It's pretty thick, and while it could protect you from more than rads, why would you waste such a thing like this in combat?"
Expand Down
Loading