mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
Merge pull request #11305 from GhostActual/Janitorial-oversite
Janitor Equipment Fix
This commit is contained in:
Aronai Sieyes
@@ -1,8 +1,16 @@
|
||||
/* Closets for specific jobs
|
||||
/*
|
||||
* Closets for specific jobs
|
||||
* Contains:
|
||||
* Bartender
|
||||
* Janitor
|
||||
* Lawyer
|
||||
* Janitorial Equipment
|
||||
*
|
||||
*
|
||||
* These have been removed from the map for the most part, however
|
||||
* do not remove these in case people want to make maps or POIs
|
||||
* with these closets.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -28,7 +36,8 @@
|
||||
/obj/item/clothing/under/dress/dress_saloon,
|
||||
/obj/item/clothing/accessory/wcoat = 2,
|
||||
/obj/item/clothing/shoes/black = 2,
|
||||
/obj/item/clothing/shoes/laceup)
|
||||
/obj/item/clothing/shoes/laceup
|
||||
)
|
||||
|
||||
/*
|
||||
* Chef
|
||||
@@ -45,7 +54,8 @@
|
||||
/obj/item/weapon/storage/box/mousetraps = 2,
|
||||
/obj/item/clothing/under/rank/chef,
|
||||
/obj/item/clothing/head/chefhat,
|
||||
/obj/item/weapon/storage/bag/food = 2)
|
||||
/obj/item/weapon/storage/bag/food = 2
|
||||
)
|
||||
|
||||
/*
|
||||
* Janitor
|
||||
@@ -68,7 +78,8 @@
|
||||
/obj/item/device/lightreplacer,
|
||||
/obj/item/weapon/storage/bag/trash,
|
||||
/obj/item/weapon/storage/belt/janitor,
|
||||
/obj/item/clothing/shoes/galoshes)
|
||||
/obj/item/clothing/shoes/galoshes
|
||||
)
|
||||
|
||||
/*
|
||||
* Lawyer
|
||||
@@ -97,4 +108,23 @@
|
||||
/obj/item/clothing/glasses/sunglasses/big = 2,
|
||||
/obj/item/clothing/under/lawyer/blue = 2,
|
||||
/obj/item/clothing/under/lawyer/blue/skirt = 2,
|
||||
/obj/item/device/tape/random = 2)
|
||||
/obj/item/device/tape/random = 2
|
||||
)
|
||||
|
||||
/*
|
||||
* Janitorial Equipment
|
||||
*/
|
||||
/obj/structure/closet/jequipcloset
|
||||
name = "custodial equipment closet"
|
||||
desc = "It's a storage unit for janitorial clothes and gear."
|
||||
closet_appearance = /decl/closet_appearance/wardrobe/janitor
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/device/flashlight = 5,
|
||||
/obj/item/clothing/suit/caution = 12,
|
||||
/obj/item/device/lightreplacer = 3,
|
||||
/obj/item/weapon/storage/bag/trash = 3,
|
||||
/obj/item/weapon/storage/box/lights/mixed = 3,
|
||||
/obj/item/weapon/storage/box/mousetraps = 1,
|
||||
/obj/item/weapon/grenade/chem_grenade/cleaner = 4
|
||||
)
|
||||
@@ -1,5 +1,20 @@
|
||||
//Gun Cabinets
|
||||
/*
|
||||
* Closets for Virgo
|
||||
* Contains:
|
||||
* Gun Cabinets
|
||||
* Explorer
|
||||
* Pathfinder
|
||||
* SAR/Field Medic
|
||||
* Pilot/Navigator
|
||||
* Exotic Seeds
|
||||
* Autolok Suit
|
||||
* Emergency Suit (Wall)
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* Gun Cabinets
|
||||
*/
|
||||
/obj/structure/closet/secure_closet/guncabinet/sidearm
|
||||
name = "emergency weapon cabinet"
|
||||
req_one_access = list(access_armory,access_captain)
|
||||
@@ -7,7 +22,6 @@
|
||||
starts_with = list(
|
||||
/obj/item/weapon/gun/energy/gun = 4)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/guncabinet/rifle
|
||||
name = "rifle cabinet"
|
||||
req_one_access = list(access_explorer,access_brig)
|
||||
@@ -33,8 +47,9 @@
|
||||
/obj/item/weapon/cell/device/weapon = 2,
|
||||
/obj/item/clothing/accessory/permit/gun/planetside)
|
||||
|
||||
//Explorer Lockers
|
||||
|
||||
/*
|
||||
* Explorer
|
||||
*/
|
||||
/obj/structure/closet/secure_closet/explorer
|
||||
name = "explorer locker"
|
||||
req_access = list(access_explorer)
|
||||
@@ -73,8 +88,52 @@
|
||||
starts_with += /obj/item/weapon/storage/backpack/dufflebag/explorer
|
||||
return ..()
|
||||
|
||||
//SAR Lockers
|
||||
/*
|
||||
* Pathfinder
|
||||
*/
|
||||
/obj/structure/closet/secure_closet/pathfinder
|
||||
name = "pathfinder locker"
|
||||
req_access = list(access_gateway)
|
||||
closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/clothing/under/explorer,
|
||||
/obj/item/clothing/suit/storage/hooded/explorer,
|
||||
/obj/item/clothing/mask/gas/explorer,
|
||||
/obj/item/weapon/storage/belt/explorer/pathfinder,
|
||||
/obj/item/clothing/shoes/boots/winter/explorer,
|
||||
/obj/item/clothing/gloves/black,
|
||||
/obj/item/device/radio/headset/pathfinder,
|
||||
/obj/item/device/radio/headset/pathfinder/alt,
|
||||
/obj/item/weapon/cartridge/explorer,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/device/gps/explorer,
|
||||
/obj/item/weapon/storage/box/flare,
|
||||
/obj/item/weapon/storage/box/explorerkeys,
|
||||
/obj/item/device/geiger,
|
||||
/obj/item/weapon/cell/device,
|
||||
/obj/item/device/radio,
|
||||
/obj/item/device/bluespaceradio/tether_prelinked,
|
||||
/obj/item/stack/marker_beacon/thirty,
|
||||
/obj/item/weapon/material/knife/tacknife/survival,
|
||||
/obj/item/weapon/material/knife/machete/deluxe,
|
||||
/obj/item/clothing/accessory/holster/machete,
|
||||
/obj/random/explorer_shield,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
|
||||
/obj/item/device/cataloguer/compact/pathfinder,
|
||||
/obj/item/device/mapping_unit)
|
||||
|
||||
/obj/structure/closet/secure_closet/pathfinder/Initialize()
|
||||
if(prob(50))
|
||||
starts_with += /obj/item/weapon/storage/backpack
|
||||
else
|
||||
starts_with += /obj/item/weapon/storage/backpack/satchel/norm
|
||||
return ..()
|
||||
|
||||
/*
|
||||
* SAR/Field Medic
|
||||
*/
|
||||
/obj/structure/closet/secure_closet/sar
|
||||
name = "field medic locker"
|
||||
desc = "Supplies for a wilderness first responder."
|
||||
@@ -124,8 +183,9 @@
|
||||
starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
|
||||
return ..()
|
||||
|
||||
//Pilot Locker
|
||||
|
||||
/*
|
||||
* Pilot/Navigator
|
||||
*/
|
||||
/obj/structure/closet/secure_closet/pilot
|
||||
name = "pilot locker"
|
||||
req_access = list(access_pilot)
|
||||
@@ -161,48 +221,9 @@
|
||||
starts_with += /obj/item/weapon/storage/backpack/satchel/norm
|
||||
return ..()
|
||||
|
||||
/obj/structure/closet/secure_closet/pathfinder
|
||||
name = "pathfinder locker"
|
||||
req_access = list(access_gateway)
|
||||
closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/clothing/under/explorer,
|
||||
/obj/item/clothing/suit/storage/hooded/explorer,
|
||||
/obj/item/clothing/mask/gas/explorer,
|
||||
/obj/item/weapon/storage/belt/explorer/pathfinder,
|
||||
/obj/item/clothing/shoes/boots/winter/explorer,
|
||||
/obj/item/clothing/gloves/black,
|
||||
/obj/item/device/radio/headset/pathfinder,
|
||||
/obj/item/device/radio/headset/pathfinder/alt,
|
||||
/obj/item/weapon/cartridge/explorer,
|
||||
/obj/item/device/flashlight,
|
||||
/obj/item/device/gps/explorer,
|
||||
/obj/item/weapon/storage/box/flare,
|
||||
/obj/item/weapon/storage/box/explorerkeys,
|
||||
/obj/item/device/geiger,
|
||||
/obj/item/weapon/cell/device,
|
||||
/obj/item/device/radio,
|
||||
/obj/item/device/bluespaceradio/tether_prelinked,
|
||||
/obj/item/stack/marker_beacon/thirty,
|
||||
/obj/item/weapon/material/knife/tacknife/survival,
|
||||
/obj/item/weapon/material/knife/machete/deluxe,
|
||||
/obj/item/clothing/accessory/holster/machete,
|
||||
/obj/random/explorer_shield,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
|
||||
/obj/item/device/cataloguer/compact/pathfinder,
|
||||
/obj/item/device/mapping_unit)
|
||||
|
||||
/obj/structure/closet/secure_closet/pathfinder/Initialize()
|
||||
if(prob(50))
|
||||
starts_with += /obj/item/weapon/storage/backpack
|
||||
else
|
||||
starts_with += /obj/item/weapon/storage/backpack/satchel/norm
|
||||
return ..()
|
||||
|
||||
//Exotic Seeds Crate
|
||||
|
||||
/*
|
||||
* Exotic Seeds
|
||||
*/
|
||||
/obj/structure/closet/crate/hydroponics/exotic
|
||||
name = "exotic seeds crate"
|
||||
desc = "All you need to destroy that pesky planet."
|
||||
@@ -215,6 +236,9 @@
|
||||
/obj/item/seeds/libertymycelium,
|
||||
/obj/item/seeds/reishimycelium)
|
||||
|
||||
/*
|
||||
* Autolok Suit
|
||||
*/
|
||||
/obj/structure/closet/autolok_wall
|
||||
name = "autolok suit storage"
|
||||
desc = "It's wall-mounted storage unit for an AutoLok suit."
|
||||
@@ -231,6 +255,9 @@
|
||||
/obj/item/device/suit_cooling_unit/emergency
|
||||
)
|
||||
|
||||
/*
|
||||
* Emergency Suit (Wall)
|
||||
*/
|
||||
/obj/structure/closet/emergsuit_wall
|
||||
name = "emergency suit storage"
|
||||
desc = "It's wall-mounted storage unit for an emergency suit."
|
||||
|
||||
@@ -1137,6 +1137,7 @@
|
||||
products = list(
|
||||
/obj/item/clothing/under/rank/bartender = 5,
|
||||
/obj/item/clothing/under/rank/bartender/skirt = 5,
|
||||
/obj/item/clothing/under/waiter = 5,
|
||||
/obj/item/clothing/head/that = 5,
|
||||
/obj/item/clothing/head/flatcap = 5,
|
||||
/obj/item/clothing/shoes/brown = 5,
|
||||
@@ -1180,7 +1181,9 @@
|
||||
/obj/item/clothing/suit/storage/apron/white = 5,
|
||||
/obj/item/clothing/suit/chef = 5,
|
||||
/obj/item/clothing/suit/chef/classic = 5,
|
||||
/obj/item/clothing/head/chefhat = 5
|
||||
/obj/item/clothing/head/chefhat = 5,
|
||||
/obj/item/clothing/under/waiter = 5,
|
||||
/obj/item/clothing/under/sundress = 1
|
||||
)
|
||||
req_log_access = access_hop
|
||||
has_logs = 1
|
||||
@@ -1431,16 +1434,16 @@
|
||||
icon_state = "janidrobe"
|
||||
req_access = list(access_janitor)
|
||||
products = list(
|
||||
/obj/item/clothing/under/rank/janitor = 5,
|
||||
/obj/item/clothing/under/dress/maid/janitor = 5,
|
||||
/obj/item/device/radio/headset/headset_service = 5,
|
||||
/obj/item/weapon/cartridge/janitor = 5,
|
||||
/obj/item/clothing/gloves/black = 5,
|
||||
/obj/item/clothing/head/soft/purple = 5,
|
||||
/obj/item/clothing/head/beret/purple = 5,
|
||||
/obj/item/clothing/suit/caution = 20,
|
||||
/obj/item/clothing/head/headband/maid = 5,
|
||||
/obj/item/device/radio/headset/headset_service = 5,
|
||||
/obj/item/clothing/under/rank/janitor = 5,
|
||||
/obj/item/clothing/under/dress/maid/janitor = 5,
|
||||
/obj/item/clothing/gloves/black = 5,
|
||||
/obj/item/weapon/storage/belt/janitor = 5,
|
||||
/obj/item/clothing/shoes/galoshes = 5
|
||||
/obj/item/clothing/shoes/galoshes = 5,
|
||||
/obj/item/weapon/cartridge/janitor = 5
|
||||
)
|
||||
req_log_access = access_hop
|
||||
has_logs = 1
|
||||
|
||||
@@ -26085,100 +26085,71 @@
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/tether/surfacebase/east_stairs_two)
|
||||
"aUL" = (
|
||||
/obj/effect/floor_decal/corner/purple{
|
||||
dir = 5
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
dir = 1
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 9
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border/shifted{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/camera/network/civilian,
|
||||
/obj/structure/closet/jcloset,
|
||||
/obj/machinery/vending/wardrobe/janidrobe,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aUM" = (
|
||||
/obj/machinery/newscaster{
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border/shifted{
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/vending/wardrobe/janidrobe,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aUN" = (
|
||||
/obj/structure/cable{
|
||||
d2 = 2;
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 1;
|
||||
name = "north bump";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border/shifted{
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple{
|
||||
dir = 5
|
||||
/obj/structure/sink/kitchen{
|
||||
pixel_y = 22
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aUO" = (
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border/shifted{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/janitorialcart,
|
||||
/obj/structure/sink/kitchen{
|
||||
pixel_y = 28
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aUP" = (
|
||||
/obj/structure/janitorialcart,
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border/shifted{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/alarm{
|
||||
pixel_y = 22
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aUQ" = (
|
||||
/obj/structure/janitorialcart,
|
||||
/obj/effect/floor_decal/borderfloor/shifted{
|
||||
dir = 1
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 5
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border/shifted{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple{
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
@@ -26359,36 +26330,28 @@
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/tether/surfacebase/east_stairs_two)
|
||||
"aVu" = (
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
id = "janitor_blast";
|
||||
name = "Desk Shutters";
|
||||
pixel_x = -22
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/purple/border{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
cell_type = /obj/item/weapon/cell/super;
|
||||
dir = 8;
|
||||
name = "west bump";
|
||||
nightshift_setting = 2;
|
||||
pixel_x = -30
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aVv" = (
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aVw" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 4;
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aVx" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aVy" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -27078,6 +27041,7 @@
|
||||
"aWr" = (
|
||||
/obj/effect/floor_decal/borderfloor/corner,
|
||||
/obj/effect/floor_decal/corner/purple/bordercorner,
|
||||
/obj/structure/closet/jequipcloset,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aWs" = (
|
||||
@@ -27510,7 +27474,7 @@
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/obj/machinery/light_switch{
|
||||
dir = 4;
|
||||
pixel_x = -28
|
||||
pixel_x = -31
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 8
|
||||
@@ -27524,6 +27488,11 @@
|
||||
/obj/effect/floor_decal/corner/purple/bordercorner2{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
id = "janitor_blast";
|
||||
name = "Desk Shutters";
|
||||
pixel_x = -22
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aXj" = (
|
||||
@@ -27784,9 +27753,6 @@
|
||||
dir = 2;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_x = 25
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
@@ -27798,15 +27764,16 @@
|
||||
/obj/item/weapon/grenade/chem_grenade/cleaner,
|
||||
/obj/item/weapon/grenade/chem_grenade/cleaner,
|
||||
/obj/item/weapon/grenade/chem_grenade/cleaner,
|
||||
/obj/item/weapon/storage/box/mousetraps,
|
||||
/obj/item/weapon/storage/box/lights/mixed,
|
||||
/obj/item/weapon/storage/box/lights/mixed,
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner,
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner,
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner,
|
||||
/obj/item/weapon/soap/nanotrasen,
|
||||
/obj/item/weapon/soap/nanotrasen,
|
||||
/obj/item/weapon/soap/nanotrasen,
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
dir = 8;
|
||||
pixel_x = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/janitor)
|
||||
"aXT" = (
|
||||
@@ -48962,7 +48929,7 @@ aLY
|
||||
aTe
|
||||
aUc
|
||||
aUM
|
||||
aVv
|
||||
aVy
|
||||
aWq
|
||||
aVv
|
||||
aXQ
|
||||
@@ -49104,7 +49071,7 @@ aLY
|
||||
aTf
|
||||
aUc
|
||||
aUN
|
||||
aVw
|
||||
aVy
|
||||
aVv
|
||||
aXj
|
||||
aXR
|
||||
@@ -49246,7 +49213,7 @@ aLY
|
||||
aTg
|
||||
aUc
|
||||
aUO
|
||||
aVx
|
||||
aVy
|
||||
aWr
|
||||
aXk
|
||||
aXS
|
||||
@@ -49388,7 +49355,7 @@ aLY
|
||||
aTh
|
||||
aUc
|
||||
aUP
|
||||
aVx
|
||||
aVy
|
||||
aWs
|
||||
aUc
|
||||
aUc
|
||||
|
||||
Reference in New Issue
Block a user