From 59f46508b9918031b57a0f3dd35ad5562e073965 Mon Sep 17 00:00:00 2001 From: Ktlwjec Date: Mon, 2 Dec 2019 13:04:19 +0000 Subject: [PATCH] demodularise --- .../structures/crates_lockers/closets.dm | 1 + .../closets/bluespace_locker.dm | 0 .../crates_lockers/closets/bodybag.dm | 1 + .../crates_lockers/closets/job_closets.dm | 16 ++++ .../crates_lockers/closets/secure/cargo.dm | 1 + .../closets/secure/engineering.dm | 6 ++ .../crates_lockers/closets/secure/medical.dm | 75 +++++++++++++++ .../closets/secure/scientist.dm | 3 + .../crates_lockers/closets/secure/security.dm | 35 ++++++- .../crates_lockers/closets/secure/service.dm | 6 +- .../structures/crates_lockers/crates.dm | 93 ++++++++++++++++++- yogstation.dme | 11 +-- .../structures/crates_lockers/closet.dm | 2 - .../crates_lockers/closets/bodybag.dm | 2 - .../crates_lockers/closets/job_closets.dm | 16 ---- .../crates_lockers/closets/secure/command.dm | 61 ------------ .../crates_lockers/closets/secure/medical.dm | 74 --------------- .../crates_lockers/closets/secure/security.dm | 27 ------ .../structures/crates_lockers/crates.dm | 91 ------------------ 19 files changed, 231 insertions(+), 290 deletions(-) rename {yogstation/code => code}/game/objects/structures/crates_lockers/closets/bluespace_locker.dm (100%) rename {yogstation/code => code}/game/objects/structures/crates_lockers/closets/secure/service.dm (86%) delete mode 100644 yogstation/code/game/objects/structures/crates_lockers/closet.dm delete mode 100644 yogstation/code/game/objects/structures/crates_lockers/closets/bodybag.dm delete mode 100644 yogstation/code/game/objects/structures/crates_lockers/closets/job_closets.dm delete mode 100644 yogstation/code/game/objects/structures/crates_lockers/closets/secure/command.dm delete mode 100644 yogstation/code/game/objects/structures/crates_lockers/closets/secure/medical.dm delete mode 100644 yogstation/code/game/objects/structures/crates_lockers/closets/secure/security.dm delete mode 100644 yogstation/code/game/objects/structures/crates_lockers/crates.dm diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9105d016f6c3..afc924d08648 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -33,6 +33,7 @@ var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable. var/anchorable = TRUE var/icon_welded = "welded" + var/notreallyacloset = FALSE // It is genuinely a closet /obj/structure/closet/Initialize(mapload) diff --git a/yogstation/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm b/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm similarity index 100% rename from yogstation/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm rename to code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index dabea93b4585..d280f5d4bd5e 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -12,6 +12,7 @@ material_drop = /obj/item/stack/sheet/cloth delivery_icon = null //unwrappable anchorable = FALSE + notreallyacloset = TRUE var/foldedbag_path = /obj/item/bodybag var/obj/item/bodybag/foldedbag_instance = null var/tagged = 0 // so closet code knows to put the tag overlay back diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index a07172d9301c..cba9d166268b 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -309,3 +309,19 @@ new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/storage/backpack/satchel/explorer(src) +/obj/structure/closet/wardrobe/tcomms + name = "signal tech wardrobe" + icon = 'yogstation/icons/obj/closet.dmi' + icon_state = "sigtech" + icon_door = "sigtech" + +/obj/structure/closet/wardrobe/tcomms/PopulateContents() + ..() + contents = list() + new /obj/item/storage/backpack/duffelbag/engineering(src) + new /obj/item/storage/backpack/industrial(src) + new /obj/item/storage/backpack/satchel/eng(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering/tcomms(src) + new /obj/item/clothing/under/yogs/rank/signal_tech(src) + new /obj/item/clothing/shoes/workboots(src) + new /obj/item/clothing/under/yogs/rank/signal_tech/skirt(src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index ff05844ebf6f..68b83d48b97b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -22,3 +22,4 @@ new /obj/item/circuitboard/machine/techfab/department/cargo(src) new /obj/item/storage/photo_album/QM(src) new /obj/item/circuitboard/machine/ore_silo(src) + new /obj/item/card/id/departmental_budget/car(src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index bc98c345489c..3e9558eff236 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -33,6 +33,12 @@ new /obj/item/extinguisher/advanced(src) new /obj/item/storage/photo_album/CE(src) new /obj/item/energy_harvester(src) + new /obj/item/clipboard/yog/paperwork/ce(src) + new /obj/item/card/id/departmental_budget/eng(src) + new /obj/item/clothing/under/yogs/ceturtleneck(src) + new /obj/item/clothing/under/yogs/cecasual(src) + new /obj/item/clothing/head/beret/ce(src) + new /obj/item/poster/firstsingularity(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index d82e5035afbd..c18951d26046 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -75,6 +75,78 @@ new /obj/item/wallframe/defib_mount(src) new /obj/item/circuitboard/machine/techfab/department/medical(src) new /obj/item/storage/photo_album/CMO(src) + new /obj/item/clipboard/yog/paperwork/cmo(src) + new /obj/item/card/id/departmental_budget/med(src) + new /obj/item/clothing/head/beret/cmo(src) + +/obj/structure/closet/secure_closet/paramedic + name = "paramedical closet" + desc = "It's a secure storage unit for paramedical supplies." + icon = 'yogstation/icons/obj/closet.dmi' + icon_state = "paramed" + req_access = list(ACCESS_PARAMEDIC) + +/obj/structure/closet/secure_closet/paramedic/PopulateContents() + ..() + if(prob(50)) + new /obj/item/storage/backpack/medic(src) + else + new /obj/item/storage/backpack/satchel/med(src) + new /obj/item/storage/firstaid/regular(src) + new /obj/item/clothing/shoes/sneakers/white(src) + switch(pick("blue", "green", "purple")) + if ("blue") + new /obj/item/clothing/under/rank/medical/blue(src) + if ("green") + new /obj/item/clothing/under/rank/medical/green(src) + if ("purple") + new /obj/item/clothing/under/rank/medical/purple(src) + switch(pick("blue", "green", "purple")) + if ("blue") + new /obj/item/clothing/under/rank/medical/blue(src) + if ("green") + new /obj/item/clothing/under/rank/medical/green(src) + if ("purple") + new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/under/rank/medical(src) + new /obj/item/clothing/suit/toggle/labcoat/emt(src) + new /obj/item/clothing/head/soft/emt(src) + new /obj/item/defibrillator/loaded(src) + new /obj/item/clothing/suit/toggle/labcoat/pmedic_jacket(src) + new /obj/item/radio/headset/headset_med(src) + new /obj/item/storage/belt/medical(src) + +/obj/structure/closet/secure_closet/mmedical + name = "mining medic's locker" + req_access = list(ACCESS_MEDICAL) + icon = 'yogstation/icons/obj/closet.dmi' + icon_state = "medic" + +/obj/structure/closet/secure_closet/mmedical/PopulateContents() + ..() + new /obj/item/reagent_containers/hypospray/mixi(src) + new /obj/item/reagent_containers/hypospray/derm(src) + if(prob(50)) + new /obj/item/storage/backpack/medic(src) + else + new /obj/item/storage/backpack/satchel/med(src) + new /obj/item/defibrillator/loaded(src) + new /obj/item/clothing/suit/toggle/labcoat/emt/explorer(src) + new /obj/item/clothing/under/yogs/rank/miner/medic(src) + new /obj/item/clothing/shoes/sneakers/white(src) + new /obj/item/cartridge/medical(src) + new /obj/item/radio/headset/headset_cargo(src) + new /obj/item/storage/firstaid/toxin(src) + new /obj/item/clothing/mask/gas/explorer(src) + new /obj/item/storage/belt/medical(src) + new /obj/item/pickaxe(src) + new /obj/item/sensor_device(src) + new /obj/item/storage/box/bodybags(src) + new /obj/item/extinguisher/mini(src) + new /obj/item/clothing/glasses/hud/health(src) + var/obj/item/key/K = new(src) + K.name = "ATV key" + K.desc = "It's a small grey key. Don't let those goddamn ashwalkers get it." /obj/structure/closet/secure_closet/animal name = "animal control" @@ -98,6 +170,9 @@ new /obj/item/storage/box/pillbottles(src) new /obj/item/storage/box/medsprays(src) new /obj/item/storage/box/medsprays(src) + new /obj/item/reagent_containers/glass/bottle/facid(src) + new /obj/item/reagent_containers/glass/bottle/capsaicin(src) + new /obj/item/reagent_containers/glass/bottle/mutagen(src) /obj/structure/closet/secure_closet/chemical/heisenberg //contains one of each beaker, syringe etc. name = "advanced chemical closet" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index d583425db218..2c581b1ca4a1 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -29,3 +29,6 @@ new /obj/item/door_remote/research_director(src) new /obj/item/circuitboard/machine/techfab/department/science(src) new /obj/item/storage/photo_album/RD(src) + new /obj/item/clipboard/yog/paperwork/rd(src) + new /obj/item/card/id/departmental_budget/sci(src) + new /obj/item/clothing/under/yogs/rdema(src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index ccc423a05ddb..1c651ce636c5 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -13,10 +13,12 @@ new /obj/item/radio/headset/heads/captain(src) new /obj/item/restraints/handcuffs/cable/zipties(src) new /obj/item/storage/belt/sabre(src) - // new /obj/item/gun/energy/e_gun(src) - yogs new /obj/item/door_remote/captain(src) new /obj/item/card/id/captains_spare(src) new /obj/item/storage/photo_album/Captain(src) + new /obj/item/clipboard/yog/paperwork/captain(src) + new /obj/item/card/id/departmental_budget/civ(src) + new /obj/item/radio/security(src) /obj/structure/closet/secure_closet/hop name = "\proper head of personnel's locker" @@ -45,6 +47,12 @@ new /obj/item/door_remote/civillian(src) new /obj/item/circuitboard/machine/techfab/department/service(src) new /obj/item/storage/photo_album/HoP(src) + new /obj/item/clipboard/yog/paperwork/hop(src) + new /obj/item/card/id/departmental_budget/srv(src) + new /obj/item/gun/energy/e_gun/mini(src) //hop doesn't get a proper gun + new /obj/item/clothing/suit/armor/vest/rurmcoat(src) + new /obj/item/clothing/suit/armor/vest/sovietcoat(src) + new /obj/item/clothing/under/yogs/hopcasual(src) /obj/structure/closet/secure_closet/hos name = "\proper head of security's locker" @@ -80,6 +88,14 @@ new /obj/item/pinpointer/nuke(src) new /obj/item/circuitboard/machine/techfab/department/security(src) new /obj/item/storage/photo_album/HoS(src) + new /obj/item/clipboard/yog/paperwork/hos(src) + new /obj/item/clothing/under/yogs/lieutgeneral(src) + new /obj/item/clothing/under/yogs/dictatorhos(src) + new /obj/item/clothing/suit/armor/hos/germancoat(src) + new /obj/item/clothing/under/yogs/hoslatenight(src) + new /obj/item/clothing/under/yogs/hoscasual(src) + new /obj/item/clothing/suit/armor/vest/hosjacket(src) + new /obj/item/radio/security(src) /obj/structure/closet/secure_closet/warden name = "\proper warden's locker" @@ -107,6 +123,13 @@ new /obj/item/door_remote/head_of_security(src) new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) new /obj/item/clothing/shoes/jackboots/warden(src) + new /obj/item/clipboard/yog/paperwork/warden(src) + new /obj/item/card/id/departmental_budget/sec(src) + new /obj/item/clothing/under/yogs/ocelot(src) + new /obj/item/clothing/under/yogs/krofficer(src) + new /obj/item/clothing/head/beret/corpwarden(src) + new /obj/item/clothing/suit/armor/vest/wardenjacket(src) + new /obj/item/radio/security(src) /obj/structure/closet/secure_closet/security name = "security officer's locker" @@ -121,6 +144,8 @@ new /obj/item/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/flashlight/seclite(src) + new /obj/item/radio/security(src) + new /obj/item/clipboard/yog/paperwork/security(src) /obj/structure/closet/secure_closet/security/sec @@ -187,6 +212,14 @@ new /obj/item/storage/belt/holster/full(src) new /obj/item/pinpointer/crew(src) new /obj/item/twohanded/binoculars(src) + new /obj/item/clothing/under/yogs/forensictech(src) + new /obj/item/clothing/under/yogs/bluedetective(src) + new /obj/item/clothing/under/yogs/golddetective(src) + new /obj/item/clothing/under/yogs/greydetective(src) + new /obj/item/clothing/under/yogs/blackdetective(src) + new /obj/item/clothing/suit/yogs/golddetective(src) + new /obj/item/clothing/suit/yogs/detectivecoat(src) + new /obj/item/clothing/suit/yogs/bluedetective(src) /obj/structure/closet/secure_closet/injection name = "lethal injections" diff --git a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm similarity index 86% rename from yogstation/code/game/objects/structures/crates_lockers/closets/secure/service.dm rename to code/game/objects/structures/crates_lockers/closets/secure/service.dm index a4a70a5d0b7c..9a8d4b309610 100644 --- a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -22,8 +22,4 @@ /obj/item/clothing/neck/petcollar = 1, /obj/item/storage/belt/bandolier = 1, /obj/item/gun/ballistic/shotgun/doublebarrel = 1) //now in closet rather than on a table - generate_items_inside(items_inside,src) - -/obj/structure/closet/secure_closet/quartermaster/PopulateContents() - ..() - new /obj/item/card/id/departmental_budget/car(src) \ No newline at end of file + generate_items_inside(items_inside,src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 9adedf17f310..39dcca616d29 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -279,5 +279,94 @@ new /obj/item/gun/magic/rune/resizement_rune(src) new /obj/item/gun/magic/rune/heal_rune(src) - - +/obj/structure/closet/crate/sphere + desc = "An Advanced Crate that defies all known cargo standards." + name = "Advanced Crate" + icon = 'yogstation/icons/obj/crates.dmi' + icon_state = "round" + +/obj/structure/closet/crate/critter/exoticgoats + name = "goat crate" + desc = "Contains a completly random goat from Goat Tech Industries that may or may not break the laws of science!" + +/obj/structure/closet/crate/critter/exoticgoats/Initialize() + var/loot = rand(1,39) //39 different goats! + switch(loot) + if(1) + new /mob/living/simple_animal/hostile/retaliate/goat(loc) + if(2) + new /mob/living/simple_animal/hostile/retaliate/goat/clown(loc) + if(3) + new /mob/living/simple_animal/hostile/retaliate/goat/ras(loc) + if(4) + new /mob/living/simple_animal/hostile/retaliate/goat/blue(loc) + if(5) + new /mob/living/simple_animal/hostile/retaliate/goat/chocolate(loc) + if(6) + new /mob/living/simple_animal/hostile/retaliate/goat/christmas(loc) + if(7) + new /mob/living/simple_animal/hostile/retaliate/goat/confetti(loc) + if(8) + new /mob/living/simple_animal/hostile/retaliate/goat/cottoncandy(loc) + if(9) + new /mob/living/simple_animal/hostile/retaliate/goat/glowing(loc) + if(10) + new /mob/living/simple_animal/hostile/retaliate/goat/goatgoat(loc) + if(11) + new /mob/living/simple_animal/hostile/retaliate/goat/horror(loc) + if(12) + new /mob/living/simple_animal/hostile/retaliate/goat/inverted(loc) + if(13) + new /mob/living/simple_animal/hostile/retaliate/goat/memory(loc) + if(14) + new /mob/living/simple_animal/hostile/retaliate/goat/mirrored(loc) + if(15) + new /mob/living/simple_animal/hostile/retaliate/goat/paper(loc) + if(16) + new /mob/living/simple_animal/hostile/retaliate/goat/pixel(loc) + if(17) + new /mob/living/simple_animal/hostile/retaliate/goat/radioactive(loc) + if(18) + new /mob/living/simple_animal/hostile/retaliate/goat/rainbow(loc) + if(19) + new /mob/living/simple_animal/hostile/retaliate/goat/cute(loc) + if(20) + new /mob/living/simple_animal/hostile/retaliate/goat/star(loc) + if(21) + new /mob/living/simple_animal/hostile/retaliate/goat/twisted(loc) + if(22) + new /mob/living/simple_animal/hostile/retaliate/goat/huge(loc) + if(23) + new /mob/living/simple_animal/hostile/retaliate/goat/tiny(loc) + if(24) + new /mob/living/simple_animal/hostile/retaliate/goat/ghost(loc) + if(25) + new /mob/living/simple_animal/hostile/retaliate/goat/brick(loc) + if(26) + new /mob/living/simple_animal/hostile/retaliate/goat/watercolor(loc) + if(27) + new /mob/living/simple_animal/hostile/retaliate/goat/brown(loc) + if(28) + new /mob/living/simple_animal/hostile/retaliate/goat/panda(loc) + if(29) + new /mob/living/simple_animal/hostile/retaliate/goat/black(loc) + if(30) + new /mob/living/simple_animal/hostile/retaliate/goat/green(loc) + if(31) + new /mob/living/simple_animal/hostile/retaliate/goat/orange(loc) + if(32) + new /mob/living/simple_animal/hostile/retaliate/goat/purple(loc) + if(33) + new /mob/living/simple_animal/hostile/retaliate/goat/red(loc) + if(34) + new /mob/living/simple_animal/hostile/retaliate/goat/yellow(loc) + if(35) + new /mob/living/simple_animal/hostile/retaliate/goat/legitgoat(loc) + if(36) + new /mob/living/simple_animal/hostile/retaliate/goat/skiddo(loc) + if(37) + new /mob/living/simple_animal/hostile/retaliate/goat/gogoat(loc) + if(38) + new /mob/living/simple_animal/hostile/retaliate/goat/sanic(loc) + if(39) + new /mob/living/simple_animal/hostile/retaliate/goat/plunger(loc) \ No newline at end of file diff --git a/yogstation.dme b/yogstation.dme index 6def5c602c72..b3e55a34aa33 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1087,6 +1087,7 @@ #include "code\game\objects\structures\beds_chairs\sofa.dm" #include "code\game\objects\structures\crates_lockers\closets.dm" #include "code\game\objects\structures\crates_lockers\crates.dm" +#include "code\game\objects\structures\crates_lockers\closets\bluespace_locker.dm" #include "code\game\objects\structures\crates_lockers\closets\bodybag.dm" #include "code\game\objects\structures\crates_lockers\closets\cardboardbox.dm" #include "code\game\objects\structures\crates_lockers\closets\fitness.dm" @@ -1108,6 +1109,7 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\service.dm" #include "code\game\objects\structures\crates_lockers\crates\bins.dm" #include "code\game\objects\structures\crates_lockers\crates\critter.dm" #include "code\game\objects\structures\crates_lockers\crates\large.dm" @@ -3055,15 +3057,6 @@ #include "yogstation\code\game\objects\structures\bar_stuff\bar_stuff.dm" #include "yogstation\code\game\objects\structures\beds_chairs\chair.dm" #include "yogstation\code\game\objects\structures\beds_chairs\electric_bed.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closet.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\crates.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closets\bluespace_locker.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closets\bodybag.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closets\job_closets.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\command.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\medical.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\security.dm" -#include "yogstation\code\game\objects\structures\crates_lockers\closets\secure\service.dm" #include "yogstation\code\game\objects\structures\signs\signs_plaques.dm" #include "yogstation\code\game\turfs\simulated\ballpit.dm" #include "yogstation\code\game\turfs\simulated\minerals.dm" diff --git a/yogstation/code/game/objects/structures/crates_lockers/closet.dm b/yogstation/code/game/objects/structures/crates_lockers/closet.dm deleted file mode 100644 index f50dd6234f34..000000000000 --- a/yogstation/code/game/objects/structures/crates_lockers/closet.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/structure/closet - var/notreallyacloset = FALSE // It is genuinely a closet \ No newline at end of file diff --git a/yogstation/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/yogstation/code/game/objects/structures/crates_lockers/closets/bodybag.dm deleted file mode 100644 index 87339d9c109c..000000000000 --- a/yogstation/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/structure/closet/body_bag - notreallyacloset = TRUE diff --git a/yogstation/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/yogstation/code/game/objects/structures/crates_lockers/closets/job_closets.dm deleted file mode 100644 index 08973aa71beb..000000000000 --- a/yogstation/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ /dev/null @@ -1,16 +0,0 @@ -/obj/structure/closet/wardrobe/tcomms - name = "signal tech wardrobe" - icon = 'yogstation/icons/obj/closet.dmi' - icon_state = "sigtech" - icon_door = "sigtech" - -/obj/structure/closet/wardrobe/tcomms/PopulateContents() - ..() - contents = list() - new /obj/item/storage/backpack/duffelbag/engineering(src) - new /obj/item/storage/backpack/industrial(src) - new /obj/item/storage/backpack/satchel/eng(src) - new /obj/item/clothing/suit/hooded/wintercoat/engineering/tcomms(src) - new /obj/item/clothing/under/yogs/rank/signal_tech(src) - new /obj/item/clothing/shoes/workboots(src) - new /obj/item/clothing/under/yogs/rank/signal_tech/skirt(src) \ No newline at end of file diff --git a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/command.dm b/yogstation/code/game/objects/structures/crates_lockers/closets/secure/command.dm deleted file mode 100644 index cda2b139c49e..000000000000 --- a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/command.dm +++ /dev/null @@ -1,61 +0,0 @@ -//command lockers population -//RD locker -/obj/structure/closet/secure_closet/RD/PopulateContents() - ..() - new /obj/item/clipboard/yog/paperwork/rd(src) - new /obj/item/card/id/departmental_budget/sci(src) - new /obj/item/clothing/under/yogs/rdema(src) - -//HoS locker -/obj/structure/closet/secure_closet/hos/PopulateContents() - ..() - new /obj/item/clipboard/yog/paperwork/hos(src) - new /obj/item/clothing/under/yogs/lieutgeneral(src) - new /obj/item/clothing/under/yogs/dictatorhos(src) - new /obj/item/clothing/suit/armor/hos/germancoat(src) - new /obj/item/clothing/under/yogs/hoslatenight(src) - new /obj/item/clothing/under/yogs/hoscasual(src) - new /obj/item/clothing/suit/armor/vest/hosjacket(src) - -//HoP's locker -/obj/structure/closet/secure_closet/hop/PopulateContents() - ..() - new /obj/item/clipboard/yog/paperwork/hop(src) - new /obj/item/card/id/departmental_budget/srv(src) - new /obj/item/gun/energy/e_gun/mini(src) //hop doesn't get a proper gun - new /obj/item/clothing/suit/armor/vest/rurmcoat(src) - new /obj/item/clothing/suit/armor/vest/sovietcoat(src) - new /obj/item/clothing/under/yogs/hopcasual(src) - -//warden's locker -/obj/structure/closet/secure_closet/warden/PopulateContents() - ..() - new /obj/item/clipboard/yog/paperwork/warden(src) - new /obj/item/card/id/departmental_budget/sec(src) - new /obj/item/clothing/under/yogs/ocelot(src) - new /obj/item/clothing/under/yogs/krofficer(src) - new /obj/item/clothing/head/beret/corpwarden(src) - new /obj/item/clothing/suit/armor/vest/wardenjacket(src) - -//captain's locker -/obj/structure/closet/secure_closet/captains/PopulateContents() - ..() - new /obj/item/clipboard/yog/paperwork/captain(src) - new /obj/item/card/id/departmental_budget/civ(src) - -//CE's locker -/obj/structure/closet/secure_closet/engineering_chief/PopulateContents() - ..() - new /obj/item/clipboard/yog/paperwork/ce(src) - new /obj/item/card/id/departmental_budget/eng(src) - new /obj/item/clothing/under/yogs/ceturtleneck(src) - new /obj/item/clothing/under/yogs/cecasual(src) - new /obj/item/clothing/head/beret/ce(src) - new /obj/item/poster/firstsingularity(src) - -//CMO's locker -/obj/structure/closet/secure_closet/CMO/PopulateContents() - ..() - new /obj/item/clipboard/yog/paperwork/cmo(src) - new /obj/item/card/id/departmental_budget/med(src) - new /obj/item/clothing/head/beret/cmo(src) \ No newline at end of file diff --git a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/yogstation/code/game/objects/structures/crates_lockers/closets/secure/medical.dm deleted file mode 100644 index 45fea370f436..000000000000 --- a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ /dev/null @@ -1,74 +0,0 @@ -/obj/structure/closet/secure_closet/paramedic - name = "paramedical closet" - desc = "It's a secure storage unit for paramedical supplies." - icon = 'yogstation/icons/obj/closet.dmi' - icon_state = "paramed" - req_access = list(ACCESS_PARAMEDIC) - -/obj/structure/closet/secure_closet/paramedic/PopulateContents() - ..() - if(prob(50)) - new /obj/item/storage/backpack/medic(src) - else - new /obj/item/storage/backpack/satchel/med(src) - new /obj/item/storage/firstaid/regular(src) - new /obj/item/clothing/shoes/sneakers/white(src) - switch(pick("blue", "green", "purple")) - if ("blue") - new /obj/item/clothing/under/rank/medical/blue(src) - if ("green") - new /obj/item/clothing/under/rank/medical/green(src) - if ("purple") - new /obj/item/clothing/under/rank/medical/purple(src) - switch(pick("blue", "green", "purple")) - if ("blue") - new /obj/item/clothing/under/rank/medical/blue(src) - if ("green") - new /obj/item/clothing/under/rank/medical/green(src) - if ("purple") - new /obj/item/clothing/under/rank/medical/purple(src) - new /obj/item/clothing/under/rank/medical(src) - new /obj/item/clothing/suit/toggle/labcoat/emt(src) - new /obj/item/clothing/head/soft/emt(src) - new /obj/item/defibrillator/loaded(src) - new /obj/item/clothing/suit/toggle/labcoat/pmedic_jacket(src) - new /obj/item/radio/headset/headset_med(src) - new /obj/item/storage/belt/medical(src) - -/obj/structure/closet/secure_closet/mmedical - name = "mining medic's locker" - req_access = list(ACCESS_MEDICAL) - icon = 'yogstation/icons/obj/closet.dmi' - icon_state = "medic" - -/obj/structure/closet/secure_closet/mmedical/PopulateContents() - ..() - new /obj/item/reagent_containers/hypospray/mixi(src) - new /obj/item/reagent_containers/hypospray/derm(src) - if(prob(50)) - new /obj/item/storage/backpack/medic(src) - else - new /obj/item/storage/backpack/satchel/med(src) - new /obj/item/defibrillator/loaded(src) - new /obj/item/clothing/suit/toggle/labcoat/emt/explorer(src) - new /obj/item/clothing/under/yogs/rank/miner/medic(src) - new /obj/item/clothing/shoes/sneakers/white(src) - new /obj/item/cartridge/medical(src) - new /obj/item/radio/headset/headset_cargo(src) - new /obj/item/storage/firstaid/toxin(src) - new /obj/item/clothing/mask/gas/explorer(src) - new /obj/item/storage/belt/medical(src) - new /obj/item/pickaxe(src) - new /obj/item/sensor_device(src) - new /obj/item/storage/box/bodybags(src) - new /obj/item/extinguisher/mini(src) - new /obj/item/clothing/glasses/hud/health(src) - var/obj/item/key/K = new(src) - K.name = "ATV key" - K.desc = "It's a small grey key. Don't let those goddamn ashwalkers get it." - -/obj/structure/closet/secure_closet/chemical/PopulateContents() - ..() - new /obj/item/reagent_containers/glass/bottle/facid(src) - new /obj/item/reagent_containers/glass/bottle/capsaicin(src) - new /obj/item/reagent_containers/glass/bottle/mutagen(src) \ No newline at end of file diff --git a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/yogstation/code/game/objects/structures/crates_lockers/closets/secure/security.dm deleted file mode 100644 index 8fbef5b34618..000000000000 --- a/yogstation/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ /dev/null @@ -1,27 +0,0 @@ -/obj/structure/closet/secure_closet/captains/PopulateContents() - ..() - new /obj/item/radio/security(src) - -/obj/structure/closet/secure_closet/hos/PopulateContents() - ..() - new /obj/item/radio/security(src) - -/obj/structure/closet/secure_closet/warden/PopulateContents() - ..() - new /obj/item/radio/security(src) - -/obj/structure/closet/secure_closet/security/PopulateContents() - ..() - new /obj/item/radio/security(src) - new /obj/item/clipboard/yog/paperwork/security(src) - -/obj/structure/closet/secure_closet/detective/PopulateContents() - ..() - new /obj/item/clothing/under/yogs/forensictech(src) - new /obj/item/clothing/under/yogs/bluedetective(src) - new /obj/item/clothing/under/yogs/golddetective(src) - new /obj/item/clothing/under/yogs/greydetective(src) - new /obj/item/clothing/under/yogs/blackdetective(src) - new /obj/item/clothing/suit/yogs/golddetective(src) - new /obj/item/clothing/suit/yogs/detectivecoat(src) - new /obj/item/clothing/suit/yogs/bluedetective(src) \ No newline at end of file diff --git a/yogstation/code/game/objects/structures/crates_lockers/crates.dm b/yogstation/code/game/objects/structures/crates_lockers/crates.dm deleted file mode 100644 index cb51c161d68f..000000000000 --- a/yogstation/code/game/objects/structures/crates_lockers/crates.dm +++ /dev/null @@ -1,91 +0,0 @@ -/obj/structure/closet/crate/sphere - desc = "An Advanced Crate that defies all known cargo standards." - name = "Advanced Crate" - icon = 'yogstation/icons/obj/crates.dmi' - icon_state = "round" - -/obj/structure/closet/crate/critter/exoticgoats - name = "goat crate" - desc = "Contains a completly random goat from Goat Tech Industries that may or may not break the laws of science!" - -/obj/structure/closet/crate/critter/exoticgoats/Initialize() - var/loot = rand(1,39) //39 different goats! - switch(loot) - if(1) - new /mob/living/simple_animal/hostile/retaliate/goat(loc) - if(2) - new /mob/living/simple_animal/hostile/retaliate/goat/clown(loc) - if(3) - new /mob/living/simple_animal/hostile/retaliate/goat/ras(loc) - if(4) - new /mob/living/simple_animal/hostile/retaliate/goat/blue(loc) - if(5) - new /mob/living/simple_animal/hostile/retaliate/goat/chocolate(loc) - if(6) - new /mob/living/simple_animal/hostile/retaliate/goat/christmas(loc) - if(7) - new /mob/living/simple_animal/hostile/retaliate/goat/confetti(loc) - if(8) - new /mob/living/simple_animal/hostile/retaliate/goat/cottoncandy(loc) - if(9) - new /mob/living/simple_animal/hostile/retaliate/goat/glowing(loc) - if(10) - new /mob/living/simple_animal/hostile/retaliate/goat/goatgoat(loc) - if(11) - new /mob/living/simple_animal/hostile/retaliate/goat/horror(loc) - if(12) - new /mob/living/simple_animal/hostile/retaliate/goat/inverted(loc) - if(13) - new /mob/living/simple_animal/hostile/retaliate/goat/memory(loc) - if(14) - new /mob/living/simple_animal/hostile/retaliate/goat/mirrored(loc) - if(15) - new /mob/living/simple_animal/hostile/retaliate/goat/paper(loc) - if(16) - new /mob/living/simple_animal/hostile/retaliate/goat/pixel(loc) - if(17) - new /mob/living/simple_animal/hostile/retaliate/goat/radioactive(loc) - if(18) - new /mob/living/simple_animal/hostile/retaliate/goat/rainbow(loc) - if(19) - new /mob/living/simple_animal/hostile/retaliate/goat/cute(loc) - if(20) - new /mob/living/simple_animal/hostile/retaliate/goat/star(loc) - if(21) - new /mob/living/simple_animal/hostile/retaliate/goat/twisted(loc) - if(22) - new /mob/living/simple_animal/hostile/retaliate/goat/huge(loc) - if(23) - new /mob/living/simple_animal/hostile/retaliate/goat/tiny(loc) - if(24) - new /mob/living/simple_animal/hostile/retaliate/goat/ghost(loc) - if(25) - new /mob/living/simple_animal/hostile/retaliate/goat/brick(loc) - if(26) - new /mob/living/simple_animal/hostile/retaliate/goat/watercolor(loc) - if(27) - new /mob/living/simple_animal/hostile/retaliate/goat/brown(loc) - if(28) - new /mob/living/simple_animal/hostile/retaliate/goat/panda(loc) - if(29) - new /mob/living/simple_animal/hostile/retaliate/goat/black(loc) - if(30) - new /mob/living/simple_animal/hostile/retaliate/goat/green(loc) - if(31) - new /mob/living/simple_animal/hostile/retaliate/goat/orange(loc) - if(32) - new /mob/living/simple_animal/hostile/retaliate/goat/purple(loc) - if(33) - new /mob/living/simple_animal/hostile/retaliate/goat/red(loc) - if(34) - new /mob/living/simple_animal/hostile/retaliate/goat/yellow(loc) - if(35) - new /mob/living/simple_animal/hostile/retaliate/goat/legitgoat(loc) - if(36) - new /mob/living/simple_animal/hostile/retaliate/goat/skiddo(loc) - if(37) - new /mob/living/simple_animal/hostile/retaliate/goat/gogoat(loc) - if(38) - new /mob/living/simple_animal/hostile/retaliate/goat/sanic(loc) - if(39) - new /mob/living/simple_animal/hostile/retaliate/goat/plunger(loc) \ No newline at end of file