From 9185b5189c1fa4d15832a8f537b7f06604fc42ed Mon Sep 17 00:00:00 2001 From: Hawk_v3 Date: Sun, 28 Oct 2012 23:39:50 +0000 Subject: [PATCH] RIGs have heat resist. Firesuits have cold resist. You're welcome. ^v^ --- code/modules/clothing/spacesuits/rig.dm | 6 +++++- code/modules/clothing/suits/utility.dm | 2 ++ code/setup.dm | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index f1ebad3b0c1..2c528c9d1ac 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -10,6 +10,8 @@ var/on = 0 color = "engineering" //Determines used sprites: rig[on]-[color] and rig[on]-[color]2 (lying down sprite) icon_action_button = "action_hardhat" + heat_protection = HEAD + max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE attack_self(mob/user) if(!isturf(user.loc)) @@ -42,6 +44,8 @@ slowdown = 2 armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) + heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE //Chief Engineer's rig @@ -120,4 +124,4 @@ w_class = 3 unacidable = 1 armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) - allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen) \ No newline at end of file + allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index b334c3d0420..367a86f004b 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -24,6 +24,8 @@ flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE + cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + min_cold_protection_temperature = FIRESUIT_MIN_COLD_PROTECITON_TEMPERATURE /obj/item/clothing/suit/fire/firefighter diff --git a/code/setup.dm b/code/setup.dm index 934074dec2c..ddbc69de036 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -45,6 +45,8 @@ #define HELMET_MAX_HEAT_PROTECITON_TEMPERATURE 600 //For normal helmets #define ARMOR_MIN_COLD_PROTECITON_TEMPERATURE 160 //For armor #define ARMOR_MAX_HEAT_PROTECITON_TEMPERATURE 600 //For armor +#define FIRESUIT_MIN_COLD_PROTECITON_TEMPERATURE 50 //These need better cold protect +#define SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE 5000 //These need better heat protect #define GLOVES_MIN_COLD_PROTECITON_TEMPERATURE 2.0 //For some gloves (black and) #define GLOVES_MAX_HEAT_PROTECITON_TEMPERATURE 1500 //For some gloves @@ -577,4 +579,4 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define HOSTILE_STANCE_ALERT 2 #define HOSTILE_STANCE_ATTACK 3 #define HOSTILE_STANCE_ATTACKING 4 -#define HOSTILE_STANCE_TIRED 5 \ No newline at end of file +#define HOSTILE_STANCE_TIRED 5