From c5ee54481aa076796674ff76d07e814194955071 Mon Sep 17 00:00:00 2001 From: Sparrowbird611 Date: Wed, 31 Jan 2024 17:50:47 -0500 Subject: [PATCH 1/3] Le thing --- mojave/items/clothing/head/helmet.dm | 14 +++++++++++++- mojave/items/clothing/suits/armor.dm | 13 ++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/mojave/items/clothing/head/helmet.dm b/mojave/items/clothing/head/helmet.dm index 4476e0685ee..c7b918165f3 100644 --- a/mojave/items/clothing/head/helmet.dm +++ b/mojave/items/clothing/head/helmet.dm @@ -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. @@ -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." diff --git a/mojave/items/clothing/suits/armor.dm b/mojave/items/clothing/suits/armor.dm index 674f40ccaa6..a96ab062028 100644 --- a/mojave/items/clothing/suits/armor.dm +++ b/mojave/items/clothing/suits/armor.dm @@ -538,12 +538,23 @@ 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?" From 1864b6c0f023567df763fcda87b05604205d830d Mon Sep 17 00:00:00 2001 From: Sparrowbird611 <58889237+Sparrowbird611@users.noreply.github.com> Date: Thu, 22 Feb 2024 20:19:10 -0500 Subject: [PATCH 2/3] Update armor.dm --- mojave/items/clothing/suits/armor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mojave/items/clothing/suits/armor.dm b/mojave/items/clothing/suits/armor.dm index a96ab062028..8de1d6286ef 100644 --- a/mojave/items/clothing/suits/armor.dm +++ b/mojave/items/clothing/suits/armor.dm @@ -544,7 +544,7 @@ 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) +/obj/item/clothing/suit/armor/ms13/firesuit/equipped(mob/living/user, slot) if(slot_flags & slot) var/mob/living/carbon/human/H = user if(istype(H.head, /obj/item/clothing/head/helmet/ms13/firehood)) From f24170b0e3df0097c3c8e957e059ab3f6fd2415d Mon Sep 17 00:00:00 2001 From: Sparrowbird611 Date: Thu, 22 Feb 2024 20:32:20 -0500 Subject: [PATCH 3/3] fixing... --- mojave/items/clothing/suits/armor.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mojave/items/clothing/suits/armor.dm b/mojave/items/clothing/suits/armor.dm index 8de1d6286ef..9ffc75cb3cb 100644 --- a/mojave/items/clothing/suits/armor.dm +++ b/mojave/items/clothing/suits/armor.dm @@ -544,7 +544,8 @@ equip_delay_self = 3.5 SECONDS equip_delay_other = 5 SECONDS -/obj/item/clothing/suit/armor/ms13/firesuit/equipped(mob/living/user, slot) +/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))