From eb312f526fdfe957ee7b5447511e0026857e2cfe Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 22 Sep 2018 15:11:19 +0100 Subject: [PATCH] gamma fireproof suits, fixed an accidental removal in scanners.dm --- code/game/objects/items/devices/scanners.dm | 2 ++ code/modules/clothing/spacesuits/ert.dm | 34 +++++++++++++++++++ code/modules/response_team/ert_outfits.dm | 36 +++++++++------------ 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index aa084b42614..de465284f9d 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -657,6 +657,8 @@ REAGENT SCANNER /obj/item/bodyanalyzer/New() ..() + power_supply = new cell_type(src) + power_supply.give(power_supply.maxcharge) update_icon() /obj/item/bodyanalyzer/proc/setReady() diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 2597b3cdde7..caf85c91ee1 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -56,12 +56,19 @@ item_state = "helm-command" item_color = "ert_commander" +/obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT + + /obj/item/clothing/suit/space/hardsuit/ert/commander name = "emergency response team commander suit" desc = "A suit worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant." icon_state = "ert_commander" item_state = "suit-command" +/obj/item/clothing/suit/space/hardsuit/ert/commander/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + //Security /obj/item/clothing/head/helmet/space/hardsuit/ert/security name = "emergency response team security helmet" @@ -70,12 +77,18 @@ item_state = "syndicate-helm-black-red" item_color = "ert_security" +/obj/item/clothing/head/helmet/space/hardsuit/ert/security/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT + /obj/item/clothing/suit/space/hardsuit/ert/security name = "emergency response team security suit" desc = "A suit worn by security members of a Nanotrasen Emergency Response Team. Has red highlights. Armoured, space ready, and fire resistant." icon_state = "ert_security" item_state = "syndicate-black-red" +/obj/item/clothing/suit/space/hardsuit/ert/security/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + //Engineer /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer name = "emergency response team engineer helmet" @@ -84,12 +97,20 @@ item_state = "helm-orange" item_color = "ert_engineer" +//Engineer +/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT + /obj/item/clothing/suit/space/hardsuit/ert/engineer name = "emergency response team engineer suit" desc = "A suit worn by the engineers of a Nanotrasen Emergency Response Team. Has yellow highlights. Armoured, space ready, and fire resistant." icon_state = "ert_engineer" item_state = "suit-orange" +/obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + + //Medical /obj/item/clothing/head/helmet/space/hardsuit/ert/medical name = "emergency response team medical helmet" @@ -97,11 +118,18 @@ icon_state = "hardsuit0-ert_medical" item_color = "ert_medical" +/obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT + + /obj/item/clothing/suit/space/hardsuit/ert/medical name = "emergency response team medical suit" desc = "A suit worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready." icon_state = "ert_medical" +/obj/item/clothing/suit/space/hardsuit/ert/medical/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + //Janitor /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor name = "emergency response team janitor helmet" @@ -109,11 +137,17 @@ icon_state = "hardsuit0-ert_janitor" item_color = "ert_janitor" +/obj/item/clothing/head/helmet/space/hardsuit/ert/janitor/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT + /obj/item/clothing/suit/space/hardsuit/ert/janitor name = "emergency response team janitor suit" desc = "A suit worn by the janitorial of a Nanotrasen Emergency Response Team. Has purple highlights. Armoured, space ready, and fire resistant." icon_state = "ert_janitor" +/obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma + max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT + //Paranormal /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal name = "paranormal response unit helmet" diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 360864259ce..a37dbe00de2 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -80,15 +80,12 @@ name = "RT Commander (Gamma)" shoes = /obj/item/clothing/shoes/magboots/advance gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/space/hardsuit/ert/commander + suit = /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma glasses = /obj/item/clothing/glasses/night suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 - belt = /obj/item/gun/projectile/automatic/pistol/enforcer - backpack_contents = list( - /obj/item/storage/box/responseteam/ = 1, - /obj/item/clothing/head/helmet/space/hardsuit/ert/commander = 1, + /obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma = 1, /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/restraints/handcuffs = 1, /obj/item/storage/lockbox/mindshield = 1, @@ -103,6 +100,10 @@ /obj/item/organ/internal/cyberimp/arm/flash ) +/datum/outfit/job/centcomm/response_team/commander/gamma/pre_equip() + var/gun = new /obj/item/gun/projectile/automatic/pistol/enforcer {mag_type = /obj/item/ammo_box/magazine/m45/enforcer45/lethal} + belt = gun + //////////////////// SECURITY /////////////////// /datum/outfit/job/centcom/response_team/security @@ -163,7 +164,7 @@ has_grenades = TRUE shoes = /obj/item/clothing/shoes/magboots/advance gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/space/hardsuit/ert/security + suit = /obj/item/clothing/suit/space/hardsuit/ert/security/gamma belt = /obj/item/storage/belt/security/response_team/gamma suit_store = /obj/item/gun/energy/gun/nuclear glasses = /obj/item/clothing/glasses/night @@ -173,11 +174,10 @@ r_hand = /obj/item/gun/energy/immolator/multi backpack_contents = list( - /obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1, + /obj/item/clothing/head/helmet/space/hardsuit/ert/security/gamma = 1, /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/storage/box/flashbangs = 1, - /obj/item/storage/box/responseteam/ = 1, /obj/item/whetstone = 1, /obj/item/storage/lockbox/t4 = 1, ) @@ -250,7 +250,7 @@ shoes = /obj/item/clothing/shoes/magboots/advance gloves = /obj/item/clothing/gloves/color/yellow belt = /obj/item/storage/belt/utility/chief/full - suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer + suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 glasses = /obj/item/clothing/glasses/meson/night @@ -258,11 +258,10 @@ r_pocket = /obj/item/melee/classic_baton/telescopic backpack_contents = list( - /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer = 1, + /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma = 1, /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/rcd/combat = 1, /obj/item/rcd_ammo/large = 3, - /obj/item/storage/box/responseteam/ = 1 ) cybernetic_implants = list( @@ -334,14 +333,14 @@ /obj/item/storage/box/autoinjectors = 1, /obj/item/roller = 1, /obj/item/clothing/shoes/magboots = 1, - /obj/item/scanner/bodyanalyzer = 1 + /obj/item/bodyanalyzer = 1 ) /datum/outfit/job/centcom/response_team/medic/gamma name = "RT Medic (Gamma)" shoes = /obj/item/clothing/shoes/magboots/advance gloves = /obj/item/clothing/gloves/combat - suit = /obj/item/clothing/suit/space/hardsuit/ert/medical + suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma glasses = /obj/item/clothing/glasses/night suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 cybernetic_implants = list( @@ -353,15 +352,13 @@ l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites r_pocket = /obj/item/reagent_containers/hypospray/autoinjector - r_hand = /obj/item/gun/medbeam backpack_contents = list( - /obj/item/clothing/head/helmet/space/hardsuit/ert/medical = 1, + /obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma = 1, /obj/item/clothing/mask/gas/sechailer/swat = 1, - /obj/item/storage/box/responseteam/ = 1, /obj/item/bodyanalyzer/advanced = 1, /obj/item/extinguisher/mini = 1, /obj/item/storage/belt/medical/surgery/loaded = 1, - /obj/structure/stool/bed/roller = 1, + /obj/item/roller = 1, ) cybernetic_implants = list( @@ -456,8 +453,7 @@ /datum/outfit/job/centcom/response_team/janitorial/gamma name = "RT Janitor (Gamma)" - suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor - head = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor + suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma glasses = /obj/item/clothing/glasses/hud/security/sunglasses gloves = /obj/item/clothing/gloves/combat suit_store = /obj/item/gun/energy/gun @@ -466,7 +462,7 @@ shoes = /obj/item/clothing/shoes/magboots/advance backpack_contents = list( - /obj/item/storage/box/responseteam/ = 1, + /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor/gamma = 1, /obj/item/grenade/chem_grenade/antiweed = 2, /obj/item/storage/box/lights/mixed = 1, /obj/item/storage/bag/trash/bluespace = 1,