diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index 490273e00ce..83236ad526f 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -10,7 +10,8 @@ var/welded = 0 var/wall_mounted = 0 //never solid (You can always pass over it) flags = FPRINT - var/health = 200//Might be a bit much, dono can always change later + var/health = 100 //Might be a bit much, dono can always change later //Nerfed -Pete + var/lastbang // /obj/structure/closet/acloset name = "Strange closet" @@ -581,25 +582,25 @@ -/obj/structure/secure_closet +/obj/structure/closet/secure_closet desc = "An immobile card-locked storage closet." name = "Security Locker" icon = 'closet.dmi' icon_state = "secure1" density = 1 - var/opened = 0 + opened = 0 var/locked = 1 var/broken = 0 var/large = 1 - var/icon_closed = "secure" + icon_closed = "secure" var/icon_locked = "secure1" - var/icon_opened = "secureopen" + icon_opened = "secureopen" var/icon_broken = "securebroken" var/icon_off = "secureoff" - var/wall_mounted = 0 //never solid (You can always pass over it) - var/health = 300 + wall_mounted = 0 //never solid (You can always pass over it) + health = 200 -/obj/structure/secure_closet/medical_wall +/obj/structure/closet/secure_closet/medical_wall name = "First Aid Closet" desc = "A wall mounted closet which --should-- contain medical supplies." icon_state = "medical_wall_locked" @@ -613,21 +614,21 @@ wall_mounted = 1 req_access = list(access_medical) -/obj/structure/secure_closet/personal +/obj/structure/closet/secure_closet/personal desc = "The first card swiped gains control." name = "Personal Closet" -/obj/structure/secure_closet/personal/patient +/obj/structure/closet/secure_closet/personal/patient name = "Patient's closet" -/obj/structure/secure_closet/kitchen +/obj/structure/closet/secure_closet/kitchen name = "Kitchen Cabinet" req_access = list(access_kitchen) -/obj/structure/secure_closet/kitchen/mining +/obj/structure/closet/secure_closet/kitchen/mining req_access = list() -/obj/structure/secure_closet/meat +/obj/structure/closet/secure_closet/meat name = "Meat Fridge" icon_state = "fridge1" icon_closed = "fridge" @@ -636,7 +637,7 @@ icon_broken = "fridgebroken" icon_off = "fridge1" -/obj/structure/secure_closet/fridge +/obj/structure/closet/secure_closet/fridge name = "Refrigerator" icon_state = "fridge1" icon_closed = "fridge" @@ -645,7 +646,7 @@ icon_broken = "fridgebroken" icon_off = "fridge1" -/obj/structure/secure_closet/money_freezer +/obj/structure/closet/secure_closet/money_freezer name = "Freezer" icon_state = "fridge1" icon_closed = "fridge" @@ -655,7 +656,7 @@ icon_off = "fridge1" req_access = list(access_heads_vault) -/obj/structure/secure_closet/wall +/obj/structure/closet/secure_closet/wall name = "wall locker" req_access = list(access_security) icon_state = "wall-locker1" diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 1eb51b8a0e7..eb75d021213 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -11,7 +11,7 @@ "/obj/item/weapon/pen/paralysis", "/obj/item/weapon/chem_grenade/incendiary") cost = 20 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Special Ops crate" hidden = 1 @@ -30,14 +30,14 @@ "/obj/item/weapon/reagent_containers/food/snacks/grown/banana", "/obj/item/weapon/reagent_containers/food/snacks/grown/banana") cost = 5 - containertype = "/obj/structure/crate/freezer" + containertype = "/obj/structure/closet/crate/freezer" containername = "Food crate" /datum/supply_packs/monkey name = "Monkey crate" contains = list ("/obj/item/weapon/monkeycube_box") cost = 20 - containertype = "/obj/structure/crate/freezer" + containertype = "/obj/structure/closet/crate/freezer" containername = "Monkey crate" /* @@ -47,7 +47,7 @@ "/obj/item/ammo_casing/shotgun/beanbag", "/obj/item/ammo_casing/shotgun/beanbag") cost = 25 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Shotgun crate" //APPARENTLY OP? */ @@ -65,7 +65,7 @@ "/obj/item/ammo_casing/shotgun/beanbag", "/obj/item/ammo_casing/shotgun/beanbag") cost = 10 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Beanbag shells" /datum/supply_packs/party @@ -81,7 +81,7 @@ "/obj/item/weapon/reagent_containers/food/drinks/beer", "/obj/item/weapon/reagent_containers/food/drinks/beer") cost = 20 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Party equipment" /datum/supply_packs/internals @@ -93,7 +93,7 @@ "/obj/item/weapon/tank/air", "/obj/item/weapon/tank/air") cost = 10 - containertype = "/obj/structure/crate/internals" + containertype = "/obj/structure/closet/crate/internals" containername = "Internals crate" /datum/supply_packs/evacuation @@ -113,7 +113,7 @@ "/obj/item/clothing/mask/gas", "/obj/item/clothing/mask/gas") cost = 35 - containertype = "/obj/structure/crate/internals" + containertype = "/obj/structure/closet/crate/internals" containername = "Emergency Crate" /datum/supply_packs/janitor @@ -131,7 +131,7 @@ "/obj/item/weapon/chem_grenade/cleaner", "/obj/structure/mopbucket") cost = 10 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Janitorial supplies" /obj/item/weapon/storage/lightbox/tubes @@ -147,7 +147,7 @@ "/obj/item/weapon/storage/lightbox/bulbs", "/obj/item/weapon/storage/lightbox/bulbs") cost = 5 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Replacement lights" /datum/supply_packs/costume @@ -165,7 +165,7 @@ "/obj/item/clothing/suit/suspenders", "/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing") cost = 10 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Standard Costumes" access = access_theatre @@ -176,14 +176,14 @@ "/obj/item/clothing/shoes/sandal", "/obj/item/clothing/head/wizard/fake") cost = 20 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Wizard costume crate" /datum/supply_packs/mule name = "MULEbot Crate" contains = list("/obj/machinery/bot/mulebot") cost = 20 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "MULEbot Crate" /datum/supply_packs/hydroponics // -- Skie @@ -197,7 +197,7 @@ "/obj/item/clothing/gloves/botanic_leather", "/obj/item/clothing/suit/apron") // Updated with new things cost = 10 - containertype = /obj/structure/crate/hydroponics + containertype = /obj/structure/closet/crate/hydroponics containername = "Hydroponics crate" access = access_hydroponics @@ -215,7 +215,7 @@ "/obj/item/seeds/chantermycelium", "/obj/item/seeds/potatoseed") cost = 10 - containertype = /obj/structure/crate/hydroponics + containertype = /obj/structure/closet/crate/hydroponics containername = "Seeds crate" access = access_hydroponics @@ -232,7 +232,7 @@ "/obj/item/seeds/bananaseed", "/obj/item/seeds/eggyseed") cost = 15 - containertype = /obj/structure/crate/hydroponics + containertype = /obj/structure/closet/crate/hydroponics containername = "Exotic Seeds crate" access = access_hydroponics @@ -247,7 +247,7 @@ "/obj/item/weapon/reagent_containers/glass/bottle/stoxin", "/obj/item/weapon/storage/syringes") cost = 10 - containertype = "/obj/structure/crate/medical" + containertype = "/obj/structure/closet/crate/medical" containername = "Medical crate" @@ -264,7 +264,7 @@ "/obj/item/weapon/storage/syringes", "/obj/item/weapon/storage/beakerbox") cost = 20 - containertype = "/obj/structure/crate/secure/weapon" + containertype = "/obj/structure/closet/crate/secure/weapon" containername = "Virus crate" access = access_cmo @@ -273,7 +273,7 @@ contains = list("/obj/item/stack/sheet/metal") amount = 50 cost = 10 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Metal sheets crate" /datum/supply_packs/glass50 @@ -281,7 +281,7 @@ contains = list("/obj/item/stack/sheet/glass") amount = 50 cost = 10 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Glass sheets crate" /datum/supply_packs/electrical @@ -295,7 +295,7 @@ "/obj/item/weapon/cell/high", "/obj/item/weapon/cell/high") cost = 15 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Electrical maintenance crate" /datum/supply_packs/mechanical @@ -310,7 +310,7 @@ "/obj/item/clothing/head/helmet/welding", "/obj/item/clothing/head/helmet/hardhat") cost = 10 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Mechanical maintenance crate" /datum/supply_packs/waterfueltank @@ -318,7 +318,7 @@ contains = list("/obj/structure/reagent_dispensers/watertank", "/obj/structure/reagent_dispensers/fueltank") cost = 15 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "Water/Fuel tank crate" /datum/supply_packs/engine @@ -326,7 +326,7 @@ contains = list("/obj/machinery/emitter", "/obj/machinery/emitter",) cost = 10 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Emitter crate" access = access_heads @@ -366,7 +366,7 @@ "/obj/item/mecha_parts/circuitboard/ripley/peripherals", //TEMPORARY due to lack of circuitboard printer "/obj/item/mecha_parts/circuitboard/ripley/main") //TEMPORARY due to lack of circuitboard printer cost = 40 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "APLU \"Ripley\" Circuit Crate" access = access_robotics @@ -383,7 +383,7 @@ "/obj/item/weapon/cell/high", "/obj/item/weapon/cell/high") cost = 10 - containertype = "/obj/structure/crate/secure/gear" + containertype = "/obj/structure/closet/crate/secure/gear" containername = "Robotics Assembly" access = access_robotics @@ -402,7 +402,7 @@ "/obj/item/device/assembly/timer", "/obj/item/device/assembly/timer") cost = 10 - containertype = "/obj/structure/crate/secure/plasma" + containertype = "/obj/structure/closet/crate/secure/plasma" containername = "Plasma assembly crate" access = access_tox @@ -417,7 +417,7 @@ "/obj/item/weapon/storage/flashbang_kit", "/obj/item/weapon/storage/flashbang_kit") cost = 30 - containertype = "/obj/structure/crate/secure/weapon" + containertype = "/obj/structure/closet/crate/secure/weapon" containername = "Weapons crate" access = access_security @@ -431,7 +431,7 @@ "/obj/item/weapon/chem_grenade/incendiary", "/obj/item/weapon/chem_grenade/incendiary") cost = 25 - containertype = "/obj/structure/crate/secure/weapon" + containertype = "/obj/structure/closet/crate/secure/weapon" containername = "Experimental weapons crate" access = access_heads @@ -442,7 +442,7 @@ "/obj/item/clothing/suit/armor/vest", "/obj/item/clothing/suit/armor/vest") cost = 15 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Armor crate" access = access_security @@ -467,7 +467,7 @@ "/obj/item/clothing/head/helmet/riot", "/obj/item/clothing/suit/armor/riot") cost = 60 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Riot gear crate" access = access_armory @@ -475,7 +475,7 @@ name = "Loyalty implant crate" contains = list ("/obj/item/weapon/storage/lockbox/loyalty") cost = 60 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Loyalty implant crate" access = access_armory @@ -486,7 +486,7 @@ "/obj/item/weapon/gun/projectile/shotgun/combat2", "/obj/item/weapon/gun/projectile/shotgun/combat2") cost = 50 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Ballistic gear crate" access = access_armory @@ -497,7 +497,7 @@ "/obj/item/weapon/gun/energy/gun", "/obj/item/weapon/gun/energy/gun") cost = 50 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Experimental energy gear crate" access = access_armory @@ -508,7 +508,7 @@ "/obj/item/clothing/head/helmet/riot", "/obj/item/clothing/suit/armor/riot") cost = 35 - containertype = "/obj/structure/crate/secure" + containertype = "/obj/structure/closet/crate/secure" containername = "Experimental armor crate" access = access_armory @@ -519,7 +519,7 @@ "/obj/machinery/deployable/barrier", "/obj/machinery/deployable/barrier") cost = 20 - containertype = "/obj/structure/crate/secure/gear" + containertype = "/obj/structure/closet/crate/secure/gear" containername = "Secruity Barriers crate" /datum/supply_packs/hats/ @@ -549,7 +549,7 @@ "/obj/item/clothing/head/collectable/petehat") name = "Collectable Hat Crate!" cost = 200 - containertype = "/obj/structure/crate/hat" + containertype = "/obj/structure/closet/crate/hat" containername = "Collectable Hats Crate! Brought to you by Bass.inc!" /datum/supply_packs/hats/New() diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index e724d369e21..726a03b8db1 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -262,7 +262,7 @@ temp_apc.overload_lighting() // for (var/obj/machinery/computer/prison_shuttle/temp_shuttle in world) // temp_shuttle.prison_break() - for (var/obj/structure/secure_closet/security/temp_closet in world) + for (var/obj/structure/closet/secure_closet/security/temp_closet in world) if(istype(get_area(temp_closet), /area/security/brig)) temp_closet.locked = 0 temp_closet.icon_state = temp_closet.icon_closed diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index d04d4575e77..d7f335d4157 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -468,7 +468,7 @@ // called to load a crate /obj/machinery/bot/mulebot/proc/load(var/atom/movable/C) - if((wires & wire_loadcheck) && !istype(C,/obj/structure/crate)) + if((wires & wire_loadcheck) && !istype(C,/obj/structure/closet/crate)) src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") playsound(src.loc, 'buzz-sigh.ogg', 50, 0) return // if not emagged, only allow crates to be loaded @@ -478,7 +478,7 @@ mode = 1 // if a create, close before loading - var/obj/structure/crate/crate = C + var/obj/structure/closet/crate/crate = C if(istype(crate)) crate.close() @@ -742,7 +742,7 @@ AM = A break else // otherwise, look for crates only - AM = locate(/obj/structure/crate) in get_step(loc,loaddir) + AM = locate(/obj/structure/closet/crate) in get_step(loc,loaddir) if(AM) load(AM) // whatever happened, check to see if we return home diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 00c97522847..1fc1f691143 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -37,7 +37,7 @@ if(F.id == src.id) targets += F - for(var/obj/structure/secure_closet/brig/C in world) + for(var/obj/structure/closet/secure_closet/brig/C in world) if(C.id == src.id) targets += C @@ -81,7 +81,7 @@ spawn(0) door.close() - for(var/obj/structure/secure_closet/brig/C in targets) + for(var/obj/structure/closet/secure_closet/brig/C in targets) if(C.broken) continue if(C.opened && !C.close()) continue C.locked = 1 @@ -97,7 +97,7 @@ spawn(0) door.open() - for(var/obj/structure/secure_closet/brig/C in targets) + for(var/obj/structure/closet/secure_closet/brig/C in targets) if(C.broken) continue if(C.opened) continue C.locked = 0 diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index b7268953542..c329a4a883b 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -155,7 +155,7 @@ if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break -/obj/structure/crate/juice +/obj/structure/closet/crate/juice New() ..() new/obj/machinery/juicer(src) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 5f6378cfaf0..8e33bebe72e 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -210,7 +210,7 @@ else tmploc = locate(tx, ty, destination.z) - if(tx == destturf.x && ty == destturf.y && (istype(destination.loc, /obj/structure/closet) || istype(destination.loc, /obj/structure/secure_closet))) + if(tx == destturf.x && ty == destturf.y && (istype(destination.loc, /obj/structure/closet) || istype(destination.loc, /obj/structure/closet/secure_closet))) tmploc = destination.loc if(tmploc==null) diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index 241b13ba0d8..29414b342a9 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -717,7 +717,7 @@ var/list/sacrificed = list() cultist.handcuffed || \ istype(cultist.wear_mask, /obj/item/clothing/mask/muzzle) || \ (istype(cultist.loc, /obj/structure/closet)&&cultist.loc:welded) || \ - (istype(cultist.loc, /obj/structure/secure_closet)&&cultist.loc:locked) || \ + (istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked) || \ (istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) \ )) user << "\red The [cultist] is already free." @@ -730,7 +730,7 @@ var/list/sacrificed = list() cultist.u_equip(cultist.wear_mask) if(istype(cultist.loc, /obj/structure/closet)&&cultist.loc:welded) cultist.loc:welded = 0 - if(istype(cultist.loc, /obj/structure/secure_closet)&&cultist.loc:locked) + if(istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked) cultist.loc:locked = 0 if(istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) cultist.loc:locked = 0 diff --git a/code/game/objects/closets.dm b/code/game/objects/closets.dm index b4cbf555d1a..e1fd7c33405 100644 --- a/code/game/objects/closets.dm +++ b/code/game/objects/closets.dm @@ -6,7 +6,7 @@ return (!density) /obj/structure/closet/proc/can_open() - if (src.welded) + if(src.welded) return 0 return 1 @@ -14,28 +14,23 @@ for(var/obj/structure/closet/closet in get_turf(src)) if(closet != src) return 0 - for(var/obj/structure/secure_closet/closet in get_turf(src)) - return 0 return 1 /obj/structure/closet/proc/dump_contents() - for (var/obj/item/I in src) + for(var/obj/item/I in src) I.loc = src.loc - for (var/obj/effect/overlay/o in src) //REMOVE THIS - o.loc = src.loc - for(var/mob/M in src) M.loc = src.loc - if (M.client) + if(M.client) M.client.eye = M.client.mob M.client.perspective = MOB_PERSPECTIVE /obj/structure/closet/proc/open() - if (src.opened) + if(src.opened) return 0 - if (!src.can_open()) + if(!src.can_open()) return 0 src.dump_contents() @@ -47,26 +42,22 @@ return 1 /obj/structure/closet/proc/close() - if (!src.opened) + if(!src.opened) return 0 - if (!src.can_close()) + if(!src.can_close()) return 0 - for (var/obj/item/I in src.loc) - if (!I.anchored) + for(var/obj/item/I in src.loc) + if(!I.anchored) I.loc = src - for (var/obj/effect/overlay/o in src.loc) //REMOVE THIS - if (!o.anchored) - o.loc = src - - for (var/mob/M in src.loc) - if (istype (M, /mob/dead/observer)) + for(var/mob/M in src.loc) + if(istype (M, /mob/dead/observer)) continue - if (M.buckled) + if(M.buckled) continue - if (M.client) + if(M.client) M.client.perspective = EYE_PERSPECTIVE M.client.eye = src @@ -78,27 +69,27 @@ return 1 /obj/structure/closet/proc/toggle() - if (src.opened) + if(src.opened) return src.close() return src.open() // this should probably use dump_contents() /obj/structure/closet/ex_act(severity) switch(severity) - if (1) - for (var/atom/movable/A as mob|obj in src) + if(1) + for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) del(src) - if (2) - if (prob(50)) + if(2) + if(prob(50)) for (var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) del(src) - if (3) - if (prob(5)) - for (var/atom/movable/A as mob|obj in src) + if(3) + if(prob(5)) + for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) del(src) @@ -107,7 +98,7 @@ health -= Proj.damage ..() if(health <= 0) - for (var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A as mob|obj in src) A.loc = src.loc del(src) @@ -115,18 +106,18 @@ // this should probably use dump_contents() /obj/structure/closet/blob_act() - if (prob(75)) + if(prob(75)) for(var/atom/movable/A as mob|obj in src) A.loc = src.loc del(src) /obj/structure/closet/meteorhit(obj/O as obj) - if (O.icon_state == "flaming") + if(O.icon_state == "flaming") src.dump_contents() del(src) /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/packageWrap)) + if(istype(W, /obj/item/weapon/packageWrap)) var/obj/item/weapon/packageWrap/O = W if (O.amount > 3) var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(src.loc)) @@ -135,16 +126,16 @@ src.welded = 1 src.loc = P O.amount -= 3 - else if (src.opened) - if (istype(W, /obj/item/weapon/grab)) + else if(src.opened) + if(istype(W, /obj/item/weapon/grab)) src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet - if (istype(W, /obj/item/weapon/weldingtool) && W:welding) - if (!W:remove_fuel(0,user)) + if(istype(W, /obj/item/weapon/weldingtool) && W:welding) + if(!W:remove_fuel(0,user)) user << "\blue You need more welding fuel to complete this task." return new /obj/item/stack/sheet/metal(src.loc) - for (var/mob/M in viewers(src)) + for(var/mob/M in viewers(src)) M.show_message("\red [src] has been cut apart by [user.name] with the weldingtool.", 3, "\red You hear welding.", 2) del(src) return @@ -154,11 +145,11 @@ usr.drop_item() - if (W) + if(W) W.loc = src.loc else if(istype(W, /obj/item/weapon/weldingtool) && W:welding) - if (!W:remove_fuel(0,user)) + if(!W:remove_fuel(0,user)) user << "\blue You need more welding fuel to complete this task." return src.welded =! src.welded @@ -169,32 +160,29 @@ return /obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - if (!user.can_use_hands()) + if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis) return - if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src))) + if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src))) return - if (user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems + if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems return - if (!istype(user.loc, /turf)) // are you in a container/closet/pod/etc? + if(!istype(user.loc, /turf)) // are you in a container/closet/pod/etc? return if(!src.opened) return - if(istype(O, /obj/structure/secure_closet) || istype(O, /obj/structure/closet)) - return - if(isrobot(user)) + if(istype(O, /obj/structure/closet)) return step_towards(O, src.loc) - user.show_viewers(text("\red [] stuffs [] into []!", user, O, src)) + if(user != O) + user.show_viewers(text("\red [] stuffs [] into []!", user, O, src)) src.add_fingerprint(user) return -/obj/structure/closet - var/lastbang = 0 /obj/structure/closet/relaymove(mob/user as mob) - if (user.stat) + if(user.stat) return - if (!src.open()) + if(!src.open()) user << "\blue It won't budge!" if(!lastbang) lastbang = 1 @@ -217,5 +205,5 @@ /obj/structure/closet/attack_hand(mob/user as mob) src.add_fingerprint(user) - if (!src.toggle()) + if(!src.toggle()) usr << "\blue It won't budge!" diff --git a/code/game/objects/closets/kitchen.dm b/code/game/objects/closets/kitchen.dm index 9f45350b43e..ed6509d8307 100644 --- a/code/game/objects/closets/kitchen.dm +++ b/code/game/objects/closets/kitchen.dm @@ -1,4 +1,4 @@ -/obj/structure/secure_closet/kitchen/New() +/obj/structure/closet/secure_closet/kitchen/New() ..() sleep(2) /*new /obj/item/clothing/head/chefhat(src) @@ -38,7 +38,7 @@ new /obj/item/weapon/kitchen/utensil/spoon(src) new /obj/item/weapon/kitchen/rollingpin(src)*/ -/obj/structure/secure_closet/meat/New() +/obj/structure/closet/secure_closet/meat/New() ..() sleep(2) new /obj/item/kitchen/egg_box(src) @@ -48,7 +48,7 @@ new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src) new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src) -/obj/structure/secure_closet/fridge/New() +/obj/structure/closet/secure_closet/fridge/New() ..() sleep(2) new /obj/item/weapon/reagent_containers/food/drinks/milk(src) @@ -62,7 +62,7 @@ new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src) new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src) -/obj/structure/secure_closet/money_freezer/New() +/obj/structure/closet/secure_closet/money_freezer/New() ..() sleep(2) new /obj/item/weapon/spacecash/c1000(src) diff --git a/code/game/objects/closets/secure/bar.dm b/code/game/objects/closets/secure/bar.dm index da1978d35b2..9790093c324 100644 --- a/code/game/objects/closets/secure/bar.dm +++ b/code/game/objects/closets/secure/bar.dm @@ -1,4 +1,4 @@ -/obj/structure/secure_closet/bar +/obj/structure/closet/secure_closet/bar name = "Booze" req_access = list(access_bar) diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index 33632c84bae..08a61ad98a9 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -1,4 +1,4 @@ -/obj/structure/secure_closet/engineering_chief +/obj/structure/closet/secure_closet/engineering_chief name = "Chief Engineer's Locker" req_access = list(access_ce) @@ -22,7 +22,7 @@ -/obj/structure/secure_closet/engineering_electrical +/obj/structure/closet/secure_closet/engineering_electrical name = "Electrical Supplies" req_access = list(access_engine) @@ -42,7 +42,7 @@ -/obj/structure/secure_closet/engineering_welding +/obj/structure/closet/secure_closet/engineering_welding name = "Welding Supplies" req_access = list(access_engine) @@ -60,7 +60,7 @@ -/obj/structure/secure_closet/engineering_personal +/obj/structure/closet/secure_closet/engineering_personal name = "Engineer's Locker" req_access = list(access_engine) diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index 400b5c208a0..1bf9f9bd9a0 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -1,4 +1,4 @@ -/obj/structure/secure_closet/medical1 +/obj/structure/closet/secure_closet/medical1 name = "Medicine Closet" desc = "Filled with medical junk." icon_state = "medical1" @@ -26,7 +26,7 @@ -/obj/structure/secure_closet/medical2 +/obj/structure/closet/secure_closet/medical2 name = "Anesthetic" desc = "Used to knock people out." icon_state = "medical1" @@ -51,7 +51,7 @@ -/obj/structure/secure_closet/medical3 +/obj/structure/closet/secure_closet/medical3 name = "Medical Doctor's Locker" req_access = list(access_medical) @@ -71,7 +71,7 @@ -/obj/structure/secure_closet/CMO +/obj/structure/closet/secure_closet/CMO name = "Chief Medical Officer" req_access = list(access_cmo) @@ -90,7 +90,7 @@ -/obj/structure/secure_closet/animal +/obj/structure/closet/secure_closet/animal name = "Animal Control" req_access = list(access_medical) @@ -106,7 +106,7 @@ -/obj/structure/secure_closet/chemical +/obj/structure/closet/secure_closet/chemical name = "Chemical Closet" desc = "Store dangerous chemicals in here." icon_state = "medical1" diff --git a/code/game/objects/closets/secure/personal.dm b/code/game/objects/closets/secure/personal.dm index 9072b405d65..e072709db43 100644 --- a/code/game/objects/closets/secure/personal.dm +++ b/code/game/objects/closets/secure/personal.dm @@ -1,14 +1,14 @@ -/obj/structure/secure_closet/personal/var/registered = null -/obj/structure/secure_closet/personal/req_access = list(access_all_personal_lockers) +/obj/structure/closet/secure_closet/personal/var/registered = null +/obj/structure/closet/secure_closet/personal/req_access = list(access_all_personal_lockers) -/obj/structure/secure_closet/personal/New() +/obj/structure/closet/secure_closet/personal/New() ..() spawn(2) new /obj/item/weapon/storage/backpack( src ) new /obj/item/device/radio/headset( src ) return -/obj/structure/secure_closet/personal/patient/New() +/obj/structure/closet/secure_closet/personal/patient/New() ..() contents = list() spawn(4) @@ -16,7 +16,7 @@ new /obj/item/clothing/shoes/white( src ) return -/obj/structure/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob) if (src.opened) if (istype(W, /obj/item/weapon/grab)) src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet diff --git a/code/game/objects/closets/secure/scientist.dm b/code/game/objects/closets/secure/scientist.dm index 037560a23b1..7e959155243 100644 --- a/code/game/objects/closets/secure/scientist.dm +++ b/code/game/objects/closets/secure/scientist.dm @@ -1,4 +1,4 @@ -/obj/structure/secure_closet/scientist +/obj/structure/closet/secure_closet/scientist name = "Scientist Locker" req_access = list(access_tox_storage) @@ -16,7 +16,7 @@ -/obj/structure/secure_closet/RD +/obj/structure/closet/secure_closet/RD name = "Research Director" req_access = list(access_rd) diff --git a/code/game/objects/closets/secure/secure_closets.dm b/code/game/objects/closets/secure/secure_closets.dm index e5ffb532689..64c3689ac54 100644 --- a/code/game/objects/closets/secure/secure_closets.dm +++ b/code/game/objects/closets/secure/secure_closets.dm @@ -1,88 +1,10 @@ -/obj/structure/secure_closet/alter_health() - return get_turf(src) - -/obj/structure/secure_closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group || (height==0) || wall_mounted) return 1 - - return src.opened - -/obj/structure/secure_closet/proc/can_close() - for(var/obj/structure/closet/closet in get_turf(src)) - return 0 - for(var/obj/structure/secure_closet/closet in get_turf(src)) - if(closet != src) - return 0 - return 1 - -/obj/structure/secure_closet/proc/can_open() - if (src.locked) +/obj/structure/closet/secure_closet/can_open() + ..() + if(src.locked) return 0 return 1 -/obj/structure/secure_closet/proc/dump_contents() - for (var/obj/item/I in src) - I.loc = src.loc - - for (var/obj/effect/overlay/o in src) //REMOVE THIS - o.loc = src.loc - - for(var/mob/M in src) - M.loc = src.loc - if (M.client) - M.client.eye = M.client.mob - M.client.perspective = MOB_PERSPECTIVE -/obj/structure/secure_closet/proc/open() - if (src.opened) - return 0 - - if (!src.can_open()) - return 0 - - src.dump_contents() - - src.icon_state = src.icon_opened - src.opened = 1 - playsound(src.loc, 'click.ogg', 15, 1, -3) - return 1 - -/obj/structure/secure_closet/proc/close() - if (!src.opened) - return 0 - - if (!src.can_close()) - return 0 - - for (var/obj/item/I in src.loc) - if (!I.anchored) - I.loc = src - - for (var/obj/effect/overlay/o in src.loc) //REMOVE THIS - if (!o.anchored) - o.loc = src - - for (var/mob/M in src.loc) - if (M.buckled) - continue - - if (M.client) - M.client.perspective = EYE_PERSPECTIVE - M.client.eye = src - - M.loc = src - if(broken) - src.icon_state = src.icon_off - else - src.icon_state = src.icon_closed - src.opened = 0 - playsound(src.loc, 'click.ogg', 15, 1, -3) - return 1 - -/obj/structure/secure_closet/proc/toggle() - if (src.opened) - return src.close() - return src.open() - -/obj/structure/secure_closet/emp_act(severity) +/obj/structure/closet/secure_closet/emp_act(severity) for(var/obj/O in src) O.emp_act(severity) if(!broken) @@ -96,69 +18,20 @@ src.req_access += pick(get_all_accesses()) ..() -/obj/structure/secure_closet/ex_act(severity) - switch(severity) - if (1) - for (var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - del(src) - if (2) - if (prob(50)) - for (var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - del(src) - if (3) - if (prob(5)) - for (var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - del(src) - -/obj/structure/secure_closet/blob_act() - if (prob(75)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - del(src) - -/obj/structure/secure_closet/meteorhit(obj/O as obj) - if (O.icon_state == "flaming") - for(var/obj/item/I in src) - I.loc = src.loc - for(var/mob/M in src) - M.loc = src.loc - if (M.client) - M.client.eye = M.client.mob - M.client.perspective = MOB_PERSPECTIVE - src.icon_state = src.icon_broken - del(src) - return - return - -/obj/structure/secure_closet/bullet_act(var/obj/item/projectile/Proj) - health -= Proj.damage - ..() - if(health <= 0) - for (var/atom/movable/A as mob|obj in src) - A.loc = src.loc - del(src) - return - -/obj/structure/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (src.opened) - if (istype(W, /obj/item/weapon/grab)) - if (src.large) +/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(src.opened) + if(istype(W, /obj/item/weapon/grab)) + if(src.large) src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet else user << "The locker is too small to stuff [W] into!" user.drop_item() - if (W) + if(W) W.loc = src.loc else if(src.broken) user << "\red It appears to be broken." return - else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken) + else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken) broken = 1 locked = 0 desc = "It appears to be broken." @@ -177,7 +50,7 @@ else if(src.allowed(user)) src.locked = !src.locked for(var/mob/O in viewers(user, 3)) - if ((O.client && !( O.blinded ))) + if((O.client && !( O.blinded ))) O << text("\blue The locker has been []locked by [].", (src.locked ? null : "un"), user) if(src.locked) src.icon_state = src.icon_locked @@ -188,88 +61,32 @@ user << "\red Access Denied" return -/obj/structure/secure_closet - var/lastbang -/obj/structure/secure_closet/relaymove(mob/user as mob) - if (user.stat) +/obj/structure/closet/secure_closet/relaymove(mob/user as mob) + if(user.stat) return - if (!( src.locked )) + if(!(src.locked)) for(var/obj/item/I in src) I.loc = src.loc for(var/mob/M in src) M.loc = src.loc - if (M.client) + if(M.client) M.client.eye = M.client.mob M.client.perspective = MOB_PERSPECTIVE src.icon_state = src.icon_opened src.opened = 1 else user << "\blue It's welded shut!" - if (world.time > lastbang+5) + if(world.time > lastbang+5) lastbang = world.time for(var/mob/M in hearers(src, null)) M << text("BANG, bang!", max(0, 5 - get_dist(src, M))) return -/obj/structure/secure_closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - if ((user.restrained() || user.stat)) - return - if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src))) - return - if(!src.opened) - return - if(istype(O, /obj/structure/secure_closet) || istype(O, /obj/structure/closet)) - return - step_towards(O, src.loc) - if (user != O) - for(var/mob/B in viewers(user, 3)) - if ((B.client && !( B.blinded ))) - B << text("\red [] stuffs [] into []!", user, O, src) - src.add_fingerprint(user) - return -/* -/obj/structure/secure_closet/attack_hand(mob/user as mob) - src.add_fingerprint(user) - if (!src.opened && !src.locked) - if(!src.can_open()) - return - //open it - for(var/obj/item/I in src) - I.loc = src.loc - for(var/mob/M in src) - M.loc = src.loc - if (M.client) - M.client.eye = M.client.mob - M.client.perspective = MOB_PERSPECTIVE - src.icon_state = src.icon_opened - playsound(src.loc, 'click.ogg', 15, 1, -3) - src.opened = 1 - else if(src.opened) - if(!src.can_close()) - return - //close it - for(var/obj/item/I in src.loc) - if (!( I.anchored )) - I.loc = src - for(var/mob/M in src.loc) - if (M.buckled) - continue - if (M.client) - M.client.perspective = EYE_PERSPECTIVE - M.client.eye = src - M.loc = src - src.icon_state = src.icon_closed - playsound(src.loc, 'click.ogg', 15, 1, -3) - src.opened = 0 - else - return src.attackby(null, user) - return*/ - -/obj/structure/secure_closet/attack_hand(mob/user as mob) +/obj/structure/closet/secure_closet/attack_hand(mob/user as mob) src.add_fingerprint(user) - if (!src.toggle()) + if(!src.toggle()) return src.attackby(null, user) -/obj/structure/secure_closet/attack_paw(mob/user as mob) - return src.attack_hand(user) +/obj/structure/closet/secure_closet/attack_paw(mob/user as mob) + return src.attack_hand(user) \ No newline at end of file diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 88176687752..253dd3cb92b 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -1,4 +1,4 @@ -/obj/structure/secure_closet/captains +/obj/structure/closet/secure_closet/captains name = "Captain's Closet" req_access = list(access_captain) @@ -20,7 +20,7 @@ -/obj/structure/secure_closet/hop +/obj/structure/closet/secure_closet/hop name = "Head of Personnel" req_access = list(access_hop) @@ -42,7 +42,7 @@ -/obj/structure/secure_closet/hos +/obj/structure/closet/secure_closet/hos name = "Head Of Security" req_access = list(access_hos) @@ -66,7 +66,7 @@ -/obj/structure/secure_closet/warden +/obj/structure/closet/secure_closet/warden name = "Warden's Locker" req_access = list(access_armory) @@ -87,7 +87,7 @@ -/obj/structure/secure_closet/security +/obj/structure/closet/secure_closet/security name = "Security Locker" req_access = list(access_security) @@ -108,7 +108,7 @@ -/obj/structure/secure_closet/detective +/obj/structure/closet/secure_closet/detective name = "Detective" req_access = list(access_forensics_lockers) icon_state = "cabinetdetective" @@ -137,7 +137,7 @@ -/obj/structure/secure_closet/injection +/obj/structure/closet/secure_closet/injection name = "Lethal Injections" req_access = list(access_hos) @@ -151,7 +151,7 @@ -/obj/structure/secure_closet/brig +/obj/structure/closet/secure_closet/brig name = "Brig Locker" req_access = list(access_brig) anchored = 1 @@ -164,7 +164,7 @@ -/obj/structure/secure_closet/courtroom +/obj/structure/closet/secure_closet/courtroom name = "Courtroom Locker" req_access = list(access_court) diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index 6da5ef7da7d..77aac0573ee 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -506,7 +506,7 @@ Code: menu += "Calculating navigation path" if(7) menu += "Unable to locate destination" - var/obj/structure/crate/C = QC.botstatus["load"] + var/obj/structure/closet/crate/C = QC.botstatus["load"] menu += "
Current Load: [ !C ? "none" : "[C.name] (unload)" ]
" menu += "Destination: [!QC.botstatus["dest"] ? "none" : QC.botstatus["dest"] ] (set)
" menu += "Power: [QC.botstatus["powr"]]%
" diff --git a/code/game/objects/new_year.dm b/code/game/objects/new_year.dm index c6394eb1121..90ed7f10665 100644 --- a/code/game/objects/new_year.dm +++ b/code/game/objects/new_year.dm @@ -132,6 +132,6 @@ "/obj/item/weapon/wrapping_paper", "/obj/item/weapon/wrapping_paper") cost = 20 - containertype = "/obj/structure/crate" + containertype = "/obj/structure/closet/crate" containername = "New Year Celebration crate" */ \ No newline at end of file diff --git a/code/game/objects/secstorage/secstorage.dm b/code/game/objects/secstorage/secstorage.dm index 864bb1f6310..9c6f5e324c7 100644 --- a/code/game/objects/secstorage/secstorage.dm +++ b/code/game/objects/secstorage/secstorage.dm @@ -4,7 +4,7 @@ var/obj/screen/close/closer = null var/icon_locking = "secureb" var/icon_sparking = "securespark" - var/icon_open = "secure0" + var/icon_opened = "secure0" var/locked = 1 var/code = "" var/l_code = null @@ -216,7 +216,7 @@ else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1)) src.locked = 0 src.overlays = null - overlays += image('storage.dmi', icon_open) + overlays += image('storage.dmi', icon_opened) src.code = null else src.code = "ERROR" diff --git a/code/game/objects/secstorage/ssafe.dm b/code/game/objects/secstorage/ssafe.dm index 034edb1a6d5..28d58e713d0 100644 --- a/code/game/objects/secstorage/ssafe.dm +++ b/code/game/objects/secstorage/ssafe.dm @@ -2,7 +2,7 @@ name = "secure safe" icon = 'storage.dmi' icon_state = "safe" - icon_open = "safe0" + icon_opened = "safe0" icon_locking = "safeb" icon_sparking = "safespark" flags = FPRINT | TABLEPASS diff --git a/code/game/objects/storage/crates.dm b/code/game/objects/storage/crates.dm index 759d73b379c..c111c52acd2 100644 --- a/code/game/objects/storage/crates.dm +++ b/code/game/objects/storage/crates.dm @@ -1,150 +1,148 @@ -/obj/structure/crate +/obj/structure/closet/crate desc = "A crate." name = "Crate" icon = 'storage.dmi' icon_state = "crate" density = 1 - var/openicon = "crateopen" - var/closedicon = "crate" + icon_opened = "crateopen" + icon_closed = "crate" req_access = null - var/opened = 0 - var/locked = 0 + opened = 0 flags = FPRINT - m_amt = 7500 - mouse_drag_pointer = MOUSE_ACTIVE_POINTER +// mouse_drag_pointer = MOUSE_ACTIVE_POINTER //??? -/obj/structure/crate/internals +/obj/structure/closet/crate/internals desc = "A internals crate." name = "Internals crate" icon = 'storage.dmi' icon_state = "o2crate" density = 1 - openicon = "o2crateopen" - closedicon = "o2crate" + icon_opened = "o2crateopen" + icon_closed = "o2crate" -/obj/structure/crate/trashcart +/obj/structure/closet/crate/trashcart desc = "A heavy, metal trashcart with wheels." name = "Trash Cart" icon = 'storage.dmi' icon_state = "trashcart" density = 1 - openicon = "trashcartopen" - closedicon = "trashcart" + icon_opened = "trashcartopen" + icon_closed = "trashcart" -/obj/structure/crate/hat +/obj/structure/closet/crate/hat desc = "A crate filled with Valuable Collector's Hats!." name = "Hat Crate" icon = 'storage.dmi' icon_state = "crate" density = 1 - openicon = "crateopen" - closedicon = "crate" + icon_opened = "crateopen" + icon_closed = "crate" -/obj/structure/crate/medical +/obj/structure/closet/crate/medical desc = "A medical crate." name = "Medical crate" icon = 'storage.dmi' icon_state = "medicalcrate" density = 1 - openicon = "medicalcrateopen" - closedicon = "medicalcrate" + icon_opened = "medicalcrateopen" + icon_closed = "medicalcrate" -/obj/structure/crate/rcd +/obj/structure/closet/crate/rcd desc = "A crate for the storage of the RCD." name = "RCD crate" icon = 'storage.dmi' icon_state = "crate" density = 1 - openicon = "crateopen" - closedicon = "crate" + icon_opened = "crateopen" + icon_closed = "crate" -/obj/structure/crate/freezer +/obj/structure/closet/crate/freezer desc = "A freezer." name = "Freezer" icon = 'storage.dmi' icon_state = "freezer" density = 1 - openicon = "freezeropen" - closedicon = "freezer" + icon_opened = "freezeropen" + icon_closed = "freezer" -/obj/structure/crate/bin +/obj/structure/closet/crate/bin desc = "A large bin." name = "Large bin" icon = 'storage.dmi' icon_state = "largebin" density = 1 - openicon = "largebinopen" - closedicon = "largebin" + icon_opened = "largebinopen" + icon_closed = "largebin" -/obj/structure/crate/radiation +/obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." name = "Radioactive gear crate" icon = 'storage.dmi' icon_state = "radiation" density = 1 - openicon = "radiationopen" - closedicon = "radiation" + icon_opened = "radiationopen" + icon_closed = "radiation" /obj/item/clothing/suit/radiation -/obj/structure/crate/secure/weapon +/obj/structure/closet/crate/secure/weapon desc = "A secure weapons crate." name = "Weapons crate" icon = 'storage.dmi' icon_state = "weaponcrate" density = 1 - openicon = "weaponcrateopen" - closedicon = "weaponcrate" + icon_opened = "weaponcrateopen" + icon_closed = "weaponcrate" -/obj/structure/crate/secure/plasma +/obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." name = "Plasma crate" icon = 'storage.dmi' icon_state = "plasmacrate" density = 1 - openicon = "plasmacrateopen" - closedicon = "plasmacrate" + icon_opened = "plasmacrateopen" + icon_closed = "plasmacrate" -/obj/structure/crate/secure/gear +/obj/structure/closet/crate/secure/gear desc = "A secure gear crate." name = "Gear crate" icon = 'storage.dmi' icon_state = "secgearcrate" density = 1 - openicon = "secgearcrateopen" - closedicon = "secgearcrate" + icon_opened = "secgearcrateopen" + icon_closed = "secgearcrate" -/obj/structure/crate/secure/bin +/obj/structure/closet/crate/secure/bin desc = "A secure bin." name = "Secure bin" icon_state = "largebins" - openicon = "largebinsopen" - closedicon = "largebins" + icon_opened = "largebinsopen" + icon_closed = "largebins" redlight = "largebinr" greenlight = "largebing" sparks = "largebinsparks" emag = "largebinemag" -/obj/structure/crate/secure +/obj/structure/closet/crate/secure desc = "A secure crate." name = "Secure crate" icon_state = "securecrate" - openicon = "securecrateopen" - closedicon = "securecrate" + icon_opened = "securecrateopen" + icon_closed = "securecrate" var/redlight = "securecrater" var/greenlight = "securecrateg" var/sparks = "securecratesparks" var/emag = "securecrateemag" var/broken = 0 - locked = 1 + var/locked = 1 -/obj/structure/crate/hydroponics +/obj/structure/closet/crate/hydroponics name = "Hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." icon = 'storage.dmi' icon_state = "hydrocrate" - openicon = "hydrocrateopen" - closedicon = "hydrocrate" + icon_opened = "hydrocrateopen" + icon_closed = "hydrocrate" density = 1 /* New() // This stuff shouldn't be here, it should be in /datum/supply_packs/hydroponics ..() @@ -158,14 +156,14 @@ new /obj/item/weapon/pestspray(src) new /obj/item/weapon/pestspray(src) */ -/obj/structure/crate/hydroponics/prespawned +/obj/structure/closet/crate/hydroponics/prespawned //This exists so the prespawned hydro crates spawn with their contents. /* name = "Hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." icon = 'storage.dmi' icon_state = "hydrocrate" - openicon = "hydrocrateopen" - closedicon = "hydrocrate" + icon_opened = "hydrocrateopen" + icon_closed = "hydrocrate" density = 1*/ New() ..() @@ -179,7 +177,7 @@ // new /obj/item/weapon/pestspray(src) // new /obj/item/weapon/pestspray(src) -/obj/structure/crate/New() +/obj/structure/closet/crate/New() ..() spawn(1) if(!opened) // if closed, any item at the crate's loc is put in the contents @@ -187,7 +185,7 @@ if(I.density || I.anchored || I == src) continue I.loc = src -/obj/structure/crate/secure/New() +/obj/structure/closet/crate/secure/New() ..() if(locked) overlays = null @@ -196,14 +194,14 @@ overlays = null overlays += greenlight -/obj/structure/crate/rcd/New() +/obj/structure/closet/crate/rcd/New() ..() new /obj/item/weapon/rcd_ammo(src) new /obj/item/weapon/rcd_ammo(src) new /obj/item/weapon/rcd_ammo(src) new /obj/item/weapon/rcd(src) -/obj/structure/crate/radiation/New() +/obj/structure/closet/crate/radiation/New() ..() new /obj/item/clothing/suit/radiation(src) new /obj/item/clothing/head/radiation(src) @@ -214,7 +212,7 @@ new /obj/item/clothing/suit/radiation(src) new /obj/item/clothing/head/radiation(src) -/obj/structure/crate/proc/open() +/obj/structure/closet/crate/open() playsound(src.loc, 'click.ogg', 15, 1, -3) for(var/obj/O in src) @@ -222,34 +220,37 @@ for(var/mob/M in src) M.loc = get_turf(src) - icon_state = openicon + icon_state = icon_opened src.opened = 1 -/obj/structure/crate/proc/close() +/obj/structure/closet/crate/close() playsound(src.loc, 'click.ogg', 15, 1, -3) for(var/obj/O in get_turf(src)) if(O.density || O.anchored || O == src) continue O.loc = src - icon_state = closedicon + icon_state = icon_closed src.opened = 0 -/obj/structure/crate/attack_hand(mob/user as mob) - if(!locked) - if(opened) close() - else open() - else - user << "\red It's locked." +/obj/structure/closet/crate/attack_hand(mob/user as mob) + if(opened) close() + else open() return -/obj/structure/crate/secure/attack_hand(mob/user as mob) - if(locked && allowed(user) && !broken) - user << "\blue You unlock the [src]." - src.locked = 0 - overlays = null - overlays += greenlight - return ..() +/obj/structure/closet/crate/secure/attack_hand(mob/user as mob) + if(locked && !broken) + if (allowed(user)) + user << "\blue You unlock the [src]." + src.locked = 0 + overlays = null + overlays += greenlight + return + else + user << "\red It's locked." + return + else + ..() -/obj/structure/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/card) && src.allowed(user) && !locked && !opened && !broken) user << "\red You lock the [src]." src.locked = 1 @@ -269,10 +270,10 @@ return ..() -/obj/structure/crate/attack_paw(mob/user as mob) +/obj/structure/closet/crate/attack_paw(mob/user as mob) return attack_hand(user) -/obj/structure/crate/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/packageWrap)) var/obj/item/weapon/packageWrap/O = W if (O.amount > 3) @@ -288,7 +289,7 @@ W.loc = src.loc else return attack_hand(user) -/obj/structure/crate/secure/emp_act(severity) +/obj/structure/closet/crate/secure/emp_act(severity) for(var/obj/O in src) O.emp_act(severity) if(!broken && !opened && prob(50/severity)) @@ -312,7 +313,7 @@ ..() -/obj/structure/crate/ex_act(severity) +/obj/structure/closet/crate/ex_act(severity) switch(severity) if(1.0) for(var/obj/O in src.contents) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 3b02a0f129e..6e5f00878ae 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -146,7 +146,7 @@ var/ordernum=0 var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE for(var/turf/T in get_area_turfs(shuttleat) ) - var/crate = locate(/obj/structure/crate) in T + var/crate = locate(/obj/structure/closet/crate) in T if (crate) del(crate) supply_shuttle_points += SUPPLY_POINTSPERCRATE @@ -169,7 +169,7 @@ var/ordernum=0 var/pickedloc = 0 var/found = 0 for(var/C in markers) - if (locate(/obj/structure/crate) in get_turf(C)) continue + if (locate(/obj/structure/closet/crate) in get_turf(C)) continue found = 1 pickedloc = get_turf(C) if (!found) pickedloc = get_turf(pick(markers)) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 6836387dc80..16f0fe07c7a 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -604,7 +604,7 @@ /obj/machinery/chem_dispenser/, /obj/machinery/reagentgrinder, /obj/structure/table, - /obj/structure/secure_closet, + /obj/structure/closet/secure_closet, /obj/structure/closet, /obj/machinery/sink, /obj/item/weapon/storage, diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index fed7224b723..a49b639c21d 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -9,7 +9,7 @@ /**********************Miner Lockers**************************/ -/obj/structure/secure_closet/miner +/obj/structure/closet/secure_closet/miner name = "Miner's Equipment" icon_state = "miningsec1" icon_closed = "miningsec" @@ -18,7 +18,7 @@ icon_off = "miningsecoff" req_access = list(access_mining) -/obj/structure/secure_closet/miner/New() +/obj/structure/closet/secure_closet/miner/New() ..() sleep(2) new /obj/item/device/analyzer(src) @@ -220,14 +220,14 @@ proc/move_mining_shuttle() /**********************Mining car (Crate like thing, not the rail car)**************************/ -/obj/structure/crate/miningcar +/obj/structure/closet/crate/miningcar desc = "A mining car. This one doesn't work on rails, but has to be dragged." name = "Mining car (not for rails)" icon = 'storage.dmi' icon_state = "miningcar" density = 1 - openicon = "miningcaropen" - closedicon = "miningcar" + icon_opened = "miningcaropen" + icon_closed = "miningcar" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index fd044259cf3..814f40132e1 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -94,7 +94,7 @@ for (var/mob/V in viewers(usr)) if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis) V.show_message("[usr] starts climbing into the disposal.", 3) - if(target != user && !user.restrained()) + if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) if(target.anchored) return V.show_message("[usr] starts stuffing [target.name] into the disposal.", 3) if(!do_after(usr, 20)) @@ -103,7 +103,7 @@ // must be awake, not stunned or whatever msg = "[user.name] climbs into the [src]." user << "You climb into the [src]." - else if(target != user && !user.restrained()) + else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) msg = "[user.name] stuffs [target.name] into the [src]!" user << "You stuff [target.name] into the [src]!" else diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index efb22911a8f..d3b8c0e0782 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -70,8 +70,8 @@ P.wrapped = O O.loc = P src.amount -= 1 - else if (istype(target, /obj/structure/crate)) - var/obj/structure/crate/O = target + else if (istype(target, /obj/structure/closet/crate)) + var/obj/structure/closet/crate/O = target if (src.amount > 3) var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(O.loc)) P.wrapped = O diff --git a/icons/obj/pipes/disposal.dmi b/icons/obj/pipes/disposal.dmi index d085fc0df4c..395b2ffa727 100644 Binary files a/icons/obj/pipes/disposal.dmi and b/icons/obj/pipes/disposal.dmi differ diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index df9aa068aba..938eb1b0080 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -30,7 +30,7 @@ "aaD" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/security/hos) "aaE" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor,/area/security/hos) "aaF" = (/obj/structure/closet{name = "Evidence Closet"},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor,/area/security/hos) -"aaG" = (/obj/machinery/light{dir = 1},/obj/structure/secure_closet/hos,/turf/simulated/floor{dir = 9; icon_state = "carpetside"},/area/security/hos) +"aaG" = (/obj/machinery/light{dir = 1},/obj/structure/closet/secure_closet/hos,/turf/simulated/floor{dir = 9; icon_state = "carpetside"},/area/security/hos) "aaH" = (/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/hos) "aaI" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/hos) "aaJ" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/hos) @@ -214,7 +214,7 @@ "aef" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/security/main) "aeg" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/security/main) "aeh" = (/obj/machinery/vending/security,/turf/simulated/floor,/area/security/main) -"aei" = (/obj/structure/secure_closet/security,/turf/simulated/floor,/area/security/main) +"aei" = (/obj/structure/closet/secure_closet/security,/turf/simulated/floor,/area/security/main) "aej" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/wall,/area/security/main) "aek" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "ael" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -333,10 +333,10 @@ "agu" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/turf/simulated/floor,/area/security/range) "agv" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/obj/item/clothing/ears/earmuffs,/turf/simulated/floor,/area/security/range) "agw" = (/obj/structure/table{tag = "icon-tabledir (SOUTHWEST)"; icon_state = "tabledir"; dir = 10},/obj/machinery/light,/turf/simulated/floor,/area/security/range) -"agx" = (/obj/structure/cable,/obj/machinery/power/apc{cell_type = 2500; name = "Firing Range APC"; pixel_y = -28},/obj/structure/crate,/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/turf/simulated/floor,/area/security/range) -"agy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light_switch{pixel_y = -22},/obj/structure/crate,/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/turf/simulated/floor,/area/security/range) -"agz" = (/obj/structure/secure_closet/brig,/turf/simulated/floor{icon_state = "red"},/area/security/brig) -"agA" = (/obj/machinery/light,/obj/structure/secure_closet/brig,/turf/simulated/floor{icon_state = "red"},/area/security/brig) +"agx" = (/obj/structure/cable,/obj/machinery/power/apc{cell_type = 2500; name = "Firing Range APC"; pixel_y = -28},/obj/structure/closet/crate,/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/turf/simulated/floor,/area/security/range) +"agy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light_switch{pixel_y = -22},/obj/structure/closet/crate,/obj/item/target,/obj/item/target,/obj/item/target/alien,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/target/syndicate,/turf/simulated/floor,/area/security/range) +"agz" = (/obj/structure/closet/secure_closet/brig,/turf/simulated/floor{icon_state = "red"},/area/security/brig) +"agA" = (/obj/machinery/light,/obj/structure/closet/secure_closet/brig,/turf/simulated/floor{icon_state = "red"},/area/security/brig) "agB" = (/turf/simulated/floor{icon_state = "red"},/area/security/brig) "agC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/security/brig) "agD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/security/brig) @@ -368,7 +368,7 @@ "ahd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/device/radio/intercom{pixel_x = 24},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig) "ahe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/item/weapon/cigbutt,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "ahf" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig) -"ahg" = (/obj/structure/secure_closet/injection,/turf/simulated/floor{icon_state = "dark"},/area/security/brig) +"ahg" = (/obj/structure/closet/secure_closet/injection,/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "ahh" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/brig) "ahi" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/security/brig) "ahj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/brig) @@ -423,10 +423,10 @@ "aig" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/paper{info = "5 Deployable Barriers
4 Portable Flashers + Wrench
1 Set of Riot Armor
1 Bulletproof Vest
1 Ablative Vest
2 Bomb Suits
1 Biohazard Suit
1 Chemical Implant Kit
1 Tracking Implant Kit
1 Loyalty Implant Kit
1 Box of Spare Handcuffs
2 Empty Lockboxes
3 Riot shields
3 Helmets
3 Armor Vests
1 Ion Rifle
2 Stun Batons
3 Energy Guns
3 Laser Rifles
3 Gas Masks"; name = "Armoury Inventory"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig) "aih" = (/obj/structure/stool/chair{dir = 2},/obj/effect/landmark/start{name = "Warden"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig) "aii" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig) -"aij" = (/obj/structure/secure_closet/warden,/obj/machinery/light,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig) +"aij" = (/obj/structure/closet/secure_closet/warden,/obj/machinery/light,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/brig) "aik" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig) "ail" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable,/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig) -"aim" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/secure_closet/brig{id = "Cell 6"; name = "Cell 6 Locker"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) +"aim" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/closet/secure_closet/brig{id = "Cell 6"; name = "Cell 6 Locker"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "ain" = (/obj/machinery/flasher{id = "Cell 6"; pixel_x = 0; pixel_y = -28},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "aio" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) "aip" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/item/weapon/wrench{pixel_x = 5; pixel_y = -5},/turf/simulated/floor/plating{tag = "icon-warnplate (SOUTHWEST)"; icon_state = "warnplate"; dir = 10},/area/maintenance/fsmaint) @@ -474,7 +474,7 @@ "ajf" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/security/brig) "ajg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor,/area/security/brig) "ajh" = (/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/brig) -"aji" = (/obj/structure/secure_closet/courtroom,/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/crew_quarters/courtroom) +"aji" = (/obj/structure/closet/secure_closet/courtroom,/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/crew_quarters/courtroom) "ajj" = (/obj/machinery/light{dir = 1},/obj/structure/stool/chair,/turf/simulated/floor,/area/crew_quarters/courtroom) "ajk" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/crew_quarters/courtroom) "ajl" = (/obj/structure/stool/chair,/turf/simulated/floor,/area/crew_quarters/courtroom) @@ -541,15 +541,15 @@ "aku" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating/airless,/area/solar/auxport) "akv" = (/obj/machinery/light/small{dir = 1},/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "akw" = (/turf/simulated/floor/plating,/area/maintenance/fpmaint) -"akx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/secure_closet/brig{id = "Cell 1"; name = "Cell 1 Locker"},/turf/simulated/floor,/area/security/brig) -"aky" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/secure_closet/brig{id = "Cell 2"; name = "Cell 2 Locker"},/turf/simulated/floor,/area/security/brig) +"akx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/brig{id = "Cell 1"; name = "Cell 1 Locker"},/turf/simulated/floor,/area/security/brig) +"aky" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/brig{id = "Cell 2"; name = "Cell 2 Locker"},/turf/simulated/floor,/area/security/brig) "akz" = (/obj/structure/stool,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor,/area/security/brig) -"akA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/secure_closet/brig{id = "Cell 3"; name = "Cell 3 Locker"},/turf/simulated/floor,/area/security/brig) +"akA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/brig{id = "Cell 3"; name = "Cell 3 Locker"},/turf/simulated/floor,/area/security/brig) "akB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/security/brig) "akC" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/security/brig) -"akD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/secure_closet/brig{id = "Cell 4"; name = "Cell 4 Locker"},/turf/simulated/floor,/area/security/brig) -"akE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/secure_closet/brig{id = "Cell 5"; name = "Cell 5 Locker"},/turf/simulated/floor,/area/security/brig) -"akF" = (/obj/structure/secure_closet/brig,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/security/brig) +"akD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/brig{id = "Cell 4"; name = "Cell 4 Locker"},/turf/simulated/floor,/area/security/brig) +"akE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/brig{id = "Cell 5"; name = "Cell 5 Locker"},/turf/simulated/floor,/area/security/brig) +"akF" = (/obj/structure/closet/secure_closet/brig,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/security/brig) "akG" = (/obj/machinery/door/window/southleft{dir = 1; name = "Security"; req_access_txt = "1"},/obj/item/device/radio/intercom{broadcasting = 0; dir = 8; listening = 0; name = "Station Intercom (Court)"; pixel_x = -28},/obj/structure/window/reinforced{dir = 4},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/courtroom) "akH" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/floor{dir = 5; icon_state = "blue"},/area/crew_quarters/courtroom) "akI" = (/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/crew_quarters/courtroom) @@ -745,17 +745,17 @@ "aoq" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "aor" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/crew_quarters) "aos" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) -"aot" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) +"aot" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aou" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aov" = (/turf/simulated/wall,/area/crew_quarters) "aow" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/crew_quarters) "aox" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 23},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters) "aoy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/stool{pixel_y = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aoz" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) -"aoA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/secure_closet/personal,/obj/machinery/alarm{pixel_y = 23},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) +"aoA" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{pixel_y = 23},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aoB" = (/obj/structure/stool{pixel_y = 8},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aoC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) -"aoD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 23},/obj/structure/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) +"aoD" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 23},/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aoE" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/crew_quarters/fitness) "aoF" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/fitness) "aoG" = (/obj/machinery/sink{pixel_y = 29},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/fitness) @@ -811,7 +811,7 @@ "apE" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; frequency = 1439; icon_state = "off"; id_tag = null; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small,/obj/item/weapon/camera_test{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apF" = (/obj/structure/table/woodentable,/obj/item/ammo_magazine/c38,/obj/item/ammo_magazine/c38,/obj/item/weapon/gun/projectile/detective,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) -"apH" = (/obj/structure/secure_closet/detective,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) +"apH" = (/obj/structure/closet/secure_closet/detective,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apI" = (/obj/machinery/computer/secure_data/detective_computer,/obj/machinery/camera{c_tag = "Detective's Office"; dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apJ" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "wood"},/area/lawoffice) "apK" = (/obj/machinery/light,/obj/structure/table/woodentable,/obj/item/weapon/pen,/obj/machinery/camera{c_tag = "Law Office"; dir = 1; network = "SS13"},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice) @@ -857,7 +857,7 @@ "aqy" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "aqz" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aqA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) -"aqB" = (/obj/structure/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) +"aqB" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aqC" = (/turf/simulated/floor{icon_state = "neutralcorner"; dir = 4},/area/crew_quarters) "aqD" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters) "aqE" = (/obj/machinery/requests_console{department = "Crew Quarters"; pixel_y = 30},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters) @@ -958,7 +958,7 @@ "asv" = (/obj/effect/sign/vacuum,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/maintenance/fpmaint) "asw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "asx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) -"asy" = (/obj/structure/crate/rcd,/obj/machinery/camera/motion{c_tag = "EVA Storage"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"asy" = (/obj/structure/closet/crate/rcd,/obj/machinery/camera/motion{c_tag = "EVA Storage"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "asz" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/machinery/light{dir = 1},/obj/item/weapon/hand_labeler,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "asA" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/clothing/head/helmet/welding,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/ai_monitored/storage/eva) "asB" = (/obj/machinery/power/apc{dir = 1; name = "EVA APC"; pixel_x = 3; pixel_y = 23},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/ai_monitored/storage/eva) @@ -1140,7 +1140,7 @@ "avV" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/shuttle/arrival/station) "avW" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/camera{c_tag = "Arrivals East"; dir = 8; network = "SS13"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/hallway/secondary/entry) "avX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/security/checkpoint2) -"avY" = (/obj/structure/secure_closet/security,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{icon_state = "red"; dir = 9},/area/security/checkpoint2) +"avY" = (/obj/structure/closet/secure_closet/security,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{icon_state = "red"; dir = 9},/area/security/checkpoint2) "avZ" = (/obj/machinery/power/apc{dir = 1; name = "Checkpoint APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/checkpoint2) "awa" = (/obj/machinery/computer/security,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/checkpoint2) "awb" = (/obj/machinery/computer/card,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/security/checkpoint2) @@ -1495,9 +1495,9 @@ "aCM" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/hydroponics) "aCN" = (/obj/structure/table,/obj/item/clothing/head/helmet/greenbandana{pixel_x = -1; pixel_y = 5},/obj/item/clothing/head/helmet/greenbandana{pixel_x = 3; pixel_y = 2},/obj/item/weapon/paper/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aCO" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) -"aCP" = (/obj/structure/crate/hydroponics/prespawned,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) -"aCQ" = (/obj/structure/crate/hydroponics/prespawned,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) -"aCR" = (/obj/structure/crate/hydroponics/prespawned,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"aCP" = (/obj/structure/closet/crate/hydroponics/prespawned,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"aCQ" = (/obj/structure/closet/crate/hydroponics/prespawned,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"aCR" = (/obj/structure/closet/crate/hydroponics/prespawned,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aCS" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aCT" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Hydroponics Delivery"; req_access_txt = "35"},/turf/simulated/floor{icon_state = "delivery"},/area/hydroponics) "aCU" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Hydroponics"},/turf/simulated/floor{icon_state = "bot"},/area/hydroponics) @@ -1850,7 +1850,7 @@ "aJD" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/vending/snack,/turf/simulated/floor,/area/crew_quarters/locker) "aJE" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/crew_quarters/locker) "aJF" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor,/area/crew_quarters/locker) -"aJG" = (/obj/structure/secure_closet/personal,/turf/simulated/floor,/area/crew_quarters/locker) +"aJG" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor,/area/crew_quarters/locker) "aJH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/mint) "aJI" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/mint) "aJJ" = (/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/mint) @@ -1913,14 +1913,14 @@ "aKO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/port) "aKP" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/closet/wardrobe/mixed,/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor,/area/crew_quarters/locker) "aKQ" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor,/area/crew_quarters/locker) -"aKR" = (/obj/structure/secure_closet/personal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/crew_quarters/locker) +"aKR" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/crew_quarters/locker) "aKS" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/mint) "aKT" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/mint) "aKU" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/mint) "aKV" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "aKW" = (/turf/simulated/wall/r_wall,/area/storage/tools) "aKX" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) -"aKY" = (/obj/structure/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) +"aKY" = (/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aKZ" = (/obj/machinery/power/apc{dir = 1; name = "Tool Storage APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/storage/tools) "aLa" = (/turf/simulated/floor,/area/storage/tools) "aLb" = (/obj/structure/table,/obj/machinery/light/small{dir = 1},/obj/item/weapon/module/power_control,/turf/simulated/floor,/area/storage/tools) @@ -1974,12 +1974,12 @@ "aLX" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor,/area/crew_quarters/locker) "aLY" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor,/area/crew_quarters/locker) "aLZ" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/locker) -"aMa" = (/obj/structure/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/locker) +"aMa" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/locker) "aMb" = (/obj/machinery/camera{c_tag = "Mint"; c_tag_order = 999; dir = 4},/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/mint) "aMc" = (/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/mint) "aMd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "aMe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) -"aMf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) +"aMf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aMg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/storage/tools) "aMh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/storage/tools) "aMi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tools) @@ -2055,7 +2055,7 @@ "aNA" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/port) "aNB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Chemical Storage Maintenance"; req_access_txt = "12;33"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/storage/tools) "aNC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) -"aND" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) +"aND" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aNE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/wall,/area/storage/tools) "aNF" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/storage/tools) "aNG" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/hallway/primary/central) @@ -2118,7 +2118,7 @@ "aOL" = (/obj/machinery/requests_console{department = "Locker Room"; pixel_y = -30},/turf/simulated/floor,/area/crew_quarters/locker) "aOM" = (/obj/machinery/camera{c_tag = "Locker Room West"; dir = 1},/turf/simulated/floor,/area/crew_quarters/locker) "aON" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/crew_quarters/locker) -"aOO" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/secure_closet/personal,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/crew_quarters/locker) +"aOO" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/secure_closet/personal,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/crew_quarters/locker) "aOP" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/mint) "aOQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/mint) "aOR" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"; tag = ""},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/mint) @@ -2128,7 +2128,7 @@ "aOV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/camera{c_tag = "Port Maintenance 2"; dir = 8; network = "SS13"},/turf/simulated/floor/plating,/area/maintenance/port) "aOW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/storage/tools) "aOX" = (/turf/simulated/floor{icon_state = "white"},/area/storage/tools) -"aOY" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/secure_closet/medical2{pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) +"aOY" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/closet/secure_closet/medical2{pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aOZ" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/camera{c_tag = "Engineering South-West"; dir = 1},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/storage/tools) "aPa" = (/obj/structure/table,/turf/simulated/floor,/area/storage/tools) "aPb" = (/obj/structure/reagent_dispensers/fueltank,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/storage/tools) @@ -2521,7 +2521,7 @@ "aWy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "aWz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor/plating,/area/maintenance/port) "aWA" = (/obj/machinery/conveyor_switch{id = "packageSort1"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/quartermaster/sorting) -"aWB" = (/obj/structure/crate,/turf/simulated/floor,/area/quartermaster/sorting) +"aWB" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/sorting) "aWC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/quartermaster/sorting) "aWD" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/pen,/turf/simulated/floor,/area/quartermaster/sorting) "aWE" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/central) @@ -2706,7 +2706,7 @@ "bab" = (/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bac" = (/obj/structure/stool/chair{dir = 1},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bad" = (/obj/structure/table,/obj/item/weapon/storage/beakerbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/large,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"bae" = (/obj/structure/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) +"bae" = (/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "baf" = (/obj/structure/table,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/item/stack/sheet/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bag" = (/obj/structure/table,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/beaker,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bah" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/toxins/lab) @@ -2741,7 +2741,7 @@ "baK" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/central) "baL" = (/obj/structure/rack,/obj/item/weapon/tank/jetpack,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "baM" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) -"baN" = (/obj/structure/secure_closet/captains,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) +"baN" = (/obj/structure/closet/secure_closet/captains,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "baO" = (/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/obj/machinery/light,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "baP" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "baQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/crew_quarters/captain) @@ -2753,7 +2753,7 @@ "baW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/grid,/area/turret_protected/ai) "baX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/turret_protected/ai) "baY" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall/r_wall,/area/crew_quarters/heads) -"baZ" = (/obj/structure/disposalpipe/segment,/obj/structure/secure_closet/hop,/turf/simulated/floor,/area/crew_quarters/heads) +"baZ" = (/obj/structure/disposalpipe/segment,/obj/structure/closet/secure_closet/hop,/turf/simulated/floor,/area/crew_quarters/heads) "bba" = (/obj/machinery/power/apc{dir = 2; name = "Head of Staff APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor,/area/crew_quarters/heads) "bbb" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/crew_quarters/heads) "bbc" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/requests_console{department = "Head of personnel's desk"; departmentType = 5; name = "HOP RC"; pixel_y = -30},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) @@ -2846,7 +2846,7 @@ "bcL" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/hallway/primary/central) "bcM" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/door/firedoor/border_only,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/hallway/primary/central) "bcN" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/crew_quarters/kitchen) -"bcO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/secure_closet/kitchen,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) +"bcO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/kitchen,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bcP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bcQ" = (/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bcR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) @@ -2938,7 +2938,7 @@ "bez" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "beA" = (/obj/structure/stool/chair{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "beB" = (/obj/machinery/power/apc{dir = 4; name = "Morgue APC"; pixel_x = 25},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) -"beC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) +"beC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "beD" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "beE" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/reagentgrinder,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "beF" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/toxins/lab) @@ -3021,8 +3021,8 @@ "bge" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) "bgf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/quartermaster/storage) "bgg" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/quartermaster/storage) -"bgh" = (/obj/structure/crate/internals,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/quartermaster/storage) -"bgi" = (/obj/structure/crate/freezer,/turf/simulated/floor,/area/quartermaster/storage) +"bgh" = (/obj/structure/closet/crate/internals,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/quartermaster/storage) +"bgi" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor,/area/quartermaster/storage) "bgj" = (/turf/simulated/floor{icon_state = "delivery"},/area/quartermaster/storage) "bgk" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #1"},/obj/machinery/bot/mulebot{beacon_freq = 1400; home_destination = "QM #1"; suffix = "#1"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage) "bgl" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -3091,8 +3091,8 @@ "bhw" = (/turf/space,/area/shuttle/administration/station) "bhx" = (/obj/machinery/door/airlock/external{name = "Supply Dock Airlock"},/turf/simulated/floor/plating,/area/quartermaster/storage) "bhy" = (/turf/simulated/floor/plating,/area/quartermaster/storage) -"bhz" = (/obj/structure/crate,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/quartermaster/storage) -"bhA" = (/obj/structure/crate,/turf/simulated/floor,/area/quartermaster/storage) +"bhz" = (/obj/structure/closet/crate,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/quartermaster/storage) +"bhA" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/storage) "bhB" = (/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor,/area/quartermaster/storage) "bhC" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #2"},/obj/machinery/bot/mulebot{home_destination = "QM #2"; suffix = "#2"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage) "bhD" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -3105,7 +3105,7 @@ "bhK" = (/obj/structure/table,/obj/item/weapon/hand_tele,/turf/simulated/floor,/area/teleporter) "bhL" = (/obj/structure/table,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/teleporter) "bhM" = (/obj/structure/table,/obj/machinery/camera{c_tag = "Teleporter"},/turf/simulated/floor,/area/teleporter) -"bhN" = (/obj/structure/crate,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/teleporter) +"bhN" = (/obj/structure/closet/crate,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/teleporter) "bhO" = (/obj/item/weapon/crowbar,/turf/simulated/floor/plating,/area/teleporter) "bhP" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/teleporter) "bhQ" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload) @@ -3123,7 +3123,7 @@ "bic" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/central) "bid" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/central) "bie" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/kitchen) -"bif" = (/obj/structure/secure_closet/meat,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) +"bif" = (/obj/structure/closet/secure_closet/meat,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "big" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bih" = (/obj/structure/table,/obj/machinery/processor,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bii" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Kitchen"; req_access_txt = "28"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) @@ -3148,7 +3148,7 @@ "biB" = (/obj/machinery/door_control{id = "Biohazard"; name = "Biohazard Shutter"; pixel_x = -24; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "biC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "biD" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"biE" = (/obj/structure/crate,/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"biE" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "biF" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "biG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/quartermaster/storage) "biH" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #3"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage) @@ -3170,7 +3170,7 @@ "biX" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor,/area/bridge/meeting_room) "biY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "heads_meeting"; name = "Meeting Room Window Shields"; opacity = 0},/obj/machinery/atmospherics/pipe/simple{tag = "icon-intact-b-f (NORTH)"; icon_state = "intact-b-f"; dir = 1; level = 2; color = "blue"},/turf/simulated/floor/plating,/area/bridge/meeting_room) "biZ" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/hallway/primary/central) -"bja" = (/obj/structure/secure_closet/fridge,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) +"bja" = (/obj/structure/closet/secure_closet/fridge,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bjb" = (/obj/structure/table,/obj/machinery/blender{pixel_y = 0},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bjc" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bjd" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) @@ -3200,7 +3200,7 @@ "bjB" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bjC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/status_display{density = 0; layer = 4; supply_display = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) "bjD" = (/obj/machinery/camera{c_tag = "Cargo Recieving Dock"; dir = 4},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/quartermaster/storage) -"bjE" = (/obj/structure/crate/medical,/turf/simulated/floor,/area/quartermaster/storage) +"bjE" = (/obj/structure/closet/crate/medical,/turf/simulated/floor,/area/quartermaster/storage) "bjF" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #4"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage) "bjG" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) "bjH" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/simulated/floor,/area/quartermaster/storage) @@ -3306,7 +3306,7 @@ "blD" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/door/window/eastright{name = "Cargo Office"; req_access_txt = "31"},/turf/simulated/floor,/area/quartermaster/storage) "blE" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor,/area/quartermaster) "blF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster) -"blG" = (/obj/structure/crate,/turf/simulated/floor,/area/teleporter) +"blG" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/teleporter) "blH" = (/obj/machinery/shieldwallgen,/turf/simulated/floor{icon_state = "bot"},/area/teleporter) "blI" = (/obj/machinery/shieldwallgen,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "bot"},/area/teleporter) "blJ" = (/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/teleporter) @@ -3513,7 +3513,7 @@ "bpC" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/kitchenspike,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) "bpD" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) "bpE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) -"bpF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/crate,/obj/item/clothing/head/chefhat,/obj/item/clothing/under/rank/chef,/obj/item/weapon/storage/mousetraps{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/mousetraps,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) +"bpF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/crate,/obj/item/clothing/head/chefhat,/obj/item/clothing/under/rank/chef,/obj/item/weapon/storage/mousetraps{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/mousetraps,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) "bpG" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/saltshaker,/obj/machinery/power/apc{dir = 8; name = "Bar APC"; pixel_x = -25; pixel_y = 0},/obj/machinery/camera{c_tag = "Bar West"; dir = 4; network = "SS13"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bpH" = (/obj/structure/stool{pixel_y = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bpI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) @@ -3569,7 +3569,7 @@ "bqG" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bqH" = (/obj/structure/table,/obj/item/weapon/storage/diskbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/gl_kit,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bqI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bqJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/secure_closet/medical3{pixel_x = 5},/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/medical/medbay) +"bqJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/closet/secure_closet/medical3{pixel_x = 5},/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/medical/medbay) "bqK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bqL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bqM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -3578,7 +3578,7 @@ "bqP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/medical/genetics) "bqQ" = (/obj/structure/table,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/weapon/book/manual/medical_cloning{pixel_y = 6},/obj/item/weapon/storage/gl_kit,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bqR" = (/obj/machinery/light,/obj/structure/closet/wardrobe/white,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/camera{c_tag = "Genetics Cloning"; dir = 1; network = "SS13"; pixel_x = 22},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) -"bqS" = (/obj/structure/secure_closet/personal/patient,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) +"bqS" = (/obj/structure/closet/secure_closet/personal/patient,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bqT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/genetics) "bqU" = (/obj/structure/stool/chair,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bqV" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Genetics Research"; req_access_txt = "9; 7"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) @@ -3598,7 +3598,7 @@ "brj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/qm) "brk" = (/obj/structure/closet,/obj/machinery/light_switch{pixel_y = -22},/turf/simulated/floor,/area/quartermaster/qm) "brl" = (/obj/structure/closet,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/quartermaster/qm) -"brm" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/crate,/turf/simulated/floor,/area/quartermaster/qm) +"brm" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/qm) "brn" = (/obj/machinery/light/small,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/quartermaster/qm) "bro" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/quartermaster/qm) "brp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/quartermaster/qm) @@ -3630,7 +3630,7 @@ "brP" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "brQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/storage/backpack/medic{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/backpack/medic{pixel_x = 3; pixel_y = 6},/obj/item/weapon/cleaner,/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "brR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"brS" = (/obj/structure/secure_closet/medical1{pixel_x = 5},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/medical/medbay) +"brS" = (/obj/structure/closet/secure_closet/medical1{pixel_x = 5},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/medical/medbay) "brT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "brU" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; pixel_x = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "brV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/medical/medbay) @@ -3690,7 +3690,7 @@ "bsX" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Bar Storage"; req_access_txt = "25"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "bsY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bsZ" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bta" = (/obj/structure/secure_closet/medical2{pixel_x = 5},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/medical/medbay) +"bta" = (/obj/structure/closet/secure_closet/medical2{pixel_x = 5},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/medical/medbay) "btb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "btc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "medpriv4"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/medbay) "btd" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -3842,7 +3842,7 @@ "bvT" = (/obj/machinery/door_control{id = "medpriv1"; name = "Privacy Shutters"; pixel_y = -25},/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bvU" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bvV" = (/obj/structure/window/reinforced{dir = 4},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) -"bvW" = (/obj/structure/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) +"bvW" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bvX" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bvY" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bvZ" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Mixing Room"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) @@ -3874,7 +3874,7 @@ "bwz" = (/obj/machinery/door/airlock/maintenance{name = "Quartermaster's Office"; req_access_txt = "41"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/quartermaster/qm) "bwA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/quartermaster/qm) "bwB" = (/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/quartermaster/miningdock) -"bwC" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/secure_closet/money_freezer,/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage) +"bwC" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/secure_closet/money_freezer,/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage) "bwD" = (/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/security/nuke_storage) "bwE" = (/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/nuke_storage) "bwF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/security/nuke_storage) @@ -3897,9 +3897,9 @@ "bwW" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bwX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bwY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/blood/splatter{icon_state = "floor2"},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bwZ" = (/obj/machinery/light/small,/obj/structure/secure_closet/bar{req_access_txt = "25"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) +"bwZ" = (/obj/machinery/light/small,/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "bxa" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=1"; location = "Bar"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) -"bxb" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/crate/freezer,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) +"bxb" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/closet/crate/freezer,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "bxc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bxd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/medical/cryo) "bxe" = (/turf/simulated/wall,/area/medical/cryo) @@ -3991,20 +3991,20 @@ "byM" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "byN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "byO" = (/obj/item/weapon/ore/iron,/turf/simulated/floor,/area/quartermaster/miningdock) -"byP" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/crate,/turf/simulated/floor,/area/quartermaster/miningdock) +"byP" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/miningdock) "byQ" = (/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/wall,/area/quartermaster/miningdock) "byR" = (/obj/machinery/camera{c_tag = "Construction Area West"; dir = 2},/obj/machinery/computer/mining_shuttle,/turf/simulated/floor,/area/quartermaster/miningdock) "byS" = (/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor,/area/quartermaster/miningdock) "byT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/quartermaster/miningdock) "byU" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/miningdock) -"byV" = (/obj/structure/crate,/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) +"byV" = (/obj/structure/closet/crate,/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) "byW" = (/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) "byX" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) "byY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/quartermaster/miningdock) "byZ" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 8; icon_state = "brown"},/area/quartermaster/miningdock) "bza" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/quartermaster/miningdock) "bzb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock) -"bzc" = (/obj/machinery/camera{c_tag = "Nuke Storage"; dir = 4; network = "SS13"},/obj/structure/crate,/obj/item/stack/sheet/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/gold{pixel_y = 2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage) +"bzc" = (/obj/machinery/camera{c_tag = "Nuke Storage"; dir = 4; network = "SS13"},/obj/structure/closet/crate,/obj/item/stack/sheet/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/gold{pixel_y = 2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage) "bzd" = (/obj/machinery/nuclearbomb{r_code = "LOLNO"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage) "bze" = (/obj/item/weapon/moneybag/vault,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage) "bzf" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/hallway/primary/aft) @@ -4101,7 +4101,7 @@ "bAS" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bAT" = (/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bAU" = (/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) -"bAV" = (/obj/structure/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) +"bAV" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bAW" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/crew_quarters/hor) "bAX" = (/obj/structure/window/reinforced{dir = 4},/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/crew_quarters/hor) "bAY" = (/obj/machinery/light{dir = 1},/obj/machinery/requests_console{announcementConsole = 1; department = "RD's Office"; departmentType = 5; name = "RD RC"; pixel_x = 0; pixel_y = 30},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) @@ -4155,7 +4155,7 @@ "bBU" = (/obj/structure/grille,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/atmos) "bBV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bBW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bBX" = (/obj/structure/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) +"bBX" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) "bBY" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1; icon_state = "manifold"; level = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) "bBZ" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; dir = 10; pixel_x = 0; level = 2; initialize_directions = 10},/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) "bCa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/cryo) @@ -4181,7 +4181,7 @@ "bCu" = (/turf/simulated/floor/airless{icon_state = "warning"},/area/toxins/test_area) "bCv" = (/turf/simulated/floor/airless{dir = 6; icon_state = "warning"},/area/toxins/test_area) "bCw" = (/turf/simulated/floor/airless{dir = 10; icon_state = "warning"},/area/toxins/test_area) -"bCx" = (/obj/structure/crate,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) +"bCx" = (/obj/structure/closet/crate,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bCy" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/shuttle/engine/heater,/turf/simulated/floor/plating/airless,/area/shuttle/mining/station) "bCz" = (/obj/structure/ore_box,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bCA" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock) @@ -4189,8 +4189,8 @@ "bCC" = (/obj/structure/table,/obj/machinery/light,/turf/simulated/floor,/area/quartermaster/miningdock) "bCD" = (/obj/structure/table,/obj/machinery/camera{c_tag = "Mining Dock"; dir = 1},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor,/area/quartermaster/miningdock) "bCE" = (/obj/machinery/computer/security/mining,/turf/simulated/floor,/area/quartermaster/miningdock) -"bCF" = (/obj/structure/secure_closet/miner,/turf/simulated/floor,/area/quartermaster/miningdock) -"bCG" = (/obj/machinery/light,/obj/structure/secure_closet/miner,/turf/simulated/floor,/area/quartermaster/miningdock) +"bCF" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor,/area/quartermaster/miningdock) +"bCG" = (/obj/machinery/light,/obj/structure/closet/secure_closet/miner,/turf/simulated/floor,/area/quartermaster/miningdock) "bCH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bCI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/apmaint) "bCJ" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/apmaint) @@ -4234,7 +4234,7 @@ "bDv" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/crew_quarters/hor) "bDw" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/stamp/rd,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "bDx" = (/obj/structure/table,/obj/item/weapon/circuitboard/aicore,/obj/item/device/taperecorder,/obj/item/device/paicard,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) -"bDy" = (/obj/structure/secure_closet/RD,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) +"bDy" = (/obj/structure/closet/secure_closet/RD,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "bDz" = (/obj/structure/table,/obj/item/weapon/book/manual/robotics_cyborgs{pixel_y = 5},/obj/item/weapon/clipboard,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor) "bDA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/xenobiology) "bDB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) @@ -4332,7 +4332,7 @@ "bFp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/atmos) "bFq" = (/obj/effect/landmark/start{name = "Atmospheric Technician"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/atmos) "bFr" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/atmos) -"bFs" = (/obj/structure/crate,/turf/simulated/floor,/area/atmos) +"bFs" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/atmos) "bFt" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b"; level = 2},/turf/simulated/floor,/area/atmos) "bFu" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_on"; name = "Air to Distro"; on = 1},/turf/simulated/floor,/area/atmos) "bFv" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 9; icon_state = "intact-c"; level = 2},/turf/simulated/floor,/area/atmos) @@ -4505,7 +4505,7 @@ "bIG" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery) "bIH" = (/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Obshutter"; name = "Observation Shutters"; opacity = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/medical/surgery) "bII" = (/obj/structure/table,/obj/item/weapon/surgicaldrill,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) -"bIJ" = (/obj/structure/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) +"bIJ" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bIK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) "bIL" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) "bIM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) @@ -4622,7 +4622,7 @@ "bKT" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; initialize_directions = 12; level = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple{color = "cyan"; icon_state = "intact-c"},/turf/simulated/floor/plating,/area/atmos) "bKU" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "n2o_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine/n20,/area/atmos) "bKV" = (/turf/simulated/floor/engine/n20,/area/atmos) -"bKW" = (/obj/structure/secure_closet/CMO,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/medical/cmo) +"bKW" = (/obj/structure/closet/secure_closet/CMO,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/medical/cmo) "bKX" = (/obj/machinery/power/apc{dir = 2; name = "Medical Office APC"; pixel_x = 0; pixel_y = -22},/obj/structure/cable,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "bKY" = (/obj/structure/table,/obj/item/weapon/reagent_containers/hypospray,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "bKZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/cmo) @@ -4633,7 +4633,7 @@ "bLe" = (/obj/structure/table,/obj/item/weapon/cautery{pixel_x = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bLf" = (/obj/structure/table,/obj/machinery/light,/obj/item/device/radio/intercom{pixel_y = -25},/obj/item/weapon/cleaner,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bLg" = (/obj/machinery/vending/wallmed2{pixel_y = -28},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) -"bLh" = (/obj/structure/crate/freezer,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) +"bLh" = (/obj/structure/closet/crate/freezer,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bLi" = (/turf/simulated/wall/r_wall,/area/medical/virology) "bLj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window/reinforced,/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/medical/research{name = "Research Division"}) "bLk" = (/obj/structure/disposaloutlet,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) @@ -4762,7 +4762,7 @@ "bND" = (/obj/machinery/camera{c_tag = "Atmospherics East"; dir = 8; network = "SS13"},/turf/simulated/floor,/area/atmos) "bNE" = (/obj/machinery/vending/medical{pixel_x = -2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bNF" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bNG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bNG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bNH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bNI" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass{name = "Rest Room"; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bNJ" = (/obj/machinery/door/airlock/glass{name = "Virology"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) @@ -4799,7 +4799,7 @@ "bOo" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bOp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bOq" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bOr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/secure_closet/medical3,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bOr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bOs" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bOt" = (/obj/machinery/light,/obj/structure/stool/bed,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bOu" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) @@ -4842,11 +4842,11 @@ "bPf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/medical/virology) "bPg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/virology) "bPh" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) -"bPi" = (/obj/structure/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"bPi" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bPj" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/virology) "bPk" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bPl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/medical/virology) -"bPm" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/crate,/obj/item/device/multitool,/obj/item/device/assembly/prox_sensor,/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bPm" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/closet/crate,/obj/item/device/multitool,/obj/item/device/assembly/prox_sensor,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bPn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bPo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/light/small{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bPp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/aft) @@ -5085,7 +5085,7 @@ "bTO" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "bTP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bTQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/wall/r_wall,/area/medical/virology) -"bTR" = (/obj/structure/secure_closet/medical1{pixel_x = -5},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"bTR" = (/obj/structure/closet/secure_closet/medical1{pixel_x = -5},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTS" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTT" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Virology APC"; pixel_x = 0; pixel_y = -23},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTU" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/obj/machinery/requests_console{department = "Virology"; name = "Virology Requests Console"; pixel_x = 32},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) @@ -5188,7 +5188,7 @@ "bVN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/portsolar) "bVO" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/turf/simulated/floor/plating,/area/maintenance/portsolar) "bVP" = (/obj/machinery/door/airlock/engineering{name = "Port Solar Access"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/maintenance/portsolar) -"bVQ" = (/obj/structure/crate,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/aft) +"bVQ" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/aft) "bVR" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/aft) "bVS" = (/obj/machinery/field_generator,/turf/simulated/floor/plating,/area/engine/engineering) "bVT" = (/obj/machinery/emitter,/turf/simulated/floor/plating,/area/engine/engineering) @@ -5208,7 +5208,7 @@ "bWh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/engine/chiefs_office) "bWi" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office) "bWj" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/elite,/turf/simulated/floor,/area/engine/chiefs_office) -"bWk" = (/obj/machinery/power/apc{dir = 1; name = "CE office APC"; pixel_x = 0; pixel_y = 25},/obj/structure/secure_closet/engineering_chief{req_access_txt = "0"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/engine/chiefs_office) +"bWk" = (/obj/machinery/power/apc{dir = 1; name = "CE office APC"; pixel_x = 0; pixel_y = 25},/obj/structure/closet/secure_closet/engineering_chief{req_access_txt = "0"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/engine/chiefs_office) "bWl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable,/turf/simulated/floor/plating,/area/engine/chiefs_office) "bWm" = (/turf/simulated/floor,/area/engine/engineering) "bWn" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple{color = "yellow"; icon_state = "intact-y"; level = 2},/turf/space,/area) @@ -5231,7 +5231,7 @@ "bWE" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/aft) "bWF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/aft) "bWG" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/aft) -"bWH" = (/obj/structure/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/engine/engineering) +"bWH" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/engine/engineering) "bWI" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/engine/engineering) "bWJ" = (/turf/simulated/floor/plating,/area/engine/engineering) "bWK" = (/obj/machinery/door/poddoor{id = "Secure Storage"; name = "Secure Storage"},/turf/simulated/floor/plating,/area/engine/engineering) @@ -5346,7 +5346,7 @@ "bYP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bYQ" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/aft) "bYR" = (/obj/machinery/the_singularitygen{anchored = 0},/turf/simulated/floor/plating,/area/engine/engineering) -"bYS" = (/obj/structure/secure_closet/engineering_welding,/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 9; icon_state = "yellow"},/area/engine/engineering) +"bYS" = (/obj/structure/closet/secure_closet/engineering_welding,/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 9; icon_state = "yellow"},/area/engine/engineering) "bYT" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Engineering"; departmentType = 4; name = "Engineering RC"; pixel_y = 30},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) "bYU" = (/obj/machinery/vending/coffee,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) "bYV" = (/obj/machinery/vending/cigarette,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) @@ -5359,8 +5359,8 @@ "bZc" = (/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) "bZd" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/belt/utility,/obj/item/weapon/wrench,/obj/item/weapon/weldingtool,/obj/item/clothing/head/helmet/welding{pixel_x = -3; pixel_y = 5},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) "bZe" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) -"bZf" = (/obj/structure/secure_closet/engineering_personal,/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) -"bZg" = (/obj/structure/secure_closet/engineering_personal,/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) +"bZf" = (/obj/structure/closet/secure_closet/engineering_personal,/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) +"bZg" = (/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/engine/engineering) "bZh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/maintenance/asmaint2) "bZi" = (/obj/machinery/power/apc{name = "Starboard Solar APC"; dir = 8; pixel_x = -26; pixel_y = 3},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "bZj" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) @@ -5368,7 +5368,7 @@ "bZl" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/port) "bZm" = (/obj/machinery/door/airlock/engineering{name = "Engineering"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/engine/engineering) "bZn" = (/obj/machinery/alarm,/turf/simulated/wall/r_wall,/area/engine/engineering) -"bZo" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/secure_closet/engineering_electrical,/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) +"bZo" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/engine/engineering) "bZp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/engine/engineering) "bZq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/engine/engineering) "bZr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/computer/security/telescreen{dir = 8; layer = 4; name = "Singularity Engine Telescreen"; network = "Singularity"; pixel_x = 0; pixel_y = -30},/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/engine/engineering) @@ -5388,7 +5388,7 @@ "bZF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/door/firedoor/border_only{dir = 4},/turf/simulated/floor,/area/engine/engineering) "bZG" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering) "bZH" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor,/area/engine/engineering) -"bZI" = (/obj/structure/crate/radiation,/turf/simulated/floor,/area/engine/engineering) +"bZI" = (/obj/structure/closet/crate/radiation,/turf/simulated/floor,/area/engine/engineering) "bZJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering) "bZK" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering) "bZL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor,/area/engine/engineering) @@ -5440,7 +5440,7 @@ "caF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/engine/engineering) "caG" = (/obj/structure/particle_accelerator/end_cap,/turf/simulated/floor/plating,/area/engine/engineering) "caH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/engine/engineering) -"caI" = (/obj/structure/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/engineering) +"caI" = (/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/engineering) "caJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "caK" = (/obj/structure/grille,/turf/simulated/floor/plating/airless,/area) "caL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/engine/engineering) @@ -5459,7 +5459,7 @@ "caY" = (/obj/machinery/door_control{id = "Singularity"; name = "Shutters Control"; pixel_x = 25; pixel_y = 0; req_access_txt = "11"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/engine/engineering) "caZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/door_control{id = "Singularity"; name = "Shutters Control"; pixel_x = -25; pixel_y = 0; req_access_txt = "11"},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering) "cba" = (/obj/machinery/camera{c_tag = "Engineering East"; dir = 1; pixel_x = 23},/obj/machinery/light,/obj/effect/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering) -"cbb" = (/obj/structure/secure_closet/engineering_personal,/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering) +"cbb" = (/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering) "cbc" = (/obj/structure/lattice,/obj/structure/grille,/turf/space,/area) "cbd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "cbe" = (/obj/effect/decal/cleanable/oil/streak{icon_state = "floor5"},/turf/simulated/floor/plating/airless,/area) @@ -5676,7 +5676,7 @@ "cfh" = (/obj/item/stack/sheet/metal{amount = 5000},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) "cfi" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "cfj" = (/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) -"cfk" = (/obj/structure/secure_closet/personal,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) +"cfk" = (/obj/structure/closet/secure_closet/personal,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "cfl" = (/turf/unsimulated/wall,/area/centcom/suppy) "cfm" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l (EAST)"; icon_state = "propulsion_l"; dir = 4},/turf/space,/area/shuttle/administration/centcom) "cfn" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (WEST)"; icon_state = "heater"; dir = 8},/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/administration/centcom) @@ -5723,7 +5723,7 @@ "cgc" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock) "cgd" = (/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cge" = (/obj/machinery/door/window/westright,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) -"cgf" = (/obj/structure/crate/internals,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) +"cgf" = (/obj/structure/closet/crate/internals,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "cgg" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/administration/centcom) "cgh" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) "cgi" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) @@ -5746,7 +5746,7 @@ "cgz" = (/obj/machinery/scan_consolenew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom) "cgA" = (/obj/structure/device/piano{dir = 4},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) "cgB" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) -"cgC" = (/obj/structure/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) +"cgC" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) "cgD" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) "cgE" = (/obj/machinery/vending/boozeomat,/turf/unsimulated/wall,/area/centcom/living) "cgF" = (/obj/structure/kitchenspike,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) @@ -5757,9 +5757,9 @@ "cgK" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom) "cgL" = (/obj/item/weapon/reagent_containers/food/condiment/saltshaker,/obj/structure/table,/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) "cgM" = (/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) -"cgN" = (/obj/structure/secure_closet/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) +"cgN" = (/obj/structure/closet/secure_closet/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) "cgO" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) -"cgP" = (/obj/structure/crate/medical,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) +"cgP" = (/obj/structure/closet/crate/medical,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cgQ" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cgR" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/syndicate_station/start) "cgS" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) @@ -5850,7 +5850,7 @@ "ciz" = (/turf/unsimulated/wall,/area/centcom/test) "ciA" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) "ciB" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) -"ciC" = (/obj/structure/secure_closet/security,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) +"ciC" = (/obj/structure/closet/secure_closet/security,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) "ciD" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control) "ciE" = (/obj/structure/stool/bed,/turf/unsimulated/floor{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/prison/solitary) "ciF" = (/turf/unsimulated/floor{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/prison/solitary) @@ -5892,7 +5892,7 @@ "cjp" = (/turf/unsimulated/floor{icon_state = "greencorner"},/area/centcom/control) "cjq" = (/turf/unsimulated/floor{icon_state = "greencorner"; dir = 8},/area/centcom/control) "cjr" = (/obj/machinery/door/airlock/centcom{name = "Research Facility"; opacity = 1; req_access_txt = "104"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/test) -"cjs" = (/obj/structure/secure_closet/courtroom,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) +"cjs" = (/obj/structure/closet/secure_closet/courtroom,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) "cjt" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) "cju" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/camera{c_tag = "Court"; invisibility = 1; network = "thunder"; pixel_x = 10},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) "cjv" = (/obj/machinery/mech_bay_recharge_port,/turf/unsimulated/floor{icon_state = "bot"},/area/centcom/specops) @@ -5903,7 +5903,7 @@ "cjA" = (/obj/machinery/camera{c_tag = "Spec. Ops. Center"; dir = 2; network = "CREED"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "cjB" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "cjC" = (/obj/effect/landmark{name = "Commando"; tag = "Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"cjD" = (/obj/structure/secure_closet/personal,/turf/unsimulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/centcom/specops) +"cjD" = (/obj/structure/closet/secure_closet/personal,/turf/unsimulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/centcom/specops) "cjE" = (/turf/unsimulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/centcom/specops) "cjF" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/handcuffs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "cjG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/specops) @@ -5912,9 +5912,9 @@ "cjJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) "cjK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) "cjL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) -"cjM" = (/obj/structure/secure_closet/medical3{pixel_x = -5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) -"cjN" = (/obj/structure/secure_closet/medical1{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) -"cjO" = (/obj/structure/secure_closet/medical2{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) +"cjM" = (/obj/structure/closet/secure_closet/medical3{pixel_x = -5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) +"cjN" = (/obj/structure/closet/secure_closet/medical1{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) +"cjO" = (/obj/structure/closet/secure_closet/medical2{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) "cjP" = (/obj/machinery/sleeper,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) "cjQ" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) "cjR" = (/obj/structure/stool/chair{dir = 4},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/control) @@ -6014,7 +6014,7 @@ "clH" = (/obj/machinery/camera{c_tag = "Assault Armor South"; dir = 1; network = "CREED"},/turf/unsimulated/floor{tag = "icon-loadingarea (WEST)"; icon_state = "loadingarea"; dir = 8},/area/centcom/specops) "clI" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/centcom/specops) "clJ" = (/obj/structure/bookcase{name = "bookcase (Tactics)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) -"clK" = (/obj/structure/secure_closet/hos,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) +"clK" = (/obj/structure/closet/secure_closet/hos,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "clL" = (/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "clM" = (/obj/structure/rack,/obj/item/weapon/secstorage/sbriefcase,/obj/item/weapon/cigpacket,/obj/item/weapon/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "clN" = (/obj/structure/bookcase{name = "bookcase (Reports)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) @@ -6025,7 +6025,7 @@ "clS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/specops) "clT" = (/turf/unsimulated/floor{tag = "icon-loadingarea"; icon_state = "loadingarea"},/area/centcom/specops) "clU" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 8; listening = 0; name = "Station Intercom (General)"; pixel_x = -28},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) -"clV" = (/obj/structure/secure_closet/injection,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) +"clV" = (/obj/structure/closet/secure_closet/injection,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) "clW" = (/obj/structure/stool/chair{dir = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/centcom/control) "clX" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_l (EAST)"; icon_state = "burst_l"; dir = 4},/turf/space,/area/shuttle/specops/centcom) "clY" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/specops/centcom) @@ -6159,7 +6159,7 @@ "cow" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/escape/centcom) "cox" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "coy" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) -"coz" = (/obj/structure/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) +"coz" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "coA" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "coB" = (/obj/machinery/vending/boozeomat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "coC" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) @@ -6251,7 +6251,7 @@ "cqk" = (/obj/effect/landmark{name = "Holding Facility"},/turf/unsimulated/floor{icon_state = "engine"},/area/centcom/holding) "cql" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area/shuttle/escape/centcom) "cqm" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/tdome) -"cqn" = (/obj/structure/secure_closet/bar,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) +"cqn" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "cqo" = (/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "cqp" = (/obj/machinery/gibber,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "cqq" = (/obj/machinery/door/airlock/command{name = "Thunderdome"},/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/tdome) @@ -6261,8 +6261,8 @@ "cqu" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "cqv" = (/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "cqw" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) -"cqx" = (/obj/structure/secure_closet/meat,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) -"cqy" = (/obj/structure/secure_closet/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) +"cqx" = (/obj/structure/closet/secure_closet/meat,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) +"cqy" = (/obj/structure/closet/secure_closet/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "cqz" = (/obj/structure/stool/chair,/obj/effect/landmark{name = "tdomeobserve"},/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "cqA" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "cqB" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) @@ -6689,8 +6689,8 @@ "cyG" = (/obj/item/clothing/glasses/night,/turf/simulated/floor/plating,/area/AIsattele) "cyH" = (/obj/item/device/aicard,/turf/simulated/floor/plating,/area/AIsattele) "cyI" = (/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating,/area/AIsattele) -"cyJ" = (/obj/structure/crate,/turf/simulated/floor/plating,/area/AIsattele) -"cyK" = (/obj/structure/crate,/obj/machinery/light,/turf/simulated/floor/plating,/area/AIsattele) +"cyJ" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/AIsattele) +"cyK" = (/obj/structure/closet/crate,/obj/machinery/light,/turf/simulated/floor/plating,/area/AIsattele) "cyL" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/plating,/area/AIsattele) "cyM" = (/obj/structure/grille,/turf/unsimulated/floor{name = "plating"},/area) "cyN" = (/obj/machinery/power/solar/fake,/turf/unsimulated/floor{tag = "icon-solarpanel (NORTHEAST)"; icon_state = "solarpanel"; dir = 5},/area/djstation/solars) @@ -7617,7 +7617,7 @@ "cQy" = (/obj/machinery/door/airlock{name = "Room 3"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/mine/living_quarters) "cQz" = (/obj/structure/ore_box,/turf/simulated/floor,/area/mine/storage) "cQA" = (/obj/machinery/recharge_station,/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/mine/storage) -"cQB" = (/obj/structure/secure_closet/miner,/turf/simulated/floor,/area/mine/storage) +"cQB" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor,/area/mine/storage) "cQC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/mine/storage) "cQD" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/wall/r_wall,/area/mine/eva) "cQE" = (/turf/simulated/wall/r_wall,/area/mine/eva) @@ -7816,7 +7816,7 @@ "cUp" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area/mine/lobby) "cUq" = (/obj/machinery/conveyor_switch{id = "mining_internal"},/obj/machinery/atmospherics/pipe/manifold{dir = 4},/obj/machinery/camera{c_tag = "Shuttle Airlock"; dir = 8; network = "MINE"},/turf/simulated/floor,/area/mine/lobby) "cUr" = (/obj/machinery/camera{c_tag = "Station External West"; network = "MINE"},/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored) -"cUs" = (/obj/structure/crate,/turf/simulated/floor,/area/mine/lobby) +"cUs" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/mine/lobby) "cUt" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/mine/production) "cUu" = (/obj/machinery/power/apc{dir = 1; name = "Production Area APC"; pixel_x = 1; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/mine/production) "cUv" = (/obj/machinery/light{dir = 1},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/mine/production) @@ -7841,8 +7841,8 @@ "cUO" = (/obj/machinery/mineral/processing_unit,/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/production) "cUP" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area/mine/lobby) "cUQ" = (/obj/machinery/atmospherics/pipe/simple{dir = 9; icon_state = "intact-f"},/turf/simulated/floor,/area/mine/lobby) -"cUR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/crate,/turf/simulated/floor,/area/mine/production) -"cUS" = (/obj/structure/crate,/obj/machinery/light,/turf/simulated/floor,/area/mine/production) +"cUR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/closet/crate,/turf/simulated/floor,/area/mine/production) +"cUS" = (/obj/structure/closet/crate,/obj/machinery/light,/turf/simulated/floor,/area/mine/production) "cUT" = (/turf/simulated/wall/r_wall,/area/mine/explored) "cUU" = (/obj/machinery/mineral/stacking_unit_console,/turf/simulated/wall/r_wall,/area/mine/production) "cUV" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/explored) diff --git a/maps/uterus.dmm b/maps/uterus.dmm index 7c54dee1dc7..8ddc7f1b4b4 100644 --- a/maps/uterus.dmm +++ b/maps/uterus.dmm @@ -65,7 +65,7 @@ "abm" = (/obj/machinery/door/airlock/maintenance{name = "Security Maintenance"; req_access_txt = "1"},/turf/simulated/floor/plating,/area/security/main) "abn" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "abo" = (/turf/simulated/floor,/area/security/hos) -"abp" = (/obj/machinery/light{dir = 1},/obj/structure/secure_closet/hos,/turf/simulated/floor{dir = 9; icon_state = "carpetside"},/area/security/hos) +"abp" = (/obj/machinery/light{dir = 1},/obj/structure/closet/secure_closet/hos,/turf/simulated/floor{dir = 9; icon_state = "carpetside"},/area/security/hos) "abq" = (/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/hos) "abr" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/hos) "abs" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/security/hos) @@ -123,7 +123,7 @@ "acs" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/power/apc{dir = 4; name = "Head of Security Office APC"; pixel_x = 27; pixel_y = 2},/turf/simulated/floor{dir = 6; icon_state = "carpetside"},/area/security/hos) "act" = (/obj/machinery/vending/security,/turf/simulated/floor,/area/security/main) "acu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/security/main) -"acv" = (/obj/structure/secure_closet/security,/turf/simulated/floor,/area/security/main) +"acv" = (/obj/structure/closet/secure_closet/security,/turf/simulated/floor,/area/security/main) "acw" = (/obj/machinery/disposal,/turf/simulated/floor,/area/security/main) "acx" = (/obj/structure/closet/wardrobe/red,/turf/simulated/floor,/area/security/main) "acy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -222,7 +222,7 @@ "aen" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/bridge) "aeo" = (/obj/structure/table,/obj/item/weapon/storage/toolbox,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/bridge) "aep" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/warden) -"aeq" = (/obj/structure/secure_closet/injection,/turf/simulated/floor{icon_state = "dark"},/area/security/warden) +"aeq" = (/obj/structure/closet/secure_closet/injection,/turf/simulated/floor{icon_state = "dark"},/area/security/warden) "aer" = (/turf/simulated/floor{icon_state = "dark"},/area/security/warden) "aes" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/warden) "aet" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/security/warden) @@ -368,7 +368,7 @@ "ahd" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/turret_protected/ai) "ahe" = (/obj/structure/rack,/obj/item/weapon/tank/jetpack,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/obj/machinery/door_control{id = "captain"; name = "Window Shades"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "ahf" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) -"ahg" = (/obj/structure/secure_closet/captains,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) +"ahg" = (/obj/structure/closet/secure_closet/captains,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "ahh" = (/obj/structure/displaycase,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "ahi" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/camera{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "ahj" = (/obj/machinery/power/apc{dir = 1; name = "Captain's Room APC"; pixel_y = 28},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) @@ -431,7 +431,7 @@ "aio" = (/turf/simulated/wall,/area/hallway/primary/fore) "aip" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) "aiq" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) -"air" = (/obj/structure/secure_closet/warden,/obj/machinery/light,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) +"air" = (/obj/structure/closet/secure_closet/warden,/obj/machinery/light,/turf/simulated/floor{icon_state = "showroomfloor"},/area/security/warden) "ais" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Brig Lockdown Gate"; opacity = 0},/obj/machinery/door/window/brigdoor/southleft{id = "cell1"; name = "Brig Cell 1"; req_access_txt = "1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/security/brig) "ait" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Brig Lockdown Gate"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/brig) "aiu" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Brig Lockdown Gate"; opacity = 0},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/brig) @@ -494,7 +494,7 @@ "ajz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/security/nuke_storage) "ajA" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads) "ajB" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated,/area/crew_quarters/courtroom) -"ajC" = (/obj/structure/secure_closet/courtroom,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) +"ajC" = (/obj/structure/closet/secure_closet/courtroom,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) "ajD" = (/obj/machinery/light{dir = 1},/obj/structure/stool/chair{name = "Bailiff"},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) "ajE" = (/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) "ajF" = (/obj/machinery/camera{c_tag = "Courtroom North"},/obj/structure/stool/chair{name = "Judge"},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) @@ -508,7 +508,7 @@ "ajN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay) "ajO" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay) "ajP" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/medbay) -"ajQ" = (/obj/structure/secure_closet/CMO,/turf/simulated/floor{icon_state = "warning"},/area/medical/cmo) +"ajQ" = (/obj/structure/closet/secure_closet/CMO,/turf/simulated/floor{icon_state = "warning"},/area/medical/cmo) "ajR" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/closet/emcloset,/turf/simulated/floor{icon_state = "warning"},/area/medical/cmo) "ajS" = (/obj/machinery/camera,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "ajT" = (/obj/structure/table,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) @@ -537,7 +537,7 @@ "akq" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/teleporter,/turf/simulated/floor,/area/storage/tech) "akr" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/grid,/area/turret_protected/ai) "aks" = (/obj/structure/lattice{icon_state = "lattice-simple"},/turf/space,/area) -"akt" = (/obj/structure/secure_closet/money_freezer,/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage) +"akt" = (/obj/structure/closet/secure_closet/money_freezer,/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage) "aku" = (/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/security/nuke_storage) "akv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/security/nuke_storage) "akw" = (/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/security/nuke_storage) @@ -562,11 +562,11 @@ "akP" = (/obj/structure/table/woodentable,/obj/item/device/radio/intercom{broadcasting = 1; dir = 8; listening = 0; name = "Station Intercom (Court)"; pixel_x = 0},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/courtroom) "akQ" = (/obj/structure/stool/chair{name = "Witness"},/obj/machinery/door/window/northleft{base_state = "right"; dir = 4; icon_state = "right"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/crew_quarters/courtroom) "akR" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/window/reinforced/tinted{dir = 8},/obj/structure/window/reinforced/tinted{tag = "icon-twindow (EAST)"; icon_state = "twindow"; dir = 4},/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 1},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Brig Lockdown Gate"; opacity = 0},/turf/simulated/floor/plating,/area/security/brig) -"akS" = (/obj/structure/secure_closet/brig{name = "Brig Locker 1"; id = 1},/turf/simulated/floor,/area/security/brig) -"akT" = (/obj/structure/secure_closet/brig{name = "Brig Locker 2"; id = 2},/turf/simulated/floor,/area/security/brig) -"akU" = (/obj/structure/secure_closet/brig{name = "Brig Locker 3"; id = 3},/turf/simulated/floor,/area/security/brig) -"akV" = (/obj/structure/secure_closet/brig{name = "Brig Locker 4"; id = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) -"akW" = (/obj/structure/secure_closet/brig{name = "Brig Locker 4"; id = 4},/turf/simulated/floor,/area/security/brig) +"akS" = (/obj/structure/closet/secure_closet/brig{name = "Brig Locker 1"; id = 1},/turf/simulated/floor,/area/security/brig) +"akT" = (/obj/structure/closet/secure_closet/brig{name = "Brig Locker 2"; id = 2},/turf/simulated/floor,/area/security/brig) +"akU" = (/obj/structure/closet/secure_closet/brig{name = "Brig Locker 3"; id = 3},/turf/simulated/floor,/area/security/brig) +"akV" = (/obj/structure/closet/secure_closet/brig{name = "Brig Locker 4"; id = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig) +"akW" = (/obj/structure/closet/secure_closet/brig{name = "Brig Locker 4"; id = 4},/turf/simulated/floor,/area/security/brig) "akX" = (/obj/structure/table,/obj/item/weapon/gun/syringe{pixel_y = 3},/obj/item/weapon/gun/syringe,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "akY" = (/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "akZ" = (/obj/structure/table,/obj/item/weapon/storage/gl_kit,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -654,7 +654,7 @@ "amD" = (/turf/simulated/floor{icon_state = "bot"},/area/turret_protected/ai_upload) "amE" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/computer/aiupload,/turf/simulated/floor/grid,/area/turret_protected/ai_upload) "amF" = (/obj/structure/table,/obj/item/weapon/aiModule/oxygen,/obj/item/weapon/aiModule/oneHuman,/obj/machinery/door/window{base_state = "left"; dir = 8; icon_state = "left"; name = "High-Risk Modules"; req_access_txt = "20"},/obj/item/weapon/aiModule/purge,/obj/structure/window/reinforced,/turf/simulated/floor/grid,/area/turret_protected/ai_upload) -"amG" = (/obj/machinery/camera{c_tag = "Nuke Storage"; dir = 4; network = "SS13"},/obj/structure/crate,/obj/item/stack/sheet/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/gold{pixel_y = 2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage) +"amG" = (/obj/machinery/camera{c_tag = "Nuke Storage"; dir = 4; network = "SS13"},/obj/structure/closet/crate,/obj/item/stack/sheet/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/gold{pixel_y = 2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage) "amH" = (/obj/machinery/nuclearbomb{r_code = "LOLNO"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage) "amI" = (/obj/item/weapon/moneybag/vault,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage) "amJ" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating{dir = 9; icon_state = "warnplate"; tag = "icon-warnplate (EAST)"},/area/maintenance/atmos_control) @@ -681,9 +681,9 @@ "ane" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/hallway/primary/fore) "anf" = (/turf/simulated/floor{icon_state = "red"; dir = 5},/area/hallway/primary/fore) "ang" = (/obj/structure/table,/obj/item/weapon/storage/syringes,/obj/item/weapon/storage/belt/medical{pixel_x = 4; pixel_y = -7},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"anh" = (/obj/structure/secure_closet/medical1{pixel_x = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"anh" = (/obj/structure/closet/secure_closet/medical1{pixel_x = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "ani" = (/obj/structure/table,/obj/item/weapon/reagent_containers/hypospray,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) -"anj" = (/obj/structure/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) +"anj" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "ank" = (/obj/item/device/radio/intercom{pixel_x = -25},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "anl" = (/obj/structure/stool/chair{dir = 1},/obj/effect/landmark/start{name = "Geneticist"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "anm" = (/obj/structure/stool/chair{dir = 1},/obj/machinery/light{dir = 4},/obj/effect/landmark/start{name = "Geneticist"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) @@ -732,15 +732,15 @@ "aod" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/cryo) "aoe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/cryo) "aof" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/cryo) -"aog" = (/obj/structure/secure_closet/medical3{pixel_x = -5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"aoh" = (/obj/structure/secure_closet/medical2{pixel_x = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"aog" = (/obj/structure/closet/secure_closet/medical3{pixel_x = -5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"aoh" = (/obj/structure/closet/secure_closet/medical2{pixel_x = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aoi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/medical/cmo) "aoj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "CMO's Office"; req_access_txt = "40"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "aok" = (/obj/structure/table,/obj/item/weapon/cautery{pixel_x = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "aol" = (/obj/structure/table,/obj/item/weapon/retractor,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "aom" = (/obj/structure/table,/obj/item/weapon/surgicaldrill,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "aon" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) -"aoo" = (/obj/structure/crate/freezer,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) +"aoo" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "aop" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "aoq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Genetics"; req_access_txt = "9;47"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "aor" = (/turf/simulated/floor/plating,/area/maintenance/starboard) @@ -790,7 +790,7 @@ "apj" = (/obj/structure/table,/obj/item/weapon/storage/diskbox,/obj/item/weapon/storage/diskbox{pixel_x = 5; pixel_y = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "apk" = (/obj/structure/closet,/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/medical/genetics) "apl" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/genetics) -"apm" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/secure_closet/medical1,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/genetics) +"apm" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/closet/secure_closet/medical1,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/genetics) "apn" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_access_txt = "27;12"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/chapel/main) "apo" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "app" = (/turf/simulated/wall/r_wall,/area/chapel/main) @@ -864,7 +864,7 @@ "aqF" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aqG" = (/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aqH" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/genetics) -"aqI" = (/obj/structure/secure_closet/personal/patient,/turf/simulated/floor,/area/medical/genetics) +"aqI" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor,/area/medical/genetics) "aqJ" = (/obj/structure/table,/obj/item/weapon/book/manual/medical_cloning{pixel_y = 6},/obj/item/weapon/storage/gl_kit,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/medical/genetics) "aqK" = (/obj/machinery/power/apc{dir = 1; name = "Cloning APC"; pixel_y = 28},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/medical/genetics) "aqL" = (/turf/simulated/floor,/area/medical/genetics) @@ -1013,7 +1013,7 @@ "aty" = (/obj/structure/table,/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "atz" = (/obj/structure/table,/obj/item/weapon/chem_grenade,/obj/item/weapon/chem_grenade,/obj/item/weapon/chem_grenade,/obj/item/weapon/chem_grenade,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "atA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/chemistry) -"atB" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/crate,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"atB" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "atC" = (/obj/structure/table/reinforced,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."},/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "atD" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/door/window,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "atE" = (/obj/structure/table,/obj/item/device/flashlight/pen,/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -1072,7 +1072,7 @@ "auF" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "auG" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "auH" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/chemistry) -"auI" = (/obj/structure/crate,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"auI" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "auJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay) "auK" = (/obj/structure/stool/chair{dir = 4},/obj/machinery/light/small{dir = 1},/obj/effect/sign/redcross{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "auL" = (/obj/structure/stool/chair{dir = 8},/obj/machinery/light/small{dir = 1},/obj/effect/sign/redcross{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -1120,7 +1120,7 @@ "avB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "avC" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Chemistry"; req_access_txt = "33"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "avD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"avE" = (/obj/structure/window/reinforced,/obj/structure/crate,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"avE" = (/obj/structure/window/reinforced,/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "avF" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay) "avG" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "avH" = (/obj/structure/stool/chair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -1373,8 +1373,8 @@ "aAu" = (/turf/simulated/floor{icon_state = "delivery"},/area/medical/medbay) "aAv" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aAw" = (/obj/structure/table,/obj/item/weapon/crowbar,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"aAx" = (/obj/structure/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"aAy" = (/obj/structure/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"aAx" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"aAy" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "aAz" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/machinery/power/apc{dir = 8; name = "Starboard Maintainance APC"; pixel_x = -28},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/starboard) "aAA" = (/obj/structure/morgue,/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "aAB" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) @@ -1462,7 +1462,7 @@ "aCf" = (/obj/item/weapon/airlock_electronics,/turf/simulated/floor/plating,/area/storage/auxillary) "aCg" = (/obj/item/weapon/module/power_control,/turf/simulated/floor/plating,/area/storage/auxillary) "aCh" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/storage/auxillary) -"aCi" = (/obj/structure/secure_closet/warden,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) +"aCi" = (/obj/structure/closet/secure_closet/warden,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "aCj" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "aCk" = (/obj/structure/table/woodentable,/obj/item/weapon/cigpacket,/obj/item/clothing/glasses/thermal,/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/security/detectives_office) "aCl" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp/green{pixel_x = 1; pixel_y = 5},/obj/effect/deskclutter,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) @@ -1500,7 +1500,7 @@ "aCR" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/item/device/radio/intercom{broadcasting = 1; dir = 8; listening = 0; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor{icon_state = "wood"},/area/security/checkpoint2) "aCS" = (/obj/structure/table/reinforced,/obj/item/weapon/paper,/turf/simulated/floor{icon_state = "wood"},/area/security/checkpoint2) "aCT" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "wood"},/area/security/checkpoint2) -"aCU" = (/obj/structure/secure_closet/security,/obj/machinery/light,/turf/simulated/floor{icon_state = "wood"},/area/security/checkpoint2) +"aCU" = (/obj/structure/closet/secure_closet/security,/obj/machinery/light,/turf/simulated/floor{icon_state = "wood"},/area/security/checkpoint2) "aCV" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/airless,/area/hallway/secondary/entry) "aCW" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "aCX" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/hallway/primary/port) @@ -1511,7 +1511,7 @@ "aDc" = (/obj/machinery/disposal/toilet,/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aDd" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aDe" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) -"aDf" = (/obj/structure/secure_closet/bar{req_access_txt = "25"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) +"aDf" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aDg" = (/obj/structure/reagent_dispensers/beerkeg,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aDh" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aDi" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) @@ -1568,7 +1568,7 @@ "aEh" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aEi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aEj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) -"aEk" = (/obj/structure/crate/freezer,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) +"aEk" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/bar) "aEl" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEm" = (/obj/machinery/door/airlock/maintenance,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aEn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/maintcentral) @@ -1707,7 +1707,7 @@ "aGQ" = (/obj/machinery/computer/pandemic,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "aGR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/virology) "aGS" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) -"aGT" = (/obj/structure/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"aGT" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "aGU" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/medical/virology) "aGV" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/storage) "aGW" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/camera,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/storage) @@ -1798,7 +1798,7 @@ "aID" = (/obj/machinery/door/airlock/maintenance,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "aIE" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/quartermaster/qm) "aIF" = (/obj/effect/landmark/start{name = "Quartermaster"},/turf/simulated/floor,/area/quartermaster/qm) -"aIG" = (/obj/structure/crate,/turf/simulated/floor,/area/quartermaster/qm) +"aIG" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/qm) "aIH" = (/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/locker/locker_toilet) "aII" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/primary/central) "aIJ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/maintcentral) @@ -1831,7 +1831,7 @@ "aJk" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/turf/space,/area) "aJl" = (/turf/space,/area/shuttle/administration/station) "aJm" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) -"aJn" = (/obj/structure/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) +"aJn" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aJo" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "aJp" = (/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/crew_quarters) "aJq" = (/obj/machinery/power/apc{dir = 1; name = "Crew Quarters"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/crew_quarters) @@ -1862,7 +1862,7 @@ "aJP" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/cafeteria) "aJQ" = (/turf/simulated/floor{icon_state = "delivery"},/area/crew_quarters/cafeteria) "aJR" = (/obj/structure/kitchenspike,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/cafeteria) -"aJS" = (/obj/structure/crate,/obj/item/clothing/head/chefhat,/obj/item/clothing/under/rank/chef,/obj/item/weapon/storage/mousetraps{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/mousetraps,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/cafeteria) +"aJS" = (/obj/structure/closet/crate,/obj/item/clothing/head/chefhat,/obj/item/clothing/under/rank/chef,/obj/item/weapon/storage/mousetraps{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/mousetraps,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/cafeteria) "aJT" = (/obj/structure/disposalpipe/segment,/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/cafeteria) "aJU" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/atmos_control) "aJV" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating,/area/maintenance/atmos_control) @@ -1934,7 +1934,7 @@ "aLj" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "delivery"},/area/storage/primary) "aLk" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; location = "Tool Storage"},/turf/simulated/floor{icon_state = "bot"},/area/storage/primary) "aLl" = (/obj/structure/table,/obj/item/weapon/crowbar,/turf/simulated/floor,/area/storage/primary) -"aLm" = (/obj/structure/secure_closet/medical1{pixel_x = -5},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"aLm" = (/obj/structure/closet/secure_closet/medical1{pixel_x = -5},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "aLn" = (/obj/machinery/power/apc{cell_type = 5000; dir = 2; name = "Virology APC"; pixel_x = 0; pixel_y = -23},/obj/structure/cable,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "aLo" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "aLp" = (/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Virology Holding Rooms"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) @@ -1999,7 +1999,7 @@ "aMw" = (/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 4; id = "QM2"},/turf/simulated/floor/plating,/area/quartermaster/qm) "aMx" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/crew_quarters/locker) "aMy" = (/turf/simulated/floor,/area/crew_quarters/locker) -"aMz" = (/obj/structure/secure_closet/personal,/turf/simulated/floor,/area/crew_quarters/locker) +"aMz" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor,/area/crew_quarters/locker) "aMA" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/crew_quarters/locker) "aMB" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/crew_quarters/locker) "aMC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/locker) @@ -2033,7 +2033,7 @@ "aNe" = (/obj/machinery/light{dir = 1},/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) "aNf" = (/obj/machinery/driver_button{dir = 2; id = "toxinsgun"; pixel_y = 24},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) "aNg" = (/obj/machinery/computer/security/telescreen{name = "Test Chamber Telescreen"; pixel_x = 0; pixel_y = 27; network = "Toxins"},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) -"aNh" = (/obj/structure/crate/rcd,/obj/machinery/camera/motion{c_tag = "EVA Storage"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/ai_monitored/storage/eva) +"aNh" = (/obj/structure/closet/crate/rcd,/obj/machinery/camera/motion{c_tag = "EVA Storage"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/ai_monitored/storage/eva) "aNi" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/machinery/light{dir = 1},/obj/item/weapon/hand_labeler,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/turf/simulated/floor{icon_state = "warning"},/area/ai_monitored/storage/eva) "aNj" = (/obj/structure/table,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/assembly/prox_sensor,/obj/item/device/assembly/prox_sensor,/turf/simulated/floor{icon_state = "warning"},/area/ai_monitored/storage/eva) "aNk" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/clothing/head/helmet/welding,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/ai_monitored/storage/eva) @@ -2064,8 +2064,8 @@ "aNJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/cafeteria) "aNK" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/cafeteria) "aNL" = (/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/cafeteria) -"aNM" = (/obj/machinery/requests_console{department = "Kitchen"; departmentType = 2; name = "Kitchen RC"; pixel_x = -1; pixel_y = 27},/obj/structure/secure_closet/meat,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/cafeteria) -"aNN" = (/obj/structure/secure_closet/kitchen,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/cafeteria) +"aNM" = (/obj/machinery/requests_console{department = "Kitchen"; departmentType = 2; name = "Kitchen RC"; pixel_x = -1; pixel_y = 27},/obj/structure/closet/secure_closet/meat,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/cafeteria) +"aNN" = (/obj/structure/closet/secure_closet/kitchen,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/cafeteria) "aNO" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/cafeteria) "aNP" = (/obj/machinery/camera{dir = 8},/turf/simulated/floor,/area/hallway/primary/central) "aNQ" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -2128,7 +2128,7 @@ "aOV" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor,/area/quartermaster/qm) "aOW" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/floor,/area/quartermaster/qm) "aOX" = (/obj/machinery/vending/coffee,/turf/simulated/floor,/area/crew_quarters/locker) -"aOY" = (/obj/structure/secure_closet/personal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/crew_quarters/locker) +"aOY" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/crew_quarters/locker) "aOZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/locker) "aPa" = (/obj/machinery/door/airlock{req_access_txt = "150"},/turf/simulated/floor,/area/crew_quarters/locker) "aPb" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/central) @@ -2384,7 +2384,7 @@ "aTR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "aTS" = (/obj/machinery/door/airlock/glass_medical{name = "Xenobiology"; req_access_txt = 55},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aTT" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/crew_quarters/hor) -"aTU" = (/obj/structure/secure_closet/RD,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 29},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/hor) +"aTU" = (/obj/structure/closet/secure_closet/RD,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 29},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/hor) "aTV" = (/obj/machinery/computer/aifixer,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/hor) "aTW" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{name = "Research Monitor"; network = "RD"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/hor) "aTX" = (/obj/machinery/computer/robotics,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/hor) @@ -2407,7 +2407,7 @@ "aUo" = (/obj/structure/table,/obj/item/weapon/hand_tele,/turf/simulated/floor,/area/teleporter) "aUp" = (/obj/structure/table,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/teleporter) "aUq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/teleporter) -"aUr" = (/obj/structure/crate,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/teleporter) +"aUr" = (/obj/structure/closet/crate,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/teleporter) "aUs" = (/obj/item/weapon/crowbar,/turf/simulated/floor/plating,/area/teleporter) "aUt" = (/obj/structure/table,/obj/machinery/camera{c_tag = "Teleporter"},/turf/simulated/floor,/area/teleporter) "aUu" = (/obj/machinery/biogenerator,/turf/simulated/floor,/area/hydroponics) @@ -2525,9 +2525,9 @@ "aWC" = (/obj/structure/lamarr,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/crew_quarters/hor) "aWD" = (/obj/machinery/door/airlock/external{name = "Supply Dock Airlock"},/turf/simulated/floor/plating,/area/quartermaster/qm) "aWE" = (/turf/simulated/floor/plating,/area/quartermaster/qm) -"aWF" = (/obj/structure/crate,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) -"aWG" = (/obj/structure/crate/freezer,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) -"aWH" = (/obj/structure/crate/secure,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) +"aWF" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) +"aWG" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) +"aWH" = (/obj/structure/closet/crate/secure,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) "aWI" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/quartermaster/qm) "aWJ" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/quartermaster/sorting) "aWK" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/structure/table,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/turf/simulated/floor,/area/quartermaster/sorting) @@ -2559,9 +2559,9 @@ "aXk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/hor) "aXl" = (/turf/simulated/wall,/area/crew_quarters/hor) "aXm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/quartermaster/qm) -"aXn" = (/obj/structure/crate/internals,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) -"aXo" = (/obj/structure/crate/medical,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) -"aXp" = (/obj/structure/crate/hydroponics,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) +"aXn" = (/obj/structure/closet/crate/internals,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) +"aXo" = (/obj/structure/closet/crate/medical,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) +"aXp" = (/obj/structure/closet/crate/hydroponics,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/qm) "aXq" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/conveyor{id = "postal2"},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/quartermaster/sorting) "aXr" = (/obj/machinery/conveyor_switch{id = "postal2"},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/quartermaster/sorting) "aXs" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor,/area/quartermaster/sorting) @@ -2580,7 +2580,7 @@ "aXF" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/atmos) "aXG" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/atmos) "aXH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/atmos) -"aXI" = (/obj/structure/crate,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/teleporter) +"aXI" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/teleporter) "aXJ" = (/obj/machinery/shieldwallgen,/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/teleporter) "aXK" = (/obj/machinery/shieldwallgen,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/teleporter) "aXL" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/teleporter) @@ -2600,7 +2600,7 @@ "aXZ" = (/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "aYa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/status_display{supply_display = 1},/turf/simulated/floor/plating,/area/quartermaster/qm) "aYb" = (/obj/structure/plasticflaps{opacity = 1},/obj/machinery/conveyor{id = "postal2"},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/quartermaster/sorting) -"aYc" = (/obj/structure/crate,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/sorting) +"aYc" = (/obj/structure/closet/crate,/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/quartermaster/sorting) "aYd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/quartermaster/sorting) "aYe" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor,/area/quartermaster/sorting) "aYf" = (/obj/machinery/light{dir = 8},/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hallway/primary/port) @@ -2735,9 +2735,9 @@ "baE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "baF" = (/obj/structure/table,/obj/item/clothing/head/helmet/greenbandana{pixel_x = -1; pixel_y = 5},/obj/item/clothing/head/helmet/greenbandana{pixel_x = 3; pixel_y = 2},/obj/item/weapon/paper/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "baG" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) -"baH" = (/obj/structure/crate/hydroponics/prespawned,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) -"baI" = (/obj/structure/crate/hydroponics/prespawned,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) -"baJ" = (/obj/structure/crate/hydroponics/prespawned,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"baH" = (/obj/structure/closet/crate/hydroponics/prespawned,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"baI" = (/obj/structure/closet/crate/hydroponics/prespawned,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"baJ" = (/obj/structure/closet/crate/hydroponics/prespawned,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "baK" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "baL" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) "baM" = (/obj/item/weapon/stock_parts/console_screen,/obj/structure/table,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/lab) @@ -2754,8 +2754,8 @@ "baX" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/shuttle/mining/station) "baY" = (/turf/simulated/wall,/area/quartermaster/miningdock) "baZ" = (/obj/machinery/computer/security/mining,/turf/simulated/floor,/area/quartermaster/miningdock) -"bba" = (/obj/structure/secure_closet/miner,/turf/simulated/floor,/area/quartermaster/miningdock) -"bbb" = (/obj/structure/secure_closet/miner,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor,/area/quartermaster/miningdock) +"bba" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor,/area/quartermaster/miningdock) +"bbb" = (/obj/structure/closet/secure_closet/miner,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor,/area/quartermaster/miningdock) "bbc" = (/obj/effect/decal/cleanable/blood{tag = "icon-gib3"; icon_state = "gib3"},/obj/effect/decal/cleanable/xenoblood{icon_state = "xfloor2"},/obj/effect/decal/cleanable/blood/gibs{tag = "icon-gibleg"; icon_state = "gibleg"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/aft) "bbd" = (/obj/structure/table,/obj/item/device/radio,/turf/simulated/floor,/area/crew_quarters/fitness) "bbe" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) @@ -2826,7 +2826,7 @@ "bcr" = (/obj/structure/stool/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bcs" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bct" = (/obj/item/weapon/ore/iron,/turf/simulated/floor,/area/quartermaster/miningdock) -"bcu" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/crate,/turf/simulated/floor,/area/quartermaster/miningdock) +"bcu" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/crate,/turf/simulated/floor,/area/quartermaster/miningdock) "bcv" = (/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/wall,/area/quartermaster/miningdock) "bcw" = (/obj/machinery/camera{c_tag = "Construction Area West"; dir = 2},/obj/machinery/computer/mining_shuttle,/turf/simulated/floor,/area/quartermaster/miningdock) "bcx" = (/obj/effect/landmark/start{name = "Miner"},/turf/simulated/floor,/area/quartermaster/miningdock) @@ -2898,7 +2898,7 @@ "bdL" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2o_sensor"},/turf/simulated/floor/engine/n20,/area/atmos) "bdM" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent/roomfiller{valve_open = 1},/turf/simulated/floor/engine/n20,/area/atmos) "bdN" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine/n20,/area/atmos) -"bdO" = (/obj/structure/crate,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) +"bdO" = (/obj/structure/closet/crate,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bdP" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/shuttle/engine/heater,/turf/simulated/floor/plating/airless,/area/shuttle/mining/station) "bdQ" = (/obj/structure/ore_box,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bdR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock) @@ -3174,7 +3174,7 @@ "bjb" = (/turf/simulated/wall,/area/assembly/assembly_line) "bjc" = (/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/flash,/obj/item/device/flash,/obj/structure/table,/turf/simulated/floor{icon_state = "showroomfloor"},/area/assembly/assembly_line) "bjd" = (/turf/simulated/floor{icon_state = "showroomfloor"},/area/assembly/assembly_line) -"bje" = (/obj/structure/secure_closet/medical2,/turf/simulated/floor{icon_state = "showroomfloor"},/area/assembly/assembly_line) +"bje" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor{icon_state = "showroomfloor"},/area/assembly/assembly_line) "bjf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/assembly/assembly_line) "bjg" = (/obj/structure/table/woodentable,/obj/item/trash/sosjerky,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/assembly/chargebay) "bjh" = (/obj/structure/table/woodentable,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/assembly/chargebay) @@ -3302,14 +3302,14 @@ "blz" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/device/flash,/obj/item/device/flash,/turf/simulated/floor,/area/assembly/assembly_line) "blA" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/weapon/cable_coil,/turf/simulated/floor,/area/assembly/assembly_line) "blB" = (/obj/structure/table,/obj/item/weapon/cable_coil/blue,/turf/simulated/floor,/area/engine/engine_smes) -"blC" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/crate,/turf/simulated/floor,/area/engine/engine_smes) +"blC" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/closet/crate,/turf/simulated/floor,/area/engine/engine_smes) "blD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/engine/engine_smes) "blE" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/assembly/assembly_line) "blF" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/assembly/assembly_line) "blG" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{pixel_x = 5; pixel_y = -5; charge = 100; maxcharge = 15000},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/machinery/light,/turf/simulated/floor,/area/assembly/assembly_line) "blH" = (/obj/structure/table,/obj/item/device/multitool,/obj/item/weapon/crowbar,/obj/item/device/flash,/obj/item/device/flash,/turf/simulated/floor,/area/assembly/assembly_line) "blI" = (/obj/structure/table,/obj/item/weapon/cable_coil/green,/obj/item/weapon/wirecutters,/turf/simulated/floor,/area/engine/engine_smes) -"blJ" = (/obj/structure/crate,/turf/simulated/floor,/area/engine/engine_smes) +"blJ" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/engine/engine_smes) "blK" = (/obj/machinery/door/airlock/maintenance,/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/portsolar) "blL" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/portsolar) "blM" = (/turf/simulated/floor/plating,/area/maintenance/portsolar) @@ -3407,7 +3407,7 @@ "bnA" = (/obj/machinery/power/terminal,/obj/structure/cable,/turf/simulated/floor/plating,/area/maintenance/portsolar) "bnB" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor,/area/engine/engine_smes) "bnC" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/belt/utility,/obj/item/weapon/wrench,/obj/item/weapon/weldingtool,/obj/item/clothing/head/helmet/welding{pixel_x = -3; pixel_y = 5},/turf/simulated/floor,/area/engine/engine_smes) -"bnD" = (/obj/structure/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/engine_smes) +"bnD" = (/obj/structure/closet/secure_closet/engineering_personal,/turf/simulated/floor,/area/engine/engine_smes) "bnE" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/extinguisher{pixel_x = 8},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/engine/engine_smes) "bnF" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/fire/firefighter,/obj/item/clothing/head/helmet/hardhat,/turf/simulated/floor,/area/engine/engine_smes) "bnG" = (/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/turf/simulated/floor,/area/engine/engine_smes) @@ -3425,7 +3425,7 @@ "bnS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/engine_smes) "bnT" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes,/turf/simulated/floor/plating,/area/engine/engine_smes) "bnU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/wall/r_wall,/area/engine/engine_smes) -"bnV" = (/obj/structure/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/engine/engine_smes) +"bnV" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/engine/engine_smes) "bnW" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/tracker,/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/port) "bnX" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/solar/port) "bnY" = (/obj/machinery/door/airlock/external{name = "West Solar Maintenance"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/engine/engine_smes) @@ -3440,13 +3440,13 @@ "boh" = (/turf/simulated/floor/airless{dir = 10; icon_state = "warning"},/area/toxins/test_area) "boi" = (/obj/machinery/light/spot{dir = 4; layer = 2.8},/turf/simulated/floor/airless{dir = 6; icon_state = "warning"},/area/toxins/test_area) "boj" = (/obj/item/clothing/glasses/meson,/turf/simulated/floor,/area/engine/engine_smes) -"bok" = (/obj/structure/secure_closet/engineering_electrical,/turf/simulated/floor/plating,/area/engine/engine_smes) -"bol" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/secure_closet/engineering_electrical,/turf/simulated/floor/plating,/area/engine/engine_smes) +"bok" = (/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor/plating,/area/engine/engine_smes) +"bol" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor/plating,/area/engine/engine_smes) "bom" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/engine/engine_smes) "bon" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/engine_smes) "boo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/item/trash/cheesie,/turf/simulated/floor/plating,/area/engine/engine_smes) -"bop" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/engine/engine_smes) -"boq" = (/obj/structure/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/engine/engine_smes) +"bop" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/engine/engine_smes) +"boq" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/engine/engine_smes) "bor" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating/airless,/area/toxins/test_area) "bos" = (/turf/simulated/floor/airless{icon_state = "bot"},/area/toxins/test_area) "bot" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/solar,/turf/simulated/floor{icon_state = "solarpanel"},/area/solar/port) @@ -3504,7 +3504,7 @@ "bpt" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/engine/engine_smes) "bpu" = (/obj/machinery/power/monitor,/turf/simulated/floor,/area/engine/chiefs_office) "bpv" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/engine/chiefs_office) -"bpw" = (/obj/structure/secure_closet/engineering_chief,/obj/machinery/light,/turf/simulated/floor,/area/engine/chiefs_office) +"bpw" = (/obj/structure/closet/secure_closet/engineering_chief,/obj/machinery/light,/turf/simulated/floor,/area/engine/chiefs_office) "bpx" = (/obj/structure/table/woodentable,/obj/item/weapon/zippo,/obj/item/weapon/stamp/ce,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/engine/chiefs_office) "bpy" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/engineering_hacking{pixel_x = 6; pixel_y = 6},/obj/item/weapon/book/manual/engineering_guide,/obj/item/weapon/book/manual/robotics_cyborgs{pixel_x = -3; pixel_y = -3},/turf/simulated/floor,/area/engine/chiefs_office) "bpz" = (/obj/structure/table/woodentable,/obj/machinery/light/lamp/green,/turf/simulated/floor,/area/engine/chiefs_office) @@ -3528,7 +3528,7 @@ "bpR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/external{name = "Engine Room"},/turf/simulated/floor/plating,/area/engine/engineering) "bpS" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/engine/engineering) "bpT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/engine/engineering) -"bpU" = (/obj/structure/crate/radiation,/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/engine/engineering) +"bpU" = (/obj/structure/closet/crate/radiation,/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/engine/engineering) "bpV" = (/obj/structure/rack,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/engine/engineering) "bpW" = (/turf/simulated/floor,/area/engine/engineering) "bpX" = (/obj/structure/rack,/turf/simulated/floor,/area/engine/engineering) @@ -3786,7 +3786,7 @@ "buP" = (/obj/item/stack/sheet/metal{amount = 5000},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) "buQ" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "buR" = (/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) -"buS" = (/obj/structure/secure_closet/personal,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) +"buS" = (/obj/structure/closet/secure_closet/personal,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "buT" = (/turf/unsimulated/wall,/area/centcom/suppy) "buU" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l (EAST)"; icon_state = "propulsion_l"; dir = 4},/turf/space,/area/shuttle/administration/centcom) "buV" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (WEST)"; icon_state = "heater"; dir = 8},/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/administration/centcom) @@ -3833,7 +3833,7 @@ "bvK" = (/turf/unsimulated/floor{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/supply/dock) "bvL" = (/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area) "bvM" = (/obj/machinery/door/window/westright,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area) -"bvN" = (/obj/structure/crate/internals,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area) +"bvN" = (/obj/structure/closet/crate/internals,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area) "bvO" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/administration/centcom) "bvP" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) "bvQ" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) @@ -3858,7 +3858,7 @@ "bwj" = (/obj/machinery/scan_consolenew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom) "bwk" = (/obj/structure/device/piano{dir = 4},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) "bwl" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) -"bwm" = (/obj/structure/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) +"bwm" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) "bwn" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) "bwo" = (/obj/machinery/vending/boozeomat,/turf/unsimulated/wall,/area/centcom/living) "bwp" = (/obj/structure/kitchenspike,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) @@ -3869,9 +3869,9 @@ "bwu" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/administration/centcom) "bwv" = (/obj/item/weapon/reagent_containers/food/condiment/saltshaker,/obj/structure/table,/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) "bww" = (/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/living) -"bwx" = (/obj/structure/secure_closet/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) +"bwx" = (/obj/structure/closet/secure_closet/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) "bwy" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/living) -"bwz" = (/obj/structure/crate/medical,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area) +"bwz" = (/obj/structure/closet/crate/medical,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area) "bwA" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area) "bwB" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area) "bwC" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area) @@ -3963,7 +3963,7 @@ "byk" = (/turf/unsimulated/wall,/area/centcom/test) "byl" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) "bym" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) -"byn" = (/obj/structure/secure_closet/security,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) +"byn" = (/obj/structure/closet/secure_closet/security,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) "byo" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/test) "byp" = (/turf/unsimulated/floor{icon_state = "dark"},/area) "byq" = (/obj/structure/stool/bed,/turf/unsimulated/floor{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/prison/solitary) @@ -4008,7 +4008,7 @@ "bzd" = (/turf/unsimulated/floor{icon_state = "greencorner"},/area/centcom/control) "bze" = (/turf/unsimulated/floor{icon_state = "greencorner"; dir = 8},/area/centcom/control) "bzf" = (/obj/machinery/door/airlock/centcom{name = "Research Facility"; opacity = 1; req_access_txt = "104"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/control) -"bzg" = (/obj/structure/secure_closet/courtroom,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) +"bzg" = (/obj/structure/closet/secure_closet/courtroom,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) "bzh" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) "bzi" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/camera{c_tag = "Court"; invisibility = 1; network = "thunder"; pixel_x = 10},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) "bzj" = (/obj/machinery/mech_bay_recharge_port,/turf/unsimulated/floor{icon_state = "bot"},/area/centcom/specops) @@ -4019,7 +4019,7 @@ "bzo" = (/obj/machinery/camera{c_tag = "Spec. Ops. Center"; dir = 2; network = "CREED"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "bzp" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "bzq" = (/obj/effect/landmark{name = "Commando"; tag = "Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"bzr" = (/obj/structure/secure_closet/personal,/turf/unsimulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/centcom/specops) +"bzr" = (/obj/structure/closet/secure_closet/personal,/turf/unsimulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/centcom/specops) "bzs" = (/turf/unsimulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/centcom/specops) "bzt" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/handcuffs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "bzu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/specops) @@ -4028,9 +4028,9 @@ "bzx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) "bzy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) "bzz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) -"bzA" = (/obj/structure/secure_closet/medical3{pixel_x = -5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/control) -"bzB" = (/obj/structure/secure_closet/medical1{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/control) -"bzC" = (/obj/structure/secure_closet/medical2{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/control) +"bzA" = (/obj/structure/closet/secure_closet/medical3{pixel_x = -5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/control) +"bzB" = (/obj/structure/closet/secure_closet/medical1{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/control) +"bzC" = (/obj/structure/closet/secure_closet/medical2{pixel_x = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/control) "bzD" = (/obj/machinery/sleeper,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) "bzE" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/test) "bzF" = (/obj/structure/stool/chair{dir = 4},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/test) @@ -4132,7 +4132,7 @@ "bBx" = (/obj/machinery/camera{c_tag = "Assault Armor South"; dir = 1; network = "CREED"},/turf/unsimulated/floor{tag = "icon-loadingarea (WEST)"; icon_state = "loadingarea"; dir = 8},/area/centcom/specops) "bBy" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/centcom/specops) "bBz" = (/obj/structure/bookcase{name = "bookcase (Tactics)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) -"bBA" = (/obj/structure/secure_closet/hos,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) +"bBA" = (/obj/structure/closet/secure_closet/hos,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "bBB" = (/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "bBC" = (/obj/structure/rack,/obj/item/weapon/secstorage/sbriefcase,/obj/item/weapon/cigpacket,/obj/item/weapon/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) "bBD" = (/obj/structure/bookcase{name = "bookcase (Reports)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) @@ -4145,7 +4145,7 @@ "bBK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/specops) "bBL" = (/turf/unsimulated/floor{tag = "icon-loadingarea"; icon_state = "loadingarea"},/area/centcom/specops) "bBM" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 8; listening = 0; name = "Station Intercom (General)"; pixel_x = -28},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed) -"bBN" = (/obj/structure/secure_closet/injection,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) +"bBN" = (/obj/structure/closet/secure_closet/injection,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) "bBO" = (/obj/structure/stool/chair{dir = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/centcom/test) "bBP" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_l (EAST)"; icon_state = "burst_l"; dir = 4},/turf/space,/area/shuttle/specops/centcom) "bBQ" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/specops/centcom) @@ -4303,7 +4303,7 @@ "bEM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/shuttle/escape/centcom) "bEN" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "bEO" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) -"bEP" = (/obj/structure/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) +"bEP" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "bEQ" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "bER" = (/obj/machinery/vending/boozeomat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "bES" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/donkpocket_kit{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) @@ -4400,7 +4400,7 @@ "bGF" = (/obj/effect/landmark{name = "Holding Facility"},/turf/unsimulated/floor{icon_state = "engine"},/area/centcom/holding) "bGG" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area/centcom/evac) "bGH" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/tdome) -"bGI" = (/obj/structure/secure_closet/bar,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) +"bGI" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "bGJ" = (/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "bGK" = (/obj/machinery/gibber,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "bGL" = (/obj/machinery/door/airlock/command{name = "Thunderdome"},/turf/unsimulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/tdome) @@ -4410,8 +4410,8 @@ "bGP" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "bGQ" = (/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "bGR" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) -"bGS" = (/obj/structure/secure_closet/meat,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) -"bGT" = (/obj/structure/secure_closet/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) +"bGS" = (/obj/structure/closet/secure_closet/meat,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) +"bGT" = (/obj/structure/closet/secure_closet/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "bGU" = (/obj/structure/stool/chair,/obj/effect/landmark{name = "tdomeobserve"},/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "bGV" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) "bGW" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{tag = "icon-redbluefull (WEST)"; icon_state = "redbluefull"; dir = 8},/area/tdome/tdomeobserve) @@ -4828,8 +4828,8 @@ "bOR" = (/obj/item/clothing/glasses/night,/turf/simulated/floor/plating,/area/AIsattele) "bOS" = (/obj/item/device/aicard,/turf/simulated/floor/plating,/area/AIsattele) "bOT" = (/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/plating,/area/AIsattele) -"bOU" = (/obj/structure/crate,/turf/simulated/floor/plating,/area/AIsattele) -"bOV" = (/obj/structure/crate,/obj/machinery/light,/turf/simulated/floor/plating,/area/AIsattele) +"bOU" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/AIsattele) +"bOV" = (/obj/structure/closet/crate,/obj/machinery/light,/turf/simulated/floor/plating,/area/AIsattele) "bOW" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/plating,/area/AIsattele) "bOX" = (/obj/structure/grille,/turf/unsimulated/floor{name = "plating"},/area) "bOY" = (/obj/machinery/power/solar/fake,/turf/unsimulated/floor{tag = "icon-solarpanel (NORTHEAST)"; icon_state = "solarpanel"; dir = 5},/area/djstation/solars) @@ -5811,7 +5811,7 @@ "chM" = (/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/mine/unexplored) "chN" = (/obj/machinery/door/airlock{name = "Room 3"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/mine/unexplored) "chO" = (/obj/machinery/recharge_station,/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/mine/unexplored) -"chP" = (/obj/structure/secure_closet/miner,/turf/simulated/floor,/area/mine/unexplored) +"chP" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor,/area/mine/unexplored) "chQ" = (/obj/structure/table,/obj/item/weapon/shovel,/turf/simulated/floor,/area) "chR" = (/obj/structure/table,/obj/item/weapon/storage/donkpocket_kit,/turf/simulated/floor,/area) "chS" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area) @@ -5969,7 +5969,7 @@ "ckO" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area) "ckP" = (/obj/machinery/conveyor_switch{id = "mining_internal"},/obj/machinery/atmospherics/pipe/manifold{dir = 4},/obj/machinery/camera{c_tag = "Shuttle Airlock"; dir = 8; network = "MINE"},/turf/simulated/floor,/area) "ckQ" = (/obj/machinery/camera{c_tag = "Station External West"; network = "MINE"},/turf/simulated/floor/plating/airless/asteroid,/area) -"ckR" = (/obj/structure/crate,/turf/simulated/floor,/area) +"ckR" = (/obj/structure/closet/crate,/turf/simulated/floor,/area) "ckS" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area) "ckT" = (/obj/machinery/power/apc{dir = 1; name = "Production Area APC"; pixel_x = 1; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area) "ckU" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area) @@ -5990,8 +5990,8 @@ "clj" = (/obj/machinery/mineral/processing_unit_console,/turf/simulated/wall/r_wall,/area) "clk" = (/obj/machinery/mineral/processing_unit,/turf/simulated/floor{icon_state = "floorgrime"},/area) "cll" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area) -"clm" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/crate,/turf/simulated/floor,/area) -"cln" = (/obj/structure/crate,/obj/machinery/light,/turf/simulated/floor,/area) +"clm" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/closet/crate,/turf/simulated/floor,/area) +"cln" = (/obj/structure/closet/crate,/obj/machinery/light,/turf/simulated/floor,/area) "clo" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area) "clp" = (/obj/machinery/mineral/stacking_unit_console,/turf/simulated/wall/r_wall,/area) "clq" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area)