From 235f379f094f589b5fcd97d22e7e7348d22c3770 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 21 Jan 2017 16:03:12 -0500 Subject: [PATCH 01/44] Cutting off legs no longer stuns --- code/modules/surgery/bodyparts/dismemberment.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 6653a114ba6..ab2c05c0bf9 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -186,7 +186,6 @@ /obj/item/bodypart/r_leg/drop_limb(special) if(owner && !special) - owner.Weaken(2) if(owner.legcuffed) owner.legcuffed.loc = owner.loc owner.legcuffed.dropped(owner) @@ -198,7 +197,6 @@ /obj/item/bodypart/l_leg/drop_limb(special) //copypasta if(owner && !special) - owner.Weaken(2) if(owner.legcuffed) owner.legcuffed.loc = owner.loc owner.legcuffed.dropped(owner) From 5cf651822b23866eaa856aae8043b72b056c7ef1 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Mon, 23 Jan 2017 15:40:11 +0000 Subject: [PATCH 02/44] Uplink implants are now empty by default :cl: coiax del: The Syndicate "Uplink Implant" now has no TC precharged. You can charge it with the use of physical telecrystals. The price has been reduced from 14TC to 4TC accordingly. (The uplink implant in the implant bundle still has 10TC). /:cl: - Also cleaned up implantuplink.dm. - Removed "weak" uplink implants, which were only used for persistence memes. These changes will make purchasing an uplink implant more common, as you don't have to commit a large chunk of TC to use it. It's a buff to a rarely used syndicate item, and synergises with physical telecrystals. --- .../items/weapons/implants/implantuplink.dm | 16 +++++----- .../items/weapons/storage/uplink_kits.dm | 32 +------------------ code/modules/uplink/uplink_item.dm | 6 ++-- 3 files changed, 12 insertions(+), 42 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index fa401363cc1..650b551f50a 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -4,10 +4,11 @@ icon = 'icons/obj/radio.dmi' icon_state = "radio" origin_tech = "materials=4;magnets=4;programming=4;biotech=4;syndicate=5;bluespace=5" + var/starting_tc = 0 /obj/item/weapon/implant/uplink/New() hidden_uplink = new(src) - hidden_uplink.telecrystals = 10 + hidden_uplink.telecrystals = starting_tc ..() /obj/item/weapon/implant/uplink/implant(mob/living/target, mob/user, silent = 0) @@ -29,18 +30,17 @@ /obj/item/weapon/implanter/uplink name = "implanter (uplink)" - persistence_replacement = /obj/item/weapon/implanter/weakuplink /obj/item/weapon/implanter/uplink/New() imp = new /obj/item/weapon/implant/uplink(src) ..() -/obj/item/weapon/implanter/weakuplink + +/obj/item/weapon/implanter/uplink/precharged name = "implanter (uplink)" -/obj/item/weapon/implanter/weakuplink/New() - imp = new /obj/item/weapon/implant/uplink/weak(src) +/obj/item/weapon/implanter/uplink/New() + imp = new /obj/item/weapon/implant/uplink/precharged(src) ..() -/obj/item/weapon/implant/uplink/weak/New() - ..() - hidden_uplink.telecrystals = 5 \ No newline at end of file +/obj/item/weapon/implant/uplink/precharged + starting_tc = 10 diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 2a25c9f0a48..41c1e82694b 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -16,7 +16,6 @@ new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals new /obj/item/device/flashlight/emp(src) // 2 tc new /obj/item/device/chameleon(src) // 7 tc - return if("stealth") // 31 tc new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src) @@ -25,7 +24,6 @@ new /obj/item/device/chameleon(src) new /obj/item/weapon/soap/syndie(src) new /obj/item/clothing/glasses/thermal/syndi(src) - return if("bond") // 29 tc new /obj/item/weapon/gun/ballistic/automatic/pistol(src) @@ -36,8 +34,6 @@ new /obj/item/weapon/card/id/syndicate(src) new /obj/item/weapon/reagent_containers/syringe/stimulants(src) - return - if("screwed") // 29 tc new /obj/item/device/sbeacondrop/bomb(src) new /obj/item/weapon/grenade/syndieminibomb(src) @@ -45,7 +41,6 @@ new /obj/item/clothing/suit/space/syndicate/black/red(src) new /obj/item/clothing/head/helmet/space/syndicate/black/red(src) new /obj/item/device/encryptionkey/syndicate(src) - return if("guns") // 28 tc now new /obj/item/weapon/gun/ballistic/revolver(src) @@ -56,7 +51,6 @@ new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/mask/gas/clown_hat(src) new /obj/item/clothing/under/suit_jacket/really_black(src) - return if("murder") // 28 tc now new /obj/item/weapon/melee/energy/sword/saber(src) @@ -65,16 +59,14 @@ new /obj/item/clothing/shoes/chameleon(src) new /obj/item/device/encryptionkey/syndicate(src) new /obj/item/weapon/grenade/syndieminibomb(src) - return if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it? new /obj/item/weapon/implanter/freedom(src) - new /obj/item/weapon/implanter/uplink(src) + new /obj/item/weapon/implanter/uplink/precharged(src) new /obj/item/weapon/implanter/emp(src) new /obj/item/weapon/implanter/adrenalin(src) new /obj/item/weapon/implanter/explosive(src) new /obj/item/weapon/implanter/storage(src) - return if("hacker") // 26 tc new /obj/item/weapon/aiModule/syndicate(src) @@ -82,14 +74,12 @@ new /obj/item/device/encryptionkey/binary(src) new /obj/item/weapon/aiModule/toyAI(src) new /obj/item/device/multitool/ai_detect(src) - return if("lordsingulo") // 24 tc new /obj/item/device/sbeacondrop(src) new /obj/item/clothing/suit/space/syndicate/black/red(src) new /obj/item/clothing/head/helmet/space/syndicate/black/red(src) new /obj/item/weapon/card/emag(src) - return if("sabotage") // 26 tc now new /obj/item/weapon/grenade/plastic/c4 (src) @@ -110,7 +100,6 @@ new /obj/item/weapon/card/id/syndicate(src) new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks new /obj/item/weapon/spellbook/oneuse/summonitem(src) - return if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks new /obj/item/weapon/gun/ballistic/automatic/sniper_rifle(src) // 12 tc @@ -119,7 +108,6 @@ new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/mask/gas/clown_hat(src) new /obj/item/clothing/under/suit_jacket/really_black(src) - return if("metaops") // 30 tc new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc @@ -130,7 +118,6 @@ new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc new /obj/item/weapon/card/emag(src) // 6 tc - return if("ninja") // 33 tc worth new /obj/item/weapon/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc? @@ -158,15 +145,6 @@ var/obj/item/weapon/implanter/O = new(src) O.imp = new /obj/item/weapon/implant/freedom(O) O.update_icon() - return - -/*/obj/item/weapon/storage/box/syndie_kit/imp_compress - name = "Compressed Matter Implant (with injector)" -/obj/item/weapon/storage/box/syndie_kit/imp_compress/New() - new /obj/item/weapon/implanter/compressed(src) - ..() - return -*/ /obj/item/weapon/storage/box/syndie_kit/imp_microbomb name = "Microbomb Implant (with injector)" @@ -176,7 +154,6 @@ O.imp = new /obj/item/weapon/implant/explosive(O) O.update_icon() ..() - return /obj/item/weapon/storage/box/syndie_kit/imp_macrobomb name = "Macrobomb Implant (with injector)" @@ -186,7 +163,6 @@ O.imp = new /obj/item/weapon/implant/explosive/macro(O) O.update_icon() ..() - return /obj/item/weapon/storage/box/syndie_kit/imp_uplink name = "boxed uplink implant (with injector)" @@ -196,7 +172,6 @@ var/obj/item/weapon/implanter/O = new(src) O.imp = new /obj/item/weapon/implant/uplink(O) O.update_icon() - return /obj/item/weapon/storage/box/syndie_kit/bioterror name = "bioterror syringe box" @@ -205,7 +180,6 @@ ..() for(var/i in 1 to 7) new /obj/item/weapon/reagent_containers/syringe/bioterror(src) - return /obj/item/weapon/storage/box/syndie_kit/imp_adrenal name = "boxed adrenal implant (with injector)" @@ -215,7 +189,6 @@ var/obj/item/weapon/implanter/O = new(src) O.imp = new /obj/item/weapon/implant/adrenalin(O) O.update_icon() - return /obj/item/weapon/storage/box/syndie_kit/imp_storage name = "boxed storage implant (with injector)" @@ -223,7 +196,6 @@ /obj/item/weapon/storage/box/syndie_kit/imp_storage/New() ..() new /obj/item/weapon/implanter/storage(src) - return /obj/item/weapon/storage/box/syndie_kit/space name = "boxed space suit and helmet" @@ -234,7 +206,6 @@ ..() new /obj/item/clothing/suit/space/syndicate/black/red(src) // Black and red is so in right now new /obj/item/clothing/head/helmet/space/syndicate/black/red(src) - return /obj/item/weapon/storage/box/syndie_kit/emp name = "boxed EMP kit" @@ -267,7 +238,6 @@ new /obj/item/weapon/reagent_containers/glass/bottle/curare(src) new /obj/item/weapon/reagent_containers/glass/bottle/amanitin(src) new /obj/item/weapon/reagent_containers/syringe(src) - return /obj/item/weapon/storage/box/syndie_kit/nuke name = "box" diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 6dbe8a890aa..7569aba31fb 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -1055,10 +1055,10 @@ var/list/uplink_items = list() // Global list so we only initialize this once. /datum/uplink_item/implants/uplink name = "Uplink Implant" - desc = "An implant injected into the body, and later activated at the user's will. It will open a separate uplink \ - with 10 telecrystals. Undetectable, and excellent for escaping confinement." + desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals, must be charged by the use of physical telecrystals. Undetectable (except via surgery), and excellent for escaping confinement." item = /obj/item/weapon/storage/box/syndie_kit/imp_uplink - cost = 14 + cost = 4 + // An empty uplink is kinda useless. surplus = 0 /datum/uplink_item/implants/adrenal From 0904446ab3cfa2256095320677e390d21694dd5c Mon Sep 17 00:00:00 2001 From: c0 Date: Fri, 27 Jan 2017 12:12:57 +0300 Subject: [PATCH 03/44] Clicking filled item slot now clicks the item in it --- code/_onclick/hud/screen_objects.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index fbb719a662c..58e192fb099 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -87,7 +87,7 @@ layer = HUD_LAYER plane = HUD_PLANE -/obj/screen/inventory/Click() +/obj/screen/inventory/Click(location, control, params) // At this point in client Click() code we have passed the 1/10 sec check and little else // We don't even know if it's a middle click if(world.time <= usr.next_move) @@ -95,8 +95,14 @@ if(usr.incapacitated()) return 1 - if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech + if(istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech return 1 + + if(hud && hud.mymob && slot_id) + var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id) + if(inv_item) + return inv_item.Click(location, control, params) + if(usr.attack_ui(slot_id)) usr.update_inv_hands() return 1 From 2e6759065a905108b1e49aa0d8ed63790b8af728 Mon Sep 17 00:00:00 2001 From: c0 Date: Fri, 27 Jan 2017 13:20:22 +0300 Subject: [PATCH 04/44] Removes two buttons from /inventory/ path --- code/_onclick/hud/generic_dextrous.dm | 4 ++-- code/_onclick/hud/human.dm | 4 ++-- code/_onclick/hud/screen_objects.dm | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm index f20730483ad..a9cede3ed49 100644 --- a/code/_onclick/hud/generic_dextrous.dm +++ b/code/_onclick/hud/generic_dextrous.dm @@ -32,11 +32,11 @@ zone_select.icon = ui_style zone_select.update_icon(mymob) - using = new /obj/screen/inventory/craft + using = new /obj/screen/craft using.icon = ui_style static_inventory += using - using = new /obj/screen/inventory/area_creator + using = new /obj/screen/area_creator using.icon = ui_style static_inventory += using diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 2d65e033e68..5254ac6ce8b 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -90,7 +90,7 @@ var/obj/screen/using var/obj/screen/inventory/inv_box - using = new /obj/screen/inventory/craft + using = new /obj/screen/craft using.icon = ui_style static_inventory += using @@ -99,7 +99,7 @@ wheels += using static_inventory += using - using = new /obj/screen/inventory/area_creator + using = new /obj/screen/area_creator using.icon = ui_style static_inventory += using diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 58e192fb099..c2d4ae42ff5 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -53,25 +53,25 @@ M.swap_hand() return 1 -/obj/screen/inventory/craft +/obj/screen/craft name = "crafting menu" icon = 'icons/mob/screen_midnight.dmi' icon_state = "craft" screen_loc = ui_crafting -/obj/screen/inventory/craft/Click() +/obj/screen/craft/Click() var/mob/living/M = usr if(isobserver(usr)) return M.OpenCraftingMenu() -/obj/screen/inventory/area_creator +/obj/screen/area_creator name = "create new area" icon = 'icons/mob/screen_midnight.dmi' icon_state = "area_edit" screen_loc = ui_building -/obj/screen/inventory/area_creator/Click() +/obj/screen/area_creator/Click() if(usr.incapacitated()) return 1 var/area/A = get_area(usr) From 6f2ca062f1d404c224896224c4697af8ad75952d Mon Sep 17 00:00:00 2001 From: c0 Date: Fri, 27 Jan 2017 14:15:56 +0300 Subject: [PATCH 05/44] Refactors action intent selectors, adds support for simple mobs having more than one intent --- code/_onclick/hud/generic_dextrous.dm | 12 ++++ code/_onclick/hud/human.dm | 9 ++- code/_onclick/hud/monkey.dm | 11 ++-- code/_onclick/hud/robot.dm | 7 +-- code/_onclick/hud/screen_objects.dm | 7 ++- .../living/carbon/alien/humanoid/humanoid.dm | 1 + .../mob/living/carbon/carbon_defines.dm | 1 + .../mob/living/carbon/human/human_defines.dm | 1 + code/modules/mob/living/silicon/silicon.dm | 1 + code/modules/mob/mob_defines.dm | 1 + code/modules/mob/mob_helpers.dm | 63 +++++++------------ 11 files changed, 56 insertions(+), 58 deletions(-) diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm index f20730483ad..be65b882dfe 100644 --- a/code/_onclick/hud/generic_dextrous.dm +++ b/code/_onclick/hud/generic_dextrous.dm @@ -28,9 +28,21 @@ using.screen_loc = ui_swaphand_position(owner,2) static_inventory += using + if(mymob.possible_a_intents) + if(mymob.possible_a_intents.len == 4) + // All possible intents - full intent selector + action_intent = new /obj/screen/act_intent/segmented + else + action_intent = new /obj/screen/act_intent + action_intent.icon = ui_style + action_intent.icon_state = mymob.a_intent + static_inventory += action_intent + + zone_select = new /obj/screen/zone_sel() zone_select.icon = ui_style zone_select.update_icon(mymob) + static_inventory += zone_select using = new /obj/screen/inventory/craft using.icon = ui_style diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 2d65e033e68..ed9e7a0d902 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -103,12 +103,11 @@ using.icon = ui_style static_inventory += using - using = new /obj/screen/act_intent() - using.icon_state = mymob.a_intent - static_inventory += using - action_intent = using + action_intent = new /obj/screen/act_intent/segmented + action_intent.icon_state = mymob.a_intent + static_inventory += action_intent - using = new /obj/screen/mov_intent() + using = new /obj/screen/mov_intent using.icon = ui_style using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") using.screen_loc = ui_movi diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index 28d14ad1c1f..60ee61e33da 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -3,12 +3,11 @@ var/obj/screen/using var/obj/screen/inventory/inv_box - using = new /obj/screen/act_intent() - using.icon = ui_style - using.icon_state = mymob.a_intent - using.screen_loc = ui_acti - static_inventory += using - action_intent = using + action_intent = new /obj/screen/act_intent() + action_intent.icon = ui_style + action_intent.icon_state = mymob.a_intent + action_intent.screen_loc = ui_acti + static_inventory += action_intent using = new /obj/screen/mov_intent() using.icon = ui_style diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 5ee83e5e98f..912d88e3a33 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -151,10 +151,9 @@ mymobR.thruster_button = using //Intent - using = new /obj/screen/act_intent/robot() - using.icon_state = mymob.a_intent - static_inventory += using - action_intent = using + action_intent = new /obj/screen/act_intent/robot() + action_intent.icon_state = mymob.a_intent + static_inventory += action_intent //Health healths = new /obj/screen/healths/robot() diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index fbb719a662c..2e49355eb73 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -185,8 +185,10 @@ screen_loc = ui_acti /obj/screen/act_intent/Click(location, control, params) - if(ishuman(usr) && (usr.client.prefs.toggles & INTENT_STYLE)) + usr.a_intent_change(INTENT_HOTKEY_RIGHT) +/obj/screen/act_intent/segmented/Click(location, control, params) + if(usr.client.prefs.toggles & INTENT_STYLE) var/_x = text2num(params2list(params)["icon-x"]) var/_y = text2num(params2list(params)["icon-y"]) @@ -201,9 +203,8 @@ else if(_x>=17 && _y>=17) usr.a_intent_change(INTENT_DISARM) - else - usr.a_intent_change(INTENT_HOTKEY_RIGHT) + return ..() /obj/screen/act_intent/alien icon = 'icons/mob/screen_alien.dmi' diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index cd47ad3bc26..c39eb68fd06 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -3,6 +3,7 @@ icon_state = "alien_s" pass_flags = PASSTABLE butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1) + possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) limb_destroyer = 1 var/obj/item/r_store = null var/obj/item/l_store = null diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 40eec866a24..fb01950fa5e 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -1,6 +1,7 @@ /mob/living/carbon gender = MALE pressure_resistance = 15 + possible_a_intents = list(INTENT_HELP, INTENT_HARM) var/list/stomach_contents = list() var/list/internal_organs = list() //List of /obj/item/organ in the mob. They don't go in the contents for some reason I don't want to know. var/list/internal_organs_slot = list() //Same as above, but stores "slot ID" - "organ" pairs for easy access. diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index abf9dffc00c..6bd8d9cef98 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -3,6 +3,7 @@ var/global/default_martial_art = new/datum/martial_art languages_spoken = HUMAN languages_understood = HUMAN hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD) + possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) pressure_resistance = 25 //Hair colour and style var/hair_color = "000" diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 79ee8f69265..8c39bc1d938 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -11,6 +11,7 @@ see_in_dark = 8 bubble_icon = "machine" weather_immunities = list("ash") + possible_a_intents = list(INTENT_HELP, INTENT_HARM) var/syndicate = 0 var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 28fe9de5e47..3c96df24549 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -73,6 +73,7 @@ var/weakened = 0 var/losebreath = 0//Carbon var/a_intent = INTENT_HELP//Living + var/list/possible_a_intents = null//Living var/m_intent = MOVE_INTENT_RUN//Living var/lastKnownIP = null var/atom/movable/buckled = null//Living diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 82cc250500b..893addf7294 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -291,49 +291,32 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o set name = "a-intent" set hidden = 1 - if(ishuman(src) || isalienadult(src) || isbrain(src)) - switch(input) - if(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) - a_intent = input - if(INTENT_HOTKEY_RIGHT) - switch (a_intent) - if(INTENT_HELP) - a_intent = INTENT_DISARM - if(INTENT_DISARM) - a_intent = INTENT_GRAB - if(INTENT_GRAB) - a_intent = INTENT_HARM - if(INTENT_HARM) - a_intent = INTENT_HELP - if(INTENT_HOTKEY_LEFT) - switch (a_intent) - if(INTENT_HELP) - a_intent = INTENT_HARM - if(INTENT_DISARM) - a_intent = INTENT_HELP - if(INTENT_GRAB) - a_intent = INTENT_DISARM - if(INTENT_HARM) - a_intent = INTENT_GRAB + if(!possible_a_intents || !possible_a_intents.len) + return - if(hud_used && hud_used.action_intent) - hud_used.action_intent.icon_state = "[a_intent]" + if(input in possible_a_intents) + a_intent = input + else + var/current_intent = possible_a_intents.Find(a_intent) + if(!current_intent) + return - else if(iscyborg(src) || ismonkey(src) || islarva(src)) - switch(input) - if(INTENT_HELP) - a_intent = INTENT_HELP - if(INTENT_HARM) - a_intent = INTENT_HARM - if(INTENT_HOTKEY_RIGHT, INTENT_HOTKEY_LEFT) - switch (a_intent) - if(INTENT_HELP) - a_intent = INTENT_HARM - if(INTENT_HARM) - a_intent = INTENT_HELP + if(input == INTENT_HOTKEY_RIGHT) + current_intent += 1 + if(input == INTENT_HOTKEY_LEFT) + current_intent -= 1 + + // Handle looping + if(current_intent < 1) + current_intent = possible_a_intents.len + if(current_intent > possible_a_intents.len) + current_intent = 1 + + a_intent = possible_a_intents[current_intent] + + if(hud_used && hud_used.action_intent) + hud_used.action_intent.icon_state = "[a_intent]" - if(hud_used && hud_used.action_intent) - hud_used.action_intent.icon_state = "[a_intent]" /proc/is_blind(A) if(ismob(A)) From 588fcf88f1a427aca470d2631fc000cf8c609ea8 Mon Sep 17 00:00:00 2001 From: c0 Date: Fri, 27 Jan 2017 14:19:43 +0300 Subject: [PATCH 06/44] Adds failsafe to stop badmins from breaking intent cyclers --- code/modules/mob/mob_helpers.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 893addf7294..2624ba4deaa 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -298,8 +298,10 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o a_intent = input else var/current_intent = possible_a_intents.Find(a_intent) + if(!current_intent) - return + // Failsafe. Just in case some badmin was playing with VV. + current_intent = 1 if(input == INTENT_HOTKEY_RIGHT) current_intent += 1 From f947945e94e118c797dfb0e04282833fd5ea21e7 Mon Sep 17 00:00:00 2001 From: c0 Date: Sat, 28 Jan 2017 14:04:44 +0300 Subject: [PATCH 07/44] Extends easy inventory clicking to active hands --- code/_onclick/hud/screen_objects.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index c2d4ae42ff5..8d06fc214f5 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -150,7 +150,7 @@ add_overlay(active_overlay) -/obj/screen/inventory/hand/Click() +/obj/screen/inventory/hand/Click(location, control, params) // At this point in client Click() code we have passed the 1/10 sec check and little else // We don't even know if it's a middle click if(world.time <= usr.next_move) @@ -160,9 +160,12 @@ if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech return 1 - if(ismob(usr)) - var/mob/M = usr - M.swap_hand(held_index) + if(hud.mymob.active_hand_index == held_index) + var/obj/item/I = hud.mymob.get_active_held_item() + if(I) + I.Click(location, control, params) + else + hud.mymob.swap_hand(held_index) return 1 /obj/screen/close From c06d9aa193b4bc474c3403ca761210157213f14b Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sat, 28 Jan 2017 22:46:07 +0000 Subject: [PATCH 08/44] Revhead camoHUDs are now full camoflage items :cl: coiax add: Camoflaged HUDs given to head revolutionaries now function the same as chameleon glasses in the chameleon kit bundle, giving them an action button and far more disguise options. /:cl: - inb4 the revhead runs around with ratvar or cultist blindfolds on --- code/modules/clothing/glasses/hud.dm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 2d43948031c..72586756390 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -74,11 +74,24 @@ /obj/item/clothing/glasses/hud/security/chameleon name = "Chameleon Security HUD" - desc = "A stolen security HUD integrated with Syndicate chameleon technology. Toggle to disguise the HUD. Provides flash protection." + desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection." flash_protect = 1 -/obj/item/clothing/glasses/hud/security/chameleon/attack_self(mob/user) - chameleon(user) + // Yes this code is the same as normal chameleon glasses, but we don't + // have multiple inheritance, okay? + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/glasses/hud/security/chameleon/New() + ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/glasses + chameleon_action.chameleon_name = "Glasses" + chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/glasses/changeling, only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/glasses/hud/security/chameleon/emp_act(severity) + . = ..() + chameleon_action.emp_randomise() /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch From d30bb4e97a31d3cb96f21d59281708a9f879c532 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sat, 28 Jan 2017 23:05:00 +0000 Subject: [PATCH 09/44] While we're here, do thermals as well --- code/modules/clothing/glasses/glasses.dm | 69 +++++------------------- 1 file changed, 14 insertions(+), 55 deletions(-) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 597876fb4ae..464319f3c8f 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -248,12 +248,23 @@ /obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete name = "Chameleon Thermals" - desc = "A pair of thermal optic goggles with an onboard chameleon generator. Toggle to disguise." + desc = "A pair of thermal optic goggles with an onboard chameleon generator." origin_tech = "magnets=3;syndicate=4" flash_protect = -1 -/obj/item/clothing/glasses/thermal/syndi/attack_self(mob/user) - chameleon(user) + var/datum/action/item_action/chameleon/change/chameleon_action + +/obj/item/clothing/glasses/thermal/syndi/New() + ..() + chameleon_action = new(src) + chameleon_action.chameleon_type = /obj/item/clothing/glasses + chameleon_action.chameleon_name = "Glasses" + chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/glasses/changeling, only_root_path = TRUE) + chameleon_action.initialize_disguises() + +/obj/item/clothing/glasses/thermal/syndi/emp_act(severity) + ..() + chameleon_action.emp_randomise() /obj/item/clothing/glasses/thermal/monocle name = "Thermoncle" @@ -318,58 +329,6 @@ qdel(src) ..() -/obj/item/clothing/glasses/proc/chameleon(var/mob/user) - var/input_glasses = input(user, "Choose a piece of eyewear to disguise as.", "Choose glasses style.") as null|anything in list("Sunglasses", "Medical HUD", "Mesons", "Science Goggles", "Glasses", "Security Sunglasses","Eyepatch","Welding","Gar") - - if(user && src in user.contents) - switch(input_glasses) - if("Sunglasses") - desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes." - name = "sunglasses" - icon_state = "sun" - item_state = "sunglasses" - if("Medical HUD") - name = "Health Scanner HUD" - desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." - icon_state = "healthhud" - item_state = "healthhud" - if("Mesons") - name = "Optical Meson Scanner" - desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." - icon_state = "meson" - item_state = "meson" - if("Science Goggles") - name = "Science Goggles" - desc = "A pair of snazzy goggles used to protect against chemical spills." - icon_state = "purple" - item_state = "glasses" - if("Glasses") - name = "Prescription Glasses" - desc = "Made by Nerd. Co." - icon_state = "glasses" - item_state = "glasses" - if("Security Sunglasses") - name = "HUDSunglasses" - desc = "Sunglasses with a HUD." - icon_state = "sunhud" - item_state = "sunglasses" - if("Eyepatch") - name = "eyepatch" - desc = "Yarr." - icon_state = "eyepatch" - item_state = "eyepatch" - if("Welding") - name = "welding goggles" - desc = "Protects the eyes from welders; approved by the mad scientist association." - icon_state = "welding-g" - item_state = "welding-g" - if("Gar") - desc = "Just who the hell do you think I am?!" - name = "gar glasses" - icon_state = "gar" - item_state = "gar" - - /obj/item/clothing/glasses/AltClick(mob/user) if(glass_colour_type && ishuman(user)) var/mob/living/carbon/human/H = user From 7f0f9db906c0c8b0fd1134b24796473b61bb5b18 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 28 Jan 2017 20:43:28 -0500 Subject: [PATCH 10/44] Fixes something doing a locate in world --- code/game/objects/structures/aliens.dm | 6 +++--- .../mob/living/carbon/alien/humanoid/alien_powers.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 2a5b1040936..ad1bc4ebd7e 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -177,8 +177,8 @@ /obj/structure/alien/weeds/node/New() icon = 'icons/obj/smooth_structures/alien/weednode.dmi' ..() - var/obj/structure/alien/weeds/W = locate(/obj/structure/alien/weeds) - if(W) + var/obj/structure/alien/weeds/W = locate(/obj/structure/alien/weeds) in loc + if(W && W != src) qdel(W) START_PROCESSING(SSobj, src) @@ -284,7 +284,7 @@ /obj/structure/alien/egg/Moved(oldloc) remove_from_proximity_list(oldloc, 1) if(status == GROWN) - add_to_proximity_list(src, 1) + add_to_proximity_list(src, 1) return ..() /obj/structure/alien/egg/deconstruct() diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 3c8a0cb0bc7..103ace63e79 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -63,7 +63,7 @@ Doesn't work on other aliens/AI.*/ /obj/effect/proc_holder/alien/plant/fire(mob/living/carbon/user) if(locate(/obj/structure/alien/weeds/node) in get_turf(user)) - src << "There's already a weed node here." + user << "There's already a weed node here." return 0 user.visible_message("[user] has planted some alien weeds!") new/obj/structure/alien/weeds/node(user.loc) From 1ec69f309c2918eaf0770104182216453dfeec97 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 28 Jan 2017 22:43:36 -0500 Subject: [PATCH 11/44] Fixes the cult rune announce --- code/game/gamemodes/cult/ritual.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 0ff4991e4bc..719854d9474 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -221,8 +221,7 @@ This file contains the arcane tome files. A = get_area(src) if(!check_rune_turf(Turf, user) || (loc.z && loc.z != ZLEVEL_STATION)|| !A.blob_allowed) return - var/locname = initial(A.name) - priority_announce("Figments from an eldritch god are being summoned by [user] into [locname] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensionsal Affairs", 'sound/AI/spanomalies.ogg') + priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensionsal Affairs", 'sound/AI/spanomalies.ogg') for(var/B in spiral_range_turfs(1, user, 1)) var/obj/structure/emergency_shield/sanguine/N = new(B) shields += N From c12c3ac0eda9a1b4ee61ce16997237175fe1e3c5 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sun, 29 Jan 2017 04:18:04 +0000 Subject: [PATCH 12/44] Removes underscore from blob event Removes a rogue underscore from the descriptive text. --- code/modules/events/blob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 5e01aff6eee..2989cc81c50 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -11,7 +11,7 @@ /datum/round_event/ghost_role/blob announceWhen = 12 - role_name = "blob_overmind" + role_name = "blob overmind" var/new_rate = 2 /datum/round_event/ghost_role/blob/New(my_processing = TRUE, set_point_rate) From ae0ddac5b64254399190d4dfdf68147e0d737df6 Mon Sep 17 00:00:00 2001 From: tofa01 Date: Sun, 29 Jan 2017 18:59:10 +1100 Subject: [PATCH 13/44] Fixes area names for deltastation. --- .../map_files/Deltastation/DeltaStation2.dmm | 13411 +++++----------- code/game/area/Space_Station_13_areas.dm | 107 +- 2 files changed, 4236 insertions(+), 9282 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 27560bef891..f46164cffe8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2410,16 +2410,12 @@ /area/shuttle/arrival) "aeX" = ( /turf/closed/wall, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aeY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aeZ" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -2427,9 +2423,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -2437,9 +2431,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -2451,35 +2443,27 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; tag = "icon-neutral (NORTHEAST)" }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afc" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afd" = ( /obj/machinery/vending/snack, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/vault{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afe" = ( /obj/machinery/vending/cola, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aff" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -2491,9 +2475,7 @@ /turf/open/floor/plasteel/vault{ dir = 6 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afg" = ( /obj/structure/chair/stool, /obj/machinery/light/small{ @@ -2503,9 +2485,7 @@ pixel_y = 23 }, /turf/open/floor/plasteel/vault, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afh" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -2513,16 +2493,12 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/vault, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afi" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afj" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -2532,9 +2508,7 @@ pixel_y = 3 }, /turf/open/floor/plasteel/vault, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afk" = ( /obj/machinery/porta_turret/syndicate{ dir = 4 @@ -2557,15 +2531,11 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ @@ -2573,49 +2543,35 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afp" = ( /mob/living/simple_animal/cockroach, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afq" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afr" = ( /obj/structure/door_assembly/door_assembly_mhatch, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aft" = ( /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afu" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afv" = ( /obj/machinery/suit_storage_unit/syndicate, /turf/open/floor/plasteel/podhatch{ @@ -2672,9 +2628,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -2686,9 +2640,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -2699,9 +2651,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -2717,26 +2667,20 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afI" = ( /obj/effect/landmark{ name = "blobstart" @@ -2745,9 +2689,7 @@ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -2755,9 +2697,7 @@ on = 1 }, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afK" = ( /obj/machinery/suit_storage_unit/syndicate, /turf/open/floor/plasteel/podhatch{ @@ -2878,9 +2818,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -2888,16 +2826,12 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afV" = ( /obj/structure/table_frame/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afW" = ( /obj/item/chair/stool/bar{ pixel_y = -8 @@ -2905,36 +2839,26 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afX" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afY" = ( /obj/machinery/light/small, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "afZ" = ( /obj/structure/chair/stool/bar, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aga" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "agb" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -3219,9 +3143,7 @@ "agA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "agB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3232,9 +3154,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "agC" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -3244,22 +3164,16 @@ }, /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "agD" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "agE" = ( /obj/structure/sign/nosmoking_2, /turf/closed/wall, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "agF" = ( /obj/structure/table/reinforced, /obj/item/weapon/reagent_containers/food/condiment/saltshaker{ @@ -3270,9 +3184,7 @@ pixel_x = -8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "agG" = ( /turf/open/floor/plasteel/vault{ dir = 8 @@ -3536,9 +3448,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -3546,14 +3456,10 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahh" = ( /turf/open/floor/plasteel/red/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahi" = ( /obj/machinery/light/small{ dir = 1 @@ -3563,14 +3469,10 @@ on = 1 }, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahj" = ( /turf/open/floor/plasteel/white/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahk" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -3580,18 +3482,14 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/red/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahl" = ( /obj/structure/closet/crate/freezer/blood, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahm" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -3600,9 +3498,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahn" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -3611,9 +3507,7 @@ /turf/open/floor/plasteel/red/corner{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aho" = ( /obj/machinery/suit_storage_unit/syndicate, /turf/open/floor/plasteel/podhatch{ @@ -3708,9 +3602,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ahA" = ( /turf/closed/wall, /area/bridge{ @@ -3831,9 +3723,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -3846,9 +3736,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -3862,9 +3750,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahR" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -3873,9 +3759,7 @@ dir = 4 }, /turf/open/floor/plasteel/red, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -3884,15 +3768,11 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahT" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/red, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (EAST)"; @@ -3900,9 +3780,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahV" = ( /obj/machinery/newscaster{ pixel_x = 32; @@ -3914,9 +3792,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -3930,15 +3806,11 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -3946,9 +3818,7 @@ on = 1 }, /turf/open/floor/plasteel/red, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ahZ" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, @@ -3958,38 +3828,28 @@ icon_state = "whitehall"; dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aia" = ( /obj/machinery/ai_status_display, /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) "aib" = ( /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aic" = ( /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aid" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aie" = ( /obj/structure/table, /obj/item/weapon/storage/toolbox/emergency, /obj/item/weapon/tank/internals/oxygen, /obj/item/weapon/wrench, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aif" = ( /obj/structure/table/wood, /obj/item/weapon/folder, @@ -4077,9 +3937,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aiq" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/box/ids, @@ -4174,9 +4032,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiz" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -4188,9 +4044,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -4202,9 +4056,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -4215,9 +4067,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiC" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -4229,9 +4079,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiD" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -4240,9 +4088,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiE" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -4252,22 +4098,16 @@ }, /obj/item/weapon/reagent_containers/blood/random, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiF" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiG" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiH" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, @@ -4275,18 +4115,14 @@ /obj/item/weapon/kitchen/knife/butcher, /obj/item/stack/packageWrap, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiI" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/apron/chef, /obj/item/clothing/head/chefhat, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiJ" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -4300,9 +4136,7 @@ pixel_x = 24 }, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ @@ -4311,9 +4145,7 @@ pixel_y = -22 }, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiL" = ( /obj/structure/table_frame, /obj/effect/decal/cleanable/dirt, @@ -4321,9 +4153,7 @@ /turf/open/floor/plasteel/white/side{ dir = 1 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiM" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -4332,9 +4162,7 @@ /turf/open/floor/plasteel/red/corner{ dir = 1 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aiN" = ( /obj/machinery/sleeper/syndie{ dir = 4 @@ -4462,16 +4290,12 @@ }) "aiX" = ( /turf/closed/wall, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aiY" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aiZ" = ( /obj/machinery/light/small{ dir = 8 @@ -4484,9 +4308,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aja" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -4494,17 +4316,13 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ajb" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ajc" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -4576,9 +4394,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ajm" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -4776,26 +4592,20 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ajC" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ajD" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ajE" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -4803,18 +4613,14 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ajF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/weapon/crowbar/red, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ajG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -4826,15 +4632,11 @@ /turf/open/floor/plasteel/neutral/side{ dir = 6 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ajH" = ( /obj/structure/sign/poster, /turf/closed/wall, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ajI" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -4925,9 +4727,7 @@ /obj/item/clothing/under/waiter, /obj/item/clothing/tie/waistcoat, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajR" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -4938,9 +4738,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajS" = ( /obj/structure/table/wood, /obj/item/weapon/storage/box/matches{ @@ -4948,9 +4746,7 @@ pixel_y = 5 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajT" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -4959,25 +4755,19 @@ dir = 1 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajU" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajV" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajW" = ( /obj/structure/table/wood, /obj/item/weapon/storage/briefcase, @@ -4985,17 +4775,13 @@ /turf/open/floor/wood{ icon_state = "wood-broken4" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajX" = ( /obj/structure/table/wood, /obj/item/weapon/electronics/firelock, /obj/item/weapon/electronics/airlock, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajY" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -5004,9 +4790,7 @@ pixel_y = 3 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ajZ" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -5018,17 +4802,13 @@ icon_state = "plant-22" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aka" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, /obj/item/weapon/electronics/apc, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akb" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -5038,9 +4818,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "akc" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -5052,9 +4830,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "akd" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ tag = "icon-connector_map (WEST)"; @@ -5063,9 +4839,7 @@ }, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ake" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -5115,9 +4889,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "akn" = ( /obj/machinery/computer/crew, /obj/machinery/ai_status_display{ @@ -5280,16 +5052,12 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "akE" = ( /obj/machinery/computer/arcade, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "akF" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -5305,9 +5073,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/bar, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "akG" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -5316,35 +5082,27 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "akH" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "akI" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "akJ" = ( /obj/structure/table/wood, /obj/item/clothing/suit/syndicatefake, /obj/item/clothing/head/syndicatefake, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "akK" = ( /turf/open/floor/plasteel/podhatch{ dir = 9 @@ -5407,14 +5165,10 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akT" = ( /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akU" = ( /obj/structure/table/wood, /obj/item/clothing/neck/tie/red, @@ -5422,21 +5176,15 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akV" = ( /turf/open/floor/wood{ icon_state = "wood-broken7" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akW" = ( /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akX" = ( /obj/structure/chair/comfy/brown{ icon_state = "comfychair"; @@ -5446,9 +5194,7 @@ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akY" = ( /obj/structure/table/wood, /obj/item/weapon/poster/contraband{ @@ -5461,9 +5207,7 @@ }, /obj/item/weapon/poster/contraband, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "akZ" = ( /obj/structure/chair/comfy/brown{ icon_state = "comfychair"; @@ -5472,23 +5216,17 @@ /turf/open/floor/wood{ icon_state = "wood-broken5" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ala" = ( /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alb" = ( /obj/structure/frame/computer, /obj/item/stack/cable_coil/white, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alc" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -5500,9 +5238,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ald" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ tag = "icon-connector_map (WEST)"; @@ -5513,9 +5249,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ale" = ( /obj/machinery/airalarm{ dir = 4; @@ -5601,9 +5335,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "alm" = ( /obj/machinery/computer/card, /obj/machinery/light{ @@ -5760,9 +5492,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -5773,9 +5503,7 @@ name = "blobstart" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alA" = ( /obj/structure/table/wood, /obj/item/toy/carpplushie, @@ -5783,35 +5511,27 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alB" = ( /obj/machinery/computer/arcade, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alC" = ( /obj/machinery/computer/arcade, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alD" = ( /obj/structure/table/wood, /obj/item/weapon/coin/antagtoken, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alE" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -5819,9 +5539,7 @@ }, /obj/structure/chair/stool/bar, /turf/open/floor/plasteel/black, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alF" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, @@ -5830,26 +5548,20 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alG" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alH" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, /obj/item/toy/syndicateballoon, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "alI" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -5937,9 +5649,7 @@ icon_state = "plant-22" }, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alT" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -5948,25 +5658,19 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alW" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -5975,9 +5679,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alX" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, @@ -5987,9 +5689,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alY" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -6000,26 +5700,20 @@ dir = 1 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "alZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8; on = 1 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ama" = ( /obj/structure/chair/office/dark{ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "amb" = ( /obj/structure/frame/computer, /obj/item/weapon/circuitboard/computer/secure_data, @@ -6027,17 +5721,13 @@ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "amc" = ( /obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "amd" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -6047,15 +5737,11 @@ /turf/open/floor/plating{ icon_state = "platingdmg3" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ame" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "amf" = ( /obj/structure/chair/office/dark, /turf/open/floor/plasteel/grimy, @@ -6092,9 +5778,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "amk" = ( /obj/machinery/computer/med_data, /obj/machinery/status_display{ @@ -6235,52 +5919,38 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amz" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amA" = ( /obj/structure/chair/stool/bar, /turf/open/floor/plasteel/black, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amB" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amC" = ( /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amD" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plasteel/black, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amE" = ( /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amF" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -6300,17 +5970,13 @@ pixel_y = 6 }, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amG" = ( /obj/structure/table/wood, /obj/item/weapon/folder/blue, /obj/item/clothing/head/collectable/HoP, /turf/open/floor/plasteel/redyellow, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "amH" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -6566,9 +6232,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ane" = ( /obj/structure/table/wood, /obj/item/weapon/electronics/airalarm, @@ -6576,15 +6240,11 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "anf" = ( /obj/structure/chair/stool/bar, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ang" = ( /obj/structure/chair/comfy/brown{ icon_state = "comfychair"; @@ -6595,9 +6255,7 @@ icon_state = "2-4" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "anh" = ( /obj/structure/table/wood, /obj/item/weapon/folder/red, @@ -6607,9 +6265,7 @@ icon_state = "4-8" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ani" = ( /obj/structure/chair/comfy/brown{ icon_state = "comfychair"; @@ -6621,18 +6277,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "anj" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "ank" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -6641,18 +6293,14 @@ /turf/open/floor/wood{ icon_state = "wood-broken4" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "anl" = ( /obj/structure/frame/computer, /obj/machinery/status_display{ pixel_x = 32 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "anm" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -6660,9 +6308,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ann" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/neutral/side{ @@ -6670,9 +6316,7 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; tag = "icon-neutral (SOUTHEAST)" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ano" = ( /obj/structure/table/wood, /obj/item/weapon/phone{ @@ -6888,9 +6532,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anJ" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -6904,9 +6546,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anK" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -6919,9 +6559,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anL" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -6931,9 +6569,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anM" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -6945,9 +6581,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anN" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -6960,9 +6594,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anO" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -6972,17 +6604,13 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "anQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7128,9 +6756,7 @@ /obj/item/weapon/stock_parts/console_screen, /obj/item/weapon/circuitboard/machine/microwave, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoc" = ( /obj/machinery/newscaster{ pixel_y = -32 @@ -7139,9 +6765,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aod" = ( /obj/structure/table/wood, /obj/item/weapon/poster/contraband{ @@ -7154,9 +6778,7 @@ }, /obj/item/weapon/poster/contraband, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoe" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -7166,29 +6788,21 @@ tag = "icon-wood-broken"; icon_state = "wood-broken" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aof" = ( /obj/machinery/light/small, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aog" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoh" = ( /turf/open/floor/wood{ tag = "icon-wood-broken7"; icon_state = "wood-broken7" }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoi" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -7203,9 +6817,7 @@ pixel_y = -26 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoj" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -7214,16 +6826,12 @@ /obj/item/weapon/folder/red, /obj/item/weapon/lighter, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aok" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aol" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -7239,9 +6847,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aom" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -7250,9 +6856,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aon" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -7297,37 +6901,27 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aoq" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aor" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aos" = ( /turf/open/floor/plasteel/black, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aot" = ( /obj/structure/table/wood, /obj/item/toy/talking/AI, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aou" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -7514,9 +7108,7 @@ "aoM" = ( /obj/structure/sign/poster, /turf/closed/wall, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoN" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -7533,9 +7125,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoO" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -7549,23 +7139,17 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/crew_quarters/bar{ - name = "Electronic Marketing Den" - }) +/area/crew_quarters/electronic_marketing_den) "aoP" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoQ" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -7574,41 +7158,31 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoU" = ( /obj/structure/cable/white{ tag = "icon-2-4"; icon_state = "2-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoV" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -7618,9 +7192,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoX" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -7629,9 +7201,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -7639,9 +7209,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aoZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -7657,9 +7225,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apa" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -7670,9 +7236,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -7685,18 +7249,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apd" = ( /obj/machinery/light{ dir = 8 @@ -7780,9 +7340,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -7791,9 +7349,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apm" = ( /obj/machinery/light/small{ dir = 1 @@ -7804,9 +7360,7 @@ name = "3maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apn" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -7815,40 +7369,30 @@ name = "arcade coin" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apo" = ( /obj/machinery/computer/arcade, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "app" = ( /obj/structure/table/wood, /obj/item/toy/talking/codex_gigas, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apq" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/regular/hipster, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apr" = ( /obj/machinery/computer/arcade, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aps" = ( /obj/machinery/airalarm{ dir = 1; @@ -7862,18 +7406,14 @@ name = "arcade coin" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apt" = ( /obj/structure/table/wood, /obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "apu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -8155,9 +7695,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8165,9 +7703,7 @@ icon_state = "2-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8177,9 +7713,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apX" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -8190,18 +7724,14 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apY" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "apZ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -8211,9 +7741,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8226,9 +7754,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqb" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -8238,9 +7764,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8251,9 +7775,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8267,9 +7789,7 @@ dir = 10; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqe" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -8279,9 +7799,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqf" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -8293,9 +7811,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqg" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -8305,9 +7821,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqh" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -8323,26 +7837,20 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/corner, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqk" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -8356,9 +7864,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aql" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -8367,9 +7873,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqm" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -8380,25 +7884,19 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -8411,18 +7909,14 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqq" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqr" = ( /turf/open/floor/plating{ icon_state = "panelscorched" @@ -8437,9 +7931,7 @@ /turf/open/floor/plating{ icon_state = "platingdmg2" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -8449,9 +7941,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqt" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -8462,9 +7952,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqu" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -8477,9 +7965,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqv" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -8497,9 +7983,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aqw" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -8615,9 +8099,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -8627,9 +8109,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqG" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -8641,9 +8121,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8654,9 +8132,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8673,9 +8149,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -8685,9 +8159,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -8700,26 +8172,20 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqL" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /turf/closed/wall, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqM" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/closed/wall, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "aqN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9053,18 +8519,14 @@ "aro" = ( /obj/structure/sign/poster, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "arp" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "arq" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -9077,9 +8539,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "arr" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -9091,17 +8551,13 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ars" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "art" = ( /turf/closed/wall, /area/janitor) @@ -9109,9 +8565,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "arv" = ( /turf/closed/wall, /area/crew_quarters/toilet{ @@ -9204,9 +8658,7 @@ dir = 4 }, /turf/closed/wall, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -9216,9 +8668,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -9233,9 +8683,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -9247,17 +8695,13 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arH" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arI" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -9272,9 +8716,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -9290,9 +8732,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 6 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -9306,9 +8746,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arL" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -9323,9 +8761,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arM" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -9338,9 +8774,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -9354,9 +8788,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arO" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -9372,9 +8804,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -9390,9 +8820,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -9410,9 +8838,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arR" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -9427,9 +8853,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "arS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -9763,16 +9187,12 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asv" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -9780,9 +9200,7 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asw" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -9793,9 +9211,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asx" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -9803,9 +9219,7 @@ /obj/item/clothing/gloves/color/white, /obj/item/clothing/head/rabbitears, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -9814,24 +9228,18 @@ icon_state = "redblue"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asz" = ( /obj/structure/table_frame/wood, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asA" = ( /obj/structure/easel, /obj/item/weapon/canvas/twentythreeXtwentythree, /obj/item/weapon/canvas/twentythreeXtwentythree, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asB" = ( /obj/structure/easel, /obj/item/weapon/canvas/twentythreeXtwentythree, @@ -9839,25 +9247,19 @@ /turf/open/floor/wood{ icon_state = "wood-broken7" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asD" = ( /obj/structure/table/wood, /obj/item/device/camera_film, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asE" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -9867,9 +9269,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asF" = ( /obj/structure/table/reinforced, /obj/machinery/light/small{ @@ -9969,9 +9369,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "asM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -10089,14 +9487,10 @@ pixel_y = 8 }, /turf/closed/wall, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "asW" = ( /turf/closed/wall, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "asX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -10113,9 +9507,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "asY" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -10123,17 +9515,13 @@ dir = 8 }, /turf/closed/wall, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "asZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ata" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -10309,9 +9697,7 @@ "att" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ @@ -10322,15 +9708,11 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atv" = ( /obj/structure/grille, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atw" = ( /obj/structure/mirror{ desc = "Mirror mirror on the wall, who is the most robust of them all?"; @@ -10341,9 +9723,7 @@ /obj/item/clothing/suit/suspenders, /obj/effect/landmark/costume, /turf/open/floor/plasteel/redblue, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atx" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -10354,57 +9734,43 @@ icon_state = "redblue"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aty" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/melee/skateboard, /turf/open/floor/plasteel/cafeteria, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atA" = ( /mob/living/simple_animal/cockroach, /turf/open/floor/wood, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atB" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; on = 1 }, /turf/open/floor/wood, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atE" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -10414,18 +9780,14 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atG" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -10439,9 +9801,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atH" = ( /obj/structure/mirror{ desc = "Mirror mirror on the wall, who is the most robust of them all?"; @@ -10524,9 +9884,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "atO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mirror{ @@ -10639,22 +9997,16 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "atZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aua" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aub" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -10663,9 +10015,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "auc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/small{ @@ -10676,9 +10026,7 @@ icon_state = "brown"; dir = 1 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aud" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -10688,9 +10036,7 @@ name = "cargo camera" }, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aue" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ @@ -10698,16 +10044,12 @@ icon_state = "brown"; dir = 1 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "auf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aug" = ( /obj/item/stack/packageWrap, /obj/item/weapon/hand_labeler, @@ -11038,9 +10380,7 @@ }) "auN" = ( /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11049,45 +10389,33 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auP" = ( /obj/structure/rack, /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auQ" = ( /obj/structure/table_frame/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redblue, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auR" = ( /turf/open/floor/plasteel/redblue, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auS" = ( /turf/open/floor/plasteel/redblue/redside{ tag = "icon-redblue (WEST)"; icon_state = "redblue"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auT" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/cafeteria, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auU" = ( /obj/structure/table/wood, /obj/item/device/camera, @@ -11095,9 +10423,7 @@ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auV" = ( /obj/structure/chair/comfy/brown{ icon_state = "comfychair"; @@ -11107,18 +10433,14 @@ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster{ @@ -11128,15 +10450,11 @@ tag = "icon-wood-broken7"; icon_state = "wood-broken7" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auY" = ( /obj/machinery/photocopier, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "auZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11147,9 +10465,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /mob/living/simple_animal/cockroach, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ava" = ( /obj/structure/table/reinforced, /obj/machinery/airalarm{ @@ -11219,9 +10535,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "avh" = ( /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ @@ -11337,9 +10651,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -11356,16 +10668,12 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/secure/loot, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -11379,9 +10687,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -11391,18 +10697,14 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cardboard, @@ -11414,9 +10716,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -11426,9 +10726,7 @@ icon_state = "brown"; dir = 4 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ @@ -11439,9 +10737,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "avz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -11681,9 +10977,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "avX" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ @@ -11691,9 +10985,7 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "avY" = ( /obj/machinery/light/small, /obj/machinery/power/apc{ @@ -11703,18 +10995,14 @@ }, /obj/structure/cable/white, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "avZ" = ( /obj/structure/sign/poster{ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redblue, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "awa" = ( /obj/machinery/vending/autodrobe{ req_access_txt = "0" @@ -11726,9 +11014,7 @@ icon_state = "redblue"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "awb" = ( /obj/structure/table/wood, /obj/structure/sign/poster{ @@ -11738,9 +11024,7 @@ /obj/item/clothing/shoes/jackboots, /obj/effect/landmark/costume, /turf/open/floor/plasteel/cafeteria, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "awc" = ( /obj/structure/table/wood, /obj/item/weapon/lipstick/random{ @@ -11756,9 +11040,7 @@ pixel_y = -32 }, /turf/open/floor/plasteel/cafeteria, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "awd" = ( /obj/structure/table/wood, /obj/item/weapon/canvas/twentythreeXnineteen, @@ -11771,9 +11053,7 @@ tag = "icon-wood-broken6"; icon_state = "wood-broken6" }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "awe" = ( /obj/structure/sink{ dir = 8; @@ -11899,9 +11179,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ @@ -11915,15 +11193,11 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awr" = ( /obj/item/weapon/storage/box/lights/mixed, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aws" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -11932,9 +11206,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -11943,9 +11215,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, @@ -11953,9 +11223,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/internals, @@ -11964,17 +11232,13 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aww" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -11985,9 +11249,7 @@ icon_state = "brown"; dir = 4 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ @@ -11998,9 +11260,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "awz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -12222,33 +11482,25 @@ }) "awX" = ( /turf/closed/wall, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "awY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "awZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ name = "blobstart" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "axa" = ( /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "axb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -12259,9 +11511,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "axc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -12316,9 +11566,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "axh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, @@ -12398,18 +11646,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axo" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; on = 1 }, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axp" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -12421,9 +11665,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start{ @@ -12435,9 +11677,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ @@ -12447,18 +11687,14 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axs" = ( /obj/effect/decal/cleanable/oil, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -12466,18 +11702,14 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axu" = ( /turf/open/floor/plasteel/brown{ tag = "icon-brown (EAST)"; icon_state = "brown"; dir = 4 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "axv" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=4"; @@ -12785,9 +12017,7 @@ /obj/item/seeds/sunflower, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayb" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -12800,23 +12030,17 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayc" = ( /obj/structure/table, /obj/item/clothing/suit/apron/overalls, /obj/item/weapon/cultivator, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayd" = ( /obj/machinery/biogenerator, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aye" = ( /obj/structure/table, /obj/item/seeds/poppy/lily{ @@ -12829,17 +12053,13 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/corn, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayf" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/tea, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayg" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -12851,9 +12071,7 @@ pixel_y = 32 }, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayh" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -12863,17 +12081,13 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/grapes, /obj/item/weapon/reagent_containers/food/snacks/grown/cherries, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayi" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/poppy, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "ayj" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -12884,9 +12098,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -12902,9 +12114,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -12918,9 +12128,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aym" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -12933,9 +12141,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -12949,9 +12155,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayo" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -12964,9 +12168,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayp" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -12984,9 +12186,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13001,9 +12201,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13025,9 +12223,7 @@ sortType = 19 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ays" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -13038,9 +12234,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -13049,9 +12243,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -13064,9 +12256,7 @@ sortType = 22 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -13078,9 +12268,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -13092,9 +12280,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -13107,17 +12293,13 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "ayz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -13145,20 +12327,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayC" = ( /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayD" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayE" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -13166,17 +12342,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/deadcockroach, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayG" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -13187,31 +12359,23 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayH" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/storage/box/mousetraps, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayI" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/delivery, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayJ" = ( /obj/structure/plasticflaps{ opacity = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "ayK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/navbeacon{ @@ -13466,14 +12630,10 @@ "azn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/hydrofloor, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "azo" = ( /turf/open/floor/plasteel/hydrofloor, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "azp" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -13486,32 +12646,24 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azs" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -13520,9 +12672,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azu" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -13535,9 +12685,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13549,9 +12697,7 @@ }, /obj/machinery/light/small, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azw" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -13559,9 +12705,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13575,9 +12719,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13590,9 +12732,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -13607,9 +12747,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "azA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -13664,9 +12802,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azE" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -13685,9 +12821,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13707,9 +12841,7 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azG" = ( /obj/effect/decal/cleanable/oil, /obj/structure/cable/white{ @@ -13729,9 +12861,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13751,9 +12881,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13766,9 +12894,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13776,18 +12902,14 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azK" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -13800,9 +12922,7 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plasteel/bot, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -13820,9 +12940,7 @@ icon_state = "brown"; dir = 4 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "azN" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -14032,18 +13150,14 @@ pixel_x = -32 }, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aAl" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; on = 1 }, /turf/open/floor/plasteel/hydrofloor, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aAm" = ( /obj/structure/sink{ dir = 4; @@ -14053,9 +13167,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aAn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -14068,9 +13180,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aAo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -14174,16 +13284,12 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /turf/open/floor/plasteel/brown, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -14192,9 +13298,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/brown, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -14203,9 +13307,7 @@ dir = 6 }, /turf/open/floor/plasteel/brown, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -14215,28 +13317,20 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAF" = ( /obj/machinery/light/small, /turf/open/floor/plating, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ @@ -14244,9 +13338,7 @@ icon_state = "brown"; dir = 6 }, -/area/quartermaster/sorting{ - name = "\improper Warehouse" - }) +/area/quartermaster/warehouse) "aAJ" = ( /obj/machinery/camera{ c_tag = "Cargo Bay - Port"; @@ -14616,18 +13708,14 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/hydrofloor, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aBl" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/hydrofloor, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aBm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -14636,18 +13724,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/hydrofloor, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aBn" = ( /obj/structure/cable/white{ tag = "icon-2-8"; icon_state = "2-8" }, /turf/open/floor/plasteel/hydrofloor, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aBo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -14657,9 +13741,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aBp" = ( /obj/structure/table/wood, /obj/item/weapon/folder, @@ -14940,9 +14022,7 @@ "aBN" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aBO" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -14960,15 +14040,11 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aBP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aBQ" = ( /turf/closed/wall, /area/security/checkpoint/supply{ @@ -15204,17 +14280,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCq" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/harebell, /obj/machinery/light/small, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCr" = ( /obj/structure/table, /obj/item/weapon/shovel/spade, @@ -15233,9 +14305,7 @@ pixel_y = -26 }, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCs" = ( /obj/machinery/seed_extractor, /obj/machinery/status_display{ @@ -15243,24 +14313,18 @@ }, /obj/item/weapon/reagent_containers/glass/bucket, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCt" = ( /obj/structure/table, /obj/item/device/plant_analyzer, /obj/item/weapon/hatchet, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -15268,27 +14332,21 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCw" = ( /obj/structure/table, /obj/item/weapon/crowbar, /obj/item/weapon/wrench, /obj/item/weapon/reagent_containers/glass/bucket, /turf/open/floor/plasteel/bot, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCx" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /turf/open/floor/plasteel/delivery, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aCy" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -15297,9 +14355,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aCz" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -15523,9 +14579,7 @@ opacity = 1 }, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aCU" = ( /obj/machinery/conveyor{ dir = 4; @@ -15533,9 +14587,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aCV" = ( /obj/machinery/conveyor{ dir = 2; @@ -15543,9 +14595,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aCW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/trunk{ @@ -15561,9 +14611,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aCX" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -15573,9 +14621,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aCY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -15590,9 +14636,7 @@ /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aCZ" = ( /obj/structure/disposalpipe/trunk{ tag = "icon-pipe-t (NORTH)"; @@ -15601,9 +14645,7 @@ }, /obj/structure/disposaloutlet, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aDa" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -16227,9 +15269,7 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aDR" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -16244,9 +15284,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aDS" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -16263,9 +15301,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/hydroponics{ - name = "Abandoned Garden" - }) +/area/hydroponics/Abandoned_Garden) "aDT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -16275,9 +15311,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aDU" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -16460,9 +15494,7 @@ }, /obj/machinery/door/window, /turf/open/floor/plasteel/bot, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aEm" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -16470,18 +15502,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aEn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aEo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor{ @@ -16489,9 +15517,7 @@ id = "cargodisposals" }, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aEp" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -17074,9 +16100,7 @@ dir = 5 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aFl" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -17086,9 +16110,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aFm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -17101,9 +16123,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aFn" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -17122,9 +16142,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aFo" = ( /obj/structure/table/wood, /obj/structure/table/wood, @@ -17293,9 +16311,7 @@ /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/bot, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aFH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor_switch/oneway{ @@ -17305,9 +16321,7 @@ pixel_x = -12 }, /turf/open/floor/plasteel/loadingarea, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aFI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -17316,9 +16330,7 @@ dir = 6 }, /turf/open/floor/plasteel/loadingarea, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aFJ" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -17330,17 +16342,13 @@ dir = 9 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aFK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aFL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor{ @@ -17349,9 +16357,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aFM" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -17826,9 +16832,7 @@ "aGF" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aGG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -17837,26 +16841,18 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aGH" = ( /obj/structure/closet, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aGI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aGJ" = ( /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aGK" = ( /obj/structure/table/wood, /obj/item/device/camera, @@ -17987,29 +16983,21 @@ pixel_x = -32 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aGX" = ( /obj/structure/chair/stool/bar, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aGY" = ( /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aGZ" = ( /obj/structure/chair/stool/bar, /obj/effect/landmark/start{ name = "Assistant" }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aHa" = ( /obj/structure/chair/stool/bar, /obj/item/device/radio/intercom{ @@ -18018,14 +17006,10 @@ pixel_y = 0 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aHb" = ( /turf/closed/wall, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aHc" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -18037,9 +17021,7 @@ req_access_txt = "50" }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aHd" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -18052,9 +17034,7 @@ icon_state = "brown"; dir = 9 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aHe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; @@ -18066,9 +17046,7 @@ icon_state = "brown"; dir = 1 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aHf" = ( /obj/effect/landmark{ name = "lightsout" @@ -18082,9 +17060,7 @@ icon_state = "brown"; dir = 1 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aHg" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -18100,9 +17076,7 @@ icon_state = "brown"; dir = 5 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aHh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -18119,9 +17093,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aHi" = ( /obj/structure/cable/white, /obj/structure/grille, @@ -18554,9 +17526,7 @@ }) "aHW" = ( /turf/closed/wall, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "aHX" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -18567,9 +17537,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aHY" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, @@ -18660,9 +17628,7 @@ pixel_x = -26 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aIg" = ( /obj/machinery/airalarm{ dir = 8; @@ -18674,9 +17640,7 @@ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aIh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/loadingarea, @@ -18691,20 +17655,14 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aIj" = ( /turf/open/floor/plasteel/neutral, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aIk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aIl" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -18716,9 +17674,7 @@ icon_state = "brown"; dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aIm" = ( /obj/structure/window/reinforced{ dir = 4 @@ -18731,9 +17687,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aIn" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -19255,9 +18209,7 @@ /obj/structure/table/wood, /obj/item/clothing/glasses/sunglasses, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aJk" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -19266,26 +18218,20 @@ pixel_y = 3 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aJl" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aJm" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aJn" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -19301,9 +18247,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken7" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aJo" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -19312,9 +18256,7 @@ pixel_y = 3 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aJp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -19358,9 +18300,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJu" = ( /obj/structure/table/wood, /obj/structure/sign/poster{ @@ -19370,9 +18310,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJv" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -19394,9 +18332,7 @@ name = "service camera" }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJw" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -19405,9 +18341,7 @@ /obj/item/weapon/canvas/twentythreeXtwentythree, /obj/item/weapon/canvas/twentythreeXtwentythree, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJx" = ( /obj/structure/window/reinforced{ dir = 4; @@ -19423,39 +18357,29 @@ pixel_y = 3 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJy" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJz" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; on = 1 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJA" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJB" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aJC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/device/radio/intercom{ @@ -19478,22 +18402,16 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aJE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aJF" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/bot, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aJG" = ( /obj/machinery/status_display, /turf/closed/wall, @@ -19508,9 +18426,7 @@ }, /obj/structure/plasticflaps, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aJI" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -20075,33 +18991,25 @@ dir = 8 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aKG" = ( /obj/structure/chair/office/dark{ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aKH" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, /obj/item/weapon/folder/red, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aKI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aKJ" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, @@ -20111,9 +19019,7 @@ icon_state = "1-2" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aKK" = ( /obj/machinery/computer/slot_machine, /obj/machinery/light/small{ @@ -20126,9 +19032,7 @@ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aKL" = ( /obj/structure/dresser, /obj/machinery/newscaster{ @@ -20206,23 +19110,17 @@ "aKR" = ( /obj/structure/sign/poster, /turf/closed/wall, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKS" = ( /obj/structure/table/wood, /obj/item/device/instrument/guitar, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKT" = ( /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKU" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -20233,14 +19131,10 @@ on = 1 }, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKV" = ( /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKW" = ( /obj/structure/window/reinforced{ dir = 4; @@ -20250,32 +19144,24 @@ icon_state = "plant-22" }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKX" = ( /obj/structure/table/wood, /obj/item/clothing/head/fedora, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKY" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aKZ" = ( /obj/structure/table/wood, /obj/item/weapon/storage/pill_bottle/dice, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aLa" = ( /obj/item/weapon/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; @@ -20286,16 +19172,12 @@ }, /obj/structure/table/wood, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aLb" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aLc" = ( /obj/structure/table, /obj/structure/cable/white{ @@ -20318,9 +19200,7 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aLd" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -20333,9 +19213,7 @@ name = "Cargo Technician" }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aLe" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -20351,9 +19229,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aLf" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -20369,16 +19245,12 @@ icon_state = "brown"; dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aLg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps, /turf/open/floor/plasteel/delivery, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aLh" = ( /obj/structure/cable/white{ d2 = 2; @@ -20996,24 +19868,18 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aMo" = ( /obj/structure/sign/poster{ pixel_x = -32 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aMp" = ( /obj/structure/table/wood, /obj/item/weapon/storage/briefcase, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aMq" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck/syndicate{ @@ -21022,14 +19888,10 @@ pixel_y = 6 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aMr" = ( /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aMs" = ( /obj/structure/chair/stool/bar, /obj/structure/cable/white{ @@ -21037,9 +19899,7 @@ icon_state = "1-2" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aMt" = ( /obj/machinery/computer/slot_machine, /obj/structure/sign/poster{ @@ -21049,9 +19909,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken4" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aMu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -21063,9 +19921,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aMv" = ( /obj/structure/mirror{ desc = "Mirror mirror on the wall, who is the most robust of them all?"; @@ -21138,9 +19994,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMD" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -21148,24 +20002,18 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aME" = ( /obj/structure/chair/wood/normal, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMF" = ( /obj/structure/window/reinforced{ dir = 4; pixel_x = 0 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMG" = ( /obj/structure/chair/comfy/brown{ icon_state = "comfychair"; @@ -21174,17 +20022,13 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMI" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -21192,9 +20036,7 @@ }, /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMJ" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -21202,9 +20044,7 @@ }, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMK" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck, @@ -21212,26 +20052,20 @@ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aML" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMN" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -21241,9 +20075,7 @@ name = "Atrium" }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aMO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -21303,17 +20135,13 @@ icon_state = "brown"; dir = 10 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aMS" = ( /obj/structure/table, /obj/item/weapon/folder/yellow, /obj/item/device/destTagger, /turf/open/floor/plasteel/brown, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aMT" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -21321,9 +20149,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/brown, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aMU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -21341,9 +20167,7 @@ icon_state = "brown"; dir = 6 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aMV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/trunk, @@ -21353,9 +20177,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aMW" = ( /turf/open/floor/plasteel/red/side{ tag = "icon-red (SOUTHWEST)"; @@ -21883,31 +20705,23 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aNX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ icon_state = "wood-broken4" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aNY" = ( /turf/open/floor/wood{ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aNZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aOa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -21919,18 +20733,14 @@ tag = "icon-wood-broken5"; icon_state = "wood-broken5" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aOb" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aOc" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -21952,9 +20762,7 @@ sortType = 18 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aOd" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -22120,9 +20928,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aOn" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -22138,9 +20944,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aOo" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -22150,9 +20954,7 @@ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aOp" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (EAST)"; @@ -22169,32 +20971,24 @@ dir = 9 }, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aOq" = ( /obj/machinery/holopad, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aOr" = ( /obj/effect/landmark{ name = "lightsout" }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aOs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Atrium" }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aOt" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -22220,26 +21014,20 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aOv" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aOw" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, /turf/closed/wall, -/area/quartermaster/office{ - name = "\improper Cargo Office" - }) +/area/quartermaster/sorting) "aOx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22964,24 +21752,18 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aPD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aPE" = ( /obj/structure/chair/stool/bar, /turf/open/floor/wood{ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aPF" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, @@ -22989,9 +21771,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aPG" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -23003,9 +21783,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken5" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aPH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -23016,9 +21794,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aPI" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -23030,9 +21806,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aPJ" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -23049,9 +21823,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aPK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -23144,9 +21916,7 @@ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aPT" = ( /obj/structure/table/wood, /obj/item/weapon/lipstick/random{ @@ -23164,17 +21934,13 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aPU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aPV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -23182,9 +21948,7 @@ dir = 10 }, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aPW" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (NORTH)"; @@ -23192,23 +21956,17 @@ dir = 1 }, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aPX" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/drinks/coffee, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aPY" = ( /obj/structure/table/wood, /obj/item/device/paicard, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aPZ" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -23217,17 +21975,13 @@ dir = 6 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aQa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aQb" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -23237,9 +21991,7 @@ name = "Atrium" }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aQc" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -24073,18 +22825,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aRr" = ( /obj/machinery/light/small, /obj/structure/table/wood, /obj/item/weapon/storage/pill_bottle, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aRs" = ( /obj/machinery/computer/slot_machine, /obj/structure/sign/poster{ @@ -24094,9 +22842,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken7" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aRt" = ( /obj/machinery/computer/slot_machine, /obj/structure/sign/poster{ @@ -24104,9 +22850,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aRu" = ( /obj/machinery/light/small, /obj/structure/table/wood, @@ -24117,9 +22861,7 @@ /obj/item/weapon/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/space) "aRv" = ( /obj/structure/table/wood, /obj/machinery/requests_console{ @@ -24203,9 +22945,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; @@ -24213,54 +22953,40 @@ scrub_Toxins = 0 }, /turf/open/floor/carpet, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRD" = ( /obj/structure/table/wood, /obj/item/clothing/mask/cigarette/pipe, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRE" = ( /obj/structure/chair/stool, /obj/effect/landmark/start{ name = "Assistant" }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRF" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/snacks/chips, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRG" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRH" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aRJ" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -25223,9 +23949,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTk" = ( /obj/structure/table/wood, /obj/structure/sign/poster{ @@ -25236,9 +23960,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTl" = ( /obj/structure/piano{ tag = "icon-piano"; @@ -25251,18 +23973,14 @@ }, /obj/machinery/light, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTm" = ( /obj/structure/chair/stool/bar, /obj/structure/sign/poster{ pixel_y = -32 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTn" = ( /obj/machinery/door/window/eastright{ name = "Theatre Stage" @@ -25271,16 +23989,12 @@ pixel_y = -32 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTo" = ( /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTp" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -25288,9 +24002,7 @@ pixel_y = -26 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; @@ -25298,9 +24010,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aTr" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -25922,9 +24632,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUE" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -25937,9 +24645,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUF" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -25953,9 +24659,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUG" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -25965,9 +24669,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUH" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -25980,9 +24682,7 @@ sortType = 21 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUI" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -26006,9 +24706,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -26020,9 +24718,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -26033,9 +24729,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -26046,9 +24740,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aUM" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -26123,9 +24815,7 @@ name = "service camera" }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aUS" = ( /obj/machinery/firealarm{ dir = 4; @@ -26139,9 +24829,7 @@ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aUT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ @@ -27077,9 +25765,7 @@ /area/atmos) "aWz" = ( /turf/open/floor/plasteel/neutral/corner, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aWA" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -27087,9 +25773,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aWB" = ( /turf/closed/wall, /area/hydroponics) @@ -27213,9 +25897,7 @@ pixel_y = 3 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aWO" = ( /obj/structure/chair/stool/bar, /obj/structure/disposalpipe/segment{ @@ -27223,18 +25905,14 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aWP" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar{ - name = "Atrium" - }) +/area/crew_quarters/bar/atrium) "aWQ" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -27361,23 +26039,17 @@ }) "aXb" = ( /turf/closed/wall, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aXc" = ( /obj/machinery/status_display, /turf/closed/wall, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aXd" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aXe" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_mining{ @@ -27390,16 +26062,12 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aXf" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aXg" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -27407,9 +26075,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aXh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, @@ -27427,9 +26093,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aXi" = ( /obj/machinery/status_display, /turf/closed/wall, @@ -28196,9 +26860,7 @@ icon_state = "brown"; dir = 9 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aYF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -28207,9 +26869,7 @@ icon_state = "purple"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aYG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/brown{ @@ -28217,9 +26877,7 @@ icon_state = "brown"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aYH" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/belt/utility, @@ -28228,9 +26886,7 @@ icon_state = "purple"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aYI" = ( /obj/structure/table/reinforced, /obj/machinery/computer/stockexchange, @@ -28239,9 +26895,7 @@ icon_state = "brown"; dir = 5 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "aYJ" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -28256,16 +26910,12 @@ dir = 1 }, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYL" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -28273,22 +26923,16 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYM" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYN" = ( /obj/structure/closet/secure_closet/miner, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYO" = ( /obj/machinery/mineral/equipment_vendor, /obj/effect/decal/cleanable/dirt, @@ -28296,9 +26940,7 @@ dir = 1 }, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYP" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -28308,16 +26950,12 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYQ" = ( /obj/structure/table, /obj/item/weapon/storage/box/donkpockets, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYR" = ( /obj/structure/cable/white{ d2 = 2; @@ -28328,9 +26966,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "aYS" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/mining) @@ -28636,9 +27272,7 @@ "aZA" = ( /mob/living/simple_animal/cockroach, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aZB" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -28648,9 +27282,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "aZC" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/window/reinforced, @@ -29016,9 +27648,7 @@ icon_state = "purple"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "baj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -29026,9 +27656,7 @@ on = 1 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bak" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -29036,17 +27664,13 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bal" = ( /obj/structure/chair/office/dark{ dir = 1 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bam" = ( /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/plasteel/purple/side{ @@ -29054,9 +27678,7 @@ icon_state = "purple"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "ban" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -29067,9 +27689,7 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bao" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -29081,18 +27701,14 @@ icon_state = "brown"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bap" = ( /turf/open/floor/plasteel/loadingarea{ tag = "icon-loadingarea (NORTH)"; icon_state = "loadingarea"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "baq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/loadingarea{ @@ -29100,9 +27716,7 @@ icon_state = "loadingarea"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bar" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ @@ -29110,18 +27724,14 @@ icon_state = "brown"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bas" = ( /turf/open/floor/plasteel/purple/side{ tag = "icon-purple (NORTH)"; icon_state = "purple"; dir = 1 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bat" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ @@ -29129,9 +27739,7 @@ icon_state = "brown"; dir = 5 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bau" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -29141,9 +27749,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bav" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -29156,9 +27762,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "baw" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -29172,9 +27776,7 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/sign/vacuum, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bax" = ( /obj/structure/cable/white{ tag = "icon-0-8"; @@ -29188,9 +27790,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bay" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/emergency, @@ -29420,9 +28020,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "baX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -29433,9 +28031,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "baY" = ( /obj/structure/closet/crate/hydroponics, /obj/item/weapon/cultivator, @@ -29668,9 +28264,7 @@ req_access_txt = "48" }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bbC" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -29680,26 +28274,18 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bbD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bbE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bbF" = ( /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bbG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/brown{ @@ -29707,9 +28293,7 @@ icon_state = "brown"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bbH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, @@ -29718,25 +28302,19 @@ req_access_txt = "48" }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bbI" = ( /turf/open/floor/plasteel/purple/side{ tag = "icon-purple (WEST)"; icon_state = "purple"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbJ" = ( /obj/effect/decal/cleanable/oil, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbK" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -29752,9 +28330,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start{ @@ -29764,9 +28340,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbM" = ( /obj/effect/landmark/start{ name = "Shaft Miner" @@ -29776,32 +28350,24 @@ on = 1 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbN" = ( /obj/effect/landmark/start{ name = "Shaft Miner" }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbP" = ( /turf/open/floor/plasteel/purple/side{ tag = "icon-purple (EAST)"; icon_state = "purple"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbQ" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -29810,31 +28376,23 @@ pixel_x = 0 }, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/ore_box, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbT" = ( /obj/structure/cable/white, /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bbU" = ( /turf/open/floor/plasteel/warning{ dir = 8 @@ -30100,9 +28658,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bcs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -30111,9 +28667,7 @@ name = "3maintenance loot spawner" }, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bct" = ( /obj/structure/sign/botany, /turf/closed/wall, @@ -30302,9 +28856,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bcP" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -30318,18 +28870,14 @@ icon_state = "purple"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bcQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bcR" = ( /obj/machinery/holopad, /obj/effect/landmark{ @@ -30337,18 +28885,14 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bcS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bcT" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -30363,9 +28907,7 @@ icon_state = "purple"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bcU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -30376,9 +28918,7 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bcV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -30393,30 +28933,22 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bcW" = ( /obj/machinery/suit_storage_unit/mining/eva, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bcX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/suit_storage_unit/mining/eva, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bcY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bcZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor, @@ -30426,9 +28958,7 @@ req_access_txt = "48" }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bda" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning/side{ @@ -30436,18 +28966,14 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bdb" = ( /turf/open/floor/plasteel/warning/side{ tag = "icon-plasteel_warn_side (EAST)"; icon_state = "plasteel_warn_side"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bdc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -30458,9 +28984,7 @@ req_access_txt = "48" }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bdd" = ( /obj/machinery/door/airlock/shuttle{ name = "Mining Shuttle Airlock"; @@ -31023,9 +29547,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bem" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -31035,15 +29557,11 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "ben" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "beo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (NORTH)"; @@ -31051,9 +29569,7 @@ dir = 1 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bep" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -31065,9 +29581,7 @@ dir = 1 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "beq" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -31081,9 +29595,7 @@ icon_state = "brown"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "ber" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -31098,9 +29610,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bes" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -31114,9 +29624,7 @@ icon_state = "purple"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bet" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -31124,9 +29632,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "beu" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -31141,18 +29647,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bev" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bew" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -31160,15 +29662,11 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bex" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bey" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -31178,22 +29676,16 @@ icon_state = "purple"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bez" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "beA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "beB" = ( /obj/structure/cable/white{ d2 = 2; @@ -31203,9 +29695,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "beC" = ( /obj/structure/chair{ dir = 1 @@ -31764,9 +30254,7 @@ /obj/item/device/flashlight, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bfz" = ( /obj/structure/sink{ dir = 8; @@ -32064,17 +30552,13 @@ icon_state = "purple"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bgd" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bge" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -32087,9 +30571,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/neutral, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bgf" = ( /obj/machinery/photocopier, /obj/effect/decal/cleanable/dirt, @@ -32098,9 +30580,7 @@ icon_state = "purple"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bgg" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -32112,15 +30592,11 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/purple/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -32132,18 +30608,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/brown, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgj" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/purple/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgk" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -32162,18 +30634,14 @@ name = "cargo camera" }, /turf/open/floor/plasteel/brown, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgl" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/brown, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgm" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -32184,9 +30652,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/purple/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgn" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -32201,9 +30667,7 @@ icon_state = "brown"; dir = 6 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgo" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -32221,9 +30685,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgp" = ( /obj/structure/cable/white{ tag = "icon-0-8"; @@ -32233,9 +30695,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bgq" = ( /obj/item/clothing/suit/hazardvest{ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; @@ -32723,17 +31183,13 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bhl" = ( /obj/effect/landmark{ name = "blobstart" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bhm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -32745,9 +31201,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bhn" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/status_display{ @@ -33123,24 +31577,18 @@ icon_state = "brown"; dir = 10 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bhZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/loadingarea{ dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bia" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bib" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -33151,9 +31599,7 @@ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bic" = ( /obj/structure/table, /obj/structure/cable/white{ @@ -33178,9 +31624,7 @@ icon_state = "brown"; dir = 6 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bid" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, @@ -33197,15 +31641,11 @@ /obj/item/weapon/pickaxe, /obj/item/weapon/pickaxe, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bie" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bif" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -33215,9 +31655,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "big" = ( /obj/structure/closet/wardrobe/miner, /obj/effect/decal/cleanable/dirt, @@ -33230,17 +31668,13 @@ }, /obj/item/weapon/storage/backpack/satchel/explorer, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bih" = ( /obj/machinery/disposal/bin, /obj/effect/decal/cleanable/dirt, /obj/machinery/light, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bii" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/airalarm{ @@ -33249,24 +31683,18 @@ pixel_y = -22 }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bij" = ( /obj/machinery/computer/security/mining, /obj/machinery/newscaster{ pixel_y = -32 }, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bik" = ( /obj/machinery/computer/shuttle/mining, /turf/open/floor/plasteel/bot, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bil" = ( /obj/structure/shuttle/engine/propulsion/burst, /obj/structure/window/reinforced{ @@ -33547,9 +31975,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "biP" = ( /obj/structure/window/reinforced{ dir = 1; @@ -33558,9 +31984,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "biQ" = ( /obj/structure/window/reinforced{ dir = 1; @@ -33576,9 +32000,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "biR" = ( /obj/structure/window/reinforced{ dir = 8 @@ -33818,9 +32240,7 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bjp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -33829,9 +32249,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bjq" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light{ @@ -34020,18 +32438,14 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningoffice) "bjK" = ( /obj/structure/plasticflaps{ opacity = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bjL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -34048,9 +32462,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bjM" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -34059,9 +32471,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bjN" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -34372,9 +32782,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bkq" = ( /obj/structure/chair{ dir = 1 @@ -34382,17 +32790,13 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bkr" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bks" = ( /obj/structure/window/reinforced{ dir = 4; @@ -34405,9 +32809,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bkt" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -34805,9 +33207,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "blg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -34822,9 +33222,7 @@ icon_state = "brown"; dir = 8 }, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "blh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -34838,22 +33236,16 @@ dir = 9 }, /turf/open/floor/plasteel/delivery, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "bli" = ( /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "blj" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, -/area/quartermaster/miningdock{ - name = "\improper Mining Office" - }) +/area/quartermaster/miningdock) "blk" = ( /obj/structure/cable/white, /obj/structure/grille, @@ -35207,9 +33599,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "blP" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -35219,26 +33609,20 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "blQ" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "blR" = ( /obj/structure/window/reinforced, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "blS" = ( /obj/structure/window/reinforced, /obj/machinery/camera{ @@ -35253,18 +33637,14 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "blT" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "blU" = ( /obj/structure/window/reinforced{ dir = 1; @@ -35278,9 +33658,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "blV" = ( /obj/structure/window/reinforced{ dir = 8 @@ -35547,9 +33925,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -35560,9 +33936,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -35574,9 +33948,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmy" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -35588,9 +33960,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -35604,9 +33974,7 @@ dir = 10; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -35616,9 +33984,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -35630,9 +33996,7 @@ icon_state = "pipe-j2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -35648,9 +34012,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bmD" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/newscaster{ @@ -36334,9 +34696,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bnN" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -36673,9 +35033,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "boy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -37751,9 +36109,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bqn" = ( /obj/machinery/vending/hydroseeds, /turf/open/floor/plasteel/bot, @@ -39505,9 +37861,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "btw" = ( /obj/machinery/porta_turret/ai, /turf/open/floor/plasteel/vault{ @@ -39572,9 +37926,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "btD" = ( /turf/closed/wall/r_wall, /area/engine/gravity_generator) @@ -39815,9 +38167,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bud" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ @@ -40254,9 +38604,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "buS" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/blue, @@ -40678,9 +39026,7 @@ dir = 8 }, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bvF" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -40694,9 +39040,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bvG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -40710,9 +39054,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bvH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -40731,9 +39073,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bvI" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -40747,9 +39087,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bvJ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -41250,9 +39588,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bwx" = ( /obj/machinery/status_display, /turf/closed/wall/r_wall, @@ -41715,9 +40051,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bxq" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -44648,9 +42982,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bBQ" = ( /obj/machinery/gravity_generator/main/station, /turf/open/floor/plasteel/vault{ @@ -47187,15 +45519,11 @@ }) "bGx" = ( /turf/closed/wall/r_wall, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bGy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bGz" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -47210,15 +45538,11 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bGA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bGB" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, @@ -47584,9 +45908,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bHk" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -47599,9 +45921,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bHl" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -47616,9 +45936,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bHm" = ( /obj/structure/window/reinforced{ dir = 8 @@ -47699,9 +46017,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bHu" = ( /obj/structure/window/reinforced{ dir = 1; @@ -47719,9 +46035,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bHv" = ( /turf/closed/wall/r_wall, /area/engine/break_room{ @@ -48299,9 +46613,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIp" = ( /obj/structure/table/wood, /obj/item/device/radio/intercom{ @@ -48311,9 +46623,7 @@ /obj/item/weapon/folder/blue, /obj/item/weapon/pen, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIq" = ( /obj/machinery/power/apc{ cell_type = 10000; @@ -48336,9 +46646,7 @@ dir = 5 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -48352,9 +46660,7 @@ network = list("SS13","tcomm") }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIs" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -48365,9 +46671,7 @@ pixel_y = 26 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHEAST)"; @@ -48375,9 +46679,7 @@ dir = 6 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIu" = ( /obj/machinery/airalarm{ pixel_y = 22 @@ -48391,9 +46693,7 @@ dir = 9 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIv" = ( /obj/structure/table/wood, /obj/item/device/radio/intercom{ @@ -48404,9 +46704,7 @@ pixel_y = 5 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIw" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -48416,9 +46714,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bIx" = ( /obj/machinery/vending/boozeomat, /turf/open/floor/plasteel/vault{ @@ -48919,9 +47215,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bJt" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -48933,9 +47227,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bJu" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -48951,9 +47243,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bJv" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -49277,9 +47567,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Fore Port Maintenance" - }) +/area/maintenance/fpmaint2/fore_port_maintenance) "bKd" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal{ @@ -49469,17 +47757,13 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKv" = ( /obj/structure/chair/office/dark{ dir = 1 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKw" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -49491,9 +47775,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKx" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -49505,9 +47787,7 @@ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKy" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -49519,9 +47799,7 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -49529,26 +47807,20 @@ dir = 8 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKA" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8; on = 1 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKB" = ( /obj/structure/chair/office/dark{ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKC" = ( /obj/machinery/computer/telecomms/monitor, /obj/machinery/status_display{ @@ -49557,9 +47829,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bKD" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plasteel/vault{ @@ -49954,9 +48224,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bLp" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) @@ -50028,9 +48296,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bLx" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/white{ @@ -50507,49 +48773,35 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMv" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMw" = ( /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMy" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMA" = ( /obj/structure/chair/office/dark, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMB" = ( /obj/machinery/computer/telecomms/server, /obj/machinery/newscaster{ @@ -50558,9 +48810,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bMC" = ( /obj/structure/bed/dogbed{ anchored = 1; @@ -51542,22 +49792,16 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOr" = ( /obj/structure/table/wood, /obj/item/weapon/storage/box/donkpockets, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOs" = ( /obj/structure/filingcabinet/security, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOt" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -51565,9 +49809,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOu" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -51575,23 +49817,17 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOv" = ( /obj/structure/filingcabinet/medical, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOw" = ( /obj/structure/table/wood, /obj/item/weapon/folder/red, /obj/item/weapon/pen, /turf/open/floor/plasteel/grimy, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOx" = ( /obj/structure/table/wood, /obj/machinery/firealarm{ @@ -51610,9 +49846,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/tcommsat/computer{ - name = "\improper Telecoms Control Room" - }) +/area/tcommsat/computer) "bOy" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -51968,9 +50202,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bPa" = ( /obj/structure/window/reinforced{ dir = 1; @@ -51989,9 +50221,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bPb" = ( /obj/structure/showcase{ density = 0; @@ -52213,9 +50443,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bPt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/window/northright, @@ -52225,9 +50453,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bPu" = ( /obj/structure/window/reinforced{ dir = 1; @@ -52239,9 +50465,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bPv" = ( /obj/structure/window/reinforced{ dir = 1; @@ -52260,9 +50484,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bPw" = ( /obj/structure/lattice, /obj/structure/transit_tube/diagonal{ @@ -52988,9 +51210,7 @@ /area/crew_quarters/captain) "bQC" = ( /turf/closed/wall/r_wall, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bQD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -53345,16 +51565,12 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRf" = ( /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ @@ -53606,9 +51822,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRz" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -53622,9 +51836,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -53637,9 +51849,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRB" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -53648,9 +51858,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRC" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -53660,9 +51868,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRD" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -53676,9 +51882,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRE" = ( /obj/structure/window/reinforced{ dir = 4; @@ -53693,9 +51897,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bRF" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ @@ -54299,9 +52501,7 @@ name = "Captain" }, /turf/open/floor/plasteel/white, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bSP" = ( /obj/structure/window/reinforced{ dir = 8 @@ -54319,9 +52519,7 @@ on = 1 }, /turf/open/floor/plasteel/white, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bSQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ @@ -54769,9 +52967,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bTy" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -54783,9 +52979,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bTz" = ( /obj/structure/sign/nosmoking_2, /turf/closed/wall/r_wall, @@ -54956,9 +53150,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bTO" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -54969,9 +53161,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bTP" = ( /obj/structure/window/reinforced, /obj/structure/cable/white, @@ -54983,9 +53173,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bTQ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -55000,9 +53188,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "bTR" = ( /obj/structure/lattice, /obj/structure/transit_tube/diagonal, @@ -55503,9 +53689,7 @@ "bUP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bUQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -55520,20 +53704,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bUR" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bUS" = ( /turf/open/floor/plasteel/white, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bUT" = ( /obj/structure/sink{ dir = 4; @@ -55543,9 +53721,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bUU" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -56248,9 +54424,7 @@ /area/hallway/primary/port) "bWg" = ( /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bWh" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -56262,9 +54436,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bWi" = ( /turf/closed/wall, /area/library) @@ -56441,9 +54613,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWE" = ( /obj/machinery/light_switch{ pixel_x = 26; @@ -56456,14 +54626,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWF" = ( /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWG" = ( /obj/machinery/light{ dir = 1 @@ -56472,9 +54638,7 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWH" = ( /obj/structure/closet/secure_closet/captains, /obj/item/clothing/suit/armor/vest/capcarapace, @@ -56482,28 +54646,20 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWI" = ( /turf/closed/wall, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWJ" = ( /obj/machinery/door/airlock/silver{ name = "Bathroom" }, /turf/open/floor/plasteel/white, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bWL" = ( /obj/structure/sign/directions/evac{ pixel_y = -8 @@ -57095,24 +55251,18 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bXL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bXM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bXN" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ @@ -57130,9 +55280,7 @@ icon_state = "0-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bXO" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole, @@ -57402,9 +55550,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bYp" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -57415,17 +55561,13 @@ dir = 5 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bYq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bYr" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -57433,9 +55575,7 @@ dir = 1 }, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bYs" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, @@ -57447,17 +55587,13 @@ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bYt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bYu" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -57469,9 +55605,7 @@ dir = 9 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "bYv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -58084,9 +56218,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bZB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -58095,27 +56227,19 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bZC" = ( /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bZD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bZE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bZF" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -58124,9 +56248,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "bZG" = ( /obj/structure/table/wood, /obj/item/weapon/folder, @@ -58452,9 +56574,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cai" = ( /obj/structure/chair/comfy/brown{ color = "#c45c57"; @@ -58473,9 +56593,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "caj" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -58491,9 +56609,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cak" = ( /obj/machinery/holopad, /obj/structure/cable/white{ @@ -58510,9 +56626,7 @@ icon_state = "pipe-c" }, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cal" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -58523,9 +56637,7 @@ on = 1 }, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cam" = ( /obj/machinery/door/window/brigdoor/westleft{ name = "Captain's Bedroom"; @@ -58536,14 +56648,10 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "can" = ( /turf/open/floor/carpet, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cao" = ( /obj/machinery/light/small{ dir = 4 @@ -58557,9 +56665,7 @@ name = "Captain" }, /turf/open/floor/carpet, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cap" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -59236,9 +57342,7 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cbt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -59246,33 +57350,25 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cbu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cbv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cbw" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cbx" = ( /obj/machinery/light{ dir = 8 @@ -59451,9 +57547,7 @@ }, /obj/item/weapon/razor, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbR" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, @@ -59462,9 +57556,7 @@ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbS" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-18"; @@ -59477,9 +57569,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbT" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -59491,9 +57581,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbU" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -59515,9 +57603,7 @@ name = "command camera" }, /turf/open/floor/wood, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbV" = ( /obj/structure/table/wood, /obj/machinery/recharger, @@ -59532,21 +57618,15 @@ }, /obj/structure/cable/white, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbW" = ( /obj/structure/filingcabinet/security, /turf/open/floor/carpet, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbX" = ( /obj/structure/dresser, /turf/open/floor/carpet, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cbY" = ( /obj/structure/table, /obj/machinery/ai_status_display{ @@ -60277,9 +58357,7 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cdi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -60287,17 +58365,13 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cdj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cdk" = ( /obj/effect/landmark{ name = "blobstart" @@ -60305,9 +58379,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cdl" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, @@ -60513,9 +58585,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/crew_quarters/captain{ - name = "\improper Captain's Quarters" - }) +/area/crew_quarters/captain/captains_quarters) "cdJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -61134,9 +59204,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ceP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -61146,9 +59214,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ceQ" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -61312,21 +59378,15 @@ /area/tcommsat/server) "cfi" = ( /turf/closed/wall/r_wall, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfj" = ( /obj/machinery/shieldwallgen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfk" = ( /turf/closed/wall, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfl" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -61349,9 +59409,7 @@ /turf/open/floor/plasteel/blue/side{ dir = 9 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfm" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -61365,9 +59423,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfn" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -61383,24 +59439,18 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfp" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/blue/corner{ dir = 4 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cfq" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -61631,9 +59681,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "cfM" = ( /obj/structure/table/reinforced, /obj/item/weapon/aiModule/reset, @@ -61850,18 +59898,14 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cgi" = ( /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cgj" = ( /obj/structure/rack, /obj/item/weapon/crowbar/red, @@ -61870,9 +59914,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cgk" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -61881,15 +59923,11 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cgl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cgm" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -62009,9 +60047,7 @@ "cgz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cgA" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -62028,9 +60064,7 @@ icon_state = "plating_warn_side"; dir = 8 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cgB" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -62529,9 +60563,7 @@ /obj/machinery/shieldgen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chD" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -62542,9 +60574,7 @@ pixel_x = -1 }, /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62553,9 +60583,7 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chF" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -62565,18 +60593,14 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -62585,9 +60609,7 @@ icon_state = "1-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -62597,9 +60619,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62610,9 +60630,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -62624,9 +60642,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -62647,9 +60663,7 @@ icon_state = "1-8" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "chM" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -62803,14 +60817,10 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/loadingarea, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cie" = ( /turf/open/floor/plasteel/loadingarea, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cif" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -62820,9 +60830,7 @@ pixel_y = 32 }, /turf/open/floor/plasteel/bot, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cig" = ( /obj/structure/table, /obj/item/weapon/hand_tele, @@ -62842,9 +60850,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/bot, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cih" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -62855,9 +60861,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/bot, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cii" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -62866,9 +60870,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/delivery, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cij" = ( /obj/machinery/button/door{ id = "teleporterhubshutters"; @@ -62884,9 +60886,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cik" = ( /obj/machinery/teleport/hub, /obj/structure/disposalpipe/segment{ @@ -62895,9 +60895,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cil" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ @@ -62908,9 +60906,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cim" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -63323,9 +61319,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "ciR" = ( /obj/structure/cable/white, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -63414,9 +61408,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "ciX" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -63498,9 +61490,7 @@ /area/engine/engineering) "cjf" = ( /turf/closed/wall/r_wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cjg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -63511,9 +61501,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cjh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -63526,9 +61514,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cji" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -63759,9 +61745,7 @@ /obj/item/weapon/wrench, /obj/item/weapon/crowbar, /turf/open/floor/plasteel/bot, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHEAST)"; @@ -63769,17 +61753,13 @@ dir = 6 }, /turf/open/floor/plasteel/neutral, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjK" = ( /obj/machinery/holopad, /obj/structure/cable/white{ @@ -63794,9 +61774,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/bot, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjL" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -63811,9 +61789,7 @@ icon_state = "pipe-j2" }, /turf/open/floor/plasteel/neutral, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjM" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -63833,9 +61809,7 @@ icon_state = "pipe-j2" }, /turf/open/floor/plasteel/neutral, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjN" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -63849,9 +61823,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjO" = ( /obj/machinery/teleport/station, /obj/machinery/status_display{ @@ -63860,9 +61832,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cjP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -64282,15 +62252,11 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ckI" = ( /obj/machinery/shieldwallgen, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ckJ" = ( /obj/structure/tank_dispenser, /obj/effect/decal/cleanable/dirt, @@ -64301,16 +62267,12 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ckK" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ckL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -64321,9 +62283,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ckM" = ( /obj/machinery/power/apc{ dir = 8; @@ -64525,9 +62485,7 @@ pixel_y = -26 }, /turf/open/floor/plasteel/bot, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cli" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -64535,9 +62493,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "clj" = ( /obj/machinery/light_switch{ pixel_x = -7; @@ -64553,14 +62509,10 @@ name = "command camera" }, /turf/open/floor/plasteel/warning/corner, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "clk" = ( /turf/open/floor/plasteel/warning, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cll" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -64568,9 +62520,7 @@ dir = 8 }, /turf/open/floor/plasteel/warning, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "clm" = ( /obj/machinery/light, /obj/machinery/airalarm{ @@ -64586,9 +62536,7 @@ /turf/open/floor/plasteel/warning/corner{ dir = 1 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cln" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -64598,17 +62546,13 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "clo" = ( /obj/machinery/computer/teleporter, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "clp" = ( /obj/structure/table, /obj/machinery/status_display{ @@ -64979,27 +62923,19 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cme" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cmf" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cmg" = ( /obj/structure/sign/securearea, /turf/closed/wall/r_wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cmh" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -65007,9 +62943,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cmi" = ( /obj/machinery/light{ dir = 8 @@ -65146,9 +63080,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cmy" = ( /obj/machinery/button/door{ id = "teleportershutters"; @@ -65166,9 +63098,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cmz" = ( /obj/machinery/door/poddoor/shutters{ id = "teleportershutters"; @@ -65180,23 +63110,17 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cmA" = ( /obj/structure/cable/white, /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cmB" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, -/area/teleporter{ - name = "\improper Teleporter Room" - }) +/area/teleporter) "cmC" = ( /obj/structure/table, /obj/machinery/airalarm{ @@ -65392,9 +63316,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "cna" = ( /obj/structure/window/reinforced{ dir = 1; @@ -65404,9 +63326,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "cnb" = ( /obj/structure/window/reinforced{ dir = 1; @@ -65416,9 +63336,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "cnc" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -65429,9 +63347,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "cnd" = ( /obj/item/weapon/wrench, /turf/open/floor/plating, @@ -65640,9 +63556,7 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cny" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ @@ -65656,9 +63570,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cnz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -65667,9 +63579,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cnA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -65677,9 +63587,7 @@ /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cnB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/highsecurity{ @@ -65690,18 +63598,14 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cnC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cnD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -65716,9 +63620,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cnE" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -66323,17 +64225,13 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "coG" = ( /obj/structure/chair, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "coH" = ( /obj/structure/window/reinforced{ dir = 4; @@ -66347,9 +64245,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "coI" = ( /turf/open/floor/plating/warnplate{ dir = 10 @@ -66510,20 +64406,14 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cpc" = ( /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cpd" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cpe" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -66535,17 +64425,13 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cpf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cpg" = ( /obj/structure/bookcase/random/nonfiction, /turf/open/floor/wood, @@ -67213,16 +65099,12 @@ /area/maintenance/starboard) "cqe" = ( /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cqf" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cqg" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -67234,9 +65116,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "cqh" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -67252,9 +65132,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "cqi" = ( /obj/structure/cable{ d1 = 1; @@ -67385,9 +65263,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cqx" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal{ @@ -67400,9 +65276,7 @@ /obj/item/weapon/electronics/airlock, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cqy" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ @@ -67413,9 +65287,7 @@ /obj/item/weapon/electronics/firelock, /obj/item/weapon/stock_parts/console_screen, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cqz" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, @@ -67424,18 +65296,14 @@ /obj/item/weapon/stock_parts/cell/high, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cqA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cqB" = ( /obj/machinery/door/airlock/glass{ name = "Library Game Room" @@ -67928,25 +65796,19 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cry" = ( /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "crz" = ( /obj/structure/table, /obj/item/stack/sheet/cloth/ten, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "crA" = ( /obj/machinery/light{ dir = 1 @@ -67963,9 +65825,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "crB" = ( /obj/structure/table, /obj/item/weapon/paper_bin, @@ -67973,24 +65833,18 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "crC" = ( /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "crD" = ( /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "crE" = ( /obj/structure/closet/masks, /obj/structure/sign/nanotrasen{ @@ -68000,9 +65854,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "crF" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, @@ -68043,9 +65895,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "crK" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -68622,9 +66472,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "csO" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -68641,9 +66489,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "csP" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -68654,14 +66500,10 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "csQ" = ( /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "csR" = ( /obj/structure/closet/athletic_mixed, /obj/machinery/light/small{ @@ -68670,9 +66512,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "csS" = ( /obj/machinery/field/generator{ anchored = 1; @@ -68864,9 +66704,7 @@ icon_state = "2-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cti" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -68874,9 +66712,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ctj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -68887,18 +66723,14 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ctk" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ctl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -68908,9 +66740,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ctm" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -68918,9 +66748,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "ctn" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -68938,9 +66766,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cto" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, @@ -69618,9 +67444,7 @@ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -69629,9 +67453,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuB" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -69644,18 +67466,14 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/weightlifter, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -69664,9 +67482,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuE" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (NORTH)"; @@ -69675,17 +67491,13 @@ }, /obj/structure/stacklifter, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -69695,17 +67507,13 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuH" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cuI" = ( /obj/machinery/power/grounding_rod, /turf/open/floor/plating/warnplate/corner{ @@ -69839,9 +67647,7 @@ "cuT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cuU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -69853,9 +67659,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cuV" = ( /obj/machinery/light{ dir = 8 @@ -70335,9 +68139,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvR" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -70349,9 +68151,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -70362,9 +68162,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -70372,9 +68170,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -70383,9 +68179,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -70394,9 +68188,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -70404,17 +68196,13 @@ dir = 10 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cvY" = ( /obj/structure/lattice, /obj/machinery/camera/emp_proof{ @@ -70588,18 +68376,14 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cwo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/mechanical, /obj/item/device/flashlight, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cwp" = ( /obj/structure/table/reinforced, /obj/item/weapon/tank/internals/emergency_oxygen{ @@ -70615,9 +68399,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cwq" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, @@ -70628,9 +68410,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cwr" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -70641,9 +68421,7 @@ }, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cws" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -71403,9 +69181,7 @@ /obj/machinery/vending/coffee, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cxD" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -71414,9 +69190,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cxE" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -71426,16 +69200,12 @@ dir = 8; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cxF" = ( /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cxG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; @@ -71445,15 +69215,11 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cxH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cxI" = ( /obj/structure/chair{ dir = 4 @@ -71465,9 +69231,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cxJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -71575,29 +69339,21 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cxU" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cxV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/yellow/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cxW" = ( /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cxX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -71608,9 +69364,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cxY" = ( /obj/structure/table/wood, /obj/item/weapon/newspaper{ @@ -71694,9 +69448,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cyg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -71708,24 +69460,18 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cyh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cyi" = ( /obj/machinery/space_heater, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cyj" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -72281,26 +70027,18 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "czb" = ( /obj/structure/stacklifter, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "czc" = ( /turf/open/floor/plasteel/neutral/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "czd" = ( /obj/structure/weightlifter, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cze" = ( /obj/structure/chair{ dir = 4 @@ -72312,9 +70050,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "czf" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -72324,9 +70060,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "czg" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -72334,18 +70068,14 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "czh" = ( /obj/machinery/status_display, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "czi" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -72355,9 +70085,7 @@ dir = 10 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "czj" = ( /turf/open/floor/plating/warnplate{ dir = 1 @@ -72531,9 +70259,7 @@ pixel_x = -26 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -72546,9 +70272,7 @@ on = 1 }, /turf/open/floor/plasteel/yellow, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czz" = ( /obj/effect/landmark{ name = "blobstart" @@ -72557,17 +70281,13 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czB" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -72578,9 +70298,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czC" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -72592,9 +70310,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czD" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -72712,23 +70428,17 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ name = "blobstart" }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czO" = ( /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -72740,9 +70450,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "czQ" = ( /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, @@ -73348,9 +71056,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cAQ" = ( /obj/structure/chair{ dir = 4 @@ -73359,17 +71065,13 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cAR" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cAS" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -73581,42 +71283,30 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cBl" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cBm" = ( /turf/open/floor/plasteel/yellow/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cBn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/caution, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cBo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cBp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cBq" = ( /obj/item/weapon/clipboard, /obj/item/weapon/folder/yellow, @@ -74076,15 +71766,11 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cCl" = ( /obj/structure/chair, /turf/open/floor/plasteel/neutral/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cCm" = ( /obj/structure/grille, /turf/open/floor/plating/warnplate{ @@ -74301,9 +71987,7 @@ /obj/item/stack/packageWrap, /obj/item/weapon/hand_labeler, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCG" = ( /obj/structure/table/reinforced, /obj/item/stack/rods{ @@ -74316,9 +72000,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCH" = ( /obj/structure/rack, /obj/item/weapon/book/manual/wiki/engineering_hacking{ @@ -74333,18 +72015,14 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCI" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -74359,26 +72037,20 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCK" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -74388,9 +72060,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -74399,9 +72069,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/sortjunction{ @@ -74411,18 +72079,14 @@ sortType = 16 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCQ" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -74431,18 +72095,14 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCR" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cCS" = ( /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; @@ -74603,9 +72263,7 @@ /area/gateway) "cDe" = ( /turf/closed/wall, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cDf" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -74615,22 +72273,16 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cDg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cDh" = ( /obj/structure/mopbucket, /obj/item/weapon/mop, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cDi" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/cigarette, @@ -74759,9 +72411,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cDt" = ( /obj/structure/window/reinforced{ dir = 1; @@ -74771,18 +72421,14 @@ dir = 8 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cDu" = ( /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cDv" = ( /obj/structure/window/reinforced{ dir = 1; @@ -74794,15 +72440,11 @@ req_access_txt = "0" }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cDw" = ( /obj/machinery/status_display, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cDx" = ( /obj/structure/closet/emcloset{ anchored = 1 @@ -74812,9 +72454,7 @@ dir = 1 }, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cDy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps{ @@ -74857,21 +72497,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cDC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cDD" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cDE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -74882,17 +72516,13 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cDF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cDG" = ( /obj/effect/landmark{ name = "lightsout" @@ -75122,20 +72752,14 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cEd" = ( /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cEe" = ( /obj/structure/girder, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cEf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, @@ -75166,9 +72790,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cEi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -75179,26 +72801,20 @@ icon_state = "bluecorner"; dir = 1 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cEj" = ( /obj/structure/table, /obj/item/weapon/storage/box/bodybags, /obj/item/weapon/pen, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cEk" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/weapon/storage/firstaid/regular, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cEl" = ( /obj/machinery/washing_machine, /obj/machinery/camera{ @@ -75373,9 +72989,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEy" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -75388,17 +73002,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEz" = ( /obj/structure/window/reinforced{ dir = 8 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEA" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -75407,9 +73017,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEB" = ( /obj/structure/window/reinforced{ dir = 4 @@ -75418,15 +73026,11 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEC" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cED" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -75435,9 +73039,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEE" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck Access" @@ -75446,9 +73048,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEF" = ( /obj/machinery/light, /obj/structure/extinguisher_cabinet{ @@ -75459,9 +73059,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEG" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck Access" @@ -75472,9 +73070,7 @@ dir = 9 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cEH" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck Access" @@ -75485,18 +73081,14 @@ dir = 5 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cEI" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cEJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -75505,9 +73097,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cEK" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8; @@ -75522,16 +73112,12 @@ dir = 1; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cEL" = ( /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cEM" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; @@ -75539,17 +73125,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEN" = ( /turf/open/floor/plasteel/neutral/side{ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEO" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -75560,9 +73142,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -75580,9 +73160,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -75596,9 +73174,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cER" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -75610,9 +73186,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cES" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -75623,9 +73197,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cET" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75641,9 +73213,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75656,9 +73226,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75671,9 +73239,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEW" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -75685,9 +73251,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75703,9 +73267,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEY" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -75720,9 +73282,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cEZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75739,9 +73299,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75761,9 +73319,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75788,9 +73344,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFc" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -75803,9 +73357,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75819,9 +73371,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75838,9 +73388,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75858,9 +73406,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75876,9 +73422,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFh" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -75895,9 +73439,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75913,9 +73455,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFj" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -75930,9 +73470,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFk" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -75946,9 +73484,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75965,9 +73501,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -75978,9 +73512,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFn" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -75990,9 +73522,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -76003,9 +73533,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFp" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -76018,9 +73546,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -76033,9 +73559,7 @@ dir = 10; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFr" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -76048,9 +73572,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFs" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -76062,9 +73584,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFt" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -76082,9 +73602,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFu" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -76099,9 +73617,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFv" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -76116,9 +73632,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cFw" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -76321,9 +73835,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFK" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -76336,9 +73848,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -76352,9 +73862,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76364,9 +73872,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFN" = ( /obj/structure/girder, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76376,9 +73882,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -76389,9 +73893,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -76411,9 +73913,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -76427,9 +73927,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -76443,9 +73941,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -76464,9 +73960,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFT" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -76482,9 +73976,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ @@ -76494,9 +73986,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76509,9 +73999,7 @@ /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/dropper, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cFW" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -76601,9 +74089,7 @@ name = "recreation camera" }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cGi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -76613,40 +74099,30 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/bot, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cGj" = ( /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cGk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cGl" = ( /obj/structure/sign/nosmoking_2, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cGm" = ( /obj/machinery/computer/holodeck, /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cGn" = ( /obj/structure/chair/office/light{ dir = 8 @@ -76655,9 +74131,7 @@ name = "Assistant" }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cGo" = ( /obj/structure/table/reinforced, /obj/item/weapon/paper_bin, @@ -76665,9 +74139,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cGp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76678,9 +74150,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -76688,9 +74158,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -76698,9 +74166,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76709,9 +74175,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGt" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -76719,9 +74183,7 @@ dir = 1 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -76731,9 +74193,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -76743,9 +74203,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76754,9 +74212,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -76769,9 +74225,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -76781,9 +74235,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGz" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -76794,9 +74246,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -76810,9 +74260,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -76824,9 +74272,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGC" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -76840,9 +74286,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -76851,9 +74295,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -76862,9 +74304,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGF" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -76878,9 +74318,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -76896,25 +74334,19 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -76925,9 +74357,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (NORTH)"; @@ -76935,17 +74365,13 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cGO" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -77103,17 +74529,13 @@ dir = 4 }, /turf/closed/wall, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHe" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -77123,9 +74545,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -77137,9 +74557,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHg" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -77152,9 +74570,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHh" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -77162,9 +74578,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHi" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -77174,17 +74588,13 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cHk" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -77200,9 +74610,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -77210,9 +74618,7 @@ dir = 10 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -77222,9 +74628,7 @@ /turf/open/floor/plasteel/blue/corner{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cHn" = ( /obj/machinery/washing_machine, /turf/open/floor/plasteel/arrival{ @@ -77395,9 +74799,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cHB" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -77412,9 +74814,7 @@ icon_state = "pipe-j2" }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cHC" = ( /obj/structure/window/reinforced{ dir = 8 @@ -77423,9 +74823,7 @@ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cHD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -77435,9 +74833,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cHE" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/blue, @@ -77446,15 +74842,11 @@ dir = 8; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cHF" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/bot, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cHG" = ( /obj/structure/table/reinforced, /obj/item/weapon/clipboard, @@ -77467,26 +74859,20 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cHH" = ( /obj/machinery/shieldgen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cHI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cHJ" = ( /turf/closed/wall, /area/maintenance/electrical) @@ -77536,18 +74922,14 @@ }, /mob/living/simple_animal/cockroach, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cHQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8; on = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cHR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -77560,9 +74942,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cHS" = ( /turf/closed/wall/r_wall, /area/toxins/xenobiology) @@ -77654,16 +75034,12 @@ /obj/item/device/flashlight, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cId" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cIe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -77673,9 +75049,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cIf" = ( /obj/machinery/light, /obj/structure/closet/emcloset, @@ -77696,17 +75070,13 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cIj" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cIk" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -77715,15 +75085,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cIl" = ( /obj/machinery/status_display, /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cIm" = ( /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side{ @@ -77731,9 +75097,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cIn" = ( /obj/structure/sign/directions/evac{ pixel_y = -8 @@ -77746,9 +75110,7 @@ pixel_y = 8 }, /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cIo" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -77798,16 +75160,12 @@ pixel_y = 8 }, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cIs" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cIt" = ( /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side{ @@ -77815,15 +75173,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cIu" = ( /obj/machinery/status_display, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cIv" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -77832,15 +75186,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cIw" = ( /obj/structure/sign/bluecross_2, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cIx" = ( /obj/machinery/disposal/bin, /turf/open/floor/plasteel/delivery, @@ -77860,41 +75210,29 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cIB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cIC" = ( /obj/structure/grille, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cID" = ( /turf/closed/wall/r_wall, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cIE" = ( /obj/machinery/vending/medical, /turf/open/floor/plasteel/neutral/corner, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cIF" = ( /obj/structure/closet/secure_closet/medical3, /obj/machinery/newscaster{ pixel_y = 32 }, /turf/open/floor/plasteel/neutral/side, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cIG" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/device/radio/intercom{ @@ -77903,9 +75241,7 @@ pixel_y = 26 }, /turf/open/floor/plasteel/neutral/side, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cIH" = ( /obj/structure/closet/wardrobe/white/medical, /obj/structure/extinguisher_cabinet{ @@ -77913,16 +75249,12 @@ }, /obj/item/weapon/storage/backpack/satchel/med, /turf/open/floor/plasteel/neutral/side, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cII" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel/bot, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cIJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -77936,9 +75268,7 @@ icon_state = "bluecorner"; dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cIK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -77948,9 +75278,7 @@ on = 1 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cIL" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -77958,9 +75286,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cIM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -77987,9 +75313,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIQ" = ( /obj/structure/window/reinforced, /obj/machinery/door/window{ @@ -77998,24 +75322,18 @@ req_access_txt = "0" }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIR" = ( /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIS" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIT" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -78023,9 +75341,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/corner, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIU" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck Access" @@ -78034,9 +75350,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIV" = ( /obj/machinery/light{ dir = 1 @@ -78045,9 +75359,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIW" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck Access" @@ -78058,9 +75370,7 @@ dir = 10 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cIX" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck Access" @@ -78071,9 +75381,7 @@ dir = 6 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cIY" = ( /obj/machinery/light{ dir = 1 @@ -78085,17 +75393,13 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cIZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cJa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -78103,23 +75407,17 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/neutral/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cJb" = ( /turf/open/floor/plasteel/neutral/side{ dir = 6 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cJc" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJd" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -78128,9 +75426,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -78142,9 +75438,7 @@ tag = "icon-warning (EAST)"; dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -78153,9 +75447,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -78166,9 +75458,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJh" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/structure/sign/poster{ @@ -78309,9 +75599,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJw" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -78320,9 +75608,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -78334,9 +75620,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJy" = ( /obj/structure/rack, /obj/item/weapon/book/manual/wiki/engineering_guide, @@ -78345,26 +75629,20 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -78377,9 +75655,7 @@ dir = 9 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cJC" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -78473,15 +75749,11 @@ /area/toxins/xenobiology) "cJL" = ( /turf/closed/wall/r_wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cJN" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -78497,15 +75769,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cJO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cJP" = ( /turf/closed/wall/r_wall, /area/security/checkpoint/science{ @@ -78526,9 +75794,7 @@ icon_state = "whitepurplecorner"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJR" = ( /obj/structure/chair, /obj/structure/disposalpipe/segment, @@ -78537,9 +75803,7 @@ icon_state = "whitepurplecorner"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJS" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner{ @@ -78547,9 +75811,7 @@ icon_state = "whitepurplecorner"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJT" = ( /obj/structure/chair, /obj/effect/landmark/start{ @@ -78560,9 +75822,7 @@ icon_state = "whitepurplecorner"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJU" = ( /obj/structure/table, /obj/item/weapon/folder/white, @@ -78572,9 +75832,7 @@ icon_state = "whitepurplecorner"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJV" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-18" @@ -78587,9 +75845,7 @@ icon_state = "whitepurple"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJW" = ( /obj/structure/table, /obj/item/stack/cable_coil/white, @@ -78601,17 +75857,13 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJX" = ( /obj/structure/chair, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJY" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -78621,16 +75873,12 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cJZ" = ( /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cKa" = ( /obj/structure/chair, /obj/effect/landmark/start{ @@ -78639,9 +75887,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cKb" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -78649,15 +75895,11 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cKc" = ( /obj/structure/sign/science, /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cKd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -78680,9 +75922,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKh" = ( /obj/structure/chair, /obj/effect/landmark/start{ @@ -78691,24 +75931,18 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKi" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKj" = ( /obj/structure/chair, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKk" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ @@ -78719,9 +75953,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKl" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-18" @@ -78732,9 +75964,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKm" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -78743,9 +75973,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKn" = ( /obj/structure/chair, /obj/effect/landmark/start{ @@ -78754,32 +75982,24 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKo" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKp" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKq" = ( /obj/structure/chair, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKr" = ( /obj/structure/table, /obj/item/weapon/storage/firstaid/regular, @@ -78791,14 +76011,10 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKs" = ( /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cKt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -78807,29 +76023,21 @@ dir = 10; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/reagent_containers/glass/bucket, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKv" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKx" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -78849,9 +76057,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cKy" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -78871,9 +76077,7 @@ icon_state = "whiteblue"; dir = 1 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cKz" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -78887,9 +76091,7 @@ icon_state = "whiteblue"; dir = 1 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cKA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -78906,9 +76108,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cKB" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -78926,9 +76126,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cKC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -78948,9 +76146,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -78963,9 +76159,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKE" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -78977,9 +76171,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKF" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -78995,9 +76187,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/blue/corner, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKG" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -79010,9 +76200,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -79030,9 +76218,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKI" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -79047,9 +76233,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKJ" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -79058,9 +76242,7 @@ dir = 10 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cKK" = ( /obj/structure/dresser, /obj/item/device/radio/intercom{ @@ -79107,16 +76289,12 @@ /obj/machinery/vending/cola, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cKQ" = ( /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cKR" = ( /obj/structure/chair{ dir = 1 @@ -79124,23 +76302,17 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cKS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cKT" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cKU" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, @@ -79151,18 +76323,14 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cKV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cKW" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/machinery/airalarm{ @@ -79310,9 +76478,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cLm" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -79374,17 +76540,13 @@ }, /obj/item/weapon/storage/backpack/satchel/tox, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cLs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cLt" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -79395,9 +76557,7 @@ icon_state = "whitepurple"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cLu" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -79407,9 +76567,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cLv" = ( /turf/closed/wall, /area/security/checkpoint/science{ @@ -79477,74 +76635,54 @@ icon_state = "whitepurplecorner"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLB" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLC" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLD" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/holopad, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLG" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLH" = ( /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLI" = ( /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLJ" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -79553,9 +76691,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cLK" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -79564,31 +76700,21 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cLL" = ( /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cLM" = ( /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cLN" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cLO" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cLP" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -79596,9 +76722,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cLQ" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -79615,27 +76739,21 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cLR" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cLS" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cLT" = ( /turf/closed/wall, /area/security/checkpoint/medical) @@ -79644,9 +76762,7 @@ /area/security/checkpoint/medical) "cLV" = ( /turf/closed/wall, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cLW" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -79659,23 +76775,17 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cLX" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cLY" = ( /turf/open/floor/plasteel/cmo, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cLZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHEAST)"; @@ -79683,18 +76793,14 @@ dir = 6 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cMa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cMb" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -79709,9 +76815,7 @@ location = "Medbay" }, /turf/open/floor/plasteel/delivery, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cMc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -79720,9 +76824,7 @@ dir = 9 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cMd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -79730,18 +76832,14 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cMe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cMf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -79750,9 +76848,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue/corner, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cMg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -79760,9 +76856,7 @@ }, /obj/machinery/space_heater, /turf/open/floor/plasteel/blue, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cMh" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -79777,16 +76871,12 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cMi" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cMj" = ( /obj/structure/bed, /obj/item/weapon/bedsheet/clown, @@ -79832,32 +76922,24 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cMo" = ( /obj/structure/chair{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cMp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cMq" = ( /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cMr" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ tag = "icon-intact (NORTHEAST)"; @@ -79984,18 +77066,14 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cMH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cMI" = ( /turf/open/floor/plasteel/vault{ tag = "icon-vault (NORTHEAST)"; @@ -80267,17 +77345,13 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cNc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cNd" = ( /obj/structure/cable/white{ d2 = 2; @@ -80327,9 +77401,7 @@ icon_state = "whitepurplecorner"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; @@ -80342,9 +77414,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHEAST)"; @@ -80356,17 +77426,13 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNl" = ( /obj/effect/landmark{ name = "lightsout" @@ -80375,18 +77441,14 @@ dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNn" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -80395,17 +77457,13 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80413,18 +77471,14 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNq" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cNr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80452,9 +77506,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80462,25 +77514,19 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80492,9 +77538,7 @@ scrub_Toxins = 1 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -80503,9 +77547,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -80513,9 +77555,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -80527,17 +77567,13 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cNC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cND" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -80547,9 +77583,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cNE" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -80631,9 +77665,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cNI" = ( /obj/structure/table, /obj/item/weapon/storage/box/gloves{ @@ -80649,9 +77681,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cNJ" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -80664,16 +77694,12 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cNK" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cNL" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/fire{ @@ -80692,23 +77718,17 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cNM" = ( /obj/effect/landmark/start{ name = "Medical Doctor" }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cNN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/cmo, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cNO" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/toxin{ @@ -80737,15 +77757,11 @@ dir = 8; heat_capacity = 1e+006 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cNP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cNQ" = ( /obj/machinery/door/airlock{ name = "Medbay Auxiliary Storage"; @@ -80760,9 +77776,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cNR" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -80771,9 +77785,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cNS" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, @@ -80799,39 +77811,29 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cNW" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cNX" = ( /obj/structure/table, /obj/item/weapon/folder, /obj/item/weapon/razor, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cNY" = ( /obj/structure/table, /obj/item/clothing/under/sl_suit{ name = "referee suit" }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cNZ" = ( /obj/structure/table, /obj/item/weapon/storage/briefcase, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cOa" = ( /obj/machinery/camera{ c_tag = "Holodeck - Aft"; @@ -80853,18 +77855,14 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cOc" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cOd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -80872,9 +77870,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cOe" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -80957,9 +77953,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cOr" = ( /obj/effect/decal/remains/xeno, /obj/effect/decal/cleanable/xenoblood, @@ -81181,9 +78175,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cOP" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -81193,9 +78185,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cOQ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -81208,9 +78198,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cOR" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -81299,9 +78287,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cOX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (SOUTHEAST)"; @@ -81310,17 +78296,13 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cOY" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cOZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -81330,9 +78312,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cPa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81340,9 +78320,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cPb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81351,9 +78329,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cPc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81366,34 +78342,26 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cPd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cPe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cPf" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cPg" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -81433,9 +78401,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81446,9 +78412,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81457,9 +78421,7 @@ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81468,18 +78430,14 @@ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPn" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81489,17 +78447,13 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPq" = ( /obj/effect/landmark{ name = "lightsout" @@ -81508,9 +78462,7 @@ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81524,9 +78476,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81535,9 +78485,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPt" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -81552,9 +78500,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cPu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -81567,9 +78513,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPv" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -81580,9 +78524,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPw" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -81592,9 +78534,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPx" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -81651,9 +78591,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPD" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/brute{ @@ -81672,18 +78610,14 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cPE" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cPF" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/o2{ @@ -81710,9 +78644,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cPG" = ( /obj/structure/toilet{ dir = 4 @@ -81735,9 +78667,7 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPH" = ( /obj/machinery/door/airlock{ name = "Bathroom" @@ -81748,9 +78678,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPI" = ( /obj/structure/urinal{ pixel_y = 28 @@ -81760,9 +78688,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPJ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -81771,9 +78697,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPK" = ( /obj/structure/mirror{ pixel_x = 26 @@ -81796,9 +78720,7 @@ name = "blobstart" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cPL" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -81807,9 +78729,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cPM" = ( /obj/structure/table/wood, /obj/item/weapon/folder, @@ -81890,31 +78810,23 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cPT" = ( /obj/structure/table, /obj/item/toy/cards/deck, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cPU" = ( /obj/structure/table, /obj/item/weapon/storage/firstaid/regular, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cPV" = ( /obj/structure/table, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cPW" = ( /obj/structure/chair{ dir = 4 @@ -81927,9 +78839,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/corner, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cPX" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -81939,9 +78849,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cPY" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -81949,18 +78857,14 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cPZ" = ( /obj/machinery/status_display, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cQa" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -81970,9 +78874,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/space) "cQb" = ( /obj/structure/rack, /obj/item/clothing/suit/fire/firefighter, @@ -81983,9 +78885,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cQc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -81993,9 +78893,7 @@ on = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cQd" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -82003,9 +78901,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cQe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 @@ -82121,9 +79017,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cQs" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -82334,9 +79228,7 @@ on = 1 }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cQL" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -82346,9 +79238,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cQM" = ( /obj/structure/cable/white, /obj/structure/grille, @@ -82406,31 +79296,23 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cQS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cQT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cQU" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cQV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/junction{ @@ -82448,9 +79330,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cQX" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -82463,9 +79343,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cQY" = ( /obj/structure/disposalpipe/segment{ tag = "icon-pipe-s (EAST)"; @@ -82473,43 +79351,33 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cQZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cRa" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cRb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cRc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cRd" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -82562,9 +79430,7 @@ "cRi" = ( /obj/machinery/newscaster, /turf/closed/wall, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cRj" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/beakers{ @@ -82579,32 +79445,24 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cRk" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cRl" = ( /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cRm" = ( /obj/machinery/light_switch{ pixel_x = 26; pixel_y = -38 }, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cRn" = ( /obj/structure/table/glass, /obj/item/weapon/storage/belt/medical, @@ -82626,9 +79484,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cRo" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -82641,9 +79497,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cRp" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -82655,16 +79509,12 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cRq" = ( /obj/structure/girder, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cRr" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -82674,9 +79524,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cRs" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -82689,9 +79537,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cRt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; @@ -82700,27 +79546,21 @@ scrub_Toxins = 1 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cRu" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; on = 1 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cRv" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cRw" = ( /obj/machinery/atmospherics/components/binary/valve{ tag = "icon-mvalve_map (NORTH)"; @@ -82816,9 +79656,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cRJ" = ( /obj/machinery/camera{ c_tag = "Xenobiology - Secure Cell"; @@ -83050,9 +79888,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cSb" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -83141,27 +79977,21 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSh" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -83169,9 +79999,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSi" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -83186,9 +80014,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSj" = ( /obj/structure/table, /obj/item/device/gps, @@ -83197,47 +80023,35 @@ pixel_y = -32 }, /turf/open/floor/plasteel/whitepurple/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSk" = ( /obj/structure/table, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSl" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSm" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSn" = ( /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSo" = ( /obj/machinery/autolathe, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSp" = ( /obj/structure/table, /obj/item/stack/sheet/metal{ @@ -83249,9 +80063,7 @@ /obj/item/stack/packageWrap, /obj/machinery/light, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research/research_lobby) "cSq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -83265,34 +80077,26 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSs" = ( /obj/structure/table, /obj/item/weapon/folder/white, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSt" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, /turf/open/floor/plasteel/bot, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSu" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSv" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -83302,23 +80106,17 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSw" = ( /obj/structure/bed/roller, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSx" = ( /obj/structure/bed/roller, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSy" = ( /obj/structure/bed/roller, /obj/structure/sign/chemistry{ @@ -83331,36 +80129,26 @@ name = "medbay camera" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSz" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSA" = ( /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSB" = ( /obj/structure/table, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/lobby) "cSC" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSD" = ( /obj/structure/cable/white, /obj/structure/grille, @@ -83413,9 +80201,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSJ" = ( /obj/structure/sign/bluecross_2{ pixel_x = 32 @@ -83428,9 +80214,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -83452,9 +80236,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cSL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -83466,9 +80248,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay2{ - name = "Medbay Storage" - }) +/area/medical/medbay2/medbay_storage) "cSM" = ( /obj/structure/table/wood, /obj/machinery/microwave{ @@ -83479,9 +80259,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSN" = ( /obj/structure/table/wood, /obj/item/weapon/storage/box/donkpockets, @@ -83489,9 +80267,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSO" = ( /obj/machinery/camera{ c_tag = "Medbay - Break Room"; @@ -83501,9 +80277,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -83513,18 +80287,14 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSQ" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/open/floor/plasteel/bot, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cSR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -83532,17 +80302,13 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cSS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cST" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83552,9 +80318,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cSU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -83563,9 +80327,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cSV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ @@ -83575,9 +80337,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cSW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -83592,9 +80352,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cSX" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -83602,9 +80360,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cSY" = ( /obj/structure/closet/crate, /obj/item/weapon/storage/box/donkpockets, @@ -83616,9 +80372,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cSZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -83630,9 +80384,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cTa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -83641,57 +80393,43 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cTb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cTc" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cTd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cTe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cTf" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cTg" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cTh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (NORTHWEST)"; @@ -83699,9 +80437,7 @@ dir = 9 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cTi" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -83992,9 +80728,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cTO" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -84055,15 +80789,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cTS" = ( /obj/structure/sign/science, /turf/closed/wall/r_wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cTT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -84077,15 +80807,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cTU" = ( /obj/structure/sign/securearea, /turf/closed/wall/r_wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cTV" = ( /obj/structure/sign/science, /turf/closed/wall, @@ -84166,9 +80892,7 @@ name = "Chemisty Lobby Shutters" }, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/chemistry) "cUf" = ( /obj/machinery/smartfridge/chemistry, /turf/closed/wall, @@ -84189,9 +80913,7 @@ /obj/item/weapon/folder/yellow, /obj/machinery/door/window/northleft, /turf/open/floor/plasteel/delivery, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/chemistry) "cUh" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -84201,18 +80923,14 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/chemistry) "cUi" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/item/weapon/folder/white, /obj/item/weapon/reagent_containers/hypospray/medipen, /turf/open/floor/plasteel/delivery, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cUj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -84222,17 +80940,13 @@ /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, /obj/item/weapon/reagent_containers/syringe, /turf/open/floor/plasteel/delivery, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cUk" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/item/weapon/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel/delivery, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cUl" = ( /obj/machinery/airalarm{ dir = 4; @@ -84248,9 +80962,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ @@ -84261,9 +80973,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUn" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -84341,18 +81051,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUr" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; on = 1 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUs" = ( /obj/structure/table/glass, /obj/item/stack/medical/gauze, @@ -84366,9 +81072,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUt" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -84377,18 +81081,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUu" = ( /turf/open/floor/plasteel/whiteblue/side{ tag = "icon-whiteblue (NORTH)"; icon_state = "whiteblue"; dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUv" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -84397,9 +81097,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUw" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -84412,9 +81110,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUx" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -84422,28 +81118,20 @@ dir = 4 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUy" = ( /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUA" = ( /obj/machinery/vending/coffee, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cUB" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -84459,9 +81147,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUC" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -84479,9 +81165,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUD" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84496,9 +81180,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUE" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84512,9 +81194,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUF" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84528,9 +81208,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUG" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84544,9 +81222,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUH" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84559,9 +81235,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUI" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84576,9 +81250,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUJ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84592,9 +81264,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUK" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84608,9 +81278,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cUL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -84628,9 +81296,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUM" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -84646,9 +81312,7 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUN" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -84660,16 +81324,12 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUO" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUP" = ( /obj/structure/table, /obj/item/clothing/under/suit_jacket/really_black, @@ -84681,9 +81341,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUQ" = ( /obj/structure/table, /obj/item/weapon/clipboard, @@ -84692,9 +81350,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUR" = ( /obj/structure/table, /obj/item/toy/sword, @@ -84703,18 +81359,14 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUS" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (NORTHWEST)"; @@ -84722,16 +81374,12 @@ dir = 9 }, /turf/open/floor/plasteel/neutral/corner, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUU" = ( /turf/open/floor/plasteel/escape{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUV" = ( /obj/structure/table/wood, /obj/item/weapon/storage/crayons, @@ -84741,17 +81389,13 @@ icon_state = "escape"; dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cUW" = ( /obj/structure/mopbucket, /obj/effect/decal/cleanable/dirt, /obj/item/weapon/mop, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cUX" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -84760,9 +81404,7 @@ }, /obj/item/weapon/reagent_containers/glass/bucket, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cUY" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Auxiliary Port"; @@ -85015,9 +81657,7 @@ "cVv" = ( /obj/structure/closet/emcloset, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cVw" = ( /obj/machinery/shower{ dir = 4; @@ -85029,9 +81669,7 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cVx" = ( /obj/machinery/light/small{ dir = 1 @@ -85044,9 +81682,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cVy" = ( /obj/structure/sink{ dir = 4; @@ -85061,15 +81697,11 @@ /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cVz" = ( /obj/structure/closet/firecloset, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cVA" = ( /obj/structure/sign/nosmoking_2, /turf/closed/wall/r_wall, @@ -85266,9 +81898,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cVV" = ( /obj/structure/chair/office/light{ dir = 1 @@ -85276,16 +81906,12 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cVW" = ( /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cVX" = ( /obj/structure/chair/office/light{ dir = 1 @@ -85293,9 +81919,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cVY" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/button/door{ @@ -85309,9 +81933,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cVZ" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -85361,32 +81983,24 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWd" = ( /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWe" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWf" = ( /obj/effect/landmark/start{ name = "Medical Doctor" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWg" = ( /obj/structure/mirror{ pixel_x = 26 @@ -85398,23 +82012,17 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWh" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWj" = ( /obj/machinery/holopad, /obj/effect/landmark/start{ @@ -85426,9 +82034,7 @@ dir = 6 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -85436,9 +82042,7 @@ dir = 4 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWl" = ( /obj/machinery/vending/cola, /obj/machinery/status_display{ @@ -85451,16 +82055,12 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cWm" = ( /obj/structure/girder, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cWn" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -85469,45 +82069,33 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cWo" = ( /turf/closed/wall, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cWp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cWq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cWr" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, /turf/open/floor/plasteel/bot, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cWs" = ( /obj/structure/table, /obj/item/weapon/storage/photo_album, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cWt" = ( /obj/item/weapon/lipstick/random{ pixel_x = 3; @@ -85520,9 +82108,7 @@ /obj/item/weapon/lipstick/random, /obj/structure/table, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cWu" = ( /obj/structure/table, /obj/item/device/camera_film{ @@ -85531,22 +82117,16 @@ }, /obj/item/device/camera_film, /turf/open/floor/plasteel/neutral, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cWv" = ( /turf/open/floor/plasteel/neutral/corner, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cWw" = ( /obj/structure/chair/stool, /turf/open/floor/plasteel/escape{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cWx" = ( /obj/structure/easel, /obj/item/weapon/canvas/twentythreeXtwentythree, @@ -85560,9 +82140,7 @@ icon_state = "escape"; dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cWy" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -85576,9 +82154,7 @@ /turf/open/floor/plasteel/green/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -85592,17 +82168,13 @@ icon_state = "purple"; dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -85613,9 +82185,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWC" = ( /obj/effect/landmark{ name = "blobstart" @@ -85629,9 +82199,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85643,15 +82211,11 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85664,9 +82228,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -85680,9 +82242,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -85701,9 +82261,7 @@ icon_state = "0-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -85715,9 +82273,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85733,9 +82289,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -85750,9 +82304,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -85766,9 +82318,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85784,9 +82334,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWN" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -85794,9 +82342,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cWO" = ( /obj/machinery/light, /turf/open/floor/plasteel/vault{ @@ -86107,9 +82653,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cXn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -86121,16 +82665,12 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cXo" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cXp" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -86140,9 +82680,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cXq" = ( /obj/structure/closet/firecloset, /obj/machinery/camera{ @@ -86152,9 +82690,7 @@ network = list("SS13","RD") }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cXr" = ( /obj/structure/table/reinforced, /obj/item/weapon/stock_parts/matter_bin{ @@ -86296,27 +82832,21 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cXI" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; on = 1 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cXJ" = ( /obj/machinery/holopad, /obj/effect/landmark/start{ name = "Medical Doctor" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cXK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; @@ -86326,9 +82856,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cXL" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -86339,9 +82867,7 @@ req_access_txt = "5" }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cXM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -86351,9 +82877,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXN" = ( /obj/structure/cable/white{ d2 = 2; @@ -86408,17 +82932,13 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXS" = ( /obj/machinery/holopad{ pixel_y = 16 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXT" = ( /obj/machinery/shower{ dir = 8; @@ -86429,9 +82949,7 @@ pixel_x = 26 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXU" = ( /obj/structure/table/wood, /obj/item/weapon/folder/white, @@ -86439,34 +82957,26 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXV" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXW" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 }, /turf/open/floor/plasteel/redblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXX" = ( /obj/machinery/vending/cigarette, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /turf/open/floor/plasteel/neutral/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cXY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -86474,9 +82984,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cXZ" = ( /obj/machinery/airalarm{ dir = 4; @@ -86490,9 +82998,7 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cYa" = ( /obj/structure/mirror{ icon_state = "mirror_broke"; @@ -86502,9 +83008,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cYb" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip{ @@ -86512,9 +83016,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cYc" = ( /obj/structure/table/glass, /obj/item/stack/medical/gauze, @@ -86529,9 +83031,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cYd" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip{ @@ -86541,9 +83041,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cYe" = ( /obj/structure/mirror{ icon_state = "mirror_broke"; @@ -86554,9 +83052,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cYf" = ( /obj/structure/frame/machine, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -86564,36 +83060,26 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cYg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cYh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cYi" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plasteel/delivery, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cYj" = ( /turf/open/floor/plasteel/neutral/corner{ dir = 8; heat_capacity = 1e+006 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cYk" = ( /obj/machinery/light, /obj/machinery/camera{ @@ -86602,18 +83088,14 @@ name = "recreation camera" }, /turf/open/floor/plasteel/neutral/side, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cYl" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/plasteel/neutral/corner, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cYm" = ( /obj/structure/table/wood, /obj/item/stack/packageWrap{ @@ -86624,9 +83106,7 @@ /turf/open/floor/plasteel/escape{ dir = 8 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cYn" = ( /obj/structure/table/wood, /obj/item/device/camera, @@ -86639,9 +83119,7 @@ icon_state = "escape"; dir = 4 }, -/area/crew_quarters/fitness{ - name = "\improper Recreation Area" - }) +/area/crew_quarters/fitness) "cYo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -86651,28 +83129,20 @@ /turf/open/floor/plasteel/green/side{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYr" = ( /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (NORTHEAST)"; @@ -86680,18 +83150,14 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYt" = ( /obj/structure/closet/emcloset, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -86703,26 +83169,20 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -86737,9 +83197,7 @@ icon_state = "1-4" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -86751,9 +83209,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYz" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -86763,9 +83219,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -86776,9 +83230,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYB" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -86793,9 +83245,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYC" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -86805,9 +83255,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cYD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -86870,9 +83318,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cYL" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -86897,9 +83343,7 @@ }, /obj/structure/closet/emcloset, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cYN" = ( /obj/machinery/shower{ dir = 4; @@ -86911,18 +83355,14 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cYO" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cYP" = ( /obj/structure/sink{ dir = 4; @@ -86937,15 +83377,11 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cYQ" = ( /obj/structure/closet/l3closet/scientist, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cYR" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white{ @@ -87082,23 +83518,17 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cZh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cZi" = ( /obj/structure/chair/office/light, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cZj" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -87106,9 +83536,7 @@ }, /obj/machinery/light/small, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "cZk" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -87118,9 +83546,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -87129,9 +83555,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZm" = ( /obj/structure/chair{ dir = 4 @@ -87188,9 +83612,7 @@ icon_state = "plasteel_warn_end"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZr" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -87199,14 +83621,10 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZs" = ( /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZt" = ( /obj/machinery/sleeper{ icon_state = "sleeper-open"; @@ -87217,9 +83635,7 @@ icon_state = "plasteel_warn_end"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZu" = ( /obj/structure/table/wood, /obj/item/weapon/storage/pill_bottle/dice, @@ -87232,37 +83648,27 @@ /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZv" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZx" = ( /turf/open/floor/plasteel/neutral/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZy" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/neutral/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "cZz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -87272,9 +83678,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cZA" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -87282,9 +83686,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "cZB" = ( /obj/structure/sign/examroom{ pixel_x = -32 @@ -87296,47 +83698,33 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cZC" = ( /turf/open/floor/plasteel/blue, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cZD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cZE" = ( /turf/open/floor/plasteel/neutral, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cZF" = ( /obj/item/weapon/crowbar/red, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/blue, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cZG" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cZH" = ( /obj/structure/sign/bluecross_2, /turf/closed/wall, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "cZI" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -87348,9 +83736,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZJ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -87360,9 +83746,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -87371,9 +83755,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -87384,9 +83766,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZM" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ @@ -87401,9 +83781,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZN" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -87414,9 +83792,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZO" = ( /obj/structure/rack, /obj/item/weapon/crowbar/red, @@ -87430,9 +83806,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -87442,9 +83816,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -87454,9 +83826,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "cZR" = ( /obj/structure/sign/xenobio, /turf/closed/wall/r_wall, @@ -87523,9 +83893,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cZW" = ( /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side{ @@ -87533,9 +83901,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cZX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, @@ -87544,15 +83910,11 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cZY" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "cZZ" = ( /obj/structure/table, /obj/item/weapon/storage/box/bodybags{ @@ -87561,9 +83923,7 @@ }, /obj/item/weapon/storage/box/gloves, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "daa" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -87571,9 +83931,7 @@ /obj/item/weapon/wrench, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dab" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -87583,20 +83941,14 @@ pixel_x = 32 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dac" = ( /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dad" = ( /obj/structure/sign/securearea, /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dae" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/white, @@ -87743,24 +84095,18 @@ /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "dap" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/item/weapon/folder/white, /obj/item/weapon/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/delivery, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay/front_office) "daq" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dar" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, @@ -87798,9 +84144,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dau" = ( /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side{ @@ -87808,9 +84152,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dav" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -87819,15 +84161,11 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "daw" = ( /obj/structure/sign/examroom, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dax" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -87839,17 +84177,13 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "day" = ( /obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "daz" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -87862,25 +84196,19 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "daA" = ( /obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "daB" = ( /obj/item/weapon/firstaid_arm_assembly, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "daC" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -87899,9 +84227,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "daD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -87917,9 +84243,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "daE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -87932,17 +84256,13 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "daF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "daG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -87950,9 +84270,7 @@ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "daH" = ( /obj/item/weapon/wrench, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -87964,17 +84282,13 @@ pixel_x = -1 }, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "daI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "daJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -87983,31 +84297,23 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "daK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "daL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "daM" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "daN" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -88018,33 +84324,25 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daP" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daQ" = ( /obj/structure/table/wood, /obj/machinery/cell_charger, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daR" = ( /obj/structure/table/wood, /obj/structure/cable/white{ @@ -88061,9 +84359,7 @@ pixel_y = 25 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daS" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -88081,9 +84377,7 @@ pixel_y = 32 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daT" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -88092,44 +84386,34 @@ pixel_y = 3 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daU" = ( /obj/structure/sign/poster{ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daV" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daX" = ( /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "daY" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -88141,9 +84425,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "daZ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -88155,9 +84437,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dba" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -88171,9 +84451,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dbb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -88186,9 +84464,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dbc" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -88200,9 +84476,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dbd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -88215,9 +84489,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dbe" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -88229,9 +84501,7 @@ dir = 10 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dbf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -88243,9 +84513,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dbg" = ( /obj/machinery/light/small, /obj/machinery/camera{ @@ -88290,16 +84558,12 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbk" = ( /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHEAST)"; @@ -88309,9 +84573,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -88321,9 +84583,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -88341,9 +84601,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -88351,25 +84609,19 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbp" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -88378,9 +84630,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -88390,9 +84640,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -88402,9 +84650,7 @@ icon_state = "whitepurple"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -88418,9 +84664,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -88430,9 +84674,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -88445,18 +84687,14 @@ icon_state = "whitepurple"; dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dbx" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dby" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -88654,9 +84892,7 @@ icon_state = "whiteyellowcorner"; dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -88665,9 +84901,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -88675,9 +84909,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbU" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26; @@ -88687,18 +84919,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -88707,18 +84935,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -88726,9 +84950,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dbZ" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -88740,9 +84962,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dca" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (NORTH)"; @@ -88752,9 +84972,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dcb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -88767,25 +84985,19 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dcc" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dcd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dce" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (NORTH)"; @@ -88795,9 +85007,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dcf" = ( /obj/structure/sign/poster{ icon_state = "poster22_legit"; @@ -88810,25 +85020,19 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dcg" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dch" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dci" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -88837,9 +85041,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dcj" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -88849,9 +85051,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dck" = ( /obj/machinery/shower{ dir = 4; @@ -88865,39 +85065,29 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dcl" = ( /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dcm" = ( /obj/machinery/iv_drip{ density = 0 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dcn" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/item/weapon/surgical_drapes, /turf/open/floor/plasteel/blue, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dco" = ( /obj/structure/frame/computer, /obj/item/weapon/circuitboard/computer/operating, /turf/open/floor/plasteel/neutral, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dcp" = ( /obj/structure/chair{ dir = 8 @@ -88910,39 +85100,29 @@ use_power = 0 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dcq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dcr" = ( /obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dcs" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dct" = ( /obj/machinery/vending/cigarette, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -88954,9 +85134,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -88964,9 +85142,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -88976,9 +85152,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcx" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -88994,9 +85168,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcy" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89010,9 +85182,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcz" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89027,9 +85197,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcA" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -89048,17 +85216,13 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcB" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -89069,9 +85233,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcD" = ( /obj/structure/sign/poster{ pixel_x = 32 @@ -89081,31 +85243,23 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dcE" = ( /turf/closed/wall, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dcF" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/cable/white, /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dcG" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dcH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -89114,9 +85268,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dcI" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, @@ -89129,60 +85281,46 @@ /turf/open/floor/plasteel/whitepurple/side{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcL" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcM" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcN" = ( /obj/item/device/radio/beacon, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcP" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 2; @@ -89194,9 +85332,7 @@ dir = 4 }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -89204,9 +85340,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -89214,16 +85348,12 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcT" = ( /turf/open/floor/plasteel/whitepurple/side{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dcU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -89349,9 +85479,7 @@ /turf/open/floor/plasteel/whiteyellow/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddi" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89359,36 +85487,28 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddj" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddk" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddl" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddm" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89396,9 +85516,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddn" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -89414,9 +85532,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddo" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89424,9 +85540,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddp" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89434,9 +85548,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddq" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -89447,9 +85559,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddr" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89461,9 +85571,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dds" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89471,9 +85579,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddt" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -89484,9 +85590,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddu" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89494,9 +85598,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddv" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89507,9 +85609,7 @@ icon_state = "1-4" }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddw" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89521,9 +85621,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddx" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89531,9 +85629,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddy" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89542,9 +85638,7 @@ /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddz" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89555,9 +85649,7 @@ req_access_txt = "5" }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "ddA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -89566,9 +85658,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "ddB" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -89582,9 +85672,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "ddC" = ( /obj/structure/sink{ dir = 8; @@ -89601,29 +85689,21 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "ddD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "ddE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "ddF" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "ddG" = ( /obj/structure/chair{ dir = 8 @@ -89633,24 +85713,18 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "ddH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "ddI" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/dresser, /turf/open/floor/wood, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "ddJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -89659,9 +85733,7 @@ /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "ddK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -89669,9 +85741,7 @@ /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/grenade/smokebomb, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "ddL" = ( /obj/machinery/vending/assist, /obj/machinery/newscaster{ @@ -89682,24 +85752,18 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddN" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddO" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -89707,9 +85771,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddP" = ( /obj/structure/chair/wood/normal, /obj/effect/decal/cleanable/dirt, @@ -89717,22 +85779,16 @@ /turf/open/floor/wood{ icon_state = "wood-broken7" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddQ" = ( /obj/structure/chair/wood/normal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddR" = ( /obj/structure/chair/wood/normal, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddS" = ( /obj/structure/table/wood/poker, /obj/structure/cable/white{ @@ -89741,18 +85797,14 @@ }, /obj/item/weapon/storage/wallet/random, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddT" = ( /obj/structure/table/wood/poker, /obj/item/weapon/storage/briefcase, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -89765,15 +85817,11 @@ pixel_x = -1 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "ddW" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -89782,18 +85830,14 @@ pixel_y = 3 }, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "ddX" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "ddY" = ( /obj/structure/table/reinforced, /obj/machinery/light/small{ @@ -89805,9 +85849,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "ddZ" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/toolbox/emergency{ @@ -89820,25 +85862,19 @@ pixel_y = 32 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dea" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "deb" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dec" = ( /obj/machinery/light/small{ dir = 1 @@ -89853,34 +85889,26 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "ded" = ( /obj/structure/table, /obj/item/weapon/folder/white, /obj/item/weapon/pen, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dee" = ( /obj/structure/table, /obj/item/device/flashlight/lamp, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "def" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "deg" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -89892,9 +85920,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "deh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -89903,9 +85929,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dei" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -89916,9 +85940,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dej" = ( /turf/closed/wall/r_wall, /area/toxins/explab) @@ -90013,9 +86035,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dev" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -90023,9 +86043,7 @@ dir = 8 }, /turf/open/floor/plasteel/whitepurple/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dew" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -90034,9 +86052,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dex" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -90044,18 +86060,14 @@ dir = 8 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dey" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dez" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -90063,52 +86075,40 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "deA" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "deB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "deC" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "deD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "deE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "deF" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -90118,9 +86118,7 @@ dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "deG" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -90353,17 +86351,13 @@ icon_state = "whiteyellowcorner"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "deX" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "deY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -90371,9 +86365,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "deZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -90387,9 +86379,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -90398,9 +86388,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfb" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -90411,15 +86399,11 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfc" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -90427,25 +86411,19 @@ /obj/machinery/light, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dff" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -90454,17 +86432,13 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfh" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -90474,9 +86448,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfj" = ( /obj/structure/sign/bluecross_2{ pixel_x = 32; @@ -90487,9 +86459,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfk" = ( /obj/structure/sign/poster{ icon_state = "poster17_legit"; @@ -90507,24 +86477,18 @@ name = "medbay camera" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfn" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -90532,17 +86496,13 @@ dir = 1 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dfp" = ( /obj/structure/rack, /obj/item/roller, @@ -90554,9 +86514,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfq" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -90568,9 +86526,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfr" = ( /obj/structure/closet/secure_closet/medical2, /obj/effect/decal/cleanable/dirt, @@ -90583,9 +86539,7 @@ pixel_y = -24 }, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dfs" = ( /obj/machinery/light/small, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -90593,9 +86547,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dft" = ( /obj/structure/table/reinforced, /obj/machinery/status_display{ @@ -90606,9 +86558,7 @@ /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, /turf/open/floor/plasteel/vault, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dfu" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ @@ -90618,9 +86568,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dfv" = ( /obj/structure/table/reinforced, /obj/machinery/status_display{ @@ -90634,9 +86582,7 @@ /obj/item/weapon/reagent_containers/syringe, /obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/vault, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dfw" = ( /obj/structure/table/reinforced, /obj/machinery/light/small, @@ -90644,9 +86590,7 @@ /obj/item/weapon/gun/syringe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dfx" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -90654,17 +86598,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/medbay3{ - name = "Abandoned Medbay" - }) +/area/medical/abandoned_medbay) "dfy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -90673,9 +86613,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -90686,9 +86624,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -90704,9 +86640,7 @@ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office/dark{ @@ -90716,23 +86650,17 @@ name = "revenantspawn" }, /turf/open/floor/wood, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, /obj/item/device/modular_computer/tablet/preset/cheap, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dfE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfF" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -90753,9 +86681,7 @@ icon_state = "0-4" }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfG" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -90770,9 +86696,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfH" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -90786,9 +86710,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfI" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -90803,9 +86725,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfJ" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -90824,23 +86744,17 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfK" = ( /obj/structure/table/wood/poker, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfL" = ( /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfM" = ( /obj/machinery/airalarm{ dir = 8; @@ -90848,9 +86762,7 @@ pixel_x = 24 }, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dfN" = ( /obj/structure/table/reinforced, /obj/item/weapon/disk/tech_disk{ @@ -90860,55 +86772,41 @@ /obj/item/weapon/disk/tech_disk, /obj/item/device/assembly/timer, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dfO" = ( /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dfP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dfQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dfR" = ( /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dfS" = ( /obj/structure/chair/office/light{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dfT" = ( /obj/structure/table, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dfU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -90917,9 +86815,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dfV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -90931,9 +86827,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dfW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -90944,9 +86838,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dfX" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ @@ -91029,9 +86921,7 @@ /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dgg" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/research{ @@ -91043,15 +86933,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dgh" = ( /obj/structure/sign/nosmoking_2, /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dgi" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -91060,9 +86946,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dgj" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -91083,9 +86967,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dgk" = ( /obj/structure/cable/white{ tag = "icon-0-8"; @@ -91094,9 +86976,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dgl" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, @@ -91175,18 +87055,14 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dgt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dgu" = ( /turf/closed/wall, /area/assembly/chargebay) @@ -91290,9 +87166,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dgH" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -91304,9 +87178,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dgI" = ( /turf/closed/wall, /area/medical/surgery) @@ -91350,9 +87222,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dgO" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -91363,9 +87233,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dgP" = ( /turf/closed/wall, /area/hallway/secondary/construction) @@ -91375,16 +87243,12 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dgR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dgS" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -91396,25 +87260,19 @@ dir = 8 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dgT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dgU" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dgV" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -91426,9 +87284,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dgW" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (WEST)"; @@ -91438,9 +87294,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken4" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dgX" = ( /obj/structure/table/reinforced, /obj/item/weapon/stock_parts/matter_bin, @@ -91453,16 +87307,12 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dgY" = ( /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dgZ" = ( /obj/structure/frame/machine, /obj/item/stack/cable_coil/white, @@ -91470,65 +87320,49 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dha" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dhb" = ( /obj/structure/frame/machine, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dhc" = ( /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dhd" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dhe" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dhf" = ( /obj/structure/rack, /obj/item/weapon/storage/toolbox/electrical, /obj/item/device/multitool, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dhg" = ( /obj/machinery/light/small{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dhh" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -91598,9 +87432,7 @@ pixel_y = 0 }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dhr" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -91610,16 +87442,12 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dhs" = ( /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dht" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -91629,9 +87457,7 @@ /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dhu" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8; @@ -91644,9 +87470,7 @@ network = list("SS13","RD") }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dhv" = ( /obj/structure/table/reinforced, /obj/item/weapon/gun/energy/laser/practice{ @@ -91673,9 +87497,7 @@ pixel_y = 3 }, /turf/open/floor/plasteel/delivery, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dhw" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -91693,9 +87515,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dhx" = ( /obj/item/stack/rods{ amount = 50 @@ -91724,9 +87544,7 @@ icon_state = "0-8" }, /turf/open/floor/plasteel/delivery, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dhy" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/white, @@ -91793,9 +87611,7 @@ "dhE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dhF" = ( /obj/structure/table, /obj/item/weapon/stock_parts/cell/high, @@ -92021,9 +87837,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dhZ" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -92035,9 +87849,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dia" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -92045,26 +87857,20 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dib" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dic" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "did" = ( /obj/structure/table, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ @@ -92079,17 +87885,13 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "die" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dif" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -92099,9 +87901,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dig" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -92112,15 +87912,11 @@ on = 1 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dih" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dii" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -92188,9 +87984,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dis" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -92201,9 +87995,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dit" = ( /obj/structure/table, /obj/item/weapon/storage/toolbox/mechanical, @@ -92266,9 +88058,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "diB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -92278,9 +88068,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "diC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -92289,9 +88077,7 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "diD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -92304,17 +88090,13 @@ on = 1 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "diE" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "diF" = ( /obj/structure/sign/poster{ pixel_x = -32 @@ -92324,14 +88106,10 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "diG" = ( /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "diH" = ( /obj/structure/table/wood/poker, /obj/item/stack/spacecash/c1000{ @@ -92339,9 +88117,7 @@ }, /obj/item/stack/spacecash/c500, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "diI" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (EAST)"; @@ -92349,14 +88125,10 @@ dir = 4 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "diJ" = ( /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "diK" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (WEST)"; @@ -92364,16 +88136,12 @@ dir = 8 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "diL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "diM" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, @@ -92390,23 +88158,17 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diN" = ( /obj/structure/frame/computer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diO" = ( /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diP" = ( /obj/structure/frame/machine, /obj/item/stack/cable_coil/white, @@ -92414,17 +88176,13 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -92436,21 +88194,15 @@ pixel_x = -1 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diS" = ( /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diT" = ( /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door{ @@ -92459,9 +88211,7 @@ pixel_x = 26 }, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "diV" = ( /obj/machinery/door/poddoor/preopen{ id = "maintrobotics"; @@ -92470,9 +88220,7 @@ /obj/structure/girder, /obj/structure/grille, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "diW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -92481,9 +88229,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "diX" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -92500,9 +88246,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "diY" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -92663,9 +88407,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -92677,9 +88419,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djl" = ( /obj/machinery/holopad, /obj/effect/landmark{ @@ -92692,9 +88432,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djm" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -92703,9 +88441,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djn" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -92719,9 +88455,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -92733,9 +88467,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "djp" = ( /obj/machinery/holopad, /obj/structure/cable/white{ @@ -92748,9 +88480,7 @@ icon_state = "pipe-j2" }, /turf/open/floor/plasteel/bot, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "djq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -92763,9 +88493,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "djr" = ( /obj/structure/cable/white{ d2 = 2; @@ -92866,9 +88594,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djz" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; @@ -92877,9 +88603,7 @@ sortType = 14 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djA" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -92891,9 +88615,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "djB" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -93111,9 +88833,7 @@ icon_state = "whitepurplecorner"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dka" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -93128,14 +88848,10 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dkb" = ( /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dkc" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -93143,9 +88859,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dkd" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 @@ -93154,9 +88868,7 @@ name = "Medical Doctor" }, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dke" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -93164,18 +88876,14 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dkf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dkg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ @@ -93209,9 +88917,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dkk" = ( /obj/structure/rack, /obj/machinery/light/small{ @@ -93251,39 +88957,29 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dkp" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dkq" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dkr" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dks" = ( /obj/structure/table/wood/poker, /obj/item/clothing/glasses/sunglasses/big, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dkt" = ( /obj/structure/table/wood/poker, /obj/item/stack/spacecash/c10{ @@ -93293,9 +88989,7 @@ /obj/item/stack/spacecash/c100, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dku" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck/syndicate{ @@ -93304,17 +88998,13 @@ pixel_y = 6 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dkv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /mob/living/simple_animal/cockroach, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dkw" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (EAST)"; @@ -93326,18 +89016,14 @@ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dkx" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dky" = ( /obj/effect/decal/cleanable/vomit/old, /obj/effect/landmark{ @@ -93346,9 +89032,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dkz" = ( /obj/item/weapon/storage/toolbox/emergency, /obj/effect/decal/cleanable/blood/old, @@ -93356,9 +89040,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dkA" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (WEST)"; @@ -93366,9 +89048,7 @@ dir = 8 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dkB" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/white, @@ -93378,29 +89058,21 @@ /obj/item/weapon/stock_parts/console_screen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkE" = ( /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -93408,9 +89080,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkG" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -93422,9 +89092,7 @@ dir = 5 }, /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkH" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -93438,9 +89106,7 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkI" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -93452,9 +89118,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -93472,9 +89136,7 @@ req_access_txt = "12" }, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dkK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/preopen{ @@ -93493,9 +89155,7 @@ /obj/structure/girder, /obj/structure/grille, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dkL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -93510,9 +89170,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dkM" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -93530,9 +89188,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dkN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -93649,25 +89305,19 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dkZ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dla" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dlb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -93675,17 +89325,13 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dlc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dld" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -93704,9 +89350,7 @@ dir = 1 }, /turf/open/floor/plasteel/delivery, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dle" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -93722,9 +89366,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/warning, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dlf" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -93732,9 +89374,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dlg" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -93865,9 +89505,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dlo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -93881,9 +89519,7 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dlp" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -93892,9 +89528,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dlq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -94068,9 +89702,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dlN" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -94078,15 +89710,11 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dlO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dlP" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 @@ -94094,15 +89722,11 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dlQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dlR" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -94110,9 +89734,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dlS" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -94148,16 +89770,12 @@ dir = 8 }, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dlW" = ( /obj/structure/chair/stool/bar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dlX" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (EAST)"; @@ -94166,9 +89784,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dlY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -94178,9 +89794,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dlZ" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -94193,18 +89807,14 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dma" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dmb" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -94214,16 +89824,12 @@ /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dmc" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dmd" = ( /obj/machinery/light/small, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -94234,15 +89840,11 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dme" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dmf" = ( /obj/structure/cable/white, /obj/machinery/power/apc{ @@ -94253,15 +89855,11 @@ pixel_y = -24 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dmg" = ( /obj/machinery/light/small, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dmh" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -94269,9 +89867,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dmi" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -94285,9 +89881,7 @@ pixel_x = 26 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dmj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor/preopen{ @@ -94297,9 +89891,7 @@ /obj/structure/girder, /obj/structure/grille, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dmk" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -94307,9 +89899,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dml" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -94358,15 +89948,11 @@ /area/toxins/explab) "dms" = ( /turf/closed/wall/r_wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dmt" = ( /obj/structure/sign/fire, /turf/closed/wall/r_wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dmu" = ( /obj/machinery/door/firedoor/heavy, /obj/structure/grille, @@ -94376,9 +89962,7 @@ name = "Toxins Lab Shutters" }, /turf/open/floor/plating, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dmv" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/research{ @@ -94394,15 +89978,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dmw" = ( /obj/structure/sign/biohazard, /turf/closed/wall/r_wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dmx" = ( /obj/structure/window/reinforced{ dir = 1 @@ -94410,9 +89990,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dmy" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -94422,18 +90000,14 @@ name = "Shooting Range" }, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dmz" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dmA" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -94506,9 +90080,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dmG" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/white{ @@ -94516,16 +90088,12 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dmH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dmI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -94685,9 +90253,7 @@ icon_state = "whitepurplecorner"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dnd" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -94695,9 +90261,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dne" = ( /obj/structure/table/glass, /obj/item/weapon/folder/white, @@ -94705,9 +90269,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, /obj/item/weapon/reagent_containers/dropper, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dnf" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -94716,17 +90278,13 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dng" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, /turf/open/floor/plasteel/warning, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dnh" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -94735,9 +90293,7 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dni" = ( /obj/structure/table/glass, /obj/item/weapon/wrench/medical, @@ -94748,9 +90304,7 @@ name = "medbay camera" }, /turf/open/floor/plasteel/whiteblue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dnj" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -94758,9 +90312,7 @@ dir = 8 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dnk" = ( /obj/structure/sign/nosmoking_2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -94878,9 +90430,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dnv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/yellow/corner{ @@ -94901,9 +90451,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dnz" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -94914,9 +90462,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dnA" = ( /obj/structure/table/wood, /obj/machinery/status_display{ @@ -94924,16 +90470,12 @@ }, /obj/item/weapon/book/manual/wiki/engineering_hacking, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dnB" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dnC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -94946,18 +90488,14 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dnD" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dnE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -94984,32 +90522,24 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dnJ" = ( /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dnK" = ( /turf/open/floor/plasteel/whitepurple/side{ tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dnL" = ( /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dnM" = ( /obj/structure/closet/bombcloset, /obj/machinery/light_switch{ @@ -95019,35 +90549,27 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dnN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/warnplate{ dir = 8 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dnO" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dnP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/warnplate{ dir = 4 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dnQ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -95136,9 +90658,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dnW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/status_display{ @@ -95240,9 +90760,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "doi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -95254,18 +90772,14 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "doj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dok" = ( /obj/structure/sign/bluecross_2, /turf/closed/wall/r_wall, @@ -95291,9 +90805,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "doo" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -95388,9 +90900,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dox" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -95402,9 +90912,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "doy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -95465,9 +90973,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "doG" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -95480,9 +90986,7 @@ }, /obj/structure/window/reinforced, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "doH" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -95495,9 +90999,7 @@ /obj/structure/grille, /obj/structure/window/reinforced, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "doI" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -95513,15 +91015,11 @@ dir = 4 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "doJ" = ( /obj/structure/chair/stool, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "doK" = ( /obj/structure/table/wood, /obj/item/device/assembly/igniter, @@ -95532,26 +91030,20 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "doL" = ( /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/weapon/hand_labeler, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doM" = ( /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doN" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -95560,26 +91052,20 @@ pixel_y = 3 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doO" = ( /obj/structure/table/reinforced, /obj/item/device/mmi, /obj/item/device/assembly/prox_sensor, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doP" = ( /obj/structure/frame/machine, /obj/item/stack/cable_coil/white, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doQ" = ( /obj/structure/rack, /obj/item/weapon/book/manual/robotics_cyborgs, @@ -95587,27 +91073,21 @@ /obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doR" = ( /obj/machinery/mecha_part_fabricator, /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doS" = ( /obj/structure/table/reinforced, /obj/item/weapon/stock_parts/console_screen, /obj/item/weapon/stock_parts/micro_laser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doT" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal{ @@ -95618,18 +91098,14 @@ }, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "doU" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "doV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -95640,9 +91116,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "doW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (NORTHEAST)"; @@ -95727,14 +91201,10 @@ pixel_x = -22 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dpg" = ( /turf/open/floor/plasteel/neutral, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dph" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -95742,9 +91212,7 @@ pixel_y = 26 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dpi" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -95755,9 +91223,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dpj" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -95766,9 +91232,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dpk" = ( /obj/structure/table/reinforced, /obj/item/weapon/clipboard, @@ -95853,9 +91317,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dpr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -95868,9 +91330,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dps" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -95880,9 +91340,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dpt" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -96126,9 +91584,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dpR" = ( /obj/structure/cable/white{ tag = "icon-0-2"; @@ -96205,9 +91661,7 @@ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dpY" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -96218,9 +91672,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dpZ" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -96379,9 +91831,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dql" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -96392,9 +91842,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dqm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/yellow/corner{ @@ -96418,9 +91866,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dqq" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, @@ -96431,9 +91877,7 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dqr" = ( /obj/machinery/light/small{ dir = 1 @@ -96444,17 +91888,13 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dqs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dqt" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -96469,9 +91909,7 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dqu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -96481,50 +91919,38 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dqv" = ( /turf/open/floor/wood{ tag = "icon-wood-broken7"; icon_state = "wood-broken7" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dqw" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dqx" = ( /obj/structure/table, /obj/machinery/cell_charger, /obj/item/weapon/stock_parts/cell/high, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dqy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dqz" = ( /obj/structure/table/reinforced, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dqA" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -96537,9 +91963,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dqB" = ( /turf/open/floor/plasteel/vault{ dir = 5 @@ -96579,9 +92003,7 @@ icon_state = "escape"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dqF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (SOUTHWEST)"; @@ -96591,15 +92013,11 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dqG" = ( /obj/machinery/atmospherics/components/unary/vent_pump, /turf/open/floor/plasteel/neutral, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dqH" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ icon_state = "intact"; @@ -96608,9 +92026,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dqI" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ tag = "icon-heater (WEST)"; @@ -96621,9 +92037,7 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dqJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ @@ -96635,9 +92049,7 @@ /turf/open/floor/plating/warnplate{ dir = 8 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dqK" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -96647,17 +92059,13 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dqL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/warnplate{ dir = 4 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dqM" = ( /obj/structure/table/reinforced, /obj/machinery/light, @@ -96725,9 +92133,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dqS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -96738,9 +92144,7 @@ network = list("SS13","RD") }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dqT" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -97041,9 +92445,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dru" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -97058,9 +92460,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "drv" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -97071,9 +92471,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "drw" = ( /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Office"; @@ -97191,9 +92589,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "drE" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -97212,9 +92608,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "drF" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -97222,9 +92616,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "drG" = ( /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 @@ -97296,9 +92688,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "drP" = ( /obj/structure/rack, /obj/machinery/light/small{ @@ -97349,18 +92739,14 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "drW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "drX" = ( /obj/effect/landmark{ name = "xeno_spawn"; @@ -97371,18 +92757,14 @@ on = 1 }, /turf/open/floor/plasteel/warning, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "drY" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "drZ" = ( /obj/structure/chair/wood/normal{ tag = "icon-wooden_chair (NORTH)"; @@ -97391,18 +92773,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dsa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dsb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -97410,85 +92788,61 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dsc" = ( /obj/structure/chair/stool/bar, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dsd" = ( /obj/structure/chair/stool/bar, /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dse" = ( /mob/living/simple_animal/cockroach, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dsf" = ( /obj/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsh" = ( /turf/open/floor/plasteel/circuit/gcircuit, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsi" = ( /obj/machinery/computer/mech_bay_power_console, /turf/open/floor/plasteel/circuit/gcircuit, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsk" = ( /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsl" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ pixel_x = 26 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dsn" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/light{ @@ -97506,9 +92860,7 @@ icon_state = "escape"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dso" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -97518,18 +92870,14 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dsp" = ( /obj/effect/landmark/start{ name = "Scientist" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dsq" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -97537,9 +92885,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dsr" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ tag = "icon-connector_map (WEST)"; @@ -97557,9 +92903,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dss" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; @@ -97567,18 +92911,14 @@ scrub_Toxins = 0 }, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dst" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; on = 1 }, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dsu" = ( /turf/closed/wall, /area/crew_quarters/hor) @@ -97640,9 +92980,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dsz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -97652,9 +92990,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dsA" = ( /turf/closed/wall, /area/assembly/robotics) @@ -97930,9 +93266,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dsU" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -97949,9 +93283,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dsV" = ( /obj/structure/cable/white, /obj/structure/grille, @@ -98144,9 +93476,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dtq" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -98156,25 +93486,19 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dtr" = ( /obj/structure/table/wood/poker, /obj/item/device/flashlight/lamp, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dts" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/wood{ icon_state = "wood-broken5" }, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dtt" = ( /obj/structure/table/wood/poker, /obj/item/weapon/storage/box/matches{ @@ -98182,17 +93506,13 @@ pixel_y = 5 }, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dtu" = ( /obj/structure/table/wood/poker, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dtv" = ( /obj/structure/table/wood/poker, /obj/item/weapon/storage/fancy/cigarettes/dromedaryco{ @@ -98202,9 +93522,7 @@ /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dtw" = ( /obj/machinery/airalarm{ dir = 1; @@ -98212,35 +93530,25 @@ pixel_y = -22 }, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dtx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/status_display{ pixel_x = -32 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dty" = ( /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/mech_bay_recharge_floor, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -98252,9 +93560,7 @@ pixel_x = -1 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -98262,9 +93568,7 @@ dir = 8 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -98274,9 +93578,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -98284,9 +93586,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (WEST)"; @@ -98299,9 +93599,7 @@ req_access_txt = "12" }, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dtG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -98314,9 +93612,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dtH" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -98330,9 +93626,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dtI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -98347,9 +93641,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dtJ" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -98363,9 +93655,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dtK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -98374,9 +93664,7 @@ dir = 10 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dtL" = ( /obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -98387,9 +93675,7 @@ icon_state = "arrival"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dtM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -98398,9 +93684,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dtN" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -98408,9 +93692,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dtO" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -98419,9 +93701,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dtP" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ tag = "icon-connector_map (WEST)"; @@ -98434,24 +93714,18 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dtQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/warnplate{ dir = 9 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dtR" = ( /turf/open/floor/plating/warnplate{ dir = 5 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dtS" = ( /obj/structure/closet/secure_closet/RD, /obj/machinery/computer/security/telescreen/entertainment{ @@ -98729,9 +94003,7 @@ name = "medbay camera" }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dut" = ( /obj/structure/bed/dogbed{ desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off."; @@ -98810,9 +94082,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "duz" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -98820,9 +94090,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "duA" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -98878,16 +94146,12 @@ /obj/structure/frame/machine, /obj/item/weapon/circuitboard/machine/cyborgrecharger, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "duF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "duG" = ( /obj/machinery/mech_bay_recharge_port{ tag = "icon-recharge_port (NORTH)"; @@ -98898,22 +94162,16 @@ /turf/open/floor/plating/warnplate{ dir = 6 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "duH" = ( /obj/item/robot_suit, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "duI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "duJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (NORTHEAST)"; @@ -98921,17 +94179,13 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "duK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "duL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -98939,35 +94193,27 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "duM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "duN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "duO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "duP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -98980,9 +94226,7 @@ dir = 10 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "duQ" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -98995,9 +94239,7 @@ pixel_y = 3 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "duR" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99007,9 +94249,7 @@ /turf/open/floor/plasteel/whitepurple/side{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "duS" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -99017,9 +94257,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "duT" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -99027,9 +94265,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "duU" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ tag = "icon-connector_map (WEST)"; @@ -99040,17 +94276,13 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "duV" = ( /turf/open/floor/plating, /turf/open/floor/plating{ icon_state = "platingdmg2" }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "duW" = ( /obj/item/target/syndicate, /obj/effect/decal/cleanable/dirt, @@ -99059,14 +94291,10 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/bot, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "duX" = ( /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "duY" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -99387,9 +94615,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvz" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -99405,9 +94631,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/whiteblue/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvA" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -99418,9 +94642,7 @@ dir = 4 }, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvB" = ( /obj/structure/cable/white{ tag = "icon-0-4"; @@ -99533,31 +94755,23 @@ "dvI" = ( /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvJ" = ( /obj/machinery/iv_drip, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvK" = ( /obj/structure/bed, /obj/item/weapon/bedsheet/medical, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvL" = ( /obj/item/weapon/folder/white, /obj/item/device/flashlight/pen, /obj/item/clothing/neck/stethoscope, /obj/structure/table, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvM" = ( /obj/machinery/computer/med_data/laptop, /obj/structure/table, @@ -99565,9 +94779,7 @@ pixel_x = 32 }, /turf/open/floor/plasteel/vault, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dvN" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -99576,9 +94788,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvO" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -99592,9 +94802,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvP" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99608,9 +94816,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvQ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99621,9 +94827,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvR" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99635,9 +94839,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvS" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99648,9 +94850,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvT" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99660,9 +94860,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvU" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99677,9 +94875,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvV" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99696,9 +94892,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvW" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99714,9 +94908,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvX" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -99734,9 +94926,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvY" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99749,9 +94939,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dvZ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -99764,9 +94952,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dwa" = ( /obj/machinery/door/airlock/engineering{ name = "Aft Starboard Solar Access"; @@ -99802,9 +94988,7 @@ /obj/machinery/chem_dispenser/drinks/beer, /obj/structure/table/wood/poker, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dwe" = ( /obj/structure/table/wood/poker, /obj/item/weapon/reagent_containers/food/drinks/bottle/rum{ @@ -99816,9 +95000,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dwf" = ( /obj/machinery/vending/boozeomat{ req_access_txt = "0" @@ -99829,63 +95011,47 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dwg" = ( /obj/structure/table/wood/poker, /obj/item/weapon/reagent_containers/food/drinks/shaker, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, /obj/item/weapon/reagent_containers/dropper, /turf/open/floor/plating, -/area/crew_quarters/bar{ - name = "Abandoned Gambling Den" - }) +/area/crew_quarters/abandoned_gambling_den) "dwh" = ( /obj/structure/table, /obj/item/weapon/crowbar/red, /obj/item/weapon/wrench, /obj/item/clothing/mask/gas, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dwi" = ( /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dwj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dwk" = ( /obj/structure/chair/office/light, /turf/open/floor/plasteel/warning, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dwl" = ( /obj/structure/rack, /obj/item/weapon/storage/toolbox/mechanical, /obj/item/clothing/head/welding, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dwm" = ( /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dwn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -99893,9 +95059,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dwo" = ( /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ @@ -99915,17 +95079,13 @@ /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dwp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/side{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dwq" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -99934,32 +95094,24 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/holopad, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dwr" = ( /turf/open/floor/plasteel/whitepurple/side{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dws" = ( /obj/machinery/newscaster{ pixel_x = 32 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dwt" = ( /obj/machinery/light/small, /turf/open/floor/plating/warnplate{ dir = 10 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dwu" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -99967,18 +95119,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dwv" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/warnplate{ dir = 6 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dww" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/suit_storage_unit/rd, @@ -100038,9 +95186,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dwC" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -100225,9 +95371,7 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dwW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -100237,9 +95381,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dwX" = ( /obj/effect/landmark/start{ name = "Medical Doctor" @@ -100248,9 +95390,7 @@ dir = 4 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dwY" = ( /obj/structure/chair/office/light{ dir = 1 @@ -100259,9 +95399,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dwZ" = ( /obj/structure/sink{ dir = 4; @@ -100279,9 +95417,7 @@ on = 1 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dxa" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -100293,9 +95429,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -100308,18 +95442,14 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxc" = ( /obj/structure/girder, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxd" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -100330,24 +95460,18 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxe" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -100357,17 +95481,13 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -100381,9 +95501,7 @@ dir = 1 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (NORTHWEST)"; @@ -100391,9 +95509,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dxk" = ( /obj/structure/cable/white, /obj/machinery/power/apc{ @@ -100439,9 +95555,7 @@ /obj/item/device/flashlight/seclite, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxo" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -100451,34 +95565,26 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxp" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxq" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxr" = ( /obj/structure/table, /obj/item/weapon/clipboard, /obj/item/weapon/folder/white, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxs" = ( /obj/structure/frame/computer, /obj/effect/decal/cleanable/dirt, @@ -100488,18 +95594,14 @@ pixel_y = -22 }, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxt" = ( /obj/structure/frame/machine, /obj/machinery/light/small, /obj/item/weapon/stock_parts/console_screen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxu" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -100509,18 +95611,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxv" = ( /obj/structure/table, /obj/item/clothing/gloves/color/black, /obj/item/weapon/storage/toolbox/electrical, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/medical/research{ - name = "Abandoned Research Lab" - }) +/area/medical/research/abandoned_research_lab) "dxw" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -100528,9 +95626,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dxx" = ( /obj/item/device/assembly/prox_sensor{ pixel_x = -4; @@ -100555,9 +95651,7 @@ /turf/open/floor/plasteel/warning/corner{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dxy" = ( /obj/item/device/assembly/timer{ pixel_x = 5; @@ -100580,9 +95674,7 @@ /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dxz" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -100590,18 +95682,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dxA" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ icon_state = "intact"; dir = 6 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dxB" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ tag = "icon-freezer (WEST)"; @@ -100611,15 +95699,11 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dxC" = ( /obj/structure/sign/fire, /turf/closed/wall/r_wall, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dxD" = ( /obj/machinery/door/firedoor/heavy, /obj/structure/cable/white{ @@ -100640,14 +95724,10 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dxE" = ( /turf/closed/wall/r_wall, -/area/toxins/misc_lab{ - name = "\improper Research Testing Range" - }) +/area/toxins/misc_lab) "dxF" = ( /obj/machinery/door/firedoor/heavy, /obj/structure/grille, @@ -100677,9 +95757,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dxH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ tag = "icon-intact (WEST)"; @@ -100692,9 +95770,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dxI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_research{ @@ -100995,18 +96071,14 @@ dir = 4 }, /turf/open/floor/plating, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dyk" = ( /obj/structure/dresser, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dyl" = ( /obj/structure/mirror{ pixel_y = -28 @@ -101017,9 +96089,7 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dym" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -101032,24 +96102,18 @@ }, /obj/machinery/light, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dyn" = ( /obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dyo" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/status_display{ pixel_x = 32 }, /turf/open/floor/plasteel/cmo, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dyp" = ( /obj/effect/landmark{ name = "blobstart" @@ -101058,9 +96122,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dyq" = ( /turf/closed/wall, /area/crew_quarters/theatre{ @@ -101076,9 +96138,7 @@ }) "dys" = ( /turf/closed/wall, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dyt" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -101096,9 +96156,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dyu" = ( /obj/structure/cable{ d1 = 1; @@ -101113,27 +96171,21 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dyw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 10; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dyx" = ( /obj/structure/closet, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Port Maintenance" - }) +/area/maintenance/fpmaint2/port_maintenance) "dyy" = ( /obj/item/device/transfer_valve{ pixel_x = -5 @@ -101162,9 +96214,7 @@ pixel_y = 0 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dyz" = ( /obj/structure/chair/office/light{ dir = 8 @@ -101177,9 +96227,7 @@ /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dyA" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -101195,17 +96243,13 @@ scrub_Toxins = 0 }, /turf/open/floor/plasteel/neutral, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dyB" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dyC" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ tag = "icon-connector_map (WEST)"; @@ -101221,9 +96265,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dyD" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light{ @@ -101273,9 +96315,7 @@ /area/toxins/storage) "dyI" = ( /turf/closed/wall/r_wall, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dyJ" = ( /obj/machinery/airalarm{ dir = 4; @@ -101292,9 +96332,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dyK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; @@ -101304,9 +96342,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dyL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -101319,18 +96355,14 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dyM" = ( /obj/structure/sign/securearea, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dyN" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -101524,18 +96556,14 @@ /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dzo" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dzp" = ( /obj/structure/table/wood, /obj/item/clothing/under/maid, @@ -101643,9 +96671,7 @@ }, /obj/item/weapon/newspaper, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dzz" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -101653,18 +96679,14 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dzA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ pixel_y = 26 }, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dzB" = ( /obj/structure/sign/poster{ icon_state = "poster22_legit"; @@ -101675,9 +96697,7 @@ tag = "icon-wood-broken5"; icon_state = "wood-broken5" }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dzC" = ( /obj/structure/table/wood, /obj/item/weapon/crowbar/red, @@ -101690,9 +96710,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dzD" = ( /obj/structure/cable{ icon_state = "0-2"; @@ -101716,16 +96734,12 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzF" = ( /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzG" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -101742,26 +96756,20 @@ network = list("SS13","RD") }, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzH" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzI" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/light{ dir = 1 }, /turf/open/floor/plasteel/warning, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/newscaster{ @@ -101776,14 +96784,10 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzK" = ( /turf/closed/wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzL" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -101801,15 +96805,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzN" = ( /obj/item/device/assembly/signaler{ pixel_x = 0; @@ -101832,9 +96832,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel/warning/corner, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzO" = ( /obj/structure/table/reinforced, /obj/item/weapon/wrench, @@ -101846,18 +96844,14 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzP" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 }, /obj/machinery/meter, /turf/open/floor/plasteel/whitepurple/corner, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzQ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ tag = "icon-connector_map (WEST)"; @@ -101877,9 +96871,7 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dzR" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -101932,9 +96924,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dzX" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -101947,9 +96937,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dzY" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -101962,9 +96950,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dzZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -101981,9 +96967,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dAa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -101996,9 +96980,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dAb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -102013,9 +96995,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dAc" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -102023,9 +97003,7 @@ dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dAd" = ( /obj/machinery/disposal/bin, /obj/structure/cable/white{ @@ -102350,9 +97328,7 @@ on = 1 }, /turf/open/floor/plasteel/blue, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dAG" = ( /obj/structure/rack, /obj/effect/landmark/costume, @@ -102362,9 +97338,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dAH" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -102374,9 +97348,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dAI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -102451,9 +97423,7 @@ layer = 4.1 }, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dAR" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -102463,19 +97433,13 @@ /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dAS" = ( /turf/open/floor/wood, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dAT" = ( /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dAU" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/suit/jacket{ @@ -102493,16 +97457,12 @@ icon_state = "detective" }, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dAV" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dAW" = ( /obj/structure/cable{ d1 = 2; @@ -102573,18 +97533,14 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBc" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ tag = "icon-warning (EAST)"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBd" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -102598,9 +97554,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBe" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -102609,9 +97563,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBf" = ( /obj/machinery/atmospherics/components/trinary/filter{ density = 0; @@ -102621,9 +97573,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBg" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -102631,17 +97581,13 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -102649,43 +97595,33 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBk" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/firstaid/toxin, /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBm" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dBn" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -102741,9 +97677,7 @@ name = "Xenobiology Containment Door" }, /turf/open/floor/plating, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dBt" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -102774,9 +97708,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dBu" = ( /obj/structure/cable/white{ tag = "icon-0-8"; @@ -102794,9 +97726,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dBv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -102809,9 +97739,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dBw" = ( /obj/structure/rack, /obj/item/weapon/storage/toolbox/mechanical{ @@ -103090,9 +98018,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dBZ" = ( /obj/machinery/light_switch{ pixel_x = -26 @@ -103163,9 +98089,7 @@ pixel_y = 3 }, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dCg" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -103180,24 +98104,18 @@ on = 1 }, /turf/open/floor/wood, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dCh" = ( /turf/open/floor/wood{ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dCi" = ( /obj/structure/filingcabinet/security, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dCj" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -103230,17 +98148,13 @@ /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCm" = ( /turf/open/floor/plasteel/warning{ tag = "icon-warning (EAST)"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (NORTHEAST)"; @@ -103252,9 +98166,7 @@ icon_state = "white_warn_side"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCo" = ( /obj/effect/landmark/start{ name = "Scientist" @@ -103267,9 +98179,7 @@ icon_state = "white_warn_side"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -103279,9 +98189,7 @@ icon_state = "white_warn_side"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCq" = ( /obj/machinery/light_switch{ pixel_x = 26; @@ -103295,9 +98203,7 @@ icon_state = "white_warn_side"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCr" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -103309,9 +98215,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -103319,9 +98223,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCt" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -103337,9 +98239,7 @@ /obj/item/device/radio/beacon, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCu" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -103353,9 +98253,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCv" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -103375,9 +98273,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCw" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -103392,9 +98288,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCx" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -103407,9 +98301,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCy" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -103425,9 +98317,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/whitepurple/side, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCz" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -103437,9 +98327,7 @@ dir = 4 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -103450,9 +98338,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCB" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/research{ @@ -103468,9 +98354,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/warning/side, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dCC" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -103532,17 +98416,13 @@ name = "Mainframe Base"; initial_gas_mix = "n2=100;TEMP=80" }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dCI" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dCJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -103564,9 +98444,7 @@ name = "Mainframe Base"; initial_gas_mix = "n2=100;TEMP=80" }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dCK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/extinguisher_cabinet{ @@ -103581,9 +98459,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dCL" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -103595,9 +98471,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dCM" = ( /obj/structure/cable/white{ tag = "icon-0-8"; @@ -103611,9 +98485,7 @@ pixel_y = 0 }, /turf/open/floor/plasteel/whitepurple/corner, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dCN" = ( /obj/structure/table, /obj/item/weapon/stock_parts/cell/high, @@ -103838,18 +98710,14 @@ /turf/open/floor/plasteel/whitegreen/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dDn" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plasteel/whitegreen/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dDo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (WEST)"; @@ -103857,18 +98725,14 @@ dir = 8 }, /turf/open/floor/plasteel/whitegreen/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dDp" = ( /obj/structure/closet/crate, /obj/effect/landmark/costume, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dDq" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -103888,9 +98752,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dDr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -104022,28 +98884,20 @@ tag = "icon-wood-broken7"; icon_state = "wood-broken7" }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dDC" = ( /obj/structure/chair/office/dark, /turf/open/floor/wood, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dDD" = ( /obj/structure/chair/office/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dDE" = ( /mob/living/simple_animal/cockroach, /turf/open/floor/wood, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dDF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster{ @@ -104062,9 +98916,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dDG" = ( /obj/structure/chair, /obj/effect/decal/cleanable/dirt, @@ -104092,9 +98944,7 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDK" = ( /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_scrubber{ @@ -104105,9 +98955,7 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDL" = ( /obj/item/stack/rods{ amount = 50 @@ -104131,9 +98979,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDM" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -104144,17 +98990,13 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDO" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -104168,17 +99010,13 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -104188,9 +99026,7 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDR" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -104203,9 +99039,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -104215,15 +99049,11 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDT" = ( /obj/structure/tank_dispenser, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDU" = ( /obj/structure/rack, /obj/structure/extinguisher_cabinet{ @@ -104238,9 +99068,7 @@ dir = 5 }, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDV" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -104254,9 +99082,7 @@ dir = 1 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDW" = ( /obj/machinery/disposal/bin, /obj/effect/decal/cleanable/dirt, @@ -104271,9 +99097,7 @@ dir = 8 }, /turf/open/floor/plasteel/delivery, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDX" = ( /obj/item/weapon/storage/toolbox/mechanical{ pixel_x = -3; @@ -104292,9 +99116,7 @@ dir = 8 }, /turf/open/floor/plasteel/bot, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDY" = ( /obj/structure/sign/securearea, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -104303,9 +99125,7 @@ dir = 8 }, /turf/closed/wall/r_wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dDZ" = ( /obj/structure/table, /obj/item/weapon/paper_bin, @@ -104362,17 +99182,13 @@ name = "Mainframe Base"; initial_gas_mix = "n2=100;TEMP=80" }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dEf" = ( /obj/machinery/atmospherics/pipe/manifold/general/hidden, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dEg" = ( /obj/machinery/r_n_d/server/robotics, /obj/machinery/atmospherics/pipe/simple/general/hidden{ @@ -104384,9 +99200,7 @@ name = "Mainframe Base"; initial_gas_mix = "n2=100;TEMP=80" }, -/area/toxins/server{ - name = "\improper Research Division Server Room" - }) +/area/toxins/server) "dEh" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -104396,9 +99210,7 @@ /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dEi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -104406,9 +99218,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/purple, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dEj" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -104472,9 +99282,7 @@ "dEn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dEo" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -104490,9 +99298,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dEp" = ( /obj/effect/landmark{ name = "xeno_spawn"; @@ -104535,9 +99341,7 @@ /obj/structure/table/wood, /obj/item/device/flashlight/lamp, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dEt" = ( /obj/structure/table/wood, /obj/item/weapon/folder/white{ @@ -104548,18 +99352,14 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dEu" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dEv" = ( /obj/structure/table/wood, /obj/item/clothing/gloves/color/black, @@ -104573,9 +99373,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dEw" = ( /obj/structure/chair{ dir = 4 @@ -104608,15 +99406,11 @@ "dEA" = ( /obj/structure/sign/vacuum, /turf/closed/wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dEB" = ( /obj/structure/sign/securearea, /turf/closed/wall, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dEC" = ( /obj/machinery/door/window/southleft{ name = "Mass Driver Door"; @@ -104624,9 +99418,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/loadingarea, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dED" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -104643,9 +99435,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dEE" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -104663,9 +99453,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dEF" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/plasteel/bot, @@ -104695,9 +99483,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dEJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -104708,9 +99494,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dEK" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -104722,9 +99506,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dEL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -104733,16 +99515,12 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dEM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dEN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -104750,9 +99528,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dEO" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (NORTH)"; @@ -104763,9 +99539,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dEP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -104774,9 +99548,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dEQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -104851,9 +99623,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dEX" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -104863,9 +99633,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dEY" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -104876,9 +99644,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dEZ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -104892,9 +99658,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFa" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -104907,9 +99671,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFb" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -104927,9 +99689,7 @@ icon_state = "2-4" }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFc" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -104948,9 +99708,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFd" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -104959,9 +99717,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFe" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -104976,9 +99732,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFf" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -104992,9 +99746,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFg" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105009,9 +99761,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFh" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -105021,9 +99771,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -105033,9 +99781,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dFj" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -105047,9 +99793,7 @@ /turf/open/floor/plasteel/whitegreen/corner{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dFk" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -105063,9 +99807,7 @@ /turf/open/floor/plasteel/whitegreen/side{ dir = 1 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dFl" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -105077,9 +99819,7 @@ /turf/open/floor/plasteel/whitegreen/corner{ dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dFm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -105088,9 +99828,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dFn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -105101,9 +99839,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dFo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -105113,9 +99849,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dFp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -105125,9 +99859,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dFq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -105136,9 +99868,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dFr" = ( /obj/machinery/light/small{ dir = 8 @@ -105211,17 +99941,13 @@ pixel_x = -32 }, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dFy" = ( /obj/structure/chair/office/dark{ dir = 1 }, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dFz" = ( /obj/structure/table/wood, /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift{ @@ -105232,17 +99958,13 @@ }, /obj/item/weapon/lighter, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dFA" = ( /turf/open/floor/wood{ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dFB" = ( /obj/structure/rack, /obj/item/weapon/storage/briefcase{ @@ -105252,9 +99974,7 @@ /obj/item/weapon/storage/secure/briefcase, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dFC" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -105310,9 +100030,7 @@ /turf/open/floor/plating/warnplate{ dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dFK" = ( /turf/open/floor/plating/warnplate{ dir = 4; @@ -105320,9 +100038,7 @@ initial_gas_mix = "o2=0.01;n2=0.01"; temperature = 2.7 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dFL" = ( /obj/machinery/door/poddoor{ id = "toxinsdriver"; @@ -105330,18 +100046,14 @@ }, /obj/structure/fans/tiny, /turf/open/floor/plating, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dFM" = ( /turf/open/floor/plasteel/warning/side{ tag = "icon-plasteel_warn_side (EAST)"; icon_state = "plasteel_warn_side"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dFN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning/end{ @@ -105349,9 +100061,7 @@ icon_state = "plasteel_warn_end"; dir = 4 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dFO" = ( /obj/machinery/mass_driver{ dir = 8; @@ -105363,16 +100073,12 @@ icon_state = "plasteel_warn_end"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "dFP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFQ" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -105380,9 +100086,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -105390,18 +100094,14 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -105414,18 +100114,14 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFU" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -105434,27 +100130,19 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFX" = ( /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFY" = ( /turf/closed/wall/r_wall, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dFZ" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plasteel/bot, @@ -105480,9 +100168,7 @@ pixel_x = -1 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dGc" = ( /obj/structure/table/wood, /obj/machinery/microwave{ @@ -105496,9 +100182,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dGd" = ( /obj/structure/table/wood, /obj/structure/sign/poster{ @@ -105510,9 +100194,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dGe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/device/radio/intercom{ @@ -105522,9 +100204,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dGf" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -105534,9 +100214,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dGg" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -105548,9 +100226,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dGh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -105558,9 +100234,7 @@ dir = 10; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dGi" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -105571,9 +100245,7 @@ icon_state = "2-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dGj" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105584,9 +100256,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dGk" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105596,9 +100266,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dGl" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105619,9 +100287,7 @@ icon_state = "2-8" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dGm" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105632,9 +100298,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dGn" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105645,9 +100309,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dGo" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -105725,9 +100387,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 10 }, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -105737,9 +100397,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGx" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -105748,9 +100406,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -105762,26 +100418,20 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -105796,18 +100446,14 @@ pixel_y = -24 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGD" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -105818,9 +100464,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGE" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105830,9 +100474,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGF" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -105842,9 +100484,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -105852,25 +100492,19 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGI" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGJ" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -105881,18 +100515,14 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGL" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -105903,9 +100533,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGM" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105916,9 +100544,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dGN" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105932,9 +100558,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dGO" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -105944,9 +100568,7 @@ /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dGP" = ( /obj/structure/cable/white{ tag = "icon-1-4"; @@ -105984,9 +100606,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/bot, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dGQ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106001,9 +100621,7 @@ icon_state = "whitegreen"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dGR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -106018,9 +100636,7 @@ dir = 4 }, /turf/open/floor/plasteel/warning/side, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dGS" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106030,9 +100646,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dGT" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106042,9 +100656,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dGU" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106055,9 +100667,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dGV" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106068,9 +100678,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dGW" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106080,9 +100688,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dGX" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -106097,9 +100703,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 6 }, -/area/maintenance/starboard{ - name = "Aft Starboard Maintenance" - }) +/area/maintenance/starboard/aft_starboard_maintenance) "dGY" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, @@ -106197,33 +100801,23 @@ /obj/structure/frame/computer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dHi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dHj" = ( /turf/open/floor/plasteel/grimy, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dHk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dHl" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/security/detectives_office{ - name = "Private Investigator's Office" - }) +/area/security/detectives_office/private_investigators_office) "dHm" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark{ @@ -106271,9 +100865,7 @@ name = "2maintenance loot spawner" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -106286,9 +100878,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -106301,9 +100891,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHv" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106313,9 +100901,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -106326,9 +100912,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -106341,9 +100925,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -106356,9 +100938,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHz" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -106372,9 +100952,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber{ @@ -106395,17 +100973,13 @@ name = "Bathroom" }, /turf/open/floor/plasteel/warning/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dHD" = ( /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dHE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -106419,9 +100993,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dHF" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -106436,9 +101008,7 @@ dir = 4 }, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dHG" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -106449,27 +101019,21 @@ icon_state = "pipe-c" }, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dHH" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dHI" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHJ" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -106479,9 +101043,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHK" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -106547,16 +101109,12 @@ /area/hallway/primary/aft) "dHP" = ( /turf/closed/wall, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dHQ" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/maintenance/aft{ - name = "Aft Maintenance" - }) +/area/maintenance/aft/Aft_Maintenance) "dHR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (WEST)"; @@ -106566,9 +101124,7 @@ /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dHS" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -106579,9 +101135,7 @@ on = 1 }, /turf/open/floor/plasteel/bot, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dHT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/side{ @@ -106589,9 +101143,7 @@ icon_state = "whitegreen"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dHU" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -106622,15 +101174,11 @@ req_access_txt = "13" }, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dHZ" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; @@ -106638,24 +101186,18 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIa" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (SOUTHEAST)"; @@ -106667,9 +101209,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dId" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -106681,9 +101221,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -106696,9 +101234,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIf" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable/white{ @@ -106706,35 +101242,27 @@ icon_state = "1-8" }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -106742,9 +101270,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -106755,9 +101281,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIl" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, @@ -106787,17 +101311,13 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/closed/wall, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIp" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -106808,9 +101328,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -106822,9 +101340,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIr" = ( /obj/effect/landmark/start{ name = "Scientist" @@ -106834,9 +101350,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIs" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -106845,9 +101359,7 @@ dir = 1 }, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIt" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -106865,9 +101377,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIu" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -106876,9 +101386,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIv" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -106890,9 +101398,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIw" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -107034,17 +101540,13 @@ /turf/open/floor/plasteel/whitegreen/corner{ dir = 8 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dIG" = ( /obj/machinery/light/small, /obj/machinery/iv_drip, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/corner, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dIH" = ( /obj/item/stack/cable_coil, /obj/structure/lattice/catwalk, @@ -107061,22 +101563,16 @@ /area/toxins/test_area) "dIJ" = ( /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIK" = ( /turf/closed/wall, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dIL" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dIM" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -107090,9 +101586,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dIN" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -107110,24 +101604,18 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dIO" = ( /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIQ" = ( /turf/closed/wall/r_wall, /area/toxins/storage) @@ -107141,9 +101629,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIS" = ( /obj/machinery/vending/coffee, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -107151,9 +101637,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; @@ -107166,16 +101650,12 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIV" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -107183,9 +101663,7 @@ on = 1 }, /turf/open/floor/plasteel/redyellow, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIW" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -107196,18 +101674,14 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dIX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIY" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -107220,9 +101694,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dIZ" = ( /obj/machinery/computer/med_data, /obj/machinery/status_display{ @@ -107317,15 +101789,11 @@ /area/shuttle/escape) "dJl" = ( /turf/closed/wall/r_wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dJm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dJn" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -107341,16 +101809,12 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dJo" = ( /obj/structure/sign/biohazard, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, -/area/medical/medbay{ - name = "Medbay Central" - }) +/area/medical/medbay) "dJp" = ( /turf/closed/wall/r_wall, /area/medical/virology) @@ -107393,18 +101857,14 @@ /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJu" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/weapon/folder, /obj/item/weapon/pen, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJv" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -107416,15 +101876,11 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -107432,48 +101888,36 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJy" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/black, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJz" = ( /obj/structure/table/wood, /obj/item/weapon/dice/d20, /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJA" = ( /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJB" = ( /obj/structure/chair/office/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJC" = ( /obj/structure/chair/office/dark, /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJD" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -107483,9 +101927,7 @@ pixel_y = 3 }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dJE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -107496,9 +101938,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -107507,9 +101947,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJG" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -107521,35 +101959,27 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJH" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJI" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/light/small{ dir = 1 }, /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -107567,9 +101997,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, @@ -107579,9 +102007,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJM" = ( /obj/structure/toilet{ tag = "icon-toilet00 (WEST)"; @@ -107594,9 +102020,7 @@ pixel_x = -32 }, /turf/open/floor/plasteel/neutral, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dJN" = ( /obj/machinery/disposal/bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -107604,9 +102028,7 @@ dir = 4 }, /turf/open/floor/plasteel/bot, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dJO" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -107617,9 +102039,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dJP" = ( /obj/machinery/vending/cola, /obj/machinery/light, @@ -107628,15 +102048,11 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dJQ" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plasteel/neutral/side, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dJR" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, @@ -107644,17 +102060,13 @@ /turf/open/floor/plasteel/neutral/side{ dir = 6 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dJS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJT" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -107665,9 +102077,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dJU" = ( /obj/machinery/computer/card, /obj/structure/cable/white{ @@ -107934,9 +102344,7 @@ /obj/structure/table_frame/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKs" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -107944,14 +102352,10 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKt" = ( /turf/open/floor/plasteel/black, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -107960,54 +102364,40 @@ icon_state = "1-2" }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKv" = ( /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKw" = ( /obj/structure/chair/office/dark{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKx" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/device/paicard, /turf/open/floor/carpet, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKy" = ( /obj/structure/table/wood, /obj/item/weapon/storage/pill_bottle/dice, /turf/open/floor/carpet, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKz" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dKA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -108016,9 +102406,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKC" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -108028,9 +102416,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKD" = ( /obj/machinery/atmospherics/components/trinary/filter{ density = 0; @@ -108043,9 +102429,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKE" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -108056,9 +102440,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/neutral, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -108066,16 +102448,12 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKG" = ( /obj/machinery/droneDispenser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKH" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -108088,9 +102466,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKI" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -108110,15 +102486,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/medical/research{ - name = "Research Division" - }) +/area/medical/research) "dKJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKK" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -108128,9 +102500,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dKL" = ( /obj/machinery/computer/crew, /obj/machinery/ai_status_display{ @@ -108460,47 +102830,35 @@ dir = 8 }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ icon_state = "wood-broken4" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLq" = ( /turf/open/floor/wood{ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLr" = ( /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLs" = ( /turf/open/floor/wood{ icon_state = "wood-broken5" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLt" = ( /obj/structure/chair/office/dark{ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLu" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck/cas{ @@ -108512,17 +102870,13 @@ pixel_y = 5 }, /turf/open/floor/carpet, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLv" = ( /obj/structure/table/wood, /obj/item/weapon/clipboard, /obj/item/weapon/folder/red, /turf/open/floor/carpet, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLw" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -108534,9 +102888,7 @@ pixel_x = 24 }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dLx" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -108546,18 +102898,14 @@ /turf/open/floor/plasteel/neutral/side{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -108574,9 +102922,7 @@ dir = 5 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLA" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108586,9 +102932,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -108599,9 +102943,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -108616,9 +102958,7 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLD" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108638,9 +102978,7 @@ icon_state = "1-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLE" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108650,9 +102988,7 @@ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLF" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108665,9 +103001,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLG" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108678,9 +103012,7 @@ }, /mob/living/simple_animal/cockroach, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLH" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108695,9 +103027,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLI" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108717,9 +103047,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLJ" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108730,9 +103058,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLK" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108743,9 +103069,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLL" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108759,9 +103083,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLM" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108773,9 +103095,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLN" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -108790,9 +103110,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLO" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -108804,9 +103122,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dLP" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -109196,15 +103512,11 @@ /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMv" = ( /obj/structure/bookcase, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -109216,17 +103528,13 @@ pixel_x = -1 }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMy" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (EAST)"; @@ -109239,31 +103547,23 @@ }, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMz" = ( /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ name = "blobstart" }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMB" = ( /obj/structure/chair/office/dark{ dir = 1 }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dMC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -109275,9 +103575,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dMD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -109288,9 +103586,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dME" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -109330,9 +103626,7 @@ dir = 4 }, /turf/closed/wall, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dMI" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -109340,9 +103634,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dMJ" = ( /obj/structure/closet, /obj/effect/landmark/costume, @@ -109351,17 +103643,13 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dMK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dML" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -109370,9 +103658,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dMM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -109380,9 +103666,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dMN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, @@ -109390,9 +103674,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dMO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -109712,9 +103994,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -109725,27 +104005,21 @@ tag = "icon-wood-broken6"; icon_state = "wood-broken6" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNv" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNw" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ @@ -109753,9 +104027,7 @@ icon_state = "1-8" }, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNy" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -109763,9 +104035,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken7" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNz" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ @@ -109778,16 +104048,12 @@ tag = "icon-wood-broken"; icon_state = "wood-broken" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNA" = ( /obj/machinery/photocopier, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNB" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, @@ -109796,27 +104062,21 @@ tag = "icon-wood-broken2"; icon_state = "wood-broken2" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dNC" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/item/device/flashlight/lamp, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dND" = ( /obj/structure/cable/white{ tag = "icon-1-2"; icon_state = "1-2" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dNE" = ( /turf/closed/wall, /area/chapel/office) @@ -110132,37 +104392,27 @@ "dOl" = ( /mob/living/simple_animal/cockroach, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dOm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dOn" = ( /turf/open/floor/wood{ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dOo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dOp" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dOq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -110172,9 +104422,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dOr" = ( /obj/structure/table, /obj/item/weapon/storage/box/gloves{ @@ -110592,24 +104840,18 @@ dir = 8 }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ tag = "icon-wood-broken"; icon_state = "wood-broken" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPe" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -110619,27 +104861,21 @@ tag = "icon-wood-broken5"; icon_state = "wood-broken5" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPg" = ( /obj/structure/destructible/cult/tome, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPh" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -110650,9 +104886,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dPj" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -110661,9 +104895,7 @@ /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dPk" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -111014,18 +105246,14 @@ /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPU" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/wood{ tag = "icon-wood-broken6"; icon_state = "wood-broken6" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPV" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, @@ -111033,9 +105261,7 @@ name = "revenantspawn" }, /turf/open/floor/plasteel/black, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dPW" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -111046,9 +105272,7 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dPX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -111056,9 +105280,7 @@ icon_state = "1-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dPY" = ( /obj/structure/table, /obj/item/weapon/wrench, @@ -111368,25 +105590,19 @@ pixel_y = 0 }, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dQK" = ( /turf/open/floor/wood{ icon_state = "wood-broken7" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dQL" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dQM" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -111395,9 +105611,7 @@ pixel_y = 3 }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dQN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -111412,18 +105626,14 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dQO" = ( /obj/effect/decal/cleanable/blood/old, /obj/item/organ/tongue/bone{ origin_tech = "biotech=0" }, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dQP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -111435,17 +105645,13 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dQQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dQR" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -111833,16 +106039,12 @@ /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRB" = ( /obj/structure/chair/office/dark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRC" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -111851,9 +106053,7 @@ tag = "icon-wood-broken5"; icon_state = "wood-broken5" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRD" = ( /obj/structure/table/wood, /obj/item/weapon/folder, @@ -111864,17 +106064,13 @@ dir = 5 }, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -111882,18 +106078,14 @@ /turf/open/floor/wood{ icon_state = "wood-broken4" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRH" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -111902,9 +106094,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/morgue{ @@ -111916,9 +106106,7 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (NORTHWEST)"; @@ -111926,9 +106114,7 @@ dir = 9 }, /turf/open/floor/plasteel/black, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -111936,9 +106122,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dRL" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -111946,9 +106130,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dRM" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -112262,9 +106444,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/device/flashlight/lamp, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSs" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -112273,9 +106453,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken5" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSt" = ( /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-21"; @@ -112288,9 +106466,7 @@ tag = "icon-wood-broken3"; icon_state = "wood-broken3" }, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSu" = ( /obj/structure/table/wood, /obj/item/clothing/under/rank/librarian, @@ -112299,27 +106475,21 @@ name = "2maintenance loot spawner" }, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSv" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSw" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSx" = ( /obj/structure/easel, /obj/effect/decal/cleanable/dirt, @@ -112327,46 +106497,34 @@ /obj/item/weapon/canvas/twentythreeXtwentythree, /obj/machinery/light/small, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSy" = ( /obj/structure/table/wood, /obj/item/weapon/storage/crayons, /obj/item/weapon/storage/crayons, /turf/open/floor/wood, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSz" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/weapon/paper_bin, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSA" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSB" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/device/taperecorder, /turf/open/floor/plasteel/black, -/area/library{ - name = "Abandoned Library" - }) +/area/library/abandoned_library) "dSC" = ( /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dSD" = ( /obj/structure/bodycontainer/morgue, /obj/structure/sign/poster{ @@ -112780,17 +106938,13 @@ dir = 8; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTm" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, @@ -113037,9 +107191,7 @@ dir = 6 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -113050,9 +107202,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -113062,9 +107212,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark{ @@ -113077,9 +107225,7 @@ dir = 1; heat_capacity = 1e+006 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTO" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ tag = "icon-manifold (NORTH)"; @@ -113087,9 +107233,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -113102,9 +107246,7 @@ dir = 9 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dTQ" = ( /turf/closed/wall/r_wall, /area/chapel/office) @@ -113339,18 +107481,14 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUo" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -113358,9 +107496,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -113372,9 +107508,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel/blue/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -113382,9 +107516,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel/blue/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -113397,18 +107529,14 @@ icon_state = "2-4" }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUt" = ( /obj/structure/cable/white{ tag = "icon-4-8"; icon_state = "4-8" }, /turf/open/floor/plasteel/blue/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -113416,9 +107544,7 @@ icon_state = "1-8" }, /turf/open/floor/plasteel/neutral/side, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (NORTHEAST)"; @@ -113674,24 +107800,18 @@ /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUW" = ( /obj/structure/sign/electricshock, /turf/closed/wall/r_wall, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUX" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/cable/white, /obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUY" = ( /obj/machinery/door/poddoor/shutters{ id = "evashutters2"; @@ -113704,9 +107824,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dUZ" = ( /obj/machinery/button/door{ id = "evashutters2"; @@ -113724,9 +107842,7 @@ icon_state = "plasteel_warn_side"; dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -113745,9 +107861,7 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/command{ @@ -113761,15 +107875,11 @@ icon_state = "plasteel_warn_side"; dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVc" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVd" = ( /obj/structure/bodycontainer/morgue, /obj/machinery/airalarm{ @@ -114069,33 +108179,25 @@ dir = 9 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVE" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/weapon/hand_labeler, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVF" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVG" = ( /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVH" = ( /obj/machinery/light{ dir = 1 @@ -114107,9 +108209,7 @@ pixel_y = 3 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVI" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -114119,9 +108219,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVJ" = ( /obj/structure/table/reinforced, /obj/item/weapon/clipboard, @@ -114130,17 +108228,13 @@ pixel_x = 26 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dVL" = ( /obj/structure/table, /obj/item/weapon/storage/box/gloves{ @@ -114401,21 +108495,15 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWm" = ( /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWn" = ( /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWo" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -114427,9 +108515,7 @@ on = 1 }, /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWp" = ( /obj/structure/cable/white{ tag = "icon-1-8"; @@ -114442,17 +108528,13 @@ dir = 9 }, /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWr" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ @@ -114470,9 +108552,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWs" = ( /obj/structure/bodycontainer/morgue, /obj/machinery/firealarm{ @@ -114665,32 +108745,24 @@ /obj/machinery/shieldwallgen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWP" = ( /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWR" = ( /obj/structure/rack, /obj/structure/cable/white{ @@ -114702,25 +108774,19 @@ /obj/item/device/radio, /obj/item/clothing/mask/breath, /turf/open/floor/plasteel/bot, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWT" = ( /obj/machinery/shieldwallgen, /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -114729,9 +108795,7 @@ name = "3maintenance loot spawner" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dWV" = ( /obj/machinery/door/morgue{ name = "Relic Closet"; @@ -114937,9 +109001,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dXo" = ( /obj/item/clothing/suit/hazardvest{ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; @@ -115020,16 +109082,12 @@ /turf/open/floor/plasteel/vault{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dXp" = ( /turf/open/floor/plasteel/warning{ dir = 8 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dXq" = ( /obj/structure/rack, /obj/structure/cable/white{ @@ -115041,17 +109099,13 @@ /obj/item/device/radio, /obj/item/clothing/mask/breath, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dXr" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/warning{ dir = 4 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dXs" = ( /obj/item/clothing/suit/hazardvest{ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; @@ -115130,16 +109184,12 @@ }, /obj/structure/closet/crate/internals, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dXt" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dXu" = ( /obj/structure/table/wood/fancy, /obj/item/weapon/spellbook/oneuse/smoke, @@ -115445,9 +109495,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYe" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -115457,9 +109505,7 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYf" = ( /obj/structure/cable/white{ tag = "icon-2-4"; @@ -115472,9 +109518,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -115484,9 +109528,7 @@ /turf/open/floor/plasteel/warning{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYh" = ( /obj/structure/cable/white, /obj/structure/cable/white{ @@ -115498,9 +109540,7 @@ icon_state = "1-4" }, /turf/open/floor/plasteel/delivery, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYi" = ( /obj/structure/cable/white{ tag = "icon-4-8"; @@ -115509,9 +109549,7 @@ /turf/open/floor/plasteel/warning{ dir = 9 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYj" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -115525,9 +109563,7 @@ /turf/open/floor/plasteel/warning{ dir = 1 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYk" = ( /obj/structure/cable/white{ tag = "icon-2-8"; @@ -115535,9 +109571,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYl" = ( /obj/structure/table/reinforced, /obj/structure/extinguisher_cabinet{ @@ -115546,9 +109580,7 @@ /obj/item/weapon/storage/toolbox/mechanical, /obj/item/device/flashlight, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYm" = ( /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -115807,9 +109839,7 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYO" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -115824,9 +109854,7 @@ /turf/open/floor/plasteel/warning{ dir = 10 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYP" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -115835,9 +109863,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel/warning, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYQ" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/light{ @@ -115847,18 +109873,14 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYR" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/light{ dir = 8 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYS" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -115867,9 +109889,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYT" = ( /obj/structure/cable/white{ tag = "icon-1-2"; @@ -115882,9 +109902,7 @@ /turf/open/floor/plasteel/warning{ dir = 6 }, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYU" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/rglass{ @@ -115896,9 +109914,7 @@ amount = 50 }, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dYV" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -116241,9 +110257,7 @@ /obj/structure/window/reinforced/fulltile, /obj/structure/cable/white, /turf/open/floor/plating, -/area/maintenance/fpmaint2{ - name = "Aft Port Maintenance" - }) +/area/maintenance/fpmaint2/aft_port_maintenance) "dZD" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -117179,9 +111193,7 @@ icon_state = "plasteel_warn_end"; dir = 8 }, -/area/toxins/mixing{ - name = "\improper Toxins Lab" - }) +/area/toxins/mixing) "ebG" = ( /turf/open/floor/engine, /area/engine/gravity_generator{ @@ -117329,17 +111341,13 @@ /turf/open/floor/plasteel/vault{ dir = 5 }, -/area/construction/hallway{ - name = "\improper MiniSat Exterior" - }) +/area/construction/minisat_exterior) "ebW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ebX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ tag = "icon-intact (EAST)"; @@ -117347,9 +111355,7 @@ dir = 4 }, /turf/open/floor/plasteel/red, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) "ebY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -117358,9 +111364,862 @@ dir = 4 }, /turf/open/floor/plasteel/delivery, -/area/maintenance/starboard{ - name = "Fore Starboard Maintenance" - }) +/area/maintenance/starboard/fore_starboard_maintenance) +"ebZ" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"eca" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ecb" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ecc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/quartermaster/sorting) +"ecd" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/quartermaster/sorting) +"ece" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/quartermaster/sorting) +"ecf" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/quartermaster/sorting) +"ecg" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ech" = ( +/obj/machinery/status_display, +/turf/closed/wall, +/area/quartermaster/sorting) +"eci" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ecj" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"eck" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ecl" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ecm" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ecn" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/quartermaster/sorting) +"eco" = ( +/turf/closed/wall, +/area/quartermaster/sorting) +"ecp" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/purple/side{ + tag = "icon-purple (NORTH)"; + icon_state = "purple"; + dir = 1 + }, +/area/quartermaster/miningdock) +"ecr" = ( +/turf/open/floor/plasteel/neutral, +/area/quartermaster/miningdock) +"ecs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/neutral, +/area/quartermaster/miningdock) +"ect" = ( +/turf/open/floor/plasteel/neutral, +/area/quartermaster/miningdock) +"ecu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/brown{ + tag = "icon-brown (EAST)"; + icon_state = "brown"; + dir = 4 + }, +/area/quartermaster/miningdock) +"ecv" = ( +/turf/open/floor/plasteel/neutral, +/area/quartermaster/miningdock) +"ecw" = ( +/turf/open/floor/plasteel/neutral, +/area/quartermaster/miningdock) +"ecx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/quartermaster/miningdock) +"ecy" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecz" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecA" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecB" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecC" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecD" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecE" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecF" = ( +/turf/closed/wall, +/area/hallway/primary/port) +"ecG" = ( +/turf/closed/wall, +/area/hallway/primary/port) +"ecH" = ( +/turf/closed/wall, +/area/hallway/primary/port) +"ecI" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecJ" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecK" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecL" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecM" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecN" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecO" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecP" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecQ" = ( +/turf/closed/wall, +/area/quartermaster/miningdock) +"ecR" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/crew_quarters/fitness) +"ecS" = ( +/obj/machinery/door/airlock/glass{ + name = "Holodeck Access" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/warning/side, +/area/space) +"ecT" = ( +/obj/structure/sign/nosmoking_2, +/turf/closed/wall, +/area/crew_quarters/fitness) +"ecU" = ( +/obj/machinery/door/airlock/glass{ + name = "Holodeck Access" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/warning/side, +/area/space) +"ecV" = ( +/turf/closed/wall, +/area/medical/medbay) +"ecW" = ( +/turf/closed/wall, +/area/medical/medbay) +"ecX" = ( +/turf/closed/wall, +/area/medical/medbay) +"ecY" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/space) +"ecZ" = ( +/turf/closed/wall, +/area/medical/medbay) +"eda" = ( +/turf/closed/wall, +/area/medical/medbay) +"edb" = ( +/turf/closed/wall, +/area/medical/medbay) +"edc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/space) +"edd" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/space) +"ede" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 1 + }, +/area/medical/medbay) +"edf" = ( +/turf/closed/wall, +/area/medical/medbay) +"edg" = ( +/turf/closed/wall, +/area/medical/medbay) +"edh" = ( +/turf/closed/wall, +/area/medical/medbay) +"edi" = ( +/turf/closed/wall, +/area/medical/medbay) +"edj" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/space) +"edk" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/space) +"edl" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/medbay) +"edm" = ( +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 4 + }, +/area/medical/medbay) +"edn" = ( +/turf/closed/wall, +/area/medical/medbay) +"edo" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/blue, +/area/medical/medbay) +"edp" = ( +/turf/open/floor/plasteel/blue, +/area/medical/medbay) +"edq" = ( +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 4 + }, +/area/medical/medbay) +"edr" = ( +/turf/closed/wall, +/area/medical/medbay) +"eds" = ( +/turf/closed/wall, +/area/medical/medbay) +"edt" = ( +/turf/closed/wall, +/area/medical/medbay) +"edu" = ( +/turf/closed/wall, +/area/medical/medbay) +"edv" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"edw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/medical/medbay) +"edx" = ( +/turf/closed/wall, +/area/medical/medbay) +"edy" = ( +/turf/open/floor/plasteel/purple, +/area/medical/research) +"edz" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay/front_office) +"edA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay/front_office) +"edB" = ( +/turf/closed/wall, +/area/medical/medbay/front_office) +"edC" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/blue, +/area/medical/medbay) +"edD" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"edE" = ( +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 4 + }, +/area/medical/medbay) +"edF" = ( +/turf/closed/wall, +/area/medical/medbay) +"edG" = ( +/turf/closed/wall, +/area/medical/medbay) +"edH" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"edI" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay/front_office) +"edJ" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/medbay) +"edK" = ( +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 1 + }, +/area/medical/medbay) +"edL" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/medbay) +"edM" = ( +/turf/closed/wall, +/area/medical/medbay) +"edN" = ( +/turf/closed/wall, +/area/medical/medbay) +"edO" = ( +/turf/open/floor/plasteel/purple, +/area/medical/research) +"edP" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/medbay/front_office) +"edQ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/blue, +/area/medical/medbay) +"edR" = ( +/turf/open/floor/plasteel/blue, +/area/medical/medbay) +"edS" = ( +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"edT" = ( +/turf/open/floor/plasteel/blue, +/area/medical/medbay) +"edU" = ( +/turf/closed/wall, +/area/medical/medbay) +"edV" = ( +/turf/closed/wall, +/area/medical/medbay) +"edW" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"edX" = ( +/turf/open/floor/plasteel/whiteblue/corner, +/area/medical/medbay/front_office) +"edY" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay/front_office) +"edZ" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/medbay) +"eea" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"eeb" = ( +/turf/open/floor/plasteel/whiteblue/corner, +/area/medical/medbay) +"eec" = ( +/turf/closed/wall, +/area/medical/medbay) +"eed" = ( +/turf/closed/wall, +/area/medical/medbay) +"eee" = ( +/obj/structure/sign/science, +/turf/closed/wall, +/area/medical/research) +"eef" = ( +/turf/closed/wall, +/area/medical/medbay/front_office) +"eeg" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay/front_office) +"eeh" = ( +/turf/closed/wall, +/area/medical/medbay/front_office) +"eei" = ( +/turf/closed/wall, +/area/medical/medbay/front_office) +"eej" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"eek" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/warning/side{ + tag = "icon-plasteel_warn_side (WEST)"; + icon_state = "plasteel_warn_side"; + dir = 8 + }, +/area/medical/medbay) +"eel" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/warning/side{ + tag = "icon-plasteel_warn_side (WEST)"; + icon_state = "plasteel_warn_side"; + dir = 8 + }, +/area/medical/medbay) +"eem" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"een" = ( +/obj/structure/sign/bluecross_2, +/turf/closed/wall, +/area/medical/medbay) +"eeo" = ( +/turf/closed/wall, +/area/medical/medbay) +"eep" = ( +/turf/closed/wall, +/area/medical/medbay) +"eeq" = ( +/turf/closed/wall, +/area/medical/medbay) +"eer" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"ees" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/whitepurple/corner{ + dir = 4 + }, +/area/medical/research) +"eet" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/whitepurple/corner{ + dir = 4 + }, +/area/medical/research) +"eeu" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"eev" = ( +/turf/open/floor/plasteel/purple, +/area/medical/research) +"eew" = ( +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"eex" = ( +/turf/open/floor/plasteel/purple, +/area/medical/research) +"eey" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"eez" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/purple, +/area/medical/research) +"eeA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"eeB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"eeC" = ( +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"eeD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"eeE" = ( +/turf/open/floor/plasteel/whitepurple/corner{ + dir = 8 + }, +/area/medical/research) +"eeF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/crew_quarters/abandoned_gambling_den) +"eeG" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/research) +"eeH" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/neutral, +/area/medical/research) +"eeI" = ( +/obj/machinery/status_display, +/turf/closed/wall, +/area/medical/medbay) +"eeJ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"eeK" = ( +/turf/closed/wall, +/area/medical/medbay) +"eeL" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"eeM" = ( +/turf/closed/wall, +/area/medical/medbay) +"eeN" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"eeO" = ( +/obj/machinery/status_display, +/turf/closed/wall, +/area/medical/medbay) +"eeP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"eeQ" = ( +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"eeR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"eeS" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"eeT" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/purple, +/area/medical/research) +"eeU" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"eeV" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"eeW" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"eeX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"eeY" = ( +/obj/item/weapon/twohanded/required/kirbyplants{ + icon_state = "plant-21"; + layer = 4.1; + pixel_x = -3; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"eeZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"efa" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"efb" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/turf/open/floor/plating, +/area/medical/medbay) +"efc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"efd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efe" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"eff" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"efg" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efi" = ( +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efj" = ( +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"efl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efm" = ( +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efn" = ( +/turf/open/floor/wood{ + tag = "icon-wood-broken2"; + icon_state = "wood-broken2" + }, +/area/crew_quarters/abandoned_gambling_den) +"efo" = ( +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"efr" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efs" = ( +/obj/item/weapon/twohanded/required/kirbyplants{ + icon_state = "plant-21"; + layer = 4.1; + pixel_x = -3; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"eft" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"efu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"efv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/abandoned_gambling_den) +"efw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) +"efx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"efy" = ( +/turf/closed/wall, +/area/medical/medbay) +"efz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/cmo, +/area/medical/medbay) +"efA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/medical/medbay) +"efB" = ( +/turf/closed/wall, +/area/medical/medbay) +"efC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/whiteblue/corner{ + dir = 8 + }, +/area/medical/medbay) +"efD" = ( +/turf/closed/wall, +/area/medical/medbay) +"efE" = ( +/turf/closed/wall, +/area/medical/medbay) +"efF" = ( +/turf/closed/wall, +/area/medical/medbay) +"efG" = ( +/turf/closed/wall, +/area/medical/medbay) +"efH" = ( +/turf/closed/wall, +/area/medical/medbay) +"efI" = ( +/turf/closed/wall, +/area/medical/medbay) +"efJ" = ( +/turf/closed/wall, +/area/medical/medbay) +"efK" = ( +/turf/closed/wall, +/area/medical/medbay) +"efL" = ( +/turf/closed/wall, +/area/medical/medbay) +"efM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/cmo, +/area/medical/medbay) +"efN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/neutral, +/area/medical/medbay) +"efO" = ( +/turf/closed/wall, +/area/medical/medbay) +"efP" = ( +/turf/closed/wall, +/area/medical/medbay) +"efQ" = ( +/turf/closed/wall, +/area/medical/medbay) +"efR" = ( +/turf/closed/wall, +/area/medical/medbay) +"efS" = ( +/turf/closed/wall, +/area/medical/medbay) +"efT" = ( +/turf/closed/wall, +/area/medical/medbay) +"efU" = ( +/turf/closed/wall, +/area/medical/medbay) +"efV" = ( +/turf/closed/wall, +/area/medical/medbay) +"efW" = ( +/turf/closed/wall, +/area/medical/medbay) +"efX" = ( +/turf/closed/wall, +/area/medical/medbay) +"efY" = ( +/turf/closed/wall, +/area/medical/medbay) +"efZ" = ( +/turf/closed/wall, +/area/medical/medbay) +"ega" = ( +/turf/closed/wall, +/area/medical/medbay) (1,1,1) = {" aaa @@ -138348,11 +133207,11 @@ aHW dcs aHW dcs -aPD +eeP diG dkt dlW -aNZ +efd dcs aHW dcs @@ -138605,11 +133464,11 @@ daN dct ddL daP -aMr +eeQ diH dku dlW -aNZ +efe ddQ dqt drZ @@ -139117,15 +133976,15 @@ cYt bWg daP dcv -aMr -aKI -aPD +eeC +eeF +eeR diI dkw dlX diJ -aNZ -aMr +efh +efi dfL dtq aHW @@ -139382,7 +134241,7 @@ dgS dgS dgS doG -aMr +efj dsb diK dcs @@ -139640,9 +134499,9 @@ dkx diJ doH dqv -aNZ -aNZ -aPD +efp +efr +efu diJ dcs aaa @@ -139888,7 +134747,7 @@ cYu bWg daS dcy -aNZ +eeD dfH dgT dgT @@ -140151,9 +135010,9 @@ dgU dgT dky dgU -aPD +eff doH -aPD +efk dsc dts diJ @@ -140405,15 +135264,15 @@ dcz ddQ dfI dgU -aPD +eeW dkz dfL dgT doH -aNZ +efl dsc dtt -aNZ +efv dwf aHW aaf @@ -140657,20 +135516,20 @@ cVa cWL cYw bWg -aPD +eer dcz ddR dfI -aPD +eeS diJ diJ dfL dkx doH -aMr +efm dsd dtu -aPD +efw dwg dcs aaa @@ -140924,7 +135783,7 @@ dgV dlZ dnz doI -aNY +efn dse dtv dcs @@ -141179,9 +136038,9 @@ dgW diK dkA dma -aNZ +efg doJ -aMr +efo dfL dtw aHW @@ -141691,13 +136550,13 @@ ddV dfM ddV diL -aRq +eeY dmb dnA doK dqw diJ -aRq +efs aHW aaf aaa @@ -145482,7 +140341,7 @@ aIU aZy aNV aJg -aib +ecF bms bor bqk @@ -145739,7 +140598,7 @@ bdD bfx aNV aJh -aib +ecG bmt bos bql @@ -145996,7 +140855,7 @@ bdE bcq aNV aJg -aib +ecH bmu bot bot @@ -147520,14 +142379,14 @@ aCs awX aic aoQ -aHW -aHW -aHW -aHW +aGe +aGe +aGe +aGe aNW aPC -aHW -aHW +aGe +aGe avX aWz aoT @@ -147777,14 +142636,14 @@ aCt awX aoS aGH -aHW +aGe aJj aKF aMo aNX aPD aRq -aHW +aGe aoQ aGI aro @@ -148034,14 +142893,14 @@ aCu aDR aFk aGI -aHW +aGe aJk aKG aMp aNY aNZ aRr -aHW +aGe aUD aic aib @@ -148291,14 +143150,14 @@ aCv aDS aFl aGI -aHW +aGe aJl aKH aMq aNZ aPE aRs -aHW +aGe awZ aic aic @@ -148548,14 +143407,14 @@ aCw awX aqg aoT -aHW +aGe aJm aKI aMr aOa aPF aRt -aHW +aGe aUE aWA aWA @@ -148626,7 +143485,7 @@ cYF cZR dbj dcJ -cOW +eeE dad dhq djj @@ -148805,14 +143664,14 @@ aCx aDQ aqg aGJ -aHW +aGe aJn aKJ aMs aOb aPG aRu -aHW +aGe aUF aWB aWB @@ -148882,7 +143741,7 @@ cXd cYG cZS dbk -cLI +eeu deu dgf dhr @@ -149062,14 +143921,14 @@ aCp awX aFm aGJ -aHW +aGe aJo aKK aMt aNZ aPH aJm -aHW +aGe aUG aWB aYd @@ -149139,7 +143998,7 @@ cXe cOK cZT dbk -cLH +eev dev dgg dhs @@ -149319,14 +144178,14 @@ awX awX aFm aoT -aHW -aHW -aHW -aHW +aGe +aGe +aGe +aGe aNW aPI -aHW -aHW +aGe +aGe aUH aWC aYe @@ -149398,7 +144257,7 @@ cZU dbl dcK dew -cIi +eeG dht djm dlb @@ -149910,7 +144769,7 @@ cXh cYJ cHS dbn -cLI +eew dex cJL cJL @@ -150167,7 +145026,7 @@ cHS cHS cHS dbo -cLH +eex dex dgi dhv @@ -150674,11 +145533,11 @@ cLt cNb cOP cQK -cLI -cLH -cLI -cLH -cLI +edv +edy +edH +edO +edW cZW dbq dcN @@ -151451,8 +146310,8 @@ cVr cXi cTO cZZ -cNp -cLE +ees +eey dez dgn dhz @@ -151709,7 +146568,7 @@ cXj cYL daa dbt -cLD +eez dez dgo dhA @@ -151966,7 +146825,7 @@ cXk cVu dab dbo -cLE +eeA dez dgp dhB @@ -152480,7 +147339,7 @@ cXm cYM dac dbo -cLE +eeB dez dgr dhD @@ -152992,12 +147851,12 @@ cTS cVx cXo cYO -cKc +eee dbw dcM deD -cLA -cLB +eeH +eeT djz dlo dmG @@ -153507,7 +148366,7 @@ cVz cXq cYQ dad -cNp +eet dcT deF dgu @@ -156767,16 +151626,16 @@ asW asW asW asW -aBM +ebZ aCT -aEk -aEk +ecc +ece aHc -aEk -aBM -aBM -aBM -aBM +ecf +ecg +eci +ecj +ecl aBM aRL aTt @@ -156843,7 +151702,7 @@ cNu cPj cQW cIw -cKs +cXz cVL cXz cVL @@ -157024,16 +151883,16 @@ axn ayB azD aAA -aBM +eca aCU -aEk +ecd aFG aHd aIi aJD aLc aMR -aBM +ecm aQd aRM aTu @@ -157100,7 +151959,7 @@ cNv cPk cQX cSr -cKs +cXz cVM cXA cYZ @@ -157281,7 +152140,7 @@ asW asW azE asW -aBM +ecb aCV aEl aFH @@ -157290,7 +152149,7 @@ aIj aJE aLd aMS -aEk +ecn aQe aRN aTv @@ -157614,7 +152473,7 @@ cNx cPm cQZ cSt -cUf +ddg cVO cXC cZb @@ -158058,10 +152917,10 @@ aEn aFK aHh aIm -aJG +ech aLg -aBM -aBM +eck +eco aQh aRQ aTy @@ -158385,7 +153244,7 @@ cNx cPp cLM cSw -cKs +cXz cVR cXF cXF @@ -158899,7 +153758,7 @@ cNx cPp cLM cSy -cKs +cXz cVT cXz cZf @@ -159156,11 +154015,11 @@ cNx cPp cLL cSz -cIs +edz cVU cXH cZg -cKs +eef dbR ddh deW @@ -159929,9 +154788,9 @@ cLM cSA cUk cVX -cLM -cSA -cIs +edP +edX +eeg dbT ddk deY @@ -160184,11 +155043,11 @@ cNA cPs cRa cSB -cIs +edA cVY cXK cZj -cKs +eeh dbT ddj deY @@ -160441,11 +155300,11 @@ cNB cPt cIs cIw -cKs -cIs +edB +edI cXL -cIs -cKs +edY +eei dbT ddl deZ @@ -160692,9 +155551,9 @@ bkT cFG ebU cIg -cKs +ecV cLQ -cNv +ede cPu cRb cRb @@ -160949,15 +155808,15 @@ bBy cFH boH cIy -cKs +ecW cLR cNC cPv -cLO +edo cSC -cLO +edC cSC -cLO +edQ cZl daq dbV @@ -161206,7 +156065,7 @@ cEb cFI cHb cIz -cKs +ecX cLS cND cPw @@ -161407,7 +156266,7 @@ aQp aSb aTG aVj -aXb +ecp aYJ ban bbI @@ -161415,9 +156274,9 @@ bcU bes bgg bid -aXb +ecz blf -aXb +ecJ boZ boZ brQ @@ -161477,11 +156336,11 @@ dar dbX ddp dfd -cIu -cIs +eeI +eeU cWd cWd -cIs +efa dok dpR drw @@ -161666,15 +156525,15 @@ aTH aVk aXg aYK -aYF +ecq bbJ -bcQ +ecs bet bgh bie bjK blg -aXb +ecK aaa aaf aaa @@ -161734,7 +156593,7 @@ cVZ dbY ddj dfe -cIs +eeJ dib dkb dkb @@ -161931,7 +156790,7 @@ bgi bif bjL blh -aXb +ecL aaa bqw bqw @@ -161991,7 +156850,7 @@ das dbZ ddq dfe -cKs +eeK dic dkc dlP @@ -162186,9 +157045,9 @@ bcW bev bgj big -aXb +ecA bbO -aXb +ecM aaf bqw brR @@ -162248,7 +157107,7 @@ cWb dca ddr dff -cIs +eeL did dkd dlQ @@ -162442,10 +157301,10 @@ bbM bcX bew bgk -aXb -aXb +ecy +ecB bli -aXb +ecN aaa bqw brS @@ -162505,7 +157364,7 @@ dar dcb ddk deY -cKs +eeM die dke dlR @@ -162700,9 +157559,9 @@ bcX bex bgj bih -aXb +ecC bar -aXb +ecO aaa bqw brT @@ -162749,7 +157608,7 @@ cFO cHh cIB cDg -cKs +ecZ cNH cPC cRb @@ -162762,7 +157621,7 @@ dat dcc ddj deY -cIs +eeN dib dkb dkb @@ -162952,14 +157811,14 @@ aVp aNg aYO bar -bbF +ecr bcY -bbF +ecv bgl bii -aXb +ecD blj -aXb +ecP aaa bqw brU @@ -163006,24 +157865,24 @@ cFP cHi cIC cDg -cKs +eda cNI -cLM -cLL -cNw +edl +edp +edw cUr -cLM -cLL -cLM +edJ +edR +edZ dau dcd ddk dfg -cIu -cIs +eeO +eeV cWd cWd -cIs +efb dok dpR drC @@ -163039,8 +157898,8 @@ dol dol dch dGN -cKs -cKs +efX +efZ dJl dJp dJp @@ -163210,13 +158069,13 @@ aNg aYP bas bbO -bbF -bbF +ect +ecw bgm bij -aXb -aXb -aXb +ecE +ecI +ecQ aaf bqw brV @@ -163263,10 +158122,10 @@ cFK cHd cDg cDg -cKs +edb cNJ -cKp -cKp +edm +edq cSJ cPw cRc @@ -163278,17 +158137,17 @@ dds dfh dav dif -cZh -cZh -cZh +eeX +eeZ +efc don dif drD -cZh -cZh -cZh +efq +eft +efx dwV -cZh +efC dzn dif dif @@ -163467,7 +158326,7 @@ aNh aYQ bat bbP -bbG +ecu bey bgn bik @@ -163525,10 +158384,10 @@ cNK cNK cRi cLV -cIs +edD cWd cWd -cIs +eea daw dbY ddt @@ -163725,7 +158584,7 @@ aYR bau bbQ bcZ -aXf +ecx bgo aYR bgp @@ -163783,10 +158642,10 @@ cPD cRj cLV cUs -cKi -cSu +edK +edS cZq -cIs +eej dce ddu dfj @@ -164060,15 +158919,15 @@ dgI daA dwW dyj -cKs +efE daA dwW dyj -cKs +efQ dch dGR -cKs -cKs +efY +ega dJl dJp dKY @@ -164300,7 +159159,7 @@ cUu cWf cXS cZs -cIt +eek dbY ddj dfe @@ -164315,13 +159174,13 @@ drG dtb dgI dvI -cNx +efz dyk -cKs +efF dvI -cNx +efM dyk -cKs +efR dFm dGS cDe @@ -164553,11 +159412,11 @@ cNN cPE cRm cSL -cKp -cLM -cLL -cSA -cIt +edE +edL +edT +eeb +eel dbY ddk dfe @@ -164572,13 +159431,13 @@ drH dtc dgI dvJ -cNw +efA dyl -cKs +efG dvJ -cNw +efN dyl -cKs +efS dFn dGT daM @@ -164814,7 +159673,7 @@ cUv cWg cXT cZt -cIs +eem dbY ddj dfe @@ -164831,11 +159690,11 @@ dgI dvK dwX dym -cKs +efH dvK dwX dym -cKs +efT cHd dGU cDe @@ -165067,11 +159926,11 @@ cID cID cLV cLV -cKs -cKs -cKs -cKs -cIw +edF +edM +edU +eec +een dce ddw dfk @@ -165088,11 +159947,11 @@ dgI dvL dwY dyn -cKs +efI dvL dwY dyn -cKs +efU dFo dGV cDe @@ -165320,15 +160179,15 @@ cHk cIJ cKC cMc -cKs +edf cPG -cKs +edr cSM cUw cWh cXU cZu -cKs +eeo dcf ddj dfe @@ -165345,11 +160204,11 @@ dgI dvM dwZ dyo -cKs +efJ dvM dwZ dyo -cKs +efV dFp dGU cDe @@ -165599,14 +160458,14 @@ dqf drK dtf dgI -cKs -cKs -cKs -cKs -cKs -cKs -cKs -cKs +efy +efB +efD +efK +efL +efO +efP +efW cHd dGW daM @@ -165834,9 +160693,9 @@ cHm cIL cKE cMe -cKs +edg cPI -cKs +eds cSO cUy cWj @@ -166348,15 +161207,15 @@ cHn cvP cKG cMg -cKs +edh cPK -cKs +edt cSQ cUA cWl cXX cZy -cKs +eep dbY ddy dfe @@ -166605,15 +161464,15 @@ cHo cvP cKH cHc -cKs -cKs -cKs -cKs -cKs -cKs -cKs -cKs -cKs +edi +edn +edu +edx +edG +edN +edV +eed +eeq dch ddz dfo @@ -173283,7 +168142,7 @@ aaa cqf cEF cqe -cGl +ecT cIV cqf aaa @@ -173537,14 +168396,14 @@ aaf czf cAR cAR -cAR +ecR cEG cqf cqf cIW cKT -cKT -cKT +edc +edj cPX aaf cqe @@ -173789,7 +168648,7 @@ aaf aaf aaf aaf -cqf +brL aaa czg cAS @@ -173804,7 +168663,7 @@ cAS cAS cPY aaa -cqf +brL aaf aaf aaf @@ -174046,7 +168905,7 @@ aaa aaa aaa aaf -cqf +brL aaa czg cAS @@ -174061,7 +168920,7 @@ cAS cAS cPY aaa -cqf +brL aaf aaa aaa @@ -174303,7 +169162,7 @@ agg aaf aaf aaf -cqf +brL aaf czh cAT @@ -174318,7 +169177,7 @@ cAS cOa cPZ aaf -cqf +brL aaf agg aaa @@ -174560,7 +169419,7 @@ aaa aaa aaa aaf -cqf +brL aaa czg cAS @@ -174575,7 +169434,7 @@ cAS cAS cPY aaa -cqf +brL aaf agg aaa @@ -174817,7 +169676,7 @@ aaa aaa agg aaf -cqf +brL aaa czg cAS @@ -174832,7 +169691,7 @@ cAS cAS cPY aaa -cqf +brL aaf agg aaa @@ -175074,22 +169933,22 @@ aaa aaa agg aaf -cqe +aGe aaf czi cAR cAR cAR cEH -cqf -cqf +brL +brL cIX -cKT -cKT -cKT +ecY +edd +edk cQa aaf -cqe +aGe aaf agg aaa @@ -175331,22 +170190,22 @@ aaa aaa aaa aaf -cqf +brL aaa aaa aaf aaa -cqf +brL cEI cGl -cqe +aGe cIY -cqf +brL aaa aaf aaa aaa -cqf +brL aaf aaa aaa @@ -175588,22 +170447,22 @@ aaa aaa aaa aaf -cqf -cqf -cqf -cqf -cqf -cqf -cEE -cqf -cqf -cIU -cqf -cqf -cqf -cqf -cqf -cqf +brL +brL +brL +brL +brL +brL +ecS +brL +brL +ecU +brL +brL +brL +brL +brL +brL aaf agg aaa @@ -175850,12 +170709,12 @@ aaf aaf aaf aaf -cqf +brL cEJ cGm cHE cIZ -cqf +brL aaf aaf aaf @@ -176364,12 +171223,12 @@ aaa aaa aaa aaa -cqf +brL cEL cGo cHG cJb -cqf +brL aaa aaa aaa @@ -176621,12 +171480,12 @@ aaa aaa aaa aaa -cqf -cqf -cqf -cqf -cqf -cqf +brL +brL +brL +brL +brL +brL aaa aaa aaa diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index ad2fe9cf530..a931ca749b1 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -125,6 +125,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Arrivals North Maintenance" icon_state = "fpmaint" +/area/maintenance/fpmaint2/port_maintenance + name = "Port Maintenance" + icon_state = "fpmaint" + +/area/maintenance/fpmaint2/fore_port_maintenance + name = "Arrivals North Maintenance" + icon_state = "fpmaint" + +/area/maintenance/fpmaint2/aft_port_maintenance + name = "Aft Port Maintenance" + icon_state = "fpmaint" + /area/maintenance/fsmaint name = "Dormitory Maintenance" icon_state = "fsmaint" @@ -157,6 +169,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Starboard Maintenance" icon_state = "smaint" +/area/maintenance/starboard/aft_starboard_maintenance + name = "Aft Starboard Maintenance" + icon_state = "smaint" + +/area/maintenance/starboard/fore_starboard_maintenance + name = "Fore Starboard Maintenance" + icon_state = "smaint" + /area/maintenance/port name = "Locker Room Maintenance" icon_state = "pmaint" @@ -165,6 +185,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Engineering Maintenance" icon_state = "amaint" +/area/maintenance/aft/Aft_Maintenance + name = "Aft Maintenance" + icon_state = "amaint" + /area/maintenance/storage name = "Atmospherics" icon_state = "green" @@ -181,6 +205,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Electrical Maintenance" icon_state = "yellow" + //Hallway /area/hallway/primary/fore @@ -231,6 +256,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Captain's Office" icon_state = "captain" +/area/crew_quarters/captain/captains_quarters + name = "Captain's Quarters" + icon_state = "captain" + /area/crew_quarters/courtroom name = "Courtroom" icon_state = "courtroom" @@ -314,6 +343,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Bar" icon_state = "bar" +/area/crew_quarters/bar/atrium + name = "Atrium" + icon_state = "bar" + +/area/crew_quarters/electronic_marketing_den + name = "Electronic Marketing Den" + icon_state = "bar" + +/area/crew_quarters/abandoned_gambling_den + name = "Abandoned Gambling Den" + icon_state = "bar" + /area/crew_quarters/theatre name = "Theatre" icon_state = "Theatre" @@ -323,6 +364,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "library" flags = NONE +/area/library/abandoned_library + name = "Abandoned Library" + icon_state = "library" + flags = NONE + /area/chapel icon_state = "chapel" ambientsounds = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg') @@ -441,7 +487,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Teleporter /area/teleporter - name = "Teleporter" + name = "Teleporter Room" icon_state = "teleporter" music = "signal" @@ -453,7 +499,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //MedBay /area/medical/medbay - name = "Medbay" + name = "Medbay Central" + icon_state = "medbay" + music = 'sound/ambience/signal.ogg' + +/area/medical/medbay/front_office + name = "Medbay Front Office" + icon_state = "medbay" + music = 'sound/ambience/signal.ogg' + +/area/medical/medbay/lobby + name = "Medbay Lobby" icon_state = "medbay" music = 'sound/ambience/signal.ogg' @@ -463,11 +519,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "medbay2" music = 'sound/ambience/signal.ogg' +/area/medical/medbay2/medbay_storage + name = "Medbay Storeage" + icon_state = "medbay2" + music = 'sound/ambience/signal.ogg' + /area/medical/medbay3 name = "Medbay" icon_state = "medbay3" music = 'sound/ambience/signal.ogg' +/area/medical/abandoned_medbay + name = "Abandoned Medbay" + icon_state = "medbay3" + music = 'sound/ambience/signal.ogg' + /area/medical/patients_rooms name = "Patients' Rooms" icon_state = "patients" @@ -481,7 +547,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "medresearch" /area/medical/research - name = "Medical Research" + name = "Research Division" + icon_state = "medresearch" + +/area/medical/research/research_lobby + name = "Research Division Lobby" + icon_state = "medresearch" + +/area/medical/research/abandoned_research_lab + name = "Abandoned Research Lab" icon_state = "medresearch" /area/medical/virology @@ -557,6 +631,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "detective" ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg') +/area/security/detectives_office/private_investigators_office + name = "Private Investigator's Office" + icon_state = "detective" + ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg') + /area/security/range name = "Firing Range" icon_state = "firingrange" @@ -616,6 +695,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Delivery Office" icon_state = "quartstorage" +/area/quartermaster/warehouse + name = "Warehouse" + icon_state = "quartstorage" + ////////////WORK IN PROGRESS////////// /area/quartermaster/office @@ -634,9 +717,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Mining Dock" icon_state = "mining" +/area/quartermaster/miningoffice + name = "Mining Office" + icon_state = "mining" + /area/quartermaster/miningstorage name = "Mining Storage" - icon_state = "green" + icon_state = "mining" /area/quartermaster/mechbay name = "Mech Bay" @@ -651,6 +738,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Hydroponics" icon_state = "hydro" +/area/hydroponics/Abandoned_Garden + name = "Abandoned Garden" + icon_state = "hydro" + //Toxins /area/toxins/lab @@ -675,7 +766,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxtest" /area/toxins/mixing - name = "Toxins Mixing Room" + name = "Toxins Mixing Lab" icon_state = "toxmix" /area/toxins/misc_lab @@ -683,7 +774,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxmisc" /area/toxins/server - name = "Server Room" + name = "Research Division Server Room" icon_state = "server" /area/toxins/explab @@ -744,6 +835,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Construction Area" icon_state = "yellow" +/area/construction/minisat_exterior + name = "Minisat Exterior" + icon_state = "yellow" + /area/mining_construction name = "Auxillary Base Construction" icon_state = "yellow" From a4f5a5b7af816494e5babf4ec242649117ffe21b Mon Sep 17 00:00:00 2001 From: Christopher Date: Sun, 29 Jan 2017 19:24:42 +1100 Subject: [PATCH 14/44] Spelling error fixed. --- code/game/area/Space_Station_13_areas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index a931ca749b1..931eb89320f 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -520,7 +520,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station music = 'sound/ambience/signal.ogg' /area/medical/medbay2/medbay_storage - name = "Medbay Storeage" + name = "Medbay Storage" icon_state = "medbay2" music = 'sound/ambience/signal.ogg' From effa9cc55e2e828fbc1d8be126c21eef7573970c Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 29 Jan 2017 03:29:55 -0500 Subject: [PATCH 15/44] Plant Analyzer Info Tweak --- code/modules/hydroponics/grown.dm | 16 ++++------------ code/modules/hydroponics/seeds.dm | 6 ++++++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index bd8cfb4cd3a..147d0a89e51 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -61,20 +61,12 @@ var/msg = "*---------*\n This is \a [src].\n" if(seed) msg += seed.get_analyzer_text() - msg += "\n- Nutritional value: [reagents.get_reagent_amount("nutriment")]\n" - msg += "- Other substances: [reagents.total_volume-reagents.get_reagent_amount("nutriment")]\n" - msg += "*---------*" - - var/list/scannable_reagents = list("charcoal" = "Anti-Toxin", "morphine" = "Morphine", "amatoxin" = "Amatoxins", - "toxin" = "Toxins", "mushroomhallucinogen" = "Mushroom Hallucinogen", "condensedcapsaicin" = "Condensed Capsaicin", - "capsaicin" = "Capsaicin", "frostoil" = "Frost Oil", "gold" = "Mineral Content", "glycerol" = "Glycerol", - "radium" = "Highly Radioactive Material", "uranium" = "Radioactive Material") var/reag_txt = "" if(seed) - for(var/reagent_id in scannable_reagents) - if(reagent_id in seed.reagents_add) - var/amt = reagents.get_reagent_amount(reagent_id) - reag_txt += "\n- [scannable_reagents[reagent_id]]: [amt*100/reagents.maximum_volume]%" + for(var/reagent_id in seed.reagents_add) + var/datum/reagent/R = chemical_reagents_list[reagent_id] + var/amt = reagents.get_reagent_amount(reagent_id) + reag_txt += "\n- [R.name]: [amt]" if(reag_txt) msg += reag_txt diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 16ace71d357..cf1cf93cdfe 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -290,6 +290,12 @@ text += "- Weed Vulnerability: [weed_chance]\n" if(rarity) text += "- Species Discovery Value: [rarity]\n" + var/all_traits = "" + for(var/datum/plant_gene/trait/traits in genes) + if(istype(traits, /datum/plant_gene/trait/plant_type)) + continue + all_traits += " [traits.get_name()]" + text += "- Plant Traits:[all_traits]\n" text += "*---------*" From 9b4081fac952917932fc12ad9c9a78b9844c6f6a Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sun, 29 Jan 2017 12:51:22 -0500 Subject: [PATCH 16/44] Fixes proselytizer repair doubling the target's name --- .../clock_cult/clock_helpers/proselytizer_helpers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm index 293f277c0e2..89e550b1f8e 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm @@ -363,14 +363,14 @@ /mob/living/silicon/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) . = TRUE if(proselytizer_heal(user, proselytizer) && user) - user.visible_message("[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] [src] with glowing orange energy.", \ + user.visible_message("[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.") //Same with clockwork mobs. /mob/living/simple_animal/hostile/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) . = TRUE if(proselytizer_heal(user, proselytizer) && user) - user.visible_message("[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] [src] with glowing orange energy.", \ + user.visible_message("[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [health]/[maxHealth] health.") //Cogscarabs get special interaction because they're drones and have innate self-heals/revives. From 6df4e916a999af0f6240b47daa0f9b9ac0b8c641 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 29 Jan 2017 12:59:28 -0500 Subject: [PATCH 17/44] Fixes cryo tubes remembering their occupants --- .../atmospherics/machinery/components/unary_devices/cryo.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 7e4183d908c..9d6ca79d735 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -181,6 +181,7 @@ if(isliving(M)) var/mob/living/L = M L.update_canmove() + occupant = null /obj/machinery/atmospherics/components/unary/cryo_cell/close_machine(mob/living/carbon/user) if((isnull(user) || istype(user)) && state_open && !panel_open) From 7a880e75f82666035365b6f294a7dfbee87e1759 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 29 Jan 2017 13:59:00 -0500 Subject: [PATCH 18/44] Fix some weirdness with Metastation field generators --- _maps/map_files/MetaStation/MetaStation.dmm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 64b8bc55380..9353f513848 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -20990,17 +20990,11 @@ }) "aJT" = ( /obj/effect/decal/cleanable/cobweb, -/obj/machinery/field/generator{ - anchored = 0; - state = 2 - }, +/obj/machinery/field/generator, /turf/open/floor/plating, /area/engine/engineering) "aJU" = ( -/obj/machinery/field/generator{ - anchored = 0; - state = 2 - }, +/obj/machinery/field/generator, /turf/open/floor/plating, /area/engine/engineering) "aJV" = ( From 8d984ef59c137951541e4027800544e123490690 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sun, 29 Jan 2017 20:00:24 -0800 Subject: [PATCH 19/44] Adds an editorconfig Prevents github putting newlines at the end of files in the web editor (something that would make expanding the context on the diff annoying to do. Sets the default tab size to be the same as DM. --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..d90dd34b993 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,4 @@ +[*] +insert_final_newline = false +indent_style = tab +indent_size = 4 From e78185c9686eee6d7e0547203ea5c4b975de4a40 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Mon, 30 Jan 2017 00:20:08 -0800 Subject: [PATCH 20/44] Adds a topic limiter. (#23478) * Adds a topic limiter. This appiles to all non-admins, the rate is configurable but defaults to 10 in any second and 100 in any minute. Hitting the minute limit causes a notification to go to admins (once per minute) The user is always notifed when a topic is ignored so they know whats going on. If they trigger a notification to admins they are told about this as well. * This makes more sense --- code/__DEFINES/admin.dm | 1 + code/controllers/configuration.dm | 8 +++- code/modules/client/client_defines.dm | 5 ++- code/modules/client/client_procs.dm | 55 +++++++++++++++++++++++---- config/config.txt | 10 +++++ 5 files changed, 70 insertions(+), 9 deletions(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index a50bf74d557..c85e06eb616 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -44,6 +44,7 @@ #define ADMIN_SM(user) "(SM)" #define ADMIN_TP(user) "(TP)" #define ADMIN_BSA(user) "(BSA)" +#define ADMIN_KICK(user) "(KICK)" #define ADMIN_CENTCOM_REPLY(user) "(RPLY)" #define ADMIN_SYNDICATE_REPLY(user) "(RPLY)" #define ADMIN_SC(user) "(SC)" diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 7b8f3d2b722..4cd2df43e1c 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -232,6 +232,9 @@ var/list/gamemode_cache = null + var/minutetopiclimit + var/secondtopiclimit + /datum/configuration/New() gamemode_cache = typecacheof(/datum/game_mode,TRUE) for(var/T in gamemode_cache) @@ -482,7 +485,10 @@ config.client_error_version = text2num(value) if("client_error_message") config.client_error_message = value - + if("minute_topic_limit") + config.minutetopiclimit = text2num(value) + if("second_topic_limit") + config.secondtopiclimit = text2num(value) else diary << "Unknown setting in configuration: '[name]'" diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 7c18b69d356..9b9adff580b 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -59,4 +59,7 @@ var/avgping = 0 var/connection_time //world.time they connected var/connection_realtime //world.realtime they connected - var/connection_timeofday //world.timeofday they connected \ No newline at end of file + var/connection_timeofday //world.timeofday they connected + + var/inprefs = FALSE + var/list/topiclimiter \ No newline at end of file diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index c292196e069..cd5d28757fb 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -3,6 +3,12 @@ //////////// #define UPLOAD_LIMIT 1048576 //Restricts client uploads to the server to 1MB //Could probably do with being lower. +#define LIMITER_SIZE 5 +#define CURRENT_SECOND 1 +#define SECOND_COUNT 2 +#define CURRENT_MINUTE 3 +#define MINUTE_COUNT 4 +#define ADMINSWARNED_AT 5 /* When somebody clicks a link in game, this Topic is called first. It does the stuff in this proc and then is redirected to the Topic() proc for the src=[0xWhatever] @@ -18,16 +24,55 @@ - If so, is there any protection against somebody spam-clicking a link? If you have any questions about this stuff feel free to ask. ~Carn */ -/client/var/inprefs = FALSE + /client/Topic(href, href_list, hsrc) if(!usr || usr != mob) //stops us calling Topic for somebody else's client. Also helps prevent usr=null return + // asset_cache if(href_list["asset_cache_confirm_arrival"]) //src << "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED." var/job = text2num(href_list["asset_cache_confirm_arrival"]) - completed_asset_jobs += job - return + //because we skip the limiter, we have to make sure this is a valid arrival and not somebody tricking us + // into letting append to a list without limit. + if (job && job <= last_asset_job && !(job in completed_asset_jobs)) + completed_asset_jobs += job + return + + if (!holder && config.minutetopiclimit) + var/minute = round(world.time, 600) + if (!topiclimiter) + topiclimiter = new(LIMITER_SIZE) + if (minute != topiclimiter[CURRENT_MINUTE]) + topiclimiter[CURRENT_MINUTE] = minute + topiclimiter[MINUTE_COUNT] = 0 + topiclimiter[MINUTE_COUNT] += 1 + if (topiclimiter[MINUTE_COUNT] > config.minutetopiclimit) + var/msg = "Your previous action was ignored because you've done too many in a minute." + if (minute != topiclimiter[ADMINSWARNED_AT]) //only one admin message per-minute. (if they spam the admins can just boot/ban them) + topiclimiter[ADMINSWARNED_AT] = minute + msg += " Administrators have been informed." + log_game("[key_name(src)] Has hit the per-minute topic limit of [config.minutetopiclimit] topic calls in a given game minute") + message_admins("[key_name_admin(src)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [config.minutetopiclimit] topic calls in a given game minute") + src << "[msg]" + return + + if (!holder && config.secondtopiclimit) + var/second = round(world.time, 10) + if (!topiclimiter) + topiclimiter = new(LIMITER_SIZE) + if (second != topiclimiter[CURRENT_SECOND]) + topiclimiter[CURRENT_SECOND] = second + topiclimiter[SECOND_COUNT] = 0 + topiclimiter[SECOND_COUNT] += 1 + if (topiclimiter[SECOND_COUNT] > config.secondtopiclimit) + src << "Your previous action was ignored because you've done too many in a second" + return + + //Logs all hrefs + if(config && config.log_hrefs && href_logfile) + href_logfile << "[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]
" + // Admin PM if(href_list["priv_msg"]) if (href_list["ahelp_reply"]) @@ -36,10 +81,6 @@ cmd_admin_pm(href_list["priv_msg"],null) return - //Logs all hrefs - if(config && config.log_hrefs && href_logfile) - href_logfile << "[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]
" - switch(href_list["_src_"]) if("holder") hsrc = holder diff --git a/config/config.txt b/config/config.txt index a0b7c6854b2..fe8764358c5 100644 --- a/config/config.txt +++ b/config/config.txt @@ -297,3 +297,13 @@ ANNOUNCE_ADMIN_LOGOUT #CLIENT_WARN_MESSAGE Byond is really close to releasing 510 beta as the stable release, please take this time to try it out. Reports are that the client preforms better then the version you are using, and also handles network lag better. Shortly after it's release we will end up using 510 client features and you will be forced to update. #CLIENT_ERROR_VERSION 509 #CLIENT_ERROR_MESSAGE Your version of byond is not supported. Please upgrade. + +## TOPIC RATE LIMITING +## This allows you to limit how many topic calls (clicking on a interface window) the client can do in any given game second and/or game minute. +## Admins are exempt from these limits. +## Hitting the minute limit notifies admins. +## Set to 0 or comment out to disable. +SECOND_TOPIC_LIMIT 10 + +MINUTE_TOPIC_LIMIT 100 + From 5edfac3fe3526213bf580dcdee3792a5cd383d01 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 08:20:10 +0000 Subject: [PATCH 21/44] Automatic changelog generation for PR #23478 [ci skip] --- html/changelogs/AutoChangeLog-pr-23478.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23478.yml diff --git a/html/changelogs/AutoChangeLog-pr-23478.yml b/html/changelogs/AutoChangeLog-pr-23478.yml new file mode 100644 index 00000000000..3ee48d082fe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23478.yml @@ -0,0 +1,4 @@ +author: "MrStonedOne" +delete-after: True +changes: + - rscadd: "Because of abuse, actions on interfaces are throttled. Some bursting is allowed. You will get a message if an action is ignored. Server operators can configure this in config.dm" From abee35609318b6e58756ce18c38389a94619df82 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 30 Jan 2017 03:23:24 -0500 Subject: [PATCH 22/44] [s]Fixes fake nukes ending the round (#23488) * Fixes fake nukes ending the round * Remove uneeded arg * Update ticker.dm --- code/controllers/subsystem/ticker.dm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 29560785e08..73bc9609ab6 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -314,12 +314,7 @@ var/datum/subsystem/ticker/ticker sleep(35) flick("station_intact",cinematic) world << sound('sound/ambience/signal.ogg') - sleep(100) - if(cinematic) - qdel(cinematic) - cinematic = null - for(var/mob/M in mob_list) - M.notransform = FALSE + addtimer(CALLBACK(src, .proc/finish_cinematic, null, FALSE), 100) return //Faster exit, since nothing happened else //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) @@ -331,26 +326,27 @@ var/datum/subsystem/ticker/ticker //If its actually the end of the round, wait for it to end. //Otherwise if its a verb it will continue on afterwards. - if(mode) - mode.explosion_in_progress = 0 - world << "The station was destoyed by the nuclear blast!" - mode.station_was_nuked = (station_missed<2) //station_missed==1 is a draw. the station becomes irradiated and needs to be evacuated. - //kinda shit but I couldn't get permission to do what I wanted to do. var/bombloc = null if(actually_blew_up) if(bomb && bomb.loc) bombloc = bomb.z else if(!station_missed) bombloc = ZLEVEL_STATION + + if(mode) + mode.explosion_in_progress = 0 + world << "The station was destoyed by the nuclear blast!" + mode.station_was_nuked = (station_missed<2) //station_missed==1 is a draw. the station becomes irradiated and needs to be evacuated. - addtimer(CALLBACK(src, .proc/finish_cinematic, bombloc), 300) + addtimer(CALLBACK(src, .proc/finish_cinematic, bombloc, actually_blew_up), 300) -/datum/subsystem/ticker/proc/finish_cinematic(killz) +/datum/subsystem/ticker/proc/finish_cinematic(killz, actually_blew_up) if(cinematic) qdel(cinematic) //end the cinematic + cinematic = null for(var/mob/M in mob_list) M.notransform = FALSE - if(!isnull(killz) && M.stat != DEAD && M.z == killz) + if(actually_blew_up && !isnull(killz) && M.stat != DEAD && M.z == killz) M.gib() /datum/subsystem/ticker/proc/create_characters() From 5164a5277d2436fa3051a48d90bc5da1c16ab279 Mon Sep 17 00:00:00 2001 From: sybil-tgstation13 Date: Mon, 30 Jan 2017 08:23:27 +0000 Subject: [PATCH 23/44] Automatic changelog compile, [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-23478.yml | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-23478.yml diff --git a/html/changelog.html b/html/changelog.html index 6d2f6dd84a9..ab5ad7e1c4c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,12 @@ -->
+

30 January 2017

+

MrStonedOne updated:

+
    +
  • Because of abuse, actions on interfaces are throttled. Some bursting is allowed. You will get a message if an action is ignored. Server operators can configure this in config.dm
    • +
+

29 January 2017

BASILMAN YOUR MAIN MAN updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index dea5427860f..0877443db23 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -9130,3 +9130,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: The SRM-8 Rocket Pods have been loaded with new explosives designed to do maximum damage to terrain. These explosives are less effective on people, however. +2017-01-30: + MrStonedOne: + - rscadd: Because of abuse, actions on interfaces are throttled. Some bursting is + allowed. You will get a message if an action is ignored. Server operators can + configure this in config.dm diff --git a/html/changelogs/AutoChangeLog-pr-23478.yml b/html/changelogs/AutoChangeLog-pr-23478.yml deleted file mode 100644 index 3ee48d082fe..00000000000 --- a/html/changelogs/AutoChangeLog-pr-23478.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "MrStonedOne" -delete-after: True -changes: - - rscadd: "Because of abuse, actions on interfaces are throttled. Some bursting is allowed. You will get a message if an action is ignored. Server operators can configure this in config.dm" From 070ddc46d652272766320b467066418c26398ab3 Mon Sep 17 00:00:00 2001 From: tofa01 Date: Mon, 30 Jan 2017 21:27:59 +1100 Subject: [PATCH 24/44] Fixes space area in custodial closet ontop of APC. --- _maps/map_files/Deltastation/DeltaStation2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d1398f9ea82..2f71bf841ce 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -9640,7 +9640,7 @@ /obj/item/clothing/shoes/laceup, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/space) +/area/janitor) "asI" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/requests_console{ From 382ca36d22fd22546c43182be9ccb937337c1fa1 Mon Sep 17 00:00:00 2001 From: coiax Date: Mon, 30 Jan 2017 12:19:11 +0000 Subject: [PATCH 25/44] Increases minimum bomb countdown to 90 seconds (#23426) :cl: coiax add: Syndicate bombs and nuclear devices now have a minimum timer of 90 seconds. /:cl: Okay, so when I converted it from 60 processses to 60 actual world seconds, that SERIOUSLY buffed syndibombs, because in practice there was a lot less time to disarm them. I think they're a bit too fast to detonate now. --- code/game/gamemodes/nuclear/nuclearbomb.dm | 4 ++-- code/game/machinery/syndicatebomb.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 1199b72c374..f8305a7ac37 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -21,8 +21,8 @@ var/bomb_set resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/timer_set = 60 - var/default_timer_set = 60 - var/minimum_timer_set = 60 + var/default_timer_set = 90 + var/minimum_timer_set = 90 var/maximum_timer_set = 3600 var/ui_style = "nanotrasen" diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index b076c8c9b7b..803ee10603d 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -11,8 +11,8 @@ layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS resistance_flags = FIRE_PROOF | ACID_PROOF - var/minimum_timer = 60 - var/timer_set = 60 + var/minimum_timer = 90 + var/timer_set = 90 var/maximum_timer = 60000 var/can_unanchor = TRUE From bff83238bc2670384c5e97f58da2783d74fa6db2 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 12:19:13 +0000 Subject: [PATCH 26/44] Automatic changelog generation for PR #23426 [ci skip] --- html/changelogs/AutoChangeLog-pr-23426.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23426.yml diff --git a/html/changelogs/AutoChangeLog-pr-23426.yml b/html/changelogs/AutoChangeLog-pr-23426.yml new file mode 100644 index 00000000000..067b3931734 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23426.yml @@ -0,0 +1,4 @@ +author: "coiax" +delete-after: True +changes: + - rscadd: "Syndicate bombs and nuclear devices now have a minimum timer of 90 seconds." From dd160df63efa58f4f53eb2d30acef097fbe14255 Mon Sep 17 00:00:00 2001 From: coiax Date: Mon, 30 Jan 2017 17:17:21 +0000 Subject: [PATCH 27/44] Soapstone bug fixes (#23446) :cl: coiax add: You can regain a use of a soapstone by erasing one of your own messages. (This means you can remove a message if you don't like the colour and want to try rephrasing it to get a better colour). Erasing someone else's message still uses a charge. fix: Fixes bugs where you'd spend a charge without engraving anything. fix: Fixes a bug where the wrong ckey was entered in the engraving, you won't be able to take advantage of the "recharging" on messages made before this change. /:cl: Also includes the user's real_name rather than their name. --- code/modules/library/soapstone.dm | 68 +++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index 0a5d447f72a..ccec533563d 100644 --- a/code/modules/library/soapstone.dm +++ b/code/modules/library/soapstone.dm @@ -9,6 +9,7 @@ var/tool_speed = 50 var/remaining_uses = 3 + var/non_dull_name var/w_engrave = "engrave" var/w_engraving = "engraving" var/w_chipping = "chipping" @@ -39,19 +40,28 @@ /obj/item/soapstone/examine(mob/user) . = ..() - user << "It has [remaining_uses] uses left." + if(remaining_uses != -1) + user << "It has [remaining_uses] uses left." + else + user << "It looks like it can be used an unlimited number of times." /obj/item/soapstone/afterattack(atom/target, mob/user, proximity) var/turf/T = get_turf(target) if(!proximity) return - if(!remaining_uses) - // The dull chisel is dull. - user << "[src] is [w_dull]." var/obj/structure/chisel_message/already_message = locate(/obj/structure/chisel_message) in T + var/our_message = FALSE + if(already_message) + our_message = already_message.creator_key == user.ckey + + if(!remaining_uses && !our_message) + // The dull chisel is dull. + user << "[src] is [w_dull]." + return + if(!good_chisel_message_location(T)) user << "It's not appropriate to [w_engrave] on [T]." return @@ -60,11 +70,17 @@ user.visible_message("[user] starts erasing [already_message].", "You start erasing [already_message].", "You hear a [w_chipping] sound.") playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) - if(do_after(user, tool_speed, target=target) && spend_use()) + // Removing our own messages refunds a charge + + if((our_message || can_use()) && do_after(user, tool_speed, target=target) && (our_message || can_use())) user.visible_message("[user] has erased [already_message].", "You erased [already_message].") already_message.persists = FALSE qdel(already_message) playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) + if(our_message) + refund_use() + else + remove_use() return var/message = stripped_input(user, "What would you like to [w_engrave]?", "[name] Message") @@ -78,21 +94,38 @@ playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) user.visible_message("[user] starts [w_engraving] a message into [T].", "You start [w_engraving] a message into [T].", "You hear a [w_chipping] sound.") - if(do_after(user, tool_speed, target=T)) - if(!locate(/obj/structure/chisel_message in T) && spend_use()) + if(can_use() && do_after(user, tool_speed, target=T) && can_use()) + if(!locate(/obj/structure/chisel_message in T)) user << "You [w_engrave] a message into [T]." playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) var/obj/structure/chisel_message/M = new(T) M.register(user, message) + remove_use() -/obj/item/soapstone/proc/spend_use(mob/user) - if(!remaining_uses) - . = FALSE - else - remaining_uses-- - if(!remaining_uses) - name = "[w_dull] [name]" +/obj/item/soapstone/proc/can_use() + if(remaining_uses == -1 || remaining_uses >= 0) . = TRUE + else + . = FALSE + +/obj/item/soapstone/proc/remove_use() + if(remaining_uses <= 0) + // -1 == unlimited, 0 == empty + return + + remaining_uses-- + if(!remaining_uses) + non_dull_name = name + name = "[w_dull] [name]" + +/obj/item/soapstone/proc/refund_use() + if(remaining_uses == -1) + return + var/was_dull = remaining_uses + remaining_uses++ + + if(was_dull) + name = non_dull_name /* Persistent engraved messages, etched onto the station turfs to serve as instructions and/or memes for the next generation of spessmen. @@ -101,6 +134,9 @@ but only permamently removed with the librarian's soapstone. */ +/obj/item/soapstone/infinite + remaining_uses = -1 + /proc/good_chisel_message_location(turf/T) if(!T) . = FALSE @@ -141,8 +177,8 @@ /obj/structure/chisel_message/proc/register(mob/user, newmessage) hidden_message = newmessage - creator_name = user.name - creator_key = user.key + creator_name = user.real_name + creator_key = user.ckey realdate = world.timeofday map = MAP_NAME update_icon() From 5a8fed3e1290bbe4870d77eb692a967f5d182d17 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 17:17:22 +0000 Subject: [PATCH 28/44] Automatic changelog generation for PR #23446 [ci skip] --- html/changelogs/AutoChangeLog-pr-23446.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23446.yml diff --git a/html/changelogs/AutoChangeLog-pr-23446.yml b/html/changelogs/AutoChangeLog-pr-23446.yml new file mode 100644 index 00000000000..1f6e00be5ab --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23446.yml @@ -0,0 +1,11 @@ +author: "coiax" +delete-after: True +changes: + - rscadd: "You can regain a use of a soapstone by erasing one of your own +messages. (This means you can remove a message if you don't like the +colour and want to try rephrasing it to get a better colour). Erasing +someone else's message still uses a charge." + - bugfix: "Fixes bugs where you'd spend a charge without engraving anything." + - bugfix: "Fixes a bug where the wrong ckey was entered in the engraving, +you won't be able to take advantage of the \"recharging\" on messages made +before this change." From c541e826793c79c04d46cb74120f2cd67aeffe46 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:12:33 +0000 Subject: [PATCH 29/44] Automatic changelog generation for PR #23381 [ci skip] --- html/changelogs/AutoChangeLog-pr-23381.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23381.yml diff --git a/html/changelogs/AutoChangeLog-pr-23381.yml b/html/changelogs/AutoChangeLog-pr-23381.yml new file mode 100644 index 00000000000..9825be7fe6a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23381.yml @@ -0,0 +1,4 @@ +author: "CoreOverload" +delete-after: True +changes: + - tweak: "Clicking item slot now clicks the item in it." From 43f6ee4950add21ff50020a7f533c8f4dcfc937d Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:19:29 +0000 Subject: [PATCH 30/44] Automatic changelog generation for PR #23434 [ci skip] --- html/changelogs/AutoChangeLog-pr-23434.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23434.yml diff --git a/html/changelogs/AutoChangeLog-pr-23434.yml b/html/changelogs/AutoChangeLog-pr-23434.yml new file mode 100644 index 00000000000..d771f89fa17 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23434.yml @@ -0,0 +1,7 @@ +author: "coiax" +delete-after: True +changes: + - rscadd: "Camoflaged HUDs given to head revolutionaries now function the same +as chameleon glasses in the chameleon kit bundle, giving them an action +button and far more disguise options." + - rscadd: "Syndicate thermals are also now more like chameleon glasses as well." From f7c9749ca0d9a5274933da6f38f1207b61817ebf Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 30 Jan 2017 15:20:54 -0500 Subject: [PATCH 31/44] Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424) * Fixes some bad addtimers * Adds INVOKE * Warning for addtimer * Working syntax * Another bad call * Fixes the addtimer warning * Add suppress_zero_warning to addtimer Useful for addtimer that uses vars * Add INVOKE_AGAIN for when the var is already defined * Replace addtimer(...,0) with INVOKE((...)) * Much more sensible syntax * Less overhead, less copypaste * Rename INVOKE_ASYNC * Use a macro * Allman style * Wait, why make it a datum in the first place? * Revert the rename * Rename again, keep line endings * typo * More typos * Untouches Addtimer * Update callbacks.dm * Update timer.dm * Revert allman style * Revert "Revert allman style" This reverts commit 47361da15bd04eca138be5f13acdc9dd5ba89331. * Trying to match that whitespace diff * Why is this missing? * I'm not fucking dealing with this! --- code/__DEFINES/callbacks.dm | 3 +- code/controllers/subsystem/ticker.dm | 2 +- code/datums/antagonists/datum_clockcult.dm | 2 +- code/datums/antagonists/datum_cult.dm | 2 +- code/datums/beam.dm | 2 +- code/datums/callback.dm | 22 ++++++++---- code/datums/helper_datums/teleport.dm | 4 +-- code/datums/mind.dm | 2 +- code/game/area/areas.dm | 6 ++-- .../gamemodes/changeling/powers/fleshmend.dm | 2 +- .../clock_helpers/proselytizer_helpers.dm | 2 +- .../clock_cult/clock_items/clockwork_slab.dm | 2 +- .../clock_cult/clock_items/judicial_visor.dm | 6 ++-- .../ark_of_the_clockwork_justicar.dm | 4 +-- code/game/gamemodes/gang/gang.dm | 2 +- .../gamemodes/malfunction/Malf_Modules.dm | 2 +- .../miniantags/revenant/revenant_abilities.dm | 8 ++--- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/machinery/cloning.dm | 2 +- code/game/machinery/doors/brigdoors.dm | 4 +-- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/doors/poddoor.dm | 4 +-- code/game/machinery/magnet.dm | 2 +- .../effects/effect_system/effect_system.dm | 2 +- .../effects/effect_system/effects_smoke.dm | 2 +- code/game/objects/effects/overlays.dm | 2 +- code/game/objects/items/body_egg.dm | 4 +-- .../game/objects/items/devices/radio/radio.dm | 2 +- .../items/weapons/grenades/syndieminibomb.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 4 +-- code/game/turfs/simulated/chasm.dm | 2 +- code/modules/assembly/doorcontrol.dm | 2 +- code/modules/assembly/proximity.dm | 2 +- code/modules/flufftext/Hallucination.dm | 2 +- .../mining/lavaland/necropolis_chests.dm | 26 +++++++------- code/modules/mob/living/carbon/human/death.dm | 2 +- .../mob/living/carbon/monkey/combat.dm | 12 +++---- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../mob/living/simple_animal/bot/ed209bot.dm | 4 +-- .../hostile/megafauna/bubblegum.dm | 10 +++--- .../hostile/megafauna/colossus.dm | 10 +++--- .../simple_animal/hostile/megafauna/dragon.dm | 10 +++--- .../hostile/megafauna/hierophant.dm | 36 +++++++++---------- .../mob/living/simple_animal/slime/life.dm | 2 +- code/modules/projectiles/guns/medbeam.dm | 2 +- code/modules/recycling/disposal-unit.dm | 2 +- code/modules/shuttle/on_move.dm | 4 +-- .../spells/spell_types/ethereal_jaunt.dm | 2 +- code/modules/spells/spell_types/knock.dm | 4 +-- 49 files changed, 126 insertions(+), 117 deletions(-) diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm index 762e7c38b0f..18059a60839 100644 --- a/code/__DEFINES/callbacks.dm +++ b/code/__DEFINES/callbacks.dm @@ -1,3 +1,4 @@ #define GLOBAL_PROC "some_magic_bullshit" -#define CALLBACK new /datum/callback \ No newline at end of file +#define CALLBACK new /datum/callback +#define INVOKE_ASYNC ImmediateInvokeAsync diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 73bc9609ab6..4afe2777096 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -588,7 +588,7 @@ var/datum/subsystem/ticker/ticker //map rotate chance defaults to 75% of the length of the round (in minutes) if (!prob((world.time/600)*config.maprotatechancedelta)) return - addtimer(CALLBACK(GLOBAL_PROC, /.proc/maprotate), 0) + INVOKE_ASYNC(GLOBAL_PROC, /.proc/maprotate) /world/proc/has_round_started() diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index c8f5906461a..f45dd509d49 100644 --- a/code/datums/antagonists/datum_clockcult.dm +++ b/code/datums/antagonists/datum_clockcult.dm @@ -40,7 +40,7 @@ ticker.mode.servants_of_ratvar += owner.mind ticker.mode.update_servant_icons_added(owner.mind) if(jobban_isbanned(owner, ROLE_SERVANT_OF_RATVAR)) - addtimer(CALLBACK(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0) + INVOKE_ASYNC(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR) if(owner.mind) owner.mind.special_role = "Servant of Ratvar" owner.attack_log += "\[[time_stamp()]\] Has been converted to the cult of Ratvar!" diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index 4334134a955..b49cb41c78b 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -20,7 +20,7 @@ var/datum/game_mode/cult/C = ticker.mode C.memorize_cult_objectives(owner.mind) if(jobban_isbanned(owner, ROLE_CULTIST)) - addtimer(CALLBACK(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST), 0) + INVOKE_ASYNC(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST) if(owner.mind) owner.mind.special_role = "Cultist" owner.attack_log += "\[[time_stamp()]\] Has been converted to the cult of Nar'Sie!" diff --git a/code/datums/beam.dm b/code/datums/beam.dm index f4c27262d32..fd4e445ded6 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -131,6 +131,6 @@ /atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time = 3) var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time) - addtimer(CALLBACK(newbeam, /datum/beam/.proc/Start), 0) + INVOKE_ASYNC(newbeam, /datum/beam/.proc/Start) return newbeam diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 41deda63667..66c3e674067 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -14,6 +14,8 @@ var/result = C.Invoke(args, to, add) //additional args are added after the ones given when the callback was created OR var/result = C.InvokeAsync(args, to, add) //Sleeps will not block, returns . on the first sleep (then continues on in the "background" after the sleep/block ends), otherwise operates normally. + OR + INVOKE_ASYNC() to immediately create and call InvokeAsync PROC TYPEPATH SHORTCUTS (these operate on paths, not types, so to these shortcuts, datum is NOT a parent of atom, etc...) @@ -54,37 +56,43 @@ if (length(args) > 2) arguments = args.Copy(3) +/proc/ImmediateInvokeAsync(thingtocall, proctocall, ...) + set waitfor = FALSE + + if (!thingtocall) + return + + var/list/calling_arguments = length(args) > 2 ? args.Copy(3) : null + + if (thingtocall == GLOBAL_PROC) + call(proctocall)(arglist(calling_arguments)) + else + call(thingtocall, proctocall)(arglist(calling_arguments)) /datum/callback/proc/Invoke(...) if (!object) return - var/list/calling_arguments = arguments - if (length(args)) if (length(arguments)) calling_arguments = calling_arguments + args //not += so that it creates a new list so the arguments list stays clean else calling_arguments = args - if (object == GLOBAL_PROC) return call(delegate)(arglist(calling_arguments)) return call(object, delegate)(arglist(calling_arguments)) //copy and pasted because fuck proc overhead /datum/callback/proc/InvokeAsync(...) - set waitfor = 0 + set waitfor = FALSE if (!object) return - var/list/calling_arguments = arguments - if (length(args)) if (length(arguments)) calling_arguments = calling_arguments + args //not += so that it creates a new list so the arguments list stays clean else calling_arguments = args - if (object == GLOBAL_PROC) return call(delegate)(arglist(calling_arguments)) return call(object, delegate)(arglist(calling_arguments)) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index b7a974bbe42..b1308668679 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -82,9 +82,9 @@ /datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound) if(location) if(effect) - addtimer(CALLBACK(src, .proc/do_effect, location, effect), 0) + INVOKE_ASYNC(src, .proc/do_effect, location, effect) if(sound) - addtimer(CALLBACK(src, .proc/do_sound, location, sound), 0) + INVOKE_ASYNC(src, .proc/do_sound, location, sound) /datum/teleport/proc/do_effect(atom/location, datum/effect_system/effect) src = null diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 9bc6802f808..1ade82e90aa 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1495,7 +1495,7 @@ if(istype(S, type)) continue S.charge_counter = delay - addtimer(CALLBACK(S, /obj/effect/proc_holder/spell.proc/start_recharge), 0) + INVOKE_ASYNC(S, /obj/effect/proc_holder/spell.proc/start_recharge) /datum/mind/proc/get_ghost(even_if_they_cant_reenter) for(var/mob/dead/observer/G in dead_mob_list) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index d29ea014b96..8b3b5056255 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -197,7 +197,7 @@ var/list/teleportlocs = list() if(D.operating) D.nextstate = CLOSED else if(!D.density) - addtimer(CALLBACK(D, /obj/machinery/door/firedoor.proc/close), 0) + INVOKE_ASYNC(D, /obj/machinery/door/firedoor.proc/close) for(var/obj/machinery/firealarm/F in RA) F.update_icon() for (var/obj/machinery/camera/C in RA) @@ -223,7 +223,7 @@ var/list/teleportlocs = list() if(D.operating) D.nextstate = OPEN else if(D.density) - addtimer(CALLBACK(D, /obj/machinery/door/firedoor.proc/open), 0) + INVOKE_ASYNC(D, /obj/machinery/door/firedoor.proc/open) for(var/obj/machinery/firealarm/F in RA) F.update_icon() @@ -294,7 +294,7 @@ var/list/teleportlocs = list() if(D.operating) D.nextstate = OPEN else if(D.density) - addtimer(CALLBACK(D, /obj/machinery/door/firedoor.proc/open), 0) + INVOKE_ASYNC(D, /obj/machinery/door/firedoor.proc/open) /area/proc/updateicon() if ((fire || eject || party) && (!requires_power||power_environ))//If it doesn't require power, can still activate this proc. diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index 2a6139351f4..89e05977df1 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -36,7 +36,7 @@ by quick repeated use!" recent_uses++ - addtimer(CALLBACK(src, .proc/fleshmend, user), 0) + INVOKE_ASYNC(src, .proc/fleshmend, user) feedback_add_details("changeling_powers","RR") return 1 diff --git a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm index 293f277c0e2..b5776d6c438 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm @@ -214,7 +214,7 @@ if(reinf) prosel_cost -= POWER_ROD for(var/obj/structure/grille/G in get_turf(src)) - addtimer(CALLBACK(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, G, user), 0) + INVOKE_ASYNC(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, G, user) return list("operation_time" = prosel_time, "new_obj_type" = windowtype, "power_cost" = prosel_cost, "spawn_dir" = dir, "dir_in_new" = new_dir) /obj/structure/window/reinforced/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer) diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index 9226b4b6afe..ed99ffec611 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -443,7 +443,7 @@ if("toggle") recollecting = !recollecting if("recite") - addtimer(CALLBACK(src, .proc/recite_scripture, text2path(params["category"]), usr, FALSE), 0) + INVOKE_ASYNC(src, .proc/recite_scripture, text2path(params["category"]), usr, FALSE) if("select") selected_scripture = params["category"] if("component") diff --git a/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm b/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm index 647e88e64f0..3dcf0d88284 100644 --- a/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm +++ b/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm @@ -131,7 +131,7 @@ continue V.recharging = TRUE //To prevent exploiting multiple visors to bypass the cooldown V.update_status() - addtimer(CALLBACK(V, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor), (ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2, ranged_ability_user) + addtimer(CALLBACK(V, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), (ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2) clockwork_say(ranged_ability_user, text2ratvar("Kneel, heathens!")) ranged_ability_user.visible_message("[ranged_ability_user]'s judicial visor fires a stream of energy at [target], creating a strange mark!", "You direct [visor]'s power to [target]. You must wait for some time before doing this again.") var/turf/targetturf = get_turf(target) @@ -139,7 +139,7 @@ add_logs(ranged_ability_user, targetturf, "created a judicial marker") ranged_ability_user.update_action_buttons_icon() ranged_ability_user.update_inv_glasses() - addtimer(CALLBACK(visor, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor), ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown, ranged_ability_user)//Cooldown is reduced by 10x if Ratvar is up + addtimer(CALLBACK(visor, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown)//Cooldown is reduced by 10x if Ratvar is up remove_ranged_ability() return TRUE @@ -160,7 +160,7 @@ ..() SetLuminosity(4, 3) user = caster - addtimer(CALLBACK(src, .proc/judicialblast), 0) + INVOKE_ASYNC(src, .proc/judicialblast) /obj/effect/clockwork/judicial_marker/proc/judicialblast() playsound(src, 'sound/magic/MAGIC_MISSILE.ogg', 50, 1, 1, 1) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 059169c591d..f123579e34d 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -23,7 +23,7 @@ /obj/structure/destructible/clockwork/massive/celestial_gateway/New() ..() - addtimer(CALLBACK(src, .proc/spawn_animation), 0) + INVOKE_ASYNC(src, .proc/spawn_animation) /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/spawn_animation() var/turf/T = get_turf(src) @@ -215,7 +215,7 @@ sleep(3) new/obj/structure/destructible/clockwork/massive/ratvar(startpoint) else - addtimer(CALLBACK(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0), 0) //call the shuttle immediately + INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0) //call the shuttle immediately sleep(3) send_to_playing_players("\"[text2ratvar("Behold")]!\"\n\"[text2ratvar("See Engine's mercy")]!\"\n\ \"[text2ratvar("Observe Engine's design skills")]!\"\n\"[text2ratvar("Behold Engine's light")]!!\"\n\ diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 5955138789a..8d6709b1e2a 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -179,7 +179,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" G.add_gang_hud(gangster_mind) if(jobban_isbanned(gangster_mind.current, ROLE_GANG)) - addtimer(CALLBACK(src, /datum/game_mode.proc/replace_jobbaned_player, gangster_mind.current, ROLE_GANG, ROLE_GANG), 0) + INVOKE_ASYNC(src, /datum/game_mode.proc/replace_jobbaned_player, gangster_mind.current, ROLE_GANG, ROLE_GANG) return 2 //////////////////////////////////////////////////////////////////// //Deals with players reverting to neutral (Not a gangster anymore)// diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index ca15a7ba8aa..220b2be20dd 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -165,7 +165,7 @@ for(var/obj/machinery/door/D in airlocks) if(D.z != ZLEVEL_STATION) continue - addtimer(CALLBACK(D, /obj/machinery/door.proc/hostile_lockdown, src), 0) + INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, src) addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900) var/obj/machinery/computer/communications/C = locate() in machines diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index 68727883752..4ff1d23f596 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -194,7 +194,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - addtimer(CALLBACK(src, .proc/overload, T, user), 0) + INVOKE_ASYNC(src, .proc/overload, T, user) /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/proc/overload(turf/T, mob/user) for(var/obj/machinery/light/L in T) @@ -234,7 +234,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/defile/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - addtimer(CALLBACK(src, .proc/defile, T), 0) + INVOKE_ASYNC(src, .proc/defile, T) /obj/effect/proc_holder/spell/aoe_turf/revenant/defile/proc/defile(turf/T) if(T.flags & NOJAUNT) @@ -281,7 +281,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - addtimer(CALLBACK(src, .proc/malfunction, T, user), 0) + INVOKE_ASYNC(src, .proc/malfunction, T, user) /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/proc/malfunction(turf/T, mob/user) for(var/mob/living/simple_animal/bot/bot in T) @@ -325,7 +325,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant/blight/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(attempt_cast(user)) for(var/turf/T in targets) - addtimer(CALLBACK(src, .proc/blight, T, user), 0) + INVOKE_ASYNC(src, .proc/blight, T, user) /obj/effect/proc_holder/spell/aoe_turf/revenant/blight/proc/blight(turf/T, mob/user) for(var/mob/living/mob in T) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 5fa6edb28dc..be32c62fab1 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -275,7 +275,7 @@ rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) if(jobban_isbanned(rev_mind.current, ROLE_REV)) - addtimer(CALLBACK(src, .proc/replace_jobbaned_player), 0, rev_mind.current, ROLE_REV, ROLE_REV) + INVOKE_ASYNC(src, .proc/replace_jobbaned_player, rev_mind.current, ROLE_REV, ROLE_REV) return 1 ////////////////////////////////////////////////////////////////////////////// //Deals with players being converted from the revolution (Not a rev anymore)// // Modified to handle borged MMIs. Accepts another var if the target is being borged at the time -- Polymorph. diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index cbef0094a2b..9ea6df97316 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -136,7 +136,7 @@ if(!G) return FALSE if(clonemind.damnation_type) //Can't clone the damned. - addtimer(CALLBACK(src, .proc/horrifyingsound), 0) + INVOKE_ASYNC(src, .proc/horrifyingsound) mess = 1 icon_state = "pod_g" update_icon() diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 1b0ecc7dc31..de94bbbc85a 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -94,7 +94,7 @@ for(var/obj/machinery/door/window/brigdoor/door in targets) if(door.density) continue - addtimer(CALLBACK(door, /obj/machinery/door/window/brigdoor.proc/close), 0) + INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/close) for(var/obj/structure/closet/secure_closet/brig/C in targets) if(C.broken) @@ -123,7 +123,7 @@ for(var/obj/machinery/door/window/brigdoor/door in targets) if(!door.density) continue - addtimer(CALLBACK(door, /obj/machinery/door/window/brigdoor.proc/open), 0) + INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/open) for(var/obj/structure/closet/secure_closet/brig/C in targets) if(C.broken) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 774e0cf2273..39969b140fa 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -186,7 +186,7 @@ /obj/machinery/door/emp_act(severity) if(prob(20/severity) && (istype(src,/obj/machinery/door/airlock) || istype(src,/obj/machinery/door/window)) ) - addtimer(CALLBACK(src, .proc/open), 0) + INVOKE_ASYNC(src, .proc/open) if(prob(40/severity)) if(secondsElectrified == 0) secondsElectrified = -1 diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 6b97027fbca..30965729f40 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -30,9 +30,9 @@ /obj/machinery/door/poddoor/shuttledock/proc/check() var/turf/T = get_step(src, checkdir) if(!istype(T, turftype)) - addtimer(CALLBACK(src, .proc/open), 0, TIMER_UNIQUE) + INVOKE_ASYNC(src, .proc/open) else - addtimer(CALLBACK(src, .proc/close), 0, TIMER_UNIQUE) + INVOKE_ASYNC(src, .proc/close) /obj/machinery/door/poddoor/Bumped(atom/AM) if(density) diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 9d296c6bd33..473ed97e0c6 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -134,7 +134,7 @@ on = !on if(on) - addtimer(CALLBACK(src, .proc/magnetic_process), 0) + INVOKE_ASYNC(src, .proc/magnetic_process) diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index eb8f575efb8..39ebc92df0d 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -51,7 +51,7 @@ would spawn and follow the beaker, even if it is carried or thrown. for(var/i in 1 to number) if(total_effects > 20) return - addtimer(CALLBACK(src, .proc/generate_effect), 0) + INVOKE_ASYNC(src, .proc/generate_effect) /datum/effect_system/proc/generate_effect() if(holder) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 351ac8122c8..0ec7e137bb6 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -42,7 +42,7 @@ /obj/effect/particle_effect/smoke/proc/kill_smoke() STOP_PROCESSING(SSobj, src) - addtimer(CALLBACK(src, .proc/fade_out), 0) + INVOKE_ASYNC(src, .proc/fade_out) QDEL_IN(src, 10) /obj/effect/particle_effect/smoke/process() diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index fb2ab81eeb6..09a1f87453c 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -333,7 +333,7 @@ var/matrix/M = new M.Turn(Get_Angle(src, user)) transform = M - addtimer(CALLBACK(src, .proc/volthit), 0) + INVOKE_ASYNC(src, .proc/volthit) /obj/effect/overlay/temp/ratvar/volt_hit/proc/volthit() if(user) diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 54b2fc86b85..e89a4df3a47 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -20,14 +20,14 @@ owner.status_flags |= XENO_HOST START_PROCESSING(SSobj, src) owner.med_hud_set_status() - addtimer(CALLBACK(src, .proc/AddInfectionImages, owner), 0) + INVOKE_ASYNC(src, .proc/AddInfectionImages, owner) /obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0) STOP_PROCESSING(SSobj, src) if(owner) owner.status_flags &= ~(XENO_HOST) owner.med_hud_set_status() - addtimer(CALLBACK(src, .proc/RemoveInfectionImages, owner), 0) + INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner) ..() /obj/item/organ/body_egg/process() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 1a9bbeba017..e631d41c494 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -196,7 +196,7 @@ . = TRUE /obj/item/device/radio/talk_into(atom/movable/M, message, channel, list/spans) - addtimer(CALLBACK(src, .proc/talk_into_impl, M, message, channel, spans), 0) + INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans) return ITALICS | REDUCE_RANGE /obj/item/device/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans) diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm index 15afa53eb65..46bcde50083 100644 --- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm +++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm @@ -46,7 +46,7 @@ if(isfloorturf(T)) var/turf/open/floor/F = T F.wet = TURF_WET_PERMAFROST - addtimer(CALLBACK(F, /turf/open/floor.proc/MakeDry), rand(3000, 3100), TURF_WET_PERMAFROST) + addtimer(CALLBACK(F, /turf/open/floor.proc/MakeDry, TURF_WET_PERMAFROST), rand(3000, 3100)) for(var/mob/living/carbon/L in T) L.adjustStaminaLoss(stamina_damage) L.bodytemperature -= 230 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index a83d3d48f1a..d894da44792 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -286,7 +286,7 @@ impale(user) return if((wielded) && prob(50)) - addtimer(CALLBACK(src, .proc/jedi_spin, user), 0, TIMER_UNIQUE) + INVOKE_ASYNC(src, .proc/jedi_spin, user) /obj/item/weapon/twohanded/dualsaber/proc/jedi_spin(mob/living/user) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2)) @@ -354,7 +354,7 @@ playsound(loc, hitsound, get_clamped_volume(), 1, -1) add_fingerprint(user) // Light your candles while spinning around the room - addtimer(CALLBACK(src, .proc/jedi_spin, user), 0, TIMER_UNIQUE) + INVOKE_ASYNC(src, .proc/jedi_spin, user) /obj/item/weapon/twohanded/dualsaber/green/New() item_color = "green" diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index 1309f964856..55910cd00e9 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -28,7 +28,7 @@ for(var/thing in thing_to_check) if(droppable(thing)) . = 1 - addtimer(CALLBACK(src, .proc/drop, thing), 0) + INVOKE_ASYNC(src, .proc/drop, thing) /turf/open/chasm/proc/droppable(atom/movable/AM) if(!isliving(AM) && !isobj(AM)) diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index 2d5fbb80976..98664cf42da 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -72,7 +72,7 @@ D.safe = !D.safe for(var/D in open_or_close) - addtimer(CALLBACK(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open), 0) + INVOKE_ASYNC(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open) sleep(10) cooldown = 0 diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index dd48e73391e..081a9661358 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -78,7 +78,7 @@ /obj/item/device/assembly/prox_sensor/dropped() ..() if(scanning) - addtimer(CALLBACK(src, .proc/sense), 0) + INVOKE_ASYNC(src, .proc/sense) /obj/item/device/assembly/prox_sensor/Destroy() if(scanning) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 3e17659d2ab..c609bbed30c 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -400,7 +400,7 @@ Gunshots/explosions/opening doors/less rare audio (done) my_target = T QDEL_IN(src, 300) step_away(src,my_target,2) - addtimer(CALLBACK(src, .proc/attack_loop), 0) + INVOKE_ASYNC(src, .proc/attack_loop) /obj/effect/fake_attacker/proc/updateimage() diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 154aea5418b..828641dfae9 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -797,11 +797,11 @@ calculate_anger_mod(user) timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown if(proximity_flag) - addtimer(CALLBACK(src, .proc/aoe_burst, T, user), 0) + INVOKE_ASYNC(src, .proc/aoe_burst, T, user) add_logs(user, target, "fired 3x3 blast at", src) else if(ismineralturf(target) && get_dist(user, target) < 6) //target is minerals, we can hit it(even if we can't see it) - addtimer(CALLBACK(src, .proc/cardinal_blasts, T, user), 0) + INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) timer = world.time + cooldown_time else if(target in view(5, get_turf(user))) //if the target is in view, hit it timer = world.time + cooldown_time @@ -810,12 +810,12 @@ new /obj/effect/overlay/temp/hierophant/chaser(get_turf(user), user, target, chaser_speed, friendly_fire_check) add_logs(user, target, "fired a chaser at", src) else - addtimer(CALLBACK(src, .proc/cardinal_blasts, T, user), 0) //otherwise, just do cardinal blast + INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast add_logs(user, target, "fired cardinal blast at", src) else user << "That target is out of range!" //too far away timer = world.time - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) /obj/item/weapon/hierophant_club/proc/calculate_anger_mod(mob/user) //we get stronger as the user loses health chaser_cooldown = initial(chaser_cooldown) @@ -858,7 +858,7 @@ user.visible_message("[user] starts fiddling with [src]'s pommel...", \ "You start detaching the hierophant beacon...") timer = world.time + 51 - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) if(do_after(user, 50, target = user) && !beacon) var/turf/T = get_turf(user) playsound(T,'sound/magic/Blind.ogg', 200, 1, -4) @@ -870,7 +870,7 @@ You can remove the beacon to place it again by striking it with the club.") else timer = world.time - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) else user << "You need to be on solid ground to detach the beacon!" return @@ -887,7 +887,7 @@ user.update_action_buttons_icon() user.visible_message("[user] starts to glow faintly...") timer = world.time + 50 - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) beacon.icon_state = "hierophant_tele_on" var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE1 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(user.loc) var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE2 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(beacon.loc) @@ -899,7 +899,7 @@ user << "The beacon is blocked by something, preventing teleportation!" user.update_action_buttons_icon() timer = world.time - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) beacon.icon_state = "hierophant_tele_off" return new /obj/effect/overlay/temp/hierophant/telegraph(T, user) @@ -911,7 +911,7 @@ if(user) user.update_action_buttons_icon() timer = world.time - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) if(beacon) beacon.icon_state = "hierophant_tele_off" return @@ -920,7 +920,7 @@ user << "The beacon is blocked by something, preventing teleportation!" user.update_action_buttons_icon() timer = world.time - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) beacon.icon_state = "hierophant_tele_off" return add_logs(user, beacon, "teleported self from ([source.x],[source.y],[source.z]) to") @@ -933,7 +933,7 @@ var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies B.damage = 30 for(var/mob/living/L in range(1, source)) - addtimer(CALLBACK(src, .proc/teleport_mob, source, L, T, user), 0) //regardless, take all mobs near us along + INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along sleep(6) //at this point the blasts detonate if(beacon) beacon.icon_state = "hierophant_tele_off" @@ -941,7 +941,7 @@ qdel(TE1) qdel(TE2) timer = world.time - addtimer(CALLBACK(src, .proc/prepare_icon_update), 0) + INVOKE_ASYNC(src, .proc/prepare_icon_update) if(beacon) beacon.icon_state = "hierophant_tele_off" teleporting = FALSE @@ -980,7 +980,7 @@ sleep(2) new /obj/effect/overlay/temp/hierophant/blast(T, user, friendly_fire_check) for(var/d in cardinal) - addtimer(CALLBACK(src, .proc/blast_wall, T, d, user), 0) + INVOKE_ASYNC(src, .proc/blast_wall, T, d, user) /obj/item/weapon/hierophant_club/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long if(!T) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 1e50d17e408..cd3c9a533ac 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -33,7 +33,7 @@ if(ticker && ticker.mode) sql_report_death(src) if(mind && mind.devilinfo) - addtimer(CALLBACK(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src), 0) + INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src) /mob/living/carbon/human/proc/makeSkeleton() status_flags |= DISFIGURED diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index 8ebd2216186..d7fad273cfe 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -149,7 +149,7 @@ // next to target if(Adjacent(pickupTarget) || Adjacent(pickupTarget.loc)) - addtimer(CALLBACK(src, .proc/walk2derpless, pickupTarget.loc), 0) + INVOKE_ASYNC(src, .proc/walk2derpless, pickupTarget.loc) // who cares about these items, i want that one! drop_all_held_items() @@ -166,7 +166,7 @@ if(!pickpocketing) pickpocketing = TRUE M.visible_message("[src] starts trying to take [pickupTarget] from [M]", "[src] tries to take [pickupTarget]!") - addtimer(CALLBACK(src, .proc/pickpocket, M), 0) + INVOKE_ASYNC(src, .proc/pickpocket, M) else if(pickupTimer >= 8) @@ -174,7 +174,7 @@ pickupTarget = null pickupTimer = 0 else - addtimer(CALLBACK(src, .proc/walk2derpless, pickupTarget.loc), 0) + INVOKE_ASYNC(src, .proc/walk2derpless, pickupTarget.loc) return TRUE @@ -229,7 +229,7 @@ return TRUE if(target != null) - addtimer(CALLBACK(src, .proc/walk2derpless, target), 0) + INVOKE_ASYNC(src, .proc/walk2derpless, target) // pickup any nearby weapon if(!pickupTarget && prob(MONKEY_WEAPON_PROB)) @@ -308,7 +308,7 @@ if(target.pulledby != src && !istype(target.pulledby, /mob/living/carbon/monkey/)) - addtimer(CALLBACK(src, .proc/walk2derpless, target.loc), 0) + INVOKE_ASYNC(src, .proc/walk2derpless, target.loc) if(Adjacent(target) && isturf(target.loc)) a_intent = INTENT_GRAB @@ -321,7 +321,7 @@ frustration = 0 else if(!disposing_body) - addtimer(CALLBACK(src, .proc/walk2derpless, bodyDisposal.loc), 0) + INVOKE_ASYNC(src, .proc/walk2derpless, bodyDisposal.loc) if(Adjacent(bodyDisposal)) disposing_body = TRUE diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 95bd7d599c8..f1ca05a1230 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -178,7 +178,7 @@ R.module = RM R.update_module_innate() RM.rebuild_modules() - addtimer(CALLBACK(RM, .proc/do_transform_animation), 0) + INVOKE_ASYNC(RM, .proc/do_transform_animation) qdel(src) return RM diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index eac1dcd042a..77311e79241 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -306,13 +306,13 @@ Auto Patrol[]"}, target = null last_found = world.time frustration = 0 - addtimer(CALLBACK(src, .proc/handle_automated_action), 0) //ensure bot quickly responds + INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds /mob/living/simple_animal/bot/ed209/proc/back_to_hunt() anchored = 0 frustration = 0 mode = BOT_HUNT - addtimer(CALLBACK(src, .proc/handle_automated_action), 0) //ensure bot quickly responds + INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds // look for a criminal in view of the bot diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 7244788cd5e..6623271f951 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -88,19 +88,19 @@ Difficulty: Hard var/warped = FALSE if(!try_bloodattack()) - addtimer(CALLBACK(src, .proc/blood_spray), 0) + INVOKE_ASYNC(src, .proc/blood_spray) warped = blood_warp() if(warped && prob(100 - anger_modifier)) return if(prob(90 - anger_modifier) || slaughterlings()) if(health > maxHealth * 0.5) - addtimer(CALLBACK(src, .proc/charge), 0) + INVOKE_ASYNC(src, .proc/charge) else if(prob(70) || warped) - addtimer(CALLBACK(src, .proc/triple_charge), 0) + INVOKE_ASYNC(src, .proc/triple_charge) else - addtimer(CALLBACK(src, .proc/warp_charge), 0) + INVOKE_ASYNC(src, .proc/warp_charge) /mob/living/simple_animal/hostile/megafauna/bubblegum/New() @@ -201,7 +201,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/try_bloodattack() var/list/targets = get_mobs_on_blood() if(targets.len) - addtimer(CALLBACK(src, .proc/bloodattack, targets, prob(50)), 0) + INVOKE_ASYNC(src, .proc/bloodattack, targets, prob(50)) return TRUE return FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index b0d7639d224..ab6a55090ee 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -77,7 +77,7 @@ Difficulty: Very Hard double_spiral() else visible_message("\"Judgement.\"") - addtimer(CALLBACK(src, .proc/spiral_shoot, rand(0, 1)), 0) + INVOKE_ASYNC(src, .proc/spiral_shoot, rand(0, 1)) else if(prob(20)) ranged_cooldown = world.time + 30 @@ -88,7 +88,7 @@ Difficulty: Very Hard blast() else ranged_cooldown = world.time + 40 - addtimer(CALLBACK(src, .proc/alternating_dir_shots), 0) + INVOKE_ASYNC(src, .proc/alternating_dir_shots) /mob/living/simple_animal/hostile/megafauna/colossus/New() @@ -108,7 +108,7 @@ Difficulty: Very Hard /obj/effect/overlay/temp/at_shield/New(new_loc, new_target) ..() target = new_target - addtimer(CALLBACK(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE), 0) + INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE) /mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P) if(!stat) @@ -139,8 +139,8 @@ Difficulty: Very Hard visible_message("\"Die.\"") sleep(10) - addtimer(CALLBACK(src, .proc/spiral_shoot), 0) - addtimer(CALLBACK(src, .proc/spiral_shoot, 1), 0) + INVOKE_ASYNC(src, .proc/spiral_shoot) + INVOKE_ASYNC(src, .proc/spiral_shoot, 1) /mob/living/simple_animal/hostile/megafauna/colossus/proc/spiral_shoot(negative = 0, counter_start = 1) var/counter = counter_start diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 7cf9de1a960..78c3bf3e2d1 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -123,7 +123,7 @@ Difficulty: Medium /obj/effect/overlay/temp/target/New(loc) ..() - addtimer(CALLBACK(src, .proc/fall), 0) + INVOKE_ASYNC(src, .proc/fall) /obj/effect/overlay/temp/target/proc/fall() var/turf/T = get_turf(src) @@ -141,15 +141,15 @@ Difficulty: Medium if(prob(15 + anger_modifier) && !client) if(health < maxHealth/2) - addtimer(CALLBACK(src, .proc/swoop_attack, 1), 0) + INVOKE_ASYNC(src, .proc/swoop_attack, 1) else fire_rain() else if(prob(10+anger_modifier) && !client) if(health > maxHealth/2) - addtimer(CALLBACK(src, .proc/swoop_attack), 0) + INVOKE_ASYNC(src, .proc/swoop_attack) else - addtimer(CALLBACK(src, .proc/triple_swoop), 0) + INVOKE_ASYNC(src, .proc/triple_swoop) else fire_walls() @@ -163,7 +163,7 @@ Difficulty: Medium playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1) for(var/d in cardinal) - addtimer(CALLBACK(src, .proc/fire_wall, d), 0) + INVOKE_ASYNC(src, .proc/fire_wall, d) /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_wall(dir) var/list/hit_things = list(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 4c537c32fb3..9fdad4b1e77 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -139,7 +139,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/AttackingTarget() if(!blinking) if(target && isliving(target)) - addtimer(CALLBACK(src, .proc/melee_blast, get_turf(target)), 0) //melee attacks on living mobs produce a 3x3 blast + INVOKE_ASYNC(src, .proc/melee_blast, get_turf(target)) //melee attacks on living mobs produce a 3x3 blast ..() /mob/living/simple_animal/hostile/megafauna/hierophant/DestroySurroundings() @@ -229,9 +229,9 @@ Difficulty: Hard cross_counter-- var/delay = 7 if(prob(60)) - addtimer(CALLBACK(src, .proc/cardinal_blasts, target), 0) + INVOKE_ASYNC(src, .proc/cardinal_blasts, target) else - addtimer(CALLBACK(src, .proc/diagonal_blasts, target), 0) + INVOKE_ASYNC(src, .proc/diagonal_blasts, target) delay = 5 //this one isn't so mean, so do the next one faster(if there is one) sleep(delay) animate(src, color = oldcolor, time = 8) @@ -268,18 +268,18 @@ Difficulty: Hard else if(prob(70 - anger_modifier)) //a cross blast of some type if(prob(anger_modifier)) //at us? if(prob(anger_modifier * 2) && health < maxHealth * 0.5) //we're super angry do it at all dirs - addtimer(CALLBACK(src, .proc/alldir_blasts, src), 0) + INVOKE_ASYNC(src, .proc/alldir_blasts, src) else if(prob(60)) - addtimer(CALLBACK(src, .proc/cardinal_blasts, src), 0) + INVOKE_ASYNC(src, .proc/cardinal_blasts, src) else - addtimer(CALLBACK(src, .proc/diagonal_blasts, src), 0) + INVOKE_ASYNC(src, .proc/diagonal_blasts, src) else //at them? if(prob(anger_modifier * 2) && health < maxHealth * 0.5 && !target_is_slow) //we're super angry do it at all dirs - addtimer(CALLBACK(src, .proc/alldir_blasts, target), 0) + INVOKE_ASYNC(src, .proc/alldir_blasts, target) else if(prob(60)) - addtimer(CALLBACK(src, .proc/cardinal_blasts, target), 0) + INVOKE_ASYNC(src, .proc/cardinal_blasts, target) else - addtimer(CALLBACK(src, .proc/diagonal_blasts, target), 0) + INVOKE_ASYNC(src, .proc/diagonal_blasts, target) else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some! var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, chaser_speed, FALSE) chaser_cooldown = world.time + initial(chaser_cooldown) @@ -288,7 +288,7 @@ Difficulty: Hard OC.moving = 4 OC.moving_dir = pick(cardinal - C.moving_dir) else //just release a burst of power - addtimer(CALLBACK(src, .proc/burst, get_turf(src)), 0) + INVOKE_ASYNC(src, .proc/burst, get_turf(src)) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/diagonal_blasts(mob/victim) //fire diagonal cross blasts with a delay var/turf/T = get_turf(victim) @@ -299,7 +299,7 @@ Difficulty: Hard sleep(2) new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) for(var/d in diagonals) - addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0) + INVOKE_ASYNC(src, .proc/blast_wall, T, d) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/cardinal_blasts(mob/victim) //fire cardinal cross blasts with a delay var/turf/T = get_turf(victim) @@ -310,7 +310,7 @@ Difficulty: Hard sleep(2) new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) for(var/d in cardinal) - addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0) + INVOKE_ASYNC(src, .proc/blast_wall, T, d) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/alldir_blasts(mob/victim) //fire alldir cross blasts with a delay var/turf/T = get_turf(victim) @@ -321,7 +321,7 @@ Difficulty: Hard sleep(2) new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) for(var/d in alldirs) - addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0) + INVOKE_ASYNC(src, .proc/blast_wall, T, d) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blast_wall(turf/T, set_dir) //make a wall of blasts beam_range tiles long var/range = beam_range @@ -340,13 +340,13 @@ Difficulty: Hard return arena_cooldown = world.time + initial(arena_cooldown) for(var/d in cardinal) - addtimer(CALLBACK(src, .proc/arena_squares, T, d), 0) + INVOKE_ASYNC(src, .proc/arena_squares, T, d) for(var/t in RANGE_TURFS(11, T)) if(t && get_dist(t, T) == 11) new /obj/effect/overlay/temp/hierophant/wall(t) new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE) if(get_dist(src, T) >= 11) //hey you're out of range I need to get closer to you! - addtimer(CALLBACK(src, .proc/blink, T), 0) + INVOKE_ASYNC(src, .proc/blink, T) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/arena_squares(turf/T, set_dir) //make a fancy effect extending from the arena target var/turf/previousturf = T @@ -567,7 +567,7 @@ Difficulty: Hard if(ismineralturf(loc)) //drill mineral turfs var/turf/closed/mineral/M = loc M.gets_drilled(caster) - addtimer(CALLBACK(src, .proc/blast), 0) + INVOKE_ASYNC(src, .proc/blast) /obj/effect/overlay/temp/hierophant/blast/proc/blast() var/turf/T = get_turf(src) @@ -629,7 +629,7 @@ Difficulty: Hard if(H.beacon == src) user << "You start removing your hierophant beacon..." H.timer = world.time + 51 - addtimer(CALLBACK(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update), 0) + INVOKE_ASYNC(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update) if(do_after(user, 50, target = src)) playsound(src,'sound/magic/Blind.ogg', 200, 1, -4) new /obj/effect/overlay/temp/hierophant/telegraph/teleport(get_turf(src), user) @@ -639,7 +639,7 @@ Difficulty: Hard qdel(src) else H.timer = world.time - addtimer(CALLBACK(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update), 0) + INVOKE_ASYNC(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update) else user << "You touch the beacon with the club, but nothing happens." else diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index d700f83b35c..2b61f578c97 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -393,7 +393,7 @@ else if(canmove && isturf(loc) && prob(33)) step(src, pick(cardinal)) else if(!AIproc) - addtimer(CALLBACK(src, .proc/AIprocess), 0) + INVOKE_ASYNC(src, .proc/AIprocess) /mob/living/simple_animal/slime/handle_automated_movement() return //slime random movement is currently handled in handle_targets() diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index 33c45537095..d2281350777 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -53,7 +53,7 @@ current_target = target active = TRUE current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical) - addtimer(CALLBACK(current_beam, /datum/beam.proc/Start), 0) + INVOKE_ASYNC(current_beam, /datum/beam.proc/Start) feedback_add_details("gun_fired","[src.type]") diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm index dd001cfa404..11bba1f0d25 100644 --- a/code/modules/recycling/disposal-unit.dm +++ b/code/modules/recycling/disposal-unit.dm @@ -396,7 +396,7 @@ updateDialog() if(flush && air_contents.return_pressure() >= SEND_PRESSURE) // flush can happen even without power - addtimer(CALLBACK(src, .proc/flush), 0) + INVOKE_ASYNC(src, .proc/flush) if(stat & NOPOWER) // won't charge if no power return diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 58479c0ff55..ee88e2e79cc 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -18,10 +18,10 @@ . = ..() if(!.) return - addtimer(CALLBACK(src, .proc/close), 0, TIMER_UNIQUE) + INVOKE_ASYNC(src, .proc/close) // Close any attached airlocks as well for(var/obj/machinery/door/D in orange(1, src)) - addtimer(CALLBACK(src, .proc/close), 0, TIMER_UNIQUE) + INVOKE_ASYNC(src, .proc/close) /obj/machinery/door/airlock/onShuttleMove() shuttledocked = 0 diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm index cbc87cd40ff..d4232fb4471 100644 --- a/code/modules/spells/spell_types/ethereal_jaunt.dm +++ b/code/modules/spells/spell_types/ethereal_jaunt.dm @@ -20,7 +20,7 @@ /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets,mob/user = usr) //magnets, so mostly hardcoded playsound(get_turf(user), 'sound/magic/Ethereal_Enter.ogg', 50, 1, -1) for(var/mob/living/target in targets) - addtimer(CALLBACK(src, .proc/do_jaunt, target), 0) + INVOKE_ASYNC(src, .proc/do_jaunt, target) /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/do_jaunt(mob/living/target) target.notransform = 1 diff --git a/code/modules/spells/spell_types/knock.dm b/code/modules/spells/spell_types/knock.dm index 0deacc1c075..af70ed52b17 100644 --- a/code/modules/spells/spell_types/knock.dm +++ b/code/modules/spells/spell_types/knock.dm @@ -16,9 +16,9 @@ user << sound("sound/magic/Knock.ogg") for(var/turf/T in targets) for(var/obj/machinery/door/door in T.contents) - addtimer(CALLBACK(src, .proc/open_door, door), 0) + INVOKE_ASYNC(src, .proc/open_door, door) for(var/obj/structure/closet/C in T.contents) - addtimer(CALLBACK(src, .proc/open_closet, C), 0) + INVOKE_ASYNC(src, .proc/open_closet, C) /obj/effect/proc_holder/spell/aoe_turf/knock/proc/open_door(var/obj/machinery/door/door) if(istype(door, /obj/machinery/door/airlock)) From 56d22cb327a896525ac16a353fb584cc5a5f09ef Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:20:55 +0000 Subject: [PATCH 32/44] Automatic changelog generation for PR #23424 [ci skip] --- html/changelogs/AutoChangeLog-pr-23424.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23424.yml diff --git a/html/changelogs/AutoChangeLog-pr-23424.yml b/html/changelogs/AutoChangeLog-pr-23424.yml new file mode 100644 index 00000000000..49b6cd6926e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23424.yml @@ -0,0 +1,6 @@ +author: "Cyberboss" +delete-after: True +changes: + - bugfix: "Judicial visors now recharge properly" + - bugfix: "Gluon grenades now properly freeze turfs" + - bugfix: "Revs are now properly jobbanned" From 604c9ab4a07de55af2949ad1624e5b0f5f9c7766 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:23:38 +0000 Subject: [PATCH 33/44] Automatic changelog generation for PR #23275 [ci skip] --- html/changelogs/AutoChangeLog-pr-23275.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23275.yml diff --git a/html/changelogs/AutoChangeLog-pr-23275.yml b/html/changelogs/AutoChangeLog-pr-23275.yml new file mode 100644 index 00000000000..497f2141985 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23275.yml @@ -0,0 +1,7 @@ +author: "coiax" +delete-after: True +changes: + - rscdel: "The Syndicate \"Uplink Implant\" now has no TC precharged. You can +charge it with the use of physical telecrystals. The price has been +reduced from 14TC to 4TC accordingly. (The uplink implant in the implant +bundle still has 10TC)." From e7dff5d3e25f735fe7ba7c5f995043d2aba2fed0 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 30 Jan 2017 15:24:22 -0500 Subject: [PATCH 34/44] Fixes cyborg proselytizers (#23443) * Fixes cyborg proselytizers * wow fuck i'm an idiot --- code/_onclick/cyborg.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index b0c110cddc5..da3f8fcd2e5 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -69,9 +69,10 @@ // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents) if(A == loc || (A in loc) || (A in contents)) // No adjacency checks - var/resolved = A.attackby(W,src, params) - if(!resolved && A && W) - W.afterattack(A,src,1,params) + if(W.pre_attackby(A,src,params)) + var/resolved = A.attackby(W,src, params) + if(!resolved && A && W) + W.afterattack(A,src,1,params) return if(!isturf(loc)) @@ -80,9 +81,10 @@ // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc)) if(isturf(A) || isturf(A.loc)) if(A.Adjacent(src)) // see adjacent.dm - var/resolved = A.attackby(W, src, params) - if(!resolved && A && W) - W.afterattack(A, src, 1, params) + if(W.pre_attackby(A,src,params)) + var/resolved = A.attackby(W, src, params) + if(!resolved && A && W) + W.afterattack(A, src, 1, params) return else W.afterattack(A, src, 0, params) From dede4a897d5aad2c19434850e34f1b12aabe3607 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 30 Jan 2017 15:24:42 -0500 Subject: [PATCH 35/44] Nerfs Volt Void (#23444) * Nerfs Volt Void * 4 * Cyborgs no are no longer immune --- .../clock_scriptures/scripture_cyborg.dm | 2 +- .../clock_scriptures/scripture_scripts.dm | 25 ++++++++++++------- code/game/objects/effects/overlays.dm | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm index 8268847f1c6..f7857cb0dc8 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm @@ -40,5 +40,5 @@ //Volt Void, but with a different quickbind desc /datum/clockwork_scripture/channeled/volt_void/cyborg - quickbind_desc = "Allows you to fire energy rays at target locations using your own power.
    Maximum 5 chants." + quickbind_desc = "Allows you to fire energy rays at target locations using your own power. Failing to fire causes backlash.
    Maximum 4 chants." tier = SCRIPTURE_PERIPHERAL diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index c5b67c46934..87fd1dbe177 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -272,12 +272,12 @@ /datum/clockwork_scripture/channeled/volt_void descname = "Channeled, Targeted Energy Blasts" name = "Volt Void" //Alternative name: "On all levels but physical, I am a power sink" - desc = "Allows you to fire energy rays at target locations; more power consumed causes more damage. Channeled every fourth of a second for a maximum of ten seconds." - channel_time = 20 + desc = "Allows you to fire energy rays at target locations; more power consumed causes more damage. Channeled every fifth of a second for a maximum of ten seconds." + channel_time = 30 invocations = list("Amperage...", "...grant me your power!") chant_invocations = list("Use charge to kill!", "Slay with power!", "Hunt with energy!") - chant_amount = 5 - chant_interval = 4 + chant_amount = 4 + chant_interval = 5 required_components = list(GEIS_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 2) consumed_components = list(GEIS_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 1) usage_tip = "Though it requires you to stand still, this scripture can do massive damage." @@ -285,7 +285,7 @@ primary_component = HIEROPHANT_ANSIBLE sort_priority = 10 quickbind = TRUE - quickbind_desc = "Allows you to fire energy rays at target locations. Failing to fire causes backlash.
    Maximum 5 chants." + quickbind_desc = "Allows you to fire energy rays at target locations. Failing to fire causes backlash.
    Maximum 4 chants." var/static/list/nzcrentr_insults = list("You're not very good at aiming.", "You hunt badly.", "What a waste of energy.", "Almost funny to watch.", "Boss says \"Click something, you idiot!\".", "Stop wasting components if you can't aim.") @@ -297,13 +297,20 @@ var/turf/T = get_turf(invoker) if(!ray.run_scripture() && slab && invoker) if(can_recite() && T == get_turf(invoker)) - if(!ratvar_awakens && !iscyborg(invoker) && !isclockmob(invoker) && !isdrone(invoker)) + if(!ratvar_awakens) var/obj/structure/destructible/clockwork/powered/volt_checker/VC = new/obj/structure/destructible/clockwork/powered/volt_checker(get_turf(invoker)) - var/multiplier = 0.4 + var/multiplier = 0.5 var/usable_power = min(Floor(VC.total_accessable_power() * 0.2, MIN_CLOCKCULT_POWER), 1000) if(VC.try_use_power(usable_power)) - multiplier += (usable_power * 0.0004) //at maximum power, should be 0.8 multiplier + multiplier += (usable_power * 0.0005) //at maximum power, should be 1 multiplier qdel(VC) + if(iscyborg(invoker)) + var/mob/living/silicon/robot/C = invoker + if(C.cell) + var/prev_power = usable_power //we don't want to increase the multiplier past 1 + usable_power = min(Floor(C.cell.charge * 0.2, MIN_CLOCKCULT_POWER), 1000) - prev_power + if(usable_power > 0 && C.cell.use(usable_power)) + multiplier += (usable_power * 0.0005) var/obj/effect/overlay/temp/ratvar/volt_hit/VH = new /obj/effect/overlay/temp/ratvar/volt_hit(get_turf(invoker), null, multiplier) invoker.visible_message("[invoker] is struck by [invoker.p_their()] own [VH.name]!", "You're struck by your own [VH.name]!") invoker.adjustFireLoss(VH.damage) //you have to fail all five blasts to die to this @@ -324,7 +331,7 @@ ranged_type = /obj/effect/proc_holder/slab/volt ranged_message = "You charge the clockwork slab with shocking might.\n\ Left-click a target to fire, quickly!" - timeout_time = 16 + timeout_time = 20 /obj/structure/destructible/clockwork/powered/volt_checker invisibility = INVISIBILITY_ABSTRACT diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 09a1f87453c..b375ba5d0c2 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -317,7 +317,7 @@ duration = 5 icon_state = "volt_hit" var/mob/user - var/damage = 25 + var/damage = 20 /obj/effect/overlay/temp/ratvar/volt_hit/New(loc, caster, multiplier) if(multiplier) From bd55bcca53acc2e8225eb58191ef654e56c0dd2c Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:24:46 +0000 Subject: [PATCH 36/44] Automatic changelog generation for PR #23444 [ci skip] --- html/changelogs/AutoChangeLog-pr-23444.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23444.yml diff --git a/html/changelogs/AutoChangeLog-pr-23444.yml b/html/changelogs/AutoChangeLog-pr-23444.yml new file mode 100644 index 00000000000..38b47c3539c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23444.yml @@ -0,0 +1,5 @@ +author: "Joan" +delete-after: True +changes: + - tweak: "Volt Void now only allows you to fire 4 volt rays instead of 5, and the damage of each ray has been reduced to 20, from 25." + - rscdel: "Cyborgs using Volt Void now take damage if they fail to fire." From b7384ec99e24769d0723b60610214ce6739fb8d3 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:26:46 +0000 Subject: [PATCH 37/44] Automatic changelog generation for PR #23452 [ci skip] --- html/changelogs/AutoChangeLog-pr-23452.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23452.yml diff --git a/html/changelogs/AutoChangeLog-pr-23452.yml b/html/changelogs/AutoChangeLog-pr-23452.yml new file mode 100644 index 00000000000..6991abaf5d7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23452.yml @@ -0,0 +1,5 @@ +author: "Tofa01" +delete-after: True +changes: + - bugfix: "[Delta] Fixes area names for Deltastation" + - bugfix: "[Delta] Fixes custodial closet being cold all the time on Deltastation" From 3f7f5d4000fa5ecb154a4139108e2e39c0867be3 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 30 Jan 2017 15:28:31 -0500 Subject: [PATCH 38/44] Removes/Refactors /mob/unEquip (#22918) * Part1 * IT COMPILES!!!! * Fuck wait this was missing from that last * Update handlabeler.dm * Update handlabeler.dm * Fixes n shit * Fix this * Fixes #23310 * Fucking @RemieRichards was right * Fixes devil unEquip * WTF ARE BITFLAGS? * THERES THE FUCKING PROBLEM * Fixes --- code/datums/diseases/transformation.dm | 4 +- code/datums/diseases/wizarditis.dm | 6 +- code/datums/mind.dm | 2 +- code/game/atoms.dm | 5 +- .../gamemodes/changeling/powers/biodegrade.dm | 8 +- .../gamemodes/changeling/powers/mutations.dm | 13 +- .../clock_cult/clock_effects/clock_sigils.dm | 2 +- .../clock_items/clock_components.dm | 3 +- .../clock_cult/clock_items/clockwork_armor.dm | 8 +- .../clock_structures/geis_binding.dm | 4 +- code/game/gamemodes/cult/cult_items.dm | 18 +- code/game/gamemodes/cult/runes.dm | 2 +- .../gamemodes/devil/true_devil/inventory.dm | 6 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 5 +- code/game/gamemodes/wizard/artefact.dm | 2 +- code/game/gamemodes/wizard/soulstone.dm | 6 +- code/game/gamemodes/wizard/spellbook.dm | 2 +- code/game/gamemodes/wizard/wizard.dm | 1 - code/game/machinery/autolathe.dm | 7 +- code/game/machinery/buttons.dm | 6 +- code/game/machinery/gulag_teleporter.dm | 2 +- code/game/machinery/recycler.dm | 2 +- code/game/machinery/teleporter.dm | 3 +- code/game/machinery/washing_machine.dm | 3 +- code/game/mecha/mech_fabricator.dm | 3 +- code/game/mecha/mecha.dm | 5 +- code/game/mecha/mecha_construction_paths.dm | 18 +- code/game/mecha/mecha_defense.dm | 3 +- code/game/objects/items.dm | 11 +- code/game/objects/items/candle.dm | 3 - code/game/objects/items/devices/PDA/PDA.dm | 12 +- .../objects/items/devices/laserpointer.dm | 3 +- .../objects/items/devices/lightreplacer.dm | 6 +- .../items/devices/radio/electropack.dm | 6 +- .../objects/items/devices/radio/headset.dm | 6 +- .../game/objects/items/devices/radio/radio.dm | 3 +- .../objects/items/devices/taperecorder.dm | 3 +- .../objects/items/devices/transfer_valve.dm | 10 +- code/game/objects/items/nuke_tools.dm | 4 +- code/game/objects/items/robot/robot_parts.dm | 30 +- .../game/objects/items/stacks/sheets/light.dm | 1 - code/game/objects/items/stacks/tiles/light.dm | 1 - code/game/objects/items/stacks/wrap.dm | 2 +- code/game/objects/items/toys.dm | 26 +- code/game/objects/items/weapons/RCD.dm | 30 +- .../objects/items/weapons/airlock_painter.dm | 3 +- .../objects/items/weapons/cigs_lighters.dm | 17 +- code/game/objects/items/weapons/defib.dm | 11 +- code/game/objects/items/weapons/explosives.dm | 4 +- .../objects/items/weapons/flamethrower.dm | 6 +- code/game/objects/items/weapons/gift.dm | 8 +- .../items/weapons/grenades/chem_grenade.dm | 9 +- .../objects/items/weapons/grenades/grenade.dm | 2 +- .../objects/items/weapons/grenades/plastic.dm | 12 +- code/game/objects/items/weapons/handcuffs.dm | 10 +- .../objects/items/weapons/holy_weapons.dm | 3 +- .../items/weapons/implants/implantpad.dm | 3 +- .../objects/items/weapons/melee/energy.dm | 2 - .../objects/items/weapons/pneumaticCannon.dm | 6 +- code/game/objects/items/weapons/powerfist.dm | 3 +- .../objects/items/weapons/storage/bags.dm | 2 +- .../objects/items/weapons/storage/firstaid.dm | 6 +- .../objects/items/weapons/storage/storage.dm | 11 +- code/game/objects/items/weapons/stunbaton.dm | 3 +- .../objects/items/weapons/tanks/tank_types.dm | 4 +- .../game/objects/items/weapons/tanks/tanks.dm | 2 +- .../objects/items/weapons/tanks/watertank.dm | 9 +- code/game/objects/items/weapons/teleprod.dm | 8 +- code/game/objects/items/weapons/tools.dm | 17 +- code/game/objects/items/weapons/twohanded.dm | 4 +- code/game/objects/items/weapons/weaponry.dm | 16 +- code/game/objects/structures/artstuff.dm | 2 +- .../objects/structures/beds_chairs/chair.dm | 1 - code/game/objects/structures/displaycase.dm | 3 +- code/game/objects/structures/noticeboard.dm | 3 +- code/modules/admin/secrets.dm | 2 +- code/modules/admin/topic.dm | 21 +- code/modules/admin/verbs/onlyone.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/assembly/bomb.dm | 5 +- code/modules/assembly/holder.dm | 5 +- .../atmospherics/machinery/airalarm.dm | 2 +- code/modules/awaymissions/capture_the_flag.dm | 8 +- code/modules/clothing/chameleon.dm | 2 +- code/modules/clothing/clothing.dm | 6 +- code/modules/clothing/head/helmet.dm | 3 +- code/modules/clothing/shoes/bananashoes.dm | 2 +- .../modules/clothing/spacesuits/chronosuit.dm | 2 +- .../modules/clothing/spacesuits/flightsuit.dm | 27 +- code/modules/clothing/spacesuits/hardsuit.dm | 3 +- code/modules/clothing/suits/toggles.dm | 10 +- code/modules/detectivework/evidence.dm | 2 +- code/modules/events/wizard/curseditems.dm | 2 +- .../food_and_drinks/food/customizables.dm | 4 +- code/modules/food_and_drinks/food/snacks.dm | 6 +- .../kitchen_machinery/juicer.dm | 6 +- .../kitchen_machinery/smartfridge.dm | 12 +- code/modules/games/cas.dm | 2 +- code/modules/holodeck/computer_funcs.dm | 16 +- code/modules/hydroponics/beekeeping/beebox.dm | 8 +- code/modules/hydroponics/biogenerator.dm | 5 +- code/modules/hydroponics/grown.dm | 7 +- code/modules/hydroponics/grown/citrus.dm | 2 +- code/modules/hydroponics/grown/corn.dm | 2 - code/modules/hydroponics/grown/flowers.dm | 1 - code/modules/hydroponics/grown/nettle.dm | 1 - code/modules/hydroponics/grown/potato.dm | 5 +- code/modules/hydroponics/grown/root.dm | 5 +- code/modules/hydroponics/grown/tomato.dm | 2 - code/modules/hydroponics/grown/towercap.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 4 +- .../mining/lavaland/necropolis_chests.dm | 6 +- code/modules/mining/mine_items.dm | 4 +- code/modules/mob/interactive.dm | 4 +- code/modules/mob/inventory.dm | 39 ++- code/modules/mob/living/bloodcrawl.dm | 1 - code/modules/mob/living/brain/MMI.dm | 3 +- .../living/carbon/alien/humanoid/humanoid.dm | 4 +- .../living/carbon/alien/humanoid/inventory.dm | 2 +- .../living/carbon/alien/larva/inventory.dm | 2 +- .../living/carbon/alien/special/facehugger.dm | 8 +- code/modules/mob/living/carbon/carbon.dm | 7 +- code/modules/mob/living/carbon/human/human.dm | 14 +- .../mob/living/carbon/human/inventory.dm | 12 +- .../mob/living/carbon/human/species.dm | 2 +- .../carbon/human/species_types/golems.dm | 4 +- .../carbon/human/species_types/zombies.dm | 4 +- .../mob/living/carbon/human/update_icons.dm | 6 +- code/modules/mob/living/carbon/inventory.dm | 2 +- .../mob/living/carbon/monkey/combat.dm | 5 +- code/modules/mob/living/living.dm | 37 +-- .../mob/living/silicon/pai/pai_shell.dm | 6 +- .../mob/living/silicon/robot/robot_defense.dm | 2 +- .../living/simple_animal/bot/construction.dm | 32 +- .../simple_animal/friendly/drone/_drone.dm | 8 +- .../friendly/drone/drones_as_items.dm | 2 +- .../simple_animal/friendly/drone/inventory.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 2 +- .../simple_animal/guardian/types/dextrous.dm | 4 +- .../hostile/megafauna/colossus.dm | 2 +- .../hostile/megafauna/hierophant.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 3 +- .../mob/living/simple_animal/slime/slime.dm | 2 +- code/modules/mob/mob_movement.dm | 2 +- code/modules/mob/transform_procs.dm | 21 +- .../computers/item/computer_components.dm | 3 +- .../modular_computers/hardware/ai_slot.dm | 5 +- .../hardware/battery_module.dm | 3 +- .../modular_computers/hardware/card_slot.dm | 3 +- .../modular_computers/hardware/printer.dm | 5 +- .../suit/n_suit_verbs/energy_net_nets.dm | 2 +- .../suit/n_suit_verbs/ninja_sword_recall.dm | 6 +- code/modules/paperwork/clipboard.dm | 6 +- code/modules/paperwork/folders.dm | 3 +- code/modules/paperwork/handlabeler.dm | 5 +- code/modules/paperwork/paper.dm | 4 +- code/modules/paperwork/paper_cutter.dm | 7 +- code/modules/paperwork/paperbin.dm | 283 +++++++++--------- code/modules/paperwork/paperplane.dm | 9 +- code/modules/paperwork/photography.dm | 2 +- code/modules/power/antimatter/control.dm | 3 +- .../projectiles/ammunition/caseless.dm | 3 +- code/modules/projectiles/gun.dm | 3 +- code/modules/projectiles/guns/ballistic.dm | 21 +- .../projectiles/guns/ballistic/automatic.dm | 29 +- .../guns/ballistic/laser_gatling.dm | 9 +- .../projectiles/guns/ballistic/pistol.dm | 3 +- .../projectiles/guns/ballistic/revolver.dm | 2 +- .../guns/energy/kinetic_accelerator.dm | 4 +- .../projectiles/guns/grenade_launcher.dm | 3 +- code/modules/projectiles/guns/syringe_gun.dm | 3 +- code/modules/projectiles/pins.dm | 4 +- code/modules/projectiles/projectile/magic.dm | 2 +- .../reagents/reagent_containers/glass.dm | 1 - .../reagents/reagent_containers/pill.dm | 11 +- code/modules/recycling/sortingmachinery.dm | 4 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 2 +- code/modules/spells/spell_types/barnyard.dm | 2 +- code/modules/spells/spell_types/lichdom.dm | 6 +- .../spell_types/spacetime_distortion.dm | 9 +- code/modules/spells/spell_types/summonitem.dm | 2 +- code/modules/surgery/bodyparts/bodyparts.dm | 2 +- .../surgery/bodyparts/dismemberment.dm | 12 +- code/modules/surgery/bodyparts/helpers.dm | 2 +- .../surgery/bodyparts/robot_bodyparts.dm | 6 +- code/modules/surgery/organs/augments_arms.dm | 5 +- .../modules/surgery/prosthetic_replacement.dm | 1 - code/modules/telesci/bscrystal.dm | 1 - code/modules/telesci/telesci_computer.dm | 4 +- 189 files changed, 643 insertions(+), 810 deletions(-) diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 46744d81b89..97da8be2edc 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -46,9 +46,9 @@ return affected_mob.notransform = 1 for(var/obj/item/W in affected_mob.get_equipped_items()) - affected_mob.unEquip(W) + affected_mob.dropItemToGround(W) for(var/obj/item/I in affected_mob.held_items) - affected_mob.unEquip(I) + affected_mob.dropItemToGround(I) var/mob/living/new_mob = new new_form(affected_mob.loc) if(istype(new_mob)) new_mob.a_intent = INTENT_HARM diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index f766b1992fd..8065e6e33e7 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -59,19 +59,19 @@ STI KALY - blind var/mob/living/carbon/human/H = affected_mob if(prob(chance)) if(!istype(H.head, /obj/item/clothing/head/wizard)) - if(!H.unEquip(H.head)) + if(!H.dropItemToGround(H.head)) qdel(H.head) H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), slot_head) return if(prob(chance)) if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe)) - if(!H.unEquip(H.wear_suit)) + if(!H.dropItemToGround(H.wear_suit)) qdel(H.wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), slot_wear_suit) return if(prob(chance)) if(!istype(H.shoes, /obj/item/clothing/shoes/sandal/magic)) - if(!H.unEquip(H.shoes)) + if(!H.dropItemToGround(H.shoes)) qdel(H.shoes) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(H), slot_shoes) return diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 1ade82e90aa..cf76a3aaa77 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1237,7 +1237,7 @@ switch(href_list["common"]) if("undress") for(var/obj/item/W in current) - current.unEquip(W, 1) //The 1 forces all items to drop, since this is an admin undress. + current.dropItemToGround(W, TRUE) //The 1 forces all items to drop, since this is an admin undress. if("takeuplink") take_uplink() memory = null//Remove any memory they may have had. diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b56a36785a9..dab8a2ad0a2 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -109,8 +109,9 @@ var/atom/movable/M = A if(isliving(M.loc)) var/mob/living/L = M.loc - L.unEquip(M) - M.loc = src + L.transferItemToLoc(M, src) + else + M.forceMove(src) /atom/proc/assume_air(datum/gas_mixture/giver) qdel(giver) diff --git a/code/game/gamemodes/changeling/powers/biodegrade.dm b/code/game/gamemodes/changeling/powers/biodegrade.dm index 6fd219064dc..68b05b839d5 100644 --- a/code/game/gamemodes/changeling/powers/biodegrade.dm +++ b/code/game/gamemodes/changeling/powers/biodegrade.dm @@ -59,16 +59,12 @@ /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O) if(O && user.handcuffed == O) - user.unEquip(O) - O.visible_message("[O] dissolves into a puddle of sizzling goop.") - O.loc = get_turf(user) + visible_message("[O] dissolves into a puddle of sizzling goop.") qdel(O) /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S) if(S && user.wear_suit == S) - user.unEquip(S) - S.visible_message("[S] dissolves into a puddle of sizzling goop.") - S.loc = get_turf(user) + visible_message("[S] dissolves into a puddle of sizzling goop.") qdel(S) /obj/effect/proc_holder/changeling/biodegrade/proc/open_closet(mob/living/carbon/human/user, obj/structure/closet/C) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 304fd36d66e..1b3e59e5189 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -29,7 +29,7 @@ /obj/effect/proc_holder/changeling/weapon/proc/check_weapon(mob/user, obj/item/hand_item) if(istype(hand_item, weapon_type)) - user.unEquip(hand_item, 1) //DROPDEL will delete the item + user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL will delete the item if(!silent) playsound(user, 'sound/effects/blobattack.ogg', 30, 1) user.visible_message("With a sickening crunch, [user] reforms their [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!") - H.unEquip(H.head, TRUE) //The qdel on dropped() takes care of it - H.unEquip(H.wear_suit, TRUE) + H.temporarilyRemoveItemFromInventory(H.head, TRUE) //The qdel on dropped() takes care of it + H.temporarilyRemoveItemFromInventory(H.wear_suit, TRUE) H.update_inv_wear_suit() H.update_inv_head() H.update_hair() @@ -117,8 +117,8 @@ user << "\the [user.head] is stuck on your head, you cannot grow a [helmet_name_simple] over it!" return - user.unEquip(user.head) - user.unEquip(user.wear_suit) + user.dropItemToGround(user.head) + user.dropItemToGround(user.wear_suit) user.equip_to_slot_if_possible(new suit_type(user), slot_wear_suit, 1, 1, 1) user.equip_to_slot_if_possible(new helmet_type(user), slot_head, 1, 1, 1) @@ -312,7 +312,7 @@ /obj/item/projectile/tentacle/on_hit(atom/target, blocked = 0) var/mob/living/carbon/human/H = firer - H.unEquip(source.gun,1) //Unequip thus delete the tentacle on hit + H.dropItemToGround(source.gun, TRUE) //Unequip thus delete the tentacle on hit if(blocked >= 100) return 0 if(istype(target, /obj/item)) @@ -414,7 +414,6 @@ if(ishuman(loc)) var/mob/living/carbon/human/H = loc H.visible_message("With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "[L] collapses in on [L.p_them()]self as [src] flares bright blue!") L << "\"[text2ratvar("Your life will not be wasted.")]\"" for(var/obj/item/W in L) - if(!L.unEquip(W)) + if(!L.dropItemToGround(W)) qdel(W) L.dust() else diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm index 9a091fe3ee7..9a215c7e6c3 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm @@ -16,9 +16,8 @@ if(user.mind && user.mind.isholy) user << "The power of your faith melts away the [src]!" var/obj/item/weapon/ore/slag/wrath = new /obj/item/weapon/ore/slag - user.unEquip(src) - user.put_in_active_hand(wrath) qdel(src) + user.put_in_active_hand(wrath) if(is_servant_of_ratvar(user) && prob(20)) var/pickedmessage = pick(servant_of_ratvar_messages) user << "[servant_of_ratvar_messages[pickedmessage] ? "[text2ratvar(pickedmessage)]" : pickedmessage]" diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm index d4d6aeb853c..1c90cb96f30 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm @@ -44,7 +44,7 @@ user.emote("scream") user.apply_damage(30, BRUTE, "head") user.adjustBrainLoss(30) - addtimer(CALLBACK(user, /mob/living.proc/unEquip), src, 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off. + addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround), src, 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off. /obj/item/clothing/head/helmet/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0) if(equipper && !is_servant_of_ratvar(equipper)) @@ -106,7 +106,7 @@ user.apply_damage(15, BURN, "chest") user.adjust_fire_stacks(2) user.IgniteMob() - addtimer(CALLBACK(user, /mob/living.proc/unEquip, src, 1), 1) + addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1) /obj/item/clothing/gloves/clockwork name = "clockwork gauntlets" @@ -166,7 +166,7 @@ user.emote("scream") user.apply_damage(7, BRUTE, "l_arm") user.apply_damage(7, BRUTE, "r_arm") - addtimer(CALLBACK(user, /mob/living.proc/unEquip, src, 1), 1) + addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1) /obj/item/clothing/shoes/clockwork name = "clockwork treads" @@ -213,4 +213,4 @@ user.emote("scream") user.apply_damage(7, BURN, "l_leg") user.apply_damage(7, BURN, "r_leg") - addtimer(CALLBACK(user, /mob/living.proc/unEquip, src, 1), 1) + addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1) diff --git a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm index 9da7519a53a..041a99c19a9 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm @@ -41,7 +41,7 @@ var/image/GB = new('icons/effects/clockwork_effects.dmi', src, "geisbinding_top", M.layer + 0.01) add_overlay(GB) for(var/obj/item/I in M.held_items) - M.unEquip(I) + M.dropItemToGround(I) for(var/i in M.get_empty_held_indexes()) var/obj/item/geis_binding/B = new(M) M.put_in_hands(B, i) @@ -61,7 +61,7 @@ animate(T, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT) M.visible_message("[src] snaps into glowing pieces and dissipates!") for(var/obj/item/geis_binding/GB in M.held_items) - M.unEquip(GB, TRUE) + M.dropItemToGround(GB, TRUE) /obj/structure/destructible/clockwork/geis_binding/relaymove(mob/user, direction) if(isliving(user) && can_resist) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 6d7aca5a289..f67b7fbb511 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -15,7 +15,7 @@ /obj/item/weapon/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user) if(!iscultist(user)) user.Weaken(5) - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) user.visible_message("A powerful force shoves [user] away from [target]!", \ "\"You shouldn't play with sharp things. You'll poke someone's eye out.\"") if(ishuman(user)) @@ -38,7 +38,7 @@ user << "A horrible force yanks at your arm!" user.emote("scream") user.apply_damage(30, BRUTE, pick("l_arm", "r_arm")) - user.unEquip(src) + user.dropItemToGround(src) /obj/item/weapon/melee/cultblade/dagger name = "sacrificial dagger" @@ -179,7 +179,7 @@ if(!is_servant_of_ratvar(user)) user << "\"I wouldn't advise that.\"" user << "An overwhelming sense of nausea overpowers you!" - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Weaken(5) else @@ -187,7 +187,7 @@ user << "The armor squeezes at your body!" user.emote("scream") user.adjustBruteLoss(25) - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) /obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, attack_text, isinhands) if(current_charges) @@ -231,7 +231,7 @@ if(!is_servant_of_ratvar(user)) user << "\"I wouldn't advise that.\"" user << "An overwhelming sense of nausea overpowers you!" - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Weaken(5) else @@ -239,7 +239,7 @@ user << "The robes squeeze at your body!" user.emote("scream") user.adjustBruteLoss(25) - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) /obj/item/clothing/glasses/night/cultblind desc = "May nar-sie guide you through the darkness and shield you from the light." @@ -253,7 +253,7 @@ ..() if(!iscultist(user)) user << "\"You want to be blind, do you?\"" - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Weaken(5) user.blind_eyes(30) @@ -274,7 +274,7 @@ /obj/item/device/shuttle_curse/attack_self(mob/user) if(!iscultist(user)) - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) user.Weaken(5) user << "A powerful force shoves you away from [src]!" return @@ -327,7 +327,7 @@ user << "\The [src] is dull and unmoving in your hands." return if(!iscultist(user)) - user.unEquip(src, 1) + user.dropItemToGround(src, TRUE) step(src, pick(alldirs)) user << "\The [src] flickers out of your hands, your connection to this dimension is too strong!" return diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 9c93e97a863..65cfd923e08 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -1004,5 +1004,5 @@ var/list/wall_runes = list() new_human.visible_message("[new_human] suddenly dissolves into bones and ashes.", \ "Your link to the world fades. Your form breaks apart.") for(var/obj/I in new_human) - new_human.unEquip(I) + new_human.dropItemToGround(I) new_human.dust() diff --git a/code/game/gamemodes/devil/true_devil/inventory.dm b/code/game/gamemodes/devil/true_devil/inventory.dm index 52feb42e289..a4af9484973 100644 --- a/code/game/gamemodes/devil/true_devil/inventory.dm +++ b/code/game/gamemodes/devil/true_devil/inventory.dm @@ -1,5 +1,5 @@ -/mob/living/carbon/true_devil/unEquip(obj/item/I, force) - if(..(I,force)) +/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force) + if(..()) update_inv_hands() return 1 return 0 @@ -55,4 +55,4 @@ /mob/living/carbon/true_devil/apply_overlay(cache_index) var/image/I = devil_overlays[cache_index] if(I) - add_overlay(I) \ No newline at end of file + add_overlay(I) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index f8305a7ac37..4b182214daa 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -557,12 +557,11 @@ This is here to make the tiles around the station mininuke change when it's arme if(ismob(loc)) var/mob/M = loc - M.remove_from_mob(src) - if(istype(loc, /obj/item/weapon/storage)) + M.transferItemToLoc(src, targetturf, TRUE) //nodrops disks when? + else if(istype(loc, /obj/item/weapon/storage)) var/obj/item/weapon/storage/S = loc S.remove_from_storage(src, targetturf) // move the disc, so ghosts remain orbiting it even if it's "destroyed" - forceMove(targetturf) return targetturf /obj/item/weapon/disk/nuclear/Destroy(force) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 580de6de3c3..fa48e0c6fa4 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -182,7 +182,7 @@ //Funny gimmick, skeletons always seem to wear roman/ancient armour /obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H) for(var/obj/item/I in H) - H.unEquip(I) + H.dropItemToGround(I) var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) H.equip_to_slot_or_del(new hat(H), slot_head) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index d5d7b88848a..45f00fa7fc3 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -125,7 +125,7 @@ var/mob/living/carbon/T = target if(T.client != null) for(var/obj/item/W in T) - T.unEquip(W) + T.dropItemToGround(W) init_shade(T, user) return 1 else @@ -149,7 +149,7 @@ getCultGhost(T,user) else for(var/obj/item/W in T) - T.unEquip(W) + T.dropItemToGround(W) init_shade(T, user, vic = 1) qdel(T) else @@ -258,7 +258,7 @@ return 0 T.ckey = chosen_ghost.ckey for(var/obj/item/W in T) - T.unEquip(W) + T.dropItemToGround(W) init_shade(T, U) qdel(T) return 1 diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index e93e4967af1..e40f5cd9370 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -881,7 +881,7 @@ magichead.flags |= NODROP //curses! magichead.flags_inv &= ~HIDEFACE //so you can still see their face magichead.voicechange = 1 //NEEEEIIGHH - if(!user.unEquip(user.wear_mask)) + if(!user.dropItemToGround(user.wear_mask)) qdel(user.wear_mask) user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) qdel(src) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 0978d9434e7..e2296f498a3 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -138,7 +138,6 @@ qdel(wizard_mob.head) qdel(wizard_mob.shoes) for(var/obj/item/I in wizard_mob.held_items) - wizard_mob.unEquip(I) qdel(I) qdel(wizard_mob.r_store) qdel(wizard_mob.l_store) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 0435ba143e8..a6400e2ea6e 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -145,7 +145,7 @@ if(!materials.has_space(material_amount)) user << "The autolathe is full. Please remove metal or glass from the autolathe in order to insert more." return 1 - if(!user.unEquip(O)) + if(!user.temporarilyRemoveItemFromInventory(O)) user << "\The [O] is stuck to you and cannot be placed into the autolathe." return 1 @@ -159,10 +159,15 @@ flick("autolathe_r",src)//plays glass insertion animation user << "You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe." use_power(inserted*100) + if(!qdeleted(O)) + user.put_in_active_hand(O) else user << "You insert a material total of [inserted] to the autolathe." use_power(max(500,inserted/10)) qdel(O) + else + user.put_in_active_hand(O) + busy = 0 updateUsrDialog() return 1 diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 101700d6c05..22965fa1d64 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -68,18 +68,16 @@ if(panel_open) if(!device && istype(W, /obj/item/device/assembly)) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) user << "\The [W] is stuck to you!" return - W.loc = src device = W user << "You add [W] to the button." if(!board && istype(W, /obj/item/weapon/electronics/airlock)) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) user << "\The [W] is stuck to you!" return - W.loc = src board = W if(board.one_access) req_one_access = board.accesses diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index a72eff26c00..f879f4b4c48 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -137,7 +137,7 @@ The console is located at computer/gulag_teleporter.dm if(linked_reclaimer) linked_reclaimer.stored_items[occupant] = list() for(var/obj/item/W in occupant) - if(!is_type_in_typecache(W, required_items) && occupant.unEquip(W)) + if(!is_type_in_typecache(W, required_items) && occupant.temporarilyRemoveItemFromInventory(W)) if(istype(W, /obj/item/weapon/restraints/handcuffs)) W.forceMove(get_turf(src)) continue diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index ac5f7ac4d65..c7cad0458f4 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -183,7 +183,7 @@ var/const/SAFETY_COOLDOWN = 100 // Remove and recycle the equipped items if(eat_victim_items) for(var/obj/item/I in L.get_equipped_items()) - if(L.unEquip(I)) + if(L.dropItemToGround(I)) eat(I, sound=FALSE) // Instantly lie down, also go unconscious from the pain, before you die. diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index a5f43c7e753..d618b4167e6 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -39,10 +39,9 @@ if(istype(I, /obj/item/device/gps)) var/obj/item/device/gps/L = I if(L.locked_location && !(stat & (NOPOWER|BROKEN))) - if(!user.unEquip(L)) + if(!user.transferItemToLoc(L, src)) user << "\the [I] is stuck to your hand, you cannot put it in \the [src]!" return - L.loc = src locked = L user << "You insert the GPS device into the [name]'s slot." else diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index a7f9125cd22..b35a1f67a0e 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -207,13 +207,12 @@ user << "The washing machine is full!" return 1 - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) user << "\The [W] is stuck to your hand, you cannot put it in the washing machine!" return 1 if(istype(W,/obj/item/toy/crayon) || istype(W,/obj/item/weapon/stamp)) color_source = W - W.loc = src update_icon() else diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 04ba104c143..3f937cf1806 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -444,7 +444,7 @@ if(!materials.has_space(material_amount)) user << "\The [src] is full. Please remove some materials from [src] in order to insert more." return 1 - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) user << "\The [W] is stuck to you and cannot be placed into [src]." return 1 @@ -452,6 +452,7 @@ if(inserted) user << "You insert [inserted] sheet\s into [src]." if(W && W.materials.len) + user.put_in_active_hand(W) var/mat_overlay = "fab-load-[material2name(W.materials[1])]" add_overlay(mat_overlay) sleep(10) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 03eff51f755..0df72c79ca9 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -892,15 +892,14 @@ else if(mmi_as_oc.brainmob.stat) user << "Beta-rhythm below acceptable level!" return 0 - if(!user.unEquip(mmi_as_oc)) + if(!user.transferItemToLoc(mmi_as_oc, src)) user << "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]!" return var/mob/brainmob = mmi_as_oc.brainmob occupant = brainmob - brainmob.loc = src //should allow relaymove + brainmob.forceMove(src) //should allow relaymove brainmob.reset_perspective(src) brainmob.canmove = 1 - mmi_as_oc.loc = src mmi_as_oc.mecha = src icon_state = initial(icon_state) setDir(dir_in) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 17a28beec44..4a0e3012492 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -481,8 +481,7 @@ if(diff==FORWARD) user.visible_message("[user] installs scanner module to the [holder].", "You install scanner module to the [holder].") var/obj/item/I = used_atom - user.unEquip(I) - I.loc = holder + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "gygax11" else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") @@ -500,8 +499,7 @@ if(diff==FORWARD) user.visible_message("[user] installs capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom - user.unEquip(I) - I.loc = holder + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "gygax13" else user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") @@ -1068,8 +1066,7 @@ if(diff==FORWARD) user.visible_message("[user] installs scanner module to the [holder].", "You install phasic scanner module to the [holder].") var/obj/item/I = used_atom - user.unEquip(I) - I.loc = holder + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "durand11" else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") @@ -1087,8 +1084,7 @@ if(diff==FORWARD) user.visible_message("[user] installs capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom - user.unEquip(I) - I.loc = holder + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "durand13" else user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") @@ -1375,8 +1371,7 @@ if(diff==FORWARD) user.visible_message("[user] installs phasic scanner module to the [holder].", "You install scanner module to the [holder].") var/obj/item/I = used_atom - user.unEquip(I) - I.loc = holder + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "phazon11" else user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") @@ -1394,8 +1389,7 @@ if(diff==FORWARD) user.visible_message("[user] installs super capacitor to the [holder].", "You install capacitor to the [holder].") var/obj/item/I = used_atom - user.unEquip(I) - I.loc = holder + user.transferItemToLoc(I, holder, TRUE) holder.icon_state = "phazon13" else user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the scanner module.") diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index 2a27a20cde4..4a0c38514d5 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -258,10 +258,9 @@ return 1 else if(istype(W, /obj/item/mecha_parts/mecha_tracking)) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) user << "\the [W] is stuck to your hand, you cannot put it in \the [src]!" return - W.forceMove(src) trackers += W user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src].") diag_hud_set_mechtracking() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8cb17c6357b..758dffe0c80 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -107,9 +107,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s actions_types = null /obj/item/Destroy() + flags &= ~DROPDEL //prevent reqdels if(ismob(loc)) var/mob/m = loc - m.unEquip(src, 1) + m.temporarilyRemoveItemFromInventory(src, TRUE) for(var/X in actions) qdel(X) return ..() @@ -235,7 +236,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s throwing = 0 if(loc == user) - if(!user.unEquip(src)) + if(!user.dropItemToGround(src)) return pickup(user) @@ -256,7 +257,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s throwing = 0 if(loc == user) - if(!user.unEquip(src)) + if(!user.dropItemToGround(src)) return pickup(user) @@ -269,7 +270,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s if(!A.has_fine_manipulation) if(src in A.contents) // To stop Aliens having items stuck in their pockets - A.unEquip(src) + A.dropItemToGround(src) user << "Your claws aren't capable of such fine manipulation!" return attack_paw(A) @@ -342,8 +343,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s var/datum/action/A = X A.Remove(user) if(DROPDEL & flags) - //Prevents infinite loops where Destroy() calls an objects dropped() function - flags &= ~DROPDEL qdel(src) // called just as an item is picked up (loc is not yet changed) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index e9fc4c85629..742edcbe8e1 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -58,9 +58,6 @@ wax-- if(!wax) new/obj/item/trash/candle(src.loc) - if(istype(src.loc, /mob)) - var/mob/M = src.loc - M.unEquip(src, 1) //src is being deleted anyway qdel(src) update_icon() open_flame() diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index bee90b89cc8..83ed5db715e 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -761,10 +761,9 @@ var/global/list/obj/item/device/pda/PDAs = list() I = C if(I && I.registered_name) - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return 0 var/obj/old_id = id - I.forceMove(src) id = I if(old_id) user.put_in_hands(old_id) @@ -774,10 +773,9 @@ var/global/list/obj/item/device/pda/PDAs = list() // access to status display signals /obj/item/device/pda/attackby(obj/item/C, mob/user, params) if(istype(C, /obj/item/weapon/cartridge) && !cartridge) - if(!user.unEquip(C)) + if(!user.transferItemToLoc(C, src)) return cartridge = C - cartridge.loc = src user << "You insert [cartridge] into [src]." if(cartridge.radio) cartridge.radio.hostpda = src @@ -803,9 +801,8 @@ var/global/list/obj/item/device/pda/PDAs = list() return //Return in case of failed check or when successful. updateSelfDialog()//For the non-input related code. else if(istype(C, /obj/item/device/paicard) && !src.pai) - if(!user.unEquip(C)) + if(!user.transferItemToLoc(C, src)) return - C.loc = src pai = C user << "You slot \the [C] into [src]." update_icon() @@ -814,9 +811,8 @@ var/global/list/obj/item/device/pda/PDAs = list() if(inserted_item) user << "There is already \a [inserted_item] in \the [src]!" else - if(!user.unEquip(C)) + if(!user.transferItemToLoc(C, src)) return - C.forceMove(src) user << "You slide \the [C] into \the [src]." inserted_item = C update_icon() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index f31ba845a36..72c957f82d9 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -41,9 +41,8 @@ /obj/item/device/laser_pointer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/micro_laser)) if(!diode) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src diode = W user << "You install a [diode.name] in [src]." else diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 7af4de841c6..a4825e904e8 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -93,7 +93,7 @@ if(uses >= max_uses) user << "[src.name] is full." return - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return AddUses(round(increment*0.75)) user << "You insert a shard of glass into the [src.name]. You have [uses] light\s remaining." @@ -104,12 +104,12 @@ var/obj/item/weapon/light/L = W if(L.status == 0) // LIGHT OKAY if(uses < max_uses) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return AddUses(1) qdel(L) else - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return user << "You insert the [L.name] into the [src.name]" AddShards(1, user) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 87c97636ab5..2f0a8fe924f 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -39,15 +39,13 @@ var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) A.icon = 'icons/obj/assemblies.dmi' - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, A)) user << "[W] is stuck to your hand, you cannot attach it to [src]!" return - W.loc = A W.master = A A.part1 = W - user.unEquip(src) - loc = A + user.transferItemToLoc(src, A, TRUE) master = A A.part2 = src diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 082536c038b..dfcf3642a6c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -246,15 +246,13 @@ return if(!keyslot) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src keyslot = W else - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src keyslot2 = W diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index e631d41c494..a1d71960879 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -581,9 +581,8 @@ return if(!keyslot) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src keyslot = W recalculateChannels() diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index fbada58249a..81ec8249361 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -32,9 +32,8 @@ /obj/item/device/taperecorder/attackby(obj/item/I, mob/user, params) if(!mytape && istype(I, /obj/item/device/tape)) - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I,src)) return - I.loc = src mytape = I user << "You insert [I] into [src]." update_icon() diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index fe25907e07d..4f6ee0d9b4a 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -22,18 +22,16 @@ return if(!tank_one) - if(!user.unEquip(item)) + if(!user.transferItemToLoc(item, src)) return tank_one = item - item.loc = src user << "You attach the tank to the transfer valve." if(item.w_class > w_class) w_class = item.w_class else if(!tank_two) - if(!user.unEquip(item)) + if(!user.transferItemToLoc(item, src)) return tank_two = item - item.loc = src user << "You attach the tank to the transfer valve." if(item.w_class > w_class) w_class = item.w_class @@ -48,9 +46,9 @@ if(attached_device) user << "There is already a device attached to the valve, remove it first!" return - user.remove_from_mob(item) + if(!user.transferItemToLoc(item, src)) + return attached_device = A - A.loc = src user << "You attach the [item] to the valve controls and secure it." A.holder = src A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). diff --git a/code/game/objects/items/nuke_tools.dm b/code/game/objects/items/nuke_tools.dm index 9f9a76f604f..7fe512bfaf1 100644 --- a/code/game/objects/items/nuke_tools.dm +++ b/code/game/objects/items/nuke_tools.dm @@ -39,7 +39,7 @@ /obj/item/nuke_core_container/proc/load(obj/item/nuke_core/ncore, mob/user) if(core || !istype(ncore)) return 0 - ncore.loc = src + ncore.forceMove(src) core = ncore icon_state = "core_container_loaded" user << "Container is sealing..." @@ -56,7 +56,7 @@ /obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user) if(istype(core)) - if(!user.unEquip(core)) + if(!user.temporarilyRemoveItemFromInventory(core)) user << "The [core] is stuck to your hand!" return else diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index d0c2878a990..78308b5fcdd 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -71,19 +71,18 @@ var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly B.loc = get_turf(src) user << "You arm the robot frame." - if (user.get_inactive_held_item()==src) - user.unEquip(src) - user.put_in_inactive_hand(B) + var/holding_this = user.get_inactive_held_item()==src qdel(src) + if (holding_this) + user.put_in_inactive_hand(B) else user << "You need one sheet of metal to start building ED-209!" return else if(istype(W, /obj/item/bodypart/l_leg/robot)) if(src.l_leg) return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.forceMove(src) W.icon_state = initial(W.icon_state) W.cut_overlays() src.l_leg = W @@ -92,9 +91,8 @@ else if(istype(W, /obj/item/bodypart/r_leg/robot)) if(src.r_leg) return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.forceMove(src) W.icon_state = initial(W.icon_state) W.cut_overlays() src.r_leg = W @@ -103,9 +101,8 @@ else if(istype(W, /obj/item/bodypart/l_arm/robot)) if(src.l_arm) return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.forceMove(src) W.icon_state = initial(W.icon_state) W.cut_overlays() src.l_arm = W @@ -114,9 +111,8 @@ else if(istype(W, /obj/item/bodypart/r_arm/robot)) if(src.r_arm) return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.forceMove(src) W.icon_state = initial(W.icon_state)//in case it is a dismembered robotic limb W.cut_overlays() src.r_arm = W @@ -127,9 +123,8 @@ if(src.chest) return if(CH.wired && CH.cell) - if(!user.unEquip(CH)) + if(!user.transferItemToLoc(CH, src)) return - CH.forceMove(src) CH.icon_state = initial(CH.icon_state) //in case it is a dismembered robotic limb CH.cut_overlays() src.chest = CH @@ -148,9 +143,8 @@ if(src.head) return if(HD.flash2 && HD.flash1) - if(!user.unEquip(HD)) + if(!user.transferItemToLoc(HD, src)) return - HD.loc = src HD.icon_state = initial(HD.icon_state)//in case it is a dismembered robotic limb HD.cut_overlays() src.head = HD @@ -191,7 +185,7 @@ user << "This [M.name] does not seem to fit!" return - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc)) @@ -235,7 +229,7 @@ O.cell = chest.cell chest.cell.loc = O chest.cell = null - W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. + W.forceMove(O)//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. if(O.mmi) //we delete the mmi created by robot/New() qdel(O.mmi) O.mmi = W //and give the real mmi to the borg. @@ -243,7 +237,7 @@ feedback_inc("cyborg_birth",1) - src.loc = O + forceMove(O) O.robot_suit = src if(!locomotion) diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 10132b4d423..969ebe3d9dd 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -22,7 +22,6 @@ var/obj/item/stack/sheet/glass/G = new (user.loc) G.add_fingerprint(user) if(amount <= 0) - user.unEquip(src, 1) qdel(src) else if(istype(O, /obj/item/stack/sheet/metal)) diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 1f585f3eecc..682060e0b6a 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -25,7 +25,6 @@ amount-- new/obj/item/stack/light_w(user.loc) if(amount <= 0) - user.unEquip(src, 1) qdel(src) else return ..() \ No newline at end of file diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 784219fe9a6..d743f96ea56 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -59,7 +59,7 @@ if(!I.can_be_package_wrapped()) return if(user.is_holding(I)) - if(!user.unEquip(I)) + if(!user.dropItemToGround(I)) return else if(!isturf(I.loc)) return diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 544967eab0f..73a75a4f7cd 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -249,8 +249,6 @@ if(hacked) // That's right, we'll only check the "original" "sword". newSaber.hacked = 1 newSaber.item_color = "rainbow" - user.unEquip(W) - user.unEquip(src) qdel(W) qdel(src) else if(istype(W, /obj/item/device/multitool)) @@ -733,7 +731,7 @@ if(istype(I, /obj/item/toy/cards/singlecard)) var/obj/item/toy/cards/singlecard/SC = I if(SC.parentdeck == src) - if(!user.unEquip(SC)) + if(!user.temporarilyRemoveItemFromInventory(SC)) user << "The card is stuck to your hand, you can't add it to the deck!" return cards += SC.cardname @@ -745,7 +743,7 @@ else if(istype(I, /obj/item/toy/cards/cardhand)) var/obj/item/toy/cards/cardhand/CH = I if(CH.parentdeck == src) - if(!user.unEquip(CH)) + if(!user.temporarilyRemoveItemFromInventory(CH)) user << "The hand of cards is stuck to your hand, you can't add it to the deck!" return cards += CH.currenthand @@ -769,8 +767,10 @@ else if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object if(!remove_item_from_storage(M)) - M.unEquip(src) - M.put_in_hand(src, H.held_index) + M.temporarilyRemoveItemFromInventory(src, TRUE) + if(!M.put_in_hand(src, H.held_index)) + qdel(src) + return usr << "You pick up the deck." else @@ -834,20 +834,19 @@ N.parentdeck = src.parentdeck N.cardname = src.currenthand[1] N.apply_card_vars(N,O) - cardUser.unEquip(src) + qdel(src) N.pickup(cardUser) cardUser.put_in_hands(N) cardUser << "You also take [currenthand[1]] and hold it." cardUser << browse(null, "window=cardhand") - qdel(src) return /obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params) if(istype(C)) if(C.parentdeck == src.parentdeck) src.currenthand += C.cardname - user.unEquip(C) user.visible_message("[user] adds a card to [user.p_their()] hand.", "You add the [C.cardname] to your hand.") + qdel(C) interact(user) if(currenthand.len > 4) src.icon_state = "[deckstyle]_hand5" @@ -855,7 +854,6 @@ src.icon_state = "[deckstyle]_hand4" else if(currenthand.len > 2) src.icon_state = "[deckstyle]_hand3" - qdel(C) else user << "You can't mix cards from other decks!" else @@ -923,12 +921,11 @@ H.currenthand += src.cardname H.parentdeck = C.parentdeck H.apply_card_vars(H,C) - user.unEquip(C) - H.pickup(user) - user.put_in_active_hand(H) user << "You combine the [C.cardname] and the [src.cardname] into a hand." qdel(C) qdel(src) + H.pickup(user) + user.put_in_active_hand(H) else user << "You can't mix cards from other decks!" @@ -936,8 +933,8 @@ var/obj/item/toy/cards/cardhand/H = I if(H.parentdeck == parentdeck) H.currenthand += cardname - user.unEquip(src) user.visible_message("[user] adds a card to [user.p_their()] hand.", "You add the [cardname] to your hand.") + qdel(src) H.interact(user) if(H.currenthand.len > 4) H.icon_state = "[deckstyle]_hand5" @@ -945,7 +942,6 @@ H.icon_state = "[deckstyle]_hand4" else if(H.currenthand.len > 2) H.icon_state = "[deckstyle]_hand3" - qdel(src) else user << "You can't mix cards from other decks!" else diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 8fbaba9b2d3..4b84a0b529f 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -263,8 +263,6 @@ RCD if((matter + R.ammoamt) > max_matter) user << "The RCD can't hold any more matter-units!" return - if(!user.unEquip(W)) - return qdel(W) matter += R.ammoamt playsound(src.loc, 'sound/machines/click.ogg', 50, 1) @@ -280,24 +278,16 @@ RCD return ..() /obj/item/weapon/rcd/proc/loadwithsheets(obj/item/stack/sheet/S, value, mob/user) - var/maxsheets = round((max_matter-matter)/value) //calculate the max number of sheets that will fit in RCD - if(maxsheets > 0) - if(S.amount > maxsheets) - //S.amount -= maxsheets - S.use(maxsheets) - matter += value*maxsheets - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user << "You insert [maxsheets] [S.name] sheets into the RCD. " - else - matter += value*(S.amount) - user.unEquip() - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user << "You insert [S.amount] [S.name] sheets into the RCD. " - S.use(S.amount) - - return 1 - user << "You can't insert any more [S.name] sheets into the RCD!" - return 0 + var/maxsheets = round((max_matter-matter)/value) //calculate the max number of sheets that will fit in RCD + if(maxsheets > 0) + var/amount_to_use = min(S.amount, maxsheets) + S.use(amount_to_use) + matter += value*amount_to_use + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + user << "You insert [amount_to_use] [S.name] sheets into the RCD. " + return 1 + user << "You can't insert any more [S.name] sheets into the RCD!" + return 0 /obj/item/weapon/rcd/attack_self(mob/user) //Change the mode diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index 6120cdf397b..520323abcc3 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -109,9 +109,8 @@ if(ink) user << "[src] already contains \a [ink]." return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src user << "You install [W] into [src]." ink = W playsound(src.loc, 'sound/machines/click.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 14afba478b0..2a12e095430 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -163,18 +163,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/datum/effect_system/reagents_explosion/e = new() e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0) e.start() - if(ismob(loc)) - var/mob/M = loc - M.unEquip(src, 1) qdel(src) return if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently var/datum/effect_system/reagents_explosion/e = new() e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0) e.start() - if(ismob(loc)) - var/mob/M = loc - M.unEquip(src, 1) qdel(src) return // allowing reagents to react after being lit @@ -217,7 +211,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM new type_butt(location) if(ismob(loc)) M << "Your [name] goes out." - M.unEquip(src, 1) //un-equip it so the overlays can update //Force the un-equip so the overlays update qdel(src) return open_flame() @@ -566,16 +559,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown)) var/obj/item/weapon/reagent_containers/food/snacks/grown/O = target if(O.dry) - user.unEquip(target, 1) - user.unEquip(src, 1) var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc) R.chem_volume = target.reagents.total_volume target.reagents.trans_to(R, R.chem_volume) + qdel(target) + qdel(src) user.put_in_active_hand(R) user << "You roll the [target.name] into a rolling paper." R.desc = "Dried [target.name] rolled up in a thin piece of paper." - qdel(target) - qdel(src) else user << "You need to dry this first!" else @@ -707,9 +698,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/datum/effect_system/reagents_explosion/e = new() e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0) e.start() - if(ismob(loc)) - var/mob/M = loc - M.unEquip(src, 1) qdel(src) return reagents.remove_any(REAGENTS_METABOLISM) @@ -744,7 +732,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(prob(5))//small chance for the vape to break and deal damage if it's emagged playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, 0) M.apply_damage(20, BURN, "head") - M.unEquip(src, 1) M.Weaken(15, 1, 0) qdel(src) var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index c907ecaee25..d13d469812f 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -95,9 +95,10 @@ var/mob/M = src.loc if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object - if(!M.unEquip(src)) + if(!M.temporarilyRemoveItemFromInventory(src)) return - M.put_in_hand(src, H.held_index) + if(!M.put_in_hand(src, H.held_index)) + qdel(src) //wewie /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params) @@ -112,9 +113,8 @@ if(C.maxcharge < paddles.revivecost) user << "[src] requires a higher capacity cell." return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src bcell = W user << "You install a cell in [src]." update_icon() @@ -191,7 +191,7 @@ /obj/item/weapon/defibrillator/proc/remove_paddles(mob/user) //this fox the bug with the paddles when other player stole you the defib when you have the paddles equiped if(ismob(paddles.loc)) var/mob/M = paddles.loc - M.unEquip(paddles,1) + M.dropItemToGround(paddles, TRUE) return /obj/item/weapon/defibrillator/Destroy() @@ -337,7 +337,6 @@ if(!req_defib) return 1 //If it doesn't need a defib, just say it exists if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns - M.unEquip(O) qdel(O) return 0 else diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 2b0b7fd82ca..8c967290645 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -82,10 +82,10 @@ user << "You start planting the bomb..." if(do_after(user, 50, target = AM)) - if(!user.unEquip(src)) + if(!user.temporarilyRemoveItemFromInventory(src)) return src.target = AM - loc = null + forceMove(null) var/message = "[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [timer] second fuse" bombers += message diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 5bf785c330f..c5b1ccdceb3 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -98,9 +98,8 @@ return if(igniter) return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - I.loc = src igniter = I update_icon() return @@ -109,10 +108,9 @@ if(ptank) user << "There is already a plasma tank loaded in [src]!" return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return ptank = W - W.loc = src update_icon() return diff --git a/code/game/objects/items/weapons/gift.dm b/code/game/objects/items/weapons/gift.dm index 439ce64ea74..4da249cd4d5 100644 --- a/code/game/objects/items/weapons/gift.dm +++ b/code/game/objects/items/weapons/gift.dm @@ -75,9 +75,7 @@ if(!ispath(gift_type,/obj/item)) return - var/obj/item/I = new gift_type(M) - M.unEquip(src, 1) - M.put_in_hands(I) - I.add_fingerprint(M) qdel(src) - return + var/obj/item/I = new gift_type(M) + M.put_in_hands(I) + I.add_fingerprint(M) \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 461dd4e9fa6..552709d3491 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -71,10 +71,9 @@ return else if(I.reagents.total_volume) - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return user << "You add [I] to the [initial(name)] assembly." - I.loc = src beakers += I else user << "[I] is empty!" @@ -84,12 +83,11 @@ var/obj/item/device/assembly_holder/A = I if(isigniter(A.a_left) == isigniter(A.a_right)) //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it return - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return nadeassembly = A A.master = src - A.loc = src assemblyattacher = user.ckey stage_change(WIRED) @@ -229,10 +227,9 @@ //make a special case you might as well do it explicitly. -Sayu /obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/slime_extract) && stage == WIRED) - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return user << "You add [I] to the [initial(name)] assembly." - I.loc = src beakers += I else return ..() diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index a9eaf6eec58..93f70405fb4 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -71,7 +71,7 @@ /obj/item/weapon/grenade/proc/update_mob() if(ismob(loc)) var/mob/M = loc - M.unEquip(src) + M.dropItemToGround(src) /obj/item/weapon/grenade/attackby(obj/item/weapon/W, mob/user, params) diff --git a/code/game/objects/items/weapons/grenades/plastic.dm b/code/game/objects/items/weapons/grenades/plastic.dm index cbd62293a6e..6f6cb133612 100644 --- a/code/game/objects/items/weapons/grenades/plastic.dm +++ b/code/game/objects/items/weapons/grenades/plastic.dm @@ -24,11 +24,10 @@ /obj/item/weapon/grenade/plastic/attackby(obj/item/I, mob/user, params) if(!nadeassembly && istype(I, /obj/item/device/assembly_holder)) var/obj/item/device/assembly_holder/A = I - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return ..() nadeassembly = A A.master = src - A.loc = src assemblyattacher = user.ckey user << "You add [A] to the [name]." playsound(src, 'sound/weapons/tap.ogg', 20, 1) @@ -36,7 +35,7 @@ return if(nadeassembly && istype(I, /obj/item/weapon/wirecutters)) playsound(src, I.usesound, 20, 1) - nadeassembly.loc = get_turf(src) + nadeassembly.forceMove(get_turf(src)) nadeassembly.master = null nadeassembly = null update_icon() @@ -70,13 +69,14 @@ return if (ismob(AM)) return + user << "You start planting the [src]. The timer is set to [det_time]..." if(do_after(user, 50, target = AM)) - if(!user.unEquip(src)) + if(!user.temporarilyRemoveItemFromInventory(src)) return src.target = AM - loc = null + forceMove(null) //Yep message_admins("[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time] second fuse",0,1) log_game("[key_name(user)] planted [name] on [target.name] at [COORD(src)] with [det_time] second fuse") @@ -85,6 +85,8 @@ if(!nadeassembly) user << "You plant the bomb. Timer counting down from [det_time]." addtimer(CALLBACK(src, .proc/prime), det_time*10) + else + qdel(src) //How? /obj/item/weapon/grenade/plastic/suicide_act(mob/user) message_admins("[key_name_admin(user)](?) (FLW) suicided with [src] at ([user.x],[user.y],[user.z] - JMP)",0,1) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index f09b2847b9d..1bed868084a 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -29,13 +29,13 @@ user << "Uh... how do those things work?!" apply_cuffs(user,user) return - + // chance of monkey retaliation if(istype(C, /mob/living/carbon/monkey) && prob(MONKEY_CUFF_RETALIATION_PROB)) var/mob/living/carbon/monkey/M M = C M.retaliate(user) - + if(!C.handcuffed) if(C.get_num_arms() >= 2 || C.get_arm_ignore()) C.visible_message("[user] is trying to put [src.name] on [C]!", \ @@ -165,8 +165,7 @@ var/obj/item/stack/rods/R = I if (R.use(1)) var/obj/item/weapon/wirerod/W = new /obj/item/weapon/wirerod - if(!remove_item_from_storage(user)) - user.unEquip(src) + remove_item_from_storage(user) user.put_in_hands(W) user << "You wrap the cable restraint around the top of the rod." qdel(src) @@ -186,8 +185,7 @@ M.use(6) user.put_in_hands(S) user << "You make some weights out of [I] and tie them to [src]." - if(!remove_item_from_storage(user)) - user.unEquip(src) + remove_item_from_storage(user) qdel(src) else return ..() diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 2bdfb032548..06fae51dbde 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -49,9 +49,8 @@ if(holy_weapon) holy_weapon.reskinned = TRUE - M.unEquip(src) - M.put_in_active_hand(holy_weapon) qdel(src) + M.put_in_active_hand(holy_weapon) /obj/item/weapon/nullrod/godhand icon_state = "disintegrate" diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index b528d583f0b..cf190988edf 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -35,9 +35,8 @@ /obj/item/weapon/implantpad/attackby(obj/item/weapon/implantcase/C, mob/user, params) if(istype(C, /obj/item/weapon/implantcase)) if(!case) - if(!user.unEquip(C)) + if(!user.transferItemToLoc(C, src)) return - C.loc = src case = C update_icon() else diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 004e797d031..f7a99fa1fbd 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -193,8 +193,6 @@ if(hacked || other_esword.hacked) newSaber.hacked = TRUE newSaber.item_color = "rainbow" - user.unEquip(W) - user.unEquip(src) qdel(W) qdel(src) user.put_in_hands(newSaber) diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index badd8097791..a89accdaf61 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -61,12 +61,11 @@ if(IW.w_class > src.w_class) user << "\The [IW] is too large to fit into \the [src]!" return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return user << "You load \the [IW] into \the [src]." loadedItems.Add(IW) loadedWeightClass += IW.w_class - IW.loc = src @@ -147,11 +146,10 @@ if(src.tank) user << "\The [src] already has a tank." return - if(!user.unEquip(thetank)) + if(!user.transferItemToLoc(thetank, src)) return user << "You hook \the [thetank] up to \the [src]." src.tank = thetank - thetank.loc = src src.update_icons() /obj/item/weapon/pneumatic_cannon/proc/update_icons() diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm index 3c6b809ec7b..f6f4325b574 100644 --- a/code/game/objects/items/weapons/powerfist.dm +++ b/code/game/objects/items/weapons/powerfist.dm @@ -63,11 +63,10 @@ if(tank) user << "\The [src] already has a tank." return - if(!user.unEquip(thetank)) + if(!user.transferItemToLoc(thetank, src)) return user << "You hook \the [thetank] up to \the [src]." tank = thetank - thetank.forceMove(src) /obj/item/weapon/melee/powerfist/attack(mob/living/target, mob/living/user) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 0e92e0c4314..2577e3f0b8e 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -194,7 +194,7 @@ break if(!inserted || !S.amount) - usr.unEquip(S) + usr.dropItemToGround(S) if (usr.client && usr.s_active != src) usr.client.screen -= S S.dropped(usr) diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index f8606ae6de9..ebdf0bc3d48 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -140,9 +140,11 @@ return ..() if(!M.restrained() && !M.stat && istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object - if(!M.unEquip(src)) + if(!M.temporarilyRemoveItemFromInventory(src)) + return + if(!M.put_in_hand(src,H.held_index)) + qdel(src) return - M.put_in_hand(src,H.held_index) src.add_fingerprint(usr) return if(over_object == usr && in_range(src, usr) || usr.contents.Find(src)) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 067dd23ce35..b9169e8e05b 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -57,9 +57,11 @@ if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object - if(!M.unEquip(src)) + if(!M.temporarilyRemoveItemFromInventory(src)) + return + if(!M.put_in_hand(src,H.held_index)) + qdel(src) return - M.put_in_hand(src,H.held_index) add_fingerprint(usr) @@ -303,13 +305,14 @@ if(!istype(W)) return 0 if(usr) - if(!usr.unEquip(W)) + if(!usr.transferItemToLoc(W, src)) return 0 + else + W.forceMove(src) if(silent) prevent_warning = 1 if(W.pulledby) W.pulledby.stop_pulling() - W.loc = src W.on_enter_storage(src) if(usr) if(usr.client && usr.s_active != src) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 8e2c05d5ac4..77e34871406 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -73,9 +73,8 @@ if(C.maxcharge < hitcost) user << "[src] requires a higher capacity cell." return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src bcell = W user << "You install a cell in [src]." update_icon() diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 6ad20fc8f42..9617f8820a5 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -95,10 +95,10 @@ var/obj/item/weapon/flamethrower/F = W if ((!F.status)||(F.ptank)) return + if(!user.transferItemToLoc(src, F)) + return src.master = F F.ptank = src - user.unEquip(src) - src.loc = F F.update_icon() else return ..() diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 4c2f7c5a5d7..d1025186ed6 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -118,7 +118,7 @@ playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3) if (H && !qdeleted(H)) for(var/obj/item/W in H) - H.unEquip(W) + H.dropItemToGround(W) if(prob(50)) step(W, pick(alldirs)) H.hair_style = "Bald" diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index d944ab6f5c0..f6900215f43 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -67,14 +67,12 @@ /obj/item/weapon/watertank/proc/remove_noz() if(ismob(noz.loc)) var/mob/M = noz.loc - M.unEquip(noz, 1) + M.temporarilyRemoveItemFromInventory(noz, TRUE) return /obj/item/weapon/watertank/Destroy() if (on) - remove_noz() qdel(noz) - noz = null return ..() /obj/item/weapon/watertank/attack_hand(mob/user) @@ -87,7 +85,7 @@ var/mob/M = src.loc if(istype(M) && istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object - if(!M.unEquip(src)) + if(!M.temporarilyRemoveItemFromInventory(src)) return M.put_in_hand(src, H.held_index) @@ -138,8 +136,7 @@ /proc/check_tank_exists(parent_tank, mob/living/carbon/human/M, obj/O) if (!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank)) //To avoid weird issues from admin spawns - M.unEquip(O) - qdel(0) + qdel(O) return 0 else return 1 diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm index c827ee91e73..7736dc2ff2c 100644 --- a/code/game/objects/items/weapons/teleprod.dm +++ b/code/game/objects/items/weapons/teleprod.dm @@ -30,13 +30,11 @@ if(istype(I, /obj/item/weapon/ore/bluespace_crystal)) if(!bcell) var/obj/item/weapon/melee/baton/cattleprod/teleprod/S = new /obj/item/weapon/melee/baton/cattleprod/teleprod - if(!remove_item_from_storage(user)) - user.unEquip(src) - user.unEquip(I) + remove_item_from_storage(user) + qdel(src) + qdel(I) user.put_in_hands(S) user << "You place the bluespace crystal firmly into the igniter." - qdel(I) - qdel(src) else user.visible_message("You can't put the crystal onto the stunprod while it has a power cell installed!") else diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index faf292516e5..c2467177804 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -73,9 +73,8 @@ playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) var/obj/item/weapon/wirecutters/power/s_drill = new /obj/item/weapon/screwdriver/power user << "You attach the screw driver bit to [src]." - user.unEquip(src) - user.put_in_active_hand(s_drill) qdel(src) + user.put_in_active_hand(s_drill) /obj/item/weapon/wrench/power/suicide_act(mob/user) user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") @@ -106,7 +105,7 @@ return for(var/obj/item/W in user) - user.unEquip(W) + user.dropItemToGround(W) var/obj/item/weapon/wrench/medical/W = new /obj/item/weapon/wrench/medical(loc) W.add_fingerprint(user) @@ -203,9 +202,8 @@ playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) var/obj/item/weapon/wrench/power/b_drill = new /obj/item/weapon/wrench/power user << "You attach the bolt driver bit to [src]." - user.unEquip(src) - user.put_in_active_hand(b_drill) qdel(src) + user.put_in_active_hand(b_drill) /obj/item/weapon/screwdriver/cyborg name = "powered screwdriver" @@ -302,9 +300,8 @@ playsound(get_turf(user),"sound/items/change_jaws.ogg",50,1) var/obj/item/weapon/crowbar/power/pryjaws = new /obj/item/weapon/crowbar/power user << "You attach the pry jaws to [src]." - user.unEquip(src) - user.put_in_active_hand(pryjaws) qdel(src) + user.put_in_active_hand(pryjaws) /* * Welding Tool */ @@ -561,8 +558,7 @@ if (R.use(1)) var/obj/item/weapon/flamethrower/F = new /obj/item/weapon/flamethrower(user.loc) if(!remove_item_from_storage(F)) - user.unEquip(src) - loc = F + user.transferItemToLoc(src, F, TRUE) F.weldtool = src add_fingerprint(user) user << "You add a rod to a welder, starting to build a flamethrower." @@ -742,6 +738,5 @@ playsound(get_turf(user),"sound/items/change_jaws.ogg",50,1) var/obj/item/weapon/wirecutters/power/cutjaws = new /obj/item/weapon/wirecutters/power user << "You attach the cutting jaws to [src]." - user.unEquip(src) - user.put_in_active_hand(cutjaws) qdel(src) + user.put_in_active_hand(cutjaws) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index d894da44792..45e969fe5ac 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -182,13 +182,13 @@ /obj/item/weapon/twohanded/required/wield(mob/living/carbon/user) ..() if(!wielded) - user.unEquip(src) + user.dropItemToGround(src) /obj/item/weapon/twohanded/required/unwield(mob/living/carbon/user, show_message = TRUE) if(show_message) user << "You drop [src]." ..(user, FALSE) - user.unEquip(src) + user.dropItemToGround(src) /* * Fireaxe diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 9f5a5fca8a8..4d4c51ee9bf 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -219,26 +219,24 @@ var/highlander_claymores = 0 if(istype(I, /obj/item/weapon/shard)) var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear - if(!remove_item_from_storage(user)) - user.unEquip(src) - user.unEquip(I) + remove_item_from_storage(user) + qdel(I) + qdel(src) user.put_in_hands(S) user << "You fasten the glass shard to the top of the rod with the cable." - qdel(I) - qdel(src) else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags & NODROP)) var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod - if(!remove_item_from_storage(user)) - user.unEquip(src) - user.unEquip(I) + remove_item_from_storage(user) - user.put_in_hands(P) user << "You fasten [I] to the top of the rod with the cable." + qdel(I) qdel(src) + + user.put_in_hands(P) else return ..() diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 07e16b77988..b4e80bf9dad 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -19,7 +19,7 @@ /obj/structure/easel/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/canvas)) var/obj/item/weapon/canvas/C = I - user.unEquip(C) + user.dropItemToGround(C) painting = C C.loc = get_turf(src) C.layer = layer+0.1 diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 02d4b072fc4..b16d566d82e 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -254,7 +254,6 @@ if(remaining_mats) for(var/M=1 to remaining_mats) new stack_type(get_turf(loc)) - user.unEquip(src,1) //Even NODROP chairs are destroyed. qdel(src) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index fac248ed1da..8c724c77c77 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -213,8 +213,7 @@ else if(istype(I, /obj/item/weapon/electronics/airlock)) user << "You start installing the electronics into [src]..." playsound(src.loc, I.usesound, 50, 1) - if(user.unEquip(I) && do_after(user, 30, target = src)) - I.loc = src + if(do_after(user, 30, target = src) && user.transferItemToLoc(I,src)) electronics = I user << "You install the airlock electronics." diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 061599ae73c..07f9e27036d 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -29,9 +29,8 @@ user << "You are not authorized to add notices" return if(notices < 5) - if(!user.unEquip(O)) + if(!user.transferItemToLoc(O, src)) return - O.loc = src notices++ icon_state = "nboard0[notices]" user << "You pin the [O] to the noticeboard." diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 86a1ff5dfe7..e0f3eb437bf 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -419,7 +419,7 @@ var/forename = names.len > 1 ? names[2] : names[1] var/newname = "[forename]-[pick(honorifics["[H.gender]"])]" H.fully_replace_character_name(H.real_name,newname) - H.unEquip(H.w_uniform) + H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE) H.equip_to_slot_or_del(I, slot_w_uniform) I.flags |= NODROP else diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 1b7cc509f99..00a3202b1fe 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1347,12 +1347,7 @@ return for(var/obj/item/I in M) - M.unEquip(I) - if(I) - I.loc = M.loc - I.layer = initial(I.layer) - I.plane = initial(I.plane) - I.dropped(M) + M.dropItemToGround(I, TRUE) M.Paralyse(5) sleep(5) @@ -1378,12 +1373,7 @@ return for(var/obj/item/I in M) - M.unEquip(I) - if(I) - I.loc = M.loc - I.layer = initial(I.layer) - I.plane = initial(I.plane) - I.dropped(M) + M.dropItemToGround(I, TRUE) M.Paralyse(5) sleep(5) @@ -1432,12 +1422,7 @@ return for(var/obj/item/I in M) - M.unEquip(I) - if(I) - I.loc = M.loc - I.layer = initial(I.layer) - I.plane = initial(I.plane) - I.dropped(M) + M.dropItemToGround(I, TRUE) if(ishuman(M)) var/mob/living/carbon/human/observer = M diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 3b4c5066d03..9a332042e8d 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -101,7 +101,7 @@ var/highlander = FALSE var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id) qdel(slot_item_ID) var/obj/item/slot_item_hand = H.get_item_for_held_index(2) - H.unEquip(slot_item_hand) + H.dropItemToGround(slot_item_hand) var /obj/item/weapon/multisword/multi = new(H) H.put_in_hands_or_del(multi) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 530f249c23e..5169fd490b8 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -10,7 +10,7 @@ return for(var/obj/item/W in M) - if(!M.unEquip(W)) + if(!M.dropItemToGround(W)) qdel(W) M.regenerate_icons() diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 192a1712b0d..96f3bddba2d 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -91,8 +91,9 @@ var/obj/item/device/onetankbomb/R = new /obj/item/device/onetankbomb(loc) - M.remove_from_mob(src) //Remove the tank from your character,in case you were holding it - M.put_in_hands(R) //Equips the bomb if possible, or puts it on the floor. + M.temporarilyRemoveItemFromInventory(src, TRUE) //Remove the tank from your character,in case you were holding it + if(!M.put_in_hands(R)) //Equips the bomb if possible, or puts it on the floor. + forceMove(M.loc) R.bombassembly = S //Tell the bomb about its assembly part S.master = R //Tell the assembly about its new owner diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index b2ed47d2eb4..da49525d3f1 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -26,8 +26,9 @@ /obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user) if(!A.remove_item_from_storage(src)) if(user) - user.remove_from_mob(A) - A.loc = src + user.transferItemToLoc(A, src) + else + A.forceMove(src) A.holder = src A.toggle_secure() if(!a_left) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index ac72db5df55..b1ce7612734 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -691,7 +691,7 @@ return if(0) if(istype(W, /obj/item/weapon/electronics/airalarm)) - if(user.unEquip(W)) + if(user.temporarilyRemoveItemFromInventory(W)) user << "You insert the circuit." buildstage = 1 update_icon() diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 0c9a98397dc..c9bdd58a301 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -55,7 +55,7 @@ user << "You can't move your own flag!" return if(loc == user) - if(!user.unEquip(src)) + if(!user.dropItemToGround(src)) return anchored = FALSE pickup(user) @@ -249,8 +249,7 @@ if(istype(I, /obj/item/weapon/twohanded/ctf)) var/obj/item/weapon/twohanded/ctf/flag = I if(flag.team != src.team) - user.unEquip(flag) - flag.loc = get_turf(flag.reset) + user.transferItemToLoc(flag, get_turf(flag.reset), TRUE) points++ for(var/mob/M in player_list) var/area/mob_area = get_area(M) @@ -266,7 +265,7 @@ M << "[team] team wins!" M << "The game has been reset! Teams have been cleared. The machines will be active again in 30 seconds." for(var/obj/item/weapon/twohanded/ctf/W in M) - M.unEquip(W) + M.dropItemToGround(W) M.dust() for(var/obj/machinery/control_point/control in machines) control.icon_state = "dominator" @@ -563,7 +562,6 @@ var/outfit = CTF.ctf_gear var/datum/outfit/O = new outfit for(var/obj/item/weapon/gun/G in M) - M.unEquip(G) qdel(G) O.equip(M) M << "Ammunition reloaded!" diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index dd14b2f6b37..5a5ffe2e5fc 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -59,7 +59,7 @@ if(new_headgear) // Force drop the item in the headslot, even though // it's NODROP - D.unEquip(target, 1) + D.dropItemToGround(target, TRUE) qdel(old_headgear) // where is `slot_head` defined? WHO KNOWS D.equip_to_slot(new_headgear, slot_head) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index ae1aef243a6..3df446c4c8b 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -46,9 +46,11 @@ if(!M.restrained() && !M.stat && loc == M && istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object - if(!M.unEquip(src)) + if(!M.temporarilyRemoveItemFromInventory(src)) + return + if(!M.put_in_hand(src, H.held_index)) + qdel(src) return - M.put_in_hand(src, H.held_index) add_fingerprint(usr) /obj/item/clothing/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 78e5c03e526..7da319ce6e8 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -246,13 +246,12 @@ var/obj/item/device/flashlight/seclite/S = I if(can_flashlight) if(!F) - if(!user.unEquip(S)) + if(!user.transferItemToLoc(S, src)) return user << "You click [S] into place on [src]." if(S.on) SetLuminosity(0) F = S - S.loc = src update_icon() update_helmlight(user) verbs += /obj/item/clothing/head/helmet/proc/toggle_helmlight diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index 0167f9f8347..64cc93517dd 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -41,7 +41,7 @@ if(!bananium.get_item_material_amount(O)) user << "This item has no bananium!" return - if(!user.unEquip(O)) + if(!user.dropItemToGround(O)) user << "You can't drop [O]!" return diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index a0475112582..46ac98b2246 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -128,7 +128,7 @@ exposed += user.held_items for(var/exposed_item in exposed) var/obj/item/exposed_I = exposed_item - if(exposed_I && !(exposed_I.type in chronosafe_items) && user.unEquip(exposed_I)) + if(exposed_I && !(exposed_I.type in chronosafe_items) && user.dropItemToGround(exposed_I)) user << "Your [exposed_I.name] got left behind." user.ExtinguishMob() diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index 16d0d9381e6..fe099ed9a91 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -796,43 +796,38 @@ var/obj/item/weapon/stock_parts/S = I if(istype(S, /obj/item/weapon/stock_parts/manipulator)) usermessage("[I] has been sucessfully installed into systems.") - if(user.unEquip(I)) + if(user.transferItemToLoc(I, src)) if(part_manip) part_manip.forceMove(get_turf(src)) part_manip = null - I.loc = src part_manip = I if(istype(S, /obj/item/weapon/stock_parts/scanning_module)) usermessage("[I] has been sucessfully installed into systems.") - if(user.unEquip(I)) + if(user.transferItemToLoc(I, src)) if(part_scan) part_scan.forceMove(get_turf(src)) part_scan = null - I.loc = src part_scan = I if(istype(S, /obj/item/weapon/stock_parts/micro_laser)) usermessage("[I] has been sucessfully installed into systems.") - if(user.unEquip(I)) + if(user.transferItemToLoc(I, src)) if(part_laser) part_laser.forceMove(get_turf(src)) part_laser = null - I.loc = src part_laser = I if(istype(S, /obj/item/weapon/stock_parts/matter_bin)) usermessage("[I] has been sucessfully installed into systems.") - if(user.unEquip(I)) + if(user.transferItemToLoc(I, src)) if(part_bin) part_bin.forceMove(get_turf(src)) part_bin = null - I.loc = src part_bin = I if(istype(S, /obj/item/weapon/stock_parts/capacitor)) usermessage("[I] has been sucessfully installed into systems.") - if(user.unEquip(I)) + if(user.transferItemToLoc(I, src)) if(part_cap) part_cap.forceMove(get_turf(src)) part_cap = null - I.loc = src part_cap = I update_parts() ..() @@ -1084,7 +1079,7 @@ pack.flags &= ~NODROP resync() if(user) - user.unEquip(pack, 1) + user.transferItemToLoc(pack, src, TRUE) user.update_inv_wear_suit() user.visible_message("[user]'s [pack.name] detaches from their back and retracts into their [src]!") pack.loc = src @@ -1115,7 +1110,7 @@ shoes.flags &= ~NODROP playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) if(user) - user.unEquip(shoes, 1) + user.transferItemToLoc(shoes, src, TRUE) user.update_inv_wear_suit() user.visible_message("[user]'s [shoes.name] retracts back into their [name]!") shoes.loc = src @@ -1151,7 +1146,7 @@ usermessage("You detach the flightpack.") /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_pack(obj/item/device/flightpack/F) - F.loc = src + F.forceMove(src) pack = F pack.relink_suit(src) usermessage("You attach and fasten the flightpack.") @@ -1163,7 +1158,7 @@ usermessage("You detach the flight shoes.") /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_shoes(obj/item/clothing/shoes/flightshoes/S) - S.loc = src + S.forceMove(src) shoes = S shoes.relink_suit(src) usermessage("You attach and fasten a pair of flight shoes.") @@ -1229,14 +1224,14 @@ addmsg += english_list(addmsglist) usermessage("The flightpack you are trying to install is not fully assembled and operational![addmsg].", 1) return FALSE - if(user.unEquip(F)) + if(user.temporarilyRemoveItemFromInventory(F)) attach_pack(F) if(istype(I, /obj/item/clothing/shoes/flightshoes)) var/obj/item/clothing/shoes/flightshoes/S = I if(shoes) usermessage("There are already shoes installed!", 1) return FALSE - if(user.unEquip(S)) + if(user.temporarilyRemoveItemFromInventory(S)) attach_shoes(S) ..() diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index ca4687e27ea..775245d678b 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -103,9 +103,8 @@ user << "You cannot install the upgrade to [src] while wearing it." return - if(user.unEquip(I)) + if(user.transferItemToLoc(I, src)) jetpack = I - I.loc = src user << "You successfully install the jetpack into [src]." else if(istype(I, /obj/item/weapon/screwdriver)) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 32ed6b1ae1c..a643d83149e 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -37,9 +37,10 @@ suittoggled = 0 if(ishuman(hood.loc)) var/mob/living/carbon/H = hood.loc - H.unEquip(hood, 1) + H.transferItemToLoc(hood, src, TRUE) H.update_inv_wear_suit() - hood.loc = src + else + hood.forceMove(src) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() @@ -163,11 +164,12 @@ var/mob/living/carbon/H = helmet.loc if(helmet.on) helmet.attack_self(H) - H.unEquip(helmet, 1) + H.transferItemToLoc(helmet, src, TRUE) H.update_inv_wear_suit() H << "The helmet on the hardsuit disengages." playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) - helmet.loc = src + else + helmet.forceMove(src) /obj/item/clothing/suit/space/hardsuit/dropped() ..() diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index cd4d7feddbc..27a1110328c 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -38,7 +38,7 @@ var/obj/item/weapon/storage/U = I.loc U.remove_from_storage(I, src) if(user.is_holding(I)) - user.unEquip(I) + user.dropItemToGround(I) else return diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index 099639d202b..593ad93d8a9 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -49,7 +49,7 @@ if(loadout[i]) var/obj/item/J = loadout[i] var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list - H.unEquip(slots[i]) + H.temporarilyRemoveItemFromInventory(slots[i], TRUE) H.equip_to_slot_or_del(I, wearslots[i]) I.flags |= NODROP I.name = "cursed " + I.name diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 9d5a63a9e4d..492a95831be 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -46,12 +46,11 @@ else if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom) || istype(I, /obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom)) user << "Adding [I.name] to [src] would make a mess." else - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return if(S.trash) S.generate_trash(get_turf(user)) ingredients += S - S.loc = src mix_filling_color(S) S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. update_overlays(S) @@ -86,7 +85,6 @@ contents += O if(I && user) attackby(I, user) - user.unEquip(BASE) qdel(BASE) /obj/item/weapon/reagent_containers/food/snacks/customizable/proc/mix_filling_color(obj/item/weapon/reagent_containers/food/snacks/S) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 937a2d5f4da..7ad3b82c426 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -25,10 +25,9 @@ if(!usr) return if(!reagents.total_volume) - usr.unEquip(src) //so icons update :[ var/obj/item/trash_item = generate_trash(usr) - usr.put_in_hands(trash_item) qdel(src) + usr.put_in_hands(trash_item) /obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user) @@ -42,7 +41,6 @@ eatverb = pick("bite","chew","nibble","gnaw","gobble","chomp") if(!reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it. user << "None of [src] left, oh no!" - M.unEquip(src) //so icons update :[ qdel(src) return 0 if(iscarbon(M)) @@ -318,7 +316,7 @@ user << "[src] is full." return 0 user << "You slip [W] inside [src]." - user.unEquip(W) + user.transferItemToLoc(W, src) add_fingerprint(user) contents += W stored_item = 1 diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm index b732e1bf4dc..a2ed2fd1415 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm @@ -46,10 +46,9 @@ if (beaker) return 1 else - if(!user.unEquip(O)) + if(!user.transferItemToLoc(O, src)) user << "\the [O] is stuck to your hand, you cannot put it in \the [src]!" return 0 - O.loc = src beaker = O src.verbs += /obj/machinery/juicer/verb/detach update_icon() @@ -58,10 +57,9 @@ if (!is_type_in_list(O, allowed_items)) user << "This object contains no fluid or extractable reagents." return 1 - if(!user.unEquip(O)) + if(!user.transferItemToLoc(O, src)) user << "\the [O] is stuck to your hand, you cannot put it in \the [src]!" return 0 - O.loc = src src.updateUsrDialog() return 0 diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 20c2c28515d..7b5699b8a82 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -147,14 +147,14 @@ /obj/machinery/smartfridge/proc/load(obj/item/O) if(istype(O.loc,/mob)) var/mob/M = O.loc - if(!M.unEquip(O)) + if(!M.transferItemToLoc(O, src)) usr << "\the [O] is stuck to your hand, you cannot put it in \the [src]!" return - else if(istype(O.loc,/obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = O.loc - S.remove_from_storage(O,src) - - O.loc = src + else + if(istype(O.loc,/obj/item/weapon/storage)) + var/obj/item/weapon/storage/S = O.loc + S.remove_from_storage(O,src) + O.forceMove(src) /obj/machinery/smartfridge/attack_paw(mob/user) return src.attack_hand(user) diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index f1becca5ae6..2ea54b4bdf5 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -80,7 +80,7 @@ var/global/list/cards_against_space /obj/item/toy/cards/deck/cas/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/toy/cards/singlecard/cas)) var/obj/item/toy/cards/singlecard/cas/SC = I - if(!user.unEquip(SC)) + if(!user.temporarilyRemoveItemFromInventory(SC)) user << "The card is stuck to your hand, you can't add it to the deck!" return var/datum/playingcard/RC // replace null datum for the re-added card diff --git a/code/modules/holodeck/computer_funcs.dm b/code/modules/holodeck/computer_funcs.dm index 33edb15d605..682dd22a581 100644 --- a/code/modules/holodeck/computer_funcs.dm +++ b/code/modules/holodeck/computer_funcs.dm @@ -102,18 +102,10 @@ return var/turf/T = get_turf(obj) for(var/atom/movable/AM in obj.contents) // these should be derezed if they were generated - AM.loc = T // otherwise make sure they are dropped - - if(istype(obj)) - var/mob/M = obj.loc - if(ismob(M)) - M.unEquip(obj, 1) //Holoweapons should always drop. - - for(var/mob/M in obj.contents) - M.loc = obj.loc - silent = 0 + AM.loc = T + if(ismob(AM)) + silent = FALSE // otherwise make sure they are dropped if(!silent) - var/obj/oldobj = obj - visible_message("The [oldobj.name] fades away!") + visible_message("The [obj.name] fades away!") qdel(obj) \ No newline at end of file diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index fec53b66fa3..29dd541ca1f 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -146,8 +146,8 @@ var/obj/item/honey_frame/HF = I if(honey_frames.len < BEEBOX_MAX_FRAMES) visible_message("[user] adds a frame to the apiary.") - user.unEquip(HF) - HF.loc = src + if(!user.transferItemToLoc(HF, src)) + return honey_frames += HF else user << "There's no room for anymore frames in the apiary!" @@ -162,9 +162,9 @@ return var/obj/item/queen_bee/qb = I - user.unEquip(qb) + user.temporarilyRemoveItemFromInventory(qb) - qb.queen.loc = src + qb.queen.forceMove(src) bees += qb.queen queen_bee = qb.queen qb.queen = null diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 3dc0194d40c..d8e32671cac 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -147,9 +147,8 @@ if(i >= max_items) user << "The biogenerator is full! Activate it." else - user.unEquip(O) - O.loc = src - user << "You put [O.name] in [src.name]" + if(user.transferItemToLoc(O, src)) + user << "You put [O.name] in [src.name]" return 1 //no afterattack else if (istype(O, /obj/item/weapon/disk/design_disk)) user.visible_message("[user] begins to load \the [O] in \the [src]...", diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index bd8cfb4cd3a..8b489359d34 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -170,9 +170,10 @@ // For item-containing growns such as eggy or gatfruit /obj/item/weapon/reagent_containers/food/snacks/grown/shell/attack_self(mob/user) - user.unEquip(src) + var/obj/item/T + if(trash) + T = generate_trash() + qdel(src) if(trash) - var/obj/item/T = generate_trash() user.put_in_hands(T) user << "You open [src]\'s shell, revealing \a [T]." - qdel(src) diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 0bba7389254..3a7ce53d163 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -126,7 +126,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/proc/update_mob() if(ismob(loc)) var/mob/M = loc - M.unEquip(src) + M.dropItemToGround(src) /obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/ex_act(severity) qdel(src) //Ensuring that it's deleted by its own explosion diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index 76b5f1152ec..3c2169ddfee 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -39,9 +39,7 @@ if(W.is_sharp()) user << "You use [W] to fashion a pipe out of the corn cob!" new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) - user.unEquip(src) qdel(src) - return else return ..() diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 984b005781d..8f2147d29ee 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -192,7 +192,6 @@ force -= rand(1, (force / 3) + 1) else usr << "All the petals have fallen off the [name] from violent whacking!" - usr.unEquip(src) qdel(src) /obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user) diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index f6248c64c4e..1c9738fa44d 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -68,7 +68,6 @@ force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off else usr << "All the leaves have fallen off the nettle from violent whacking." - usr.unEquip(src) qdel(src) /obj/item/weapon/grown/nettle/basic diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index 83b51102b53..8164f5f162a 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -39,10 +39,9 @@ if(W.is_sharp()) user << "You cut the potato into wedges with [W]." var/obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges - if(!remove_item_from_storage(user)) - user.unEquip(src) - user.put_in_hands(Wedges) + remove_item_from_storage(user) qdel(src) + user.put_in_hands(Wedges) else return ..() diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index 6b3510b5477..753b9a287a8 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -26,10 +26,9 @@ if(I.is_sharp()) user << "You sharpen the carrot into a shiv with [I]." var/obj/item/weapon/kitchen/knife/carrotshiv/Shiv = new /obj/item/weapon/kitchen/knife/carrotshiv - if(!remove_item_from_storage(user)) - user.unEquip(src) - user.put_in_hands(Shiv) + remove_item_from_storage(user) qdel(src) + user.put_in_hands(Shiv) else return ..() diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index c8d4db730dd..cdab5f9e155 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -138,6 +138,4 @@ K.move_to_delay -= round(seed.production / 50) K.health = K.maxHealth K.visible_message("The Killer Tomato growls as it suddenly awakens.") - if(user) - user.unEquip(src) qdel(src) diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index fdb03e3041a..1a24a761512 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -71,7 +71,7 @@ if(leaf.dry) user.show_message("You wrap \the [W] around the log, turning it into a torch!") var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc) - usr.unEquip(W) + usr.dropItemToGround(W) usr.put_in_active_hand(T) qdel(leaf) qdel(src) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 711fc6782d0..f132af1a445 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -772,14 +772,14 @@ if(!myseed) if(istype(O, /obj/item/seeds/kudzu)) investigate_log("had Kudzu planted in it by [user.ckey]([user]) at ([x],[y],[z])","kudzu") - user.unEquip(O) + if(!user.transferItemToLoc(O, src)) + return user << "You plant [O]." dead = 0 myseed = O age = 1 plant_health = myseed.endurance lastcycle = world.time - O.forceMove(src) update_icon() else user << "[src] already has seeds in it!" diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 828641dfae9..b8b83f7cfdb 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -339,9 +339,11 @@ if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object - if(!M.unEquip(src)) + if(!M.temporarilyRemoveItemFromInventory(src)) return - M.put_in_hand(src, H.held_index) + if(!M.put_in_hand(src, H.held_index)) + qdel(src) + return //fuck these things add_fingerprint(usr) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 1aa26092f02..1fb4b3786bf 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -200,11 +200,9 @@ if(istype(W,/obj/item/weapon/ore/glass)) user << "You fill the sandbag." var/obj/item/stack/sheet/mineral/sandbags/I = new /obj/item/stack/sheet/mineral/sandbags - user.unEquip(src) + qdel(src) user.put_in_hands(I) qdel(W) - qdel(src) - return else return ..() diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm index 2d96883a554..77d669dbfaa 100644 --- a/code/modules/mob/interactive.dm +++ b/code/modules/mob/interactive.dm @@ -527,7 +527,7 @@ if(BP.can_be_inserted(I,0)) BP.handle_item_insertion(I,0) else - unEquip(I,TRUE) + dropItemToGround(I,TRUE) update_hands = 1 /mob/living/carbon/human/interactive/proc/targetRange(towhere) @@ -678,7 +678,7 @@ take_to_slot(C,1) if(!equip_to_appropriate_slot(C)) var/obj/item/I = get_item_by_slot(C) - unEquip(I) + dropItemToGround(I) spawn(5) equip_to_appropriate_slot(C) update_hands = 1 diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 7b17e260006..9ca2d1d0e48 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -236,14 +236,14 @@ if(!loc || !loc.allow_drop()) return for(var/obj/item/I in held_items) - unEquip(I) + dropItemToGround(I) //Drops the item in our active hand. /mob/proc/drop_item() if(!loc || !loc.allow_drop()) return var/obj/item/held = get_active_held_item() - return unEquip(held) + return dropItemToGround(held) //Here lie drop_from_inventory and before_item_take, already forgotten and not missed. @@ -255,7 +255,27 @@ return FALSE return TRUE -/mob/proc/unEquip(obj/item/I, force) //Force overrides NODROP for things like wizarditis and admin undress. +//The following functions are the same save for one small difference + +//for when you want the item to end up on the ground +//will force move the item to the ground and call the turf's Entered +/mob/proc/dropItemToGround(obj/item/I, force = FALSE) + return doUnEquip(I, force, loc, FALSE) + +//for when the item will be immediately placed in a loc other than the ground +/mob/proc/transferItemToLoc(obj/item/I, newloc = null, force = FALSE) + return doUnEquip(I, force, newloc, FALSE) + +//visibly unequips I but it is NOT MOVED AND REMAINS IN SRC +//item MUST BE FORCEMOVE'D OR QDEL'D +/mob/proc/temporarilyRemoveItemFromInventory(obj/item/I, force = FALSE) + return doUnEquip(I, force, null, TRUE) + +//DO NOT CALL THIS PROC +//use one of the above 2 helper procs +//you may override it, but do not modify the args +/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move) //Force overrides NODROP for things like wizarditis and admin undress. + //Use no_move if the item is just gonna be immediately moved afterward if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for NODROP. return TRUE @@ -272,18 +292,11 @@ I.layer = initial(I.layer) I.plane = initial(I.plane) I.appearance_flags &= ~NO_CLIENT_COLOR - I.forceMove(loc) + if(!no_move && !(I.flags & DROPDEL)) //item may be moved/qdel'd immedietely, don't bother moving it + I.forceMove(newloc) I.dropped(src) return TRUE - -//Attemps to remove an object on a mob. Will not move it to another area or such, just removes from the mob. -/mob/proc/remove_from_mob(var/obj/item/I) - unEquip(I) - I.screen_loc = null - return TRUE - - //Outdated but still in use apparently. This should at least be a human proc. //Daily reminder to murder this - Remie. /mob/living/proc/get_equipped_items() @@ -385,7 +398,7 @@ /mob/proc/change_number_of_hands(amt) if(amt < held_items.len) for(var/i in held_items.len to amt step -1) - unEquip(held_items[i]) + dropItemToGround(held_items[i]) held_items.len = amt if(hud_used) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index e6d569c7f9c..3a601a8711c 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -168,7 +168,6 @@ var/mob/living/carbon/C = src for(var/obj/item/weapon/bloodcrawl/BC in C) BC.flags = null - C.unEquip(BC) qdel(BC) qdel(src.holder) src.holder = null diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index f26894fd167..ae0d8a618f5 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -53,7 +53,7 @@ user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain!" return - if(!user.unEquip(O)) + if(!user.transferItemToLoc(O, src)) return var/mob/living/brain/B = newbrain.brainmob if(!B.key) @@ -70,7 +70,6 @@ living_mob_list += brainmob brainmob.reset_perspective() - newbrain.loc = src //P-put your brain in it brain = newbrain name = "Man-Machine Interface: [brainmob.real_name]" diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 4cbe1445f9a..5ebb00e0092 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -66,8 +66,8 @@ visible_message("[usr] tries to empty [src]'s pouches.", \ "[usr] tries to empty [src]'s pouches.") if(do_mob(usr, src, POCKET_STRIP_DELAY * 0.5)) - unEquip(r_store) - unEquip(l_store) + dropItemToGround(r_store) + dropItemToGround(l_store) /mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I) playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free diff --git a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm index a085a66055d..1248861062c 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/alien/humanoid/unEquip(obj/item/I) +/mob/living/carbon/alien/humanoid/doUnEquip(obj/item/I) . = ..() if(!. || !I) return diff --git a/code/modules/mob/living/carbon/alien/larva/inventory.dm b/code/modules/mob/living/carbon/alien/larva/inventory.dm index 3cb46a54b2e..239d21e7f5d 100644 --- a/code/modules/mob/living/carbon/alien/larva/inventory.dm +++ b/code/modules/mob/living/carbon/alien/larva/inventory.dm @@ -1,3 +1,3 @@ //can't unequip since it can't equip anything -/mob/living/carbon/alien/larva/unEquip(obj/item/W) +/mob/living/carbon/alien/larva/doUnEquip(obj/item/W) return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 9098171b8bf..8c63836c783 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -55,8 +55,8 @@ var/const/MAX_ACTIVE_TIME = 400 /obj/item/clothing/mask/facehugger/attack(mob/living/M, mob/user) ..() - user.unEquip(src) - Attach(M) + if(user.temporarilyRemoveItemFromInventory(src)) + Attach(M) /obj/item/clothing/mask/facehugger/examine(mob/user) ..() @@ -157,7 +157,7 @@ var/const/MAX_ACTIVE_TIME = 400 if(W.flags & NODROP) return FALSE if(!istype(W,/obj/item/clothing/mask/facehugger)) - target.unEquip(W) + target.dropItemToGround(W) target.visible_message("[src] tears [W] off of [target]'s face!", \ "[src] tears [W] off of [target]'s face!") @@ -168,7 +168,7 @@ var/const/MAX_ACTIVE_TIME = 400 "[src] smashes against [H]'s [H.head]!") Die() return FALSE - src.loc = target + forceMove(target) target.equip_to_slot_if_possible(src, slot_wear_mask, 0, 1, 1) // early returns and validity checks done: attach. attached++ diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a9b4e7ad4ba..772b8bc54d7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -157,7 +157,7 @@ else if(!(I.flags & (NODROP|ABSTRACT))) thrown_thing = I - unEquip(I) + dropItemToGround(I) if(thrown_thing) visible_message("[src] has thrown [thrown_thing].") @@ -381,8 +381,7 @@ update_inv_legcuffed() return else - unEquip(I) - I.dropped() + dropItemToGround(I) return return TRUE @@ -400,7 +399,7 @@ if(!I || (I.flags & (NODROP|ABSTRACT))) return - unEquip(I) + dropItemToGround(I) var/modifier = 0 if(disabilities & CLUMSY) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9c33fad855c..0671dd11ff0 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -267,11 +267,13 @@ if(do_mob(usr, src, POCKET_STRIP_DELAY/delay_denominator)) //placing an item into the pocket is 4 times faster if(pocket_item) if(pocket_item == (pocket_id == slot_r_store ? r_store : l_store)) //item still in the pocket we search - unEquip(pocket_item) + dropItemToGround(pocket_item) else if(place_item) - usr.unEquip(place_item) - equip_to_slot_if_possible(place_item, pocket_id, 0, 1) + if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE)) + usr.temporarilyRemoveItemFromInventory(place_item, TRUE) + equip_to_slot(place_item, pocket_id, TRUE) + //do nothing otherwise // Update strip window if(usr.machine == src && in_range(src, usr)) @@ -625,7 +627,7 @@ /mob/living/carbon/human/singularity_pull(S, current_size) if(current_size >= STAGE_THREE) for(var/obj/item/hand in held_items) - if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand)) + if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && dropItemToGround(hand)) step_towards(hand, src) src << "\The [S] pulls \the [hand] from your grip!" rad_act(current_size * 3) @@ -696,10 +698,10 @@ if(dna && dna.check_mutation(HULK)) say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) if(..(I, cuff_break = FAST_CUFFBREAK)) - unEquip(I) + dropItemToGround(I) else if(..()) - unEquip(I) + dropItemToGround(I) /mob/living/carbon/human/clean_blood() var/mob/living/carbon/human/H = src diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 75ef76eb08e..66e3b28331d 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -141,14 +141,14 @@ return not_handled //For future deeper overrides -/mob/living/carbon/human/unEquip(obj/item/I) +/mob/living/carbon/human/doUnEquip(obj/item/I, force) . = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should. if(!. || !I) return if(I == wear_suit) if(s_store) - unEquip(s_store, 1) //It makes no sense for your suit storage to stay on you if you drop your suit. + dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit. if(wear_suit.breakouttime) //when unequipping a straightjacket update_action_buttons_icon() //certain action buttons may be usable again. wear_suit = null @@ -157,13 +157,13 @@ update_inv_wear_suit() else if(I == w_uniform) if(r_store) - unEquip(r_store, 1) //Again, makes sense for pockets to drop. + dropItemToGround(r_store, TRUE) //Again, makes sense for pockets to drop. if(l_store) - unEquip(l_store, 1) + dropItemToGround(l_store, TRUE) if(wear_id) - unEquip(wear_id) + dropItemToGround(wear_id) if(belt) - unEquip(belt) + dropItemToGround(belt) w_uniform = null update_suit_sensors() update_inv_w_uniform() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 2071e7486f3..9718465ad06 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -106,7 +106,7 @@ for(var/slot_id in no_equip) var/obj/item/thing = C.get_item_by_slot(slot_id) if(thing && (!thing.species_exception || !is_type_in_list(src,thing.species_exception))) - C.unEquip(thing) + C.dropItemToGround(thing) var/obj/item/organ/heart/heart = C.getorganslot("heart") var/obj/item/organ/lungs/lungs = C.getorganslot("lungs") diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 7b133bda11c..c91b7e370ba 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -236,7 +236,7 @@ /datum/species/golem/sand/spec_death(gibbed, mob/living/carbon/human/H) H.visible_message("[H] turns into a pile of sand!") for(var/obj/item/W in H) - H.unEquip(W) + H.dropItemToGround(W) for(var/i=1, i <= rand(3,5), i++) new /obj/item/weapon/ore/glass(get_turf(H)) qdel(H) @@ -266,7 +266,7 @@ playsound(H, "shatter", 70, 1) H.visible_message("[H] shatters!") for(var/obj/item/W in H) - H.unEquip(W) + H.dropItemToGround(W) for(var/i=1, i <= rand(3,5), i++) new /obj/item/weapon/shard(get_turf(H)) qdel(H) diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index f4fd85f5eb5..abd080bfaef 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -32,7 +32,7 @@ for(var/V in C.held_items) var/obj/item/I = V if(istype(I)) - if(C.unEquip(I)) + if(C.dropItemToGround(I)) var/obj/item/zombie_hand/zh = new /obj/item/zombie_hand() C.put_in_hands(zh) else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand @@ -49,7 +49,7 @@ . = ..() for(var/obj/item/I in C.held_items) if(istype(I, /obj/item/zombie_hand)) - C.unEquip(I, TRUE) + qdel(I) // Your skin falls off diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 7910244db72..a69f0714f51 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -136,9 +136,9 @@ There are several things that need to be remembered: overlays_standing[UNIFORM_LAYER] = standing else if(!(dna && dna.species.nojumpsuit)) - // Automatically drop anything in store / id / belt if you're not wearing a uniform. - for(var/obj/item/thing in list(r_store, l_store, wear_id, belt)) - unEquip(thing) + // Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY + for(var/obj/item/thing in list(r_store, l_store, wear_id, belt)) // + dropItemToGround(thing) apply_overlay(UNIFORM_LAYER) update_mutant_bodyparts() diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index bb7ff6f45b6..3ef5d6e8178 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -88,7 +88,7 @@ return not_handled -/mob/living/carbon/unEquip(obj/item/I) +/mob/living/carbon/doUnEquip(obj/item/I) . = ..() //Sets the default return value to what the parent returns. if(!. || !I) //We don't want to set anything to null if the parent returned 0. return diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index d7fad273cfe..a3fd57f9c5e 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -345,8 +345,7 @@ for(var/obj/item/I in M.held_items) if(I == pickupTarget) M.visible_message("[src] snatches [pickupTarget] from [M].", "[src] snatched [pickupTarget]!") - M.unEquip(pickupTarget) - if(!qdeleted(pickupTarget)) + if(M.temporarilyRemoveItemFromInventory(pickupTarget) && !qdeleted(pickupTarget)) equip_item(pickupTarget) pickpocketing = FALSE pickupTarget = null @@ -453,5 +452,5 @@ /mob/living/carbon/monkey/proc/monkeyDrop(var/obj/item/A) if(A) - unEquip(A, 1) + dropItemToGround(A, TRUE) update_icons() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 76677b2ac95..db95437256d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -627,11 +627,11 @@ if(islist(where)) var/list/L = where if(what == who.get_item_for_held_index(L[2])) - who.unEquip(what) - add_logs(src, who, "stripped", addition="of [what]") + if(who.dropItemToGround(what)) + add_logs(src, who, "stripped", addition="of [what]") if(what == who.get_item_by_slot(where)) - who.unEquip(what) - add_logs(src, who, "stripped", addition="of [what]") + if(who.dropItemToGround(what)) + add_logs(src, who, "stripped", addition="of [what]") // The src mob is trying to place an item on someone // Override if a certain mob should be behave differently when placing items (can't, for example) @@ -642,25 +642,26 @@ return if(what) var/list/where_list + var/final_where + if(islist(where)) where_list = where - if(!what.mob_can_equip(who, src, where[1], 1)) - src << "\The [what.name] doesn't fit in that place!" - return + final_where = where[1] else - if(!what.mob_can_equip(who, src, where, 1)) - src << "\The [what.name] doesn't fit in that place!" - return + final_where = where + + if(!what.mob_can_equip(who, src, final_where, TRUE)) + src << "\The [what.name] doesn't fit in that place!" + return + visible_message("[src] tries to put [what] on [who].") if(do_mob(src, who, what.put_on_delay)) - if(what && Adjacent(who)) - unEquip(what) - if(where_list) - who.put_in_hand(what, where_list[2]) - else - who.equip_to_slot_if_possible(what, where, 0, 1) - add_logs(src, who, "equipped", what) - + if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE)) + if(temporarilyRemoveItemFromInventory(what)) + if(where_list) + who.put_in_hand(what, where_list[2]) + else + who.equip_to_slot(what, where, TRUE) /mob/living/singularity_pull(S, current_size) if(current_size >= STAGE_SIX) diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index cab2148d475..50758e00c5f 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -26,12 +26,10 @@ P.visible_message("[src] ejects itself from [P]!") if(istype(card.loc, /mob/living)) var/mob/living/L = card.loc - if(!L.unEquip(card)) + if(!L.transferItemToLoc(card, src)) src << "Error: Unable to expand to mobile form. Chassis is restrained by some device or person." return FALSE - var/turf/T = get_turf(card) - forceMove(T) - card.forceMove(src) + forceMove(get_turf(card)) if(client) client.perspective = EYE_PERSPECTIVE client.eye = src diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index a15d335cff2..1266afa7960 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -5,7 +5,7 @@ user << "You begin to place [I] on [src]'s head..." src << "[user] is placing [I] on your head..." if(do_after(user, 30, target = src)) - user.unEquip(I, 1) + user.temporarilyRemoveItemFromInventory(I, TRUE) place_on_head(I) return if(I.force && I.damtype != STAMINA && stat != DEAD) //only sparks if real damage is dealt. diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index c156cf1fe38..98f055c476e 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -16,14 +16,13 @@ /obj/item/weapon/bucket_sensor/attackby(obj/item/W, mob/user as mob, params) ..() if(istype(W, /obj/item/bodypart/l_arm/robot) || istype(W, /obj/item/bodypart/r_arm/robot)) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return qdel(W) var/turf/T = get_turf(loc) var/mob/living/simple_animal/bot/cleanbot/A = new /mob/living/simple_animal/bot/cleanbot(T) A.name = created_name user << "You add the robot arm to the bucket and sensor assembly. Beep boop!" - user.unEquip(src, 1) qdel(src) else if(istype(W, /obj/item/weapon/pen)) @@ -61,7 +60,7 @@ switch(build_step) if(0,1) if(istype(W, /obj/item/bodypart/l_leg/robot) || istype(W, /obj/item/bodypart/r_leg/robot)) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return qdel(W) build_step++ @@ -81,7 +80,7 @@ else if(istype(W, /obj/item/clothing/suit/bluetag)) newcolor = "b" if(newcolor || istype(W, /obj/item/clothing/suit/armor/vest)) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return lasercolor = newcolor qdel(W) @@ -112,7 +111,7 @@ if(!istype(W, /obj/item/clothing/head/helmet)) return - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return qdel(W) build_step++ @@ -123,7 +122,7 @@ if(5) if(isprox(W)) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return qdel(W) build_step++ @@ -163,7 +162,7 @@ newname = "taser ED-209 assembly" else return - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return name = newname build_step++ @@ -183,14 +182,13 @@ if(9) if(istype(W, /obj/item/weapon/stock_parts/cell)) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return build_step++ user << "You complete the ED-209." var/turf/T = get_turf(src) new /mob/living/simple_animal/bot/ed209(T,created_name,lasercolor) qdel(W) - user.unEquip(src, 1) qdel(src) //Floorbot assemblies @@ -231,7 +229,6 @@ var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles user.put_in_hands(B) user << "You add the tiles into the empty toolbox. They protrude from the top." - user.unEquip(src, 1) qdel(src) else user << "You need 10 floor tiles to start building a floorbot!" @@ -245,7 +242,6 @@ B.created_name = created_name user.put_in_hands(B) user << "You add the sensor to the toolbox and tiles." - user.unEquip(src, 1) qdel(src) else if(istype(W, /obj/item/weapon/pen)) @@ -265,7 +261,6 @@ var/mob/living/simple_animal/bot/floorbot/A = new /mob/living/simple_animal/bot/floorbot(T) A.name = created_name user << "You add the robot arm to the odd looking toolbox assembly. Boop beep!" - user.unEquip(src, 1) qdel(src) else if(istype(W, /obj/item/weapon/pen)) var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN) @@ -316,7 +311,6 @@ qdel(S) user.put_in_hands(A) user << "You add the robot arm to the first aid kit." - user.unEquip(src, 1) qdel(src) @@ -333,7 +327,7 @@ switch(build_step) if(0) if(istype(W, /obj/item/device/healthanalyzer)) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return qdel(W) build_step++ @@ -343,7 +337,7 @@ if(1) if(isprox(W)) - if(!user.unEquip(W)) + if(!user.temporarilyRemoveItemFromInventory(W)) return qdel(W) build_step++ @@ -352,7 +346,6 @@ var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T) S.skin = skin S.name = created_name - user.unEquip(src, 1) qdel(src) //Secbot Assembly @@ -383,7 +376,6 @@ var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly user.put_in_hands(A) user << "You add the signaler to the helmet." - user.unEquip(src, 1) qdel(src) else return @@ -405,7 +397,7 @@ user << "You weld the hole in [src] shut!" else if(isprox(I) && (build_step == 1)) - if(!user.unEquip(I)) + if(!user.temporarilyRemoveItemFromInventory(I)) return build_step++ user << "You add the prox sensor to [src]!" @@ -414,7 +406,7 @@ qdel(I) else if(((istype(I, /obj/item/bodypart/l_arm/robot)) || (istype(I, /obj/item/bodypart/r_arm/robot))) && (build_step == 2)) - if(!user.unEquip(I)) + if(!user.temporarilyRemoveItemFromInventory(I)) return build_step++ user << "You add the robot arm to [src]!" @@ -423,7 +415,7 @@ qdel(I) else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3)) - if(!user.unEquip(I)) + if(!user.temporarilyRemoveItemFromInventory(I)) return build_step++ user << "You complete the Securitron! Beep boop." diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index f344613cef5..8e6a6296fe4 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -130,9 +130,9 @@ /mob/living/simple_animal/drone/death(gibbed) ..(gibbed) if(internal_storage) - unEquip(internal_storage) + dropItemToGround(internal_storage) if(head) - unEquip(head) + dropItemToGround(head) alert_drones(DRONE_NET_DISCONNECT) @@ -142,9 +142,9 @@ /mob/living/simple_animal/drone/ratvar_act() if(internal_storage) - unEquip(internal_storage) + dropItemToGround(internal_storage) if(head) - unEquip(head) + dropItemToGround(head) var/mob/living/simple_animal/drone/cogscarab/ratvar/R = new /mob/living/simple_animal/drone/cogscarab/ratvar(loc) R.setDir(dir) if(mind) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index 61e29c0c76a..d75b7230c9f 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -60,7 +60,7 @@ L << "[drone] is trying to escape!" if(!do_after(drone, 50, target = L)) return - L.unEquip(src) + L.dropItemToGround(src) contents -= drone drone.loc = get_turf(src) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm index 1437e77e56e..eeacd3ab97d 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm @@ -6,7 +6,7 @@ //Drone hands -/mob/living/simple_animal/drone/unEquip(obj/item/I, force) +/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force) if(..(I,force)) update_inv_hands() if(I == head) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 7b49e29ad1c..af3001c2ecf 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -136,7 +136,7 @@ var/global/list/parasites = list() //all currently existing/living guardians visible_message("\The [src] dies along with its user!") summoner.visible_message("[summoner]'s body is completely consumed by the strain of sustaining [src]!") for(var/obj/item/W in summoner) - if(!summoner.unEquip(W)) + if(!summoner.dropItemToGround(W)) qdel(W) summoner.dust() death(TRUE) diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm index ed24b79cd12..dbfd48502aa 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm @@ -22,7 +22,7 @@ /mob/living/simple_animal/hostile/guardian/dextrous/death(gibbed) ..() if(internal_storage) - unEquip(internal_storage) + dropItemToGround(internal_storage) /mob/living/simple_animal/hostile/guardian/dextrous/examine(mob/user) if(dextrous) @@ -58,7 +58,7 @@ ..() //lose items, then return //SLOT HANDLING BULLSHIT FOR INTERNAL STORAGE -/mob/living/simple_animal/hostile/guardian/dextrous/unEquip(obj/item/I, force) +/mob/living/simple_animal/hostile/guardian/dextrous/doUnEquip(obj/item/I, force) if(..(I,force)) update_inv_hands() if(I == internal_storage) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index ab6a55090ee..df86bd8e931 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -438,7 +438,7 @@ Difficulty: Very Hard if(..() && ishuman(user) && !(user in affected_targets)) var/mob/living/carbon/human/H = user for(var/obj/item/W in H) - H.unEquip(W) + H.dropItemToGround(W) var/datum/job/clown/C = new /datum/job/clown() C.equip(H) qdel(C) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 9fdad4b1e77..ad104e56778 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -114,7 +114,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/devour(mob/living/L) for(var/obj/item/W in L) - if(!L.unEquip(W)) + if(!L.dropItemToGround(W)) qdel(W) visible_message( "\"[pick(kill_phrases)]\"\n[src] annihilates [L]!", diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 52558ca647d..1a7e7e2355f 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -728,9 +728,8 @@ break if(stolen_item) - C.unEquip(stolen_item) + C.transferItemToLoc(stolen_item, src, TRUE) held_item = stolen_item - stolen_item.loc = src visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") return held_item diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 19df9da0c51..f316a4d23a4 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -222,7 +222,7 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange", Feedon(Food) ..() -/mob/living/simple_animal/slime/unEquip(obj/item/W) +/mob/living/simple_animal/slime/doUnEquip(obj/item/W) return /mob/living/simple_animal/slime/start_pulling(atom/movable/AM) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index a3f12c4d174..12df41b4288 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -12,7 +12,7 @@ return 1 return (!mover.density || !density || lying) - + //The byond version of these verbs wait for the next tick before acting. // instant verbs however can run mid tick or even during the time between ticks. /client/verb/moveup() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 5fe7e06b5ca..02f0821bd54 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -32,7 +32,7 @@ var/Itemlist = get_equipped_items() Itemlist += held_items for(var/obj/item/W in Itemlist) - unEquip(W) + dropItemToGround(W) //Make mob invisible and spawn animation notransform = 1 @@ -174,14 +174,9 @@ var/Itemlist = get_equipped_items() Itemlist += held_items for(var/obj/item/W in Itemlist) - unEquip(W) + dropItemToGround(W, TRUE) if (client) client.screen -= W - if (W) - W.loc = loc - W.dropped(src) - W.layer = initial(W.layer) - W.plane = initial(W.plane) @@ -308,7 +303,7 @@ if (notransform) return for(var/obj/item/W in src) - unEquip(W) + dropItemToGround(W) regenerate_icons() notransform = 1 canmove = 0 @@ -352,7 +347,7 @@ if(delete_items) qdel(W) else - unEquip(W) + dropItemToGround(W) regenerate_icons() notransform = 1 canmove = 0 @@ -403,7 +398,7 @@ if (notransform) return for(var/obj/item/W in src) - unEquip(W) + dropItemToGround(W) regenerate_icons() notransform = 1 canmove = 0 @@ -433,7 +428,7 @@ if (notransform) return for(var/obj/item/W in src) - unEquip(W) + dropItemToGround(W) regenerate_icons() notransform = 1 canmove = 0 @@ -475,7 +470,7 @@ if (notransform) return for(var/obj/item/W in src) - unEquip(W) + dropItemToGround(W) regenerate_icons() notransform = 1 canmove = 0 @@ -504,7 +499,7 @@ if(notransform) return for(var/obj/item/W in src) - unEquip(W) + dropItemToGround(W) regenerate_icons() notransform = 1 diff --git a/code/modules/modular_computers/computers/item/computer_components.dm b/code/modules/modular_computers/computers/item/computer_components.dm index 0f27580a27f..be032a3ec5b 100644 --- a/code/modules/modular_computers/computers/item/computer_components.dm +++ b/code/modules/modular_computers/computers/item/computer_components.dm @@ -17,13 +17,12 @@ if(!can_install_component(H, user)) return FALSE - if(user && !user.unEquip(H)) + if(user && !user.transferItemToLoc(H, src)) return FALSE all_components[H.device_type] = H user << "You install \the [H] into \the [src]." - H.forceMove(src) H.holder = src H.on_install(src, user) diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm index 9e27b433c7a..63b6a33e56e 100644 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -32,13 +32,10 @@ if(stored_card) user << "You try to insert \the [I] into \the [src], but the slot is occupied." return FALSE - if(user && !user.unEquip(I)) + if(user && !user.transferItemToLoc(I, src)) return FALSE - stored_card = I - - I.forceMove(src) user << "You insert \the [I] into \the [src]." return TRUE diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index ea61fc4ba19..92df5dfde8a 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -28,11 +28,10 @@ user << "This power cell is too large for \the [holder]!" return FALSE - if(user && !user.unEquip(I)) + if(user && !user.transferItemToLoc(I, src)) return FALSE battery = I - I.forceMove(src) user << "You connect \the [I] to \the [src]." return TRUE diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm index e865353d21e..c038fd09b39 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -46,14 +46,13 @@ if(stored_card && stored_card2) user << "You try to insert \the [I] into \the [src], but its slots are occupied." return FALSE - if(user && !user.unEquip(I)) + if(user && !user.transferItemToLoc(I, src)) return FALSE if(!stored_card) stored_card = I else stored_card2 = I - I.forceMove(src) user << "You insert \the [I] into \the [src]." return TRUE diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm index 6aedcea72e1..294ed329b08 100644 --- a/code/modules/modular_computers/hardware/printer.dm +++ b/code/modules/modular_computers/hardware/printer.dm @@ -40,13 +40,12 @@ /obj/item/weapon/computer_hardware/printer/try_insert(obj/item/I, mob/living/user = null) if(istype(I, /obj/item/weapon/paper)) - if(user && !user.unEquip(I)) - return FALSE - if(stored_paper >= max_paper) user << "You try to add \the [I] into [src], but its paper bin is full!" return FALSE + if(user && !user.temporarilyRemoveItemFromInventory(I)) + return FALSE user << "You insert \the [I] into [src]'s paper recycler." qdel(I) stored_paper++ diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index 1ef1d02a533..1b1abe220f1 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -69,7 +69,7 @@ It is possible to destroy the net by the occupant or someone else. continue//So all they're left with are shoes and uniform. if(W == H.shoes) continue - M.unEquip(W) + M.dropItemToGround(W) playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1) new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(M), M.dir) diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm index de1e78e16d6..bba75d59005 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm @@ -26,13 +26,13 @@ if(!ninjacost(cost)) if(istype(energyKatana.loc, /mob/living/carbon)) var/mob/living/carbon/C = energyKatana.loc - C.unEquip(energyKatana) + C.transferItemToLoc(energyKatana, get_turf(energyKatana), TRUE) //Somebody swollowed my sword, probably the clown doing a circus act. if(energyKatana in C.stomach_contents) C.stomach_contents -= energyKatana - - energyKatana.loc = get_turf(energyKatana) + else + energyKatana.forceMove(get_turf(energyKatana)) if(inview) //If we can see the katana, throw it towards ourselves, damaging people as we go. energyKatana.spark_system.start() diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 2944e345900..4b596241853 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -29,9 +29,8 @@ /obj/item/weapon/clipboard/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/paper)) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src toppaper = W user << "You clip the paper onto \the [src]." update_icon() @@ -79,9 +78,8 @@ var/obj/item/held = usr.get_active_held_item() if(istype(held, /obj/item/weapon/pen)) var/obj/item/weapon/pen/W = held - if(!usr.unEquip(W)) + if(!usr.transferItemToLoc(W, src)) return - W.loc = src haspen = W usr << "You slot [W] into [src]." diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 383bc0fe595..3798adac0e0 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -32,9 +32,8 @@ /obj/item/weapon/folder/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/documents)) - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src user << "You put [W] into [src]." update_icon() else if(istype(W, /obj/item/weapon/pen)) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 5af98751ff3..12148c61294 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -83,12 +83,9 @@ /obj/item/weapon/hand_labeler/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/hand_labeler_refill)) - if(!user.unEquip(I)) - return user << "You insert [I] into [src]." qdel(I) - labels_left = initial(labels_left) - return + labels_left = initial(labels_left) //Yes, it's capped at its initial value /obj/item/weapon/hand_labeler/borg name = "cyborg-hand labeler" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 43a3db65dff..ca8e06860d2 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -325,7 +325,7 @@ if(user.disabilities & CLUMSY && prob(10)) user.visible_message("[user] accidentally ignites themselves!", \ "You miss the paper and accidentally light yourself on fire!") - user.unEquip(P) + user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() return @@ -333,7 +333,7 @@ if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper return - user.unEquip(src) + user.dropItemToGround(src) user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!") fire_act() diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 3d61ae7c687..becfab8b41b 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -101,9 +101,10 @@ else if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object if(!remove_item_from_storage(M)) - if(!M.unEquip(src)) - return - M.put_in_hand(src, H.held_index) + M.temporarilyRemoveItemFromInventory(src, TRUE) + if(!M.put_in_hand(src, H.held_index)) + qdel(src) //rip + return add_fingerprint(M) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 79878af7a21..9969e51110c 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -1,142 +1,141 @@ -/obj/item/weapon/paper_bin - name = "paper bin" - desc = "Contains all the paper you'll never need." - icon = 'icons/obj/bureaucracy.dmi' - icon_state = "paper_bin1" - item_state = "sheet-metal" - throwforce = 0 - w_class = WEIGHT_CLASS_NORMAL - throw_speed = 3 - throw_range = 7 - pressure_resistance = 8 - var/total_paper = 30 - var/list/papers = list() - var/obj/item/weapon/pen/bin_pen - -/obj/item/weapon/paper_bin/Initialize(mapload) - ..() - if(!mapload) - return - var/obj/item/weapon/pen/P = locate(/obj/item/weapon/pen) in src.loc - if(P && !bin_pen) - P.loc = src - bin_pen = P - update_icon() - var/static/warned = FALSE - if(!warned) - warning("one or more paperbins ate a pen duing initialize()") - warned = TRUE - -/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume) - if(!total_paper) - return - ..() - -/obj/item/weapon/paper_bin/Destroy() - if(papers) - for(var/i in papers) - qdel(i) - papers = null - . = ..() - -/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume) - if(total_paper) - total_paper = 0 - update_icon() - ..() - -/obj/item/weapon/paper_bin/MouseDrop(atom/over_object) - var/mob/living/M = usr - if(!istype(M) || M.incapacitated() || !Adjacent(M)) - return - - if(over_object == M) - M.put_in_hands(src) - - else if(istype(over_object, /obj/screen/inventory/hand)) - var/obj/screen/inventory/hand/H = over_object - if(!remove_item_from_storage(M)) - if(!M.unEquip(src)) - return - M.put_in_hand(src, H.held_index) - - add_fingerprint(M) - - -/obj/item/weapon/paper_bin/attack_paw(mob/user) - return attack_hand(user) - - -/obj/item/weapon/paper_bin/attack_hand(mob/user) - if(user.lying) - return - user.changeNext_move(CLICK_CD_MELEE) - if(bin_pen) - var/obj/item/weapon/pen/P = bin_pen - P.loc = user.loc - user.put_in_hands(P) - user << "You take [P] out of \the [src]." - bin_pen = null - update_icon() - else if(total_paper >= 1) - total_paper-- - update_icon() - // If there's any custom paper on the stack, use that instead of creating a new paper. - var/obj/item/weapon/paper/P - if(papers.len > 0) - P = papers[papers.len] - papers.Remove(P) - else - P = new /obj/item/weapon/paper - if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS]) - if(prob(30)) - P.info = "HONK HONK HONK HONK HONK HONK HONK
    HOOOOOOOOOOOOOOOOOOOOOONK
    APRIL FOOLS    " - P.rigged = 1 - P.updateinfolinks() - - P.loc = user.loc - user.put_in_hands(P) - user << "You take [P] out of \the [src]." - else - user << "[src] is empty!" - - add_fingerprint(user) - - -/obj/item/weapon/paper_bin/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = I - if(!user.unEquip(P)) - return - P.loc = src - user << "You put [P] in [src]." - papers.Add(P) - total_paper++ - update_icon() - else if(istype(I, /obj/item/weapon/pen)) - var/obj/item/weapon/pen/P = I - if(!user.unEquip(P)) - return - P.loc = src - user << "You put [P] in [src]." - bin_pen = P - update_icon() - else - return ..() - -/obj/item/weapon/paper_bin/examine(mob/user) - ..() - if(total_paper) - user << "It contains " + (total_paper > 1 ? "[total_paper] papers" : " one paper")+"." - else - user << "It doesn't contain anything." - - -/obj/item/weapon/paper_bin/update_icon() - if(total_paper < 1) - icon_state = "paper_bin0" - else - icon_state = "paper_bin1" - cut_overlays() - if(bin_pen) - add_overlay(image(icon=bin_pen.icon,icon_state=bin_pen.icon_state)) +/obj/item/weapon/paper_bin + name = "paper bin" + desc = "Contains all the paper you'll never need." + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "paper_bin1" + item_state = "sheet-metal" + throwforce = 0 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 3 + throw_range = 7 + pressure_resistance = 8 + var/total_paper = 30 + var/list/papers = list() + var/obj/item/weapon/pen/bin_pen + +/obj/item/weapon/paper_bin/Initialize(mapload) + ..() + if(!mapload) + return + var/obj/item/weapon/pen/P = locate(/obj/item/weapon/pen) in src.loc + if(P && !bin_pen) + P.loc = src + bin_pen = P + update_icon() + var/static/warned = FALSE + if(!warned) + warning("one or more paperbins ate a pen duing initialize()") + warned = TRUE + +/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume) + if(!total_paper) + return + ..() + +/obj/item/weapon/paper_bin/Destroy() + if(papers) + for(var/i in papers) + qdel(i) + papers = null + . = ..() + +/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume) + if(total_paper) + total_paper = 0 + update_icon() + ..() + +/obj/item/weapon/paper_bin/MouseDrop(atom/over_object) + var/mob/living/M = usr + if(!istype(M) || M.incapacitated() || !Adjacent(M)) + return + + if(over_object == M) + M.put_in_hands(src) + + else if(istype(over_object, /obj/screen/inventory/hand)) + var/obj/screen/inventory/hand/H = over_object + if(!remove_item_from_storage(M)) + M.temporarilyRemoveItemFromInventory(src, TRUE) + if(!M.put_in_hand(src, H.held_index)) + qdel(src) + return + + add_fingerprint(M) + + +/obj/item/weapon/paper_bin/attack_paw(mob/user) + return attack_hand(user) + + +/obj/item/weapon/paper_bin/attack_hand(mob/user) + if(user.lying) + return + user.changeNext_move(CLICK_CD_MELEE) + if(bin_pen) + var/obj/item/weapon/pen/P = bin_pen + P.loc = user.loc + user.put_in_hands(P) + user << "You take [P] out of \the [src]." + bin_pen = null + update_icon() + else if(total_paper >= 1) + total_paper-- + update_icon() + // If there's any custom paper on the stack, use that instead of creating a new paper. + var/obj/item/weapon/paper/P + if(papers.len > 0) + P = papers[papers.len] + papers.Remove(P) + else + P = new /obj/item/weapon/paper + if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS]) + if(prob(30)) + P.info = "HONK HONK HONK HONK HONK HONK HONK
    HOOOOOOOOOOOOOOOOOOOOOONK
    APRIL FOOLS    " + P.rigged = 1 + P.updateinfolinks() + + P.loc = user.loc + user.put_in_hands(P) + user << "You take [P] out of \the [src]." + else + user << "[src] is empty!" + + add_fingerprint(user) + + +/obj/item/weapon/paper_bin/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/weapon/paper)) + var/obj/item/weapon/paper/P = I + if(!user.transferItemToLoc(P, src)) + return + user << "You put [P] in [src]." + papers.Add(P) + total_paper++ + update_icon() + else if(istype(I, /obj/item/weapon/pen)) + var/obj/item/weapon/pen/P = I + if(!user.transferItemToLoc(P, src)) + return + user << "You put [P] in [src]." + bin_pen = P + update_icon() + else + return ..() + +/obj/item/weapon/paper_bin/examine(mob/user) + ..() + if(total_paper) + user << "It contains " + (total_paper > 1 ? "[total_paper] papers" : " one paper")+"." + else + user << "It doesn't contain anything." + + +/obj/item/weapon/paper_bin/update_icon() + if(total_paper < 1) + icon_state = "paper_bin0" + else + icon_state = "paper_bin1" + cut_overlays() + if(bin_pen) + add_overlay(image(icon=bin_pen.icon,icon_state=bin_pen.icon_state)) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index b29e0400933..a2726173966 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -47,9 +47,8 @@ /obj/item/weapon/paperplane/attack_self(mob/user) user << "You unfold [src]." - user.unEquip(src) - user.put_in_hands(internalPaper) qdel(src) + user.put_in_hands(internalPaper) /obj/item/weapon/paperplane/attackby(obj/item/weapon/P, mob/living/carbon/human/user, params) ..() @@ -73,14 +72,14 @@ if(user.disabilities & CLUMSY && prob(10)) user.visible_message("[user] accidentally ignites themselves!", \ "You miss the [src] and accidentally light yourself on fire!") - user.unEquip(P) + user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() return if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper return - user.unEquip(src) + user.dropItemToGround(src) user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!") fire_act() @@ -108,7 +107,7 @@ if( (!in_range(src, user)) || user.stat || user.restrained() ) return user << "You fold [src] into the shape of a plane!" - user.unEquip(src) + user.temporarilyRemoveItemFromInventory(src) I = new /obj/item/weapon/paperplane(loc, src) user.put_in_hands(I) else diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 55eb7d59da7..30d76518cb8 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -168,7 +168,7 @@ if(pictures_left) user << "[src] still has some film in it!" return - if(!user.unEquip(I)) + if(!user.temporarilyRemoveItemFromInventory(I)) return user << "You insert [I] into [src]." qdel(I) diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 485165fa681..a5a69a1bf21 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -181,10 +181,9 @@ user << "There is already a [fueljar] inside!" return - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return fueljar = W - W.forceMove(src) user.visible_message("[user.name] loads an [W.name] into the [src.name].", \ "You load an [W.name].", \ "You hear a thunk.") diff --git a/code/modules/projectiles/ammunition/caseless.dm b/code/modules/projectiles/ammunition/caseless.dm index aa6c47e855c..67c2745a37f 100644 --- a/code/modules/projectiles/ammunition/caseless.dm +++ b/code/modules/projectiles/ammunition/caseless.dm @@ -87,9 +87,8 @@ else if (istype(A, /obj/item/weapon/pen)) if(modified) if(!FD.pen) - if(!user.unEquip(A)) + if(!user.transferItemToLoc(A, FD)) return - A.forceMove(FD) FD.pen = A FD.damage = 5 FD.nodamage = 0 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index a0fae47ea8f..bc2a1f045cb 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -279,13 +279,12 @@ if(istype(I, /obj/item/device/flashlight/seclite)) var/obj/item/device/flashlight/seclite/S = I if(!gun_light) - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return user << "You click [S] into place on [src]." if(S.on) SetLuminosity(0) gun_light = S - I.loc = src update_icon() update_gunlight(user) verbs += /obj/item/weapon/gun/proc/toggle_gunlight diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index a8dd8f9bcbe..ee0744b2753 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -56,21 +56,23 @@ if (istype(A, /obj/item/ammo_box/magazine)) var/obj/item/ammo_box/magazine/AM = A if (!magazine && istype(AM, mag_type)) - user.remove_from_mob(AM) - magazine = AM - magazine.forceMove(src) - user << "You load a new magazine into \the [src]." - chamber_round() - A.update_icon() - update_icon() - return 1 + if(user.transferItemToLoc(AM, src)) + magazine = AM + user << "You load a new magazine into \the [src]." + chamber_round() + A.update_icon() + update_icon() + return 1 + else + user << "You cannot seem to get \the [src] out of your hands!" + return else if (magazine) user << "There's already a magazine in \the [src]." if(istype(A, /obj/item/weapon/suppressor)) var/obj/item/weapon/suppressor/S = A if(can_suppress) if(!suppressed) - if(!user.unEquip(A)) + if(!user.transferItemToLoc(A, src)) return user << "You screw [S] onto [src]." suppressed = A @@ -78,7 +80,6 @@ S.initial_w_class = w_class fire_sound = 'sound/weapons/Gunshot_silenced.ogg' w_class = WEIGHT_CLASS_NORMAL //so pistols do not fit in pockets when suppressed - A.loc = src update_icon() return else diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index c53332c22ad..f7337e4ee19 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -34,21 +34,22 @@ if(istype(A, /obj/item/ammo_box/magazine)) var/obj/item/ammo_box/magazine/AM = A if(istype(AM, mag_type)) - if(magazine) - user << "You perform a tactical reload on \the [src], replacing the magazine." - magazine.dropped() - magazine.forceMove(get_turf(src.loc)) - magazine.update_icon() - magazine = null + var/obj/item/ammo_box/magazine/oldmag = magazine + if(user.transferItemToLoc(AM, src)) + magazine = AM + if(oldmag) + user << "You perform a tactical reload on \the [src], replacing the magazine." + oldmag.dropped() + oldmag.forceMove(get_turf(src.loc)) + oldmag.update_icon() + else + user << "You insert the magazine into \the [src]." + chamber_round() + A.update_icon() + update_icon() + return 1 else - user << "You insert the magazine into \the [src]." - user.remove_from_mob(AM) - magazine = AM - magazine.loc = src - chamber_round() - A.update_icon() - update_icon() - return 1 + user << "You cannot seem to get \the [src] out of your hands!" /obj/item/weapon/gun/ballistic/automatic/ui_action_click() burst_select() diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm index dd656687c71..8f8585c29af 100644 --- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm +++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm @@ -46,13 +46,13 @@ /obj/item/weapon/minigunpack/attackby(obj/item/weapon/W, mob/user, params) if(W == gun) //Don't need armed check, because if you have the gun assume its armed. - user.unEquip(gun,1) + user.dropItemToGround(gun, TRUE) else ..() /obj/item/weapon/minigunpack/dropped(mob/user) if(armed) - user.unEquip(gun,1) + user.dropItemToGround(gun, TRUE) /obj/item/weapon/minigunpack/MouseDrop(atom/over_object) if(armed) @@ -67,9 +67,10 @@ if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object - if(!M.unEquip(src)) + if(!M.temporarilyRemoveItemFromInventory(src)) return - M.put_in_hand(src, H.held_index) + if(!M.put_in_hand(src, H.held_index)) + qdel(src) /obj/item/weapon/minigunpack/update_icon() diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index a28f1f0b64d..19f8fbffb2a 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -67,10 +67,9 @@ user << "As you try to pick up [src], it slips out of your grip.." if(prob(50)) user << "..and vanishes from your vision! Where the hell did it go?" - user.unEquip(src) qdel(src) user.update_icons() else user << "..and falls into view. Whew, that was a close one." - user.unEquip(src) + user.dropItemToGround(src) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index f1aee97eb44..e4aae72ca6b 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -108,7 +108,7 @@ playsound(user, fire_sound, 50, 1) user << "[src] blows up in your face!" user.take_bodypart_damage(0,20) - user.unEquip(src) + user.dropItemToGround(src) return 0 ..() diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 1d0dc72e1f6..df867c4444e 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -253,10 +253,10 @@ break if(KA.get_remaining_mod_capacity() >= cost) if(.) + if(!user.transferItemToLoc(src, KA)) + return user << "You install the modkit." playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) - user.unEquip(src) - forceMove(KA) KA.modkits += src else user << "The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits." diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index 6972e1adc91..7f44205eca6 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -20,9 +20,8 @@ if((istype(I, /obj/item/weapon/grenade))) if(grenades.len < max_grenades) - if(!user.unEquip(I)) + if(!user.transferItemToLoc(I, src)) return - I.loc = src grenades += I user << "You put the grenade in the grenade launcher." user << "[grenades.len] / [max_grenades] Grenades." diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 3aae4b7e168..8da5ef5aecd 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -52,11 +52,10 @@ /obj/item/weapon/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = 1) if(istype(A, /obj/item/weapon/reagent_containers/syringe)) if(syringes.len < max_syringes) - if(!user.unEquip(A)) + if(!user.transferItemToLoc(A, src)) return user << "You load [A] into \the [src]." syringes.Add(A) - A.forceMove(src) recharge_newshot() return 1 else diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 97b3b0bfb70..c460400839b 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -31,7 +31,7 @@ user << "You remove [G]'s old pin." if(!G.pin) - if(!user.unEquip(src)) + if(!user.temporarilyRemoveItemFromInventory(src)) return gun_insert(user, G) user << "You insert [src] into [G]." @@ -45,7 +45,7 @@ /obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/weapon/gun/G) gun = G - loc = gun + forceMove(gun) gun.pin = src return diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 961aa9a2a08..04a83ca3c05 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -173,7 +173,7 @@ Robot.notify_ai(1) else for(var/obj/item/W in contents) - if(!M.unEquip(W)) + if(!M.dropItemToGround(W)) qdel(W) var/mob/living/new_mob diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 16bfa2674fd..7993e9fe90f 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -255,7 +255,6 @@ else if(isprox(O)) user << "You add [O] to [src]." qdel(O) - user.unEquip(src) qdel(src) user.put_in_hands(new /obj/item/weapon/bucket_sensor) else diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 9520ec001be..9bd316d467e 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -43,19 +43,12 @@ "[user] forces [M] to [apply_method] [src].") - user.unEquip(src) //icon update add_logs(user, M, "fed", reagentlist(src)) - loc = M //Put the pill inside the mob. This fixes the issue where the pill appears to drop to the ground after someone eats it. - if(reagents.total_volume) reagents.reaction(M, apply_type) reagents.trans_to(M, reagents.total_volume) - qdel(src) - return 1 - else - qdel(src) - return 1 - return 0 + qdel(src) + return 1 /obj/item/weapon/reagent_containers/pill/afterattack(obj/target, mob/user , proximity) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 9feb23f4e47..876309b60ee 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -82,7 +82,7 @@ AM.ex_act() /obj/item/smallDelivery/attack_self(mob/user) - user.unEquip(src) + user.temporarilyRemoveItemFromInventory(src, TRUE) for(var/X in contents) var/atom/movable/AM = X user.put_in_hands(AM) @@ -92,7 +92,7 @@ /obj/item/smallDelivery/attack_self_tk(mob/user) if(ismob(loc)) var/mob/M = loc - M.unEquip(src) + M.temporarilyRemoveItemFromInventory(src, TRUE) for(var/X in contents) var/atom/movable/AM = X M.put_in_hands(AM) diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index 475f80a2425..c59850198e3 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -29,7 +29,7 @@ else meat_counter ++ for(var/obj/item/W in H) - H.unEquip(W) + H.dropItemToGround(W) H.gib() adjustHealth(-maxHealth * 0.05)//restores 5% hp of tendril diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm index a63d91c6437..0603fe2fc46 100644 --- a/code/modules/spells/spell_types/barnyard.dm +++ b/code/modules/spells/spell_types/barnyard.dm @@ -42,7 +42,7 @@ magichead.flags_inv = null target.visible_message("[target]'s face lights up in fire, and after the event a barnyard animal's head takes it's place!", \ "Your face burns up, and shortly after the fire you realise you have the face of a barnyard animal!") - if(!target.unEquip(target.wear_mask)) + if(!target.dropItemToGround(target.wear_mask)) qdel(target.wear_mask) target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) playsound(get_turf(target), mSounds[randM], 50, 1) diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm index 1e7fc5ee7f8..aad30a2b469 100644 --- a/code/modules/spells/spell_types/lichdom.dm +++ b/code/modules/spells/spell_types/lichdom.dm @@ -91,7 +91,7 @@ if(iscarbon(old_body)) var/mob/living/carbon/C = old_body for(var/obj/item/W in C) - C.unEquip(W) + C.dropItemToGround(W) for(var/X in C.internal_organs) var/obj/item/organ/I = X I.Remove(C) @@ -134,7 +134,7 @@ current_body = M.mind.current if(ishuman(M)) var/mob/living/carbon/human/H = M - H.unEquip(H.wear_suit) - H.unEquip(H.head) + H.dropItemToGround(H.wear_suit) + H.dropItemToGround(H.head) H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head) diff --git a/code/modules/spells/spell_types/spacetime_distortion.dm b/code/modules/spells/spell_types/spacetime_distortion.dm index 8d772a26738..63dae70ac10 100644 --- a/code/modules/spells/spell_types/spacetime_distortion.dm +++ b/code/modules/spells/spell_types/spacetime_distortion.dm @@ -82,10 +82,9 @@ /obj/effect/cross_action/spacetime_dist/proc/get_walker(atom/movable/AM) busy = TRUE - if(linked_dist) - flick("purplesparkles", src) - AM.forceMove(get_turf(src)) - playsound(get_turf(src),sound,70,0) + flick("purplesparkles", src) + AM.forceMove(get_turf(src)) + playsound(get_turf(src),sound,70,0) busy = FALSE /obj/effect/cross_action/spacetime_dist/Crossed(atom/movable/AM) @@ -93,7 +92,7 @@ walk_link(AM) /obj/effect/cross_action/spacetime_dist/attackby(obj/item/W, mob/user, params) - if(user.unEquip(W)) + if(user.temporarilyRemoveItemFromInventory(W)) walk_link(W) else walk_link(user) diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm index d082668630e..dd55a88bdb5 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -70,7 +70,7 @@ M.loc.visible_message("[M] suddenly appears!") item_to_retrieve = null break - M.unEquip(item_to_retrieve) + M.dropItemToGround(item_to_retrieve) if(iscarbon(M)) //Edge case housekeeping var/mob/living/carbon/C = M diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 44af9335068..979f2623f41 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -67,7 +67,7 @@ else H.visible_message("[user] jams [src] into [H]'s empty socket!",\ "[user] forces [src] into your empty socket, and it locks into place!") - user.unEquip(src,1) + user.temporarilyRemoveItemFromInventory(src, TRUE) attach_limb(C) return ..() diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 32bff216855..dea1e05f7d4 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -85,7 +85,7 @@ update_limb(1) C.bodyparts -= src if(held_index) - C.unEquip(owner.get_item_for_held_index(held_index), 1) + C.dropItemToGround(owner.get_item_for_held_index(held_index), 1) C.hand_bodyparts[held_index] = null owner = null @@ -162,7 +162,7 @@ if(R) R.update_icon() if(C.gloves) - C.unEquip(C.gloves, 1) + C.dropItemToGround(C.gloves, TRUE) C.update_inv_gloves() //to remove the bloody hands overlay @@ -180,7 +180,7 @@ if(L) L.update_icon() if(C.gloves) - C.unEquip(C.gloves, 1) + C.dropItemToGround(C.gloves, TRUE) C.update_inv_gloves() //to remove the bloody hands overlay @@ -193,7 +193,7 @@ owner.legcuffed = null owner.update_inv_legcuffed() if(owner.shoes) - owner.unEquip(owner.shoes, 1) + owner.dropItemToGround(owner.shoes, TRUE) ..() /obj/item/bodypart/l_leg/drop_limb(special) //copypasta @@ -205,7 +205,7 @@ owner.legcuffed = null owner.update_inv_legcuffed() if(owner.shoes) - owner.unEquip(owner.shoes, 1) + owner.dropItemToGround(owner.shoes, TRUE) ..() /obj/item/bodypart/head/drop_limb(special) @@ -213,7 +213,7 @@ //Drop all worn head items for(var/X in list(owner.glasses, owner.ears, owner.wear_mask, owner.head)) var/obj/item/I = X - owner.unEquip(I, 1) + owner.dropItemToGround(I, TRUE) name = "[owner.real_name]'s head" ..() diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm index 85d4e87055f..2bc650656f5 100644 --- a/code/modules/surgery/bodyparts/helpers.dm +++ b/code/modules/surgery/bodyparts/helpers.dm @@ -270,4 +270,4 @@ U.adjusted = DIGITIGRADE_STYLE H.update_inv_w_uniform() if(H.shoes && !swap_back) - H.unEquip(H.shoes) + H.dropItemToGround(H.shoes) diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index 24a9622a33d..6d0001c4211 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -61,9 +61,8 @@ user << "You have already inserted a cell!" return else - if(!user.unEquip(W)) + if(!user.transferItemToLoc(W, src)) return - W.loc = src src.cell = W user << "You insert the cell." else if(istype(W, /obj/item/stack/cable_coil)) @@ -118,9 +117,8 @@ user << "You can't use a broken flash!" return else - if(!user.unEquip(W)) + if(!user.transferItemToLoc(F, src)) return - F.loc = src if(src.flash1) src.flash2 = F else diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index a9dcf674556..86e497f1511 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -72,8 +72,7 @@ var/obj/item/device/assembly/flash/F = holder F.SetLuminosity(0) - owner.unEquip(holder, 1) - holder.forceMove(src) + owner.transferItemToLoc(holder, src, TRUE) holder = null playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1) @@ -96,7 +95,7 @@ var/obj/item/arm_item = owner.get_active_held_item() if(arm_item) - if(!owner.unEquip(arm_item)) + if(!owner.dropItemToGround(arm_item)) owner << "Your [arm_item] interferes with [src]!" return else diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm index da3c36dd687..e37e99ffeef 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/prosthetic_replacement.dm @@ -60,7 +60,6 @@ else target.regenerate_limb(target_zone) user.visible_message("[user] finishes attaching [tool]!", "You attach [tool].") - user.unEquip(tool) qdel(tool) if(istype(tool, /obj/item/weapon/twohanded/required/chainsaw)) var/obj/item/weapon/mounted_chainsaw/new_arm = new(target) diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 2bd0ee63d95..c2944a52b36 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -26,7 +26,6 @@ new /obj/effect/particle_effect/sparks(loc) playsound(src.loc, "sparks", 50, 1) blink_mob(user) - user.unEquip(src) qdel(src) /obj/item/weapon/ore/bluespace_crystal/proc/blink_mob(mob/living/L) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 9ddd993c7e6..da73a5935cd 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -68,9 +68,9 @@ updateDialog() else if(istype(W, /obj/item/device/gps)) if(!inserted_gps) + if(!user.transferItemToLoc(W, src)) + return inserted_gps = W - user.unEquip(W) - W.loc = src user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "You insert [W] into \the [src]'s GPS device slot.") else if(istype(W, /obj/item/device/multitool)) var/obj/item/device/multitool/M = W From eae7757ffbe8b99763e4f80d57820a1237281ae9 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:30:08 +0000 Subject: [PATCH 39/44] Automatic changelog generation for PR #23453 [ci skip] --- html/changelogs/AutoChangeLog-pr-23453.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23453.yml diff --git a/html/changelogs/AutoChangeLog-pr-23453.yml b/html/changelogs/AutoChangeLog-pr-23453.yml new file mode 100644 index 00000000000..87045e0c651 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23453.yml @@ -0,0 +1,5 @@ +author: "Fox McCloud" +delete-after: True +changes: + - tweak: "Plant analyzers will now display plant traits" + - tweak: "Plant analyzers will now display all of a grown's genetic reagents" From db7cb8a38582a0bc5e8c6a608954d7b73025e0fb Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:31:46 +0000 Subject: [PATCH 40/44] Automatic changelog generation for PR #23226 [ci skip] --- html/changelogs/AutoChangeLog-pr-23226.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23226.yml diff --git a/html/changelogs/AutoChangeLog-pr-23226.yml b/html/changelogs/AutoChangeLog-pr-23226.yml new file mode 100644 index 00000000000..60f4a73b40b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23226.yml @@ -0,0 +1,4 @@ +author: "Joan" +delete-after: True +changes: + - rscdel: "Cutting off legs no longer stuns." From ef2921b1c360bdcb186c0b5474a6ad1fd922117a Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 30 Jan 2017 15:33:07 -0500 Subject: [PATCH 41/44] Adds picture frames. (#23168) * Adds picture frames. * Fixes bugs in photography * clicking a photo views the photo, more consistent with other wall items --- .../items/stacks/sheets/sheet_types.dm | 1 + code/game/objects/structures/signs.dm | 2 +- code/modules/paperwork/photography.dm | 126 +++++++++++++++++- icons/obj/decals.dmi | Bin 20252 -> 20540 bytes 4 files changed, 126 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index f3dc16cba93..35c37e03fe1 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -137,6 +137,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("picture frame", /obj/item/weapon/picture_frame, 1, time = 10),\ new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40), \ new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\ diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index fbd7a9707c6..102bb762b09 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -102,7 +102,7 @@ if(isturf(target) && proximity) var/turf/T = target user.visible_message("[user] fastens [src] to [T].", \ - "You attach a blank sign to [T].") + "You attach the sign to [T].") playsound(T, 'sound/items/Deconstruct.ogg', 50, 1) new sign_path(T) user.drop_item() diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 30d76518cb8..00210dbc749 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -4,6 +4,7 @@ * Camera Film * Photos * Photo Albums + * Picture Frames * AI Photography */ @@ -53,7 +54,7 @@ /obj/item/weapon/photo/examine(mob/user) ..() - if(in_range(user, src)) + if(in_range(src, user)) show(user) else user << "You need to get closer to get a good look at this photo!" @@ -303,7 +304,7 @@ /obj/item/device/camera/proc/printpicture(mob/user, icon/temp, mobs, flag) //Normal camera proc for creating photos var/obj/item/weapon/photo/P = new/obj/item/weapon/photo(get_turf(src)) - if(Adjacent(user)) //needed because of TK + if(in_range(src, user)) //needed because of TK user.put_in_hands(P) var/icon/small_img = icon(temp) var/icon/ic = icon('icons/obj/items.dmi',"photo") @@ -484,3 +485,124 @@ C.toner -= 20 //Cyborgs are very ineffeicient at printing an image visible_message("[C.name] spits out a photograph from a narrow slot on its chassis.") usr << "You print a photograph." + +// Picture frames + +/obj/item/weapon/picture_frame + name = "picture frame" + desc = "The perfect showcase for your favorite deathtrap memories." + icon = 'icons/obj/decals.dmi' + icon_state = "frame-empty" + var/obj/item/weapon/photo/displayed + +/obj/item/weapon/picture_frame/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/weapon/photo)) + if(!displayed) + var/obj/item/weapon/photo/P = I + user.unEquip(P) + P.forceMove(src) + displayed = P + update_icon() + else + user << "\The [src] already contains a photo." + + ..() + +/obj/item/weapon/picture_frame/attack_hand(mob/user) + if(user.get_inactive_held_item() != src) + ..() + return + if(contents.len) + var/obj/item/I = pick(contents) + user.put_in_hands(I) + user << "You carefully remove the photo from \the [src]." + displayed = null + update_icon() + +/obj/item/weapon/picture_frame/attack_self(mob/user) + user.examinate(src) + +/obj/item/weapon/picture_frame/examine(mob/user) + if(user.is_holding(src) && displayed) + displayed.show(user) + else + ..() + +/obj/item/weapon/picture_frame/update_icon() + overlays.Cut() + if(displayed) + overlays |= getFlatIcon(displayed) + else + icon_state = initial(icon_state) + +/obj/item/weapon/picture_frame/afterattack(atom/target, mob/user, proximity) + var/turf/T = target + if(!iswallturf(T)) + return + user.visible_message("[user] fastens [src] to [T].", \ + "You attach the sign to [T].") + playsound(T, 'sound/items/Deconstruct.ogg', 50, 1) + var/obj/structure/sign/picture_frame/PF = new /obj/structure/sign/picture_frame(T) + PF.overlays = overlays.Copy() + if(displayed) + PF.framed = displayed + if(contents.len) + var/obj/item/I = pick(contents) + I.forceMove(PF) + qdel(src) + +/obj/structure/sign/picture_frame + name = "picture frame" + desc = "Every time you look it makes you laugh." + icon = 'icons/obj/decals.dmi' + icon_state = "frame-empty" + var/obj/item/weapon/photo/framed + +/obj/structure/sign/picture_frame/examine(mob/user) + if(in_range(src, user) && framed) + framed.show(user) + else + ..() + +/obj/structure/sign/picture_frame/attackby(obj/item/O, mob/user, params) + if(istype(O, /obj/item/weapon/screwdriver)) + user.visible_message("[user] starts removing [src]...", \ + "You start unfastening [src].") + playsound(src, O.usesound, 50, 1) + if(!do_after(user, 30*O.toolspeed, target = src)) + return + playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) + user.visible_message("[user] unfastens [src].", \ + "You unfasten [src].") + var/obj/item/weapon/picture_frame/F = new /obj/item/weapon/picture_frame(get_turf(user)) + if(framed) + F.displayed = framed + framed = null + if(contents.len) + var/obj/item/I = pick(contents) + I.forceMove(F) + F.update_icon() + qdel(src) + + else if(istype(O, /obj/item/weapon/photo)) + if(!framed) + var/obj/item/weapon/photo/P = O + user.unEquip(P) + P.forceMove(src) + framed = P + update_icon() + else + user << "\The [src] already contains a photo." + + ..() + +/obj/structure/sign/picture_frame/attack_hand(mob/user) + if(framed) + framed.show() + +/obj/structure/sign/picture_frame/update_icon() + overlays.Cut() + if(framed) + overlays |= getFlatIcon(framed) + else + icon_state = initial(icon_state) \ No newline at end of file diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index cc0f39f54546af0fb8c2dd799fe639b7a2b332a1..45113b60eee65ed9780118d6c62ae9950177575a 100644 GIT binary patch delta 19844 zcmYJabzGZG&@PM?m!c`I#ogVDI~4a8iWZ9NjZ>T!clTn&-5mJ57?>XQ3 zBl+zu$SG)fCyf!gmfFZAyUo zU8i8^j_VF)p&h;m1PO(Le2BMiv1kgL-nqJg_*+~pp671pN5PYmPGtx;GMN;0T*Uw- zY9E;nNYK<-oFPx&uHqjG?V^rvQ|RBF5~AbGW(veTn))2?QlE<4?An||8wTU_rYbR6 zF%C&P`BP;=0usM$vO12lqk8d1qIh5_)uWrP1wjO_Axtpm>T6Kf7h!d#*qfj5DJfqX zFx(`YC3gu^LOrFOB;6%Zn$GD1DaL$@dyZz(M%c9@oY`pnj*84WSDR%?e#hsLd3! zZfg$!Zgsv+sZ5=ciHTs8Kb$nKuFuckogE)N-!{ip6KN^&lEjvf=+BG8$L_C>WG(y8 zdwn;b5siZh+3Jw8S& zw89_ykmUcDw9=esKZkahoHM((e<(G3q1y3e`SO^XO*%s%4ff{C@`K2ij6-gZZ(?wy zdX06~RlUV#HL(Nu759+M#QPf`Nt<{IP^9qs>(Hv4O~4EMY$2y=e_(z zfnY34Mk;u9a05EHG}S=(!Smh~eR{bNWlXH3f2p_bm%ndQJKQa$U8obvatq7oe@`rB z8PWG9RlfFDj*ltHpiNEa12ON%Er+1598<4bD6g-4O=rWATHn=#kLbLYKd07h27n3u zChTiEhhUP?ZC29E;p^rZtK=RRMdI}Qad+fZD?5nn_H-UL`#r8)rvrYyPz2{A6b;zy zTzV~ZnPifyWiJy4$|)Pc&orULbIY^vB@B6{{`hO-@0l5AK{-Yr#-lifU`!GwwG^!Z;J&d55>dIu%&mUeb~>VCsyMYPDdlOzx_B8 zrx=<`E*Hps6_O&0ja(kz{0+Bjk|3NHr7qH9vG~W38x2#ypp_AR^aW#M)#Bla52F+As^B)Nj`t;A55*g?nAtZ(jbtfXAR36 zu(1~Xb&6dm-PEZnST`sat4n)qk9n8q)kPU z7UOz&cC!FK(9k749l14~7k99-xO~arY$hm%O`-*ovOe}AAmxx^G_HL;Ai=$2Bw(}?Z_0@P-Ue49EzPlQUNuR!w zk*T-U>Od_RNG2+IeANE z%=&|9s8d|=5;^y&?_~*T7!k7L7wc`|9Sq^JQr_u8@v@%?FaRRK6yN96h?uSnrk6%wLY$*a<%p3|seUgY%IAE$ z^t#$KeWyh5D&3L0<)I^;c4Saip`PXmxWe=f>)$ZLMvLj(up_7(1?LJnR;TNB1ajH; zG(Y;B1+1&j_I+)6{2is!Jtv3bde90BFr zG@%E3qGC2`i7O~908GQm#^Dsc?_uT_)hz}y$xmkz(6-zUE2JfB;v@Hd)n81{p?9Ge z=q8TRy-rU`KUyw=0v}oTGVH4rS2v#rIot<3q4{4bt(Y$4b=&8zVS{=Hxr#59)7`;$ z*JV{f3J>TKcN42%))3#;UWXoYfGCRAj?JxgS@iKWVu8u@hYq_;O(0pCFDz;GDN!#l z=@B#SPV+yDTg`2o-E4-zUuLmc!kvMILo@-tUYw*ARq6rjPiuw!9v<1v%@->xLtW)Y z992wAwV0m^80;3)C5wW4N!n>buJ84XUE~(Kl5CJTzs%a-cD^1om^v#K-4oW^Oj+Nb zF2CdgyO0v4P@R@2e8MN$JZm+h!#0|zraZrm_zIsryO?U(La)m%93Sap(~Hrd2&Km{ z!qzN=2AlSi=&5mHRqMYqADh;^KWCt_8Lk}1hrdzxgI&@`r!-w(%O(21)vB?RmGXR7 zopgXtcEiI}C?%}z*GE!DyM6R(?78mVg^~m?iAx%;YS5!aO=np2Gh3I=F>45gbx+%w zY50B1HY@fS(81A}#z&t?wAvq|{z|H$;n!myxbf{Exod=xh|Mu9iMWWQoEX-Ke(yTX zp$DHT_wDyQg&~E*MNoD1!`8@Q6l|Ta`kw`jDs(Hc(f`SN*Evtwk6Be89A}3Q81guP zzW)2JjUM*BCr#wKR8!4JgR3uBYJr(2Rb&Xt#uB=E8}Z2S$KN% zGotCvK7V2r^r9gohrgZRvF!Z|$d8NcPbi)Q=!NpBNQl{BV~~(CH50SuqPmHjUU+un zK>Yka^8K3YGgB&T_93JtE=IN3w`i{GX97!_;C*>o#_x zSz{9;cq6jreD&FYqv(T_I@9y+*_ox9Nw&jp)^O4fhPssmO>OKjV*!4fsi>|!z+K_| znZl#odzyY3*E!dt!?lTk>XHjyg*v@$*UYIZd=zC@UJBmN52^Us*lafjd*iYE5z%cISt=Y=cL~gt^sQ177RKz6Um1TPxu7q&Z~2Bk zjYaHx#-AR{y*u~rzk$7Mj`7s*ObNQbsp+~@mzbytXJhNaQYd$*UFE7LIhyzsrL3>lzP5yUVg56O|VphE|pv(5}gm<0#yHFL#k>-C^cpAxi#1Sn2slE9&Za5M_ovhM~2gvR?^W=M$7)xJSH& z+;O}B$Eg)@OfNsCODC$9sAPMHsp05lqmYkRWI3N(6PPt7v&loo`By z$ymQ^I7!sNm1|B(!E1)#>8AQpyA&QHpTtdgTFl*RPdRZ2v+W_nzhZvxCDsh7G5drq z>vxYLVIJ!!zXL%!0-u;YTFMOR=T0p0Fn@sU0Ej+ebH`jZV#qaCO4{|+Bi`40-8EK6 zj1K8KzKY9PlLZ>cFV_A`|MT+?HEigm>mvf_!uXBd1UO}-rw0Uiuu#vlG-m(hBw!3$ zdEm#OMKO zDkR50CV4=az*Y>42LuJNl`Dc*{g9bHxD?S@gX^a^7n^wzlyvnKiHbrL8tTh9 zgn6r*UPfiM2C#*UTP@rB^T#Y$R0u$X@?hR$Pp5jqN5TQ-&dmIj(&PA2K^F$hY^_7!1C zS$j8H>V2!n%#QVDlG`X|wGL*ZZ9NFu7(588YUaJIY|6+h}pyH;Y&Gd7g9wY3jB>#Qd;9&RsKS*eGW@%s}T z2#97Bsn$X4iZyi0L_sQ49E2t)CPLiq@#pOV`V!#%Qz)zL;w)Xb4KNO}H z7Cy+!qkLU|NPH+lRjpNN-AE=gVgd0C6`Ui!u|g5%je%Fp$`)~4aEhyc9;B-@Q=)OK zRYkEK|5-iQrStk*lq&h@3PmM;Ado~;$m(3^ce5#ys&K0)S(xK$LvwSY0^Q-^VUG*h z>0BoCDUJ>JkkuvtH-vyzQwhvRa@Lm2v*=CeqgEqu1V zbgfh2;4UEWxax0?PHiGN)))50j0MQot(8s^a1~GR!=&KP!Kz^&C$$+$dppBR&HlUQ z$6-k^vtP4P>4~_9vGWhNmCMr-Hrw!fcW_im$@^9Srm?K1jEs!K)6;<_N3!8w7cyaC zVFfxoxL*eKZg6Ytkta(x;k$%7zA-P&h8x!X>2#xsPcdjNG$oznJQFx|8{8m4T81~O%E@22`s(;ivFwB&nj zU(zO|)r8Z!UUa59a2v!DChAht8AgobDjg!FX@jH4Z4GYHBbjp#{9g8_K&g;7SIntI ztkN`2WAHtxT^jvYHo`BLBoV#%Cy%G49)J~E;<~2@9sfK1UHTynQv3uFdP`?a{LHUr z>+y=a_%Hv48(;QIKtPKvj&z!qQt6^M)qDvZyjG67vq3f7yrD+)*0@yzcKxh~@-T+mG$|RD7p8Jj=6p$1RVn@BOsd76a`s%hqBW(q%q(5%5;gX@ zaB3VqyT8O6=>bV$1#0i-BXQ9yS%6esP?5jd{b|3sSK@QKm0H=6SgS1ZxPQ#Z z+2i|$aIV{Xdb9+ebyGBTo%AZcJX&~VDAt7pCN>BwC7JmVLFa6Mw?!A;**_M_t`~gOIC3DU7>e8x~j8j9u%Bb6b9gzTdqN z2PdiITzt@|l3p7YGW_G3s^d8F$L>3w3doe1(9gQUa30$kq}SW#h$98M^4MX)6IzCw z=aZAA7H^hRV0$w7lr-FYZX`eEomfmt$}MSAetu3|9MWi!s!WK$g$iI~ByxAh*P?)n zfKSZ%7SDn1O)wXqi8hPdzdAF<(N8lE4tSBF7s&H6We50;aJuL+s6x&PF<}@Ytyj&# z#Lzt&7x+kvUi@e_HSzM4qYL$!R%7l%KSXMzxF4ZG&KH}Qui&5A6>oj#cjPG=(*0`3 z<;;F!`+PiSi5AE9|2Iv2QB*o9lgMQL%Gt!yv;wIh`g=1r0S`-$o@s{4HiH_e+`^!-yEo z93ZhV*Lv`M)r}bW9%OD|sJtq+l>9^~D52JMQ7xPwTMG0hJI;3U{%n;BZN|-(Of>C} zY;d;FDY1-=jg28~{dHiTjcA?{HIm=;uK!YfWwyk|HdR;%b#Lsu+r;Ugr&}qTce`aS z*o|P3Q~$Bz&2qf@zvhdpjcZr(#1`~F@SN$nm=r8sPbS^T9^^B<6IBU`F;doU(hJu2 z4Jf;c6TcEti7mwSxL90|1fl-zg_r5@qZDq7)6HCcdT4ulDsesO}KKwAqlYA6+JZ6+oGVdYH`qXCWwtm${$F+>bWOiOjq$% zm{GjRvA*fGM`KDp?9Mv$`)E+evCtDi=B5dbnigI^4HMmm8FK+e+}gWjkMqvqe}!g9 zzNxZ?{NZm87B&Z#e?!PwZOt>y6>8t6DV&<1v+|}SwV=@&R)e-{)3rC11 zG_FIZE&(leiEIrKZJ-UG!b|X%^-TfJlm7K#7K6a3qi~L-2^$&cDNZ$lX|JcT!iwpp z`md63#X@;Ycc(q~1C96T(5qBcRs7|b{Y=6}3BM64Y>`vk5*1&{Db|3jw}l^OmzPH) z)Sw`iRA?fxnIGEWD;f9M;yf@PI+Uoj(}u@z=YQ`gvSE3d@WJDJZFHJiMgiTKoOD~M z$q~Sq=sS1kyDup(XR^t9z3Ec1v0*qnJG0g0Ty(E{6KnZ=`?9MSb%uQ*M20QAl&_u( zni93bSJwTkYP-8-j*eI~Ks}n9GLQ~tlJYYb3Aef$QvNxd>m;v)uL$5B1>%S3&kPd1 zZ!hlO%yk#CZR`Dkztd4$-Lgy+VwM+p**Zn-`}2`eID-4>QtknsQx)|O-`0C#pjGrv zvg1lQEZ%~-lGL=EO?LM>y+|~6?xJ4o&RtATdhMFzJL$2-uoH-zs&Og^txh0eh!JjR z{Iewa?jE zMeC6~-bLnvZB9<1xWT!$?6>%P$(9+oem?BR&UfC%3FyiJHy=vSwxc!jljgB-WEZe- za!_zFcr`G|)6N~sDyA-_OfzFXOZhU~zO$Z15cCl7=$Ccq2)1qdMY|nm0rZT}k)tVi zXhYcN#d}cHMPi{{9Z@h0MIz@u^LoB)fBX+>;$ADZYn~UKk{0)>^(ROqB*(KII$Aj(r&~A2eR#%bp+tu# z7`N*yQGH^Kg~6E0=mRvNtM)7QE!AP4@Cyzg3BFfY9g0j(Q$)$6OCy@K8BP~!4v!XJ zA3bNo&UEk!u*K5LMyQF8tp8>ejD?^Tk6+_B74vsf?e`DC5C*zKsEWnlIg3pkiUR31 zg2|rx8Oq~m_DOvl$3qCF1>;rgvK3wD~$qGD~RTN`Yo zr59nXZXm4Q$(oPAE#1WleE-AQ!`<#vKmb$Pgy+JJQVngNQ(6KE$L?9p*?zlQ@d|WV zPtWBj-n_R|d@^F{m6heSF7!Xu!TqPZ0Jmjk;l!|IJ(H8T-I^ejum`5<|!|U1| z5y7e;+3v1gh-qPGRaM9H^M~hotlgf!Mv=qy@v(icsyI18wq0Z7Knr1DKeos~jZb>X zD8Lq<)oU=kZcq#Pqc$a1Q+2lzh$&;9@gC8h%+vrGMaT^ zZ2hG5>b}pZ7nUG-3wF%efySo55ErF7Cvd`=IX|9XK8l1=WP$&c02CME*z2l3xJ1rU zji#d8%3Wz86@+%KO`&a_#i-9tKO36oF^rMrX{z@aE6~+b#o+~J*?5CwDw8&5PEda! zBFUE1Y{Aee-R;_Z@I!LZTrw~SD~GBK{5r|D3gZ3*3WuNST+;0pcaS*LOZ^1C2OP-+ z+gJkhRm;f0r2Gz_PM5e|4vJHS?iz4@yMp=SBrLF_&pYE~aD={Nk@6$Jprp&*k9)el z8f4)X>-TX-+srK5mZWRZ0_M+&S6!A`t%ze~BFs^H|CsoKgdM2Zxu}kYr*!dk`tWbR z1)qucn%0=NPx&GcH=UQGlp=!xJ`Ap<_g8I;ne-?vRCM8?8Tp)UUr3?8axs}u9rcb6 z&gb6zh{vl5U(-RcT(VHQt04ZkZQaOXwjX^%RDY^J;;-#&glW?JtjQE}Fe?_NqL==I z%wbLe|EGI~G(S3DPq&v$Yd#Y+u*>P;(2x=T_~y4J8ao}x!96yv`Cr9h5BW}K-rh$3=}c1O z1_$qf%QE;5Y8w$hc(?{6^_UIP?%IqO|Xjn^1Bka#FNQTkZK|GXI-B74hLKka0i;k z7pVnw@aO@^TuXu<+23pEoix_yhc9Bxcf;Q|c!jOI=exjlw9W!2Ro{#cH;3_agAkwV z9F}h|-|-;_x@Y2dbXoIR$=}|*`L{iYQQn*6NVydVd5;@EEO?s`vee>&Z#5i8O%duzFa-(i>G%ofhiAB@z` z>Fn}uMliH$wTTCCd*p<}oE@!&?Po$l z#b!GAsB1_K74}A%m9Byg$6QbNoN|8oM%i{qhhPc(6=))ZIS9(#!O`|xG zY%s{zcmn>-AGJfT!NFr%PEsmyJUpy70&7d*LA@nx{HPa>dz)+MdI0gn2V88jY1DXe zOP+uRffyOo9z3@uy66nbvS#O_erWlKkSB{|?^i&!M!%ER9?r5FqH(HV%K@CBdHM5X zc@cEft+U*w%=6KB>l6xL4|AHEA6G?8Y}9hTUg2S0q7a3fjBi-L_HWCL_Bh}Rft2-j zql6jzP!BESE}*-sp{a>FG_Px;GPi7_*6-J5Ej?##U577|Ui;KQlb*C$ua`hfXi5`- zG@yU|6{pp2R~CQK1J@may62FgEd7{fjpWrwna$p8b63p2=vJg5$6t8#XQ^E}pGc6s za7PEpP;4`m?ak1ekRwXYr+r=Qf)W0Db8rPoAjmj8S$-as{4NtcIgbj5QSh2ukXhSX z$^slMzta|6)owm-IAsMA=s2mm>1s6h0lFC=U>~`Wx_map<~`eaAN?*8?3}sJmGr(` zH~+UV-@NkG*4AqEzWH#rG%g5{IV!i%F_%0hrVW_HgNC-yeGxY4z>b&?Z*nsK!W(Y8X0Z+4yIwA<-5Mhh|Me8 zJ0b2NbK%HX!tX&;ju8?YHg%PavS~@rV z0Y)i)6YD;M#FOF|9DP`RvU%;BvQ(#ea#~Wr1EK^=1qwTRsAx|xIl`YbttqY>#~6>^ zHUaud{`QVG<=RG*K;Vb@<(4>^;9v9OeD(;6z28STicK5{PbuTOCF53dD*bIW$=w<_ zUtqaeUQ7^4gnHGm{1gYKN)G+CLLrc7H(+1rZu^xuNY4j2)z(ydQg4pfRlahcasG4;GWu$%4(J zi43KVHHMAM_GU~E(o%^t#60BoNi+m6y&<;97#lE3#iwjD^-U_=fJ9k2@%X}(4F$fD zEJ%$OQtolrk_W_{Y&x#qDi0Ys`i-)*g*F;svPiY(O1?PS3AV+ ze#P?;CRW8PwVx^(d|%j9IiMqU#r?Iz&X;zciV;2ei?5E`1J&f3UiqJ(4bEl1>0Pv_ z_!V~D(Ce-!O*Ovvk5_%)3}BoK32M*UW+s)S;65F+U}C-Havfcco9Bm=jhb515xe|= z8>PJScB=IG^@(lb9mdp=Q{|_0#~=7Nnpj_9Ar)Mp!-aFWMP0Q%WYAgowb><# zzMj2W6f60!d87JZc@pa9CV8nT6@(3=0hF1k&t~Ug!OrmwFd7D$oHs?Y*!&;9#P)^4 zA}V;TKJD)<1o+Lk-`rhM`sceQsvngIqjEBEMFs!RFJjHlS``4?m7&xAy7YG7)+UzE z5|8vze&bs{^qs%$bOxD|bDfa?lS3{tGRo+C^Bj3A$z9SV66v8%K1KkMf}_0Z{?k7a z%#UbB>9<7!Kc}iLnBI=vnf%JBHDXK-kkmbCH(PIvkn%Cor2glK*jC`}z2Rdf{$4%D z_+IrbKQ^PbelURbH(kA738DaF=4j1(;K)srY66-~owhy<^A+dSuzA1TKo2K0k~>*I zME{70PL5F&$C5hHM{w$nPKuJWOr>8wWRX0~8FW&-O-^p92T=)bXG1w9c`o zMyH8|hhCMTt`=BB)9eG=zfqDs)tU4 z@g6Jzo`Vypi@PPfuVq7+upBT+3r@}Me!mHBkg*(727MY}KXGhcXh3tJSA z7=XAWDlP|9M`1jwz%6!xyD2$Ks-DZ8vX4xPi(JgAZxt#*m@-==cxb;&+lvpwo6o18 zHk)s1B6EUC^Ko)`rLo^};`WE?OIt1szWs14@X_;!pe_f7=j5gh?O1n1= zkN7<^INr~T;z}QrT1%a0v7OMEm~0Wg$DK}*A;^usE-kF?(7<7F@CTj@stPq{sQEk} zrTGhfHZSk31&k$yYGFR4Vz2{*ivC4;wtFT1geRkX=&jDmDE2} z%+ua9Z@N?BE#2LpE98XszEA>dfA`+&xlnlB+GYa<uy=t>NZgIQVGpeJD)@`;UmVxROYliJRf9ec zfUXWHLUHv=A~_{#Tue~5l_t`FAWoz{Bs%?Yw3$I}EIdU;nsoE?$l+SAE7$Lzc!?GF zpi9daC|mum@hp!^`MGVsSyxw~m*jBRqSvPlmwKixV!W?nIAWtO`0?A3==;#xkoQSh z3ooG`w;zIl)=rC)5~eYx z1$9_YW9M0DBCIk)%)r!}K$oa!cVbr?+Vgg+4bK)NsAZmkFzm7<-{HI*$^~_h>tL==xu?pa|LS5#tzeE#gN&fjKZh9L@FYC zJ4TRm{&=~z+j5Z4z>)$$&j$`lWn6PFKCjlxX`{`c;p9wO-3+<(g^;G*p8BX|a&;BC zik;@6bv$0TDcsbQlOdxe1W`E|C>+6Y^;9|;)PWR5(87aGlq6|FFFOdf=O5(8R=M7y zT5Rb)(G^aKB)Ot3$Id@i~kx5 zLzz+;kZ$!~ZzAI?XT&xmL<hNt>i%BsjYKORE>$nDRa!V2 zYEjbZ@(sVL`a6XqOT;*3oJitExxv4g@Cg?eYeeh1X|{S>Y2Iyd@!K>lhy#PH>glMA8cd`vEBd@6%8`p2=F4J~(HSVNsjpq&z&Qu*U zKW^P2VD)my6O|)KzyqU*PzD__w8#Bahee%u;}Hi4>bbGR?C<%>WxPm#L|5mS`A3#v z>MV83A4(2~XFLyLC&#qiQ9@xMnxaV1!Y+S_&@6lWbPW^jk?|-P|6fH70lRp4w&k%zq9n|O3;K9D^4|cs z0CbA)j6X~Z>u+;HOQ>IhtinGB5y}YjHxU*V>RJk8A7d}Q@V8XQ?h2Y(l_Uu&k`C9& zIC@)2bVw+J6#5k!8Q!^hc+_sC4`KrCv0lGp85jU~d0|0Clz#4BcTQwk$j_>YmP`)2 z++LVbNkt;ek?TSJ8OcRzyifkqy|ZBhEcQp-P>NU%d=EZDsx%3sXm>DSm}QtN3Oh>u zwMkAOj%Vm&<*zb+0`)M_=Y1wHw12ak!G(F`Ei!z*h*DVfHeDs~h))e8@4b_`LgcPb z{})Gw(W{!fn@Wp#6~A!-dM&Jl5{qZ22It-cb5zh$Q|ii}&Lws-NG_?@PM~WokWJSZ z9)u*Eh&_}1w{0s3Y!EqxhU2s~?Su_JOa``VHlOqr-;ck|SK60IgeiCrM`Rlba6cN` zdY&~H_CMCn9rGorM6`v!jF1Q&iWY@tL}|3Zp*bi1)Q?4;>EYd;6F4vI6w^f(xgJNQ zestWmCA;p4uQiT*7t-d1sV5EimiBW+U~P|edr>5C8h@p$;%wQ+L<~Y*+wCKMf9cao zW=v*WM9ZaJ_?iCa0d^#vsGe)Q$}%`fWsv~tr{8U(8zT1*=x^^_s}okK=e_aS7C24T*30xR_ku4tO- zmq*B}E%!Di+Q+5=N4(XLy*XG{s4#eOvzKOK2oD ztIk8R1!!V@>HA5W!qJ=K3k0SPViGp_pSAdDO?lSSZ$ZAzuA8;#a|?60u5=zYq@Xv_ z=rwPJrE!e+%zgm-@M5r8;qJ&#;qJ^a4)vBy*R8F!Q)VQb=$4M0%2Tb8>OmX}yN==3 zv`m~rWX|Be241K)z;-z6ykd?IENLL z0h0dmCw%zSFBN z^~W$)K!59cFgohnsf63?ZPpcwqnTsr8FYv#pFawpDrQc^{3prm0H59C^zo+UkmZ(= z!|)Z-;S#c7+<03tpyaD*NX3a2M2p-~y_lFn!bI+=iWe?B0z+7eVk~bt^*M42UQv*} zL0XD3E5$Hwu-f9i&v?;*hsmj|*M*_Z%kOi*K+UUm96!T=S|p5L@_-!6!~$jyKlfTc zH^DPyq?{ep#6zD27XTonyVLsF{?z+^(clOi`-ra=ecgaTQ(s#yO-{toF#V%_`r}Ff zL6V(>m$BY!e|LhRmp}*I9bQ?a)oNOaBKNkI5kBo*3X{t$70hFWHco9sX8PE#6974= z@3gKvc~px|s4%||i@c=?x1|T+ZAM1-ig<{f4Tx=XPoCnt(3c>wM({BF*{*Jk_YEO7 zN&O>>(2uL{^44F#?ZY>vQ0rHo=7*bza*j`7**$1Nx!1)BFg9{FFlfs&6cMKtUj62v zjOkxv%(rWaKi6@(VaIz$ao7E3U3&l{_VdKeD-1=s54$n-BT>YdFc_uV>W&9^K5={z zjtd!zNwAW~vUu%SzCBrtkNbno$`X#dEKqW?q@Z_wyd&W=&x^u33r+<2{ZkG(k{H;U z)Kj4!H4uk8dsDItl0^7-qOz2E^L&Q9eFIG~L4LeABg=-!yh)U%M?=R(ko7q3Ja=~O)tr-96`jAK7~EVB5( zfvj)G=*62cpAAj%ce};e9YwSgoWPHcD(xMY@7#Q8pidgoKgLA>=5Txo7sbEBNf}US zbX)r6#ZzKYa`_pTx8XlX=ulH^f2h#aSrVaMsJg9sbX25pIvb-fb#jSvz^MCN+B8UW z4?GEdvI;d^hNwZdLKEO6SB0$~-2s7r8MD%eeQCA z5f8U_&E84-heUpEq04?|^?&On(9ZIC+oTLHbQkOG;TPbd=Qpd$ESAqgnXirqS;pckmBrMcf9k%m@XMA-O_FLkm!nxa`}Y#gkChwtlxN@ zi=kVkC9Q2+F!A5c&rM);rq_c^SOlLAz*EFTO8IQLiap~lW;5X8>~In5x$2P+-jlqM ziUZpQf~J>SGvnf#73e%HR=<{R9DH+e5p;URSD-pVm?7nI1mVq2JjN*>SLq)Kt~H!a zy_`RFPq%q;#3hPj+0S^?7UPe~X+5FTM3ftI4<1x;f%jr1&c5|SPq5tslEYf$wMR&F(;KRL*%fIqh@EM}Xoc$k^t+^7?-%ayA&d}cra<5m> zz(Q6oQCH0}j#dR^>uN7Y50sDK_Coyz7AOqK2&g{vJE?{t2DGev9Iv&S?=tGY$wPzoi{0D`)&2$?4-CvK% z@=l(UT}{KdeYQ~Gz688-5>eb0P^Pp3otI_A5Ki}r|HSd(tg=KmC%DhdmB742-|s6l zJ#_)2H+JiTrHs;#QhZD;LYv?x#XQryb%1nmh($Wsb&w@V+G%A1GPviJp#puUM26{4L-WPy(n<{XQvtGuS*pY)>3*ZAOWO7OPiv_#96by0aGk78aRjf znI$&flALsofc}f|QBrW*vMb@%#O1`9IW@C9l2W4?``!{xb?Q&3Uz6{18&Yn`ATFz{ z=66XU+awvL`w$mpp$BP)5AG(?$X~MPy`NGFK{lTwWKxH3uG!>^2PF=9robnzQ~n$A ziRo&dNVyrYjd!*dc1CPGz^)Vq>|)Kc*TC=cS;A!#*{1lu@wN<7dug}CK@UBCE?)h@ z1nxj@>fVHd>v9F_!&Qs=(#C?Zw#MoOp8LM-Et5hZlT(yK$u^~3Ep2EL=blcKCzRtQ z!IScq53Y7n7^|z9;{|ApeFicVb z9~R^j9~wD$?7;se@x;LSW{wh$tNZ}uO)FX8%^)ve;%IY@(&D+q34J8}cinI)?On6< z|05`0Mfk*C^ag6}a+{j^XkiCVhYF12U^rE_)Ig6S{(ERUTz2U{8IWLk7C~-y?oBwh zQ1t*lDO7{-XA=9fIP#$tRaH6$ZuhJAW{Hcj#ML_(lvQcK3v)M$s><@k1SCObwh}7?oo3{TL;)-D{GT0RU83}bxR_p8fREG6z4)$y z3%%i_PiEw$s3k_n-h?u5GD>Ifi`@$Zox~9{^~uv+4Y#>2@+_K zfT|3(!|WRle=6am`Lv*m-_*m|0 z@eh1A!8w#A$O?r=aQ)+XCorhM-CsX2IUdg6J}^Il{8VsvNY;S4@1JEPz<_PosDn`X1bcr4nR`fDA3Lb|60N*_F1Mavr|;h1Y=btq-h= zt`Q_AH>2W2jQ>*5Lk#+I=uz?|sK{azjpPm&Xy;Q5(*ILIBw6%7a|9rs-C**1>q(`` zkFk`uN`I_EC}v?NCt4u)t3hitMXUeS8cE2r+5dZ){dHUNk2u)D%quCv^+asdAIR4P zPr+{3*>`%-HsY8cjCuD+a;(Q;S9e$be@$F@JXGr&AIpu%mSh>4Xh9l^gsx?{A(WvB zWhbsJYZDQ3B$Tz>ELk#Tjjnwe#Gr-jyOBM+8Pi}G!x-~B?!ABf&gXMJ=a2XEKJWXy z=RD8zec$i%9Hp7x8@o~ui(Ou~Q59?;>hpD4w&3aZ>Zkf?-Vb3tfD@zK1c(8 zWv=>1tVX^Emvn$G$w*Mu9GG15#Rg^LY|#^X_Mv{gOC z5ZPw#aQL1nIu))!&zn{N-J)@Y zPRP~~$n@j;w$o(CF)%_o-s=G{Z({FH@a||ZbYm;9Bziy}X)5Bl^tvXN%l8ep4>Z^G zF*{vzXPU*C34`(*Xizk-tG(g$yU0dRt=) z8pJJLUuSBL??CnXdB8>}KGz+d12J%Ncu(7|W`ZWmPWO+k0cHVNQt*6&za+gQud6TF zm8X26J$uC3E_R?QjuDRv3*r>r9>CIsU?r{_4x)Q9!;_OuLCL7_J8V2B|JE~aFFx0@ z{)wU}pAfLdg#*vu@YfVkZ(^mXOYnt1G2l?q0!kgW3$!kH_~Mw=oM@nZ)HuH)8;kDA zQq*eQmj8Jdohf^r+UwAjFcW_Hz7~=@H~SWppiJ4Xfy9&N1LmHOKlbp3zfyE0sHwRH z>*)t0>c3xHNN-O?(R0dS@m8I|$@g`5lzIIse!F%TcwsE`G=Q9DqCtxjdGYIk;Ujy> zkqGC3$;s}RTrc-)3pXJ6Akxd-wnCO{O=BjP?=w}UrWTZq($A$&Z4Z0JN%yj@(Ja=X zRn%a;sSpGTvw!yR_R8pU?R<&N>-!pmp?9)0619b8_ZY2I^qn`cyswx67))nPnOXat zE&y+>Gg?8F2#aU4lQ8D-ZsRfyDbk$|h+Az*^k_hx+bkHqHHyYE1P{PsZ?u zna%c6jA^_xwX78DmRU_zT5g=?i;U5?G2z|j`3%<}>|`+hzR@>5hR`~L6# zjG+o#ii;s{#rP3V#@1pFA8TD@|xGr#g*!_xj z`bfTmBp(V7In%Cnt9`mOIuh)%{0f)owCLMNjx!B+z;HWb-Iw}+nN&jCqG$q@P;&?& zvG2H&C+lAAG_fo5H#g0TX*bV$05iT6_2?bg5ek&ukjbCTvbB=n;6l!l?MQ>8T>ROB zp2%jtvH|x>;82fmXxGCR!;Y} zNfhlLcLr*(`BZwJN-lJX?Fk#y!9)T^{(NMvaAq=FxJC9t+d*=_04zDA~$na zU8^6Rm0>Cy*cj$~pd;bzJ7RrR{s(oh&S9V4Lp6nciROETeL^y^jD*3qLIX+^Dv!u` zUdbRH2MY_^Uy4nV3Fadp(L1{}gxukh@dSy)5NR!@$C76l)c)T@kOp=k>(^#CMPDaq zaseDdsuH*4^lZh9MC+5AJ2j3Wg1&fxYDCtVB}$Bl63E}jajtQEEiZ&DR{}w3D3f>S zYx9zjp~kJ3JbyIStKNx3L&5ObA#-74RT2Jw{N=qmA43;=Gdvot^agC7b6_>_gg@or zV!z}+N4Wcm_Wa-=1`uveJ*hK;4|Nv+#k%-^6|&l$6E-mO>(o7*?9u$+k>`1YI*TJL z7+tUaFMk=wp&^s!u3yl)HN{a_5xeee$o@{azPaxH;sfbc2KsNjjx(|YT zihl3#C59-Yy;$AT?wfqH+?re4su4pCpbZy~3)s*=RL@roX1R3XD@z88EDubYSRt`l z?C4&KXiDftcx7Uk(wNTjPF$yPt}Ww2LO>#XXU}Q~Z=9P!>oSrpCc*SieSQISDs+qYz52X~jQb3hD16{MC9-wNwgns^dp%)pzV|L%WskxC7 zQKb$FuLGZYxMv$94V`pwtC3t=W;V@BQ<>k&3)@bs_jTydK?fs78V=G)S{^zVP0y{E zMh-vDv2|&Rw_5^Hp7rAFp0_J|a_0#?4@$;Ynx8_`}34{;`=s z!8yHjFVBSA9jfP^V?_P{-_^jBq|Ud3*SuQCt#bz=k4K3P+x?eg)X$y=TA7$?u`h0< z5N@*;F&8f}qPC1V{5H<>$ph!E`ug-J=-Jec#h(^)y6ha8qSpJtJnW%qJ5Ph?&D?^{|!2jzP>#l8BTTx=nwE@aR;6 z0f!5Bzb|H8q<$^GX0pcpp?-XiMrqPii9?bDeFp0;1TyQ=r_2zcfjCWUtuNw>xvTh- z{f@WYOvF7S_bVAYf*Ma+mA@HAJ(AT^`SWUlx6UU3?G{s5FyKB-isb2!Pfu8Pq_b_q z`&^@HR2!Q~>a&J8O-PHCjtW*>1!{8qJqQTp>fuBXHI7(lCM?+@&d!GuZL;TMNtkcX z1hl_522=OfgQ-g!v(Ge=FA6MoW2FhcKfe7?VTgvUkxh2|diTX|$AS2h(IJnZqVzTa zgfRl+KlLbdbuNzAcq>MSnX@2#dk(c@$_qSsm%lPk3g0e5S961CG}DYNByiOI?sbiQK@*h!$F@$R*aNaxzUz;xvbq`m1zgg4_e#FyDailvzM@wWcvnE zP+s*f&hh-X3qC{31;&3Lb|qQaP~4IYhrLE&|1L9Wn_}bxDRoj6Gu>R z+UQecj$HAs%6JEtiP}Fgk6woQG||t>@7bDNeWdG+%TK9EXsJyJ(ETyhhyh4mA7&te z*sqjG`+E~+CDxnXsE?^z#O-BaqENW5Q7FV{aDR}PRLXIq0B_mKU*?m3F}te4s%cu} zOwh5G)n#!6LCJn(vg)}OWulfvOs&y?f4t<~nC&&m`$G#-nC{Pcg|X!-8#yY~Uae%# zTMPFZlDr0Sbk5?~lwf0P0Z#8GhUYbH@?aN(d>IVZfdy)TxX)zoFDWxxDRMR^CEoWb zzck92p7(uQ7%2cz3L`|^65&&@jvlG7W%}gt2NzkG;7!Q71h%uN73Vwc8k$m4_^~VT z#`S`A9ex-O3sBKBoiHy4$T7bbS*@x z&6H6{*=`uRsdd5rVe^foK8}nmv3WCPNA4}oesbn~2z9jCQ;W#GyqT{e(U&do00+}E zPaHlS8vZjWV9MavYor^tTax4*yp*kU{(@wk$^}7eHe_!`5P=Ado>S+C6biF(p1#T{ f7(OP5fH+gRl-Jw_dNL;GA>d`CZ+g8{&oSbEZ&pUz delta 19534 zcmX_HWmp`s*2dl4tx&9JvEo+TDehhzN^u#S0>$0k-6`%AhXO?wcXwap+unPh@5k~GBw&#H_Q1XAi9>Fr#2Wk zxkPrj-!1Zue?6n+1-xnQHY{-+5+7c0I6l^I*6{dVtK)F|x_QZ?a3y&MSY_H7pw&sE`7cgg}wiIDq!c2aLRj zOuqiY@atSp6LDO0t&7 zF(=p(Y=rt)mQXel%Ask1q<3(AasGk%xxJ{L#rk$He_$R3dE|S%z!|`OhW-Wj`NxVC z60#}M3>7jJwfk>$3;d$+zhz$5Zd%@8UayQAz%9RfSx>mT_7dHXrXULEU;TBNmH$!X z)&Ed6wb-ObMP!vh68NfVU@&QW^~Kx!v*cN#x)S4)yT|k8@V!lMl@z{=r?8xlTctH@ zuCut%u~s9;z1c{;P~NxmH`_hM?a{rWSGT%*faC6?eaKAKOD4?svx9*8YB8*uG2#7H zkUrECCbxJ?5bZJ@gaC#}>^z1<-jAKGHEfK`=yZa^L#A9h0D<(|`PM-TOHriCbXDg>-tKW5Sj3)lcfe|zS}uf9+>0BcsevY_#`Wm^1>RAyHD%0SR&$E)eIBYW5Zd2~=j?6Lt zhNEFYOrp^3F7iM-y6kl9@sg``t0JYjQ0!a3DqW*Qh8+V4v6mlWEXVupFrVEdX<&iyk6^VIM zp$mi6v!VL_ny{(${6e_>YH|UjR}I}C5mhjs?L`zG@R%z9h-)K_zAM}5_gWe~?E(%~+Kml# z)-=Un3OjQ0hI3}^S0LZGWrSR}8`P`icGOjugSj1)yN{wN_YF_WwlB9-a*3LVa9>+Z zB#+?XK^}po1?9&0^i+bwLbqR*jnc6+e&iy37uJ{x{Z(ti`dt{`7hgv8=Y2tGBG#VQ zZ^NaIxpl%D1*Tr^>tg4L4#4_@-mfg?jFfu2T{n?RJd`_sPN9sfjLgPvALlV@53#B2 zPpr%hVwb9>`0yrc%EkK$;a9;|Me3~Kh?IM$9AJwVItm{?H36N%0V@ZycMu{HDFt2j z6#TiUBXooNB#lAmAn^re)d$o|zd(>GvPrR3Ub(Qz+QdJ${~O;rTehgxy_dh3LU7=X zd02C%$P9wZpwC9TeaC)r1b&c3uadcyH@IQfVjI6k{;MqSjNadoqyG<$nkCDDb5Dh6 z=L`q%Ng(FGPet;wf;SAljt}^knAv+_^b|g+eqi18RDur|pTG77!e=8*qz|r`MaO+GBug+vBzo_?*V^bU@US5SX+*TZem*q7 zXAzZ%5eY-B37WXqPa^Q!bnRwH$V8<65E(xbKlwRtV4t%41^A$QL$&}1$MD)ayOBTk zkDw}}wnk2x;Qd`eUR%wCLquj^|2@6DekcWiq3(B`-YvAtTVrwBebHtlxlCHTBK-T# zr`pc&=GKG)sGJYN_yfbg9cMqawtcSWcNvg(49e~d+a;v@?N3Y@r5~INM%dS%Z~BHD z{pgur$5B;Yv>f&x0fAmh_V{zk$FKdQnSM`)WZoxr`kuQ<24J;p?4De7$Lae}qZzN6 z-MD3~@yt&NX&?Mjs%0xXjZY2yL^xEqM7GV14&HxqS#@1_q)-8hAE2!5C6Z_v#4AG4D^j!6 zDnxhjUd1bX#V$u&{gRHb)rC~Vlo@1{qtlqfI_yQoE}?6ny{?6{9%%|vyG!xa3}bBy zvmp)Ev~jU+LueoF_=Kvv=__Mz%of0D+4UE~@XpYn;d$B-TNf@YNz#T44>c+NZ$)xMIo>i!vC3ihjW4hUZi;!C?zph#WBm&B?nNju{M8D< zZ0%!qMTgWu;zEJp6p{1fed}d?jb&#n3A|9zfpSwzq>ig={YX8L1Cg~xmD=J~+XuP# zz?dHg_vJ?afQW}~@&iN6Kb^Z-H%w9S?2(Jb`MFdd1v_BeS=7ujWSF_=f>6zsxmd3B z&xgOLM^%OjiH_tuc)13sZ|V31c+^x?^dE8_f{W%s$X;UQzVwTKVGT4`=TEEK4ue)N zR6Rue`oHBmdrpV)`b_Q5sVnbZ4pSlm9SFx=yw4Htqs=6_q-;o>lBIoX%6W-;@Vedk zEayM=#b*~Yek^Z~GK%sV?lpnTQRKG2DhIzhK7P`-tA2*iY6aOrF!=~{<*fJOTT=6=f63F%`$|u(a@IA!>yDzrJQHID zvE?Heb^j*&@c=QW#+g9T17PGo{{}Uc7}CxeU--x*C1<>6iNX2v0%$`0+*BcI)7Jod z*WmFIRUJ0+gm3>U{MnMspLlq#*2&pQb{`8e^I3--QuwU!WupkhIrTdi6cvM@4Y0bD z3q@BI+vq^3#6`JT5DHd0?^>zTf)6~L zbe(zHp;m8xISh-Arta{MdJ(s8zDm>(m_#Lrtgx}58EAHSDU4qF zdyV>)LP5-3^1Nb;PRMTfHdLo&F__j}I-djU^_s6a32c;C-uLgZ+1w76BpzzJcygJ5 zOoq!nc5@{qk>k>F`4dV*5Ie$m=YwwsCy`$wjh?rJK5@LLquwELe`PCI9gt5>`)78_ z;w~_6LTAvQ0V#C}#|<4h;}0mi&`IKT_l_6jwd3xz^8X=bZR+aFaRrgORp$0oF(o`p zJJ4Kbw<#3olP(S57g+u9+HuO;!p(HymqU56Q*Jtc%WlqTK`+ge-5E2182isp88b~* zt_iI%FLycca{gq}d%NLgNtR@pce2u!911P*j@Z$~ z;#$qk!9Z`0L&(|)NL48qp}KAm*;TUx@N1X25$b1tIBe{SXV>zGh}4nr`d6m zD9iQS(i+pRTqKH#U!nhe<jmO8L;hqduyQ&d#Ef;DOnHwQRn_4G)? zB?FtAdHDJHJ;1#==SehNy_~zcTHk!CjK_&0+c1fKk{?X7BhWg#oz&`dGER=BBvks) zg*W!{kQcJZw-JEV9>=cyzw8ZDvJ2tB+DPvH^O8DmX}hA)ix5^#PX=t zFn|-teaw>m)ZV*J0jG|12%|>8DhbwoM6C+M&+kaP4%jifsJ(XrKhLw_|JCr#Zu2GRCf7-?*i?agRyX! zC+D~6!W8N@4Z?qQ!p=%F@e2+iqVgE_c%9&`pFB4%ciChA{*2jP!&N+Ji7&nBnMz5y_lHJ?V*!r*p+R zCbduqsIhr>p*H@o{dL;*wzBQ)IP+lv;tYX!ckz)$S}@I(x)j9(20t+ zWKY#hii8g>-_(+mJ3US)?)6xv3u-5Dje8km%ve15&qj$B8PaB?}<{F`M z`w`SWRAiPXzaA5S#Sx34CX?-5jj1fMIy9>ke_LSybiEj`$G`k~X`oWk%uu?%5MJQcR8Uh^XHO3XY0xXZS zzU}bImBDrWJ>s#yIiA{i7nR@J|E>0ptTPM!Sm;a@O6{|$x@ATLvyk*!Usd(4=B2qA zgU4Z_dF$(qlu$RQ?O()+qv_Lz|KAUjhCZuQnZ1R@X6)qaYI_**Ymd&tz_8L zMu9+qGyjTLHrdnH>9)xphwEo~_X^2Wm>({nESyX@B#)Caj2{bEfEHiJtEEVChsxTD zRBt+>dE`%=oKhP)Au(B)FN_L3TqeuCPICdZz$rP^h3st}?B=TGfsEHNlz^K=j&6geQGDgh4ifp1!* ze`9j&`W1Sc(d;xxxX$#u%LGX(iflA>rvIz8Y_|z1$)%OIQ_ErHDN^7B*}kmA57# z!;j75(TEj?FqViwu(M}tPTeN$^_4bDo-T-$3rl>1NR|i*^Lb*UyJoSBq)v;)?-@H| z1hHNJs)&SD+r|uudX?SYZPtQW4jf@c@ET+i1TM0VA>Z{C ztaSnh&J+mpwmYu#ug|KkDcjp;E-!m5*Hz;oAq%*j8Gqfz3O1QOT(ko<-}w=&y)EUh!tW7Nb~Po0;8OvbF+I*ESHA<0W_qC|I(#Vk+oJI^ zmLKoau}?&wdcb?Bjxcw1-b3<>eH5E^D_uH+c&hm_NYt& z(jm8&!9PX8D|&mHJ~$D2r9Q+vG;ky1r9j1mj&Isml|Jz2Ce( zxYTiK@WI+R!&s&kJ5}Z+3px8mkHtz6_xZL4hZ>EsNUxRuLT(g)GO@BM^;++IT-aEGV`U9%y;N^4(pPOqunUpVuwj=$xi z*o7fs{Ow_^xH#O->$oannNrvsD~#L?Nxir;W)L;obf9zwvU*o}4Z=fLMQ=O1DMrw3 zB4G+(S6A-5%fiIg>H%5b9N*)+7GlA|IC23u_V2&3;$ifMrCQ^wKx+sMwcdb1RHwC# z%_wonTPE8qMEiJqd+XwlyBbuA6{HFay*(tEw)cBugau)^9n8`XZ4L6&ebM-v$b*4V z%q}WN7QfQTK6#>yx&;g3Ad8Huk;(R|CTCQnl`Vu-LNk>m)Jr{y#{ht}-NZu#X{8_6 zf6})s_0aqRVEXoj!%k$k3V;K$(VhMjL8KloYQA;<41?$0KXb5`#qy|>{a-YBJJj@k z4DEiD^&}}9*2630O;R8;6GUl6c%-%_Ap)NU@$Af*o8uu4aLk@PG|eGiwDhEDjh0mCX6 zLf7q!I~#lfd@fZPJqksnISxgfg8czc!Vrp~aL@B)-s*v>MscVNv3Yzn9Bq42DB6h2WNPe?DMc$3!TL_3W8n9LN047bpJ zdq82lFh~(cA@cC!Hkm+ssJ!s(Nc98;shx+jD!Ntwh-Mjp!%xh4)*yuyGds_1uPcIp7@}D7lev68!gG|%h=Qb zbs>2WC?Czl*J(J5gubS1sk4@vR*0^*jsUuqH2w{>_*l*RW0Jjxv)wBn&#hl_++Ay1 zuI62zLuxDu+xBVA>0bMHi0;{4(7H&<=>z`p3o{4&Dfz{W+C}7r80ze4*8cgXg84v! zz|zRIN+4QZevASjQ^|SaUtShqS6jUdHF*#+kp)pxv|!1EqB-tVwKN;I5=ew$SROZ% zw?>=y_(N-3zV7WCpC^0Giz7$j(C=cG-BIq=b?(zQN4ow|QI8Smu~?pQJ~G7t)LZ$g z2cn2?R?T8#30y3Dt`_*UTc~?k`v+?640SfI&K`MYm7_ObXN`SCQb;7W2GEcAS?uU# z5xH+FPIJ3z=oLb+@RBwpgx43ugP; z;oUjZ6jOy^jYqz zeYN52g|=QCAcYUzHrBi7Yv6DjjIf1K*Qg%1(N-}I1SbwB64Rq3%Z+eRm#)6z5b96k z`^_q{IfLZaUL#td0~P?RVosvLlSd4d$bI`o*_!F|#a&O@X>KAcW8)xtq@ymt_F6L( zjX2b#2bIlzz6KM7`7}?r)NId;7=0E&sfo)p{MzPvOf2Ar_U5^(G0Arwbh6l-gsYrB z_>4%gGcAE(y4rRtYI3KMG{z3+efQm%$lzU0(!<=sf@yl_xhs$g5#EDtWNvorvfI16)v^M&ZS8q2Ojk`^#5kRzSH(m`p zP=vt)u__<&LNV;OftsJrW2?6Vws8AK#vgOL&>x$_XNV+jlyNA(ZW9?MX)oh2+M#Wo z*m3u=oEZ?&(EyKaOZ|5mqp)f;JNh>`d)OP#%$?Y6L|z*B1 z2bzKovfW1pY&Am_WsOd^?}_Uejql#5oGIVE*9PafJ!t=&L`Po1_YV&J2ro6By9*!o zB)iu7rNV&Sq;*3}OHW3+-n%4{4DGDF2P2#vjl%nn#SI_g7`#H{%e{MS-_C84$|&Ix zD)F}Z2;eLV1u|UU^XBb!qqv53f*!o}W0b?m-O$1ciZa_Zg>h{%1V>nSbgI0N8oNho zEgBG#Aol19bgVHAhrId}arrDb!ICi}kLg5@DFIJ?v4LcUo1tbXST2CeXeC z$;b`9Ad|JJ;0e@kR_w+VAeo)BPL$(Qn1>z5w)4}`kc^+#H5&0kq#yK$i+6U9jFQh1Rj|0MbHV5|8+D z#~n%KL(BxQ&`z7R<=tC8A>uMBAVsW%@?C--#8!eAQSbeu`M3TTWQn z)%BNO{#e96`cCQTuFCBG?0MBmF1Rft+U(^(CvWSWyW{4h z!1?&msMZ+e+rx0Ddmm>*LRH3w$k+#rl~Yp;b|*K{VOv&B%77)P%edID?5&r@01p}( zk6p8vha>ab8P7xSeXkwdW)F1K#lSYtwzPLYUog}MF)R7{(#HTVR3pz55&Td44)6>Q zQ3sH$o)x<2coSs=IpgVWjS#e>LtsKoU=*lB+)>BiUA#26*R~THEJE>`*Y6W_)NRU| z9w@-rWU=Xl{4PN@BTK-&;mywsSZb<(XY7>vO0Tg2zCV_?wIvltIy&xr3O_<08(wzJ zfQ2O;Yft&s1Xi%~X1T%tdEY1V)mol9nC|VabgV^*$JriHl^zS`r(a-t8EaqFW=+fA z`lpH2wOMJoZi(Z^{rC?)&B??caa)V~E0|4IJW%6#NEe6|-uy>eYTU3s1I=mhAgy_* zfep?|!E&jC()BN;aPXd@y>ThMs%fLBC?F$2oCSQlC1hqzZ;JlbO#{cQ`zrWZu+ZW9 z0<(BDy1i^0i!$@yzCTG$7lo{Po%4PWAnUbsD&`2gqLCq?ZIMAiQ9;Q{ihY^h;FVb* z3Z<8f-bM{SZllFnU7ywiS~@3+Tben(|IQV>L!~!rS6-|jI!|)%?J*uFvB9fw^K42=&`r2Z?^P4E>kd{Z23L&tO{LEw8)XG-CcuNkI zZs$*8tI|*I3VjM6eX60nZ4ePX+Hy|N@(52&hyGN3NoRTb_sAMQc%xn;GgLSlK{#VK zYm(~;9A-xDj&TyLR;1D!x4hqr2vgQNelPo70(dkusve@C7Dp>cDCyHZ;gy4yc6vy? zHc4Z%fZ$E=NJkvHLfT62UK97vM*U_GPqgi}DUSRyEr+ZZ{x=2GVC&iL_ZV6Bc1A27 zt|jKmfA+#Ti_OrzL~V!%7u(lF|5|xQXZvPn@^6y?JTDAimztt1P|pvWau8;|$5jw2 z0O%^2oECDEgi7>whCNfj>-986ZFDq-L+9<^K(AgV4#t=2FhJ)EroKLsr$0OhK2xYD zdt0f2V;SCdExvMb=jutRH`xtZDzG;Q?6e^nR2J4o=9M@WDnhr!L%9QDRZe47Cg4Cn z?$Ue}7s}1jTlm9n{FRo;`+t#Iz>PmWJFopxboH{S#+Su$c`#Fg+J%o$u5R@${EMq~ zDc03yk-cD7-`2$l!Z5i5M+sxE&Uqv@rR}@Wzs7fpwP5lfEyJkGF?rm^jy)%Kgg175 zLsk=v1K+aeLrh$oi2SlL*}ZFjuT#DpPHbm&jM%`D=EBLu?{gVH+3nX3th9!Ug=F2j zwq0QqdNKygk`$7C$nT1-2$@7{&wWTV)dj&vC29Ed8KEl?$l_FFBPc!LvgUo!AKt)n zk7JCYBvDf8)}zmoS&#yl#ApI4$R&3plr>j+d7KNCX%lI0qp!UYXdRr;Nk<0T)m50V zLdOjl*49+JQ?LJCCcQSY2M_vWd@%B&oA^PbIqmiBs$hIv%k=Ke^!KxayYiwJn*xsp zW8i}5YUKR$ONFcxOb?YRkgOB;XY=3b1gPi|W=VA8akOQ8%p?=b(F*KUeP$IJ* zUD*JA`8D4lkFEi~^vXL)Nz?CEehWc1E^-{t-ME#6M#_LKCZWOOq1IH+4ok<8G6>4P5UlvzHS%)h*{6zn zT@qb$Z6BH?U1sQ6_>qQ5nW~(W^CL^s7gu2S7VaM3d$K5A2fgY$H+$u@)nqT6&~_9M zJfXOf0Jr)k=at=ys9@PtP$FnZbwgcp2Cm(UmCFR}j3mr9YgKB;HPs|~=jF;CMy5q` z%VDFuZuB+=!k@3fAJGHVwudxuU$$lv)wMj87+4jgVOpN; zk;ZG-)EQ@kg%={%D8$s}9cy`3@nv7sG1X4^;1X_7+CGIz+|y`~p@anY*~8=)q@H0l zCstq)g!f)f%%mKyH?rd7OL=*U=Zm-ext2DYd6P=FC!NZ@LG1XE!`?-toFb6a1}VnL zf1eT4hHQGZGomwJOC_dSo{ISWBKEJtcIC=i3y5zpUWZUCJ9PAG?Q+T17r9_gP(iNM zd+2kPE!e~TdbWFUu~una#)!+{e8Ct{j{Sc6h{3U{S}YXfCZnW&M7SQ(ueM)7n>I$4 zT0TW6pOqDnD9HBXk3)|RIaGl(4e^7na-60YeNa+8|~=%pjT!E7bB4(CNh5L1ws$TOH7LV3L&*O zWj5_$GzU?o-3*{LuFeD-4R^@8V|zKm_eWIayBbJ^$y=JB-0_D*!H(Kt zRess79W_hsxt+76p1+W4^S(NpfQ9iUeWc(@dLsYgsFk{k&#aj^C;VkDMHSVvUdnT} z;^@o!-p~W%8tv)_Kvh*nqXNg^vNJ@^Xk8rHoBg)1Q+!J+-R6ZL&EU*rJ1`=z)UbB# z4{E{^)&j1GBpt|8&cx_W%B$_-mSFRgW#!dQK#(+wKvEd1t^^4z`JL|2p4Y@tfHJBW z?;DSJm@78|snsR<1^BwBp z6ULfj8fb8wu<(@7vKwc&8zg%eL?N|TI%~Yj=Mq@E@q35iw*s4sfStc_;+HW$>IDuL zAW>t`1~esYscg0QqBY{OM0ldr_PmdmTgyS07Lij8es)wk>s_;iiNixwLr-eq zJ?dwfzN+yHD5#DX3cqKsaXR-lEyZItJ&}w(#uF2OPSg)l#fZm82##5(F_ws@fXyK08{$FAb(r9`qU&6$va>cRGQ=Z8X zL9aNq1uy&Ep6ug6gm6I_*D8kO+*hu2xjc9oNNplI3q({G+u-psz6=0yIJBYYd5Y37 za9At5#jn3)(BOy+$>y2p4*8{u7-6jOgG`Y0C1?VYDtHN3FaDDAzk%Iexo6a!-re*j zNd2aUMKDdpl9w58Oeu2x0_EdzhYU|C za5JlwWZ@0U=|b!Ykj~B^cwLrv4;|`$o3Y|M-P!hN3w#tg$wj6sab4C~R{;4vbWwV4 z=5)ppC*;*VKIlsQ$A$@*mll%rOYD&VSw=r`|m4P6~SY$nJYBis5=Z&U44@8L59l z!J&c`Td9xz18wTBwOVh=5$}eB2D^~tFNw72$=FwM9+}u;MuXMYQ*k9LW#oiVL+t1s z_}&0R565Z=+kP=xf|K##ybflpk#FNs7)UK+BEku#cBV5%LK98JVH9E;!Gobzz-gur z{oG>emhdLtdMRx*f+2|XdOjaoxsl}lGGip-akgK7hpGFEsf3(P;g=wF?(kKP@^`$1 zvp4J=Y;^pG-%3uV341J>C3s~2RAKlg`nJjDoKr{G`D6vP6b^YN@-x$z6A zpmF@STT_$66Inw|jI|L$8?n`Bf>TQdW;Uk(ERXK3zV8Pw4VZFhk~{NR zTEPt06R~t0;d+eOyC6UtPK8IxcOIL9c$n9624wkZ={^W`;Ew%tp1TtE127{37UZ{X zFZhwL=?!s*v82qEMU&q2ztamxoKwzi)r5s(_qgr@e~h}*&k5WDsc+0*D?)IJ*r_8p z|A9CakyZ>PfDRp!nQn4*_1{QvToVUnyXi0NzLurHURatUxt^HL3WV}@Nq8XJtNPJFjJ8nXt44_P6jE32?Ndc{J2>iwMK#WFYZt>P8w#d-`NYp znaL})1-(V(J{4Y3O66@OjND_|Y!(!vD#ccGYqmZFdx;4pzOh$3EcVQ^m_47$-g~1@ zU!Cvs=V;3q4xL`ZQ~gGsI>k2MWoP;uP4JUH-G*3tIb5>wKhTNN{f&Mvsxs@b)`h)<*=iq zjx&}33V2fg+VT6krVJ?rH5Q7OF??Q|3S9wra`A!c^t6m=G0sQ|srQ_8Y9}@fh}e}I zCz=~HYsCSU1<0cX?2xox2Cw~tH@)6jhxBq=ks?WMP!M*p2P};3ZftGPkcX#{urSAU zI30ZcA&FSL8HHJI5T4ao;NA<%>ry+sNBcUG*X?7}JK}Rw-d$*)gU6tvEc|G`RC1`^ z`^>BaK1u3$1A#dXhDd)s9aX$sOl0sv@}gt1^jW~pzWw#y#6M_2IqoaLpK#)A{H0Qf`ovw0h(mi%ZlhYOBNH8R zUs+@Oyz^$h(IN{3Sfkn?kO$ORkz!&9Brm6vm_`qr*}?XU%4~9rOCJPOJOj*s1aqbT zI=hByCCC;pBt)`fGBltNXxbwe1wLvqToN~Kq9b{T{!+ zbS9&u#J-|PH^=uizLKvcWI%mW$QrnNl!sELqUiMWiUDbr^8Gp?+=V8#Tv$XIPFf7d zpvd5i!6+EI_khQV_wI3!paHPf7{nY;ur@mPK6Hxg?n1>xfgozO6&m_!=4@70hE(r; zZQ*BqT`F=Sc6|E79=%AXqR4HJ7i*3&nluG34R)plnvs^8_Isv7+w z?U4E}jScjrsb;&0nG^76l=g3h5b%E^T$TgH1gf1P#vG3V4}@x{ z=bNJdbluzd>C3bAk-Uxxy|db6i4WrrPLABZk@McnwuCgJgjSHt9Nv|#)Tc*EE6?F_ z@!O*+>Br3)V9g5;(f95%;CuJT_T)UIV?Kx)3OUO%-dJwY-Tq9-MLsNMCiT0nAk=9& zGwtShAtrhf;{$Uj))H^=@uG~@)l;BAhfO+c^5Kgtn(((n<0niGkK@}}V$bP!L}k?1 zFul=LQGx^lWbINLD6MU~jj>F78xlbZmjLmJ~xZ0}IBqu(92 zBK6Cl@`+BMIwq8+TbHqly|!Y0>y7uQbRmDbKh0vTtixP%7fUnqtCWX z(qirn0aVH9x)O?Y)N!eGMAePX39|aby;y5xB3W7Fh8hZ9zDCX48?6_YHRyR=y#t*3 z@k+kQT}T}nt4Z}2tY47(E<=%k?~U%pIt0bmI3GK%qhXTX&X6Khi?qG$O~h5Ap6}o1 zk9QY;!{fpD?VoA^g)^+=>Re(8eeGx3Px|CQM8pxv&m77O-@J;f_U)kZS7VE-ipT*x zErNI}QcI1<)30M5?76?Uy{>jr!dI+1tMa`wRes&w8)r$F?}Bryt1%AcKG=co_9&uD z$G`82kQjD6a06%)b!EH#VTR;7Pog#BZ)wso`==sd=cG56w+XoXTtLF)Gh*_5j)xBv zcT<#t;FavT2HJvX8^V;JVC3-I9dzMpxQUmL120QgSO&p*lnC>ud|QLS?*@g(rs?lP ztz#8vWoSD_e&a+dDjEpJM;2ZgAz|Jg`+ck4fD#6%i~{g<;VU#>UGmB`mTq{0K^f5|VZO3~tYw~08vORtTJTBQ9&z6F=3zhrR z8_DesCBMaedF?$mVMYtE548*Eu#)dr8`>G zN5{tzz-Ys9+rjg_-79xe!OnT$;L$O=0=M1L@f}a_{$(lh_~)bUo2RYzJ>_~3Bw}92{Ga%fVnTenGu+?pt%MT8JTaOeA3CD8edJv zcZ1j-592FU`rxr5zeRkbw4tVM{ZYs-LTpp@R_QjX$V}Mtt!K$p;bR`W&e-@%#Ad(p ze&xG+sE14FGw-q~VJi_Cjyo4}qcczZ(VH%-hvRE41Ed~eMP5t$irbA>x~l7!?R}u8 zjh)5EsDZNZ3%GZCOsIxk9R6TH0?jg~I~byN&%#!dQ4pVsP++ui&HS`A?z? zx6Jz;C>A$8m{8NtTPEWIN06wM3*fz`$_6$$O8rO9t+DPPUJt_wZ?^~02L8CGbmz+U z9li}vcNf&mIm>d}(T8LYo9_FH1C+gT-Xr#N-tR|fF@&r%rhy|nM<6jL{5fOlGe+?K zi*wf-Awi2k;4u8`;odN0(X8E=D;nyEVc-Mw~rk=FTG*GYjmuRF!8wl&`DD~Os-X87lZ(Nau6(gy&f8=8Y zeEY)?rgnn3o&4=AWbx-wTQJHrpZpa>fpScaVuZ2A?9c1P$VCFvRz^1qRyl9^l=L67 z&X9z;No|j3`{tT;ErFpR0utL}&x?HJi(b;Rz1~RSxaEaE1$X^@6(-$@&lSfh4h2Og z*G!AAey~svYguN{tw$@jTxY!g6_W<%sAC%Y)%W-R7^an#@w9b>@Z7rI?otVSAVuM! z4F9jPo_hulGx8(?h9>_3n{CK{qIun3cehraNRVRs`Ds{e?gVEM$A5r?023Y1p;TO3 z=o&BmU$8FBujysHO7G>CbXN_E6>s+0wJGZt|MRwEqWo+hs)b|S|075|?Izr@ z_Tg<}BbANqrho2k>y5V`6V;)j)p6|w_r32Hsr7K_1;j;&H9ZacFFcc3FdvT#CLdTc z_5gZ&WT3FB!rmW(=iy9YA?D}?bJ@}=6=;6WrVdfo-Qqd)%DzC5378V8(khft4)2al z2ET_?-PvndnAjT6RwUKUvaKjvD~~HW9m<3EK22n`2iAx(fxvH1nb+JNLIpx!kn`G! z3HT`0*n|7(t!H64(cFl<1gTi>$P-^;wj<*MbSbG2zwNK`N1yb))$!uT^*rmfiPvWF zLGu88jfs8f1Qjt2KtWEDAkx}z5k8=HFo6DY zOB6aab6Hr5RZ*Z>CBK%k*$^FEv?l^J58V$1g)a9mseIDmptc^pk^>)TS* z`4cE*^@(*m^lm?=%;R5k!ME8+*8_6SN3dA;PJW`BUkO{GW$u~@fsRVu?+)$Xry_mI zYII5O zvVXqc)iL2+0rA>{^BWpU2$|ncVge5mA_|bR9J7%>)O?_hY_}^{JAejb?6%FduIEj} z!YtjNoEf2^dttn1H} zZYcF-OWnpx>%|Rk9sK7#(C$3?Zaj6egzmH4(-&Y)WT}F4mhKW1}5P!5R)TkK3^kUhs6N|AP`boUv zxt}HKfc?k*zk?~IKpw_Oc`>Kjhm_>A36A#vI(@b80;Wq}ARVktO@{4p%ZRmR|JTHo zheO$R@v$!@*`jzw8=qpz){H$0mA6u9ESVv^GGQ9~(s(G7vKAE~rerT;n}lJ|Lb4B8 zOK-?Bn6XV}{~mqscYWV;UH4zl{XF-%&UNnJIp;p-ceB(y2$_L)5}^Jv_o{#MIlD!G zIX(4ZMi-KcYYPl~TL&%94N9cYU(~ooVp;vA5q7~$sh3LvZXI<>lq&U`FtY;ZyOl>Y z)Q?U!e;3BU1E%e;d9^=Vn{3UqG-rUBqr=hZ{gb3+#M#5k~pv!CgLTC@?kbZXBJw zB08n*nxq};ID#m_nFjz)Yb;1i?zN@8n?Pw4C{TM`ewoDBY9J*n+D&JofZlcI;*9`4 zyFx2TAN7Ve9EcHNOs&`A@MDN%TqwWQaA;*FcQ_iKWF7C-bIJ|oZ|S^-BC?HUU+Cr? z6~fY_KQghqSNdIdaYOT<*4^D-qwU~g_DTegRvpFASFXa_DfH&_0qypfn~i|hQu&lV zzEnjYJUk5i2`=Te$w==y6-b#7c230|jPaaxDp~q2&qyOO=>rNA59Cu>b$)liU)JJ}E{s;j7zOKHm1!BV(9;4+QV>^$h3AFCY=VQIXkC6J@hGXwIxo^6j)zKf zS|bW`?cmG;jT(ru8{rNfC{dKt9*(JhlYr?iSgkihfV1 z<0WHoKY@#%IT6!g&KsR)%^GKd0_(%gW}h`Z5i9jVNl=cN=4%bUmN1<0?L7*PN)T6z zxQn~l4!Ls)P(i-JoB{R)Wv|(JJACO|$S8Dnw)iSXI@E!*2$XMJTLRUtT8uPH$MS^6 zRE7boG5xoK!6XUB*b;`-o(i^7U4p8&cu^uhr`41vEJfF{XhT)>rNhR81$N|{)24!; z9$J%CmUAts_QGUe3&J8uGnV3iW2J$nz$E!Q>!)G(1+**=uP_T)`z>fhEg>OW%>bE8 z`QgA=f6%z8?!$3)lS)ncdv6d4GZOa3z>ZJmF0&3puTQ__&5uyeR2Sf#14KwT_Ue}g z!Rq^u=OF2{*<&+S&ip;^KZf1Ul7Fr-^)Y3tth_=xU#@D*9S?3M3Ur)k?5WsBX0l*w>$Z{VwBt)5bWFT+ikAw~z1 z)#@x0$T+pnz-$02NS@2K*~#%X0Qj6QWaEmr-no>Dt&-ZNs5xPp9Z9AeJ-}}A+}l_1 z^}Q@k3^0r(3ywxi?u0GKGJec94yeE)gz1Y{Gu~L-WW-;HW(P#1*k+spf_P?njl!wf z!c^aPauQK5E`b`P(@j$M?^th3%l`2}&>rUzQ+<}KFJ>o|?y6HO0lJcbo6A}45_exF z{1JY)j=Ws-4*sL1A|RGl@h2uid^O7a#P3*-c1$tfHBRUKSS@c-^EYaZC_^6O3)hD&fomv;>!||BmH(`d3?iQ zQnL*4Kc&a7lCQViA21hp55#{(O}*5YNmn~3r`5y>jemo`+GTz9h+WD;5-rSoX`DPN z?(tsoaER%V7(KaxEeAT#p=D9%p+fQ>8{DH~-5>+%-dpbRW=Q6f|7$lna90N&r9v`@;%pe+7T(~o=QxD~1W+OQeImZ0$i z&$JZql0HtYWjr5y&`^h&<-V2~U1f+v1e|bpRW5Go_C2wCbMZ^4OF3HPt^=kfF48mfhB49 z{K-&WL5GbB;23!-(wuNDrlrJS51tnk6APvk#i&xeh7PAt{=)|GFMjkL9{L;583x}s z@rUER3+IH;uU`Mkltr#ffyu}%b@H6T^YPYAw7Uu9H9+<&;u zyZQxE1@JTK{FrRgC8-7lO`|+*Wfy3{l}07xIIvZ-UKo|2`wV)%^WR=ztV_;{yNBjH z3;!nMG2O8@zB##Uaw{0{lf+ha8If#Dr?b;-D2dPeuUF3nrsiLxe!{CufmZ=p-*4Nt zp!ZKj`?o>6B<~rj8(*OQ><&ADwM|*b38rk>M#kMo6uBH@5_o}0cTRw&ZE~f`v9?ZC z-@%e*c(Iq**KI}p*MkVZS74$;lpHdeER_K#K*{Fb3*Y--@jO~;Y%5OtFB#Uw38c^P zx)XP7H{qo3oj1v}EfCTdoeQ_*XJ1|IL@z(1lVV;%Zsf@xWTnH3qvzNAef{mmMFEx+;JV%YVo)w- z7?>{3d8z*WkRh_*hU}2OaU%l6mX`AvoJuSaU>c@cym3qdV-%@_>Bvg<6Xi|5tffp# zE))brU~bGOXqmD73w>}dgpzKm743$z|hRjs<>QJP!epawYxf!iTWLQXj>{*nGz zs5JcMp}|78w7$caok|<1c;W-{A!FSq=>kk=@$`JZs_B~#9CqmRh#AD`&=sqi`8A99 zi(W4U@=m!2(5re0J0SM&EeJ29B_aHDlJG^eX;Yg%7wLa|lvi1ufLvvXX_Q~q0@h)P zm(j^wt6Mn~CZpc+z%7X4znTuM!{lvi_sYMw{TH#>OGng*F@Y+Fh8AurSo}@-r zjnK3KaJEj*4K8P8{)jDVx5c#Z From e7b4049ebcebf8abc1a814619608621f91abf399 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:33:10 +0000 Subject: [PATCH 42/44] Automatic changelog generation for PR #23168 [ci skip] --- html/changelogs/AutoChangeLog-pr-23168.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23168.yml diff --git a/html/changelogs/AutoChangeLog-pr-23168.yml b/html/changelogs/AutoChangeLog-pr-23168.yml new file mode 100644 index 00000000000..b51a2df26af --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23168.yml @@ -0,0 +1,4 @@ +author: "bgobandit" +delete-after: True +changes: + - rscadd: "Nanotrasen supports the arts. We now offer picture frames!" From d45092eb8a5574906d906009516829be4714f33e Mon Sep 17 00:00:00 2001 From: Militaires Date: Mon, 30 Jan 2017 23:35:46 +0300 Subject: [PATCH 43/44] VROOM (#23311) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🆑 BASILMAN YOUR MAIN MAN add: Added BM SPEEDWAGON THE BEST (AND ONLY) SPACE CAR ON THE MARKET. /🆑 I PRESENT THE BM SPEEDWAGON THE FRONTIER IN VEHICLE TECHNOLOGY, DRIVE ON THE PURE POWER OF THE STARS, RUN PEOPLE OVER, MOVE REALLY FAST DOWN THE HALL, PICK UP HOES* this is intended for wizards at some point but ill leave that for another pr because i fear the balance meme flocks. this was fun to make, and hopefully fun to watch operate. eliminates #23170 --- code/datums/riding.dm | 23 ++++++++++++++++++++++- code/modules/vehicles/speedbike.dm | 25 +++++++++++++++++++++++++ icons/obj/bike.dmi | Bin 3214 -> 5647 bytes 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/code/datums/riding.dm b/code/datums/riding.dm index e169e4046c4..ec6db9deb99 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -230,6 +230,27 @@ buckled_mob.pixel_x = 10 buckled_mob.pixel_y = 5 +//SPEEDUWAGON + +/datum/riding/space/speedbike/speedwagon/handle_vehicle_offsets() + if(ridden.has_buckled_mobs()) + for(var/m in ridden.buckled_mobs) + var/mob/living/buckled_mob = m + buckled_mob.setDir(ridden.dir) + switch(ridden.dir) + if(NORTH) + buckled_mob.pixel_x = -5 + buckled_mob.pixel_y = -5 + if(SOUTH) + buckled_mob.pixel_x = 5 + buckled_mob.pixel_y = 3 + if(EAST) + buckled_mob.pixel_x = -8 + buckled_mob.pixel_y = 5 + if(WEST) + buckled_mob.pixel_x = 8 + buckled_mob.pixel_y = 5 + ///////////////BOATS//////////// /datum/riding/boat keytype = /obj/item/weapon/oar @@ -275,4 +296,4 @@ handle_vehicle_layer() handle_vehicle_offsets() else - user << "You'll need something to guide the [ridden.name]." \ No newline at end of file + user << "You'll need something to guide the [ridden.name]." diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm index 24c6ecbec74..020369b2ace 100644 --- a/code/modules/vehicles/speedbike.dm +++ b/code/modules/vehicles/speedbike.dm @@ -35,3 +35,28 @@ /obj/vehicle/space/speedbike/red icon_state = "speedbike_red" overlay_state = "cover_red" + +//BM SPEEDWAGON + +/obj/vehicle/space/speedbike/speedwagon + name = "BM Speedwagon" + desc = "Push it to the limit, walk along the razor's edge." + icon = 'icons/obj/bike.dmi' + icon_state = "speedwagon" + layer = LYING_MOB_LAYER + overlay_state = "speedwagon_cover" + +/obj/vehicle/space/speedbike/speedwagon/Bump(mob/living/A) + . = ..() + if(A.density && has_buckled_mobs() && (istype(A, /mob/living/carbon/human) && has_buckled_mobs())) + var/atom/throw_target = get_edge_target_turf(A, pick(cardinal)) + A.throw_at(throw_target, 4, 3) + A.Weaken(5) + A.adjustStaminaLoss(30) + A.apply_damage(rand(20,35), BRUTE) + visible_message("[src] crashes into [A]!") + playsound(src, 'sound/effects/bang.ogg', 50, 1) + +/obj/vehicle/space/speedbike/speedwagon/buckle_mob(mob/living/M, force = 0, check_loc = 1) + . = ..() + riding_datum = new/datum/riding/space/speedbike/speedwagon diff --git a/icons/obj/bike.dmi b/icons/obj/bike.dmi index db4cb6d1aa08a08b505c8d2a3d094d6062d1f562..aa6cbfc30a2799c869f3cc81182ea892256793b8 100644 GIT binary patch literal 5647 zcma)Ac{J4D`+v`dhL|wf!X(RNWUNtS##Xk*E=prd5oNEeGj?gQFNLV=5+!Tdl3fw9 zlrr`$3L|1>-d~^Z_xJss-=DwdoO|wlJ@>iyJkRUgbMNciyJnY=gwNznoEYCs-zbOay8>s13D$@+IZWn!u7B_&SD4@ndXrJ|xDH8pj7e0)E1b8~Z7 zS63Ms8SC&F&Hcp?e+!Z&K%5`Dx(`x=tZe=DT>V^p-M#(Yy>0@)ooq`RZ{L7zx~2E} z)~u}Y3E5A5{g##13ZIo}({lYL$GZXFK9f3iWeepYWg|@Xbn=H}D~x4H9Y$4E>bSCo zs@Cx$73;hAl%=YQ1@p7+DVJjv)zBYKekgp0RgKPDo(;+Ki&GYSmMW;*O2V3&^!Fdr zcGnyWu@_E7+cWK3TG@fAn~tmPy3n5hz<ShvyxKJ0PQ(ZU?)scaT>b zZdT|QKQP}We|!6l<=G5oG%WOSa{b!W(ZOtvJw_|ZWK*~m+Ik}wPW>NS%?g<;^jULF zL_*8vn<)NQ!hgeVEK@2k#%Q78ot-B+nB9lmoJ~-`6BBkWg-p@Ns~vErCEM@e#5~HM zNQ%-HMO|d^^pR|3>Ovu0l&C>vl>lxA-ZUW64>E9{X3wUsc9)h5(Wa@HQ2m7R3|ZWH zqAh`OKsXH!iIIjgd9JaXr*cCDCH~{&f(Xx=LZI5S*EqbV_U@$|XPtDLsKpX7aSS=Y z_Ys7CnDZyQd`wpYY*q;qd_IYmZ^HG>)(>u+RY;{m-1_r28B6F0@++|)z0E!gAEftj2qdLU_x|R{F z&IDa4j=wNsmpC9iC*A|-wiW!AnLo!DY=ecVbWx&3TN93Q)P~1MaRfi@CK{tQdE^x+ z6Kuk>;z5!y1I_2WQRtmTw>+HUd@fX_n*a|h;-Vc#slW{0KYyOc#fSN=aSiB)r7#TR zbWd>sum)EHlfzJeSILZ;NZ^`Qpa>2K%_X4Y;On;U2jj%$;0LA%RUM(6IMjjZSMcYI z1t5|3R1gY$JnJi|nPWm?M|yJu2gKr!0t23s=P=vda4hQiOLfmcA>x==)|+3KjD5wD z$L~iiT>U$PR1Zh1XJ?j2)vFjLLV4%QloYZZnp~eysaZTQtpm@4?M=lTC06{EuvTWWS!$3CQe!PN4(vQmK&$v zr;GZ~M#qir<0=oeQs=zF0@FX5_4#7!@IXRBIdJg^m%=H*DF-q+o|3Zk=2%3F*W>lb z1hY>vb#>}mO?8#^!~uqPYWI`^;oX&IlqB~Hz$q;;O)FDuUFJv69XnCf7Y)pcaUrdeeX6H?qx;hC&knJokA`w*jW8`A=;8dz4Md{FFx(;u;z@xSw zD<9sKFS~!{7pH#>?YKuCikcC`#0|+HVp6KA?&^6)P!@CsQK+aWe>wji9Y=3r(|V2@ z8@1edLC#Oez49+%uoD?L#~wfjAtstOxCP0Ky3dsA7r2oJ6(YJdU6da$(1JegnQtUe zg)?F*ogY=E1=QP<%YC!T-R-^rWk0Z9W*06PU%AtBNOn~`7*_1(lbkzsthWqDV{g{o zm`NZEs(|g)UH&;`ryg!z42pEqg%L5l5A3q4`|ztagE#w%OzYIxBg(8f7>Sa)W5@w% z%GV#;0z-Ul#{Sjvhhj9n%+=HYRKxc&^rH$L-+*AwHjawv%D#xB_P^WpLJFck*eGPy zH#SO4T_*wJsV5&zP7EYiEE?e>fX&!R;lPE#*YyVWn-T$k*bF>LH*elVIdNpQmf?&P zB=dA&dR=^%tY~eAkIu1s+=#OljX`DhO&uGXt}a4_G;tojM_a2}&oQ#8J?{2H`X~yf zUHtY`YX6C!${Drl{JK+Gs*@6tHXmYtxt7Pp@y5ulop4Z3ixg@7{yhV;<9l0;gF1fm zDk%|$Urod?Pu6gkXE&R&2I9wm%GqF ztu5FNb!0C*1nXd5^u_PLy8mmDi6T9=JwXbgi%_bJCHsKw9pd_x>wd)bmO0>J59Cei zmV2Xa2F&gFim?dy7}maIX<}&Mtgnovbw+Bx3D7(Y^z``&+8hkLa z>2CH_dQ^uLe$WhPS$F&PlvE$y1fI9J#buHPP;8rrkS- z%v7S9g?Dxq_`?9{qb`*0O?{DKA{**)MY{2yV&ibLxsVGKKvnEPSG;S7jm0OvE|xpp%_Jw*k4;Ex9Q?JAODS|`Wf{NTe%t@$NM|6v zQTxqP2qy6-m~nJMg1APB166|6aa$l?LhQkd3~=lvtPH;ZZujDwe^1K|_fE6Ok3UTM zQF1TGW_qwWAz2g%NQ~CJHBGVQ(`G{2A)ObdK$-Fg3mE2(I9#X&Q;q1}La?9wbD+q^~h}%3yA1^1ru$`0{#vM3X!NytPEJ zMMEHiEK%S{J~(-Eb*~3P2iBf~4*kFxp}d~G?N6XrCo9$!0nM9Ue;&FCeyb04FmC|1 zKY|svsh){tDzmd+mBHqmJ@NFY&JwneG`iM~IJaQ#Cc)qL|7*(^nY-Y@%ZoO;Oi=UK zrm~DmBeDcGfLYxRx&X2$x&l+%!}M8DEe8LL`G}Mo;+xYb%;1~ z>2m_$*w3RY2x}#acPfTZ&k#_Bt)Mq{`EQb58~fNVW{-;?bZZHWrL&n<3Q#9rrHFAV zAuGQc3D|!;P=~>R1gDCk74TXT!SLJdOK<(HdO4QctJgu!Ob6pK@TueqV?lDRIl4#@ zqy225&t(oQTBcxCt3HWKMB!efl5P{_#*l~4-^3AzO;)~c7px-x@;Tj@EKCL+MhE|Z zE9`lJtl$Mu0BBx1fKn0pw6rT;sPu_4$pGab%ip%`Jo*`647>L}cHHJC)z@)hikKeT!K6c=QG?j7$O_gCfhH&{`92^H*Quay1~J{-olQI7OxUJ8hM6Z$CE#QO!H@uH;-z9>6jQG>?*(VjbI_h?6B`HxOpx_!70 z!^%wVfxawG;VENA(ol>~dbh#w$}2@Dy1G$>J7VJ~#eAGt`x=@OfNr_A(|s3epTLW$ zXi*P4#A{f@C-{B@$={PSGj!G=+=srgyM^A`+H%#EI#2U(bU|q8q-+H>jx!d_M|N6IvmW*1Tg-X)8={qf8M9XcWUrX0c!Z;_*Vky(kj4}Rgb!E zp!4+M!+Oh^9&hO+nSZJy<;>O7WqzUH3hRso{wzQP>+yU2vEvWM3_W z;N?u+*g3M|?ag!}T*IPUE}?G1zCmg{VViqLzVh@1M1BRDG}}67GkT&N5zV6&{e|$m zJs%b6ZpuI^XH3qaB$*HN;(!3S=HmgS^dE1Y2!sX3Y|pg`qh8ojoD@wUrTaQHADGLL zFCzv*fsj&-Bj{H{@3(;QyG|dGDo1UrnaUN!>a40{)j|Q8pV?hF4a9p=PdA^ph)pn2 zh4

    84$m@d?Tx60U2Q$1W$7Cv3$Vbg2Uy*%7Dn5ow}=o2s@C#4CtTTxQy}1JIe+b&m$3 zWwC8I$L|tGK>F8$pi*F`dYEKh3XCoTINShZI$!R_OC+ZL)HKhJch||mDC_`^=36tfG}%OOq_>*7-o2O!xY` znQ5KarU=c35zJDSb%%5x$sXZIK<^;;I_mP`C&b4dI4gy#r7nEV(9{SzXf;&Zg4o*| zy%n}Bq8&g@3x-r7LqfwslLkpXX^@R}RM4L2R)@p1^Zi21apKNz8#zft-SyDIi0@Jj z^Jv=yWB;6G=M2J+QXkjL6{Q$iG`8eB*w5|Q1ihzb-&=ylRVr<#ABScG zB?I|fW(Ckk!wj(DMT<1GzR}wSF=85cr?*7Y0g)%xd;s`ucvMBNKKFRyx5#g zr>A+(&~PMH6eF1%m35;G%$>_Q8&ezKtsxV1G{|+$nT#XmU_O2){v?{}`UaQ%1h0j* z`CEliPLW>)*0>vt6zAK!nVoVbCpjeL*(6@2R{kK>N0Z0Fiql}%MtbNms(aa$^A*uJ zi)q`Pcd@Zv$(8ktT3-|*Ol)^P>1RSV=uqwL(T5qyI$Qa};{;K2vHjfRR}+~B7Hs5B zev@|!qU+F9T21N$C$%XNGz3RjFKhSZp;>J(Pv>pL50TYJ7IA4cQtCXD7UGbE#wJE} zYp#LtX-z%3h8G`mce9iaKK{jRVQYFQAbig9;{r*wKH7`879bZ^Q&G;$r{k9146ME}ZW@u1SV z%d`M3t+xkg%Kj@&GIW{ulbChWou^eRUyTqJn(s5RMvF-inJXtmgxX(RJ;{*z)ImDP zutgLCQ=_+cafmUCaA&>()rvigjWZVnV|;1~uPCaaI<$EQ!K!~s_?%lJp;ht<+UPG+ za%w*){h99b%z}4Q_;uZxwF`0SnE=)h@GK>oB;Fc&vk)Nuf!uyRZ<&l+X}9{iP<^B| zABKnw{Lb$4KLX-3@e4i8Uckt_TSNBv64NX3*jOnAON`pu4kr00m$e?&H$S`5$n~4~ zYuh~d_eEU%%yuC(YSbs|_eI(GlzC|WrE}*hZMgFao)zV%O$J*~iUwPIA#eEE$0|8} z01jjlstd!i`6H0gIg3;zO!;Zq~~id9=|{JAp5(+T+|`s>>)RGi7!E< zW7qgBPdU9a;^|fsMY(B6=K2MdW-E~AKDiHz@&*7aQrz8Yx%}5}Ie5U-Z*umZfvYR* zpZOFWt~}3?7|Tt*vuofenR`6u=%nEQBN zWk`oL?k`>VH~jMrG$rJ&F+l!mb`}M@dnSzu(l<-i!6BafQZXiY<%{k1(t_m-SR`&> z9r_nUTkQ{XO&@@{VHoRGL&V6~=>D{e!#~r(7U6A(u@un3oPO{UG_IKrdlWLy%>?6n zVEmV5EUCVr-!F)8Lj^jOeQYDisGEx|Z(oIK&j5ACVDq$+)urum$zza-jZh2b4v3EU zH%@`vuL-Fj6IhhM{Y-=;Ex99Dl-+QDE#>8Q5MLy`q7`|iM|&X9fRGroy8)(HyL{hg z>)+`e444Hwn}214;#oGoz>Lz422;W#VUWNi3NLqora)>c)RW$%^G|^?|0z&c^e;H~ zv>Wuiphtu zyn3*nKMgridSxB2@VK8(hy^Vx9op`0*3k|y_Y(U G5&r_p&zu$j delta 3096 zcmZwJdo+}5`v>s*nS+^eXvSGZGvt)hR6B#V%n-_HXfmM#B1IwE_9@-gjipgZ^>gp=4S?6Fz+GNMP7NBY2udbe=uOGF3J*=&LoI<%~U~rpCJ*}m6 zPFwq;o}TCG)!u8@9^NbG@^`s#7IQaX41GTQ^OBH`fudoh)WSccADuVxrJ_J$yDi_+ zY2q0GG8PWD*6vZc6Ss(`e}ACxx@m8^a)?e$dPuo$cU`AYqAZjR^b>zkR68a+W;wiV zqWc(QNKZ@OQk#&{>WhWD~D#wXFPm{7yc=P<8J`t$t{kn)!z1X0Ho?_jD4J zlz=U#zzU=m@_?x-J+s0aeF{fW*#@*?-#|*+0agcBfkBbz=p+S(raU0MAtAR(B&yS{ zOut11Dxe@!icp44Mwx|Jy)K-XhUFzoQ8qY@<1((j&Ua@p5S5ft$3Tn%hExo|7aW!r zhZ4p;MyDxZ-D8!y5qI|mRhKCgfY}3bLez19JopUV77D)~gFXO(1_m5GscYS?c$aM~ zk7VE(EJ6~86G(WY2^?B&56u)46z{*j%FV$XT+4WX;$1piu?Na7Q3N;AO2K{*v}VkX zqAC9QJAm2(9Pi$9KY?;nsAslXIKJ+Re|Cf`o?0yjNIXC1Gpr|M)=9A^!orv zC&ozw-kCA#d_8t5 zHBw%HWvnN?zX8jQJJJaV@ZpdV31L6yc+8f1BO;t`^~bHy@6h z8;4zP3N^q-1f&ZQk^HW<+R!+g^!I~RML{K-=#h; z_wpUmrO!K(@Z9fBm$FknHY7^1*>cWCpacp!!`=@;M4M_@PEzNJHszv_!3cJz$E|Is zVtD9^Ecffjo7=pyAC9xx4@V!j&>B9408YL6F}G26f~<-LiZgdhnmhch)I6cA^rQ4Z zVm@m{w8&SQrr-J_{nL@*+LsmU&KA1*Z$>U>?0;CW;bN;{gw5nTP+AJtnf$2r=D3ja zR%{}s%4n>WrP=%U)m4Y@?=QoVBl^6`T;XX_+jVQ2W9S|Yh&@xqJvi#&r3Jb$xO{?2 zkqlXyfH@@h?Thc&%2c5gJIb?s_Kfi>0zw))C~6K(cqVuLte^*j|4Kc7+hAl3%&Ig| ziYKz2lyk0FWH@=~2VPGf);3(m>U$Q_a^$qqc(M=nTm+XLJ_h8Imy?;fl z^7eapU19Scta_tLyXM96pwK-2_!(OUXp4c0kIRHaRy92`lJ1_FRw^!_zHAnDxtF%v zIpzqf4RgB%=WLO!seeKv-IG2JJ(H# z?f-93)6J?Us~pbG8QKT+Y=Q7rF02)cz0vE8duRoj&H&U7$)jQ3uQI+nvIz(DQ3s8YKJ*g>5qI(W^m@r1N*#8q;PZLQ~t8-dmwF|Z$%7Lo*m+o|1j3I$;x ze8VTwIB%Qwelm%dlt3$zATWa$GP6O1w%NKlR^#5Vrxp4AjsL>r4*4rtAn(cz%iNs% zDRqiCNzfO>UhG3FhkP3+^LkebI&Q#>)A}$+AGIzhdK>E(DkW@d+p~g|X9qq-_Vq4u z2QRVy+T8KOGxQ+F@4IrvIAG^;Vlp>LdJ3g;fH5hPW_2oVsBM{#9-qTJ<**C)ECB z;-VPR!}Q4(lrD9^V@qvg5#2NWo%Ctq!t(ra4-1nvk7#pQtI_&X=D98a6UocBRJ|+IELGNG0@`?VQg(`aq=u%QG+dy+;`bfZq zg7Hhq{V_|pr{M{4x)#yQO05N)dV6&AdeJUegl@e1ESmW^#$JLXqN0Aj%pJYiaJ~5X z60_=@l>}jc-t>q0ZFIq(Ag`ScZo(rto~mUO^=TAMf(Ue|u}-179r%ddejgwq4Z9T_KMEb-A9vAML0cLkQC^oSm0DCCeYoIF;yZoe<%a-_zyV8W_=peMM+{&JjmiHF_hDdM)i@>T<&l3Du>aYHCck%# z={X{|C+-T&u<5eg2A}U&KNS?|mNz_laE|EKliQdqLf0Q`!f)zvFNRyOii7d#OSsFX zCo=O=tHsdn5EavbOY%j4!Ear|?eO69I6lNr=9rPG^|95rOvHL1Es!&j-QaLi7G+Rk z{87;xyftT2N>I+VJ_0q4Z}+V`!GC<4Ry(H;UA9W%Y6IAyhSzi1Zu>NA2QUqCUOPzU z9q+X8kbsc+ZqtUL@8t6Cpet*8#-f*SjKR7eLMzyrHc3o-+pNZUktz-y5RwZ_mvCIy z#uLVf%Aky|fLz{Vki9$c)Nck^M{9JJaU<<@CQfyd+cQ{Mq&j4cwqTXu4>}<59!Zs0 zM`ty~RKZC4%z4SavA&qD-mgtz^UD)PMv?BjD9@$-+3K{ZC6^7C%^q(zT!%Bl#VTya?wzZ!K7rVYO`6GSK-_Lgpx$ W)l_eA4f?rv0|z^%?IRoCxc>umGk%@` From be7d838789d58d8e30156cb8aad78484e19b9eb4 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Mon, 30 Jan 2017 20:35:48 +0000 Subject: [PATCH 44/44] Automatic changelog generation for PR #23311 [ci skip] --- html/changelogs/AutoChangeLog-pr-23311.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-23311.yml diff --git a/html/changelogs/AutoChangeLog-pr-23311.yml b/html/changelogs/AutoChangeLog-pr-23311.yml new file mode 100644 index 00000000000..53a5de2ed1d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-23311.yml @@ -0,0 +1,4 @@ +author: "BASILMAN YOUR MAIN MAN" +delete-after: True +changes: + - rscadd: "Added BM SPEEDWAGON THE BEST (AND ONLY) SPACE CAR ON THE MARKET."