diff --git a/code/game/machinery/vending/wardrobe.dm b/code/game/machinery/vending/wardrobe.dm index d315e9402cb..5d9e8587f1c 100644 --- a/code/game/machinery/vending/wardrobe.dm +++ b/code/game/machinery/vending/wardrobe.dm @@ -65,17 +65,9 @@ /obj/item/clothing/pants/highvis_orange = 5, /obj/item/clothing/pants/highvis_red = 5, /obj/item/clothing/shoes/sneakers/orange = 6, + /obj/item/clothing/shoes/workboots = 4, /obj/item/clothing/shoes/workboots/dark = 6, - /obj/item/clothing/shoes/workboots/toeless = 4, - /obj/item/storage/backpack/industrial = 6, - /obj/item/storage/backpack/heph = 4, - /obj/item/storage/backpack/zavod = 4, - /obj/item/storage/backpack/duffel/eng = 6, - /obj/item/storage/backpack/duffel/heph = 4, - /obj/item/storage/backpack/duffel/zavod = 4, - /obj/item/storage/backpack/cloak/engi = 3, - /obj/item/storage/backpack/cloak/heph = 2, - /obj/item/storage/backpack/cloak/zavod = 2 + /obj/item/clothing/shoes/workboots/toeless = 4 ) premium = list( /obj/item/toy/figure/engineer = 6, @@ -131,6 +123,7 @@ /obj/item/clothing/head/hardhat/orange = 2, /obj/item/clothing/head/hardhat/green = 2, /obj/item/clothing/head/hardhat/red = 2, + /obj/item/clothing/head/hardhat/atmos = 4, /obj/item/clothing/head/sidecap/zavod = 3, /obj/item/clothing/head/sidecap/zavod/alt = 3, /obj/item/clothing/head/softcap/atmos = 2, @@ -141,17 +134,9 @@ /obj/item/clothing/head/wool/zavod/alt = 2, /obj/item/clothing/accessory/storage/overalls/engineer = 3, /obj/item/clothing/shoes/sneakers/orange = 4, + /obj/item/clothing/shoes/workboots = 4, /obj/item/clothing/shoes/workboots/dark = 4, - /obj/item/clothing/shoes/workboots/toeless = 2, - /obj/item/storage/backpack/industrial = 6, - /obj/item/storage/backpack/heph = 4, - /obj/item/storage/backpack/zavod = 4, - /obj/item/storage/backpack/duffel/eng = 6, - /obj/item/storage/backpack/duffel/heph = 4, - /obj/item/storage/backpack/duffel/zavod = 4, - /obj/item/storage/backpack/cloak/engi = 3, - /obj/item/storage/backpack/cloak/heph = 2, - /obj/item/storage/backpack/cloak/zavod = 2 + /obj/item/clothing/shoes/workboots/toeless = 2 ) premium = list( /obj/item/toy/figure/atmos = 3, @@ -231,7 +216,6 @@ /obj/item/clothing/suit/storage/toggle/longcoat/pmc = 4, /obj/item/clothing/suit/storage/toggle/longcoat/zavodskoi = 4, /obj/item/clothing/suit/storage/toggle/sec_dep_jacket = 8, - /obj/item/clothing/accessory/holster/waist = 8, /obj/item/clothing/gloves/black_leather = 8, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/head/bandana/security = 8, @@ -264,18 +248,7 @@ /obj/item/clothing/head/wool/zavod/alt = 4, /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/jackboots = 8, - /obj/item/clothing/shoes/jackboots/toeless = 6, - /obj/item/storage/backpack/security = 6, - /obj/item/storage/backpack/idris = 4, - /obj/item/storage/backpack/pmcg = 4, - /obj/item/storage/backpack/zavod = 4, - /obj/item/storage/backpack/duffel/sec = 6, - /obj/item/storage/backpack/duffel/idris = 4, - /obj/item/storage/backpack/duffel/pmcg = 4, - /obj/item/storage/backpack/duffel/zavod = 4, - /obj/item/storage/backpack/cloak/phalanx = 2, - /obj/item/storage/backpack/cloak/sec = 2, - /obj/item/storage/backpack/cloak/zavod = 2 + /obj/item/clothing/shoes/jackboots/toeless = 6 ) premium = list( /obj/item/toy/figure/secofficer = 6, @@ -338,14 +311,7 @@ /obj/item/clothing/head/top_hat = 3, /obj/item/clothing/shoes/laceup = 3, /obj/item/clothing/shoes/laceup/grey = 3, - /obj/item/clothing/shoes/sneakers/black = 3, - /obj/item/storage/backpack/idris = 2, - /obj/item/storage/backpack/nt = 2, - /obj/item/storage/backpack/orion = 2, - /obj/item/storage/backpack/duffel/idris = 2, - /obj/item/storage/backpack/duffel/nt = 2, - /obj/item/storage/backpack/duffel/orion = 2, - /obj/item/storage/backpack/cloak/orion = 2 + /obj/item/clothing/shoes/sneakers/black = 3 ) premium = list( /obj/item/toy/figure/bartender = 3, @@ -396,15 +362,7 @@ /obj/item/clothing/head/wool/nt = 3, /obj/item/clothing/head/wool/orion = 3, /obj/item/clothing/head/wool/orion/alt = 3, - /obj/item/storage/box/gloves = 3, - /obj/item/storage/backpack/idris = 2, - /obj/item/storage/backpack/nt = 2, - /obj/item/storage/backpack/orion = 2, - /obj/item/storage/backpack/duffel/idris = 2, - /obj/item/storage/backpack/duffel/nt = 2, - /obj/item/storage/backpack/duffel/orion = 2, - /obj/item/storage/backpack/cloak/nt = 2, - /obj/item/storage/backpack/cloak/orion = 2 + /obj/item/storage/box/gloves = 3 ) premium = list( /obj/item/toy/figure/chef = 3 @@ -425,7 +383,6 @@ /obj/item/clothing/under/rank/janitor/idris = 3, /obj/item/clothing/under/rank/janitor/idris/alt = 3, /obj/item/clothing/under/rank/janitor/orion = 3, - /obj/item/clothing/suit/caution = 6, /obj/item/clothing/suit/storage/hazardvest = 5, /obj/item/clothing/suit/storage/hazardvest/purple = 4, /obj/item/clothing/suit/storage/hooded/wintercoat/idris = 2, @@ -440,9 +397,6 @@ /obj/item/clothing/suit/storage/toggle/highvis_alt = 5, /obj/item/clothing/suit/storage/toggle/highvis_orange = 5, /obj/item/clothing/suit/storage/toggle/highvis_red = 5, - /obj/item/storage/belt/custodial = 3, - /obj/item/clothing/accessory/holster/utility/custodial/armpit = 2, - /obj/item/clothing/accessory/holster/utility/custodial/hip = 2, /obj/item/clothing/pants/highvis = 3, /obj/item/clothing/pants/highvis_alt = 3, /obj/item/clothing/pants/highvis_orange = 3, @@ -464,16 +418,7 @@ /obj/item/clothing/gloves/janitor/tajara = 2, /obj/item/clothing/gloves/janitor/unathi = 2, /obj/item/clothing/gloves/janitor/vaurca = 2, - /obj/item/clothing/glasses/safety/goggles = 6, - /obj/item/clothing/shoes/galoshes = 4, - /obj/item/storage/backpack/idris = 2, - /obj/item/storage/backpack/nt = 2, - /obj/item/storage/backpack/orion = 2, - /obj/item/storage/backpack/duffel/idris = 2, - /obj/item/storage/backpack/duffel/nt = 2, - /obj/item/storage/backpack/duffel/orion = 2, - /obj/item/storage/backpack/cloak/nt = 2, - /obj/item/storage/backpack/cloak/orion = 2 + /obj/item/clothing/glasses/safety/goggles = 6 ) premium = list( /obj/item/toy/figure/janitor = 6 @@ -525,17 +470,7 @@ /obj/item/clothing/head/wool/orion = 3, /obj/item/clothing/head/wool/orion/alt = 3, /obj/item/clothing/accessory/apron/blue = 3, - /obj/item/clothing/accessory/overalls/blue = 3, - /obj/item/storage/backpack/hydroponics = 5, - /obj/item/storage/backpack/idris = 2, - /obj/item/storage/backpack/nt = 2, - /obj/item/storage/backpack/orion = 2, - /obj/item/storage/backpack/duffel/hyd = 5, - /obj/item/storage/backpack/duffel/idris = 2, - /obj/item/storage/backpack/duffel/nt = 2, - /obj/item/storage/backpack/duffel/orion = 2, - /obj/item/storage/backpack/cloak/nt = 2, - /obj/item/storage/backpack/cloak/orion = 2 + /obj/item/clothing/accessory/overalls/blue = 3 ) premium = list( /obj/item/toy/figure/gardener = 3 @@ -655,18 +590,7 @@ /obj/item/clothing/accessory/poncho/roles/science = 8, /obj/item/clothing/shoes/sneakers/medsci = 8, /obj/item/clothing/shoes/sneakers/medsci/zavod = 4, - /obj/item/clothing/shoes/sneakers/medsci/zeng = 4, - /obj/item/storage/backpack/toxins = 8, - /obj/item/storage/backpack/nt = 4, - /obj/item/storage/backpack/zavod = 4, - /obj/item/storage/backpack/zeng = 4, - /obj/item/storage/backpack/duffel/tox = 8, - /obj/item/storage/backpack/duffel/nt = 4, - /obj/item/storage/backpack/duffel/zavod = 4, - /obj/item/storage/backpack/duffel/zeng = 4, - /obj/item/storage/backpack/cloak/sci = 4, - /obj/item/storage/backpack/cloak/nt = 2, - /obj/item/storage/backpack/cloak/zavod = 2 + /obj/item/clothing/shoes/sneakers/medsci/zeng = 4 ) contraband = list( /obj/item/clothing/under/rank/scientist/einstein = 4 @@ -748,28 +672,13 @@ /obj/item/clothing/head/wool/zeng/alt = 2, /obj/item/clothing/head/hardhat/paramedic = 4, /obj/item/clothing/mask/surgical = 8, - /obj/item/clothing/accessory/stethoscope = 8, /obj/item/clothing/accessory/poncho/roles/medical = 6, /obj/item/clothing/shoes/sneakers/black = 6, /obj/item/clothing/shoes/sneakers/medsci = 6, /obj/item/clothing/shoes/sneakers/medsci/pmc = 4, /obj/item/clothing/shoes/sneakers/medsci/zeng = 4, /obj/item/clothing/shoes/jackboots = 4, - /obj/item/storage/backpack/medic = 8, - /obj/item/storage/backpack/emt = 4, - /obj/item/storage/backpack/psychiatrist = 2, - /obj/item/storage/backpack/nt = 4, - /obj/item/storage/backpack/pmcg = 4, - /obj/item/storage/backpack/zeng = 4, - /obj/item/storage/backpack/duffel/med = 8, - /obj/item/storage/backpack/duffel/emt = 4, - /obj/item/storage/backpack/duffel/psych = 2, - /obj/item/storage/backpack/duffel/nt = 4, - /obj/item/storage/backpack/duffel/pmcg = 4, - /obj/item/storage/backpack/duffel/zeng = 4, - /obj/item/storage/backpack/cloak/medical = 4, - /obj/item/storage/backpack/cloak/nt = 2, - /obj/item/storage/backpack/cloak/phalanx = 2 + /obj/item/clothing/shoes/jackboots/toeless = 2 ) premium = list( /obj/item/toy/figure/md = 6, @@ -817,25 +726,11 @@ /obj/item/clothing/head/wool/pmc/alt = 4, /obj/item/clothing/head/wool/zeng = 2, /obj/item/clothing/head/wool/zeng/alt = 2, - /obj/item/storage/belt/fannypack = 3, /obj/item/clothing/accessory/poncho/roles/medical = 3, /obj/item/clothing/shoes/sneakers/black = 4, /obj/item/clothing/shoes/sneakers/medsci = 4, /obj/item/clothing/shoes/sneakers/medsci/pmc = 2, - /obj/item/clothing/shoes/sneakers/medsci/zeng = 2, - /obj/item/storage/backpack/medic = 4, - /obj/item/storage/backpack/pharmacy = 3, - /obj/item/storage/backpack/nt = 3, - /obj/item/storage/backpack/pmcg = 3, - /obj/item/storage/backpack/zeng = 3, - /obj/item/storage/backpack/duffel/med = 4, - /obj/item/storage/backpack/duffel/pharm = 3, - /obj/item/storage/backpack/duffel/nt = 3, - /obj/item/storage/backpack/duffel/pmcg = 3, - /obj/item/storage/backpack/duffel/zeng = 3, - /obj/item/storage/backpack/cloak/medical = 4, - /obj/item/storage/backpack/cloak/nt = 2, - /obj/item/storage/backpack/cloak/phalanx = 2 + /obj/item/clothing/shoes/sneakers/medsci/zeng = 2 ) premium = list( /obj/item/toy/figure/chemist = 3 @@ -883,19 +778,10 @@ /obj/item/clothing/accessory/storage/overalls/mining = 4, /obj/item/clothing/glasses/safety/goggles = 3, /obj/item/clothing/gloves/black = 3, - /obj/item/clothing/gloves/yellow = 3, - /obj/item/clothing/gloves/yellow/specialu = 3, - /obj/item/clothing/gloves/yellow/specialt = 3, /obj/item/clothing/shoes/sneakers/black = 8, + /obj/item/clothing/shoes/workboots = 4, /obj/item/clothing/shoes/workboots/dark = 8, - /obj/item/clothing/shoes/workboots/toeless = 4, - /obj/item/storage/backpack/heph = 4, - /obj/item/storage/backpack/orion = 4, - /obj/item/storage/backpack/duffel/heph = 4, - /obj/item/storage/backpack/duffel/orion = 4, - /obj/item/storage/backpack/cloak/heph = 2, - /obj/item/storage/backpack/cloak/orion = 2, - /obj/item/device/flashlight/marshallingwand = 3 + /obj/item/clothing/shoes/workboots/toeless = 4 ) premium = list( /obj/item/toy/figure/cargotech = 3, @@ -943,19 +829,10 @@ /obj/item/clothing/accessory/poncho/roles/cargo = 4, /obj/item/clothing/glasses/safety/goggles = 3, /obj/item/clothing/gloves/black = 3, - /obj/item/clothing/gloves/yellow = 3, - /obj/item/clothing/gloves/yellow/specialu = 3, - /obj/item/clothing/gloves/yellow/specialt = 3, /obj/item/clothing/shoes/sneakers/black = 3, + /obj/item/clothing/shoes/workboots = 4, /obj/item/clothing/shoes/workboots/dark = 4, - /obj/item/clothing/shoes/workboots/toeless = 2, - /obj/item/storage/backpack/heph = 4, - /obj/item/storage/backpack/orion = 4, - /obj/item/storage/backpack/duffel/heph = 4, - /obj/item/storage/backpack/duffel/orion = 4, - /obj/item/storage/backpack/cloak/cargo = 3, - /obj/item/storage/backpack/cloak/heph = 2, - /obj/item/storage/backpack/cloak/orion = 2 + /obj/item/clothing/shoes/workboots/toeless = 2 ) premium = list( /obj/item/toy/figure/roboticist = 3, 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 0c62f0cb7ac..2bf971fa361 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -62,21 +62,26 @@ icon_state = "eng_secure" /obj/structure/closet/secure_closet/engineering_personal/fill() + new /obj/item/storage/backpack/industrial(src) new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/accessory/storage/brown_vest(src) + new /obj/item/clothing/accessory/storage/pouches/brown(src) new /obj/item/storage/toolbox/mechanical(src) new /obj/item/device/radio/headset/headset_eng(src) new /obj/item/device/radio/headset/headset_eng/alt(src) - new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/taperoll/engineering(src) new /obj/item/device/radio/eng/off(src) new /obj/item/storage/belt/utility(src) + new /obj/item/storage/belt/utility/alt(src) new /obj/item/device/gps/engineering(src) new /obj/item/pipewrench(src) new /obj/item/device/flashlight/heavy(src) new /obj/item/grenade/chem_grenade/antifuel(src) + new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/yellow/specialu(src) + new /obj/item/clothing/gloves/yellow/specialt(src) // Painters new /obj/item/device/paint_sprayer(src) @@ -89,14 +94,14 @@ icon_state = "atmos" /obj/structure/closet/secure_closet/atmos_personal/fill() + new /obj/item/storage/backpack/industrial(src) new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/accessory/storage/brown_vest(src) + new /obj/item/clothing/accessory/storage/pouches/brown(src) new /obj/item/clothing/suit/fire/atmos(src) - new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/extinguisher(src) new /obj/item/device/radio/headset/headset_eng(src) new /obj/item/device/radio/headset/headset_eng/alt(src) - new /obj/item/clothing/suit/storage/hazardvest/blue/atmos(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/taperoll/engineering(src) @@ -104,6 +109,7 @@ new /obj/item/rfd/piping(src) new /obj/item/device/radio/eng/off(src) new /obj/item/storage/belt/utility(src) + new /obj/item/storage/belt/utility/alt(src) new /obj/item/device/gps/engineering(src) new /obj/item/pipewrench(src) new /obj/item/crowbar/rescue_axe(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm index 4858947953f..ad903fb05de 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm @@ -40,6 +40,8 @@ /obj/structure/closet/secure_closet/hangar_tech/fill() ..() + new /obj/item/storage/backpack/industrial(src) + new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/under/rank/hangar_technician(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/device/radio/headset/headset_cargo/alt(src) @@ -48,6 +50,7 @@ new /obj/item/device/price_scanner(src) new /obj/item/device/cratescanner(src) new /obj/item/clipboard(src) + new /obj/item/storage/belt/utility(src) new /obj/item/device/flashlight/marshallingwand(src) // Machinist @@ -67,6 +70,9 @@ new /obj/item/device/multitool(src) new /obj/item/ipc_tag_scanner(src) new /obj/item/device/robotanalyzer(src) + new /obj/item/storage/belt/utility(src) + new /obj/item/storage/belt/utility/alt(src) + new /obj/item/storage/toolbox/mechanical(src) // Miner /obj/structure/closet/secure_closet/miner @@ -80,6 +86,7 @@ new /obj/item/storage/backpack/industrial(src) else new /obj/item/storage/backpack/satchel/eng(src) + new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) new /obj/item/device/analyzer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 176d5cf58ef..3851d357d70 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -242,6 +242,7 @@ new /obj/item/device/flashlight/flare/glowstick/red(src) //Belts new /obj/item/clothing/accessory/storage/black_vest(src) + new /obj/item/clothing/accessory/storage/pouches/black(src) new /obj/item/storage/belt/security(src) /obj/structure/closet/secure_closet/security @@ -275,8 +276,12 @@ new /obj/item/device/breath_analyzer(src) //Belts new /obj/item/clothing/accessory/storage/black_vest(src) + new /obj/item/clothing/accessory/storage/pouches/black(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/modular(src) + new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/clothing/accessory/holster/thigh(src) + new /obj/item/clothing/accessory/holster/armpit(src) new /obj/item/storage/belt/security/full(src) new /obj/item/storage/belt/security/vestbelt(src) new /obj/item/clothing/suit/storage/hazardvest/security/officer(src) @@ -303,9 +308,14 @@ new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) //Belts - new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/clothing/accessory/storage/black_vest(src) new /obj/item/clothing/accessory/storage/pouches/black(src) + new /obj/item/clothing/accessory/holster/waist(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/clothing/accessory/holster/thigh(src) + new /obj/item/clothing/accessory/holster/armpit(src) new /obj/item/storage/belt/security/full/investigator(src) + new /obj/item/storage/belt/security/vestbelt(src) /obj/structure/closet/secure_closet/injection name = "lethal injections locker" diff --git a/html/changelogs/DrobeChanges.yml b/html/changelogs/DrobeChanges.yml new file mode 100644 index 00000000000..19b5c0d3a31 --- /dev/null +++ b/html/changelogs/DrobeChanges.yml @@ -0,0 +1,8 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscdel: "Drobes no longer contains mechanically relevant items, such as insulated gloves or bags." + - rscadd: "Bags, holsters and webbings were added to relevant department lockers, such as security and engineering lockers. This includes alt versions of them where relevant." + - rscadd: "Engineering lockers now start with insulated gloves in them."