This commit is contained in:
izac112
2022-10-16 22:52:41 +02:00
501 changed files with 22581 additions and 19177 deletions
+2 -2
View File
@@ -153,7 +153,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
/obj/structure/cliff/CanPass(atom/movable/mover, turf/target)
if(isliving(mover))
var/mob/living/L = mover
if(L.hovering) // Flying mobs can always pass.
if(L.hovering || L.flying) // Flying mobs can always pass.
return TRUE
return ..()
@@ -174,7 +174,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
..()
/obj/structure/cliff/proc/should_fall(mob/living/L)
if(L.hovering)
if(L.hovering || L.flying)
return FALSE
var/turf/T = get_turf(L)
@@ -33,6 +33,7 @@
/obj/item/clothing/under/sl_suit = 2,
/obj/item/clothing/under/rank/bartender = 2,
/obj/item/clothing/under/rank/bartender/skirt,
/obj/item/clothing/suit/storage/hooded/wintercoat/bar,
/obj/item/clothing/under/dress/dress_saloon,
/obj/item/clothing/accessory/wcoat = 2,
/obj/item/clothing/shoes/black = 2,
@@ -70,6 +71,7 @@
/obj/item/clothing/under/dress/maid/janitor,
/obj/item/device/radio/headset/headset_service,
/obj/item/weapon/cartridge/janitor,
/obj/item/clothing/suit/storage/hooded/wintercoat/janitor,
/obj/item/clothing/gloves/black,
/obj/item/clothing/head/soft/purple,
/obj/item/clothing/head/beret/purple,
@@ -127,4 +129,4 @@
/obj/item/weapon/storage/box/lights/mixed = 3,
/obj/item/weapon/storage/box/mousetraps = 1,
/obj/item/weapon/grenade/chem_grenade/cleaner = 4
)
)
@@ -5,7 +5,8 @@
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/blueprints,
/obj/item/areaeditor/blueprints,
/obj/item/wire_reader,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/clothing/under/rank/chief_engineer,
@@ -100,7 +101,8 @@
/obj/item/clothing/shoes/boots/winter/engineering,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/storage/belt/utility, //VOREStation Add
/obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add
/obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add
/obj/item/areaeditor/blueprints/engineers) //VOREStation Add
/obj/structure/closet/secure_closet/engineering_personal/Initialize()
if(prob(50))
@@ -1,261 +1,263 @@
/obj/structure/closet/secure_closet/medical1
name = "medicine closet"
desc = "Filled with medical junk."
req_access = list(access_medical)
closet_appearance = /decl/closet_appearance/secure_closet/medical/alt
starts_with = list(
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/reagent_containers/dropper = 2,
/obj/item/weapon/reagent_containers/glass/beaker = 2,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2)
/obj/structure/closet/secure_closet/medical2
name = "anesthetics closet"
desc = "Used to knock people out."
req_access = list(access_surgery)
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list(
/obj/item/weapon/tank/anesthetic = 3,
/obj/item/clothing/mask/breath/medical = 3)
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/secure_closet/medical/doctor
starts_with = list(
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/nurse,
/obj/item/clothing/under/rank/orderly,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/medical,
/obj/item/device/radio/headset/headset_med,
/obj/item/device/radio/headset/headset_med/alt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/clothing/under/rank/nursesuit,
/obj/item/clothing/head/nursehat,
/obj/item/weapon/storage/box/freezer = 3,
/obj/item/weapon/storage/belt/medical) //VOREStation Add
/obj/structure/closet/secure_closet/medical3/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else
starts_with += /obj/item/weapon/storage/backpack/satchel/med
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs
starts_with += /obj/item/clothing/head/surgery/blue
if ("green")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
starts_with += /obj/item/clothing/head/surgery/green
if ("purple")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
starts_with += /obj/item/clothing/head/surgery/purple
if ("black")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
starts_with += /obj/item/clothing/head/surgery/navyblue
switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs
starts_with += /obj/item/clothing/head/surgery/blue
if ("green")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
starts_with += /obj/item/clothing/head/surgery/green
if ("purple")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
starts_with += /obj/item/clothing/head/surgery/purple
if ("black")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
starts_with += /obj/item/clothing/head/surgery/navyblue
return ..()
/obj/structure/closet/secure_closet/paramedic
name = "paramedic locker"
desc = "Supplies for a first responder."
req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/secure_closet/medical/paramedic
starts_with = list(
/obj/item/weapon/storage/backpack/dufflebag/emt,
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
/obj/item/weapon/storage/belt/medical/emt,
/obj/item/clothing/mask/gas,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,
/obj/item/device/radio/headset/headset_med/alt,
/obj/item/weapon/cartridge/medical,
/obj/item/weapon/storage/briefcase/inflatable,
/obj/item/device/flashlight,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/clothing/glasses/hud/health,
/obj/item/device/healthanalyzer,
/obj/item/device/radio/off,
/obj/random/medical,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/extinguisher/mini,
/obj/item/weapon/storage/box/freezer,
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/taperoll/medical)
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
req_access = list(access_cmo)
closet_appearance = /decl/closet_appearance/secure_closet/cmo
starts_with = list(
/obj/item/clothing/under/rank/chief_medical_officer,
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
/obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
/obj/item/device/radio/headset/heads/cmo,
/obj/item/device/radio/headset/heads/cmo/alt,
/obj/item/device/flash,
/obj/item/weapon/reagent_containers/hypospray/vial,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/clothing/head/beret/medical/cmo,
/obj/item/clothing/head/beret/medical/cmo/blue,
/obj/item/weapon/storage/box/freezer,
/obj/item/clothing/mask/gas,
/obj/item/taperoll/medical,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white,
/obj/item/weapon/reagent_containers/glass/beaker/vial, //VOREStation Add
/obj/item/weapon/storage/belt/medical) //VOREStation Add
/obj/structure/closet/secure_closet/CMO/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else
starts_with += /obj/item/weapon/storage/backpack/satchel/med
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs
starts_with += /obj/item/clothing/head/surgery/blue
if ("green")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
starts_with += /obj/item/clothing/head/surgery/green
if ("purple")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
starts_with += /obj/item/clothing/head/surgery/purple
if ("black")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
starts_with += /obj/item/clothing/head/surgery/navyblue
return ..()
/obj/structure/closet/secure_closet/animal
name = "animal control closet"
req_access = list(access_surgery)
starts_with = list(
/obj/item/device/assembly/signaler,
/obj/item/device/radio/electropack = 3)
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
desc = "Store dangerous chemicals in here."
req_access = list(access_chemistry)
closet_appearance = /decl/closet_appearance/secure_closet/medical/chemistry
starts_with = list(
/obj/item/weapon/storage/box/pillbottles = 2,
/obj/item/weapon/storage/box/beakers,
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/reagent_containers/dropper = 2,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2,
/obj/item/weapon/storage/fancy/vials) //VOREStation Add
/obj/structure/closet/secure_closet/psych
name = "psychiatric cabinet"
desc = "Store psychology tools and medicines in here."
req_access = list(access_psychiatrist)
closet_appearance = /decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/clothing/under/rank/psych,
/obj/item/clothing/under/rank/psych/turtleneck,
/obj/item/clothing/suit/straight_jacket,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin,
/obj/item/weapon/reagent_containers/syringe,
/obj/item/weapon/storage/pill_bottle/citalopram,
/obj/item/weapon/reagent_containers/pill/methylphenidate,
/obj/item/weapon/clipboard,
/obj/item/weapon/folder/white,
/obj/item/device/taperecorder,
/obj/item/device/tape/random = 3,
/obj/item/device/camera,
/obj/item/toy/plushie/therapy/blue)
/obj/structure/closet/secure_closet/medical_wall
name = "first aid closet"
desc = "It's a secure wall-mounted storage unit for first aid supplies."
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = TRUE
density = FALSE
wall_mounted = 1
store_mobs = 0
req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/wall/medical
/obj/structure/closet/secure_closet/medical_wall/pills
name = "pill cabinet"
starts_with = list(
/obj/item/weapon/storage/pill_bottle/tramadol,
/obj/item/weapon/storage/pill_bottle/antitox,
/obj/item/weapon/storage/pill_bottle/carbon,
/obj/random/medical/pillbottle)
/obj/structure/closet/secure_closet/medical_wall/anesthetics
name = "anesthetics wall closet"
desc = "Used to knock people out."
req_access = list(access_surgery)
starts_with = list(
/obj/item/weapon/tank/anesthetic = 3,
/obj/item/clothing/mask/breath/medical = 3)
/obj/structure/closet/secure_closet/medical1
name = "medicine closet"
desc = "Filled with medical junk."
req_access = list(access_medical)
closet_appearance = /decl/closet_appearance/secure_closet/medical/alt
starts_with = list(
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/reagent_containers/dropper = 2,
/obj/item/weapon/reagent_containers/glass/beaker = 2,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2)
/obj/structure/closet/secure_closet/medical2
name = "anesthetics closet"
desc = "Used to knock people out."
req_access = list(access_surgery)
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list(
/obj/item/weapon/tank/anesthetic = 3,
/obj/item/clothing/mask/breath/medical = 3)
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/secure_closet/medical/doctor
starts_with = list(
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/nurse,
/obj/item/clothing/under/rank/orderly,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/medical,
/obj/item/device/radio/headset/headset_med,
/obj/item/device/radio/headset/headset_med/alt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/clothing/under/rank/nursesuit,
/obj/item/clothing/head/nursehat,
/obj/item/weapon/storage/box/freezer = 3,
/obj/item/weapon/storage/belt/medical) //VOREStation Add
/obj/structure/closet/secure_closet/medical3/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else
starts_with += /obj/item/weapon/storage/backpack/satchel/med
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs
starts_with += /obj/item/clothing/head/surgery/blue
if ("green")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
starts_with += /obj/item/clothing/head/surgery/green
if ("purple")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
starts_with += /obj/item/clothing/head/surgery/purple
if ("black")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
starts_with += /obj/item/clothing/head/surgery/navyblue
switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs
starts_with += /obj/item/clothing/head/surgery/blue
if ("green")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
starts_with += /obj/item/clothing/head/surgery/green
if ("purple")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
starts_with += /obj/item/clothing/head/surgery/purple
if ("black")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
starts_with += /obj/item/clothing/head/surgery/navyblue
return ..()
/obj/structure/closet/secure_closet/paramedic
name = "paramedic locker"
desc = "Supplies for a first responder."
req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/secure_closet/medical/paramedic
starts_with = list(
/obj/item/weapon/storage/backpack/dufflebag/emt,
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
/obj/item/weapon/storage/belt/medical/emt,
/obj/item/clothing/mask/gas,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/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/device/radio/headset/headset_med/alt,
/obj/item/weapon/cartridge/medical,
/obj/item/weapon/storage/briefcase/inflatable,
/obj/item/device/flashlight,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/clothing/glasses/hud/health,
/obj/item/device/healthanalyzer,
/obj/item/device/radio/off,
/obj/random/medical,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/extinguisher/mini,
/obj/item/weapon/storage/box/freezer,
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/taperoll/medical)
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
req_access = list(access_cmo)
closet_appearance = /decl/closet_appearance/secure_closet/cmo
starts_with = list(
/obj/item/clothing/under/rank/chief_medical_officer,
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
/obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
/obj/item/device/radio/headset/heads/cmo,
/obj/item/device/radio/headset/heads/cmo/alt,
/obj/item/device/flash,
/obj/item/weapon/reagent_containers/hypospray/vial,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/clothing/head/beret/medical/cmo,
/obj/item/clothing/head/beret/medical/cmo/blue,
/obj/item/weapon/storage/box/freezer,
/obj/item/clothing/mask/gas,
/obj/item/taperoll/medical,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white,
/obj/item/weapon/reagent_containers/glass/beaker/vial, //VOREStation Add
/obj/item/weapon/storage/belt/medical) //VOREStation Add
/obj/structure/closet/secure_closet/CMO/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else
starts_with += /obj/item/weapon/storage/backpack/satchel/med
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/med
switch(pick("blue", "green", "purple", "black", "navyblue"))
if ("blue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs
starts_with += /obj/item/clothing/head/surgery/blue
if ("green")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/green
starts_with += /obj/item/clothing/head/surgery/green
if ("purple")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/purple
starts_with += /obj/item/clothing/head/surgery/purple
if ("black")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/black
starts_with += /obj/item/clothing/head/surgery/black
if ("navyblue")
starts_with += /obj/item/clothing/under/rank/medical/scrubs/navyblue
starts_with += /obj/item/clothing/head/surgery/navyblue
return ..()
/obj/structure/closet/secure_closet/animal
name = "animal control closet"
req_access = list(access_surgery)
starts_with = list(
/obj/item/device/assembly/signaler,
/obj/item/device/radio/electropack = 3)
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
desc = "Store dangerous chemicals in here."
req_access = list(access_chemistry)
closet_appearance = /decl/closet_appearance/secure_closet/medical/chemistry
starts_with = list(
/obj/item/weapon/storage/box/pillbottles = 2,
/obj/item/weapon/storage/box/beakers,
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/reagent_containers/dropper = 2,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2,
/obj/item/weapon/storage/fancy/vials) //VOREStation Add
/obj/structure/closet/secure_closet/psych
name = "psychiatric cabinet"
desc = "Store psychology tools and medicines in here."
req_access = list(access_psychiatrist)
closet_appearance = /decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/clothing/under/rank/psych,
/obj/item/clothing/under/rank/psych/turtleneck,
/obj/item/clothing/suit/straight_jacket,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin,
/obj/item/weapon/reagent_containers/syringe,
/obj/item/weapon/storage/pill_bottle/citalopram,
/obj/item/weapon/reagent_containers/pill/methylphenidate,
/obj/item/weapon/clipboard,
/obj/item/weapon/folder/white,
/obj/item/device/taperecorder,
/obj/item/device/tape/random = 3,
/obj/item/device/camera,
/obj/item/toy/plushie/therapy/blue)
/obj/structure/closet/secure_closet/medical_wall
name = "first aid closet"
desc = "It's a secure wall-mounted storage unit for first aid supplies."
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = TRUE
density = FALSE
wall_mounted = 1
store_mobs = 0
req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/wall/medical
/obj/structure/closet/secure_closet/medical_wall/pills
name = "pill cabinet"
starts_with = list(
/obj/item/weapon/storage/pill_bottle/tramadol,
/obj/item/weapon/storage/pill_bottle/antitox,
/obj/item/weapon/storage/pill_bottle/carbon,
/obj/random/medical/pillbottle)
/obj/structure/closet/secure_closet/medical_wall/anesthetics
name = "anesthetics wall closet"
desc = "Used to knock people out."
req_access = list(access_surgery)
starts_with = list(
/obj/item/weapon/tank/anesthetic = 3,
/obj/item/clothing/mask/breath/medical = 3)
@@ -60,7 +60,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/shoes/white,
/obj/item/weapon/melee/umbrella, // vorestation addition,
/obj/item/weapon/melee/umbrella,
/obj/item/clothing/glasses/science,
/obj/item/device/radio/headset/headset_sci,
/obj/item/weapon/storage/belt/archaeology,
@@ -85,4 +85,4 @@
/obj/item/device/measuring_tape,
/obj/item/weapon/pickaxe/hand,
/obj/item/weapon/storage/bag/fossils,
/obj/item/weapon/hand_labeler)
/obj/item/weapon/hand_labeler)
@@ -1,312 +1,312 @@
/obj/structure/closet/secure_closet/captains
name = "site manager's locker"
req_access = list(access_captain)
closet_appearance = /decl/closet_appearance/secure_closet/command
starts_with = list(
/obj/item/weapon/storage/backpack/dufflebag/captain,
/obj/item/clothing/head/helmet,
/obj/item/clothing/suit/storage/vest,
/obj/item/weapon/cartridge/captain,
/obj/item/weapon/storage/lockbox/medal,
/obj/item/device/radio/headset/heads/captain,
/obj/item/device/radio/headset/heads/captain/alt,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/melee/telebaton,
/obj/item/device/flash,
/obj/item/weapon/storage/box/ids)
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
req_access = list(access_hop)
closet_appearance = /decl/closet_appearance/secure_closet/command/hop
starts_with = list(
/obj/item/clothing/suit/storage/vest,
/obj/item/clothing/head/helmet,
/obj/item/weapon/cartridge/hop,
/obj/item/device/radio/headset/heads/hop,
/obj/item/device/radio/headset/heads/hop/alt,
/obj/item/weapon/storage/box/ids = 2,
/obj/item/weapon/gun/energy/gun/compact,
/obj/item/weapon/storage/box/commandkeys,
/obj/item/weapon/storage/box/servicekeys,
/obj/item/device/flash)
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
req_access = list(access_hop)
closet_appearance = /decl/closet_appearance/secure_closet/command/hop
starts_with = list(
/obj/item/clothing/under/rank/head_of_personnel,
/obj/item/clothing/under/dress/dress_hop,
/obj/item/clothing/under/dress/dress_hr,
/obj/item/clothing/under/lawyer/female,
/obj/item/clothing/under/lawyer/black,
/obj/item/clothing/under/lawyer/black/skirt,
/obj/item/clothing/under/lawyer/red,
/obj/item/clothing/under/lawyer/red/skirt,
/obj/item/clothing/under/lawyer/oldman,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/shoes/white,
/obj/item/clothing/under/rank/head_of_personnel_whimsy,
/obj/item/clothing/head/caphat/hop,
/obj/item/clothing/under/suit_jacket/teal,
/obj/item/clothing/under/suit_jacket/teal/skirt,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/suit/storage/hooded/wintercoat/hop,
/obj/item/clothing/head/caphat/hop/beret/,
/obj/item/clothing/head/caphat/hop/beret/white)
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
req_access = list(access_hos)
storage_capacity = 2.6 * MOB_MEDIUM
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
starts_with = list(
/obj/item/clothing/head/helmet/HoS,
/obj/item/clothing/head/helmet/HoS/hat,
/obj/item/clothing/suit/storage/vest/hos,
/obj/item/clothing/under/rank/head_of_security/jensen,
/obj/item/clothing/under/rank/head_of_security/corp,
/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
/obj/item/clothing/suit/storage/vest/hoscoat,
/obj/item/clothing/head/helmet/dermal,
/obj/item/weapon/cartridge/hos,
/obj/item/device/radio/headset/heads/hos,
/obj/item/device/radio/headset/heads/hos/alt,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/weapon/shield/riot,
/obj/item/weapon/shield/riot/tele,
/obj/item/weapon/storage/box/holobadge/hos,
/obj/item/clothing/accessory/badge/holo/hos,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/tool/crowbar/red,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/belt/security,
/obj/item/device/flash,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos,
/obj/item/weapon/rcd_ammo/large,
/obj/item/weapon/cell/device/weapon,
/obj/item/clothing/accessory/holster/waist,
/obj/item/weapon/melee/telebaton,
/obj/item/clothing/head/beret/sec/corporate/hos,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/suit/storage/hooded/wintercoat/security/hos,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/hos)
/obj/structure/closet/secure_closet/hos/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
storage_capacity = 42
req_access = list(access_armory)
closet_appearance = /decl/closet_appearance/secure_closet/security/warden
starts_with = list(
/obj/item/clothing/suit/storage/vest/warden,
/obj/item/clothing/under/rank/warden,
/obj/item/clothing/under/rank/warden/corp,
/obj/item/clothing/suit/storage/vest/wardencoat,
/obj/item/clothing/suit/storage/vest/wardencoat/alt,
/obj/item/clothing/suit/storage/vest/wardencoat/alt2, //VOREStation Add,
/obj/item/clothing/head/helmet/dermal,
/obj/item/clothing/head/helmet/warden,
/obj/item/clothing/head/helmet/warden/hat,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/belt/security,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/storage/box/holobadge,
/obj/item/clothing/head/beret/sec/corporate/warden,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/device/megaphone,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/warden,
/obj/item/weapon/gun/projectile/revolvershotgun,
/obj/item/ammo_magazine/m12gdrumjack/beanbag,
/obj/item/ammo_magazine/m12gdrumjack/beanbag)
/obj/structure/closet/secure_closet/warden/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/security
starts_with = list(
/obj/item/clothing/suit/storage/vest/officer,
/obj/item/clothing/head/helmet,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/weapon/storage/belt/security,
/obj/item/device/flash,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/grenade/flashbang,
/obj/item/weapon/melee/baton/loaded,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/device/hailer,
/obj/item/device/flashlight/flare,
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/under/rank/security/corp,
///obj/item/ammo_magazine/m45/rubber, //VOREStation Removal,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/cell/device/weapon,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight)
/obj/structure/closet/secure_closet/security/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
if(prob(30))
starts_with += /obj/item/poster/nanotrasen
return ..()
/obj/structure/closet/secure_closet/security/cargo/Initialize()
starts_with += /obj/item/clothing/accessory/armband/cargo
starts_with += /obj/item/device/encryptionkey/headset_cargo
return ..()
/obj/structure/closet/secure_closet/security/engine/Initialize()
starts_with += /obj/item/clothing/accessory/armband/engine
starts_with += /obj/item/device/encryptionkey/headset_eng
return ..()
/obj/structure/closet/secure_closet/security/science/Initialize()
starts_with += /obj/item/clothing/accessory/armband/science
starts_with += /obj/item/device/encryptionkey/headset_sci
return ..()
/obj/structure/closet/secure_closet/security/med/Initialize()
starts_with += /obj/item/clothing/accessory/armband/medblue
starts_with += /obj/item/device/encryptionkey/headset_med
return ..()
/obj/structure/closet/secure_closet/detective
name = "detective's cabinet"
req_access = list(access_forensics_lockers)
closet_appearance = /decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/clothing/accessory/badge/holo/detective,
/obj/item/clothing/gloves/black,
///obj/item/gunbox, // VOREStation Removal
/obj/item/gunbox/stun,
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/clothing/suit/storage/vest/detective,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/holster/armpit,
/obj/item/device/flashlight/maglight,
/obj/item/weapon/reagent_containers/food/drinks/flask/detflask,
/obj/item/weapon/storage/briefcase/crimekit,
/obj/item/device/taperecorder,
/obj/item/weapon/storage/bag/detective,
/obj/item/device/tape/random = 3)
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
req_access = list(access_captain)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list(
/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2)
GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/brig)
/obj/structure/closet/secure_closet/brig
name = "brig locker"
req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/brig
anchored = TRUE
var/id = null
starts_with = list(
/obj/item/clothing/under/color/prison,
/obj/item/clothing/shoes/orange)
/obj/structure/closet/secure_closet/posters
name = "morale storage"
req_access = list(access_security)
anchored = TRUE
starts_with = list(
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen)
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
req_access = list(access_lawyer)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list(
/obj/item/clothing/shoes/brown,
/obj/item/weapon/paper/Court = 3,
/obj/item/weapon/pen,
/obj/item/clothing/suit/judgerobe,
/obj/item/clothing/head/powdered_wig,
/obj/item/weapon/storage/briefcase)
/obj/structure/closet/secure_closet/wall
name = "wall locker"
req_access = list(access_security)
closet_appearance = /decl/closet_appearance/wall
density = TRUE
//too small to put a man in
large = 0
/obj/structure/closet/secure_closet/captains
name = "site manager's locker"
req_access = list(access_captain)
closet_appearance = /decl/closet_appearance/secure_closet/command
starts_with = list(
/obj/item/weapon/storage/backpack/dufflebag/captain,
/obj/item/clothing/head/helmet,
/obj/item/clothing/suit/storage/vest,
/obj/item/weapon/cartridge/captain,
/obj/item/weapon/storage/lockbox/medal,
/obj/item/device/radio/headset/heads/captain,
/obj/item/device/radio/headset/heads/captain/alt,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/melee/telebaton,
/obj/item/device/flash,
/obj/item/weapon/storage/box/ids)
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
req_access = list(access_hop)
closet_appearance = /decl/closet_appearance/secure_closet/command/hop
starts_with = list(
/obj/item/clothing/suit/storage/vest,
/obj/item/clothing/head/helmet,
/obj/item/weapon/cartridge/hop,
/obj/item/device/radio/headset/heads/hop,
/obj/item/device/radio/headset/heads/hop/alt,
/obj/item/weapon/storage/box/ids = 2,
/obj/item/weapon/gun/energy/gun/compact,
/obj/item/weapon/storage/box/commandkeys,
/obj/item/weapon/storage/box/servicekeys,
/obj/item/device/flash)
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
req_access = list(access_hop)
closet_appearance = /decl/closet_appearance/secure_closet/command/hop
starts_with = list(
/obj/item/clothing/under/rank/head_of_personnel,
/obj/item/clothing/under/dress/dress_hop,
/obj/item/clothing/under/dress/dress_hr,
/obj/item/clothing/under/lawyer/female,
/obj/item/clothing/under/lawyer/black,
/obj/item/clothing/under/lawyer/black/skirt,
/obj/item/clothing/under/lawyer/red,
/obj/item/clothing/under/lawyer/red/skirt,
/obj/item/clothing/under/lawyer/oldman,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/shoes/white,
/obj/item/clothing/under/rank/head_of_personnel_whimsy,
/obj/item/clothing/head/caphat/hop,
/obj/item/clothing/under/suit_jacket/teal,
/obj/item/clothing/under/suit_jacket/teal/skirt,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/suit/storage/hooded/wintercoat/hop,
/obj/item/clothing/head/caphat/hop/beret,
/obj/item/clothing/head/caphat/hop/beret/white)
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
req_access = list(access_hos)
storage_capacity = 2.6 * MOB_MEDIUM
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
starts_with = list(
/obj/item/clothing/head/helmet/HoS,
/obj/item/clothing/head/helmet/HoS/hat,
/obj/item/clothing/suit/storage/vest/hos,
/obj/item/clothing/under/rank/head_of_security/jensen,
/obj/item/clothing/under/rank/head_of_security/corp,
/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
/obj/item/clothing/suit/storage/vest/hoscoat,
/obj/item/clothing/head/helmet/dermal,
/obj/item/weapon/cartridge/hos,
/obj/item/device/radio/headset/heads/hos,
/obj/item/device/radio/headset/heads/hos/alt,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/weapon/shield/riot,
/obj/item/weapon/shield/riot/tele,
/obj/item/weapon/storage/box/holobadge/hos,
/obj/item/clothing/accessory/badge/holo/hos,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/tool/crowbar/red,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/belt/security,
/obj/item/device/flash,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos,
/obj/item/weapon/rcd_ammo/large,
/obj/item/weapon/cell/device/weapon,
/obj/item/clothing/accessory/holster/waist,
/obj/item/weapon/melee/telebaton,
/obj/item/clothing/head/beret/sec/corporate/hos,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/suit/storage/hooded/wintercoat/security/hos,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/hos)
/obj/structure/closet/secure_closet/hos/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
storage_capacity = 42
req_access = list(access_armory)
closet_appearance = /decl/closet_appearance/secure_closet/security/warden
starts_with = list(
/obj/item/clothing/suit/storage/vest/warden,
/obj/item/clothing/under/rank/warden,
/obj/item/clothing/under/rank/warden/corp,
/obj/item/clothing/suit/storage/vest/wardencoat,
/obj/item/clothing/suit/storage/vest/wardencoat/alt,
/obj/item/clothing/suit/storage/vest/wardencoat/alt2, //VOREStation Add,
/obj/item/clothing/head/helmet/dermal,
/obj/item/clothing/head/helmet/warden,
/obj/item/clothing/head/helmet/warden/hat,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/belt/security,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/storage/box/holobadge,
/obj/item/clothing/head/beret/sec/corporate/warden,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight,
/obj/item/device/megaphone,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/mask/gas/sechailer/swat/warden,
/obj/item/weapon/gun/projectile/revolvershotgun,
/obj/item/ammo_magazine/m12gdrumjack/beanbag,
/obj/item/ammo_magazine/m12gdrumjack/beanbag)
/obj/structure/closet/secure_closet/warden/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/security
starts_with = list(
/obj/item/clothing/suit/storage/vest/officer,
/obj/item/clothing/head/helmet,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/weapon/storage/belt/security,
/obj/item/device/flash,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/grenade/flashbang,
/obj/item/weapon/melee/baton/loaded,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/device/hailer,
/obj/item/device/flashlight/flare,
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/under/rank/security/corp,
///obj/item/ammo_magazine/m45/rubber, //VOREStation Removal,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/cell/device/weapon,
/obj/item/clothing/suit/storage/hooded/wintercoat/security,
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight)
/obj/structure/closet/secure_closet/security/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
if(prob(30))
starts_with += /obj/item/poster/nanotrasen
return ..()
/obj/structure/closet/secure_closet/security/cargo/Initialize()
starts_with += /obj/item/clothing/accessory/armband/cargo
starts_with += /obj/item/device/encryptionkey/headset_cargo
return ..()
/obj/structure/closet/secure_closet/security/engine/Initialize()
starts_with += /obj/item/clothing/accessory/armband/engine
starts_with += /obj/item/device/encryptionkey/headset_eng
return ..()
/obj/structure/closet/secure_closet/security/science/Initialize()
starts_with += /obj/item/clothing/accessory/armband/science
starts_with += /obj/item/device/encryptionkey/headset_sci
return ..()
/obj/structure/closet/secure_closet/security/med/Initialize()
starts_with += /obj/item/clothing/accessory/armband/medblue
starts_with += /obj/item/device/encryptionkey/headset_med
return ..()
/obj/structure/closet/secure_closet/detective
name = "detective's cabinet"
req_access = list(access_forensics_lockers)
closet_appearance = /decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/clothing/accessory/badge/holo/detective,
/obj/item/clothing/gloves/black,
///obj/item/gunbox, // VOREStation Removal
/obj/item/gunbox/stun,
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/clothing/suit/storage/vest/detective,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/holster/armpit,
/obj/item/device/flashlight/maglight,
/obj/item/weapon/reagent_containers/food/drinks/flask/detflask,
/obj/item/weapon/storage/briefcase/crimekit,
/obj/item/device/taperecorder,
/obj/item/weapon/storage/bag/detective,
/obj/item/device/tape/random = 3)
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
req_access = list(access_captain)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list(
/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2)
GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/brig)
/obj/structure/closet/secure_closet/brig
name = "brig locker"
req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/brig
anchored = TRUE
var/id = null
starts_with = list(
/obj/item/clothing/under/color/prison,
/obj/item/clothing/shoes/orange)
/obj/structure/closet/secure_closet/posters
name = "morale storage"
req_access = list(access_security)
anchored = TRUE
starts_with = list(
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen,
/obj/item/poster/nanotrasen)
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
req_access = list(access_lawyer)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list(
/obj/item/clothing/shoes/brown,
/obj/item/weapon/paper/Court = 3,
/obj/item/weapon/pen,
/obj/item/clothing/suit/judgerobe,
/obj/item/clothing/head/powdered_wig,
/obj/item/weapon/storage/briefcase)
/obj/structure/closet/secure_closet/wall
name = "wall locker"
req_access = list(access_security)
closet_appearance = /decl/closet_appearance/wall
density = TRUE
//too small to put a man in
large = 0
@@ -1,488 +1,491 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue attire."
closet_appearance = /decl/closet_appearance/wardrobe
/obj/structure/closet/wardrobe/red
name = "security wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/red
starts_with = list(
/obj/item/clothing/under/rank/security = 3,
/obj/item/clothing/under/rank/security2 = 3,
/obj/item/clothing/under/rank/security/turtleneck = 3,
/obj/item/clothing/under/rank/security/skirt = 2,
/obj/item/clothing/shoes/boots/jackboots = 3,
/obj/item/clothing/head/soft/sec = 3,
/obj/item/clothing/head/beret/sec = 3,
/obj/item/clothing/head/beret/sec/corporate/officer = 3,
/obj/item/clothing/mask/bandana/red = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/security = 3,
/obj/item/clothing/accessory/armband = 3,
/obj/item/clothing/accessory/holster/waist = 3)
/obj/structure/closet/wardrobe/red/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
return ..()
/obj/structure/closet/wardrobe/detective
name = "detective wardrobe"
closet_appearance = /decl/closet_appearance/cabinet
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/clothing/head/det = 2,
/obj/item/clothing/head/det/grey = 2,
/obj/item/clothing/shoes/brown = 2,
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/under/det = 2,
/obj/item/clothing/under/det/waistcoat = 2,
/obj/item/clothing/under/det/grey = 2,
/obj/item/clothing/under/det/grey/waistcoat = 2,
/obj/item/clothing/under/det/black = 2,
/obj/item/clothing/under/det/skirt,
/obj/item/clothing/under/det/corporate = 2,
/obj/item/clothing/suit/storage/det_trench = 2,
/obj/item/clothing/suit/storage/det_trench/grey = 2,
/obj/item/clothing/suit/storage/forensics/blue = 2,
/obj/item/clothing/suit/storage/forensics/red = 2)
/obj/structure/closet/wardrobe/pink
name = "pink wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/pink
starts_with = list(
/obj/item/clothing/under/color/pink = 3,
/obj/item/clothing/shoes/brown = 3)
/obj/structure/closet/wardrobe/black
name = "black wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/under/color/black = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/that = 3,
/obj/item/clothing/head/soft/black = 3,
/obj/item/clothing/mask/bandana = 3,
/obj/item/weapon/storage/backpack/messenger/black)
/obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe"
desc = "It's a storage unit for approved religious attire."
closet_appearance = /decl/closet_appearance/wardrobe/chapel
starts_with = list(
/obj/item/clothing/under/rank/chaplain,
/obj/item/clothing/shoes/black,
/obj/item/clothing/suit/nun,
/obj/item/clothing/head/nun_hood,
/obj/item/clothing/suit/storage/hooded/chaplain_hoodie,
/obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout,
/obj/item/clothing/suit/holidaypriest,
/obj/item/clothing/under/wedding/bride_white,
/obj/item/weapon/storage/backpack/cultpack,
/obj/item/weapon/storage/fancy/candle_box = 2,
/obj/item/weapon/storage/fancy/whitecandle_box,
/obj/item/weapon/storage/fancy/blackcandle_box,
/obj/item/godfig = 2,
/obj/item/weapon/deck/tarot)
/obj/structure/closet/wardrobe/monastary
name = "Monastary wardrobe"
desc = "It's a storage unit for approved religious attire."
closet_appearance = /decl/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/suit/unathi/mantle = 2,
/obj/item/clothing/suit/unathi/robe = 2,
/obj/item/clothing/shoes/sandal = 2,
/obj/item/clothing/shoes/footwraps = 2,
/obj/item/clothing/shoes/boots/winter = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat = 2)
/obj/structure/closet/wardrobe/green
name = "green wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/green
starts_with = list(
/obj/item/clothing/under/color/green = 3,
/obj/item/clothing/shoes/green = 3,
/obj/item/clothing/head/soft/green = 3,
/obj/item/clothing/mask/bandana/green = 3)
/obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/xenos
starts_with = list(
/obj/item/clothing/suit/unathi/mantle,
/obj/item/clothing/suit/unathi/robe,
/obj/item/clothing/shoes/sandal = 2,
/obj/item/clothing/shoes/footwraps = 2,
/obj/item/clothing/shoes/boots/winter = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat = 2)
/obj/structure/closet/wardrobe/orange
name = "prison wardrobe"
desc = "It's a storage unit for regulation prisoner attire."
closet_appearance = /decl/closet_appearance/wardrobe/orange
starts_with = list(
/obj/item/clothing/under/color/prison = 3,
/obj/item/clothing/shoes/orange = 3)
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/yellow
starts_with = list(
/obj/item/clothing/under/color/yellow = 3,
/obj/item/clothing/shoes/yellow = 3,
/obj/item/clothing/head/soft/yellow = 3,
/obj/item/clothing/mask/bandana/gold = 3)
/obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/engineer/atmos
starts_with = list(
/obj/item/clothing/under/rank/atmospheric_technician = 3,
/obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/hardhat/red = 3,
/obj/item/clothing/head/beret/engineering = 3,
/obj/item/clothing/mask/bandana/gold = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos = 3,
/obj/item/clothing/shoes/boots/winter/atmos = 3)
/obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/engineer
starts_with = list(
/obj/item/clothing/under/rank/engineer = 3,
/obj/item/clothing/under/rank/engineer/skirt = 3,
/obj/item/clothing/under/rank/engineer/turtleneck = 3,
/obj/item/clothing/shoes/orange = 3,
/obj/item/clothing/head/hardhat = 3,
/obj/item/clothing/head/beret/engineering = 3,
/obj/item/clothing/mask/bandana/gold = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 3,
/obj/item/clothing/shoes/boots/winter/engineering = 3,
/obj/item/clothing/shoes/boots/workboots = 3)
/obj/structure/closet/wardrobe/white
name = "white wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/color/white = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/head/soft/mime = 3)
/obj/structure/closet/wardrobe/pjs
name = "pajama wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/pjs
starts_with = list(
/obj/item/clothing/under/pj/red = 2,
/obj/item/clothing/under/pj/blue = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/shoes/slippers = 2)
/obj/structure/closet/wardrobe/science_white
name = "science wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/science
starts_with = list(
/obj/item/clothing/under/rank/scientist = 3,
/obj/item/clothing/under/rank/scientist/skirt = 2,
/obj/item/clothing/under/rank/scientist/turtleneck = 3,
/obj/item/clothing/suit/storage/toggle/labcoat = 3,
/obj/item/clothing/suit/storage/toggle/labcoat/modern = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/shoes/slippers = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/shoes/boots/winter/science,
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/science_white/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
return ..()
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/robotics
starts_with = list(
/obj/item/clothing/under/rank/roboticist = 2,
/obj/item/clothing/suit/storage/toggle/labcoat = 2,
/obj/item/clothing/shoes/black = 2,
/obj/item/clothing/gloves/black = 2,
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/robotics_black/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
return ..()
/obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/chemistry
starts_with = list(
/obj/item/clothing/under/rank/chemist = 2,
/obj/item/clothing/under/rank/chemist/skirt = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat/chemist = 2,
/obj/item/weapon/storage/backpack/chemistry = 2,
/obj/item/weapon/storage/backpack/satchel/chem = 2,
/obj/item/weapon/storage/bag/chemistry = 2,)
/obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/genetics
starts_with = list(
/obj/item/clothing/under/rank/geneticist = 2,
/obj/item/clothing/under/rank/geneticist/skirt = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat/genetics = 2,
/obj/item/weapon/storage/backpack/genetics = 2,
/obj/item/weapon/storage/backpack/satchel/gen = 2)
/obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/virology
starts_with = list(
/obj/item/clothing/under/rank/virologist = 2,
/obj/item/clothing/under/rank/virologist/skirt = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat/virologist = 2,
/obj/item/clothing/mask/surgical = 2,
/obj/item/weapon/storage/backpack/virology = 2,
/obj/item/weapon/storage/backpack/satchel/vir = 2)
/obj/structure/closet/wardrobe/medic_white
name = "medical wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/white
starts_with = list(
/obj/item/clothing/under/rank/medical = 2,
/obj/item/clothing/under/rank/medical/skirt = 2,
/obj/item/clothing/under/rank/medical/turtleneck = 2,
/obj/item/clothing/under/rank/medical/scrubs,
/obj/item/clothing/under/rank/medical/scrubs/green,
/obj/item/clothing/under/rank/medical/scrubs/purple,
/obj/item/clothing/under/rank/medical/scrubs/black,
/obj/item/clothing/under/rank/medical/scrubs/navyblue,
/obj/item/clothing/head/surgery/navyblue,
/obj/item/clothing/head/surgery/purple,
/obj/item/clothing/head/surgery/blue,
/obj/item/clothing/head/surgery/green,
/obj/item/clothing/head/surgery/black,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat = 2,
/obj/item/clothing/mask/surgical = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 2,
/obj/item/clothing/shoes/boots/winter/medical = 2)
/obj/structure/closet/wardrobe/medic_gown
name = "cloning wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/patient
starts_with = list(
/obj/item/clothing/under/medigown = 4)
/obj/structure/closet/wardrobe/grey
name = "grey wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/grey
starts_with = list(
/obj/item/clothing/under/color/grey = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/soft/grey = 3)
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/color/blue,
/obj/item/clothing/under/color/yellow,
/obj/item/clothing/under/color/green,
/obj/item/clothing/under/color/pink,
/obj/item/clothing/under/skirt/outfit/plaid_blue,
/obj/item/clothing/under/skirt/outfit/plaid_red,
/obj/item/clothing/under/skirt/outfit/plaid_purple,
/obj/item/clothing/shoes/blue,
/obj/item/clothing/shoes/yellow,
/obj/item/clothing/shoes/green,
/obj/item/clothing/shoes/purple,
/obj/item/clothing/shoes/red,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/under/pants/classicjeans,
/obj/item/clothing/under/pants/mustangjeans,
/obj/item/clothing/under/pants/blackjeans,
/obj/item/clothing/under/pants/youngfolksjeans,
/obj/item/clothing/under/pants/white,
/obj/item/clothing/under/pants/red,
/obj/item/clothing/under/pants/black,
/obj/item/clothing/under/pants/tan,
/obj/item/clothing/under/pants/track,
/obj/item/clothing/suit/storage/toggle/track,
/obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/mask/bandana/blue,
/obj/item/clothing/mask/bandana/blue,
/obj/item/clothing/accessory/hawaiian,
/obj/item/clothing/accessory/hawaiian/blue,
/obj/item/clothing/accessory/hawaiian/pink,
/obj/item/clothing/accessory/hawaiian/red,
/obj/item/clothing/accessory/hawaiian/yellow)
/obj/structure/closet/wardrobe/tactical
name = "tactical equipment"
closet_appearance = /decl/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/under/tactical,
/obj/item/clothing/suit/armor/tactical,
/obj/item/clothing/head/helmet/tactical,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/gloves/black,
/obj/item/clothing/under/pants/camo)
/obj/structure/closet/wardrobe/tactical/Initialize()
if(prob(25))
starts_with += /obj/item/weapon/storage/belt/security/tactical/bandolier
else
starts_with += /obj/item/weapon/storage/belt/security/tactical
if(prob(10))
starts_with += /obj/item/clothing/mask/bandana/skull
return ..()
/obj/structure/closet/wardrobe/ert
name = "emergency response team equipment"
closet_appearance = /decl/closet_appearance/ert
starts_with = list(
/obj/item/clothing/under/rank/centcom,
/obj/item/clothing/under/ert,
/obj/item/clothing/under/syndicate/combat,
/obj/item/device/radio/headset/ert/alt,
/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,
/obj/item/clothing/mask/bandana/skull = 2,
/obj/item/clothing/mask/gas/sechailer/swat)
/obj/structure/closet/wardrobe/suit
name = "suit locker"
closet_appearance = /decl/closet_appearance/wardrobe/suit
starts_with = list(
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/suit_jacket/charcoal,
/obj/item/clothing/under/suit_jacket/charcoal/skirt,
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit_jacket/navy/skirt,
/obj/item/clothing/under/suit_jacket/burgundy,
/obj/item/clothing/under/suit_jacket/burgundy/skirt,
/obj/item/clothing/under/suit_jacket/checkered,
/obj/item/clothing/under/suit_jacket/checkered/skirt,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/suit_jacket/tan/skirt,
/obj/item/clothing/under/sl_suit,
/obj/item/clothing/under/suit_jacket,
/obj/item/clothing/under/suit_jacket/female,
/obj/item/clothing/under/suit_jacket/female/skirt,
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/under/suit_jacket/really_black/skirt,
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit_jacket/red/skirt,
/obj/item/clothing/under/scratch,
/obj/item/clothing/under/scratch/skirt,
/obj/item/weapon/storage/backpack/satchel = 2)
/obj/structure/closet/wardrobe/captain
name = "site manager's wardrobe"
closet_appearance = /decl/closet_appearance/cabinet
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/weapon/storage/backpack/captain,
/obj/item/clothing/suit/captunic,
/obj/item/clothing/suit/captunic/capjacket,
/obj/item/clothing/head/caphat/cap,
/obj/item/clothing/head/caphat/beret,
/obj/item/clothing/under/rank/captain,
/obj/item/clothing/under/dress/dress_cap/femformal,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/gloves/captain,
/obj/item/clothing/under/dress/dress_cap,
/obj/item/weapon/storage/backpack/satchel/cap,
/obj/item/clothing/head/caphat/formal,
/obj/item/clothing/under/captainformal,
/obj/item/clothing/suit/storage/hooded/wintercoat/captain,
/obj/item/clothing/shoes/boots/winter/command,
/obj/item/clothing/head/beret/centcom/captain,
/obj/item/clothing/under/suit_jacket/green,
/obj/item/clothing/under/suit_jacket/green/skirt,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat)
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue attire."
closet_appearance = /decl/closet_appearance/wardrobe
/obj/structure/closet/wardrobe/red
name = "security wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/red
starts_with = list(
/obj/item/clothing/under/rank/security = 3,
/obj/item/clothing/under/rank/security2 = 3,
/obj/item/clothing/under/rank/security/turtleneck = 3,
/obj/item/clothing/under/rank/security/skirt = 2,
/obj/item/clothing/shoes/boots/jackboots = 3,
/obj/item/clothing/head/soft/sec = 3,
/obj/item/clothing/head/beret/sec = 3,
/obj/item/clothing/head/beret/sec/corporate/officer = 3,
/obj/item/clothing/mask/bandana/red = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/security = 3,
/obj/item/clothing/accessory/armband = 3,
/obj/item/clothing/accessory/holster/waist = 3)
/obj/structure/closet/wardrobe/red/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
starts_with += /obj/item/weapon/storage/backpack/satchel/sec
return ..()
/obj/structure/closet/wardrobe/detective
name = "detective wardrobe"
closet_appearance = /decl/closet_appearance/cabinet
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/clothing/head/det = 2,
/obj/item/clothing/head/det/grey = 2,
/obj/item/clothing/shoes/brown = 2,
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/under/det = 2,
/obj/item/clothing/under/det/waistcoat = 2,
/obj/item/clothing/under/det/grey = 2,
/obj/item/clothing/under/det/grey/waistcoat = 2,
/obj/item/clothing/under/det/black = 2,
/obj/item/clothing/under/det/skirt,
/obj/item/clothing/under/det/corporate = 2,
/obj/item/clothing/suit/storage/det_trench = 2,
/obj/item/clothing/suit/storage/det_trench/grey = 2,
/obj/item/clothing/suit/storage/forensics/blue = 2,
/obj/item/clothing/suit/storage/forensics/red = 2)
/obj/structure/closet/wardrobe/pink
name = "pink wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/pink
starts_with = list(
/obj/item/clothing/under/color/pink = 3,
/obj/item/clothing/shoes/brown = 3)
/obj/structure/closet/wardrobe/black
name = "black wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/under/color/black = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/that = 3,
/obj/item/clothing/head/soft/black = 3,
/obj/item/clothing/mask/bandana = 3,
/obj/item/weapon/storage/backpack/messenger/black)
/obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe"
desc = "It's a storage unit for approved religious attire."
closet_appearance = /decl/closet_appearance/wardrobe/chapel
starts_with = list(
/obj/item/clothing/under/rank/chaplain,
/obj/item/clothing/shoes/black,
/obj/item/clothing/suit/nun,
/obj/item/clothing/head/nun_hood,
/obj/item/clothing/suit/storage/hooded/chaplain_hoodie,
/obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout,
/obj/item/clothing/suit/holidaypriest,
/obj/item/clothing/under/wedding/bride_white,
/obj/item/weapon/storage/backpack/cultpack,
/obj/item/weapon/storage/fancy/candle_box = 2,
/obj/item/weapon/storage/fancy/whitecandle_box,
/obj/item/weapon/storage/fancy/blackcandle_box,
/obj/item/godfig = 2,
/obj/item/weapon/deck/tarot)
/obj/structure/closet/wardrobe/monastary
name = "Monastary wardrobe"
desc = "It's a storage unit for approved religious attire."
closet_appearance = /decl/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/suit/unathi/mantle = 2,
/obj/item/clothing/suit/unathi/robe = 2,
/obj/item/clothing/shoes/sandal = 2,
/obj/item/clothing/shoes/footwraps = 2,
/obj/item/clothing/shoes/boots/winter = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat = 2)
/obj/structure/closet/wardrobe/green
name = "green wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/green
starts_with = list(
/obj/item/clothing/under/color/green = 3,
/obj/item/clothing/shoes/green = 3,
/obj/item/clothing/head/soft/green = 3,
/obj/item/clothing/mask/bandana/green = 3)
/obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/xenos
starts_with = list(
/obj/item/clothing/suit/unathi/mantle,
/obj/item/clothing/suit/unathi/robe,
/obj/item/clothing/shoes/sandal = 2,
/obj/item/clothing/shoes/footwraps = 2,
/obj/item/clothing/shoes/boots/winter = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat = 2)
/obj/structure/closet/wardrobe/orange
name = "prison wardrobe"
desc = "It's a storage unit for regulation prisoner attire."
closet_appearance = /decl/closet_appearance/wardrobe/orange
starts_with = list(
/obj/item/clothing/under/color/prison = 3,
/obj/item/clothing/shoes/orange = 3)
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/yellow
starts_with = list(
/obj/item/clothing/under/color/yellow = 3,
/obj/item/clothing/shoes/yellow = 3,
/obj/item/clothing/head/soft/yellow = 3,
/obj/item/clothing/mask/bandana/gold = 3)
/obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/engineer/atmos
starts_with = list(
/obj/item/clothing/under/rank/atmospheric_technician = 3,
/obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/hardhat/red = 3,
/obj/item/clothing/head/beret/engineering = 3,
/obj/item/clothing/mask/bandana/gold = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos = 3,
/obj/item/clothing/shoes/boots/winter/atmos = 3)
/obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/engineer
starts_with = list(
/obj/item/clothing/under/rank/engineer = 3,
/obj/item/clothing/under/rank/engineer/skirt = 3,
/obj/item/clothing/under/rank/engineer/turtleneck = 3,
/obj/item/clothing/shoes/orange = 3,
/obj/item/clothing/head/hardhat = 3,
/obj/item/clothing/head/beret/engineering = 3,
/obj/item/clothing/mask/bandana/gold = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 3,
/obj/item/clothing/shoes/boots/winter/engineering = 3,
/obj/item/clothing/shoes/boots/workboots = 3)
/obj/structure/closet/wardrobe/white
name = "white wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/color/white = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/head/soft/mime = 3)
/obj/structure/closet/wardrobe/pjs
name = "pajama wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/pjs
starts_with = list(
/obj/item/clothing/under/pj/red = 2,
/obj/item/clothing/under/pj/blue = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/shoes/slippers = 2)
/obj/structure/closet/wardrobe/science_white
name = "science wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/science
starts_with = list(
/obj/item/clothing/under/rank/scientist = 3,
/obj/item/clothing/under/rank/scientist/skirt = 2,
/obj/item/clothing/under/rank/scientist/turtleneck = 3,
/obj/item/clothing/suit/storage/toggle/labcoat = 3,
/obj/item/clothing/suit/storage/toggle/labcoat/modern = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/shoes/slippers = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/shoes/boots/winter/science,
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/science_white/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
return ..()
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/robotics
starts_with = list(
/obj/item/clothing/under/rank/roboticist = 2,
/obj/item/clothing/suit/storage/toggle/labcoat = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics,
/obj/item/clothing/shoes/black = 2,
/obj/item/clothing/gloves/black = 2,
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/robotics_black/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
starts_with += /obj/item/weapon/storage/backpack/satchel/tox
return ..()
/obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/chemistry
starts_with = list(
/obj/item/clothing/under/rank/chemist = 2,
/obj/item/clothing/under/rank/chemist/skirt = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat/chemist = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist,
/obj/item/weapon/storage/backpack/chemistry = 2,
/obj/item/weapon/storage/backpack/satchel/chem = 2,
/obj/item/weapon/storage/bag/chemistry = 2,)
/obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/genetics
starts_with = list(
/obj/item/clothing/under/rank/geneticist = 2,
/obj/item/clothing/under/rank/geneticist/skirt = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat/genetics = 2,
/obj/item/weapon/storage/backpack/genetics = 2,
/obj/item/weapon/storage/backpack/satchel/gen = 2)
/obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/virology
starts_with = list(
/obj/item/clothing/under/rank/virologist = 2,
/obj/item/clothing/under/rank/virologist/skirt = 2,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat/virologist = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro,
/obj/item/clothing/mask/surgical = 2,
/obj/item/weapon/storage/backpack/virology = 2,
/obj/item/weapon/storage/backpack/satchel/vir = 2)
/obj/structure/closet/wardrobe/medic_white
name = "medical wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/white
starts_with = list(
/obj/item/clothing/under/rank/medical = 2,
/obj/item/clothing/under/rank/medical/skirt = 2,
/obj/item/clothing/under/rank/medical/turtleneck = 2,
/obj/item/clothing/under/rank/medical/scrubs,
/obj/item/clothing/under/rank/medical/scrubs/green,
/obj/item/clothing/under/rank/medical/scrubs/purple,
/obj/item/clothing/under/rank/medical/scrubs/black,
/obj/item/clothing/under/rank/medical/scrubs/navyblue,
/obj/item/clothing/head/surgery/navyblue,
/obj/item/clothing/head/surgery/purple,
/obj/item/clothing/head/surgery/blue,
/obj/item/clothing/head/surgery/green,
/obj/item/clothing/head/surgery/black,
/obj/item/clothing/shoes/white = 2,
/obj/item/clothing/suit/storage/toggle/labcoat = 2,
/obj/item/clothing/mask/surgical = 2,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 2,
/obj/item/clothing/shoes/boots/winter/medical = 2)
/obj/structure/closet/wardrobe/medic_gown
name = "cloning wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/medical/patient
starts_with = list(
/obj/item/clothing/under/medigown = 4)
/obj/structure/closet/wardrobe/grey
name = "grey wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/grey
starts_with = list(
/obj/item/clothing/under/color/grey = 3,
/obj/item/clothing/shoes/black = 3,
/obj/item/clothing/head/soft/grey = 3)
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/color/blue,
/obj/item/clothing/under/color/yellow,
/obj/item/clothing/under/color/green,
/obj/item/clothing/under/color/pink,
/obj/item/clothing/under/skirt/outfit/plaid_blue,
/obj/item/clothing/under/skirt/outfit/plaid_red,
/obj/item/clothing/under/skirt/outfit/plaid_purple,
/obj/item/clothing/shoes/blue,
/obj/item/clothing/shoes/yellow,
/obj/item/clothing/shoes/green,
/obj/item/clothing/shoes/purple,
/obj/item/clothing/shoes/red,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/under/pants/classicjeans,
/obj/item/clothing/under/pants/mustangjeans,
/obj/item/clothing/under/pants/blackjeans,
/obj/item/clothing/under/pants/youngfolksjeans,
/obj/item/clothing/under/pants/white,
/obj/item/clothing/under/pants/red,
/obj/item/clothing/under/pants/black,
/obj/item/clothing/under/pants/tan,
/obj/item/clothing/under/pants/track,
/obj/item/clothing/suit/storage/toggle/track,
/obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/mask/bandana/blue,
/obj/item/clothing/mask/bandana/blue,
/obj/item/clothing/accessory/hawaiian,
/obj/item/clothing/accessory/hawaiian/blue,
/obj/item/clothing/accessory/hawaiian/pink,
/obj/item/clothing/accessory/hawaiian/red,
/obj/item/clothing/accessory/hawaiian/yellow)
/obj/structure/closet/wardrobe/tactical
name = "tactical equipment"
closet_appearance = /decl/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/under/tactical,
/obj/item/clothing/suit/armor/tactical,
/obj/item/clothing/head/helmet/tactical,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/gloves/black,
/obj/item/clothing/under/pants/camo)
/obj/structure/closet/wardrobe/tactical/Initialize()
if(prob(25))
starts_with += /obj/item/weapon/storage/belt/security/tactical/bandolier
else
starts_with += /obj/item/weapon/storage/belt/security/tactical
if(prob(10))
starts_with += /obj/item/clothing/mask/bandana/skull
return ..()
/obj/structure/closet/wardrobe/ert
name = "emergency response team equipment"
closet_appearance = /decl/closet_appearance/ert
starts_with = list(
/obj/item/clothing/under/rank/centcom,
/obj/item/clothing/under/ert,
/obj/item/clothing/under/syndicate/combat,
/obj/item/device/radio/headset/ert/alt,
/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,
/obj/item/clothing/mask/bandana/skull = 2,
/obj/item/clothing/mask/gas/sechailer/swat)
/obj/structure/closet/wardrobe/suit
name = "suit locker"
closet_appearance = /decl/closet_appearance/wardrobe/suit
starts_with = list(
/obj/item/clothing/under/assistantformal,
/obj/item/clothing/under/suit_jacket/charcoal,
/obj/item/clothing/under/suit_jacket/charcoal/skirt,
/obj/item/clothing/under/suit_jacket/navy,
/obj/item/clothing/under/suit_jacket/navy/skirt,
/obj/item/clothing/under/suit_jacket/burgundy,
/obj/item/clothing/under/suit_jacket/burgundy/skirt,
/obj/item/clothing/under/suit_jacket/checkered,
/obj/item/clothing/under/suit_jacket/checkered/skirt,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/suit_jacket/tan/skirt,
/obj/item/clothing/under/sl_suit,
/obj/item/clothing/under/suit_jacket,
/obj/item/clothing/under/suit_jacket/female,
/obj/item/clothing/under/suit_jacket/female/skirt,
/obj/item/clothing/under/suit_jacket/really_black,
/obj/item/clothing/under/suit_jacket/really_black/skirt,
/obj/item/clothing/under/suit_jacket/red,
/obj/item/clothing/under/suit_jacket/red/skirt,
/obj/item/clothing/under/scratch,
/obj/item/clothing/under/scratch/skirt,
/obj/item/weapon/storage/backpack/satchel = 2)
/obj/structure/closet/wardrobe/captain
name = "site manager's wardrobe"
closet_appearance = /decl/closet_appearance/cabinet
open_sound = 'sound/effects/wooden_closet_open.ogg'
close_sound = 'sound/effects/wooden_closet_close.ogg'
starts_with = list(
/obj/item/weapon/storage/backpack/captain,
/obj/item/clothing/suit/captunic,
/obj/item/clothing/suit/captunic/capjacket,
/obj/item/clothing/head/caphat/cap,
/obj/item/clothing/head/caphat/beret,
/obj/item/clothing/under/rank/captain,
/obj/item/clothing/under/dress/dress_cap/femformal,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/gloves/captain,
/obj/item/clothing/under/dress/dress_cap,
/obj/item/weapon/storage/backpack/satchel/cap,
/obj/item/clothing/head/caphat/formal,
/obj/item/clothing/under/captainformal,
/obj/item/clothing/suit/storage/hooded/wintercoat/captain,
/obj/item/clothing/shoes/boots/winter/command,
/obj/item/clothing/head/beret/centcom/captain,
/obj/item/clothing/under/suit_jacket/green,
/obj/item/clothing/under/suit_jacket/green/skirt,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat)
@@ -155,7 +155,7 @@
bound_height = width * world.icon_size
/obj/structure/door_assembly/proc/rename_door(mob/living/user)
var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for the windoor.", src.name, src.created_name, MAX_NAME_LEN), MAX_NAME_LEN)
var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for the [base_name].", src.name, src.created_name, MAX_NAME_LEN), MAX_NAME_LEN)
if(!in_range(src, user) && src.loc != user) return
created_name = t
update_state()
@@ -17,8 +17,10 @@
if(busy)
return FALSE
visible_message(alert)
log_and_message_admins(adminalert)
if(alert)
visible_message(alert)
if(adminalert)
log_and_message_admins(adminalert)
busy = TRUE
var/datum/ghost_query/Q = new ghost_query_type()
var/list/winner = Q.query()
File diff suppressed because it is too large Load Diff
@@ -93,14 +93,52 @@
color = null
applies_material_colour = 0
// Leaving this in for the sake of compilation.
/obj/structure/bed/chair/comfy
name = "comfy chair"
desc = "It's a chair. It looks comfy."
icon_state = "comfychair"
base_icon = "comfychair"
/obj/structure/bed/chair/comfy/brown/New(var/newloc,var/newmaterial)
..(newloc,"steel","leather")
/obj/structure/bed/chair/comfy/update_icon()
..()
var/image/I = image(icon, "[base_icon]_over")
I.layer = ABOVE_MOB_LAYER
I.plane = MOB_PLANE
I.color = material.icon_colour
add_overlay(I)
if(padding_material)
I = image(icon, "[base_icon]_padding_over")
I.layer = ABOVE_MOB_LAYER
I.plane = MOB_PLANE
I.color = padding_material.icon_colour
add_overlay(I)
/obj/structure/bed/chair/comfy/brown/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/red/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "carpet")
/obj/structure/bed/chair/comfy/teal/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "teal")
/obj/structure/bed/chair/comfy/black/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "black")
/obj/structure/bed/chair/comfy/green/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "green")
/obj/structure/bed/chair/comfy/purp/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "purple")
/obj/structure/bed/chair/comfy/blue/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "blue")
/obj/structure/bed/chair/comfy/beige/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "beige")
/obj/structure/bed/chair/comfy/lime/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "lime")
/obj/structure/bed/chair/comfy/red/New(var/newloc,var/newmaterial)
..(newloc,"steel","carpet")
@@ -108,29 +146,50 @@
/obj/structure/bed/chair/comfy/teal/New(var/newloc,var/newmaterial)
..(newloc,"steel","teal")
/obj/structure/bed/chair/comfy/black/New(var/newloc,var/newmaterial)
..(newloc,"steel","black")
/obj/structure/bed/chair/comfy/yellow/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "yellow")
/obj/structure/bed/chair/comfy/green/New(var/newloc,var/newmaterial)
..(newloc,"steel","green")
/obj/structure/bed/chair/comfy/orange/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "orange")
/obj/structure/bed/chair/comfy/purp/New(var/newloc,var/newmaterial)
..(newloc,"steel","purple")
/obj/structure/bed/chair/comfy/rounded
name = "rounded chair"
desc = "It's a rounded chair. It looks comfy."
icon_state = "roundedchair"
base_icon = "roundedchair"
/obj/structure/bed/chair/comfy/blue/New(var/newloc,var/newmaterial)
..(newloc,"steel","blue")
/obj/structure/bed/chair/comfy/rounded/brown/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/beige/New(var/newloc,var/newmaterial)
..(newloc,"steel","beige")
/obj/structure/bed/chair/comfy/rounded/red/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "carpet")
/obj/structure/bed/chair/comfy/lime/New(var/newloc,var/newmaterial)
..(newloc,"steel","lime")
/obj/structure/bed/chair/comfy/rounded/teal/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "teal")
/obj/structure/bed/chair/comfy/yellow/New(var/newloc,var/newmaterial)
..(newloc,"steel","yellow")
/obj/structure/bed/chair/comfy/rounded/black/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "black")
/obj/structure/bed/chair/comfy/orange/New(var/newloc,var/newmaterial)
..(newloc,"steel","orange")
/obj/structure/bed/chair/comfy/rounded/green/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "green")
/obj/structure/bed/chair/comfy/rounded/purple/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "purple")
/obj/structure/bed/chair/comfy/rounded/blue/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "blue")
/obj/structure/bed/chair/comfy/rounded/beige/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "beige")
/obj/structure/bed/chair/comfy/rounded/lime/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "lime")
/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "yellow")
/obj/structure/bed/chair/comfy/rounded/orange/Initialize(var/ml,var/newmaterial)
. = ..(ml, MAT_STEEL, "orange")
/obj/structure/bed/chair/office
anchored = FALSE
@@ -146,7 +205,7 @@
/obj/structure/bed/chair/office/Moved(atom/old_loc, direction, forced = FALSE)
. = ..()
playsound(src, 'sound/effects/roll.ogg', 100, 1)
/obj/structure/bed/chair/office/handle_buckled_mob_movement(atom/new_loc, direction, movetime)
@@ -303,6 +303,7 @@
prob(1);/obj/item/weapon/beartrap,
prob(1);/obj/item/weapon/cell/hyper/empty,
prob(1);/obj/item/weapon/disk/nifsoft/compliance,
prob(1);/obj/item/weapon/implanter/compliance,
prob(1);/obj/item/weapon/material/knife/tacknife,
prob(1);/obj/item/weapon/storage/box/survival/space,
prob(1);/obj/item/weapon/storage/secure/briefcase/trashmoney,