cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drobe re-arrangement part two (#21416)

Browse Source 
After a discussion a little while ago, it was agreed drobes should not
have storage objects in them aside from jackets, or anything that is
mechanically job related pretty much, just fluff and decorative stuff.
As a result, all bags, holsters, webbings and the janitor's galoshes
were removed from them as they belong in their respective lockers. This
does throw a bundle of things into certain lockers to permit selecting
it, such as the officers having various holsters and engineers having
the alt toolbelt.
Also hangar techs aren't getting their insulated gloves anymore, as that
was apparently a mistake.
Engineering lockers as a result of this do have insulated gloves now, as
it is relevant work equipment. No more raiding the electrical lockers.
This commit is contained in:
Casper3667
2025-10-05 14:26:57 +00:00
committed by GitHub
parent f69c0e94a7
commit 80b638aedc
5 changed files with 52 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+9 -3
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/operations.dm
+7
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+11 -1
View File
@@ -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"