diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d9148f761b6..27cf38d481d 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -110,8 +110,8 @@ id = /obj/item/card/id/engineering pda = /obj/item/pda/atmos - backpack = /obj/item/storage/backpack/industrial - satchel = /obj/item/storage/backpack/satchel_eng + backpack = /obj/item/storage/backpack/industrial/atmos + satchel = /obj/item/storage/backpack/satchel_atmos dufflebag = /obj/item/storage/backpack/duffel/atmos box = /obj/item/storage/box/engineer diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 53f655ffadb..5c8fab85c49 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -2078,6 +2078,7 @@ products = list(/obj/item/clothing/under/rank/engineer = 6, /obj/item/clothing/under/rank/engineer/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering = 3, + /obj/item/clothing/suit/jacket/engibomber = 3, /obj/item/clothing/suit/storage/hazardvest = 3, /obj/item/clothing/head/beret/eng = 3, /obj/item/clothing/head/hardhat = 2, @@ -2107,6 +2108,7 @@ products = list(/obj/item/clothing/under/rank/atmospheric_technician = 6, /obj/item/clothing/under/rank/atmospheric_technician/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, + /obj/item/clothing/suit/jacket/atmosbomber = 3, /obj/item/clothing/suit/storage/hazardvest = 3, /obj/item/clothing/head/beret/atmos = 3, /obj/item/clothing/head/hardhat = 2, @@ -2117,8 +2119,8 @@ /obj/item/clothing/accessory/armband/engine = 3, /obj/item/clothing/shoes/laceup = 3, /obj/item/clothing/shoes/workboots = 3, - /obj/item/storage/backpack/industrial = 2, - /obj/item/storage/backpack/satchel_eng = 2, + /obj/item/storage/backpack/industrial/atmos = 2, + /obj/item/storage/backpack/satchel_atmos = 2, /obj/item/storage/backpack/duffel/atmos = 2, /obj/item/storage/belt/utility = 2) contraband = list(/obj/item/toy/figure/crew/atmos = 1) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index c6b70c0539c..01cb808fad5 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -157,6 +157,13 @@ item_state = "engiepack" resistance_flags = FIRE_PROOF +/obj/item/storage/backpack/industrial/atmos + name = "atmospherics backpack" + desc = "It's a fireproof backpack for Atmospherics Staff." + icon_state = "atmospack" + item_state = "atmospack" + resistance_flags = FIRE_PROOF + /obj/item/storage/backpack/explorer name = "explorer bag" desc = "A robust backpack for stashing your loot." @@ -255,6 +262,13 @@ item_state = "satchel-eng" resistance_flags = FIRE_PROOF +/obj/item/storage/backpack/satchel_atmos + name = "atmospherics satchel" + desc = "A fireproof satchel for keeping gear safe." + icon_state = "satchel-atmos" + item_state = "satchel-atmos" + resistance_flags = FIRE_PROOF + /obj/item/storage/backpack/satchel/explorer name = "explorer satchel" desc = "A robust satchel for stashing your loot." 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 a7ad03ee204..5fb63b3b15f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -113,9 +113,9 @@ new /obj/item/cartridge/atmos(src) new /obj/item/storage/toolbox/mechanical(src) if(prob(50)) - new /obj/item/storage/backpack/industrial(src) + new /obj/item/storage/backpack/industrial/atmos(src) else - new /obj/item/storage/backpack/satchel_eng(src) + new /obj/item/storage/backpack/satchel_atmos(src) new /obj/item/storage/backpack/duffel/atmos(src) new /obj/item/extinguisher(src) new /obj/item/grenade/gas/oxygen(src) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index cd5cfccfb51..64b924dfe24 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -810,6 +810,34 @@ armor = list(melee = 15, bullet = 5, laser = 15, energy = 5, bomb = 15, bio = 0, rad = 0, fire = 30, acid = 30) //End of inheritance from Security armour. +/obj/item/clothing/suit/jacket/engibomber + name = "engineering bomber jacket" + desc = "A stylish and warm jacket adorned with the colors of the humble Station Engineer." + icon_state = "bomberengi" + item_state = "bomberengi" + ignore_suitadjust = 0 + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 20, FIRE = 30, ACID = 45) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd) + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + actions_types = list(/datum/action/item_action/zipper) + adjust_flavour = "unzip" + +/obj/item/clothing/suit/jacket/atmosbomber + name = "atmospherics bomber jacket" + desc = "A stylish and warm jacket adorned with the colors of the magical Atmospherics Technician." + icon_state = "bomberatmos" + item_state = "bomberatmos" + ignore_suitadjust = 0 + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 20, FIRE = 30, ACID = 45) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd) + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + actions_types = list(/datum/action/item_action/zipper) + adjust_flavour = "unzip" + /obj/item/clothing/suit/jacket/leather name = "leather jacket" desc = "Pompadour not included." diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 54b3a8ac788..4ba6d5ed3d9 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi index 121cfac79c5..f462f5bb692 100644 Binary files a/icons/mob/clothing/species/grey/back.dmi and b/icons/mob/clothing/species/grey/back.dmi differ diff --git a/icons/mob/clothing/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi index 24a4a542690..d8356256292 100644 Binary files a/icons/mob/clothing/species/vox/back.dmi and b/icons/mob/clothing/species/vox/back.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index e80f27e803d..3bc633bfd46 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 0f2c771b519..7525a7f857d 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 245cbed48c7..11854a4f4b9 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index dd21772f410..4108e34a28d 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 9e985c49b55..d2adeb5ebc6 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index f054d8f4655..c5d37bb12aa 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ