[MODULAR] Makes DS-2 lockers use PopulateContents() (#22401)

* guhh

* minor tweak
This commit is contained in:
Jolly
2023-07-16 12:12:39 -07:00
committed by GitHub
parent 56c82a7ecc
commit b027771eda
10 changed files with 371 additions and 441 deletions
@@ -14,20 +14,6 @@
dir = 8
},
/obj/structure/closet/secure_closet/interdynefob/mod_locker,
/obj/item/mod/module/stealth,
/obj/item/mod/module/projectile_dampener{
pixel_x = 8;
pixel_y = 2
},
/obj/item/mod/module/pepper_shoulders,
/obj/item/mod/module/criminalcapture{
pixel_x = -3;
pixel_y = -5
},
/obj/item/mod/module/visor/night,
/obj/item/screwdriver/nuke{
pixel_y = -2
},
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security/armory)
"ae" = (
@@ -349,31 +335,14 @@
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/skyrat/interdynefob/research)
"bq" = (
/obj/item/storage/belt/security/full,
/obj/item/radio/headset/interdyne,
/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate,
/obj/item/storage/belt/security/webbing/ds,
/obj/item/clothing/head/beret/sec/syndicate,
/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
/obj/effect/turf_decal/siding/dark{
dir = 8
},
/obj/item/clothing/accessory/armband{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "brig officer armband"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker,
/obj/item/clothing/mask/gas/syndicate/ds,
/obj/item/clothing/suit/toggle/jacket/sec/old{
name = "brig officer jacket"
},
/obj/item/clothing/mask/gas/sechailer/syndicate,
/obj/item/gun/energy/disabler,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec,
/obj/item/clothing/glasses/hud/security/sunglasses/redsec,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security)
"bs" = (
@@ -773,20 +742,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/skyrat/interdynefob/service/dorms)
"cW" = (
/obj/item/gun/energy/recharge/kinetic_accelerator,
/obj/item/storage/bag/ore,
/obj/item/mining_scanner,
/obj/structure/closet/secure_closet/interdynefob/mining_locker,
/obj/item/storage/belt/mining/alt,
/obj/item/clothing/under/syndicate/skyrat/overalls{
pixel_y = -2
},
/obj/item/storage/backpack/satchel/explorer,
/obj/item/storage/backpack/explorer,
/obj/item/clothing/accessory/armband/cargo{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "mining officer armband"
},
/turf/open/floor/iron/dark/small,
/area/ruin/space/has_grav/skyrat/interdynefob/cargo)
"cY" = (
@@ -2401,21 +2357,10 @@
/area/ruin/space/has_grav/skyrat/interdynefob/service/diner)
"jW" = (
/obj/structure/closet/secure_closet/interdynefob/robotics,
/obj/item/clothing/suit/hooded/techpriest,
/obj/item/clothing/suit/toggle/labcoat/roboticist{
pixel_y = 3
},
/obj/item/clothing/under/syndicate/skyrat/overalls/skirt,
/obj/item/clothing/under/syndicate/skyrat/overalls{
pixel_y = -2
},
/obj/item/clothing/glasses/hud/ar/aviator/diagnostic,
/obj/item/clothing/glasses/hud/diagnostic,
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 4
},
/obj/effect/turf_decal/siding/dark,
/obj/item/clothing/suit/hooded/wintercoat/science/robotics,
/turf/open/floor/iron/dark/side{
dir = 4
},
@@ -2654,32 +2599,11 @@
/turf/open/floor/iron/dark/textured_large,
/area/ruin/space/has_grav/skyrat/interdynefob/cargo)
"lg" = (
/obj/item/card/id/advanced/chameleon/black,
/obj/item/card/id/advanced/chameleon/black,
/obj/item/card/id/advanced/chameleon/black,
/obj/structure/closet/secure_closet/interdynefob/cl_locker,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
/obj/item/language_manual/codespeak_manual/unlimited,
/obj/item/clothing/under/syndicate/skyrat/baseball,
/obj/item/clothing/under/rank/captain/skyrat/utility/syndicate,
/obj/item/clothing/under/suit/skyrat/helltaker{
has_sensor = 0;
random_sensor = 0
},
/obj/item/clothing/neck/chaplain/black{
desc = "An unique cloak that shimmers with the Corporate Liaison's emblem.";
name = "corporate liaison's cloak"
},
/obj/item/binoculars,
/obj/item/radio/headset/interdyne/command,
/obj/item/clothing/head/hats/hos/beret/syndicate,
/obj/item/clothing/glasses/sunglasses,
/obj/item/encryptionkey/headset_syndicate/interdyne,
/obj/item/encryptionkey/headset_syndicate/interdyne,
/obj/item/encryptionkey/headset_syndicate/interdyne,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/cl)
"li" = (
@@ -4944,22 +4868,10 @@
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/cl)
"vx" = (
/obj/structure/closet/secure_closet/interdynefob/sa_locker,
/obj/item/clothing/head/hats/hos/cap/syndicate,
/obj/item/clothing/head/hats/hos/beret/syndicate,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/under/rank/captain/skyrat/utility/syndicate,
/obj/item/radio/headset/interdyne/command,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate/winter,
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
/obj/item/clothing/glasses/sunglasses,
/obj/item/ammo_box/magazine/m9mm_aps,
/obj/item/clothing/accessory/medal/gold{
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of an Admiral to the Sothran Syndicate, and their undisputable authority over their crew.";
name = "medal of admiralty"
},
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/admiral)
"vA" = (
@@ -5918,43 +5830,7 @@
/turf/open/floor/iron/small,
/area/ruin/space/has_grav/skyrat/interdynefob/bridge)
"AG" = (
/obj/item/ammo_box/c9mm{
pixel_x = -2
},
/obj/item/ammo_box/c9mm{
pixel_x = 3;
pixel_y = -3
},
/obj/item/ammo_box/magazine/m9mm{
pixel_x = 3;
pixel_y = -3
},
/obj/item/ammo_box/magazine/m9mm,
/obj/item/ammo_box/magazine/m9mm{
pixel_x = -3;
pixel_y = 3
},
/obj/item/ammo_box/magazine/m9mm{
pixel_x = -6;
pixel_y = 6
},
/obj/item/ammo_box/advanced/s12gauge{
pixel_x = 9;
pixel_y = -10
},
/obj/item/ammo_box/advanced/s12gauge{
pixel_x = 9;
pixel_y = -5
},
/obj/item/ammo_box/advanced/s12gauge/rubber{
pixel_x = -9;
pixel_y = -10
},
/obj/item/ammo_box/advanced/s12gauge/rubber{
pixel_x = -9;
pixel_y = -5
},
/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker,
/obj/structure/closet/secure_closet/interdynefob/munitions_locker,
/obj/effect/turf_decal/siding/dark{
dir = 8
},
@@ -7004,19 +6880,6 @@
/area/ruin/space/has_grav/skyrat/interdynefob/service/hydroponics)
"FO" = (
/obj/structure/closet/secure_closet/interdynefob/medical,
/obj/item/clothing/gloves/latex/nitrile/ntrauma,
/obj/item/clothing/suit/toggle/labcoat/interdyne,
/obj/item/clothing/suit/toggle/labcoat/interdyne,
/obj/item/storage/belt/medbandolier{
pixel_x = -2;
pixel_y = 2
},
/obj/item/storage/belt/medbandolier{
pixel_x = 2;
pixel_y = -2
},
/obj/item/clothing/glasses/hud/ar/aviator/health,
/obj/item/clothing/glasses/hud/ar/aviator/health,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/skyrat/interdynefob/medbay/chem)
"FP" = (
@@ -7795,25 +7658,6 @@
/area/ruin/space/has_grav/skyrat/interdynefob/cargo)
"JD" = (
/obj/structure/closet/secure_closet/interdynefob/maa_locker,
/obj/item/storage/belt/security/full,
/obj/item/radio/headset/interdyne,
/obj/item/clothing/suit/armor/vest/warden/syndicate,
/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate,
/obj/item/clothing/head/beret/sec/navywarden/syndicate,
/obj/item/clothing/under/suit/skyrat/helltaker{
has_sensor = 0;
random_sensor = 0
},
/obj/item/clothing/suit/armor/hos/trenchcoat{
desc = "A trenchcoat enhanced with a special lightweight kevlar. It has little Syndicate logos sewn onto the shoulder badges with the letters 'MAA' just under it.";
name = "Master at arms' armored trenchcoat"
},
/obj/item/clothing/suit/armor/hos{
desc = "A greatcoat enhanced with a special alloy for some extra protection and style for those with a likely chance to get bullied for being outside of the brig";
name = "Master at arms' armored greatcoat"
},
/obj/item/gun/energy/disabler,
/obj/item/clothing/head/hats/hos/beret/syndicate,
/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
/obj/structure/window/reinforced/survival_pod{
dir = 6
@@ -7822,12 +7666,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/clothing/mask/gas/sechailer/syndicate,
/obj/item/watertank/pepperspray,
/obj/item/clothing/accessory/medal/silver{
desc = "The Sothran Syndicate's dictionary defines excellence as \"the ability to crush NT scum under one's boot\". This is awarded to those rare operatives who fit that definition.";
name = "military excellence medal"
},
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security)
"JE" = (
@@ -8167,36 +8005,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/skyrat/interdynefob/security/armory)
"Ls" = (
/obj/effect/turf_decal/siding/yellow{
dir = 4
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 4
},
/obj/effect/turf_decal/trimline/yellow/line{
dir = 8
},
/obj/structure/closet/secure_closet/interdynefob/electrical_supplies,
/obj/item/weldingtool/largetank{
pixel_y = 4
},
/obj/item/weldingtool/largetank{
pixel_y = -3
},
/obj/item/clothing/glasses/welding{
pixel_y = 4
},
/obj/item/clothing/glasses/welding{
pixel_y = -3
},
/turf/open/floor/iron/dark/side{
dir = 4
},
/area/ruin/space/has_grav/skyrat/interdynefob/engineering)
"Lv" = (
/obj/effect/turf_decal/siding/dark{
dir = 4
@@ -8204,50 +8012,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
/obj/item/storage/belt/holster/nukie{
pixel_x = -6;
pixel_y = 10
},
/obj/item/storage/belt/holster/nukie{
pixel_y = 6
},
/obj/item/storage/belt/holster/nukie{
pixel_x = 9
},
/obj/item/clothing/suit/armor/vest{
pixel_x = -5;
pixel_y = 5
},
/obj/item/clothing/suit/armor/vest{
pixel_x = 1;
pixel_y = 2
},
/obj/item/clothing/suit/armor/vest{
pixel_x = 7;
pixel_y = -1
},
/obj/item/storage/belt/military{
pixel_x = -8
},
/obj/item/storage/belt/military{
pixel_x = 1;
pixel_y = -3
},
/obj/item/storage/belt/military{
pixel_x = 8;
pixel_y = -6
},
/obj/item/clothing/head/helmet{
pixel_x = -6;
pixel_y = -4
},
/obj/item/clothing/head/helmet{
pixel_y = -7
},
/obj/item/clothing/head/helmet{
pixel_x = 6;
pixel_y = -11
},
/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security/armory)
@@ -8774,28 +8538,11 @@
/turf/open/floor/iron/dark/textured_large,
/area/ruin/space/has_grav/skyrat/interdynefob/service/dorms/fitness)
"NP" = (
/obj/item/storage/belt/security/full,
/obj/item/radio/headset/interdyne,
/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate,
/obj/item/storage/belt/security/webbing/ds,
/obj/item/clothing/head/beret/sec/syndicate,
/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
/obj/effect/turf_decal/siding/dark{
dir = 8
},
/obj/item/clothing/accessory/armband{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "brig officer armband"
},
/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker,
/obj/item/clothing/mask/gas/syndicate/ds,
/obj/item/clothing/suit/toggle/jacket/sec/old{
name = "brig officer jacket"
},
/obj/item/clothing/mask/gas/sechailer/syndicate,
/obj/item/gun/energy/disabler,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec,
/obj/item/clothing/glasses/hud/security/sunglasses/redsec,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security)
"NQ" = (
@@ -8972,11 +8719,6 @@
/turf/open/floor/iron/white/small,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"OC" = (
/obj/item/storage/belt/security/full,
/obj/item/radio/headset/interdyne,
/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate,
/obj/item/storage/belt/security/webbing/ds,
/obj/item/clothing/head/beret/sec/syndicate,
/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
/obj/structure/window/reinforced/survival_pod{
@@ -8985,22 +8727,10 @@
/obj/effect/turf_decal/siding/dark{
dir = 10
},
/obj/item/clothing/accessory/armband{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "brig officer armband"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker,
/obj/item/clothing/mask/gas/syndicate/ds,
/obj/item/clothing/suit/toggle/jacket/sec/old{
name = "brig officer jacket"
},
/obj/item/clothing/mask/gas/sechailer/syndicate,
/obj/item/gun/energy/disabler,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec,
/obj/item/clothing/glasses/hud/security/sunglasses/redsec,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security)
"OD" = (
@@ -9196,21 +8926,6 @@
},
/obj/machinery/light/cold/directional/north,
/obj/structure/closet/secure_closet/interdynefob/science_gear,
/obj/item/clothing/under/rank/rnd/scientist/skyrat/utility/syndicate,
/obj/item/clothing/suit/hooded/wintercoat/science,
/obj/item/clothing/suit/toggle/labcoat/science,
/obj/item/clothing/under/rank/rnd/scientist/skyrat/utility/syndicate{
pixel_y = -3
},
/obj/item/clothing/glasses/sunglasses/chemical,
/obj/item/clothing/accessory/armband/science{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "researcher armband"
},
/obj/item/clothing/accessory/armband/science{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "researcher armband"
},
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -10210,23 +9925,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/skyrat/interdynefob/engineering)
"TL" = (
/obj/item/clothing/suit/hooded/wintercoat/engineering,
/obj/item/clothing/head/soft/sec/syndicate,
/obj/item/clothing/under/syndicate/skyrat/overalls,
/obj/item/clothing/under/syndicate/skyrat/overalls/skirt,
/obj/item/clothing/under/rank/engineering/engineer/skyrat/utility/syndicate,
/obj/item/clothing/suit/jacket/gorlex_harness,
/obj/item/clothing/suit/hazardvest,
/obj/structure/closet/secure_closet/interdynefob/engie_locker,
/obj/item/clothing/accessory/armband/engine{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "engine technician armband"
},
/obj/item/clothing/accessory/armband/engine{
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to.";
name = "engine technician armband"
},
/obj/item/clothing/glasses/hud/ar/aviator/meson,
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 8
},
@@ -10239,9 +9938,6 @@
/obj/effect/turf_decal/siding/yellow{
dir = 4
},
/obj/item/holosign_creator/atmos{
pixel_y = -8
},
/turf/open/floor/iron/dark/side{
dir = 4
},
@@ -11082,48 +10778,6 @@
dir = 8
},
/obj/structure/closet/secure_closet/interdynefob/electrical_supplies,
/obj/item/electronics/airlock{
pixel_x = 5;
pixel_y = -7
},
/obj/item/electronics/airlock{
pixel_x = -5;
pixel_y = -7
},
/obj/item/storage/toolbox/electrical{
pixel_y = -7
},
/obj/item/electronics/apc{
pixel_x = 4;
pixel_y = 5
},
/obj/item/electronics/firelock{
pixel_x = -6;
pixel_y = 5
},
/obj/item/electronics/airalarm{
pixel_x = 2
},
/obj/item/stock_parts/cell/high{
pixel_x = -8;
pixel_y = -8
},
/obj/item/stock_parts/cell/high{
pixel_x = -4;
pixel_y = -8
},
/obj/item/stock_parts/cell/high{
pixel_y = -8
},
/obj/item/stock_parts/cell/high{
pixel_x = 4;
pixel_y = -8
},
/obj/item/stock_parts/cell/high{
pixel_x = 8;
pixel_y = -8
},
/obj/item/clothing/glasses/meson/engine,
/turf/open/floor/iron/dark/side{
dir = 4
},
@@ -12908,7 +12562,7 @@ Rt
So
tq
Jz
Ls
WZ
TL
WZ
Tt
@@ -0,0 +1,20 @@
/obj/structure/closet/secure_closet/interdynefob/mining_locker
icon_door = "mining"
icon_state = "mining"
name = "mining gear locker"
/obj/item/clothing/accessory/armband/cargo/syndicate
name = "mining officer armband"
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to."
/obj/structure/closet/secure_closet/interdynefob/mining_locker/PopulateContents()
..()
new /obj/item/gun/energy/recharge/kinetic_accelerator(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/mining_scanner(src)
new /obj/item/storage/belt/mining/alt(src)
new /obj/item/clothing/under/syndicate/skyrat/overalls(src)
new /obj/item/storage/backpack/satchel/explorer(src)
new /obj/item/storage/backpack/explorer(src)
new /obj/item/clothing/accessory/armband/cargo/syndicate(src)
@@ -0,0 +1,104 @@
/obj/structure/closet/secure_closet/interdynefob/sa_locker
icon_door = "cap"
icon_state = "cap"
name = "\proper station admiral's locker"
/obj/item/clothing/accessory/medal/gold/admiral
name = "medal of admiralty"
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. \
It signifies the codified responsibilities of an Admiral to the Sothran Syndicate, and their undisputable authority over their crew."
/obj/item/storage/bag/garment/station_admiral
name = "station admiral's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the station admiral."
/obj/item/storage/bag/garment/station_admiral/PopulateContents()
new /obj/item/clothing/head/hats/hos/cap/syndicate(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/syndicate(src)
new /obj/item/clothing/under/rank/captain/skyrat/utility/syndicate(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/syndicate/winter(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/accessory/medal/gold/admiral(src)
/obj/structure/closet/secure_closet/interdynefob/sa_locker/PopulateContents()
..()
new /obj/item/ammo_box/magazine/m9mm_aps(src)
new /obj/item/storage/bag/garment/station_admiral(src)
new /obj/item/radio/headset/interdyne/command(src)
/obj/structure/closet/secure_closet/interdynefob/maa_locker
icon_door = "warden"
icon_state = "warden"
name = "master at arms' locker"
req_access = list("syndicate_leader")
/obj/item/clothing/accessory/medal/silver/maa_medal
name = "military excellence medal"
desc = "The Sothran Syndicate's dictionary defines excellence as \"the ability to crush NT scum under one's boot\". \
This is awarded to those rare operatives who fit that definition."
/obj/item/clothing/suit/armor/hos/maa_greatcoat
name = "Master at Arms' armored greatcoat"
desc = "A greatcoat enhanced with a special alloy for some extra protection and style for those with a likely chance to get bullied for being outside of the brig"
/obj/item/clothing/suit/armor/hos/trenchcoat/maa_greatcoat
name = "Master at Arms' armored trenchcoat"
desc = "A trenchcoat enhanced with a special lightweight kevlar. It has little Syndicate logos sewn onto the shoulder badges with the letters 'MAA' just under it."
/obj/item/storage/bag/garment/master_arms
name = "master at arms' garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the master at arms."
/obj/item/storage/bag/garment/master_arms/PopulateContents()
new /obj/item/clothing/accessory/medal/silver/maa_medal(src)
new /obj/item/clothing/suit/armor/vest/warden/syndicate(src)
new /obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate(src)
new /obj/item/clothing/under/suit/skyrat/helltaker(src)
new /obj/item/clothing/suit/armor/hos/maa_greatcoat(src)
new /obj/item/clothing/head/beret/sec/navywarden/syndicate(src)
new /obj/item/clothing/head/hats/hos/beret/syndicate(src)
/obj/structure/closet/secure_closet/interdynefob/maa_locker/PopulateContents()
..()
new /obj/item/storage/belt/security/full(src)
new /obj/item/watertank/pepperspray(src)
new /obj/item/gun/energy/disabler(src)
new /obj/item/storage/bag/garment/master_arms(src)
new /obj/item/radio/headset/interdyne(src)
/obj/structure/closet/secure_closet/interdynefob/cl_locker
icon_door = "hop"
icon_state = "hop"
name = "\proper corporate liaison's locker"
req_access = list("syndicate_leader")
/obj/item/clothing/neck/chaplain/black/cl_cloak
name = "corporate liaison's cloak"
desc = "A unique cloak that shimmers with the Corporate Liaison's emblem."
/obj/item/storage/bag/garment/corprate_liaison
name = "corprate liaison's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the corprate liaison."
/obj/item/storage/bag/garment/corprate_liaison/PopulateContents()
new /obj/item/clothing/under/syndicate/skyrat/baseball(src)
new /obj/item/clothing/under/rank/captain/skyrat/utility/syndicate(src)
new /obj/item/clothing/under/suit/skyrat/helltaker(src)
new /obj/item/clothing/neck/chaplain/black/cl_cloak(src)
new /obj/item/clothing/head/hats/hos/beret/syndicate(src)
new /obj/item/clothing/glasses/sunglasses(src)
/obj/structure/closet/secure_closet/interdynefob/cl_locker/PopulateContents()
..()
new /obj/item/card/id/advanced/chameleon/black(src)
new /obj/item/card/id/advanced/chameleon/black(src)
new /obj/item/card/id/advanced/chameleon/black(src)
new /obj/item/encryptionkey/headset_syndicate/interdyne(src)
new /obj/item/encryptionkey/headset_syndicate/interdyne(src)
new /obj/item/encryptionkey/headset_syndicate/interdyne(src)
new /obj/item/language_manual/codespeak_manual/unlimited(src)
new /obj/item/storage/bag/garment/corprate_liaison(src)
new /obj/item/radio/headset/interdyne/command(src)
@@ -0,0 +1,63 @@
/obj/structure/closet/secure_closet/interdynefob/welding_supplies
icon_door = "eng_weld"
icon_state = "eng"
name = "welding supplies locker"
/obj/structure/closet/secure_closet/interdynefob/welding_supplies/PopulateContents()
..()
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/clothing/glasses/welding(src)
new /obj/item/clothing/glasses/welding(src)
/obj/structure/closet/secure_closet/interdynefob/electrical_supplies
icon_door = "eng_elec"
icon_state = "eng"
name = "electrical supplies locker"
/obj/structure/closet/secure_closet/interdynefob/electrical_supplies/PopulateContents()
..()
new /obj/item/electronics/airlock(src)
new /obj/item/electronics/airlock(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/electronics/apc(src)
new /obj/item/electronics/firelock(src)
new /obj/item/electronics/airalarm(src)
new /obj/item/stock_parts/cell/high(src)
new /obj/item/stock_parts/cell/high(src)
new /obj/item/stock_parts/cell/high(src)
new /obj/item/stock_parts/cell/high(src)
new /obj/item/clothing/glasses/meson/engine(src)
/obj/structure/closet/secure_closet/interdynefob/engie_locker
icon_door = "eng_secure"
icon_state = "eng_secure"
name = "engine technician gear locker"
/obj/item/storage/bag/garment/syndicate_engie
name = "engine tech's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to an engine tech."
/obj/item/storage/bag/garment/syndicate_engie/PopulateContents()
new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
new /obj/item/clothing/head/soft/sec/syndicate(src)
new /obj/item/clothing/under/syndicate/skyrat/overalls(src)
new /obj/item/clothing/under/syndicate/skyrat/overalls/skirt(src)
new /obj/item/clothing/under/rank/engineering/engineer/skyrat/utility/syndicate(src)
new /obj/item/clothing/suit/jacket/gorlex_harness(src)
new /obj/item/clothing/suit/hazardvest(src)
new /obj/item/clothing/accessory/armband/engine/syndicate(src)
new /obj/item/clothing/accessory/armband/engine/syndicate(src)
new /obj/item/clothing/glasses/hud/ar/aviator/meson(src)
/obj/item/clothing/accessory/armband/engine/syndicate
name = "engine technician armband"
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to."
/obj/structure/closet/secure_closet/interdynefob/engie_locker/PopulateContents()
..()
new /obj/item/storage/bag/garment/syndicate_engie(src)
new /obj/item/holosign_creator/atmos(src)
@@ -0,0 +1,24 @@
// Parent type since most of the lockers required syndicate access
/obj/structure/closet/secure_closet/interdynefob
req_access = list("syndicate")
// Generic lockers/subtypes
/obj/structure/closet/secure_closet/personal
icon_door = "cabinet"
icon_state = "cabinet"
/obj/structure/closet/secure_closet/interdynefob/mod_locker
icon_door = "syndicate"
icon_state = "syndicate"
name = "MODsuit module locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/mod_locker/PopulateContents()
..()
new /obj/item/mod/module/stealth(src)
new /obj/item/mod/module/projectile_dampener(src)
new /obj/item/mod/module/pepper_shoulders(src)
new /obj/item/mod/module/criminalcapture(src)
new /obj/item/mod/module/visor/night(src)
new /obj/item/screwdriver/nuke(src)
@@ -0,0 +1,21 @@
/obj/structure/closet/secure_closet/interdynefob/medical
icon_state = "med_secure"
name = "medical gear locker"
/obj/item/storage/bag/garment/syndicate_medical
name = "medical garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to medical."
/obj/item/storage/bag/garment/syndicate_medical/PopulateContents()
new /obj/item/clothing/gloves/latex/nitrile/ntrauma(src)
new /obj/item/clothing/suit/toggle/labcoat/interdyne(src)
new /obj/item/clothing/suit/toggle/labcoat/interdyne(src)
new /obj/item/clothing/glasses/hud/ar/aviator/health(src)
new /obj/item/clothing/glasses/hud/ar/aviator/health(src)
/obj/structure/closet/secure_closet/interdynefob/medical/PopulateContents()
..()
new /obj/item/storage/belt/medbandolier(src)
new /obj/item/storage/belt/medbandolier(src)
new /obj/item/storage/bag/garment/syndicate_medical(src)
@@ -0,0 +1,47 @@
/obj/structure/closet/secure_closet/interdynefob/science_gear
icon_state = "science"
name = "scientist gear locker"
/obj/item/clothing/accessory/armband/science/syndicate
name = "researcher armband"
desc = "An armband, worn by the FOB's operatives to display which department they're assigned to."
/obj/item/storage/bag/garment/syndicate_scientist
name = "scientist's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to a scientist."
/obj/item/storage/bag/garment/syndicate_scientist/PopulateContents()
new /obj/item/clothing/suit/hooded/wintercoat/science(src)
new /obj/item/clothing/suit/toggle/labcoat/science(src)
new /obj/item/clothing/glasses/sunglasses/chemical(src)
new /obj/item/clothing/under/rank/rnd/scientist/skyrat/utility/syndicate(src)
new /obj/item/clothing/under/rank/rnd/scientist/skyrat/utility/syndicate(src)
new /obj/item/clothing/accessory/armband/science/syndicate(src)
new /obj/item/clothing/accessory/armband/science/syndicate(src)
/obj/structure/closet/secure_closet/interdynefob/science_gear/PopulateContents()
..()
new /obj/item/storage/bag/garment/syndicate_scientist(src)
/obj/structure/closet/secure_closet/interdynefob/robotics
icon_state = "science"
name = "roboticist gear locker"
/obj/item/storage/bag/garment/syndicate_roboticist
name = "roboticist's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to a roboticist."
/obj/item/storage/bag/garment/syndicate_roboticist/PopulateContents()
new /obj/item/clothing/suit/hooded/techpriest(src)
new /obj/item/clothing/suit/toggle/labcoat/roboticist(src)
new /obj/item/clothing/under/syndicate/skyrat/overalls/skirt(src)
new /obj/item/clothing/under/syndicate/skyrat/overalls(src)
new /obj/item/clothing/glasses/hud/ar/aviator/diagnostic(src)
new /obj/item/clothing/glasses/hud/diagnostic(src)
new /obj/item/clothing/suit/hooded/wintercoat/science/robotics(src)
/obj/structure/closet/secure_closet/interdynefob/robotics/PopulateContents()
..()
new /obj/item/storage/bag/garment/syndicate_scientist(src)
@@ -0,0 +1,83 @@
/obj/structure/closet/secure_closet/interdynefob/prisoner_locker
name = "prisoner item locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker
icon_door = "sec"
icon_state = "sec"
name = "brig officer gear locker"
req_access = list("syndicate_leader")
/obj/item/clothing/suit/toggle/jacket/sec/old/syndicate
name = "brig officer jacket"
/obj/item/clothing/accessory/armband/syndicate
name = "brig officer armband"
desc ="An armband, worn by the FOB's operatives to display which department they're assigned to."
/obj/item/storage/bag/garment/brig_officer
name = "brig officer's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to a brig officer."
/obj/item/storage/bag/garment/brig_officer/PopulateContents()
new /obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate(src)
new /obj/item/clothing/head/beret/sec/syndicate(src)
new /obj/item/clothing/accessory/armband(src)
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/toggle/jacket/sec/old/syndicate(src)
new /obj/item/clothing/mask/gas/sechailer/syndicate(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/redsec(src)
/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker/PopulateContents()
..()
new /obj/item/storage/belt/security/full(src)
new /obj/item/gun/energy/disabler(src)
new /obj/item/storage/bag/garment/brig_officer(src)
new /obj/item/radio/headset/interdyne(src)
/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker
anchored = 1
icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
icon_door = "riot"
icon_state = "riot"
name = "armory gear locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker/PopulateContents()
..()
new /obj/item/storage/belt/holster/nukie(src)
new /obj/item/storage/belt/holster/nukie(src)
new /obj/item/storage/belt/holster/nukie(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/storage/belt/military(src)
new /obj/item/storage/belt/military(src)
new /obj/item/storage/belt/military(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/head/helmet(src)
/obj/structure/closet/secure_closet/interdynefob/munitions_locker
anchored = 1;
icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
icon_door = "riot"
icon_state = "riot"
name = "armory munitions locker"
/obj/structure/closet/secure_closet/interdynefob/munitions_locker/PopulateContents()
..()
new /obj/item/ammo_box/c9mm(src)
new /obj/item/ammo_box/c9mm(src)
new /obj/item/ammo_box/magazine/m9mm(src)
new /obj/item/ammo_box/magazine/m9mm(src)
new /obj/item/ammo_box/magazine/m9mm(src)
new /obj/item/ammo_box/magazine/m9mm(src)
new /obj/item/ammo_box/advanced/s12gauge(src)
new /obj/item/ammo_box/advanced/s12gauge(src)
new /obj/item/ammo_box/advanced/s12gauge/rubber(src)
new /obj/item/ammo_box/advanced/s12gauge/rubber(src)
@@ -1,92 +0,0 @@
// Lockers used in interdynefob.dmm
// Parent type since most of the lockers required syndicate access
/obj/structure/closet/secure_closet/interdynefob
req_access = list("syndicate")
// Generic lockers/subtypes
/obj/structure/closet/secure_closet/personal
icon_door = "cabinet"
icon_state = "cabinet"
// Job-specific lockers
/obj/structure/closet/secure_closet/interdynefob/science_gear
icon_state = "science"
name = "scientist gear locker"
/obj/structure/closet/secure_closet/interdynefob/robotics
icon_state = "science"
name = "roboticist gear locker"
/obj/structure/closet/secure_closet/interdynefob/medical
icon_state = "med_secure"
name = "medical gear locker"
/obj/structure/closet/secure_closet/interdynefob/welding_supplies
icon_door = "eng_weld"
icon_state = "eng"
name = "welding supplies locker"
/obj/structure/closet/secure_closet/interdynefob/electrical_supplies
icon_door = "eng_elec"
icon_state = "eng"
name = "electrical supplies locker"
/obj/structure/closet/secure_closet/interdynefob/engie_locker
icon_door = "eng_secure"
icon_state = "eng_secure"
name = "engine technician gear locker"
/obj/structure/closet/secure_closet/interdynefob/mining_locker
icon_door = "mining"
icon_state = "mining"
name = "mining gear locker"
/obj/structure/closet/secure_closet/interdynefob/sa_locker
icon_door = "cap"
icon_state = "cap"
name = "\proper station admiral's locker"
/obj/structure/closet/secure_closet/interdynefob/munitions_locker
anchored = 1;
icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
icon_door = "riot"
icon_state = "riot"
name = "armory munitions locker"
// Heads lockers
/obj/structure/closet/secure_closet/interdynefob/maa_locker
icon_door = "warden"
icon_state = "warden"
name = "master at arms' locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/armory_gear_locker
anchored = 1
icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
icon_door = "riot"
icon_state = "riot"
name = "armory gear locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/prisoner_locker
name = "prisoner item locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/mod_locker
icon_door = "syndicate"
icon_state = "syndicate"
name = "MODsuit module locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/brig_officer_locker
icon_door = "sec"
icon_state = "sec"
name = "brig officer gear locker"
req_access = list("syndicate_leader")
/obj/structure/closet/secure_closet/interdynefob/cl_locker
icon_door = "hop"
icon_state = "hop"
name = "\proper corporate liaison's locker"
req_access = list("syndicate_leader")
+7 -1
View File
@@ -6600,7 +6600,13 @@
#include "modular_skyrat\modules\mapping\code\areas\shuttles.dm"
#include "modular_skyrat\modules\mapping\code\areas\space.dm"
#include "modular_skyrat\modules\mapping\code\areas\station.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdynefob_lockers.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\cargo.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\command.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\engineering.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\generic.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\medical.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\science.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\security.dm"
#include "modular_skyrat\modules\mapping\voidraptor\code\areas.dm"
#include "modular_skyrat\modules\mapping\voidraptor\code\clothing.dm"
#include "modular_skyrat\modules\mapping\voidraptor\code\mob.dm"