cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into kk-rings

Browse Source
This commit is contained in:
Killian
2024-11-08 10:50:04 +00:00
parent 7c0942e8b0 caa6f83e14
commit e6eb45f910
45 changed files with 651 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+9 -3
View File
@@ -23,7 +23,9 @@
starts_with = list(
/obj/item/clothing/head/that = 2,
/obj/item/radio/headset/headset_service = 2,
/obj/item/radio/headset/service = 2,
/obj/item/radio/headset/alt/service = 2,
/obj/item/radio/headset/earbud/service = 2,
/obj/item/clothing/head/pin/flower,
/obj/item/clothing/head/pin/flower/pink,
/obj/item/clothing/head/pin/flower/yellow,
@@ -51,7 +53,9 @@
starts_with = list(
/obj/item/clothing/under/sundress,
/obj/item/clothing/under/waiter = 2,
/obj/item/radio/headset/headset_service = 2,
/obj/item/radio/headset/service = 2,
/obj/item/radio/headset/alt/service = 2,
/obj/item/radio/headset/earbud/service = 2,
/obj/item/storage/box/mousetraps = 2,
/obj/item/clothing/under/rank/chef,
/obj/item/clothing/head/chefhat,
@@ -69,7 +73,9 @@
starts_with = list(
/obj/item/clothing/under/rank/janitor,
/obj/item/clothing/under/dress/maid/janitor,
/obj/item/radio/headset/headset_service,
/obj/item/radio/headset/service,
/obj/item/radio/headset/alt/service,
/obj/item/radio/headset/earbud/service,
/obj/item/cartridge/janitor,
/obj/item/clothing/suit/storage/hooded/wintercoat/janitor,
/obj/item/clothing/gloves/black,
code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+4 -4
View File
@@ -63,7 +63,7 @@
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/radio/headset/explorer,
/obj/item/radio/headset/explorer/alt,
/obj/item/radio/headset/alt/explorer,
/obj/item/cartridge/explorer,
/obj/item/flashlight,
/obj/item/gps/explorer,
@@ -104,7 +104,7 @@
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/radio/headset/pathfinder,
/obj/item/radio/headset/pathfinder/alt,
/obj/item/radio/headset/alt/pathfinder,
/obj/item/cartridge/explorer,
/obj/item/flashlight,
/obj/item/gps/explorer,
@@ -153,7 +153,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/radio/headset/sar,
/obj/item/radio/headset/sar/alt,
/obj/item/radio/headset/alt/sar,
/obj/item/cartridge/sar,
/obj/item/flashlight,
/obj/item/tank/emergency/oxygen/engi,
@@ -201,7 +201,7 @@
/obj/item/clothing/shoes/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/radio/headset/pilot,
/obj/item/radio/headset/pilot/alt,
/obj/item/radio/headset/alt/pilot,
/obj/item/flashlight,
/obj/item/reagent_containers/food/snacks/liquidfood,
/obj/item/reagent_containers/food/snacks/liquidprotein,
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+7 -5
View File
@@ -11,8 +11,9 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
/obj/item/clothing/shoes/boots/winter/supply,
/obj/item/clothing/shoes/black,
/obj/item/radio/headset/headset_cargo,
/obj/item/radio/headset/headset_cargo/alt,
/obj/item/radio/headset/cargo,
/obj/item/radio/headset/alt/cargo,
/obj/item/radio/headset/earbud/cargo,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/head/soft)
@@ -37,8 +38,9 @@
/obj/item/clothing/under/rank/cargo/jeans,
/obj/item/clothing/under/rank/cargo/jeans/female,
/obj/item/clothing/shoes/brown,
/obj/item/radio/headset/headset_qm, //VOREStation Edit,
/obj/item/radio/headset/headset_qm/alt, //VOREStation Edit,
/obj/item/radio/headset/qm,
/obj/item/radio/headset/alt/qm,
/obj/item/radio/headset/earbud/qm,
/obj/item/clothing/under/rank/neo_qm,
/obj/item/clothing/under/rank/neo_qm_skirt,
/obj/item/clothing/under/rank/neo_qm_jacket,
@@ -73,7 +75,7 @@
closet_appearance = /decl/closet_appearance/secure_closet/mining
starts_with = list(
/obj/item/radio/headset/headset_mine,
/obj/item/radio/headset/miner,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/black,
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+6 -3
View File
@@ -20,7 +20,8 @@
/obj/item/clothing/shoes/brown,
/obj/item/cartridge/ce,
/obj/item/radio/headset/heads/ce,
/obj/item/radio/headset/heads/ce/alt,
/obj/item/radio/headset/alt/heads/ce,
/obj/item/radio/headset/earbud/heads/ce,
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/suit/storage/hazardvest,
///obj/item/clothing/mask/gas, //VOREStation Removal: Locker bloat, grr. The fancy one below functions as a mask & helmet combined.
@@ -92,7 +93,8 @@
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/storage/toolbox/mechanical,
/obj/item/radio/headset/headset_eng,
/obj/item/radio/headset/headset_eng/alt,
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/meson,
@@ -129,7 +131,8 @@
/obj/item/extinguisher/atmo,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/radio/headset/headset_eng,
/obj/item/radio/headset/headset_eng/alt,
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest/atmos, //VOREStation edit. Eng locker gets regular haz-vest, atmos gets the themed one of their own
/obj/item/clothing/mask/gas,
/obj/item/cartridge/atmos,
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+3 -1
View File
@@ -8,7 +8,9 @@
/obj/item/clothing/under/rank/hydroponics,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/analyzer/plant_analyzer,
/obj/item/radio/headset/headset_service,
/obj/item/radio/headset/service,
/obj/item/radio/headset/alt/service,
/obj/item/radio/headset/earbud/service,
/obj/item/clothing/head/greenbandana,
/obj/item/shovel/spade,
/obj/item/material/minihoe,
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+7 -3
View File
@@ -39,7 +39,8 @@
/obj/item/clothing/shoes/white,
/obj/item/cartridge/medical,
/obj/item/radio/headset/headset_med,
/obj/item/radio/headset/headset_med/alt,
/obj/item/radio/headset/alt/headset_med,
/obj/item/radio/headset/earbud/headset_med,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt,
/obj/item/clothing/shoes/boots/winter/medical,
@@ -108,7 +109,9 @@
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/radio/headset/headset_med/alt,
/obj/item/radio/headset/headset_med,
/obj/item/radio/headset/alt/headset_med,
/obj/item/radio/headset/earbud/headset_med,
/obj/item/cartridge/medical,
/obj/item/storage/briefcase/inflatable,
/obj/item/flashlight,
@@ -143,7 +146,8 @@
/obj/item/clothing/under/rank/neo_cmo_turtle_skirt,
/obj/item/clothing/under/rank/neo_cmo_gorka,
/obj/item/radio/headset/heads/cmo,
/obj/item/radio/headset/heads/cmo/alt,
/obj/item/radio/headset/alt/heads/cmo,
/obj/item/radio/headset/earbud/heads/cmo,
/obj/item/flash,
/obj/item/reagent_containers/hypospray/vial,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+2 -1
View File
@@ -45,7 +45,8 @@
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/radio/headset/heads/rd,
/obj/item/radio/headset/heads/rd/alt,
/obj/item/radio/headset/alt/heads/rd,
/obj/item/radio/headset/earbud/heads/rd,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/flash,
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+12 -6
View File
@@ -10,7 +10,8 @@
/obj/item/cartridge/captain,
/obj/item/storage/lockbox/medal,
/obj/item/radio/headset/heads/captain,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/radio/headset/alt/heads/captain,
/obj/item/radio/headset/earbud/heads/captain,
/obj/item/gun/energy/gun,
/obj/item/melee/telebaton,
/obj/item/flash,
@@ -27,7 +28,8 @@
/obj/item/clothing/head/helmet,
/obj/item/cartridge/hop,
/obj/item/radio/headset/heads/hop,
/obj/item/radio/headset/heads/hop/alt,
/obj/item/radio/headset/alt/heads/hop,
/obj/item/radio/headset/earbud/heads/hop,
/obj/item/storage/box/ids = 2,
/obj/item/gun/energy/gun/compact,
/obj/item/storage/box/commandkeys,
@@ -90,7 +92,8 @@
/obj/item/clothing/head/helmet/dermal,
/obj/item/cartridge/hos,
/obj/item/radio/headset/heads/hos,
/obj/item/radio/headset/heads/hos/alt,
/obj/item/radio/headset/alt/heads/hos,
/obj/item/radio/headset/earbud/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/shield/riot,
@@ -151,7 +154,8 @@
/obj/item/clothing/under/rank/neo_sec_gorka,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
@@ -189,7 +193,8 @@
/obj/item/clothing/head/helmet,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
@@ -257,7 +262,8 @@
/obj/item/storage/belt/detective,
/obj/item/storage/box/evidence,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/clothing/suit/storage/vest/detective,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/holster/armpit,
code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
+10 -5
View File
@@ -31,7 +31,8 @@
/obj/item/clothing/head/helmet/HoS/hat/blue,
/obj/item/clothing/head/helmet/dermal,
/obj/item/radio/headset/heads/hos,
/obj/item/radio/headset/heads/hos/alt,
/obj/item/radio/headset/alt/heads/hos,
/obj/item/radio/headset/earbud/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/storage/belt/security,
/obj/item/clothing/accessory/holster/waist,
@@ -76,7 +77,8 @@
/obj/item/clothing/head/helmet,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
@@ -122,7 +124,8 @@
/obj/item/clothing/head/helmet/dermal,
/obj/item/cartridge/hos,
/obj/item/radio/headset/heads/hos,
/obj/item/radio/headset/heads/hos/alt,
/obj/item/radio/headset/alt/heads/hos,
/obj/item/radio/headset/earbud/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/shield/riot,
@@ -169,7 +172,8 @@
/obj/item/clothing/head/helmet/warden,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
@@ -204,7 +208,8 @@
/obj/item/cartridge/captain,
/obj/item/storage/lockbox/medal,
/obj/item/radio/headset/heads/captain,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/radio/headset/alt/heads/captain,
/obj/item/radio/headset/earbud/heads/captain,
/obj/item/gunbox/captain,
/obj/item/melee/telebaton,
/obj/item/flash,
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+1 -1
View File
@@ -410,7 +410,7 @@
/obj/item/clothing/under/rank/centcom,
/obj/item/clothing/under/ert,
/obj/item/clothing/under/syndicate/combat,
/obj/item/radio/headset/ert/alt,
/obj/item/radio/headset/alt/ert,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/boots/swat,
/obj/item/clothing/gloves/swat,
code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm
+6 -3
View File
@@ -3,13 +3,14 @@
closet_appearance = /decl/closet_appearance/tactical/alt //because ert lockers are red for some dumb reason
starts_with = list(
/obj/item/clothing/under/ert,
/obj/item/radio/headset/ert/alt,
/obj/item/radio/headset/ert,
/obj/item/radio/headset/alt/ert,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/boots/swat,
/obj/item/clothing/gloves/swat,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/mask/balaclava)
//would you believe mercs have no official locker? well, now they do. basically just a rebranded ERT locker but hey, it's an option. -Killian
/obj/structure/closet/wardrobe/merc
name = "mercenary equipment"
@@ -18,7 +19,9 @@
starts_with = list(
/obj/item/clothing/under/tactical,
/obj/item/clothing/under/syndicate/combat,
/obj/item/radio/headset/syndicate/alt,
/obj/item/radio/headset/syndicate,
/obj/item/radio/headset/alt/syndicate,
/obj/item/radio/headset/earbud/syndicate,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/boots/combat,
/obj/item/clothing/gloves/combat,