diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 711b40784e4..e7fe40070be 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -2187,6 +2187,7 @@ products = list(/obj/item/clothing/under/rank/cargotech = 6, /obj/item/clothing/under/rank/cargotech/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/cargo = 3, + /obj/item/clothing/suit/jacket/cargobomber = 3, /obj/item/clothing/suit/storage/hazardvest = 3, /obj/item/clothing/head/soft = 3, /obj/item/clothing/head/hardhat/orange = 2, diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index d87d5a323e4..4edc0169a42 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -71,7 +71,7 @@ /datum/gear/suit/coat/job/miner display_name = "Winter coat, mining" path = /obj/item/clothing/suit/hooded/wintercoat/miner - allowed_roles = list("Shaft Miner") + allowed_roles = list("Quartermaster", "Shaft Miner") //LABCOATS /datum/gear/suit/labcoat_emt @@ -100,6 +100,16 @@ display_name = "Bomber jacket" path = /obj/item/clothing/suit/jacket +/datum/gear/suit/cargo_bomber_jacket + display_name = "Cargo bomber jacket" + path = /obj/item/clothing/suit/jacket/cargobomber + allowed_roles = list("Quartermaster", "Cargo Technician") + +/datum/gear/suit/mining_bomber_jacket + display_name = "Mining bomber jacket" + path = /obj/item/clothing/suit/jacket/miningbomber + allowed_roles = list("Quartermaster", "Shaft Miner") + /datum/gear/suit/ol_miljacket display_name = "Military jacket, olive" path = /obj/item/clothing/suit/jacket/miljacket diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index dd31f2b67dc..024044548ab 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -476,6 +476,7 @@ name = "cargo winter coat" icon_state = "wintercoat_cargo" item_state = "coatcargo" + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/rcs, /obj/item/clipboard) hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo /obj/item/clothing/head/hooded/winterhood/cargo @@ -486,7 +487,7 @@ icon_state = "wintercoat_miner" w_class = WEIGHT_CLASS_NORMAL item_state = "coatminer" - allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) + allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/t_scanner/adv_mining_scanner, /obj/item/storage/bag/ore, /obj/item/gun/energy/kinetic_accelerator) armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) hoodtype = /obj/item/clothing/head/hooded/winterhood/miner @@ -830,6 +831,33 @@ actions_types = list(/datum/action/item_action/zipper) adjust_flavour = "unzip" +/obj/item/clothing/suit/jacket/cargobomber + name = "cargo bomber jacket" + desc = "A stylish jacket to keep you warm in the warehouse." + icon_state = "bombercargo" + item_state = "bombercargo" + ignore_suitadjust = 0 + allowed = list(/obj/item/rcs, /obj/item/clipboard, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/lighter, /obj/item/storage/fancy/cigarettes) + 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/miningbomber + name = "mining bomber jacket" + desc = "A slightly armoured and stylish jacket for shaft miners." + icon_state = "bombermining" + item_state = "bombermining" + ignore_suitadjust = 0 + allowed = list(/obj/item/pickaxe, /obj/item/t_scanner/adv_mining_scanner, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/shovel, /obj/item/storage/bag/ore) + armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) + 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/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 3b0f195d5d8..a56a3b96c60 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -38,6 +38,10 @@ new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/gloves/color/black(src) + new /obj/item/clothing/suit/jacket/miningbomber(src) + new /obj/item/clothing/suit/jacket/miningbomber(src) + new /obj/item/clothing/suit/hooded/wintercoat/miner(src) + new /obj/item/clothing/suit/hooded/wintercoat/miner(src) /obj/structure/closet/secure_closet/miner name = "miner's equipment" diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 5ad6e19e306..b3f32472734 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 7525a7f857d..9954d15014d 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index d2adeb5ebc6..8daf5ba3b97 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ