From fd4591401a09f692c3dd1302731ad6fad128ded8 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Fri, 18 Nov 2022 20:23:05 -0500 Subject: [PATCH 1/3] double dipping --- .../modules/mining/equipment/explorer_gear.dm | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index aa2151d0dd51..2b70f388b11b 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -80,7 +80,7 @@ /obj/item/clothing/suit/space/hostile_environment name = "H.E.C.K. suit" - desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner." + desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner. It seems to lose its strength when there are no monsters around." icon_state = "hostile_env" item_state = "hostile_env" clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL @@ -100,6 +100,14 @@ return ..() /obj/item/clothing/suit/space/hostile_environment/process() + var/turf/T = get_turf(src) + if(is_station_level(T.z)) + max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, RAD = 60, FIRE = 100, ACID = 100) + else + max_heat_protection_temperature = initial(src.max_heat_protection_temperature) + armor = list(MELEE = 75, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) + var/mob/living/carbon/C = loc if(istype(C) && prob(2)) //cursed by bubblegum if(prob(15)) @@ -110,7 +118,7 @@ /obj/item/clothing/head/helmet/space/hostile_environment name = "H.E.C.K. helmet" - desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner." + desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner. It seems to lose its strength when there are no monsters around." icon_state = "hostile_env" item_state = "hostile_env" w_class = WEIGHT_CLASS_NORMAL @@ -122,8 +130,22 @@ /obj/item/clothing/head/helmet/space/hostile_environment/Initialize() . = ..() AddComponent(/datum/component/spraycan_paintable) + START_PROCESSING(SSobj, src) update_icon() +/obj/item/clothing/head/helmet/space/hostile_environment/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/clothing/head/helmet/space/hostile_environment/process() + var/turf/T = get_turf(src) + if(is_station_level(T.z)) + max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT + armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, RAD = 60, FIRE = 60, ACID = 100) + else + max_heat_protection_temperature = initial(src.max_heat_protection_temperature) + armor = list(MELEE = 75, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) + /obj/item/clothing/head/helmet/space/hostile_environment/update_icon() ..() cut_overlays() From b253c253a7542e8dde81bc478aa3a79467285c22 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Fri, 18 Nov 2022 20:30:26 -0500 Subject: [PATCH 2/3] Update explorer_gear.dm --- code/modules/mining/equipment/explorer_gear.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 2b70f388b11b..8192b5f204e8 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -103,7 +103,7 @@ var/turf/T = get_turf(src) if(is_station_level(T.z)) max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, RAD = 60, FIRE = 100, ACID = 100) + armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 60, FIRE = 100, ACID = 100) else max_heat_protection_temperature = initial(src.max_heat_protection_temperature) armor = list(MELEE = 75, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) @@ -141,7 +141,7 @@ var/turf/T = get_turf(src) if(is_station_level(T.z)) max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, RAD = 60, FIRE = 60, ACID = 100) + armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 60, FIRE = 60, ACID = 100) else max_heat_protection_temperature = initial(src.max_heat_protection_temperature) armor = list(MELEE = 75, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) From fc9b06a7023387ba79ced38f6179edb401960972 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:42:40 -0500 Subject: [PATCH 3/3] Update explorer_gear.dm --- code/modules/mining/equipment/explorer_gear.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 8192b5f204e8..9567e7e66c96 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -103,10 +103,10 @@ var/turf/T = get_turf(src) if(is_station_level(T.z)) max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 60, FIRE = 100, ACID = 100) + getArmor(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 60, FIRE = 100, ACID = 100) else max_heat_protection_temperature = initial(src.max_heat_protection_temperature) - armor = list(MELEE = 75, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) + getArmor(initial(src.armor)) var/mob/living/carbon/C = loc if(istype(C) && prob(2)) //cursed by bubblegum @@ -141,10 +141,10 @@ var/turf/T = get_turf(src) if(is_station_level(T.z)) max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - armor = list(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 60, FIRE = 60, ACID = 100) + getArmor(MELEE = 40, BULLET = 20, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 60, FIRE = 100, ACID = 100) else max_heat_protection_temperature = initial(src.max_heat_protection_temperature) - armor = list(MELEE = 75, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100) + getArmor(initial(src.armor)) /obj/item/clothing/head/helmet/space/hostile_environment/update_icon() ..()