cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stuffs a bunch of clothing from lockers into the department drobes (#21348)

Browse Source 
Now almost all non-command clothes should be found in the department
drobes, instead of the various lockers. I might have missed something
somewhere though.
Drobes can also be restocked by the vended items.
Lastly, the chaplain drobe had a couple of taj religious clothing added
to it after confirming with Catsin that it should be.
This commit is contained in:
Casper3667
2025-09-15 12:01:27 +00:00
committed by GitHub
parent d7ef4cba68
commit 98f34dc69d
8 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending/wardrobe.dm
+29 -4
View File
@@ -5,6 +5,7 @@
/obj/machinery/vending/wardrobe
name = "Drobe - PARENT DO NOT USE"
random_itemcount = FALSE
restock_items = TRUE
/obj/machinery/vending/wardrobe/engi_wardrobe
name = "\improper EngiDrobe"
@@ -58,6 +59,7 @@
/obj/item/clothing/head/wool/heph = 4,
/obj/item/clothing/head/wool/zavod = 2,
/obj/item/clothing/head/wool/zavod/alt = 2,
/obj/item/clothing/accessory/storage/overalls/engineer = 4,
/obj/item/clothing/pants/highvis = 5,
/obj/item/clothing/pants/highvis_alt = 5,
/obj/item/clothing/pants/highvis_orange = 5,
@@ -137,6 +139,7 @@
/obj/item/clothing/head/wool/heph = 4,
/obj/item/clothing/head/wool/zavod = 2,
/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/dark = 4,
/obj/item/clothing/shoes/workboots/toeless = 2,
@@ -259,6 +262,7 @@
/obj/item/clothing/head/wool/pmc = 4,
/obj/item/clothing/head/wool/zavod = 4,
/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,
@@ -485,6 +489,9 @@
product_ads = "Do you love soil? Then buy our clothes!;Get outfits to match your green thumb here!;Soil resistant! Or absorbant! Who cares!;Guaranteed-ish to make plants grow faster if you wear it!;Can you hear them speaking too?"
vend_reply = "Thank you for using HyDrobe!"
products = list(
/obj/item/clothing/under/rank/hydroponics = 4,
/obj/item/clothing/under/rank/hydroponics/idris = 2,
/obj/item/clothing/under/rank/hydroponics/orion = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro = 4,
/obj/item/clothing/suit/storage/hooded/wintercoat/idris = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat/idris/alt = 2,
@@ -517,6 +524,8 @@
/obj/item/clothing/head/wool/nt = 3,
/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,
@@ -549,6 +558,10 @@
/obj/item/clothing/under/unathi/skakh/healer = 2,
/obj/item/clothing/under/unathi/skakh/warrior = 2,
/obj/item/clothing/suit/nun = 3,
/obj/item/clothing/suit/storage/hooded/tajaran/priest = 2,
/obj/item/clothing/suit/storage/tajaran/messa = 3,
/obj/item/clothing/suit/storage/tajaran/matake = 2,
/obj/item/clothing/suit/storage/tajaran/azubarre = 2,
/obj/item/clothing/head/chaplain_hood = 3,
/obj/item/clothing/head/nun_hood = 3,
/obj/item/clothing/head/hijab = 3,
@@ -558,6 +571,7 @@
/obj/item/clothing/mask/trinary_mask = 3,
/obj/item/clothing/mask/gas/unathi = 3,
/obj/item/clothing/mask/tajara = 3,
/obj/item/clothing/accessory/apron/dharmela = 2,
/obj/item/clothing/shoes/sneakers/black = 3,
/obj/item/storage/box/fancy/candle_box = 3,
/obj/item/storage/box/fancy/candle_box = 3,
@@ -571,7 +585,8 @@
/obj/item/clothing/suit/cultrobes/alt = 2,
/obj/item/clothing/head/culthood/alt = 2,
/obj/item/clothing/shoes/cult = 2,
/obj/item/clothing/head/tajaran/raskara = 2
/obj/item/clothing/head/tajaran/raskara = 2,
/obj/item/clothing/suit/storage/tajaran/raskara = 2
)
premium = list(
/obj/item/toy/figure/chaplain = 3
@@ -675,6 +690,9 @@
/obj/item/clothing/under/rank/medical/pmc/alt = 3,
/obj/item/clothing/under/rank/medical/pmc/nexus = 3,
/obj/item/clothing/under/rank/medical/zeng = 3,
/obj/item/clothing/under/rank/medical/paramedic = 2,
/obj/item/clothing/under/rank/medical/paramedic/zeng = 2,
/obj/item/clothing/under/rank/medical/paramedic/pmc = 2,
/obj/item/clothing/under/rank/medical/paramedic/pmc/alt = 2,
/obj/item/clothing/under/rank/medical/paramedic/pmc/epmc = 2,
/obj/item/clothing/under/rank/medical/paramedic/pmc/nexus = 2,
@@ -736,6 +754,7 @@
/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,
@@ -833,6 +852,9 @@
/obj/item/clothing/under/rank/hangar_technician = 3,
/obj/item/clothing/under/rank/hangar_technician/heph = 3,
/obj/item/clothing/under/rank/hangar_technician/orion = 3,
/obj/item/clothing/under/rank/miner = 4,
/obj/item/clothing/under/rank/miner/heph = 4,
/obj/item/clothing/under/rank/miner/orion = 4,
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo = 4,
/obj/item/clothing/suit/storage/hooded/wintercoat/heph = 4,
/obj/item/clothing/suit/storage/hooded/wintercoat/orion = 4,
@@ -848,6 +870,7 @@
/obj/item/clothing/pants/highvis_orange = 3,
/obj/item/clothing/pants/highvis_red = 3,
/obj/item/clothing/head/bandana/cargo = 3,
/obj/item/clothing/head/bandana/miner = 4,
/obj/item/clothing/head/beret/cargo = 3,
/obj/item/clothing/head/beret/corporate/heph = 3,
/obj/item/clothing/head/beret/corporate/orion = 3,
@@ -855,15 +878,17 @@
/obj/item/clothing/head/softcap/orion = 3,
/obj/item/clothing/head/wool/heph = 4,
/obj/item/clothing/head/wool/orion = 4,
/obj/item/clothing/head/hardhat/orange = 4,
/obj/item/clothing/accessory/poncho/roles/cargo = 4,
/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 = 3,
/obj/item/clothing/shoes/workboots/dark = 4,
/obj/item/clothing/shoes/workboots/toeless = 2,
/obj/item/clothing/shoes/sneakers/black = 8,
/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,
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
-2
View File
@@ -71,7 +71,6 @@
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/clothing/accessory/storage/overalls/engineer(src)
new /obj/item/device/radio/eng/off(src)
new /obj/item/storage/belt/utility(src)
new /obj/item/device/gps/engineering(src)
@@ -101,7 +100,6 @@
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/clothing/accessory/storage/overalls/engineer(src)
new /obj/item/reagent_containers/extinguisher_refill(src)
new /obj/item/rfd/piping(src)
new /obj/item/device/radio/eng/off(src)
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
-7
View File
@@ -5,16 +5,9 @@
/obj/structure/closet/secure_closet/hydroponics/fill()
..()
switch(rand(1,2))
if(1)
new /obj/item/clothing/accessory/apron/blue(src)
if(2)
new /obj/item/clothing/accessory/overalls/blue(src)
new /obj/item/storage/bag/plants(src)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/head/bandana/hydro(src)
new /obj/item/material/minihoe(src)
new /obj/item/material/hatchet(src)
new /obj/item/wirecutters/clippers(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
-7
View File
@@ -110,10 +110,6 @@
new /obj/item/storage/backpack/medic(src)
new /obj/item/clothing/accessory/storage/white_vest(src)
new /obj/item/clothing/suit/storage/medical_chest_rig(src)
new /obj/item/clothing/under/rank/medical/paramedic(src)
new /obj/item/clothing/under/rank/medical/paramedic/zeng(src)
new /obj/item/clothing/under/rank/medical/paramedic/pmc(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/device/flashlight/pen(src)
new /obj/item/clothing/accessory/stethoscope(src)
new /obj/item/storage/belt/medical/paramedic(src)
@@ -127,9 +123,6 @@
new /obj/item/clothing/mask/gas/half(src)
new /obj/item/auto_cpr(src)
new /obj/item/defibrillator/compact/loaded(src)
new /obj/item/clothing/suit/storage/toggle/para_jacket(src)
new /obj/item/clothing/suit/storage/toggle/para_jacket/zeng(src)
new /obj/item/clothing/suit/storage/toggle/para_jacket/pmc(src)
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
code/game/objects/structures/crates_lockers/closets/secure/operations.dm
-9
View File
@@ -62,14 +62,10 @@
..()
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/glasses/welding(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
new /obj/item/clothing/under/rank/machinist/orion(src)
new /obj/item/clothing/under/rank/machinist/heph(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/device/multitool(src)
new /obj/item/ipc_tag_scanner(src)
new /obj/item/device/robotanalyzer(src)
@@ -87,9 +83,7 @@
else
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/clothing/under/rank/miner(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/device/analyzer(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/shovel(src)
@@ -99,9 +93,6 @@
new /obj/item/key/minecarts(src)
new /obj/item/device/gps/mining(src)
new /obj/item/book/manual/ka_custom(src)
new /obj/item/clothing/accessory/storage/overalls/mining(src)
new /obj/item/clothing/head/bandana/miner(src)
new /obj/item/clothing/head/hardhat/orange(src)
new /obj/item/device/radio(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/sleeping_bag/mining(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
-1
View File
@@ -291,7 +291,6 @@
new /obj/item/storage/backpack/satchel/leather/recolorable(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/accessory/badge/investigator(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/mask/gas/half(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
code/game/objects/structures/crates_lockers/closets/secure/service.dm
-4
View File
@@ -6,11 +6,7 @@
req_access = list(ACCESS_JANITOR)
/obj/structure/closet/secure_closet/custodial/fill()
new /obj/item/clothing/head/softcap/nt/custodian(src)
new /obj/item/clothing/head/softcap/idris/custodian(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/clothing/under/rank/janitor/idris(src)
new /obj/item/storage/box/janitorgloves(src)
new /obj/item/storage/belt/custodial(src)
new /obj/item/clothing/accessory/holster/utility/custodial/hip(src)