diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm index 278b452cd2..92302660d7 100644 --- a/code/datums/outfits/costumes/halloween.dm +++ b/code/datums/outfits/costumes/halloween.dm @@ -77,9 +77,9 @@ name = OUTFIT_COSTUME("Firefighter") uniform = /obj/item/clothing/under/pants shoes = /obj/item/clothing/shoes/boots/workboots - head = /obj/item/clothing/head/hardhat/red + head = /obj/item/clothing/head/hardhat/red/firefighter gloves = /obj/item/clothing/gloves/black - suit = /obj/item/clothing/suit/fire/firefighter + suit = /obj/item/clothing/suit/fire mask = /obj/item/clothing/mask/gas /decl/hierarchy/outfit/costume/highlander @@ -127,4 +127,4 @@ shoes = /obj/item/clothing/shoes/brown head = /obj/item/clothing/head/marine suit = /obj/item/clothing/suit/marine - r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff \ No newline at end of file + r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 86023fb959..1d4869ad97 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -20,6 +20,8 @@ /obj/item/radio/headset/heads/ce/alt, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/suit/storage/hazardvest, + /obj/item/clothing/head/hardhat/firefighter/chief, + /obj/item/clothing/suit/fire/atmos, /obj/item/clothing/mask/gas, /obj/item/multitool, /obj/item/storage/belt/utility/chief/full, @@ -100,8 +102,8 @@ starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, - /obj/item/clothing/suit/fire/firefighter, - /obj/item/clothing/head/hardhat/red, + /obj/item/clothing/suit/fire/atmos, + /obj/item/clothing/head/hardhat/firefighter, /obj/item/flashlight, /obj/item/extinguisher, /obj/item/clamp, diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index a582f343ee..03f3cdffa1 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -62,29 +62,29 @@ closet_appearance = /decl/closet_appearance/oxygen/fire starts_with = list( - /obj/item/clothing/suit/fire/firefighter, + /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, /obj/item/tank/oxygen/red, /obj/item/extinguisher, - /obj/item/clothing/head/hardhat/red) + /obj/item/clothing/head/hardhat/firefighter) /obj/structure/closet/firecloset/full starts_with = list( - /obj/item/clothing/suit/fire/firefighter, + /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, /obj/item/flashlight, /obj/item/tank/oxygen/red, /obj/item/extinguisher, - /obj/item/clothing/head/hardhat/red) + /obj/item/clothing/head/hardhat/firefighter) /obj/structure/closet/firecloset/full/double starts_with = list( - /obj/item/clothing/suit/fire/firefighter = 2, + /obj/item/clothing/suit/fire = 2, /obj/item/clothing/mask/gas = 2, /obj/item/flashlight = 2, /obj/item/tank/oxygen/red = 2, /obj/item/extinguisher = 2, - /obj/item/clothing/head/hardhat/red = 2) + /obj/item/clothing/head/hardhat/firefighter = 2) /* * Tool Closet diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index 5e02716e92..698f3ee954 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -140,12 +140,12 @@ density = 0 starts_with = list( - /obj/item/clothing/suit/fire/firefighter, + /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, /obj/item/flashlight, /obj/item/tank/oxygen/red, /obj/item/extinguisher, - /obj/item/clothing/head/hardhat/red) + /obj/item/clothing/head/hardhat/firefighter) /obj/structure/closet/walllocker_double/hydrant/north pixel_y = 32 @@ -161,4 +161,4 @@ /obj/structure/closet/walllocker_double/hydrant/east pixel_x = 32 - dir = EAST \ No newline at end of file + dir = EAST diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index c78749f6f8..66a32925c4 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -37,3 +37,39 @@ /obj/item/clothing/head/hardhat/dblue name = "blue hard hat" icon_state = "hardhat0_dblue" + +/obj/item/clothing/head/hardhat/red/firefighter + name = "atmospheric firefighter helmet" + desc = "An atmospheric firefighter's helmet, able to keep the user protected from heat and fire in normal atmospheric conditions." + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 15000 + min_pressure_protection = 0.5 * ONE_ATMOSPHERE + max_pressure_protection = 20 * ONE_ATMOSPHERE + icon_state = "atmos_fire" + sprite_sheets = list( + SPECIES_TAJARAN = 'icons/mob/species/tajaran/helmet.dmi', + SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi' + ) + +/obj/item/clothing/head/hardhat/firefighter + name = "firefighter helmet" + desc = "A complete, face covering helmet specially designed for firefighting. It is airtight and has a port for internals." + icon_state = "helmet_firefighter" + item_flags = THICKMATERIAL | AIRTIGHT + permeability_coefficient = 0 + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 15000 + min_pressure_protection = 0.5 * ONE_ATMOSPHERE + max_pressure_protection = 20 * ONE_ATMOSPHERE + body_parts_covered = HEAD|FACE|EYES + cold_protection = HEAD + min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE + flash_protection = FLASH_PROTECTION_MODERATE + sprite_sheets = list( + SPECIES_TAJARAN = 'icons/mob/species/tajaran/helmet.dmi', + SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi' + ) + +/obj/item/clothing/head/hardhat/firefighter/chief + name = "chief firefighter helmet" + desc = "A complete, face covering helmet specially designed for firefighting. This one is in the colors of the Chief Engineer. It is airtight and has a port for internals." + icon_state = "helmet_firefighter_ce" diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 6068dc2f92..4ec8028112 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -329,7 +329,7 @@ icon_state = "rig0-atmos" item_state_slots = list(slot_r_hand_str = "atmos_helm", slot_l_hand_str = "atmos_helm") armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50) - max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 light_overlay = "helmet_light_dual" min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 20* ONE_ATMOSPHERE @@ -340,7 +340,7 @@ icon_state = "rig-atmos" item_state_slots = list(slot_r_hand_str = "atmos_voidsuit", slot_l_hand_str = "atmos_voidsuit") armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50) - max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 20* ONE_ATMOSPHERE breach_threshold = 16 //Extra Thicc @@ -442,4 +442,4 @@ /obj/item/clothing/suit/space/void/pilot/alt desc = "An atmos resistant voidsuit for space." icon_state = "rig-pilot2" - item_state = "rig-pilot2" \ No newline at end of file + item_state = "rig-pilot2" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index a53a5cb036..eda3702ea2 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -12,13 +12,14 @@ /obj/item/clothing/suit/fire name = "firesuit" desc = "A suit that protects against fire and heat." - icon_state = "fire" + icon_state = "firesuit" w_class = ITEMSIZE_LARGE//bulky item gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 + siemens_coefficient = 0.5 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/extinguisher) - slowdown = 1.0 + slowdown = 0.8 //Slightly better than a voidsuit flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER item_flags = 0 heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS @@ -27,17 +28,13 @@ min_pressure_protection = 0.2 * ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE - -/obj/item/clothing/suit/fire/firefighter - icon_state = "firesuit" - -/obj/item/clothing/suit/fire/heavy //Is this even used?? -S2- - name = "firesuit" - desc = "A suit that protects against extreme fire and heat." - //icon_state = "thermal" - item_state_slots = list(slot_r_hand_str = "black_suit", slot_l_hand_str = "black_suit") - w_class = ITEMSIZE_LARGE//bulky item - slowdown = 1.5 +/obj/item/clothing/suit/fire/atmos + name = "atmospheric technician firesuit" + desc = "A suit that protects against fire and heat, this one is designed for atmospheric technicians." + siemens_coefficient = 0.35 + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 15000 + icon_state = "atmos_firesuit" + item_state = "atmos_firesuit" /* * Bomb protection @@ -114,4 +111,4 @@ icon = 'icons/obj/clothing/species/teshari/hats.dmi' icon_override = 'icons/mob/species/teshari/head.dmi' icon_state = "rad_fitted" - species_restricted = list(SPECIES_TESHARI) \ No newline at end of file + species_restricted = list(SPECIES_TESHARI) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 098938a901..04281884b2 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -82,7 +82,7 @@ //Dispensers /obj/structure/reagent_dispensers/watertank - name = "watertank" + name = "water tank" desc = "A watertank." icon = 'icons/obj/objects.dmi' icon_state = "watertank" @@ -403,7 +403,7 @@ /obj/structure/reagent_dispensers/acid/Initialize() . = ..() reagents.add_reagent("sacid", 1000) - + //Cooking oil refill tank /obj/structure/reagent_dispensers/cookingoil name = "cooking oil tank" @@ -437,4 +437,4 @@ /obj/structure/reagent_dispenser/he3/Initialize() ..() - reagents.add_reagent("helium3",1000) \ No newline at end of file + reagents.add_reagent("helium3",1000) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index dc1cc277f2..2bff1dfa33 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 513092f900..7ea29916bc 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index 4f90c5a779..d92ec19353 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 73c59d73db..a72af16f2b 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 5e0d177313..0c0ef6a175 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index f0c5ecdfb2..327c59d686 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ