From e502d247c549bd6f75e9d8021eef675ab8b2a376 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:53:16 -0400 Subject: [PATCH 01/15] Bracer Attachment Fixes (#7429) # About the pull request Makes it so you cant put one bracer attachment in both slots # Explain why it's good for the game Bugs bad # Changelog :cl: fix: Bracer attachments get properly deleted on bracer destruction fix: One bracer attachment cannot be attached to both bracer attachment slots /:cl: --- code/modules/cm_preds/yaut_bracers.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index b4be2bcb747c..27c95c7180a2 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -342,6 +342,8 @@ /obj/item/clothing/gloves/yautja/hunter/Destroy() QDEL_NULL(caster) QDEL_NULL(embedded_id) + QDEL_NULL(left_bracer_attachment) + QDEL_NULL(right_bracer_attachment) return ..() /obj/item/clothing/gloves/yautja/hunter/process() @@ -491,6 +493,10 @@ if(selected == "Right") //its right, left because in-game itll show up as left, right attach_to_left = FALSE + if(attacking_item.loc != user) + to_chat(user, SPAN_WARNING("You cannot attach [attacking_item] without holding it.")) + return + var/bracer_attached = FALSE if(attach_to_left && !left_bracer_attachment) left_bracer_attachment = bracer_attachment From e5f72d9b1c217e092ef2d0fbf76a965098ad0b59 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:58:44 +0000 Subject: [PATCH 02/15] Automatic changelog for PR #7429 [ci skip] --- html/changelogs/AutoChangeLog-pr-7429.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-7429.yml diff --git a/html/changelogs/AutoChangeLog-pr-7429.yml b/html/changelogs/AutoChangeLog-pr-7429.yml new file mode 100644 index 000000000000..03822d634e03 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-7429.yml @@ -0,0 +1,5 @@ +author: "BeagleGaming1" +delete-after: True +changes: + - bugfix: "Bracer attachments get properly deleted on bracer destruction" + - bugfix: "One bracer attachment cannot be attached to both bracer attachment slots" \ No newline at end of file From 5f6d0400e37805866b404efaa435e040cd821232 Mon Sep 17 00:00:00 2001 From: harryob Date: Tue, 29 Oct 2024 17:00:14 +0000 Subject: [PATCH 03/15] fixes cancelling items from the parts fabricator queue (#7418) :cl: fix: stops a crisis in the part fabricator point economy by preventing infinite money generation through cancelling items in the queue /:cl: yea i got no idea how i missed this either, the points removal now happens AFTER the item is processed in the queue, so we don't need to refund any points when removing items from the queue closes #7416 --- code/modules/cm_marines/vehicle_part_fabricator.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/cm_marines/vehicle_part_fabricator.dm b/code/modules/cm_marines/vehicle_part_fabricator.dm index f04f0f1b0dd1..5033eb638f47 100644 --- a/code/modules/cm_marines/vehicle_part_fabricator.dm +++ b/code/modules/cm_marines/vehicle_part_fabricator.dm @@ -171,7 +171,6 @@ var/datum/build_queue_entry/entry = build_queue[index] build_queue.Remove(entry) - add_to_point_store(entry.cost) return TRUE else From d45c294171cca54d291ee21e91bf0ab6b3ee2dd6 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:05:19 +0000 Subject: [PATCH 04/15] Automatic changelog for PR #7418 [ci skip] --- html/changelogs/AutoChangeLog-pr-7418.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-7418.yml diff --git a/html/changelogs/AutoChangeLog-pr-7418.yml b/html/changelogs/AutoChangeLog-pr-7418.yml new file mode 100644 index 000000000000..4a98d2f71ea0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-7418.yml @@ -0,0 +1,4 @@ +author: "harryob" +delete-after: True +changes: + - bugfix: "stops a crisis in the part fabricator point economy by preventing infinite money generation through cancelling items in the queue" \ No newline at end of file From e4da35467de79b4930705f1cb97c9596b3622bf9 Mon Sep 17 00:00:00 2001 From: joookschad <71224718+joookschad@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:22:39 +0100 Subject: [PATCH 05/15] Makes toy mechs small so they can fit into storage (#7420) # About the pull request Makes mech toys tiny so they fit into storage # Explain why it's good for the game super small mech toys should be able to fit into my webbing # Changelog :cl: qol: Toy mechs will now fit into storage. /:cl: --- code/game/objects/items/toys/toys.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 91d8164dcf38..cda721aae515 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -241,6 +241,7 @@ /obj/item/toy/prize icon_state = "ripleytoy" var/cooldown = 0 + w_class = SIZE_TINY //all credit to skasi for toy mech fun ideas /obj/item/toy/prize/attack_self(mob/user) @@ -315,6 +316,7 @@ desc = "Mini-Mecha action figure! Collect them all! 11/11." icon_state = "phazonprize" + /obj/item/toy/inflatable_duck name = "inflatable duck" desc = "No bother to sink or swim when you can just float!" From e9a1fa5c885f18260da09bf11aa47f1da59d1ee3 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:27:39 +0000 Subject: [PATCH 06/15] Automatic changelog for PR #7420 [ci skip] --- html/changelogs/AutoChangeLog-pr-7420.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-7420.yml diff --git a/html/changelogs/AutoChangeLog-pr-7420.yml b/html/changelogs/AutoChangeLog-pr-7420.yml new file mode 100644 index 000000000000..da3fc6ff17e0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-7420.yml @@ -0,0 +1,4 @@ +author: "joookschad" +delete-after: True +changes: + - qol: "Toy mechs will now fit into storage." \ No newline at end of file From 570fc8f2777381f4a88b4029da2540c72f91b253 Mon Sep 17 00:00:00 2001 From: Blundir <100090741+Blundir@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:55:21 +0200 Subject: [PATCH 07/15] Even more minimap icons, minimap fixes (#7419) # About the pull request Adds minimap icons for some misc factions, hefa, xeno cultists, numerous survivors, whiteout, and some others. Fixes some icons being incorrect. Fixes squads having incorrect squad colors on minimap. (Thanks Harry) ![bfaOHcMq39](https://github.com/user-attachments/assets/d5192a67-afb8-4328-95fe-6fc52ff68a4f) # Changelog :cl: add: new minimap icons for numerous things fix: fixed squads having incorrect colors on minimap /:cl: --------- Co-authored-by: harryob --- .../modules/gear_presets/_select_equipment.dm | 4 +--- code/modules/gear_presets/fun.dm | 2 ++ code/modules/gear_presets/other.dm | 5 +++++ .../preset_fiorina_sciannex.dm | 2 ++ ...ot_in_progress_insert_fiorina_nightmare.dm | 8 ++++++++ code/modules/gear_presets/survivors/misc.dm | 2 ++ .../crashlanding-offices_insert_bigred.dm | 6 ++++++ .../survivors/solaris/preset_solaris.dm | 4 ++++ .../sorokyne_strata/preset_sorokyne_strata.dm | 8 ++++++++ .../gear_presets/survivors/survivors.dm | 8 ++++++++ code/modules/gear_presets/synths.dm | 3 +++ code/modules/gear_presets/uscm_event.dm | 5 +++++ code/modules/gear_presets/whiteout.dm | 1 + code/modules/gear_presets/wy.dm | 3 +++ icons/ui_icons/map_blips.dmi | Bin 8500 -> 8942 bytes 15 files changed, 58 insertions(+), 3 deletions(-) diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index d5b688a37804..151addb668af 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -286,9 +286,7 @@ character_trait.apply_trait(new_human, src) /datum/equipment_preset/proc/get_minimap_icon(mob/living/carbon/human/user) - var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', minimap_background) - if(user.assigned_squad) - minimap_background = user.assigned_squad.background_icon + var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', user.assigned_squad?.background_icon ? user.assigned_squad.background_icon : minimap_background) if(islist(minimap_icon)) for(var/icons in minimap_icon) diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index f9b6970015c8..40316e57ab3b 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -85,6 +85,8 @@ paygrades = list("Ser" = JOB_PLAYTIME_TIER_0) role_comm_title = "OHEFA" + minimap_icon = "hefa" + skills = /datum/skills/specialist /datum/equipment_preset/fun/hefa/load_skills(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 73f8c5dc4df0..fc2ebe3d0e63 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -744,6 +744,9 @@ assignment = "Cultist" rank = "Cultist" + minimap_icon = "cultist" + minimap_background = "background_cultist" + /datum/equipment_preset/other/xeno_cultist/New() . = ..() access = get_access(ACCESS_LIST_COLONIAL_ALL) @@ -805,6 +808,8 @@ assignment = "Cultist Leader" rank = "Cultist Leader" + minimap_icon = "cult_leader" + /datum/equipment_preset/other/xeno_cultist/leader/load_gear(mob/living/carbon/human/new_human) . = ..() new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/cultist(new_human), WEAR_EYES) diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm index a5d92e4980dc..1f19848253a1 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm @@ -44,6 +44,8 @@ /datum/equipment_preset/survivor/colonial_marshal/fiorina name = "Survivor - United Americas Riot Officer" assignment = "United Americas Riot Officer" + minimap_icon = "mp" + minimap_background = "background_ua" /datum/equipment_preset/survivor/colonial_marshal/fiorina/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm index 27d39348e7d0..42c1ca369076 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm @@ -6,6 +6,7 @@ faction_group = list(FACTION_MARSHAL, FACTION_MARINE, FACTION_SURVIVOR) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/human_versus_human = FALSE + minimap_background = "background_cmb" access = list( ACCESS_LIST_UA, ) @@ -20,6 +21,7 @@ assignment = "CMB Deputy" rank = JOB_CMB skills = /datum/skills/cmb + minimap_icon = "deputy" /datum/equipment_preset/survivor/cmb/standard/load_gear(mob/living/carbon/human/new_human) @@ -97,6 +99,8 @@ rank = JOB_CMB_SYN languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/synthetic/cmb + minimap_icon = "cmb_syn" + minimap_background = "background_cmb" /datum/equipment_preset/synth/survivor/cmb/synth/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COLONY) @@ -155,6 +159,8 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "United Americas Police Officer" skills = /datum/skills/civilian/survivor/marshal + minimap_icon = "mp" + minimap_background = "background_ua" idtype = /obj/item/card/id/silver /datum/equipment_preset/survivor/cmb/ua/load_gear(mob/living/carbon/human/new_human) @@ -235,6 +241,8 @@ assignment = "UA Police Synthetic" languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/colonial_synthetic + minimap_icon = "synth" + minimap_background = "background_ua" idtype = /obj/item/card/id/silver /datum/equipment_preset/synth/survivor/cmb/ua_synth/load_race(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 4485624a4c27..fa70c497a05b 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -258,6 +258,8 @@ Everything below isn't used or out of place. assignment = "USASF Commander" skills = /datum/skills/commander paygrades = list(PAY_SHORT_NO5 = JOB_PLAYTIME_TIER_0) + minimap_icon = "xo" + minimap_background = "background_shipside" idtype = /obj/item/card/id/gold role_comm_title = "USASF CDR" flags = EQUIPMENT_PRESET_START_OF_ROUND diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm index 2ea019ae883d..37a3d3923b19 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -11,6 +11,8 @@ paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/pmc skills = /datum/skills/civilian/survivor/pmc + minimap_icon = "private" + minimap_background = "background_pmc" languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) access = list( ACCESS_WY_GENERAL, @@ -50,6 +52,7 @@ paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) role_comm_title = "CM" skills = /datum/skills/civilian/survivor/pmc/medic + minimap_icon = "pmc_md" /datum/equipment_preset/survivor/pmc/medic/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) @@ -72,6 +75,7 @@ paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0) role_comm_title = "TEC" skills = /datum/skills/civilian/survivor/pmc/engineer + minimap_icon = "engi" /datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) @@ -160,6 +164,8 @@ paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) role_comm_title = "WY Syn" skills = /datum/skills/synthetic + minimap_icon = "pmc_syn" + minimap_background = "background_pmc" /datum/equipment_preset/synth/survivor/pmc/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_GEN_THREE) diff --git a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm index 65cf3e7f0132..92e92576cd27 100644 --- a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm +++ b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm @@ -68,6 +68,8 @@ /datum/equipment_preset/survivor/security/solaris name = "Survivor - Solaris United Americas Peacekeepers" assignment = "United Americas Peacekeeper" + minimap_icon = "peacekeeper" + minimap_background = "background_ua" /datum/equipment_preset/survivor/security/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) @@ -82,6 +84,8 @@ name = "Survivor - Solaris United States Colonial Marine Corps Recruiter" assignment = "USCM Recruiter" paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) + minimap_icon = "recruiter" + minimap_background = "background_medical" /datum/equipment_preset/survivor/uscm/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm index f285a9635bde..793363557cab 100644 --- a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm +++ b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm @@ -1,6 +1,8 @@ /datum/equipment_preset/survivor/engineer/soro name = "Survivor - Sorokyne Strata State Contractor" assignment = "Sorokyne Strata State Contractor" + minimap_icon = "upp_cont" + minimap_background = "background_upp" /datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) @@ -14,6 +16,8 @@ /datum/equipment_preset/survivor/security/soro name = "Survivor - Sorokyne Strata Security" assignment = "Sorokyne Strata Security" + minimap_icon = "upp_sec" + minimap_background = "background_upp" /datum/equipment_preset/survivor/security/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) @@ -28,6 +32,8 @@ /datum/equipment_preset/survivor/doctor/soro name = "Survivor - Sorokyne Strata Doctor" assignment = "Sorokyne Strata Doctor" + minimap_icon = "upp_doc" + minimap_background = "background_upp" /datum/equipment_preset/survivor/doctor/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) @@ -38,6 +44,8 @@ /datum/equipment_preset/survivor/scientist/soro name = "Survivor - Sorokyne Strata Researcher" assignment = "Sorokyne Strata Researcher" + minimap_icon = "upp_sci" + minimap_background = "background_upp" /datum/equipment_preset/survivor/scientist/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index 8446ca1b37ef..27e50bf9be41 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -263,6 +263,8 @@ Standart Survivors : /datum/equipment_preset/survivor/scientist, assignment = "CMB Deputy" paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/marshal + minimap_icon = "deputy" + minimap_background = "background_cmb" flags = EQUIPMENT_PRESET_START_OF_ROUND idtype = /obj/item/card/id/deputy role_comm_title = "CMB DEP" @@ -375,6 +377,8 @@ Everything bellow is a parent used as a base for one or multiple maps. ) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) survivor_variant = CORPORATE_SURVIVOR + minimap_icon = "cl" + minimap_background = "background_civillian" /datum/equipment_preset/survivor/corporate/load_rank(mob/living/carbon/human/new_human, client/mob_client) if(paygrades.len == 1) @@ -468,6 +472,8 @@ Everything bellow is a parent used as a base for one or multiple maps. skills = /datum/skills/civilian/survivor flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_COMMAND) + minimap_icon = "obs" + minimap_background = "background_cmb" /datum/equipment_preset/survivor/interstellar_human_rights_observer/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) @@ -494,6 +500,8 @@ Everything bellow is a parent used as a base for one or multiple maps. faction_group = FACTION_LIST_SURVIVOR_WY idtype = /obj/item/card/id/silver/cl role_comm_title = "ICC Rep." + minimap_icon = "icc" + minimap_background = "background_cmb" survivor_variant = CORPORATE_SURVIVOR diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 1351fc580105..56ceb261dd5c 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -509,6 +509,7 @@ name = "Survivor - Synthetic - Corporate Protection Synth" idtype = /obj/item/card/id/pmc role_comm_title = "WY Syn" + minimap_icon = "pmc_syn" minimap_background = "background_pmc" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/helmet/marine/veteran/pmc, @@ -719,6 +720,8 @@ /datum/equipment_preset/synth/survivor/cultist_synth name = "Cultist - Xeno Cultist Synthetic" faction = FACTION_XENOMORPH + minimap_icon = "cult_synth" + minimap_background = "background_cultist" /datum/equipment_preset/synth/survivor/cultist_synth/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index b5fc3ebf1f4d..5a4bd0b47ba8 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -451,6 +451,9 @@ /*****************************************************************************************************/ +/datum/equipment_preset/uscm_event/uaac + minimap_background = "background_ua" + /datum/equipment_preset/uscm_event/uaac/tis name = "UAAC-TIS" @@ -470,6 +473,7 @@ rank = "UAAC-TIS Intelligence Officer" paygrades = list(PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_0) role_comm_title = "TIS-IO" + minimap_icon = "cmb_syn" flags = EQUIPMENT_PRESET_EXTRA /datum/equipment_preset/uscm_event/uaac/tis/io/load_gear(mob/living/carbon/human/new_human) @@ -497,6 +501,7 @@ rank = "UAAC-TIS Special Agent" paygrades = list(PAY_SHORT_NO5 = JOB_PLAYTIME_TIER_0) role_comm_title = "TIS-SA" + minimap_icon = "tissa" flags = EQUIPMENT_PRESET_EXTRA /datum/equipment_preset/uscm_event/uaac/tis/sa/load_gear(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 3d9ef47a0e17..3382f145f04e 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -8,6 +8,7 @@ rank = FACTION_WY_DEATHSQUAD languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all. skills = /datum/skills/everything //They are Synths, programmed for Everything. + minimap_icon = "whiteout" idtype = /obj/item/card/id/pmc/ds paygrades = list(PAY_SHORT_CDNM = JOB_PLAYTIME_TIER_0) diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index 24dc8bae0916..7e4d698e36d0 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -10,6 +10,9 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/headset_type = /obj/item/device/radio/headset/distress/WY + minimap_icon = "cl" + minimap_background = "background_civillian" + dress_under = list( /obj/item/clothing/under/liaison_suit/black, /obj/item/clothing/under/liaison_suit/blue, diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 5f3a96184ca649581599dfe9d3281af733523918..90bc2582fcd5d4820819b9dd51825afd43e2e145 100644 GIT binary patch literal 8942 zcmWk!Wk4J|5MI1EEqXYG;_mKJN`V%4Xn~_had#?Gezvfu26d{L6aL?cE6002||qqGVvH~&AqL54{Ie@sCDK-6+q({hwHbuhL!w{bV723bg8b^|bB{sVl)B?N z5=3@;*L<3*7|&_XGw;_22=w;sa0Tj2JH*<5Ho11*X~jopHZn`r0yzc0=Tj;Wa*SHh zbIduL^g5~+h>W$U%W5Dwrf~^A1Gj>tQQYre>AslKvaC-L<0^C<@F2Gz2>jug%q&u8 zicZmBVb6DnQJYV0(i*G`wPLed%l!4(B5l?+{BU-ldLgKAmqi}e(%jao(qn^GGJ>hA z)?89g$PQ0#LA0VtJLzAdusO~9f{f$QSy2Nlonb9w#CZ%8{S{-%<8Z;3d4q>{BfoNR zTzrbu^?RC@+|C`-ifKc>?BTKWJIn7eI;{LH{UoAl6?gHOgQ0|ca3|$Eyg4$7)guQb78Bq%r6-8xYhqIA07z~LjRa%8GS-$Dy7noVOd!WCCU(MzSOQ>@waYkW zecni-U|`rHI9aWt+pA+zuE_5snn6pAWzCPHs4c6nxa>!vX9@Fw!R zs7AOL2)W`I#9Q}L;!{X5nSRz~=p$Ek-DCO+m{*Ha;F$;@az`|a81El`vUxms^LE^~ z=tIe%U>@9<(y1MdNxq;7-U?#16nz{)0LIQMh5YjkT^C`o(wKDjUw?7J$HBOr6RXzu zeypHn97|uOFV>GC>YS6v_2H*K(qqwN59%1L%z>bR>}huXfWcnw;?;_fbYvvFBYUhM z^5|2&5q#8|wh@G8t{lz#X=}Zb&i4l1-l6vJXY}30l7ha*QvP4pzp~)**m5Ko8So$- z=&f!t04=)y683D}#o2$8zh<>Z8>}Sq*Ex)K7h}+u8O1}4-~#Y5ko#f-{C>En>gA|u zihPJfb=@OT4P_)G`-6N|Zv5$Of|T*6uM##EY#!`CH@9sQR&;VX%T87}%0|(C!Id^~ zGKm{%f&)b|+RI6NogWcGw&Cl!3{vnzM^ZtQvZfl*ydFaoZ&ZKwtEb>k{K)k)&`ZJR zU1s9yyBIF#BqB~@C(UkQs)Z+?VygX~t&(WG(RdSbiJ*lxAXT%2gv{P^CxH|!AYIyZ z2WROvfUSketZVQn-2WFt_*V?CBaLLJQ|`ApI!;wDJ6~&q04ci2k`7<#?^IVQ=(&RG^bfh)V%arn^GFmEMs^ z#GM-s*sv7!3wv}Th4XDQ6M=8MkY|GPJt#FptoU$h4i7vRDd9Ka9?!o8h;Fy|{Z?LT zPZ5Ds-ifzOi$aOGK-J$cQ^s0&Q_=eiI{4cYCcbw-@?ILPt>yMSPWxFaqIQi5s-m(o z;qT$$PbOYzf$P=nNEIC=s z?$@0491msSHFXWbqMly;4D7zbyA1C`#?s+5KseaVb z)kXLCLsk^0guaTpfLhmZ{cA*>#r6-2sM8|Ky3a-{cW^c08x>`!@MM%*Ehb^0Z789#NxJ;IW0_TzO;0Dy(L@k8DN+!epya~nZF7SjOcyAi#))U6 z@TfOmm=#Hi4r@z72uJCn=oWui>AVa2=d|@sGFp;>6EML5`AcYPcO`Ss5029!At52Y zA+o&K>?RU+Wk>S;STqx|-rg@4ICChiBSn0a*WcRFoCA7st`3It?X1Vbj|BJ0G@$AQ z_WC!?Yt%J{xp=urBf4|n_(J1VH(_}fhYcc7tw0Ku_2sSWA)ymBFqdKyR>ZFw2)()H zR;MhbMf1KxVl9<@)Dp=|Q(#LZQm~-}HYx0O(D&lxJXSv%TByCj0>0GUGX?lj@$e+T zi)(AA(CYuvdPbkz+5V%8>49rQ2{N#Fra8G)adN6xdnfa?3Oq)Bs?K( zD(}}u1TvE~nQbT7$YcSd4HRtj)r%DaD!}%~FrHtl)w4T1Ahvd)>bJt_h7RY;X6P-w zS>e5F3J>s&w`y*RYCmAX`5vmi(%Y6TJjVcCy(@k09rnFUsX_m1J%%y2Mj4vxsk#5s zolE(ezabaHaCaKEv0>BranD1v@NgPa+x?OrP!es0k$dvEe^a$=R5 zk)i0<o`}glRJc@`o?2~>7C?CP# zLT+f)w_bXvu!#|7S6)K{L4AFF(BYaj9~v6k@0HW}T{FyK6fY4iB3`TH>o(bsii!nu zb8{Du&&!ad%N^n&YHI3$t5~_nF+0y>ynQS2 z>@DWhx>i?Tk1rQRUeF`Nz{(o=;3;~Oe|dSC8g}E}E*Yqzs><*v$U6+#H%(tS{_tcc zM@U3Lp?vT7&=eENBkSbE^YHH!y`usF86z7KNyZf}CoMe*n?(px1-Pz$>nkXdGWnzyN*v}o?O(lL;&*JE#vup=-c)j04h66QcTUh<2WGh* zkFr3?4MV49K*0HgD29g@!IHb(&%|5^VIJ(MuLGL_KK_F&)E!~No3O3by2}#1Zvw7^ z5acJa?I}vpX27PSs~ZCYS&&=hWmT~U)r_Sz4(Qt6XjdXhQ>LOSBuv)3=n3eXucS~{ z%H)pUGCV^9$in$|C)T9@RJZ3~-#hS4Az}Z?evX@tS+e1GZQjhm$0NtK^7aw8KFVK5~-LPd>C<80V_q+Q0~YTG4swrJrMzuqO4rbr6U`e z+6}s28a_j)h5n z$|FhL#^?TI+g(ODtW&-72c}PFqvF(DAXYtylmv2=<_SgbyF``3TUTm!=5OYMNWsP* z@~07bF#jnXy7hhjL<_!*yyDn7fO1eDMKlV{$lebm@-(Hq4d>TL45v^hwjD_^Axf-@ zuNl~ng3E5QBWJKqmkav9TyR44hPdRrs?n@E+w)JBi+XOf?u~hP%WD~xablL2A4PI7 zRpWVVNApd3_>QVejZ^DP73z$GIpSi6U^SIqV!OOg_?)F`RHB*(S`%DKhJ_ROXzs~> zjoS<$#IGh!xUN!wcnw<=?c>!CyB*=4NWaZ<`OKAh++!3~dNxzKzgt%P{`q%!B^}iN zPs4KuJ2Ok>&X_v#&@F=;(lAiGHWJNuHHQvsv5wH zEB-`y;G2L!tSf4Q@ zbFPqtRpaYfI8J5EzQ3Walj8x|rzR$VV2*SC>sG~eka#)VxFvLRutpSfM$_^8uG?n9 zZD~;T>oJ+&#jwX*8@B%GbbRmj{xVLYmYvd@0E_&%IYo=ffWz?28Cm4gFL>L5Z4&Kz zllxnkR3l6?>HN~>1-?^WYH1J|gOX6wfnUNNNc zb}9nBpHI*>3!1$%jv=XY;-hZ^pl*=Wk0Obvj~s`7oRK#K1b6G4Zp)r?>?HHdIdMf} zn$6mL(lJjzy@z|sNpj!Vo?(6qf-bjm_2y1k7bY(9n)kB4a3(p|celdZ@A$9RP3;7Z zKI>jDjdAx-po2Q^M)a2FO}d-6lU8rA71vx}hV<;v*mts8&Wz2CGmnEraitsNcu+CB zj6#0)`XBE)WDB)))eemqY=>vPz9>#Zw*AW*W6c_0Rxe_f=4n#KN&9ZceBZ8J!Wbj_ zgE!y{!@t)vf_&=6?DvI2VLkFx3>@Z=wPfFIKaPI?y-^p%HTMohD4frvEN5?L92^_7 zS4=h&vM0=j61)Je_LtVMg+@7TjBCZJzJ`p)^L)C!S3jLx!{q^3k(R_w=JbDapMGfd2Nln{tgbgmPzE0m)0oO#mRWKO{h>h5Q~t z;p65rX43@s4Yp1h+-25{%5#xJ(#l?#ZClw=N)q{w28XKzv_){gyKjwq9V1%LT$BL5 zFY<>?d$l;P{Z4NDZ=dEGeN+T}9rd6~lAd<@06wcfox4r!*Ev@freKTEZMeJ91ps2zZr+!RUxdz192N8 zWY@#y{{K^zG$h&nFtN)a4OHavjmn*n;QiY7uh42)<5;$taARZ(qGjF9WYOw;gH4kK zFgK)^*z0Rjv-P1oxKq5Lp1b$dd1r}kzvtB1_+Ok`DY-9|=F&WJ;|k_TQ5NiCug8oc z;5*#FTUXDWH?$wHa;h;gvkNUTO|>f`Igb8v)K@Z!M{^?NJ1~le>0$vySDgb&riDO+ zlVnP5)@X028DXiZAj#2eGleMOrX?yfm8pZ6D_Iy9D}$)a-xNn)(!-XRQH*cAqc$Ot zUr7urVe4L?%Ut@+6=ofamiA_8a|nQJ#(KnBN*(}2q%aUUx$~t96AGZg$`-3b2}4K2 z`5y$48A7)Ip#agbu)V|Re720^`x>Kqr^^vWK8+yH<=bP8Z|Ach3(;Kq(AiU6+Z&DV z`6%$lU``Q0xbx1R>xczQwPUBSVDW`LS?vr8d(3{__wI}@t zKF2v_Trwt-pV_1qu-To_TLVb^^toNuUr`fQTkyE`r1Tqn-ipNE#B;OgPSNkw%qUOg z4jZVjQqcwT5|=xkM0&bQ3yR21GKpT0I+3BIK8pgrGq?x-3qEy9e=A%asDL-D)H}%| zgZz1%5m#h)4fw1{{OZ?TjT?X%F($B?6n@17EvG=#sLKM3M2Pvpal*$(@LVP?CyQ_Z z9uOOcP^(v)=kGx&;CoUGXzpU4_&NSIlp+!C2)DdGDK`7@_3um&W;;rkscgRS2j8Ls zH6^7;@V%w9oHZ2`3i_v%o@WOFO_(%Q6fzq&6_=OeB`O`6tzFrHakSGx(gdBK7tpWm z$V;mya8goIuJ0~)QqwqkmTYOblhT@fBo>ta>UD|PWaZeQgZLb8?4O|jKtwI>&B+t_ zpS3$GZ%SWPJGW;iHlgEi5DU+I|t% zF<3+YWr{&5-HCtOw@i_-SZP@792(8|mJ@6<36Y+{Dr|rv&(E7v8 z@mC$4PxFdANh0X{uM80w z823)_?AYeB2sm49j*A3w1pzR2VmvsWA*5bG#l(Io%Lcbe7~z+hmn8hZs#~KO*o0Q- zLbPzc7$Ela%%4fsWvfSgFOo0yXH+@CdIC3{xF6@b z{2aeql!~_<+ZG3XXL<$1_jrk$20PDk9VtwYdLh9F#hhLOh#0*|{Q(&>zZcHSi-*#@Lwl-K zE|y1eCeDB4rj>(iYNtkr$LJM1rFt{?b%^-~W0TBbD`%R8@FWxlN(x?&cHar&LCYk& z!7%k(NNcWKLjqGaj1ghOq)N>H3@9-n!JKBo1}<7nCzK@?YI;VB!mojBl5DhLHOkM7 zg&6L!{euC^R77U6TJ$`pyy#6ctQ#LU_GoE5%!;OhJDap9 z4Vw3w_Bc$q{YQDZxQX?Z^qZmuudWbTowg+Fw}?6$ezLH*)ktUINoA3ha;TZPxwTa)I%Nuf42X+r2efO?s?U7dwV9PIlephwv+c7P?q%j1tZd(BIzY z(>d?{jj_+dZi8EMvNqRWb+Xn6--9V(lsLbkK?AA?Zd@raT@J`1dMXU4i9jhUEyW<2 z*}43(MD#u&mp-UfT0>nOWQsfa6ZdQC{&>Nd!@kNh#{`5~SN7VS>mm!TM%n*cZ_w2C z_V>fcSny^9H5Z=Lq!F>!AC31jOres{tE*o&&84M`!_!cRd**^1!4k)RYW}+u3n^OT#4~Aow)G%*@=^WViE0TN}0EkTQF1!TNaq54URs9$@d_P;c;K zQXC&2|DytW`vSg9P8_Y`J6Uajl7%Irs^;eJr8&23?1xwhF?Z&j>mbga`cO&Ns4FYi zSpBuCNvjzNRIx~)5go+Kj(dq zZs4T5ou!$)2`d`o$A71iDLVrZkBygS@8KK*JUw5Zdyv+j21wSN{WiQEaG8tXao;|7 zWcRW^j1HfaN@OlGN7k~m?2Mv(7D8{|$u60N+-@kdMTGc?9$-SEejML04_-f9;~K6h zaz$DVP-?;0sP)xQbQ4YOUCIsY-8dWuRu?!7BZ8db#0miw}1a1bzROO_E31-;=a zEi)+Uh-)ImH)U%KDx{59V4RxF*L}~HqV|o~o!maB-fdY-8!O4=H(LEULX+m2MGMS4 zM8MIZ|U@By)Jj`SExjPA?HOLzm~xg4W4(=%iW!;4h&=hSDOl$ z4dfRVsw9mB&d#dk5LW-JGnIv%C9@wXt7PiS$y>5M4h}?+m{PQs8uX;ug`-qzQn;L? z0qiaUrtA+xJy!X;$TDAlkAd?D?V{RXQ7?K4!i?snwq0mibNhqWxKPht5?`zkd2_H% zdXBcpPX+=jZ@0X{bdR%UIh`|++f^xE>(!5@Z6G?SV5a96dJxsCF<(^lN|OWQ#^sME zvZ&R(c^R8*hd^uHNCv3R_`s_FIXbBl1sNwlH{Y&p3PK5k-I~4E(ayNl^zXMtS*zV6 zQ+fSSY5J|s842=~iW9<8##sbnw!s)6$=eMdv6^*PgkWq6f`QRRj@R|mH#MGEMNzC? zU{T`soH2CVZCsA?!w=k~QkbuhaRelY@_xMsH-k&Z1W>SxskB zhaq$oDyA9LF3mPA4MMy8{KWRwYEc&BqNS?k^xQ7Ci+G<#>yasF6?+$}sk}~BY)B%@ zDbjJ1@6IzsNG_Q)06>=gY*S))Z?DvVDU2)m`52w6JjO5L%UNERW)VytP;Xre0>vqh zTow`3Rjh3Z@Le5koo{_T=q`h{zJa?UuTmv=D^tInELQggR1;aoi~GN&mW^)rxK$Ay zk2D)gmAQgK87TIl#LxXo*4C_U&o>K)0obC&pC~tJX!_{T&hxXO0B}%yBDD>dKLEfZ ze>-&bYK}r{v4)2mMN*diF+UyV4BxO zt@uwtWMvgAEdoZKJ*j{44*O3DOneY@I8Dto(RXFKK{V6=F46+I7zC(5sAm*`nox~c z*P)O_&%?7#qH}e;9-2x%CRGjOEa&_&S#(TUzHt7$mWvyXX_vj_xy(L{KH)Ii>`H** z94j&^IE|IGZ^i1GayPsbZ=n@rsRff9%^%vw2akJ8L zgOCyUwa4U$QnVj&UBh`}K1K^U_}0hK4%%39ALhTYgXl?$9}^s5_G9#U_swX=KYP>c z_)gZii9lp2P14J^OxQ-1_IhE%>L%XB9vB#yYCd6h!vDXj%FAR2eC+B!)YjQayj|L7yW$M* z;)(6ds6{+Dt2{q*K3BA!=aMw(f1tZP37I+%6xLeG@T#ygaCIT`8a-32dgxu;Cn{Gn{(rBjP@^`&+H7xZ}py^}8dIF1LO=W)SL zJ~Qs`ND6-pt-kQPik-kogP=tg|L# z(cV7{Uai3tIGE=rJUerUaId(v=n$`9Lj|gM#sdw_#vqoDNyV}Iur|!~vU|yd<_;RG zvL|>i76P@#dej=okpc&OJzb>Ws{d@cGN-P8<-*Eoa6z2n`}bJX*S+8w+P5ETqo=VE$}wusY%#CVo25^yyi#xtaZV z{al+`;V9|DU4Ae0u4pZH&%s02R^bFF7pcL=?!)fau|c&Cp+IZoWB0gCT!j0GWQ&d| zKcL>o*P~GOzm@a7PBd$Ah2fwz$4br-ir}flw!=zRxl&Ky*)!#TKbJhh~X9_(O578t7&c91h;bo zZa!}DPCw?1j=@_7p)+->mrvvfF)@OKuM|SjAwRiFjOn7 zC`es#RgUjRM+qRh#OgQI0VOPhycLvaK*0k4Ie@_u_r`wx4&+}E(_A>)@ZJ}x;xSn zYzs+jzwE)-!KF4B>YW3@koUp{!}ws^x$eAm0O1$>QH7%`^p%q3U_c;SWV=-0C=30Sxs*n zISf79zhcl{4WrHnf<5@MNKxd_?s1QTM&it9qYsvn#__-3Lz-l=8&_`-z{ufIl*mW& zN%Oh;^Xs>VAKm@;hwV&~U5eeYyV-x)ZcfgYsXKOe+s#C7oK;G9?C!R?=tAAG`_yam zI7+I~e%fxVliVG4)py02T)}uE#A=@6HC76H3q%tIju3!o~KnF$V{so4C$#z zDr-z!EaX>3wwJhWPeLZOO=^6R>p6dX2C}ZbVj$~`diVZ5yQA{AsAlF{Y+-`@1HZ;|71iX66 znM7Ghv7J*4B^bpm4HS{U^i?FC0AQwATm)M4)5gYVRm2jJdCPs9b(l0+4-@i!{5s*={U(eeRCk zVYlk(?;mzqWy2Tt@$Ezuit-s-F(>{_P4vk{`SH;NiGC(k+8enVSjb|_Ve-ZNg-%J z2($Bm3e4>mtpUta8)5)Rn`Bl#7|k6rdIJOv+4- zhLtwj&MpI3;QR)_oU~Y=#|h#N0Zn6W&(C?f(6`<%got8br6sAzI-`F9Jx=XWV-u8f zp-fr~GCu#mQT6v<01Ke%GZO`u3j$s2BTtUAv+X(qdS7TmtN|`9xxG%Tl7Z%?Wo$>| zlvFT6r&VD~1275(m4?9?M9`%{yeI{5adCsE04QY%2Fbkyqk@*ljIP-W z>9uW%Lp#SDjLLvs3PyPh7BE=BU_dN67>K5e$czbiZyQsJDigGc}9LU zK<}9^c!EBtEZ~0*_$cuTKc{->d1!fmBJU^YOJCI&AIm>?Uw_af%`Qv6H<18=hL0EtMpBzV@gk*?6>Y4SidYe~6!6|l zRaAtWyJ%LgL0tA0+Al!TqvMgbfY}nmoHy=wf z_mABGunv#+t5Y^Sy$ox7J z1EK~9Tw_Zk*4CXzLc(BybGz%XX7(GnX{b-&j@QOuzzdbI4i@Wq>*{dR19l9&VW7Y@ zR5sv~z;|(7v_;^~`2)DSrVcT~#eVwijhJ-er-*-#9WHR5W;>j(Z-F(*D)z@`%|Bcot>RcD=I4Ba5xA6^lNBnKzw|>P_Ut)0rmzv&L^A~ zxLS8D+S}sccGn49dz&A1^=>3aiYKqDccaB(L2F~9z_~0IpcODTn#GE(fUCI~K&)8L z(~N)q%@on~odOqVrfBP|g{N6;vaPcgq@2JDufUOV0%Qh{V{JBCr6?rUW~0rDA`E(7 zULIYzaG_`nSF3o^ZjhawEzD{F=-2C(t}@6B!?1MeQo3f%8p0$HoIx!$Zv4urkWaE# z)2T(v$g{CF8Z{yT>4V+4o)9Eaic|opqep*ZWM(EXX%dREvPe-;5dnh68Z~MZMvWRp z0id7L>BN8m;-$jrbYeu)2sB2B-}=_3Rs=f583q7>b{DD~t%&Z|A#ha=Gostu(b*|} z>nlwr^l#}8=Q*dq^>68q(>@abaY~%_nLwM`;foe8ue7Nh-j*s@qr`rCTdH8Gw;+Fj zfWTSmwU^a1IXU!O5@YEN1OWUcZfemo@>KsH(6^cuf@1&_ZT;#{Vn|L-rT|b;QK2bk z61#s5dVH&}&~P^K29n{e_P_M_cd4$fPAZ9_DA=%JgK#aJH*X#RfTPQg3S8!@OacJU zEiDze*Vkka064P!34t3s?HvLDC+2_55x5&SZ6W~h!_7YwxSg|i5&-z}?I#89)+gU4 z0PusQ4+-2~)_h0+;L*7+3EaCIUm^hT#4fR)@7(#0W?;|cIGCM(SCpCo%9m!j%tKhw*)F*QlOMpOt@=MYFQ9 zC=k5vTPzkTtJB-Q$WWB`?{vtZ>!44}aLLKZl>PR|zzk$Enba~SAZVat$BvP-v@~hu zjEoG*JP#Sz0PtvNXh1_lgJF4($AhAxBI5CQH1*kl@=4zhmNGIjq~|q4a&j`QtE)pG z5YS%E&YaOm9;vCRl$SiRZ8m?(O91e-orl})5t6U1%h9Ts>?9tKhXNrZ zF#|aq4#N+~pdXm5tSnkmQbNLgJM;(y0$_DYN=h^XR$pI_`ucj5l#~#5++81-j_LVh zzTMEdg)duqc{$;w9;vCRw5qB~;EF;XUr`u0T@Q!DK?V;VEEp;=F_C|^wY9-yGSNUF zKs_E0ZEtVKsZ*z@@S7AJ9Zmgyzk1S`m>A86_4#~4hmw<%DZ4v1s>j!5oX_VY{Bd_5 zFeWC3^5yh-BOM!zy1F_H9y}O)Uxy7FMo*tUZJ0NiOtiDJlQ7A*J8al6^)s?Mzg_+i zO&%cLbUPZG@v~JQs`YRYRkt0VE;bzwF_Y=LLfbfH;H&AzA#_5fL_aPv+2EW$eVWJyn}H3Q-axXly#X6DzAtTUZLnCn?$La{;Jx29@9q-dx68%b z0e%)4fnDPKem{IZAKKg7k(HH2x;0YXk^+LMc^#Ns{>Hx% z+mIntIeXSn_Wa{s1JKQiL*9}CYKK$kzhjt)&oLE4b9;N|ki*HL)Aumu7^ z`S~DC9ssO=Hfs#8&xZpmYgEUUZ8Q85oXECG>oC0$-xr+7wo#U3{KTYHVf8$30)VWP zb5thV1MO%H_=SJe9%x5&M4Xh1j);Te_Y=ipA&TEmlqvOu&jUbRLmgV*cToUnecwgv z8oE}~nO+9IEZ+u?!^`)G3xgrJMGsq}m+|}4f`iOtPvJh(m1OYx#QBjCyM{8o*JnaT z?3ykY9FBZQWf;^q*?Xnu5jiW7gv)nVj~Pc_j~P*Ky#0S^Hp&mSY{0`A!H8pR$@mH7 zLARVqhK$%Xlnp+A3;?CgOG#<-Qj!t7hO%QIWTdKs;Hs-$20Gf{Z)+A(prZ}eh=Eeh z8X-Qk)1&o$7i9w+IV+LygL=B=w5DvuYVF!#e=be*=hD*VrGy;=q3227X`6_3`y9$k*-3dg zn@%DjCP}LA4w17G2|xIwmSqzD*ob3#UZ=Qu^7Z`z9u9HhJifcl0e3~gOVWwNh$_5))Fq<{YiwBk>-GzEDQ&8uc5d z=e&PDlbZBs3@vLg$s;wia-3=tKUAvCMjL%TDc9)psfh<^6vMU{?0^4|Hd}5Xyaa%X zj@2Z$WFwy2yB@WXdE~jh>ycZs5fvS)!_J}$F@zC1EiHzeW@Kds>JH31;k^_dvVjiA zF8pCN@;v$H)9suYFzARka4m-KabL&)mNbTtl_CeMrl0Gl_gro(T3h$#C{V))GukFV*__L;OJpX)-7y``r z7jFMlI+&Mxpf3ddIxQ{205F)NI=j*q22(&1)*3>01~eou5lsImhUhD< z1_NHvVa8XA0k3Eyg~LCS0k6IKB0*ma`0NKZD!Tz@di{MDukW;&4fHKAM|FQ({`;io zmi;F+M?|8dtrdC+K+rLHOX*igF`H4{(ILo#8Q(Fi7p~2|a{bQ@&;;M`62L|0F8fR} zM?@m^h8qNZRb?dr7;-6QGiFDMuMci+ZN*`(P1E=X&{_NkX`8d=Ka2O*|4QKYU%xu~>(jY3}v#?F5Q01Qn?!S}xC;{SGgE^0$hc84aU07$|2zF2|3-JS~o z-Ex=RNF8mhcyrA!)%;VxSgz^;7;@De9k6`$mC7}a9}fVi_W97!)~ddk_U4RCJau4; zrcK687&X9F|9Td%IdTd%HyIU+JFmtqcHx0!JU6c=MaaWPWN zX0_g1uddQazRhqPGf;n1`T&7r`na-2l{1Rtutp5LB-|yLN#UMAcC@v^W&U{w6&te?}x|ZQP0!j_p5D&~MYbhNd?+2m5=JN$ocz~2^pO_arV@H&=f zTtZBe$}`DxvNro{q;Q4^x6E&jh*Sq(uLoerrI^jCVR)pN%{Uw(dDWe3GaNVJ{C@0D zn*ac4PD{ds^ZViCxqcJSoR*~Koe_~piW9du0Dz>p>j40V=iZ8O8`rD)!*k~&DbA_M zkK4E&hv&}M)H8o-lPHQJb^DgzT1braKyb}WrU!sm3V%#xdf>|N?!0!NCisSzY+x@Y zN4}Rnjb2W7a@Bt=BI6+Lz;YN9|EZU!E(TI(&lbj|YV&5&FE;YJKDmW`<;Gzj%~|@t zLI(@ifcDf-Hy(YNp2&PbT9&=FDC4qH&e4+U>!e(4b~b-)Hh7!yQq8hG?dSBK#2udmeR}s9V9fg~06=gV8P^k+FB`v9b(Qu#-0l3kKbmRkgQA%ZJXKP+@b=vK4$B0jZopw7+)`)?spU-f3 z=3Q2h)^%T|B)xztM`p8;7&kQ2VGlR(TH|l1AKF>on_5~s>EsdTza|TB5 zDC=QzHl0-6!N1-+U*i@sF8$rt@Yj3iBmLdi1de}qC3{lu;GrYxOV4~dc<6|xV}U?` zc)j8-U^^yb!J@U^B>SwQ2@s_qxaEDq2gEL1jd3dL7B0Y(Z?@@J`#*_4YY?yAJ?lZljSq$?qbf z-;krPZT1z+W72z0eZ`GOUk<*eY2fa&GU521!n%D9ed2H567=t24($hsZf2HcrTQZo z&V2=fhLP>#00a%gx5a~<(}>sao~Wsta*o20FL-U?5X0|Uq6^53vDs)^^){5J+^2ux zYEP914>IL#TDQ-k>~?_v&0@yop*N)7xH~GMq_-wJDx$hp!LuwYDNB5zaPI4+0y7ZX zN{k0H5PKVuAvrmjR#a4IB+u^zkWgNZos#pV?VSQR@`JL6V3#Il9R5;Od#W6@r^<06 z^990=^>t5VzCdJ`HyQc?!GY&1@ZWz5>-IUcia!CwHvwgX$xu~L0ZfzYtq8TPHFYtIEdHlrB`TK0UIz9`aPN!NcEsyA+Ze0)5eKYzZ^=KA&Pdt)dH;9?uKuWf4Tefra% z(i|D7-6f)LSesOdL~D1E~)hU!5h%y^1$tO3(4d1=qk%M^(ZPT zA`J}TgnL<(LA%q)C(10+DOi z5+Jy)berxbkk>`7T}yvh-c#w3ZnNpB^ZdfXjuQxt!~FAD07*cbG5-8+j^!oBMf3u&ap4^6!?jnqI7hzO;2}ZS-V8)9dYRZP&+q)paTa={s*a{ z0b93jm3nQ=S>Qc8Uh-vS9BY&J3QJ2%$zv-PP*N-YX$XHEYQb-E^9jWJ9HYFfoIH6FdgEO{o6G<}_XeU8PTvO4L!vhX^G;b( zjmHYGKnwlyIeR3)W()s_psJt(e4qxaD+{RLcifMOiJ{fi)nJMD=1NOTNpf;Bb-Ue2 zPEHnP5!-(bTV{mn>S~Pyf-Cg0e&|;2$(Ai!WHUw8OZadcB2dzL-96)*wfU(@h%;>3y2r;G6yHUQAF zQtph59zB}2tXxS)j~*>uDDBOfn8WF(YgR79%=_#x5?Vq&8DWVEcTOuF*SM~KE|XH%B+C$rn_ zG%MvC-MxFa{DU4pE~uiSqNv?&2aX?y-EK!zRFqn`u&|JZmT$<25hDn{yaIH^kn`cY zqems9*{9tJvf0-Jer6dBXm=R<=^T3GZh3#u(9gWkc3&%Y4#$o90FLsPjdElHz%D8a#0C7fHSKLFrxgQhjihFu&czqNT%WHp@ zg$fD^V6)lOe7Ke8;lqP}uzTnba40sL;*j`u!JD7i@FVvI>`0i0$&Z&*VeO7!kV@{yq<+bd=%9bKJBagSE&56R^Y(n`FKLAc*3kI$)9Q@>=fMcF z*lC8zlP41|CS$Tu0SU&98%GWwK1}&MJ6^bOA<4_jqkNvPD>KahRX7kE6Q{Z4#m2-j z=K%mPXzdQ-1*FCRLW3SE$LlNoRM4?C40TNZ^xjs@eW(6D)H`j{wOH_f258pq^se89 za(iqx%2IFYjknn-OGf9soapPgTr3bpQ8aPV49v6WE5~@Bq7Wu|eYiGdZSZBs+ibMh zUB$=B^L^#`d{4{u1pIwOZ#W|Z@w|S< zU&v?YzZCj&{d&KTvZUu07nIR6r|no=P^NMwAb45YiC|FsPH0`hzH*G0UGBow(+AY+ z^FBo(J0*kC9k(YmXtGPMk^VwHJ8RSEOTo_+9PR`mLc23eMsw5p&2srQc(p6uRu^krImsvJW{rb*xHG2$*K`1f}&H7=;W7Jd_?Z&-Nze*Vw z9UTo`@*FGA*DG#s$5;0KkV%b^!WrV32{A;^FD@vfyf?x;5@vrO9*6SmSX=p&T3`QI zq__C0T-0^fR(HlXdQMhUR77~r<7>me(qVY}WFdTYHF*1EA^w#PgU8pVasV`vadpkj z@YU65q{r8WTLyg>@rO3xhd1S5+~_;-!<%vte`o`48T8#QBP}i{qt8r;A!kmD|8B_} zgNOb{kLBx^CZd0}C>m|MV>HRVAx`tbdCB9zfdfWksdDFria*rh9!8o>Cc0)D@9*IfEd%iL}5|eJ&-`?PchkuXC*Mke%m9ID8hKGL-fLjGW zYjMPN$P}c6L&e$s}-m*fooh&vzcg0&)ug z;2sPDT3xCh02Yv2kPN`(a;Y-kc@PUChTtAD9B6f^_3ptSz->o<+gU6iw;H89nV=#&bml-HjUTPp97$46P(=CV?g8Z`wHRbZp293aTyj&15M9}dvT$>l<-RbWS z^!a@cbglL>16?VwJ@6>aZ#x?t+>liM5cFVe4?KTL$K1I9$9Cm|NuJZU#dESYiMx6m z9Xb8CIQ6HWK`-M+PDjGnsc;|pM36;AMWj17w6|QiT_ub6{q>46a&JJ6e)L^BGC3Zn z93JSUYv5}bI&>&%Yik90-=fzMKXQ!Fpy$*v06@Q}So~t^M|k^*=kVk^ujADjGjYBp z__TkkFk0MHBFCSA^n`Z9eZluDyRKRz^~-!d0nKN=#FXz$4XFm=$cbIZOdJc~6*Qmu z65m%j;K+$xn36aa0N~iQ9wT+!h!B?;6$@qOx8bX+fwJ@40D`V70MvChYdoX(d}Z*o zM4=<94V|5x>bB58aQkVtC+gJ-69A0-&QyOKIk5{saG=NDc&A#xi2FFIUdnwORj<}P zuwe}TW!^Cy*r1(p%w^R}quqzY?Mi$#z?APi2$#!+5d+6+WWMtt!g1Br)l#myx>~L0 za=Gy7+9dTj-+2&l+woHAPPkkyjfC5-+28v=o_ZP{k4LkI_tgr5L8F5n#gJQ6rN&TY zyhNNH3nGSKLdFOrB}xAD-s!xmf0Ljn3NUCi&9_=9FBL_(q?|q}ih}VIzfULF?xZsL ejSkW`jQ Date: Tue, 29 Oct 2024 18:01:46 +0000 Subject: [PATCH 08/15] Automatic changelog for PR #7419 [ci skip] --- html/changelogs/AutoChangeLog-pr-7419.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-7419.yml diff --git a/html/changelogs/AutoChangeLog-pr-7419.yml b/html/changelogs/AutoChangeLog-pr-7419.yml new file mode 100644 index 000000000000..6834aa7b3b8a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-7419.yml @@ -0,0 +1,5 @@ +author: "Blundir" +delete-after: True +changes: + - rscadd: "new minimap icons for numerous things" + - bugfix: "fixed squads having incorrect colors on minimap" \ No newline at end of file From ea9135ba98c8edf9b453c0d610404ce6483cf426 Mon Sep 17 00:00:00 2001 From: Nanu308 <59782240+Nanu308@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:56:28 +0100 Subject: [PATCH 09/15] Better Control of Weeding and Areas - Landing Zone edition. (#7363) # About the pull request This PR adds the feature of; On Marine drop to the planet/station, weeds will be deleted from set areas according to the landing zone they select, and a non harmful gas will spawn and disappear shortly after as a lore reason for the weeds disappearing (Agent Orange). The areas which the weeds are deleted from can not be weeded for Eight Minutes, Original test had Five Minutes. Both timers and areas selected are subject to change. The old system has been removed from playable areas. No longer do you need to wait for 20mins to weed an area after marine drop. All of the colony belong to you xeno!!! (Until Marines land) Survs might have it harder :D) Features for timed blockers like caveins etc. has been added, see next paragraph as an example of usecase. Big Red, South West Cave now has timed blockers to hinder a SW hive and Marines alike from going a straight line to attack each other. These blockers dissappear in a "cavein" at fourty minutes from roundstart, Roughly on average twenty minutes after marines land. Ovi Queen Feature. Restricts areas queens can ovi & place the hivecore in at roundstart. This also has a set timer on it, making it so queens are only allowed to Ovi+Hivecore in mapper set areas on roundstart, but as the round progresses all areas unlock and the queen can move anywhere. Currently set to 25 Minutes from roundstart. **If you believe an area is intended to be Ovi'd in but missed, message or ping me on Discord about it.** # Explain why it's good for the game This is to hinder instant FOB sieges and give Marines a bit more of a headstart into the early round so they do not immediately get pushed back to the FOB, and the game turns into a siege which are boring for several xeno castes and marine players alike. This will hopefully allow more skirmishing across the middle of the map. If this is a success we might be able to get rid of the non-weedable areas from roundstart & for 20mins after marine drop which the game currently has in effect on several maps. This keeps the game the same up till Marines land, so survivors do not get a free holdout anymore like on the past test. This change is also less limiting on Xenos with both duration and area zones selected. I might add further areas that queen can hive in, if so, you can come with recommendations but i will let it be known i disagree with for example hiving right next to the LZ, or akin which makes the entire map go un-used. **FEEDBACK:** https://forum.cm-ss13.com/c/development/23 ![image](https://github.com/user-attachments/assets/3284afed-9d32-4d9e-97d2-5e5aeec505fe) # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Nanu, HarryOb, Spartanbobby add: Added a feature that will delete weeds in the surrounding area of the Marines selected landing zone, and keep them subject to be unweedable for the next eight minutes. balance: Maps currently affected by this change/test - Big Red, LV-624, Kutjevo, New Varadero, Sorokyne Strata, Prison Station Science Annex, Shiva's Snowball. maptweak: Slight area tweaks and changes to allow more subjective control over areas. maptweak: Big Red, South West Cave now has timed blockers to hinder a SW hive and Marines alike from going a straight line to attack each other. These blockers dissappear in a "cavein" at fourty minutes, Roughly on average twenty minutes after marines land. balance: Queens can only ovi and build the hivecore on "their" side of the map at roundstart, this protection drops off 25min from roundstart. /:cl: --------- Co-authored-by: harryob <55142896+harryob@users.noreply.github.com> Co-authored-by: harryob --- code/__DEFINES/__game.dm | 1 + .../dcs/signals/atom/signals_area.dm | 2 + code/__DEFINES/maps.dm | 5 + code/datums/components/resin_cleanup.dm | 19 + code/game/area/BigRed.dm | 38 +- code/game/area/DesertDam.dm | 391 +- code/game/area/LV624.dm | 34 +- code/game/area/areas.dm | 21 + code/game/area/kutjevo.dm | 31 +- code/game/area/prison_v3_fiorina.dm | 49 +- code/game/area/shiva.dm | 35 +- code/game/area/strata.dm | 33 +- code/game/area/varadero.dm | 56 +- .../colonialmarines/colonialmarines.dm | 100 +- .../objects/effects/effect_system/smoke.dm | 14 + .../objects/effects/landmarks/landmarks.dm | 4 + code/game/turfs/walls/wall_types.dm | 1 + code/game/turfs/walls/walls.dm | 6 + code/modules/cm_aliens/XenoStructures.dm | 4 + code/modules/cm_aliens/weeds.dm | 4 + code/modules/mapping/mapping_helpers.dm | 162 + .../mob/living/carbon/xenomorph/Powers.dm | 4 + .../xenomorph/abilities/general_powers.dm | 3 + .../xenomorph/abilities/queen/queen_powers.dm | 5 + code/modules/unit_tests/create_and_destroy.dm | 1 + colonialmarines.dme | 3 + maps/map_files/BigRed/BigRed.dmm | 895 +-- .../BigRed/sprinkles/15.reactor_meltdown.dmm | 338 +- maps/map_files/DesertDam/Desert_Dam.dmm | 74 +- .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 5494 +++++++++-------- .../Ice_Colony_v3/Shivas_Snowball.dmm | 1481 +++-- maps/map_files/Kutjevo/Kutjevo.dmm | 1642 ++--- maps/map_files/LV624/LV624.dmm | 63 +- maps/map_files/New_Varadero/New_Varadero.dmm | 1102 ++-- .../Sorokyne_Strata/Sorokyne_Strata.dmm | 56 +- 35 files changed, 7005 insertions(+), 5166 deletions(-) create mode 100644 code/__DEFINES/dcs/signals/atom/signals_area.dm create mode 100644 code/datums/components/resin_cleanup.dm create mode 100644 code/modules/mapping/mapping_helpers.dm diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index e95ea026d749..f84b3d316d3c 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -187,6 +187,7 @@ #define DOCK_ATTEMPT_TIMEOUT 20 SECONDS #define DROPSHIP_WARMUP_TIME 10 SECONDS #define DROPSHIP_DROP_MSG_DELAY 30 SECONDS +#define DROPSHIP_DROP_FIRE_DELAY 20 SECONDS #define DROPSHIP_TRANSIT_DURATION 100 SECONDS #define DROPSHIP_CORSAT_DURATION 30 SECONDS #define ELEVATOR_TRANSIT_DURATION 5 SECONDS diff --git a/code/__DEFINES/dcs/signals/atom/signals_area.dm b/code/__DEFINES/dcs/signals/atom/signals_area.dm new file mode 100644 index 000000000000..609b9e69e660 --- /dev/null +++ b/code/__DEFINES/dcs/signals/atom/signals_area.dm @@ -0,0 +1,2 @@ +/// From /area/proc/purge_weeds() +#define COMSIG_AREA_RESIN_DISALLOWED "area_weeds_disallowed" diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index ef3d17572f0d..84c0fc429732 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -120,3 +120,8 @@ require only minor tweaks. /// A map key that corresponds to being one exclusively for Space. #define SPACE_KEY "space" + +#define SENTRY_TOP_LEFT "top_left" +#define SENTRY_TOP_RIGHT "top_right" +#define SENTRY_BOTTOM_LEFT "bottom_left" +#define SENTRY_BOTTOM_RIGHT "bottom_right" diff --git a/code/datums/components/resin_cleanup.dm b/code/datums/components/resin_cleanup.dm new file mode 100644 index 000000000000..4305e4b358a4 --- /dev/null +++ b/code/datums/components/resin_cleanup.dm @@ -0,0 +1,19 @@ +/** + * Handles cleaning up resin when the area requests it + */ +/datum/component/resin_cleanup + +/datum/component/resin_cleanup/Initialize(...) + var/area/parent_area = get_area(parent) + + RegisterSignal(parent_area, COMSIG_AREA_RESIN_DISALLOWED, PROC_REF(cleanup_resin)) + +/datum/component/resin_cleanup/proc/cleanup_resin() + SIGNAL_HANDLER + + if(isturf(parent)) + var/turf/parent_turf = parent + addtimer(CALLBACK(parent_turf, TYPE_PROC_REF(/turf, ScrapeAway)), rand(1 SECONDS, 5 SECONDS)) + return + + QDEL_IN(parent, rand(1 SECONDS, 5 SECONDS)) diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index c5e96c78175a..d3f87d2fe478 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -20,6 +20,7 @@ name = "\improper Garage Workshop" icon_state = "green" ceiling = CEILING_METAL + linked_lz = DROPSHIP_LZ1 /area/bigred/ground/ship name = "\improper Crashed Vessel" @@ -262,6 +263,7 @@ sound_environment = SOUND_ENVIRONMENT_ROOM soundscape_playlist = list() minimap_color = MINIMAP_AREA_RESEARCH + unoviable_timer = FALSE /area/bigredv2/caves/lambda/virology name = "\improper Lambda Virology" @@ -289,6 +291,7 @@ ambience_exterior = AMBIENCE_CAVE soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH + unoviable_timer = FALSE // serve for the security checkpoint. /area/bigredv2/outside/lambda_cave_cas @@ -329,7 +332,7 @@ /area/bigredv2/outside/nw name = "\improper Northwest Colony Grounds" icon_state = "northwest" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 soundscape_playlist = SCAPE_PL_DESERT_STORM /area/bigredv2/outside/nw/ceiling @@ -348,7 +351,7 @@ /area/bigredv2/outside/w name = "\improper Western Colony Grounds" icon_state = "west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/e name = "\improper Eastern Colony Grounds" @@ -368,7 +371,7 @@ /area/bigredv2/outside/sw name = "\improper Southwest Colony Grounds" icon_state = "southwest" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 soundscape_playlist = SCAPE_PL_DESERT_STORM /area/bigredv2/caves @@ -387,7 +390,7 @@ name = "\improper Southwest Abandoned Mining Caves" icon_state = "bluenew" color = "purple" - + unoviable_timer = FALSE /area/bigredv2/caves/eta ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS @@ -395,6 +398,7 @@ ambience_exterior = AMBIENCE_ALMAYER sound_environment = SOUND_ENVIRONMENT_ROOM soundscape_playlist = list() + unoviable_timer = FALSE /area/bigredv2/outside/eta name = "\improper Eta Labs Compound" @@ -422,25 +426,27 @@ name = "\improper Cargo" icon_state = "storage" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/general_store name = "\improper General Store" icon_state = "blueold" ceiling = CEILING_METAL - + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/marshal_office name = "\improper Marshal Offices" icon_state = "brig" ceiling = CEILING_METAL minimap_color = MINIMAP_AREA_SEC + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/medical name = "\improper Hospital" icon_state = "CMO" ceiling = CEILING_METAL minimap_color = MINIMAP_AREA_MEDBAY + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/admin_building name = "\improper Administration" @@ -461,6 +467,7 @@ ceiling_muffle = FALSE base_muffle = MUFFLE_MEDIUM minimap_color = MINIMAP_AREA_MEDBAY + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/dorms name = "\improper Dormitories" @@ -496,14 +503,14 @@ name = "\improper Space Port" icon_state = "green" ceiling = CEILING_GLASS - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 is_landing_zone = TRUE /area/bigredv2/outside/space_port_lz2 name = "\improper Cargo Landing Pad" icon_state = "green" ceiling = CEILING_NONE - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ @@ -512,7 +519,7 @@ name = "\improper LZ1 Communications Relay" icon_state = "ass_line" ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 ceiling_muffle = FALSE base_muffle = MUFFLE_LOW is_landing_zone = TRUE @@ -524,6 +531,7 @@ /area/bigredv2/outside/telecomm/n_cave name = "\improper North Cave Communications Relay" is_landing_zone = FALSE + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/telecomm/warehouse name = "\improper Warehouse Communications Relay" @@ -550,6 +558,11 @@ name = "\improper Engineering Complex" icon_state = "engine" ceiling = CEILING_METAL + linked_lz = DROPSHIP_LZ2 + +/area/bigredv2/outside/engineering/reactor + name = "\improper Main Reactor" + linked_lz = null /area/bigredv2/outside/storage name = "\improper Storage" @@ -601,6 +614,7 @@ soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH minimap_color = MINIMAP_AREA_RESEARCH_CAVE + unoviable_timer = FALSE /area/bigredv2/caves_se name = "\improper Southeastern Caves" @@ -611,6 +625,7 @@ ambience_exterior = AMBIENCE_CAVE soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH + unoviable_timer = FALSE /area/bigredv2/caves_east name = "\improper Eastern Caves" @@ -621,6 +636,7 @@ ambience_exterior = AMBIENCE_CAVE soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH + unoviable_timer = FALSE /area/bigredv2/caves_north name = "\improper Northern Caves" @@ -650,21 +666,25 @@ name = "\improper Northern Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/lz1_telecomm_cas name = "\improper Virology Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/lz2_west_cas name = "\improper Southwestern Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/lz2_south_cas name = "\improper ETA Lockdown Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/filtration_cave_cas name = "\improper Filtration Lockdown Caves Entrance" diff --git a/code/game/area/DesertDam.dm b/code/game/area/DesertDam.dm index 9f53494b1bbf..f9907969f28d 100644 --- a/code/game/area/DesertDam.dm +++ b/code/game/area/DesertDam.dm @@ -11,68 +11,65 @@ // areas under rock /area/desert_dam/interior ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS + //NorthEastern Lab Section /area/desert_dam/interior/lab_northeast name = "Northeastern Lab" icon_state = "purple" minimap_color = MINIMAP_AREA_RESEARCH + unoviable_timer = FALSE + /area/desert_dam/interior/lab_northeast/east_lab_lobby name = "East Lab Lobby" icon_state = "green" + /area/desert_dam/interior/lab_northeast/east_lab_west_hallway name = "East Lab Western Hallway" icon_state = "blue" + /area/desert_dam/interior/lab_northeast/east_lab_central_hallway name = "East Lab Central Hallway" icon_state = "green" + /area/desert_dam/interior/lab_northeast/east_lab_east_hallway name = "East Lab East Hallway" icon_state = "yellow" + /area/desert_dam/interior/lab_northeast/east_lab_workshop name = "East Lab Workshop" icon_state = "ass_line" -/area/desert_dam/interior/lab_northeast/east_lab_storage - name = "East Lab Storage " - icon_state = "storage" -/area/desert_dam/interior/lab_northeast/east_lab_RD_office - name = "East Lab Research Director's Office" - icon_state = "yellow" + /area/desert_dam/interior/lab_northeast/east_lab_maintenence name = "East Lab Maintenence" icon_state = "maintcentral" + /area/desert_dam/interior/lab_northeast/east_lab_containment name = "East Lab Containment" icon_state = "purple" + /area/desert_dam/interior/lab_northeast/east_lab_RND name = "East Lab Research and Development" icon_state = "purple" + /area/desert_dam/interior/lab_northeast/east_lab_biology name = "East Lab Biology" icon_state = "purple" -/area/desert_dam/interior/lab_northeast/east_lab_surgery - name = "East Lab Surgery" - icon_state = "red" + /area/desert_dam/interior/lab_northeast/east_lab_excavation name = "East Lab Excavation Prep" icon_state = "blue" + /area/desert_dam/interior/lab_northeast/east_lab_west_entrance name = "East Lab West Entrance" icon_state = "purple" + /area/desert_dam/interior/lab_northeast/east_lab_east_entrance name = "East Lab Entrance" icon_state = "purple" -/area/desert_dam/interior/lab_northeast/east_lab_security_checkpoint - name = "East Lab Security Checkpoint" - icon_state = "purple" -/area/desert_dam/interior/lab_northeast/east_lab_security_office - name = "East Lab Security Office" - icon_state = "security" + /area/desert_dam/interior/lab_northeast/east_lab_security_armory name = "East Lab Armory" icon_state = "armory" -/area/desert_dam/interior/lab_northeast/east_lab_xenobiology - name = "East Lab Xenobiology" - icon_state = "red" //Dam Interior /area/desert_dam/interior/dam_interior @@ -81,78 +78,103 @@ /area/desert_dam/interior/dam_interior/engine_room name = "Engineering Generator Room" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/control_room name = "Engineering Control Room" icon_state = "red" + /area/desert_dam/interior/dam_interior/smes_main name = "Engineering Main Substation" icon_state = "purple" + /area/desert_dam/interior/dam_interior/smes_backup name = "Engineering Secondary Backup Substation" icon_state = "green" + /area/desert_dam/interior/dam_interior/engine_east_wing name = "Engineering East Engine Wing" icon_state = "blue-red" + /area/desert_dam/interior/dam_interior/engine_west_wing name = "Engineering West Engine Wing" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/lobby name = "Engineering Lobby" icon_state = "purple" + /area/desert_dam/interior/dam_interior/atmos_storage name = "Engineering Atmospheric Storage" icon_state = "purple" + /area/desert_dam/interior/dam_interior/northwestern_tunnel name = "Engineering Northwestern Tunnel" icon_state = "green" + /area/desert_dam/interior/dam_interior/north_tunnel name = "Engineering Northern Tunnel" icon_state = "blue-red" + /area/desert_dam/interior/dam_interior/west_tunnel name = "Engineering Western Tunnel" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/central_tunnel name = "Engineering Central Tunnel" icon_state = "red" + /area/desert_dam/interior/dam_interior/south_tunnel name = "Engineering Southern Tunnel" icon_state = "purple" + /area/desert_dam/interior/dam_interior/northeastern_tunnel name = "Engineering Northeastern Tunnel" icon_state = "green" + /area/desert_dam/interior/dam_interior/CE_office name = "Engineering Chief Engineer's Office" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/workshop name = "Engineering Workshop" icon_state = "purple" + /area/desert_dam/interior/dam_interior/hanger name = "Engineering Hangar" icon_state = "hangar" + /area/desert_dam/interior/dam_interior/hangar_storage name = "Engineering Hangar Storage" icon_state = "storage" + /area/desert_dam/interior/dam_interior/auxilary_tool_storage name = "Engineering Auxiliary Tool Storage" icon_state = "red" + /area/desert_dam/interior/dam_interior/primary_tool_storage name = "Engineering Primary Tool Storage" icon_state = "blue" + /area/desert_dam/interior/dam_interior/tech_storage name = "Engineering Secure Tech Storage" icon_state = "dark" + /area/desert_dam/interior/dam_interior/break_room name = "Engineering Breakroom" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/disposals name = "Engineering Disposals" icon_state = "disposal" + /area/desert_dam/interior/dam_interior/western_dam_cave name = "Engineering West Entrance" icon_state = "red" + /area/desert_dam/interior/dam_interior/office name = "Engineering Office" icon_state = "red" + /area/desert_dam/interior/dam_interior name = "Engineering" icon_state = "" @@ -160,15 +182,19 @@ /area/desert_dam/interior/dam_interior/north_tunnel_entrance name = "Engineering North Tunnel Entrance" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/east_tunnel_entrance name = "Engineering East Tunnel Entrance" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/south_tunnel_entrance name = "Engineering South Tunnel Entrance" icon_state = "red" + /area/desert_dam/interior/dam_interior/garage name = "Garage" icon_state = "green" + /area/desert_dam/interior/caves name = "Caves" ceiling = CEILING_DEEP_UNDERGROUND @@ -178,35 +204,28 @@ soundscape_interval = 25 sound_environment = SOUND_ENVIRONMENT_AUDITORIUM minimap_color = MINIMAP_AREA_CAVES -/area/desert_dam/interior/caves/northern_caves - name = "Northern Caves" - icon_state = "red" + /area/desert_dam/interior/caves/east_caves name = "Eastern Caves" icon_state = "red" + unoviable_timer = FALSE /area/desert_dam/interior/caves/central_caves name = "Central Caves" icon_state = "yellow" -/area/desert_dam/interior/caves/central_caves/entrances/east_tunnel_entrance - name = "Eastern Central Tunnel Entrance" - icon_state = "red" -/area/desert_dam/interior/caves/central_caves/entrances/south_tunnel_entrance - name = "Southern Central Tunnel Entrance" - icon_state = "red" -/area/desert_dam/interior/caves/central_caves/entrances/west_tunnel_entrance - name = "Western Central Tunnel Entrance" - icon_state = "red" + unoviable_timer = FALSE /area/desert_dam/interior/caves/temple name = "Sand Temple" icon_state = "green" + unoviable_timer = FALSE //BUILDING //areas not under rock // ceiling = CEILING_METAL /area/desert_dam/building ceiling = CEILING_METAL + //Substations /area/desert_dam/building/substation name = "Substation" @@ -217,25 +236,23 @@ name = "Command Substation" icon_state = "northewestern_ss" is_landing_zone = TRUE + /area/desert_dam/building/substation/northeast name = "Command Substation" icon_state = "northeastern_ss" -/area/desert_dam/building/substation/east - name = "Command Substation" - icon_state = "eastern_ss" -/area/desert_dam/building/substation/southeast - name = "Command Substation" - icon_state = "southeastern_ss" + /area/desert_dam/building/substation/central name = "Command Substation" icon_state = "central_ss" + /area/desert_dam/building/substation/southwest name = "Command Substation" icon_state = "southwestern_ss" + /area/desert_dam/building/substation/west name = "Command Substation" icon_state = "western_ss" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Administration /area/desert_dam/building/administration @@ -244,76 +261,94 @@ /area/desert_dam/building/administration/control_room name = "Administration Landing Control Room" icon_state = "yellow" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/lobby name = "Administration Lobby" icon_state = "green" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/hallway name = "Administration Hallway" icon_state = "purple" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/office name = "Administration Office" icon_state = "blue-red" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/overseer_office name = "Administration Overseer's Office" icon_state = "red" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/meetingrooom name = "Administration Meeting Room" icon_state = "yellow" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/archives name = "Administration Archives" icon_state = "green" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 //Bar /area/desert_dam/building/bar/bar name = "Bar" icon_state = "yellow" + /area/desert_dam/building/bar/backroom name = "Bar Backroom" icon_state = "green" + /area/desert_dam/building/bar/bar_restroom name = "Bar Restroom" icon_state = "purple" //Cafe +/area/desert_dam/building/cafeteria + name = "DO NOT USE" + icon_state = "purple" + unoviable_timer = FALSE + /area/desert_dam/building/cafeteria/cafeteria name = "Cafeteria" icon_state = "yellow" + /area/desert_dam/building/cafeteria/backroom name = "Cafeteria Backroom" icon_state = "green" -/area/desert_dam/building/cafeteria/restroom - name = "Cafeteria Restroom" - icon_state = "purple" + /area/desert_dam/building/cafeteria/loading name = "Cafeteria Loading Room" icon_state = "blue-red" + /area/desert_dam/building/cafeteria/cold_room name = "Cafeteria Coldroom" icon_state = "red" //Dorms +/area/desert_dam/building/dorms + name = "DO NOT USE" + icon_state = "purple" + unoviable_timer = FALSE + /area/desert_dam/building/dorms/hallway_northwing name = "Dormitory North Wing" icon_state = "yellow" + /area/desert_dam/building/dorms/hallway_westwing name = "Dormitory West Wing" icon_state = "green" -/area/desert_dam/building/dorms/hallway_eastwing - name = "Dormitory East Wing" - icon_state = "purple" + /area/desert_dam/building/dorms/restroom name = "Dormitory Showers" icon_state = "blue-red" + /area/desert_dam/building/dorms/pool name = "Dormitory Pool Room" icon_state = "red" @@ -322,67 +357,84 @@ //Medical /area/desert_dam/building/medical minimap_color = MINIMAP_AREA_MEDBAY + unoviable_timer = FALSE /area/desert_dam/building/medical/garage name = "Medical Garage" icon_state = "garage" + /area/desert_dam/building/medical/emergency_room name = "Medical Emergency Room" icon_state = "medbay" + /area/desert_dam/building/medical/treatment_room name = "Medical Treatment Room" icon_state = "medbay2" + /area/desert_dam/building/medical/lobby name = "Medical Lobby" icon_state = "medbay3" + /area/desert_dam/building/medical/chemistry name = "Medical Pharmacy" icon_state = "medbay" + /area/desert_dam/building/medical/west_wing_hallway - name = "Medical West Wing " + name = "Medical West Wing" icon_state = "medbay2" + /area/desert_dam/building/medical/north_wing_hallway name = "Medical North Wing" icon_state = "medbay3" + /area/desert_dam/building/medical/east_wing_hallway name = "Medical East Wing" icon_state = "medbay" + /area/desert_dam/building/medical/primary_storage name = "Medical Primary Storage" icon_state = "red" + /area/desert_dam/building/medical/surgery_room_one name = "Medical Surgery Room One" icon_state = "yellow" + /area/desert_dam/building/medical/surgery_room_two name = "Medical Surgery Room Two" icon_state = "purple" + /area/desert_dam/building/medical/surgury_observation name = "Medical Surgery Observation" icon_state = "medbay2" + /area/desert_dam/building/medical/morgue name = "Medical Morgue" icon_state = "blue" + /area/desert_dam/building/medical/break_room name = "Medical Breakroom" icon_state = "medbay" + /area/desert_dam/building/medical/CMO name = "Medical CMO's Office" icon_state = "CMO" + /area/desert_dam/building/medical/office1 name = "Medical Office One" icon_state = "red" + /area/desert_dam/building/medical/office2 name = "Medical Office Two" icon_state = "blue" -/area/desert_dam/building/medical/patient_wing - name = "Medical Patient Wing" - icon_state = "medbay2" + /area/desert_dam/building/medical/virology_wing name = "Medical Virology Wing" icon_state = "medbay3" + /area/desert_dam/building/medical/virology_isolation name = "Medical Virology Isolation" icon_state = "medbay" + /area/desert_dam/building/medical name = "Medical" icon_state = "medbay2" @@ -392,15 +444,17 @@ /area/desert_dam/building/warehouse/warehouse name = "Warehouse" icon_state = "yellow" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/building/warehouse/loading name = "Warehouse Loading Room" icon_state = "red" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/building/warehouse/breakroom name = "Warehouse Breakroom" icon_state = "green" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Hydroponics @@ -410,23 +464,19 @@ /area/desert_dam/building/hydroponics/hydroponics name = "Hydroponics" icon_state = "hydro" + /area/desert_dam/building/hydroponics/hydroponics_storage name = "Hydroponics Storage" icon_state = "green" + /area/desert_dam/building/hydroponics/hydroponics_loading name = "Hydroponics Loading Room" icon_state = "garage" + /area/desert_dam/building/hydroponics/hydroponics_breakroom name = "Hydroponics Breakroom" icon_state = "red" - -//Telecoms -/area/desert_dam/building/telecommunication - name = "Telecommunications" - icon_state = "yellow" - is_resin_allowed = FALSE - //Water Treatment Plant 1 /area/desert_dam/building/water_treatment_one minimap_color = MINIMAP_AREA_ENGI @@ -434,74 +484,69 @@ /area/desert_dam/building/water_treatment_one name = "Water Treatment One" icon_state = "yellow" + //Water Treatment Plant 1 /area/desert_dam/building/water_treatment_one/lobby name = "Water Treatment One Lobby" icon_state = "red" + /area/desert_dam/building/water_treatment_one/breakroom name = "Water Treatment One Breakroom" icon_state = "green" + /area/desert_dam/building/water_treatment_one/garage name = "Water Treatment One Garage" icon_state = "garage" -/area/desert_dam/building/water_treatment_one/sedimentation - name = "Water Treatment One Sedimentation" - icon_state = "blue" + /area/desert_dam/building/water_treatment_one/equipment name = "Water Treatment One Equipment Room" icon_state = "red" + /area/desert_dam/building/water_treatment_one/hallway name = "Water Treatment One Hallway" icon_state = "purple" + /area/desert_dam/building/water_treatment_one/control_room name = "Water Treatment One Control Room" icon_state = "yellow" + /area/desert_dam/building/water_treatment_one/purification name = "Water Treatment One Purification" icon_state = "green" + /area/desert_dam/building/water_treatment_one/floodgate_control name = "Water Treatment One Floodgate Control" icon_state = "green" -/area/desert_dam/building/water_treatment_one/floodgate_control/central - name = "Central Floodgate Control" - icon_state = "green" - -/area/desert_dam/building/water_treatment_one/floodgate_control/central2 - name = "Central Floodgate Control Storage" - icon_state = "green" - //Water Treatment Plant 2 /area/desert_dam/building/water_treatment_two minimap_color = MINIMAP_AREA_ENGI + unoviable_timer = FALSE /area/desert_dam/building/water_treatment_two name = "Water Treatment Two" icon_state = "yellow" + /area/desert_dam/building/water_treatment_two/lobby name = "Water Treatment Two Lobby" icon_state = "red" -/area/desert_dam/building/water_treatment_two/breakroom - name = "Water Treatment Two Breakroom" - icon_state = "green" -/area/desert_dam/building/water_treatment_two/garage - name = "Water Treatment Two Garage" - icon_state = "garage" -/area/desert_dam/building/water_treatment_two/sedimentation - name = "Water Treatment Two Sedimentation" - icon_state = "blue" + /area/desert_dam/building/water_treatment_two/equipment name = "Water Treatment Two Equipment" icon_state = "red" + /area/desert_dam/building/water_treatment_two/hallway name = "Water Treatment Two Hallway" icon_state = "purple" + /area/desert_dam/building/water_treatment_two/control_room name = "Water Treatment Two Control Room" icon_state = "yellow" + /area/desert_dam/building/water_treatment_two/purification name = "Water Treatment Two Purification" icon_state = "green" + /area/desert_dam/building/water_treatment_two/floodgate_control name = "Water Treatment Two Floodgate Control" icon_state = "green" @@ -527,54 +572,67 @@ /area/desert_dam/building/security/prison name = "Security Prison" icon_state = "sec_prison" + /area/desert_dam/building/security/marshals_office name = "Security Marshal's Office" icon_state = "sec_hos" + /area/desert_dam/building/security/armory name = "Security Armory" icon_state = "armory" + /area/desert_dam/building/security/warden name = "Security Warden's Office" icon_state = "Warden" + /area/desert_dam/building/security/interrogation name = "Security Interrogation" icon_state = "interrogation" -/area/desert_dam/building/security/backroom - name = "Security Interrogation" - icon_state = "sec_backroom" + /area/desert_dam/building/security/observation name = "Security Observation" icon_state = "observatory" + /area/desert_dam/building/security/detective name = "Security Detective's Office" icon_state = "detective" + /area/desert_dam/building/security/office name = "Security Office" icon_state = "yellow" + /area/desert_dam/building/security/lobby name = "Security Lobby" icon_state = "green" + /area/desert_dam/building/security/northern_hallway name = "Security North Hallway" icon_state = "purple" + /area/desert_dam/building/security/courtroom name = "Security Courtroom" icon_state = "courtroom" + /area/desert_dam/building/security/evidence name = "Security Evidence" icon_state = "red" + /area/desert_dam/building/security/holding name = "Security Holding Room" icon_state = "yellow" + /area/desert_dam/building/security/southern_hallway name = "Security South Hallway" icon_state = "green" + /area/desert_dam/building/security/deathrow name = "Security Death Row" icon_state = "cells_max_n" + /area/desert_dam/building/security/execution_chamber name = "Security Execution Chamber" icon_state = "red" + /area/desert_dam/building/security/staffroom name = "Security Staffroom" icon_state = "security" @@ -583,100 +641,29 @@ /area/desert_dam/building/church name = "Church" icon_state = "courtroom" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Mining area +/area/desert_dam/building/mining + name = "DO NOT USE" + icon_state = "purple" + unoviable_timer = FALSE + /area/desert_dam/building/mining/workshop name = "Mining Workshop" icon_state = "yellow" + /area/desert_dam/building/mining/workshop_foyer name = "Mining Workshop Foyer" icon_state = "purple" -//Legacy Areas for mining - /* -/area/desert_dam/building/mining/garage - name = "Mining Garage" - icon_state = "garage" -/area/desert_dam/building/mining/boxing_room - name = "Mining Boxing Room" - icon_state = "red" -/area/desert_dam/building/mining/loading_room - name = "Mining Loading Bay" - icon_state = "yellow" -/area/desert_dam/building/mining/break_room - name = "Mining Breakroom" - icon_state = "purple" -/area/desert_dam/building/mining/locker_room - name = "Mining Locker Room" - icon_state = "green" -/area/desert_dam/building/mining/lobby - name = "Mining Lobby" - icon_state = "red" -/area/desert_dam/building/mining/front_desk - name = "Mining Front Desk" - icon_state = "green" -/area/desert_dam/building/mining/foremans_office - name = "Mining Foreman's Office" - icon_state = "yellow" -/area/desert_dam/building/mining/maintenance_north - name = "Mining Maintenance North" - icon_state = "dark160" -/area/desert_dam/building/mining/maintenance_east - name = "Mining Maintenance East" - icon_state = "dark128" -/area/desert_dam/building/mining/bunkhouse - name = "Mining Bunkhouse" - icon_state = "red" -/area/desert_dam/building/mining/construction_site - name = "Construction Site" - icon_state = "yellow" -*/ - //NorthWest Lab Buildings /area/desert_dam/building/lab_northwest minimap_color = MINIMAP_AREA_RESEARCH -/area/desert_dam/building/lab_northwest/west_lab_robotics - name = "West Lab Robotics" - icon_state = "ass_line" -/area/desert_dam/building/lab_northwest/west_lab_robotics_mechbay - name = "West Lab Mechbay" - icon_state = "purple" -/area/desert_dam/building/lab_northwest/west_lab_east_hallway - name = "West Lab Hallway" - icon_state = "red" -/area/desert_dam/building/lab_northwest/west_lab_west_hallway - name = "West Lab Hallway" - icon_state = "red" -/area/desert_dam/building/lab_northwest/west_lab_maintenance - name = "West Lab Maintenance" - icon_state = "purple" -/area/desert_dam/building/lab_northwest/west_lab_chemistry - name = "West Lab Chemistry" - icon_state = "yellow" -/area/desert_dam/building/lab_northwest/west_lab_cafeteria - name = "West Lab Cafeteria" - icon_state = "blue" -/area/desert_dam/building/lab_northwest/west_lab_kitchen - name = "West Lab Kitchen" - icon_state = "kitchen" -/area/desert_dam/building/lab_northwest/west_lab_dormitory - name = "West Lab Dormitory" - icon_state = "red" -/area/desert_dam/building/lab_northwest/west_lab_meeting_room - name = "West Lab Meeting Room" - icon_state = "purple" /area/desert_dam/building/lab_northwest/west_lab_xenoflora name = "West Lab Xenoflora" icon_state = "purple" -/area/desert_dam/building/lab_northeast/checkpoint - name = "East Lab Checkpoint" - icon_state = "red" -/area/desert_dam/building/lab_northeast/garage - name = "East Lab Garage" - icon_state = "garage" - //EXTERIOR //under open sky @@ -697,114 +684,126 @@ /area/desert_dam/exterior/landing_pad_one name = "Airstrip Landing Pad" icon_state = "landing_pad" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ -/area/desert_dam/exterior/landing_pad_one_external - name = "Airstrip Landing Valley" - icon_state = "landing_pad_ext" - is_resin_allowed = FALSE - minimap_color = MINIMAP_AREA_LZ - - //Landing Pad for the Normandy. THIS IS NOT THE SHUTTLE AREA /area/desert_dam/exterior/landing_pad_two name = "Aerodrome Landing Pad" icon_state = "landing_pad" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ -/area/desert_dam/exterior/landing_pad_two_external - name = "Aerodrome Landing Valley" - icon_state = "landing_pad_ext" - is_resin_allowed = FALSE - minimap_color = MINIMAP_AREA_LZ - //Valleys //Near LZ //TODO: incorporate valleys and substrations for floodlight coverage /area/desert_dam/exterior/valley + name = "Valley" + icon_state = "red" + /area/desert_dam/exterior/valley/valley_northwest name = "Northwest Valley" icon_state = "valley_north_west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/exterior/valley/valley_cargo name = "Shipping Valley" icon_state = "valley_south_west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/exterior/valley/valley_telecoms name = "Telecomms Valley" icon_state = "valley_west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 // Generic bridge used in nightmare inserts... Can in fact be different places (sigh) /area/desert_dam/exterior/valley/valley_bridge name = "Valley Bridge" icon_state = "valley" - //telecomms areas /area/desert_dam/exterior/telecomm name = "\improper Trijent Dam Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE ceiling_muffle = FALSE base_muffle = MUFFLE_LOW always_unpowered = 0 /area/desert_dam/exterior/telecomm/lz2_containers name = "\improper Containers Communications Relay" + linked_lz = DROPSHIP_LZ2 /area/desert_dam/exterior/telecomm/lz2_tcomms name = "\improper Telecomms Communications Relay" + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/exterior/telecomm/lz2_storage name = "\improper East LZ2 Communications Relay" + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/exterior/telecomm/lz1_south name = "\improper South LZ1 Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/desert_dam/exterior/telecomm/lz1_valley name = "\improper LZ1 Valley Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/desert_dam/exterior/telecomm/lz1_xenoflora name = "\improper Xenoflora Communications Relay" + linked_lz = DROPSHIP_LZ1 //Away from LZ /area/desert_dam/exterior/valley/valley_labs name = "Lab Valley" icon_state = "valley_north" + /area/desert_dam/exterior/valley/valley_mining name = "Mining Valley" icon_state = "valley_east" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/valley_civilian name = "Civilian Valley" icon_state = "valley_south_excv" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/valley_medical name = "Medical Valley" icon_state = "valley" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/valley_hydro name = "Hydro Valley" icon_state = "valley" + /area/desert_dam/exterior/valley/valley_crashsite name = "Crash Site Valley" icon_state = "yellow" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/north_valley_dam name = "North Dam Valley" icon_state = "valley" + /area/desert_dam/exterior/valley/south_valley_dam name = "South Dam Valley" icon_state = "valley" + /area/desert_dam/exterior/valley/bar_valley_dam name = "Bar Valley" icon_state = "yellow" + /area/desert_dam/exterior/valley/valley_wilderness name = "Wilderness Valley" icon_state = "central" + unoviable_timer = FALSE //Rivers @@ -829,43 +828,33 @@ A.check_filtered() - //End of the river areas, no Next -/area/desert_dam/exterior/river/riverside_northwest - name = "Northwestern Riverbed" - icon_state = "bluenew" /area/desert_dam/exterior/river/riverside_central_north name = "Northern Central Riverbed" icon_state = "purple" + /area/desert_dam/exterior/river/riverside_central_south name = "Southern Central Riverbed" icon_state = "purple" + /area/desert_dam/exterior/river/riverside_south name = "Southern Riverbed" icon_state = "bluenew" + /area/desert_dam/exterior/river/riverside_east name = "Eastern Riverbed" icon_state = "bluenew" -/area/desert_dam/exterior/river/riverside_northeast - name = "Northeastern Riverbed" - icon_state = "bluenew" + //The filtration plants - This area isn't for the WHOLE plant, but the areas that have water in them, so the water changes color as well. /area/desert_dam/exterior/river/filtration_a name = "Filtration Plant A" -/area/desert_dam/exterior/river/filtration_b - name = "Filtration Plant B" - //Areas that are rivers, but will not change because they're before the floodgates /area/desert_dam/exterior/river_mouth/southern name = "Southern River Mouth" icon_state = "purple" -/area/desert_dam/exterior/river_mouth/eastern - name = "Eastern River Mouth" - icon_state = "purple" - /area/desert_dam/landing/console name = "LZ1 'Admin'" icon_state = "tcomsatcham" @@ -880,14 +869,18 @@ //Transit Shuttle /area/shuttle/tri_trans1/alpha icon_state = "shuttle" + /area/shuttle/tri_trans1/away icon_state = "away1" + /area/shuttle/tri_trans1/omega icon_state = "shuttle2" /area/shuttle/tri_trans2/alpha icon_state = "shuttlered" + /area/shuttle/tri_trans2/away icon_state = "away2" + /area/shuttle/tri_trans2/omega icon_state = "shuttle2" diff --git a/code/game/area/LV624.dm b/code/game/area/LV624.dm index 464067e827d3..0e91b7355c27 100644 --- a/code/game/area/LV624.dm +++ b/code/game/area/LV624.dm @@ -37,7 +37,7 @@ name ="\improper Western Jungle" icon_state = "west" //ambience = list('sound/ambience/jungle_amb1.ogg') - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/lv624/ground/jungle/west_jungle/ceiling ceiling = CEILING_GLASS @@ -177,27 +177,31 @@ /area/lv624/ground/colony/north_tcomms_road name = "\improper North T-Comms Road" icon_state = "north" + linked_lz = DROPSHIP_LZ2 /area/lv624/ground/colony/west_tcomms_road name = "\improper West T-Comms Road" icon_state = "west" + linked_lz = DROPSHIP_LZ2 /area/lv624/ground/colony/telecomm name = "\improper LZ1 Communications Relay" icon_state = "ass_line" ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 ceiling_muffle = FALSE base_muffle = MUFFLE_LOW always_unpowered = FALSE /area/lv624/ground/colony/telecomm/cargo name = "\improper Far North Storage Dome Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/lv624/ground/colony/telecomm/sw_lz1 name = "\improper South-West LZ1 Communications Relay" ceiling = CEILING_NONE + linked_lz = DROPSHIP_LZ1 /area/lv624/ground/colony/telecomm/tcommdome name = "\improper Telecomms Dome Communications Relay" @@ -209,6 +213,7 @@ /area/lv624/ground/colony/telecomm/sw_lz2 name = "\improper South-West LZ2 Communications Relay" ceiling = CEILING_NONE + linked_lz = DROPSHIP_LZ2 // ambience = list('sound/ambience/jungle_amb1.ogg') @@ -224,6 +229,7 @@ ceiling = CEILING_UNDERGROUND_BLOCK_CAS sound_environment = SOUND_ENVIRONMENT_AUDITORIUM minimap_color = MINIMAP_AREA_CAVES + unoviable_timer = FALSE /area/lv624/ground/caves/west_caves name ="\improper Western Caves" @@ -283,9 +289,11 @@ /area/lv624/lazarus/landing_zones/lz1 name = "\improper Alamo Landing Zone" + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/landing_zones/lz2 name = "\improper Normandy Landing Zone" + linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus name = "\improper Lazarus" @@ -295,11 +303,13 @@ /area/lv624/lazarus/corporate_dome name = "\improper Corporate Dome" icon_state = "green" + linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus/yggdrasil name = "\improper Yggdrasil Tree" icon_state = "atmos" ceiling = CEILING_GLASS + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/medbay name = "\improper Medbay" @@ -315,35 +325,39 @@ name = "\improper Security" icon_state = "security" minimap_color = MINIMAP_AREA_SEC + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/captain name = "\improper Commandant's Quarters" icon_state = "captain" minimap_color = MINIMAP_AREA_COMMAND + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/hop name = "\improper Head of Personnel's Office" icon_state = "head_quarters" minimap_color = MINIMAP_AREA_COMMAND + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/kitchen name = "\improper Kitchen" icon_state = "kitchen" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/canteen name = "\improper Canteen" icon_state = "cafeteria" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/main_hall name = "\improper Main Hallway" icon_state = "hallC1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/toilet name = "\improper Dormitory Toilet" icon_state = "toilet" + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/chapel name = "\improper Chapel" @@ -361,23 +375,23 @@ /area/lv624/lazarus/sleep_female name = "\improper Female Dorm" icon_state = "Sleep" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/quart name = "\improper Quartermasters" icon_state = "quart" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/quartstorage name = "\improper Cargo Bay" icon_state = "quartstorage" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/quartstorage/outdoors name = "\improper Cargo Bay Area" icon_state = "purple" ceiling = CEILING_NONE - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 always_unpowered = TRUE /area/lv624/lazarus/engineering @@ -398,7 +412,7 @@ /area/lv624/lazarus/robotics name = "\improper Robotics" icon_state = "ass_line" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus/research name = "\improper Research Lab" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index db0702200d16..8ac6a7ad4788 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -82,6 +82,13 @@ /// Doesn't need to be set for areas/Z levels that are marked as admin-only var/block_game_interaction = FALSE + /// Which, if any, LZ this area belongs to. If an area belongs to an LZ, if that LZ is designated as the primary + /// LZ, all weeds will be destroyed and further weed placement disabled + var/linked_lz = FALSE + + /// How long this area should be un-oviable + var/unoviable_timer = 25 MINUTES + /area/New() // This interacts with the map loader, so it needs to be set immediately @@ -105,6 +112,9 @@ update_base_lighting() + if(unoviable_timer) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(handle_ovi_timer))) + /area/proc/initialize_power(override_power) if(requires_power) if(override_power) //Reset everything if you want to override. @@ -418,3 +428,14 @@ areas_in_z["[z]"] = list() areas_in_z["[z]"] += src +/** + * Purges existing weeds, and prevents future weeds from being placed. + */ +/area/proc/purge_weeds() + SEND_SIGNAL(src, COMSIG_AREA_RESIN_DISALLOWED) + + is_resin_allowed = FALSE + +/// From roundstart, sets a timer to make an area oviable. +/area/proc/handle_ovi_timer() + addtimer(VARSET_CALLBACK(src, unoviable_timer, FALSE), unoviable_timer) diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm index 1180e10a761e..dc674259dca1 100644 --- a/code/game/area/kutjevo.dm +++ b/code/game/area/kutjevo.dm @@ -67,27 +67,36 @@ /area/kutjevo/exterior/lz_river name = "Kutjevo - Power Station River" icon_state = "lz_river" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/spring name = "Kutjevo - Southern Spring" icon_state = "lz_river" + unoviable_timer = FALSE /area/kutjevo/exterior/scrubland - name = "Kutjevo - Scrubland" + name = "Kutjevo - North Scrubland" icon_state = "scrubland" + linked_lz = DROPSHIP_LZ2 + +/area/kutjevo/exterior/scrubland/south + name = "Kutjevo - South Scrubland" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/kutjevo/exterior/stonyfields name = "Kutjevo - Stony Fields" icon_state = "stone_fields" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/Northwest_Colony name = "Kutjevo - Northwest Colony Grounds" icon_state = "rf_dunes" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/kutjevo/exterior/runoff_dunes name = "Kutjevo - Runoff Dunes" icon_state = "rf_dunes" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/runoff_river name = "Kutjevo - Runoff River" @@ -108,6 +117,7 @@ /area/kutjevo/exterior/construction name = "Kutjevo - Abandoned Construction" icon_state = "construction" + unoviable_timer = FALSE /area/kutjevo/exterior/complex_border name = "Kutjevo Complex - Exterior" @@ -129,21 +139,24 @@ /area/kutjevo/exterior/telecomm name = "Kutjevo - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE ceiling_muffle = FALSE base_muffle = MUFFLE_LOW /area/kutjevo/exterior/telecomm/lz1_north name = "Kutjevo - North LZ1 Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/telecomm/lz1_south name = "Kutjevo - South LZ1 Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/telecomm/lz2_north name = "Kutjevo - North LZ2 Communications Relay" + linked_lz = DROPSHIP_LZ2 /area/kutjevo/exterior/telecomm/lz2_south name = "Kutjevo - South LZ2 Communications Relay" + linked_lz = DROPSHIP_LZ2 //interior areas + caves @@ -203,21 +216,21 @@ name = "Kutjevo Complex - Northwest Colony Dorms" icon_state = "Colony_int" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE /area/kutjevo/interior/complex/Northwest_Flight_Control name = "Kutjevo Complex - Northwest Flight Control Room" icon_state = "Colony_int" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE /area/kutjevo/interior/complex/Northwest_Security_Checkpoint name = "Kutjevo Complex - Northwest Security Checkpoint" icon_state = "Colony_int" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_SEC is_landing_zone = TRUE @@ -227,6 +240,7 @@ ceiling = CEILING_METAL icon_state = "power" minimap_color = MINIMAP_AREA_ENGI + linked_lz = DROPSHIP_LZ1 /area/kutjevo/interior/power/comms name = "Kutjevo - Hydroelectric Dam Comms Relay" @@ -263,26 +277,31 @@ ceiling = CEILING_UNDERGROUND_ALLOW_CAS icon_state = "colony_caves_0" minimap_color = MINIMAP_AREA_CAVES + unoviable_timer = FALSE /area/kutjevo/interior/colony_central/mine_elevator name = "Kutjevo - Central Colony Elevator" ceiling = CEILING_UNDERGROUND_ALLOW_CAS icon_state = "colony_caves_0" + unoviable_timer = FALSE /area/kutjevo/interior/colony_north name = "Kutjevo - North Colony Caves" ceiling = CEILING_DEEP_UNDERGROUND icon_state = "colony_caves_1" + unoviable_timer = FALSE /area/kutjevo/interior/colony_S_East name = "Kutjevo - North East Colony Caves" ceiling = CEILING_DEEP_UNDERGROUND icon_state = "colony_caves_2" + unoviable_timer = FALSE /area/kutjevo/interior/colony_N_East name = "Kutjevo - South East Colony Caves" ceiling = CEILING_DEEP_UNDERGROUND icon_state = "colony_caves_2" + unoviable_timer = FALSE /area/kutjevo/interior/colony_South name = "Kutjevo - South Colony Caves" diff --git a/code/game/area/prison_v3_fiorina.dm b/code/game/area/prison_v3_fiorina.dm index c02ed0310816..727e9bd8ffaa 100644 --- a/code/game/area/prison_v3_fiorina.dm +++ b/code/game/area/prison_v3_fiorina.dm @@ -29,6 +29,8 @@ icon_state = "tumor0" temperature = 309.15 //its uh, gettin' kinda warm in here SL... ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + unoviable_timer = FALSE + /area/fiorina/tumor/deep icon_state = "tumor0-deep" @@ -41,6 +43,7 @@ icon_state = "tumor1" requires_power = 0 minimap_color = MINIMAP_AREA_SHIP + unoviable_timer = 25 MINUTES /area/fiorina/tumor/civres name = "Fiorina - Green Block Residences" @@ -74,29 +77,33 @@ /area/fiorina/lz/near_lzI name = "Fiorina - LZ1 Aux Port" + linked_lz = DROPSHIP_LZ1 + is_resin_allowed = null /area/fiorina/lz/near_lzII name = "Fiorina - LZ2 Prison Port" + linked_lz = DROPSHIP_LZ2 + is_resin_allowed = null /area/fiorina/lz/console_I name = "Fiorina - LZ1 Control Console" icon_state = "lz1" - requires_power = 0 + requires_power = FALSE /area/fiorina/lz/console_II name = "Fiorina - LZ2 Control Console" icon_state = "lz2" - requires_power = 0 + requires_power = FALSE /area/shuttle/drop1/prison_v3 name = "Fiorina - Dropship Alamo Landing Zone" icon_state = "shuttle" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/shuttle/drop2/prison_v3 name = "Fiorina - Normandy Landing Zone" icon_state = "shuttle2" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //STATION AREAS AAAA /area/fiorina/station @@ -108,23 +115,42 @@ name = "Fiorina - Low Security Cells" icon_state = "station1" +/area/fiorina/station/lowsec/showers_laundry + name = "Fiorina - Low Security Showers & Laundry" + linked_lz = DROPSHIP_LZ2 + +/area/fiorina/station/lowsec/east + name = "Fiorina - Low Security Eastside" + linked_lz = DROPSHIP_LZ1 + /area/fiorina/station/power_ring name = "Fiorina - Engineering Ring" icon_state = "power0" minimap_color = MINIMAP_AREA_ENGI + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) + +/area/fiorina/station/power_ring/reactor + name = "Fiorina - Engineering Reactor" + linked_lz = null /area/fiorina/station/disco - name = "Fiorina - Disco Storage" + name = "Fiorina - West Disco Storage" icon_state = "disco" +/area/fiorina/station/disco/east_disco + name = "Fiorina - East Disco Storage" + linked_lz = DROPSHIP_LZ1 + /area/fiorina/station/flight_deck name = "Fiorina - Flight Deck" icon_state = "police_line" + linked_lz = DROPSHIP_LZ1 /area/fiorina/station/security name = "Fiorina - Security Hub" icon_state = "security_hub" minimap_color = MINIMAP_AREA_SEC + linked_lz = DROPSHIP_LZ2 /area/fiorina/station/security/wardens name = "Fiorina - Warden's Office" @@ -155,6 +181,7 @@ /area/fiorina/station/civres_blue name = "Fiorina - Blue Block Residences" icon_state = "station1" + unoviable_timer = FALSE /area/fiorina/station/medbay name = "Fiorina - Medical Bay" @@ -166,12 +193,22 @@ icon_state = "station0" minimap_color = MINIMAP_AREA_RESEARCH +/area/fiorina/station/research_cells/west + name = "Fiorina - West Research Cellblock" + +/area/fiorina/station/research_cells/east + name = "Fiorina - East Research Cellblock" + linked_lz = DROPSHIP_LZ1 + +/area/fiorina/station/research_cells/basketball + name = "Fiorina - Basketball Court" + linked_lz = DROPSHIP_LZ1 //telecomms areas /area/fiorina/station/telecomm name = "Fiorina - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 ceiling_muffle = FALSE base_muffle = MUFFLE_LOW diff --git a/code/game/area/shiva.dm b/code/game/area/shiva.dm index dee9eb5f0aea..1842ec8b5264 100644 --- a/code/game/area/shiva.dm +++ b/code/game/area/shiva.dm @@ -14,14 +14,14 @@ name = "Shiva's Snowball - Dropship Alamo Landing Zone" icon_state = "shuttle" icon = 'icons/turf/area_shiva.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_LZ /area/shuttle/drop2/shiva name = "Shiva's Snowball - Dropship Normandy Landing Zone" icon_state = "shuttle2" icon = 'icons/turf/area_shiva.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_LZ /area/shiva/exterior/lz1_console @@ -60,69 +60,78 @@ /area/shiva/exterior/telecomm name = "Shiva's Snowball - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE /area/shiva/exterior/telecomm/lz1_north name = "Shiva's Snowball - North LZ1 Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ1 /area/shiva/exterior/telecomm/lz2_southeast name = "Shiva's Snowball - South-East LZ2 Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 /area/shiva/exterior/telecomm/lz2_northeast name = "Shiva's Snowball - North-East LZ2 Communications Relay" minimap_color = MINIMAP_AREA_LZ - + linked_lz = DROPSHIP_LZ2 //telecomms areas - interior /area/shiva/interior/telecomm name = "Shiva's Snowball - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE /area/shiva/interior/telecomm/lz1_biceps name = "Shiva's Snowball - Fort Biceps Communications Relay" icon_state = "hangars0" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ1 /area/shiva/interior/telecomm/lz1_flight name = "Shiva's Snowball - LZ1 Aerodrome Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ1 /area/shiva/interior/telecomm/lz2_research name = "Shiva's Snowball - Argentinian Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 //telecomms areas - caves /area/shiva/caves/telecomm name = "Shiva's Snowball - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE /area/shiva/caves/telecomm/lz2_south name = "Shiva's Snowball - Backup Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 //exterior areas /area/shiva/exterior/lz1_valley name = "Shiva's Snowball - Landing Valley" icon_state = "landing_valley" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ /area/shiva/exterior/lz2_fortress name = "Shiva's Snowball - Landing Bulwark" icon_state = "lz2_fortress" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ /area/shiva/exterior/valley name = "Shiva's Snowball - Storage Bunker Valley" icon_state = "junkyard1" + unoviable_timer = FALSE + +/area/shiva/exterior/southwest_valley + name = "Shiva's Snowball - Southwest Valley" + icon_state = "sw" + linked_lz = DROPSHIP_LZ1 /area/shiva/exterior/cp_colony_grounds name = "Shiva's Snowball - Colony Grounds" @@ -147,6 +156,7 @@ /area/shiva/exterior/cp_lz2 name = "Shiva's Snowball - North Colony Grounds" icon_state = "junkyard3" + linked_lz = DROPSHIP_LZ2 /area/shiva/exterior/research_alley name = "Shiva's Snowball - South Research Alley" @@ -165,6 +175,7 @@ /area/shiva/interior/caves/right_spiders name = "Shiva's Snowball - Forgotten Passage" icon_state = "caves1" + unoviable_timer = FALSE /area/shiva/interior/caves/left_spiders name = "Shiva's Snowball - Crevice Passage" @@ -174,19 +185,23 @@ name = "Shiva's Snowball - South LZ2 Caves" icon_state = "caves3" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 /area/shiva/interior/caves/cp_camp name = "Shiva's Snowball - Cave Camp" icon_state = "bar3" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/shiva/interior/caves/research_caves name = "Shiva's Snowball - South Research Hab Caves" icon_state = "caves2" minimap_color = MINIMAP_AREA_RESEARCH_CAVE + unoviable_timer = FALSE /area/shiva/interior/caves/medseceng_caves name = "Shiva's Snowball - South Med-Sec-Eng Complex Caves" icon_state = "caves3" + unoviable_timer = FALSE /area/shiva/interior/colony name = "Shiva's Snowball - Colony MegaStruct(TM)" @@ -214,10 +229,12 @@ /area/shiva/interior/colony/research_hab name = "Shiva's Snowball - Research Hab Interior" icon_state = "res2" + unoviable_timer = FALSE /area/shiva/interior/colony/medseceng name = "Shiva's Snowball - Colony MegaStruct(TM) Med-Sec-Eng Segment" icon_state = "res0" + unoviable_timer = FALSE /area/shiva/interior/colony/deck name = "Shiva's Snowball - Colony MegaStruct(TM) Open Deck" @@ -227,6 +244,7 @@ /area/shiva/interior/aerodrome name = "Shiva's Snowball - Aerodrome" icon_state = "hangars0" + linked_lz = DROPSHIP_LZ1 /area/shiva/interior/bar name = "Shiva's Snowball - Anti-Freeze Bar" @@ -239,6 +257,7 @@ /area/shiva/interior/warehouse name = "Shiva's Snowball - Blue Warehouse" icon_state = "hangars1" + linked_lz = DROPSHIP_LZ1 /area/shiva/interior/warehouse/caves name = "Shiva's Snowball - Blue Warehouse Ice Cave" diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm index 8b1132c2dce1..6c1e589be35d 100644 --- a/code/game/area/strata.dm +++ b/code/game/area/strata.dm @@ -21,14 +21,14 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "shuttle" base_lighting_alpha = 255 minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/shuttle/drop2/strata name = "Dropship Normandy Landing Zone" icon_state = "shuttle2" base_lighting_alpha = 255 minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Begin actual area definitions. There's probably a better way to do this. @@ -90,25 +90,25 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Do not use." icon_state = "landingzone_2" minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE /area/strata/ag/exterior/landing_zones/lz2 name = "Landing Zone 2 Pad - Ice Fields" unlimited_power = 1 //So the DS computer always works for the Queen weather_enabled = FALSE is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/landing_zones/near_lz2 name = "Landing Zone 2 - Ice Fields" icon_state = "nearlz2" weather_enabled = TRUE is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/interior/landing_zones name = "Do not use." icon_state = "landingzone_1" minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE weather_enabled = FALSE ceiling = CEILING_NONE @@ -116,11 +116,13 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Landing Zone 1 Pad - Mining Aerodrome" unlimited_power = 1 //So the DS computer always works for the Queen is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ1 /area/strata/ag/interior/landing_zones/near_lz1 name = "Landing Zone 1 - Mining Aerodrome" icon_state = "nearlz1" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ1 //-Caves @@ -133,11 +135,13 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/caves/lz_caves name = "External Mining Aerodrome Caves" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/jungle/carplake_center name = "Deep Jungle - Carp Lake Center Island" icon_state = "ug_jung_1" weather_enabled = TRUE + unoviable_timer = FALSE //-Marsh @@ -147,34 +151,42 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/marsh/spring_marshes name = "Cryo-Thermal Springs Marshes" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/strata/ag/exterior/marsh/water_marshes name = "Cryo-Thermal Water Marshes" + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/marsh/island_marshes name = "Cryo-Thermal Island Marshes" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/marsh/relay_marshes name = "Cryo-Thermal Relay Marshes" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/marsh/center name = "Cryo-Thermal Springs" icon_state = "marshcenter" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/strata/ag/exterior/marsh/river name = "Cryo-Thermal River" icon_state = "marshriver" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/marsh/crash name = "Cryo-Thermal Crashed Lifeboat" icon_state = "marshship" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/strata/ag/exterior/marsh/water name = "Cryo-Thermal Water" icon_state = "marshwater" temperature = TCMB //space cold + linked_lz = DROPSHIP_LZ2 //-Outside "interiors" @@ -204,9 +216,11 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/paths/flight_control_exterior name = "Flight Control Exterior" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/paths/mining_outpost_exterior name = "Mining Outpost Exterior" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/paths/north_outpost name = "Outpost - North Access Channel" @@ -219,6 +233,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/paths/south_outpost name = "South Of The Outpost" ceiling = CEILING_NONE + linked_lz = DROPSHIP_LZ2 //////////////////////////////////////// // ------===| Interior |===------ // @@ -304,6 +319,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/interior/mining_outpost name = "Do not use." minimap_color = MINIMAP_AREA_MINING + linked_lz = DROPSHIP_LZ1 /area/strata/ag/interior/mining_outpost/central name = "Mining Outpost Central Hallway" @@ -347,6 +363,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "offices" minimap_color = MINIMAP_AREA_COMMAND ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS + linked_lz = DROPSHIP_LZ1 /area/strata/ag/interior/outside/wooden_hospital name = "Wooden Hospital - Hospital Proper" @@ -388,6 +405,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Do not use." icon_state = "outpost_engi_3" minimap_color = MINIMAP_AREA_ENGI + linked_lz = DROPSHIP_LZ2 /area/strata/ag/interior/outside/engineering/parts_storage name = "Engineering Parts Storage" @@ -472,6 +490,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug/interior/jungle/carplake name = "Do not use." icon_state = "ug_jung_1" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/carplake/north name = "Deep Jungle - North of Carp Lake" @@ -488,10 +507,12 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug/interior/jungle/platform/south name = "Deep Jungle - South of Underground Platform" icon_state = "ug_jung_4" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/platform/east name = "Deep Jungle - East of Underground Platform" icon_state = "ug_jung_0" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/structures name = "Do not use." @@ -502,6 +523,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "ug_jung_2" name = "Deep Jungle - Classified Research Station" minimap_color = MINIMAP_AREA_RESEARCH + unoviable_timer = FALSE /area/strata/ug/interior/jungle/structures/research/south icon_state = "ug_jung_3" @@ -522,6 +544,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "ug_jung_5" name = "Deep Jungle - Planetary Core Monitoring" minimap_color = MINIMAP_AREA_CAVES_STRUCTURE + unoviable_timer = FALSE /area/strata/ug/interior/jungle/structures/monitoring/west icon_state = "ug_jung_6" @@ -541,10 +564,12 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug/interior/jungle/structures/ruin icon_state = "ug_jung_mine_4" name = "Deep Jungle - Ancient Dorms" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/tearlake name = "Deep Jungle - Weeping Pool" icon_state = "ug_jung_3" + unoviable_timer = FALSE //-Others diff --git a/code/game/area/varadero.dm b/code/game/area/varadero.dm index b0e5d283fdcd..f54106f67bfe 100644 --- a/code/game/area/varadero.dm +++ b/code/game/area/varadero.dm @@ -17,7 +17,7 @@ name = "New Varadero - Dropship Alamo Landing Zone" icon_state = "shuttle" icon = 'icons/turf/area_varadero.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_LZ @@ -25,7 +25,7 @@ name = "New Varadero - Dropship Normandy Landing Zone" icon_state = "shuttle2" icon = 'icons/turf/area_varadero.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_LZ //Parent areas @@ -51,7 +51,7 @@ /area/varadero/interior/comms1 name = "New Varadero - Cargo Generator" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 icon_state = "comms1" minimap_color = MINIMAP_AREA_ENGI_CAVE @@ -59,15 +59,17 @@ name = "New Varadero - Communications Project Site" icon_state = "comms2" minimap_color = MINIMAP_AREA_ENGI_CAVE + linked_lz = DROPSHIP_LZ2 /area/varadero/interior/comms3 name = "New Varadero - Engineering Communications" icon_state = "comms3" minimap_color = MINIMAP_AREA_ENGI_CAVE + linked_lz = DROPSHIP_LZ2 /area/varadero/exterior/comms4 name = "New Varadero - Walkway Extension" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 icon_state = "comms4" minimap_color = MINIMAP_AREA_ENGI_CAVE @@ -98,21 +100,21 @@ /area/varadero/exterior/lz1_near name = "New Varadero - Pontoon Airfield" icon_state = "lz1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_LZ is_landing_zone = TRUE /area/varadero/exterior/lz2_near name = "New Varadero - Palm Airfield" icon_state = "lz2" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_LZ is_landing_zone = TRUE /area/varadero/exterior/pontoon_beach name = "New Varadero - Rockabilly Beach" icon_state = "varadero0" - is_resin_allowed = FALSE + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) minimap_color = MINIMAP_AREA_JUNGLE /area/varadero/exterior/pontoon_beach/lz @@ -120,7 +122,7 @@ /area/varadero/exterior/eastbeach name = "New Varadero - East Beach" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 icon_state = "varadero1" minimap_color = MINIMAP_AREA_JUNGLE @@ -136,7 +138,7 @@ /area/varadero/exterior/eastocean name = "New Varadero - East Ocean" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 flags_area = AREA_NOTUNNEL icon_state = "varadero2" minimap_color = MINIMAP_AREA_CONTESTED_ZONE @@ -154,14 +156,14 @@ /area/varadero/interior/beach_bar name = "New Varadero - Beach Bar" icon_state = "varadero4" - is_resin_allowed = FALSE + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) minimap_color = MINIMAP_AREA_JUNGLE sound_environment = SOUND_ENVIRONMENT_ROOM /area/varadero/interior/dock_control name = "New Varadero - Dock Control" icon_state = "varadero3" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_JUNGLE sound_environment = SOUND_ENVIRONMENT_ROOM is_landing_zone = TRUE @@ -169,7 +171,7 @@ /area/varadero/interior/cargo name = "New Varadero - Cargo" icon_state = "req0" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_ENGI /area/varadero/interior/hall_NW @@ -179,7 +181,7 @@ /area/varadero/interior/hall_N name = "New Varadero - Hallway N" icon_state = "hall2" - is_resin_allowed = FALSE + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/varadero/interior/hall_SE name = "New Varadero - Hallway SE" @@ -188,19 +190,20 @@ /area/varadero/interior/chapel name = "New Vardero - Chapel" icon_state = "offices1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/morgue name = "New Varadero - Morgue" icon_state = "offices0" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_MEDBAY_CAVE /area/varadero/interior/medical name = "New Varadero - Medical" icon_state = "offices2" minimap_color = MINIMAP_AREA_MEDBAY + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) /area/varadero/interior/maintenance name = "New Varadero - Central Maintenance" @@ -209,18 +212,26 @@ /area/varadero/interior/maintenance/north name = "New Varadero - Northern Maintenance" icon_state = "tunnels1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/varadero/interior/maintenance/research name = "New Varadero - Research Maintenance" icon_state = "tunnels1" minimap_color = MINIMAP_AREA_RESEARCH_CAVE + linked_lz = DROPSHIP_LZ1 /area/varadero/interior/maintenance/security - name = "New Varadero - Security Maintenance" + name = "New Varadero - Sec. Maintenance" icon_state = "tunnels2" minimap_color = MINIMAP_AREA_SEC_CAVE +/area/varadero/interior/maintenance/security/north + name = "New Varadero - North Sec. Maintenance" + linked_lz = DROPSHIP_LZ2 + +/area/varadero/interior/maintenance/security/south + name = "New Varadero - South Sec. Maintenance" + /area/varadero/interior/research name = "New Varadero - Research Offices" icon_state = "offices4" @@ -230,6 +241,7 @@ name = "New Varadero - Electrical Annex" icon_state = "req4" minimap_color = MINIMAP_AREA_ENGI + linked_lz = DROPSHIP_LZ2 /area/varadero/interior/toilets name = "New Varadero - Restrooms" @@ -257,18 +269,20 @@ /area/varadero/interior/library name = "New Varadero - Library" icon_state = "offices0" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/court name = "New Varadero - Basketball Court" icon_state = "req4" minimap_color = MINIMAP_AREA_COMMAND_CAVE + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) /area/varadero/interior/mess name = "New Varadero - Mess Hall" icon_state = "req2" minimap_color = MINIMAP_AREA_COMMAND_CAVE + linked_lz = DROPSHIP_LZ2 /area/varadero/interior/bunks name = "New Varadero - Level 1 Quarters" @@ -312,7 +326,7 @@ power_equip = FALSE power_environ = FALSE minimap_color = MINIMAP_AREA_RESEARCH_CAVE - + unoviable_timer = FALSE /area/varadero/interior_protected/caves/central name = "New Varadero - Grass Caves" @@ -331,10 +345,10 @@ name = "New Varadero - Southern Maintenance" icon_state = "deepcaves4" minimap_color = MINIMAP_AREA_CAVES + unoviable_timer = FALSE /area/varadero/interior_protected/vessel name = "New Varadero - Unknown Vessel" icon_state = "predship" minimap_color = MINIMAP_AREA_SHIP - - + unoviable_timer = FALSE diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 14f5397b1f91..073b9ab29106 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -19,6 +19,11 @@ var/list/running_round_stats = list() var/list/lz_smoke = list() + /** + * How long, after first drop, should the resin protection in proximity to the selected LZ last + */ + var/near_lz_protection_delay = 8 MINUTES + //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -140,27 +145,41 @@ var/right = marine_dropship.x + marine_dropship.dwidth + 2 var/z = marine_dropship.z + var/dropship_type = marine_dropship.type + // Bottom left - options += get_valid_sentry_turfs(left, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(left, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_BOTTOM_LEFT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_BOTTOM_LEFT] + else + options += get_valid_sentry_turfs(left, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(left, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) // Bottom right options.Cut() - options += get_valid_sentry_turfs(right-4, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(right-1, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_BOTTOM_RIGHT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_BOTTOM_RIGHT] + else + options += get_valid_sentry_turfs(right-4, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(right-1, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) // Top left options.Cut() - options += get_valid_sentry_turfs(left, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(left, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_TOP_LEFT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_TOP_LEFT] + else + options += get_valid_sentry_turfs(left, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(left, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) // Top right options.Cut() - options += get_valid_sentry_turfs(right-4, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(right-1, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_TOP_RIGHT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_TOP_RIGHT] + else + options += get_valid_sentry_turfs(right-4, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(right-1, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) ///Returns a list of non-dense turfs using the given block arguments ignoring the provided structure types @@ -238,6 +257,69 @@ smoke.time_to_live = rand(1, 5) lz_smoke.Cut() +/// Called during the dropship flight, clears resin and indicates to those in flight that resin near the LZ has been cleared. +/datum/game_mode/colonialmarines/proc/warn_resin_clear(obj/docking_port/mobile/marine_dropship) + clear_proximity_resin() + + var/list/announcement_mobs = list() + for(var/area/area in marine_dropship.shuttle_areas) + for(var/mob/mob in area) + shake_camera(mob, steps = 3, strength = 1) + announcement_mobs += mob + + announcement_helper("Dropship [marine_dropship.name] dispersing [/obj/effect/particle_effect/smoke/weedkiller::name] due to potential biological infestation.", MAIN_AI_SYSTEM, announcement_mobs, 'sound/effects/rocketpod_fire.ogg') + +/** + * Clears any built resin in the areas around the landing zone, + * when the dropship first deploys. + */ +/datum/game_mode/colonialmarines/proc/clear_proximity_resin() + var/datum/cause_data/cause_data = create_cause_data(/obj/effect/particle_effect/smoke/weedkiller::name) + + for(var/area/near_area as anything in GLOB.all_areas) + var/area_lz = near_area.linked_lz + if(!area_lz) + continue + + if(islist(area_lz)) + if(!(active_lz.linked_lz in area_lz)) + continue + + else if(area_lz != active_lz.linked_lz) + continue + + for(var/turf/turf in near_area) + if(turf.density) + if(!istype(turf, /turf/closed/wall)) + continue + var/turf/closed/wall/wall = turf + if(wall.hull) + continue + new /obj/effect/particle_effect/smoke/weedkiller(turf, null, cause_data) + + near_area.purge_weeds() + + addtimer(CALLBACK(src, PROC_REF(allow_proximity_resin)), near_lz_protection_delay) + +/** + * If the area was previously weedable, and this was disabled by the + * LZ proximity, re-enable the weedability + */ +/datum/game_mode/colonialmarines/proc/allow_proximity_resin() + for(var/area/near_area as anything in GLOB.all_areas) + var/area_lz = near_area.linked_lz + if(!area_lz) + continue + + if(area_lz != active_lz.linked_lz) + continue + + if(initial(near_area.is_resin_allowed) == FALSE) + continue + + near_area.is_resin_allowed = TRUE + + #define MONKEYS_TO_TOTAL_RATIO 1/32 /datum/game_mode/colonialmarines/proc/spawn_smallhosts() @@ -403,6 +485,8 @@ /datum/game_mode/colonialmarines/ds_first_drop(obj/docking_port/mobile/marine_dropship) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_blurb_uscm)), DROPSHIP_DROP_MSG_DELAY) + addtimer(CALLBACK(src, PROC_REF(warn_resin_clear), marine_dropship), DROPSHIP_DROP_FIRE_DELAY) + add_current_round_status_to_end_results("First Drop") clear_lz_hazards() diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index d0ea5d2ed5ef..212b0fac4b9d 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -242,6 +242,20 @@ /obj/effect/particle_effect/smoke/miasma/ex_act(severity) return +/obj/effect/particle_effect/smoke/weedkiller + name = "C10-W Weedkiller" + amount = 1 + time_to_live = 15 + smokeranking = SMOKE_RANK_HARMLESS + opacity = FALSE + color = "#c2aac7" + alpha = 0 + +/obj/effect/particle_effect/smoke/weedkiller/Initialize(mapload, oldamount, datum/cause_data/new_cause_data) + . = ..() + + animate(src, alpha = 75, time = rand(1 SECONDS, 5 SECONDS)) + ///////////////////////////////////////////// // Sleep smoke ///////////////////////////////////////////// diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index 87c820054475..0abab1749252 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -237,6 +237,10 @@ /obj/effect/landmark/xeno_hive_spawn/Initialize(mapload, ...) . = ..() + + var/area/area = get_area(src) + area.unoviable_timer = FALSE + GLOB.xeno_hive_spawns += src /obj/effect/landmark/xeno_hive_spawn/Destroy() diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 6db61002c2fe..8f18d1a3840a 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -627,6 +627,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) icon_state = "solaris_rock" walltype = WALL_SOLARIS_ROCK hull = 1 + baseturfs = /turf/open/mars_cave/mars_cave_2 diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index f82ba6ddadaf..e8c7d84d8baf 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -79,6 +79,12 @@ for(var/i in GLOB.cardinals) T = get_step(src, i) + if(istype(T, /turf/closed/wall)) + var/turf/closed/wall/neighbour_wall = T + + neighbour_wall.update_connections() + neighbour_wall.update_icon() + //nearby glowshrooms updated for(var/obj/effect/glowshroom/shroom in T) if(!shroom.floor) //shrooms drop to the floor diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index 58a386510e8a..7058334b5f90 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -34,6 +34,10 @@ SP.linked_structure = src blocks.Add(SP) + var/area/current_area = get_area(src) + if(current_area.linked_lz) + AddComponent(/datum/component/resin_cleanup) + /obj/effect/alien/resin/Destroy() if(block_range) for(var/obj/effect/build_blocker/SP as anything in blocks) diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index dd19b3d992f1..32c0ba3dd809 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -86,6 +86,10 @@ if(hivenumber == XENO_HIVE_NORMAL) RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) + var/area/area = get_area(src) + if(area && area.linked_lz) + AddComponent(/datum/component/resin_cleanup) + /obj/effect/alien/weeds/proc/set_turf_weeded(datum/source, turf/T) SIGNAL_HANDLER if(weeded_turf) diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm new file mode 100644 index 000000000000..6fa4a47d5bbf --- /dev/null +++ b/code/modules/mapping/mapping_helpers.dm @@ -0,0 +1,162 @@ +/// Generic system for processing events after a certain time on multiple turfs, and +/// announcing them together. +/obj/effect/timed_event + icon = 'icons/landmarks.dmi' + icon_state = "o_red" + + var/static/list/notification_areas = list() + + /// How long to wait until the event should occur + var/time + +/obj/effect/timed_event/Initialize(mapload, ...) + . = ..() + + icon = null + + if(isnull(time)) + log_mapping("[type] (x: [x], y: [y], z: [z]) was created without a time.") + return INITIALIZE_HINT_QDEL + + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(handle_round_start))) + +/obj/effect/timed_event/proc/handle_round_start() + var/actual_time = time MINUTES + + if(!check_valid_type()) + return + + addtimer(generate_callback(), actual_time) + + if(notification_areas[type]?["[actual_time]"]) + LAZYORASSOCLIST(notification_areas[type], "[actual_time]", get_area(src)) + qdel(src) + else + addtimer(CALLBACK(src, PROC_REF(announce_event), actual_time), actual_time) + LAZYORASSOCLIST(notification_areas[type], "[actual_time]", get_area(src)) + +/// Checks that the type this is acting on is valid, to prevent errors when adding the timer +/obj/effect/timed_event/proc/check_valid_type() + return TRUE + +/// To be overridden to generate the callback that should be inserted into the timer +/obj/effect/timed_event/proc/generate_callback() + return + +/// When the timer is completed, what global announcement of the event should occur +/obj/effect/timed_event/proc/announce_event(time_to_grab) + return + +/// Mapping helper placed on turfs to remove the turf after a specified duration. +/obj/effect/timed_event/scrapeaway + icon_state = "o_blue" + +/obj/effect/timed_event/scrapeaway/generate_callback() + return CALLBACK(get_turf(src), TYPE_PROC_REF(/turf, ScrapeAway)) + +/obj/effect/timed_event/scrapeaway/announce_event(time_to_grab) + var/announcement_areas = english_list(notification_areas[type]["[time_to_grab]"]) + + var/marine_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "Structural collapse detected in [announcement_areas]. Be advised that new routes may be accessible." \ + : "Geological shifts detected in [announcement_areas]. Be advised that new routes may be accessible." + + marine_announcement(marine_announcement_text, "Priority Announcement") + + var/xeno_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "The shattered metal of this place has collapsed, providing new routes in [announcement_areas]." \ + : "The ground of this world trembles, and new routes are accessible in [announcement_areas]." + + xeno_announcement(SPAN_XENOANNOUNCE(xeno_announcement_text), "everything", XENO_GENERAL_ANNOUNCE) + + qdel(src) + +/// Mapping helper placed on turfs that toggles the destructiblity of the turf after a specified duration. +/obj/effect/timed_event/destructible + +/obj/effect/timed_event/destructible/check_valid_type() + if(istype(get_turf(src), /turf/closed/wall)) + return TRUE + + return FALSE + +/obj/effect/timed_event/destructible/generate_callback() + var/turf/closed/wall/wall = get_turf(src) // ensured by check_valid_type() + return VARSET_CALLBACK(wall, hull, FALSE) + +/obj/effect/timed_event/destructible/announce_event(time_to_grab) + var/announcement_areas = english_list(notification_areas[type]["[time_to_grab]"]) + + var/marine_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "Structural collapse detected in [announcement_areas], allowing dismantlement. Be advised that new routes may be created." \ + : "Geological shifts detected in [announcement_areas], allowing excavation. Be advised that new routes may be created." + + marine_announcement(marine_announcement_text, "Priority Announcement") + + var/xeno_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "The shattered metal of this place has collapsed, and we can create routes through [announcement_areas]." \ + : "The ground of this world trembles, and new routes may be created through [announcement_areas]." + + xeno_announcement(SPAN_XENOANNOUNCE(xeno_announcement_text), "everything", XENO_GENERAL_ANNOUNCE) + + qdel(src) + +GLOBAL_LIST_INIT_TYPED(sentry_spawns, /obj/effect/sentry_landmark, list()) + +/// Allows a mapper to override the location of turrets on specific LZs, in specific placements. If multiple +/// are placed, it picks randomly. +/obj/effect/sentry_landmark + icon = 'icons/landmarks.dmi' + icon_state = "x3" + + var/abstract_type = /obj/effect/sentry_landmark + + /// Which landing zone this landmark should be connected to + var/landing_zone + + /// Which position this sentry should spawn at + var/position + + +/obj/effect/sentry_landmark/Initialize(mapload, ...) + . = ..() + + if(type == abstract_type) + log_mapping("A [type] was created that should not have been! Use a subtype instead.") + return INITIALIZE_HINT_QDEL + + LAZYADDASSOCLIST(GLOB.sentry_spawns[landing_zone], position, get_turf(src)) + + return INITIALIZE_HINT_QDEL + +/obj/effect/sentry_landmark/lz_1 + abstract_type = /obj/effect/sentry_landmark/lz_1 + landing_zone = /obj/docking_port/stationary/marine_dropship/lz1 + +/obj/effect/sentry_landmark/lz_1/top_left + position = SENTRY_TOP_LEFT + +/obj/effect/sentry_landmark/lz_1/top_right + position = SENTRY_TOP_RIGHT + +/obj/effect/sentry_landmark/lz_1/bottom_left + position = SENTRY_BOTTOM_LEFT + +/obj/effect/sentry_landmark/lz_1/bottom_right + position = SENTRY_BOTTOM_RIGHT + +/obj/effect/sentry_landmark/lz_2 + abstract_type = /obj/effect/sentry_landmark/lz_2 + landing_zone = /obj/docking_port/stationary/marine_dropship/lz2 + +/obj/effect/sentry_landmark/lz_2/top_left + position = SENTRY_TOP_LEFT + +/obj/effect/sentry_landmark/lz_2/top_right + position = SENTRY_TOP_RIGHT + +/obj/effect/sentry_landmark/lz_2/bottom_left + position = SENTRY_BOTTOM_LEFT + +/obj/effect/sentry_landmark/lz_2/bottom_right + position = SENTRY_BOTTOM_RIGHT diff --git a/code/modules/mob/living/carbon/xenomorph/Powers.dm b/code/modules/mob/living/carbon/xenomorph/Powers.dm index 87a6db3c0816..da91b76dab86 100644 --- a/code/modules/mob/living/carbon/xenomorph/Powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Powers.dm @@ -142,6 +142,10 @@ new_resin.add_hiddenprint(src) //so admins know who placed it + var/area/resin_area = get_area(new_resin) + if(resin_area && resin_area.linked_lz) + new_resin.AddComponent(/datum/component/resin_cleanup) + if(istype(new_resin, /turf/closed)) for(var/mob/living/carbon/human/enclosed_human in new_resin.contents) if(enclosed_human.stat == DEAD) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index 19b20fd370fc..a783e92272e1 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -665,6 +665,9 @@ if(!spacecheck(X, T, structure_template)) //doublechecking return FALSE + if(choice == XENO_STRUCTURE_CORE && AR.unoviable_timer) + to_chat(X, SPAN_WARNING("This area does not feel right for you to build this in.")) + if((choice == XENO_STRUCTURE_CORE) && isqueen(X) && X.hive.has_structure(XENO_STRUCTURE_CORE)) if(X.hive.hive_location.hardcore || world.time > XENOMORPH_PRE_SETUP_CUTOFF) to_chat(X, SPAN_WARNING("We can't rebuild this structure!")) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm index 6ef111aed66f..237d1b5622b4 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm @@ -185,6 +185,11 @@ to_chat(xeno, SPAN_XENOWARNING("These weeds don't belong to your hive! You can't grow an ovipositor here.")) return + var/area/current_area = get_area(xeno) + if(current_area.unoviable_timer) + to_chat(xeno, SPAN_XENOWARNING("This area is not right for you to grow an ovipositor in.")) + return + if(!xeno.check_alien_construction(current_turf)) return diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index 7c829ad13e42..65dd310bdf21 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -33,6 +33,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) ignore += typesof(/obj/effect/vehicle_spawner) // Always ought to have an associated escape menu. Any references it could possibly hold would need one regardless. ignore += subtypesof(/atom/movable/screen/escape_menu) + ignore += typesof(/obj/effect/timed_event) var/list/cached_contents = spawn_at.contents.Copy() var/original_turf_type = spawn_at.type diff --git a/colonialmarines.dme b/colonialmarines.dme index eb620a57a3f6..bcef939091ae 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -131,6 +131,7 @@ #include "code\__DEFINES\dcs\signals\signals_datum.dm" #include "code\__DEFINES\dcs\signals\signals_global.dm" #include "code\__DEFINES\dcs\signals\signals_subsystem.dm" +#include "code\__DEFINES\dcs\signals\atom\signals_area.dm" #include "code\__DEFINES\dcs\signals\atom\signals_atom.dm" #include "code\__DEFINES\dcs\signals\atom\signals_cell.dm" #include "code\__DEFINES\dcs\signals\atom\signals_item.dm" @@ -417,6 +418,7 @@ #include "code\datums\components\orbiter.dm" #include "code\datums\components\overlay_lighting.dm" #include "code\datums\components\rename.dm" +#include "code\datums\components\resin_cleanup.dm" #include "code\datums\components\speed_modifier.dm" #include "code\datums\components\status_effect_component.dm" #include "code\datums\components\temporary_mute.dm" @@ -1862,6 +1864,7 @@ #include "code\modules\logging\log_category.dm" #include "code\modules\logging\log_holder.dm" #include "code\modules\mapping\map_template.dm" +#include "code\modules\mapping\mapping_helpers.dm" #include "code\modules\mapping\merge_conflicts.dm" #include "code\modules\mapping\preloader.dm" #include "code\modules\mapping\reader.dm" diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index bf30b8b73fd2..182dea6fd236 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -1465,7 +1465,7 @@ /area/bigredv2/caves/lambda/xenobiology) "agm" = ( /turf/closed/wall/solaris/rock, -/area/bigredv2/caves_north) +/area/bigredv2/outside/marshal_office) "agn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -15081,6 +15081,7 @@ "buk" = ( /obj/structure/flora/grass/desert/lightgrass_4, /obj/structure/flora/grass/desert/lightgrass_11, +/obj/effect/sentry_landmark/lz_2/top_right, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/outside/space_port_lz2) "bun" = ( @@ -15173,6 +15174,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor, /area/bigredv2/outside/lz2_south_cas) "bvH" = ( @@ -17459,6 +17461,9 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves_se) +"bLE" = ( +/turf/open/floor/darkyellow2/east, +/area/bigredv2/outside/engineering/reactor) "bLG" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/blood/xeno, @@ -17843,6 +17848,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/mars_cave/mars_cave_18, /area/bigredv2/caves_lambda) +"chw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/dark, +/area/bigredv2/outside/engineering/reactor) "chx" = ( /obj/structure/surface/table, /obj/item/trash/kepler{ @@ -17877,6 +17886,10 @@ }, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves/mining) +"cjS" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "ckr" = ( /obj/item/device/defibrillator{ pixel_x = -9; @@ -18405,7 +18418,7 @@ dir = 1 }, /turf/open/floor/dark, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cNH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/delivery, @@ -18910,7 +18923,7 @@ dir = 8 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dsU" = ( /obj/item/trash/cheesie, /obj/item/trash/pistachios, @@ -18957,7 +18970,7 @@ dir = 1 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "duG" = ( /obj/structure/surface/table, /obj/structure/machinery/light{ @@ -19029,6 +19042,10 @@ "dyv" = ( /turf/open/mars, /area/bigredv2/caves/eta/xenobiology) +"dyA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2, +/area/bigredv2/outside/engineering/reactor) "dyH" = ( /obj/structure/machinery/computer/area_atmos{ dir = 1 @@ -19104,7 +19121,7 @@ pixel_y = 9 }, /turf/open/floor/darkyellow2/north, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dCb" = ( /obj/effect/landmark/corpsespawner/security/marshal, /obj/effect/decal/cleanable/blood/oil, @@ -19300,6 +19317,9 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/mars_cave/mars_cave_5, /area/bigredv2/caves_lambda) +"dLd" = ( +/turf/open/floor/darkyellow2/southwest, +/area/bigredv2/outside/engineering/reactor) "dLJ" = ( /obj/structure/platform/kutjevo/rock, /obj/item/trash/used_stasis_bag{ @@ -19771,6 +19791,10 @@ }, /turf/open/floor/whitegreen/east, /area/bigredv2/outside/medical) +"ehN" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/mars, +/area/bigredv2/outside/space_port_lz2) "eiK" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/mars, @@ -20066,6 +20090,10 @@ "exc" = ( /turf/open/floor/asteroidwarning/east, /area/bigred/ground/garage_workshop) +"eyR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2/west, +/area/bigredv2/outside/engineering/reactor) "ezz" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/hotdog{ @@ -20207,7 +20235,7 @@ /obj/structure/machinery/power/port_gen/pacman, /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eJf" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/mars, @@ -21030,7 +21058,7 @@ name = "\improper Engine Reactor" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "fEE" = ( /turf/open/mars_cave/mars_cave_15, /area/bigredv2/outside/ne) @@ -21167,7 +21195,7 @@ /area/bigredv2/outside/s) "fOc" = ( /turf/open/mars_cave/mars_cave_3, -/area/bigredv2/caves_virology) +/area/bigredv2/outside/lz1_telecomm_cas) "fOf" = ( /obj/item/trash/eat{ pixel_x = 2; @@ -21324,7 +21352,7 @@ name = "\improper Engine Reactor" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "fVt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table, @@ -21590,7 +21618,7 @@ "giB" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave, -/area/bigredv2/caves_sw) +/area/bigredv2/outside/lz2_south_cas) "giC" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/body, @@ -21818,7 +21846,7 @@ "guu" = ( /obj/structure/machinery/light, /turf/open/floor/dark, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "guM" = ( /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves_research) @@ -22023,7 +22051,7 @@ "gFR" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "gGf" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, @@ -22094,10 +22122,6 @@ }, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/outside/nw) -"gJw" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/mars_cave, -/area/bigredv2/caves_virology) "gJB" = ( /obj/effect/decal/cleanable/blood{ layer = 3 @@ -22173,7 +22197,7 @@ "gML" = ( /obj/structure/machinery/power/turbine, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "gNv" = ( /obj/structure/machinery/light{ dir = 1 @@ -22220,7 +22244,7 @@ name = "\improper Engine Reactor" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "gPE" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/flashlight/lantern, @@ -22299,7 +22323,7 @@ pixel_y = 9 }, /turf/open/floor/darkyellow2/northwest, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "gVl" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -22401,6 +22425,10 @@ "haV" = ( /turf/open/asphalt/cement_sunbleached, /area/bigredv2/outside/e) +"hbg" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/mars, +/area/bigredv2/outside/space_port_lz2) "hby" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/nw) @@ -22571,6 +22599,10 @@ }, /turf/open/floor, /area/bigredv2/outside/general_offices) +"hkR" = ( +/obj/structure/window/framed/solaris, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "hkS" = ( /obj/structure/platform/kutjevo/rock, /obj/structure/platform/kutjevo/rock{ @@ -23041,6 +23073,10 @@ /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/mars_cave, /area/bigredv2/caves/mining) +"hLq" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "hLS" = ( /obj/structure/sign/poster/safety, /turf/closed/wall/wood, @@ -23179,7 +23215,7 @@ dir = 5 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "hYI" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, @@ -23226,7 +23262,7 @@ "iaC" = ( /obj/structure/platform, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iaD" = ( /obj/item/shard, /obj/structure/window_frame/solaris, @@ -23438,7 +23474,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/window/framed/solaris, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iih" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/floor4, @@ -23791,7 +23827,7 @@ dir = 8 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iAL" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/bigredv2/outside/space_port_lz2) @@ -23877,7 +23913,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/bananapeel, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iFr" = ( /obj/effect/decal/cleanable/generic, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, @@ -23961,7 +23997,7 @@ /area/bigredv2/outside/telecomm/warehouse) "iNR" = ( /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iOR" = ( /obj/effect/landmark/crap_item, /turf/open/floor/asteroidfloor/north, @@ -24019,7 +24055,7 @@ }, /obj/structure/barricade/handrail, /turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iTD" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -24100,6 +24136,10 @@ }, /turf/open/floor, /area/bigredv2/outside/hydroponics) +"iWP" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/mars_cave/mars_dirt_4, +/area/bigredv2/outside/space_port_lz2) "iXo" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -24494,13 +24534,13 @@ "jxA" = ( /obj/structure/barricade/handrail, /turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "jxS" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "jxV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidwarning/northeast, @@ -24540,8 +24580,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/admin_building) "jAo" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave/mars_cave_5, /area/bigredv2/caves_sw) "jAJ" = ( @@ -24581,6 +24620,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/eta) +"jBC" = ( +/obj/effect/timed_event/scrapeaway{ + time = 40 + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/outside/lz2_west_cas) "jCg" = ( /obj/effect/spawner/random/attachment, /obj/structure/machinery/light{ @@ -24660,6 +24705,9 @@ /obj/item/storage/box/gloves, /turf/open/floor/whitegreen/east, /area/bigredv2/outside/medical) +"jFG" = ( +/turf/open/floor/darkyellowcorners2/east, +/area/bigredv2/outside/engineering/reactor) "jGd" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave/mars_cave_2, @@ -25070,7 +25118,7 @@ dir = 8 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "jXP" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave/mars_cave_16, @@ -25243,6 +25291,10 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/nw) +"keO" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/floor/plating, +/area/bigredv2/outside/space_port) "kfg" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -25403,7 +25455,7 @@ pixel_y = 9 }, /turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "kkF" = ( /obj/structure/machinery/camera/autoname, /obj/structure/bed, @@ -26565,7 +26617,7 @@ name = "Reactor Turbine" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "lCR" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/flask/vacuumflask{ @@ -26785,6 +26837,10 @@ /obj/effect/decal/strata_decals/grime/grime3, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/nw) +"lOV" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "lOY" = ( /obj/effect/landmark/nightmare{ insert_tag = "etatunnel_open" @@ -27120,6 +27176,9 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, /area/bigredv2/outside/bar) +"mge" = ( +/turf/open/floor/darkyellow2/north, +/area/bigredv2/outside/engineering/reactor) "mgr" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -27277,7 +27336,12 @@ "mqh" = ( /obj/structure/window/framed/solaris, /turf/open/floor/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) +"mqu" = ( +/obj/item/tool/extinguisher, +/obj/structure/machinery/power/apc/power/west, +/turf/open/floor/darkyellow2/west, +/area/bigredv2/outside/engineering/reactor) "mqK" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/bigredv2/outside/space_port_lz2) @@ -27292,6 +27356,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave/mars_cave_3, /area/bigredv2/caves/mining) +"mrc" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, +/area/bigredv2/outside/space_port_lz2) "mrF" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/mars, @@ -28355,7 +28423,7 @@ dir = 9 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "nuq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -28377,7 +28445,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail, /turf/open/floor/darkyellow2, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "nuQ" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/objective_landmark/close, @@ -28410,6 +28478,13 @@ }, /turf/open/mars_cave/mars_cave_3, /area/bigredv2/caves/mining) +"nxl" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/asteroidwarning, +/area/bigredv2/outside/space_port_lz2) +"nxG" = ( +/turf/open/floor/darkyellow2/west, +/area/bigredv2/outside/engineering/reactor) "nyZ" = ( /obj/item/tool/minihoe{ pixel_x = -4; @@ -28451,6 +28526,10 @@ }, /turf/open/mars, /area/bigredv2/outside/nw) +"nAJ" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/mars_cave/mars_dirt_4, +/area/bigredv2/outside/space_port_lz2) "nBb" = ( /obj/item/ammo_magazine/pistol/b92fs, /obj/item/weapon/gun/pistol/b92fs{ @@ -28580,6 +28659,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_17, /area/bigredv2/outside/filtration_cave_cas) +"nGN" = ( +/obj/effect/timed_event/scrapeaway{ + time = 40 + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves_sw) "nHQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/machinery/door/poddoor/almayer/closed{ @@ -29061,7 +29146,7 @@ dir = 4 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "okh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29339,7 +29424,7 @@ "ouh" = ( /obj/item/tool/extinguisher, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ouo" = ( /turf/open/floor/whitegreencorner/north, /area/bigredv2/outside/medical) @@ -29507,6 +29592,10 @@ /obj/item/shard, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"oCA" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/asteroidwarning/north, +/area/bigredv2/outside/space_port_lz2) "oCK" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/bigredv2/outside/e) @@ -29569,6 +29658,9 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"oHc" = ( +/turf/open/floor/darkyellow2/southeast, +/area/bigredv2/outside/engineering/reactor) "oHu" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/metal{ @@ -29629,7 +29721,7 @@ dir = 6 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "oJd" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -29896,7 +29988,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail, /turf/open/floor/darkyellow2/southwest, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "oWC" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -30196,7 +30288,7 @@ dir = 8 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "pok" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/effect/decal/cleanable/blood, @@ -30680,7 +30772,7 @@ dir = 1 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "pOt" = ( /obj/structure/machinery/optable, /turf/open/floor/whiteblue/east, @@ -30781,6 +30873,10 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves_se) +"pTY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2/north, +/area/bigredv2/outside/engineering/reactor) "pUi" = ( /obj/item/weapon/broken_bottle, /turf/open/floor/plating, @@ -30792,6 +30888,9 @@ }, /turf/open/floor/whitebluefull/northeast, /area/bigredv2/outside/medical) +"pVi" = ( +/turf/open/floor/darkyellowcorners2/north, +/area/bigredv2/outside/engineering/reactor) "pVp" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -30804,7 +30903,7 @@ dir = 1 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "pVP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidfloor/north, @@ -30823,7 +30922,7 @@ pixel_y = 9 }, /turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "pXm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -30865,6 +30964,10 @@ /obj/item/weapon/gun/rifle/m41a/training, /turf/open/mars_cave/mars_cave_17, /area/bigredv2/caves/mining) +"pXM" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/floor/plating, +/area/bigredv2/outside/space_port) "pXY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31301,6 +31404,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/bigredv2/outside/bar) +"qtZ" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "qus" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/delivery, @@ -31505,10 +31612,6 @@ }, /turf/open/floor/asteroidwarning/west, /area/bigredv2/outside/n) -"qEs" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/mars_cave/mars_cave_2, -/area/bigredv2/outside/lz2_south_cas) "qEz" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/mars, @@ -31572,6 +31675,10 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) +"qGD" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/mars/mars_dirt_10, +/area/bigredv2/outside/space_port_lz2) "qGT" = ( /obj/item/stack/sheet/metal{ pixel_x = 4; @@ -32555,6 +32662,10 @@ /obj/effect/landmark/corpsespawner/colonist, /turf/open/floor/wood, /area/bigredv2/outside/dorms) +"rGz" = ( +/obj/structure/machinery/light/double, +/turf/open/mars_cave/mars_cave_5, +/area/bigredv2/caves_sw) "rGD" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/red/north, @@ -32908,7 +33019,7 @@ dir = 4 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "rUU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/cigbutt{ @@ -33086,7 +33197,7 @@ "saX" = ( /obj/structure/machinery/power/turbine, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "sbc" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -33387,7 +33498,7 @@ dir = 4 }, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "snT" = ( /obj/item/stack/rods{ pixel_y = 13; @@ -33630,6 +33741,9 @@ }, /turf/open/mars_cave/mars_cave_16, /area/bigredv2/caves/mining) +"syJ" = ( +/turf/open/mars_cave/mars_cave_23, +/area/bigredv2/outside/lz2_south_cas) "syK" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -33665,7 +33779,7 @@ "sAG" = ( /obj/effect/landmark/hunter_primary, /turf/open/mars_cave/mars_cave_2, -/area/bigredv2/caves_sw) +/area/bigredv2/outside/lz2_south_cas) "sAS" = ( /obj/item/toy/prize/fireripley{ pixel_y = 19 @@ -33744,7 +33858,7 @@ "sDO" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "sDZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/welding, @@ -33901,7 +34015,7 @@ "sNP" = ( /obj/structure/window/framed/solaris, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "sNQ" = ( /turf/open/mars_cave/mars_cave_11, /area/bigredv2/caves_lambda) @@ -34132,7 +34246,7 @@ "tcP" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "tcV" = ( /obj/effect/decal/cleanable/generic, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, @@ -34546,7 +34660,7 @@ dir = 1 }, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "twt" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -35261,7 +35375,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/window/framed/solaris, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ueM" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -35309,6 +35423,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/bigredv2/outside/space_port_lz2) +"ugT" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt/cement_sunbleached, +/area/bigredv2/outside/space_port_lz2) "ugW" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/platingdmg3/west, @@ -35588,6 +35706,10 @@ "uyk" = ( /turf/open/mars_cave/mars_cave_7, /area/bigredv2/outside/lz2_west_cas) +"uyS" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/asphalt/cement_sunbleached, +/area/bigredv2/outside/w) "uzb" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood, @@ -35806,7 +35928,7 @@ dir = 8 }, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "uJu" = ( /obj/item/robot_parts/robot_component/diagnosis_unit{ pixel_y = 15 @@ -36050,6 +36172,9 @@ }, /turf/open/floor/white, /area/bigredv2/outside/medical) +"uZy" = ( +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/engineering/reactor) "uZG" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/cigbutt{ @@ -36124,7 +36249,7 @@ icon_state = "S" }, /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "vcy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{ @@ -36422,7 +36547,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail, /turf/open/floor/darkyellow2/southeast, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "vpu" = ( /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/mars_cave/mars_cave_3, @@ -36885,7 +37010,7 @@ "vNm" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/caves_virology) +/area/bigredv2/outside/lz1_telecomm_cas) "vND" = ( /obj/structure/flora/grass/desert/lightgrass_10, /turf/open/mars, @@ -37069,6 +37194,10 @@ "vXJ" = ( /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves_lambda) +"vYf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2/east, +/area/bigredv2/outside/engineering/reactor) "vYp" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/effect/decal/cleanable/blood, @@ -37270,6 +37399,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/dark, /area/bigredv2/outside/filtration_plant) +"whG" = ( +/obj/effect/landmark/crap_item, +/turf/open/mars_cave, +/area/bigredv2/outside/lz2_west_cas) "whL" = ( /obj/structure/barricade/deployable, /turf/open/floor/asteroidwarning/west, @@ -37391,7 +37524,7 @@ "wpn" = ( /obj/structure/closet/radiation, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "wpv" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -37559,7 +37692,7 @@ "wwT" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "wxo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidwarning, @@ -37596,12 +37729,6 @@ /obj/item/ammo_casing/bullet, /turf/open/floor, /area/bigredv2/outside/marshal_office) -"wBi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/mars_cave/mars_cave_2, -/area/bigredv2/outside/lz2_south_cas) "wBq" = ( /obj/structure/fence, /turf/open/mars_cave/mars_cave_2, @@ -37938,6 +38065,9 @@ /obj/item/device/flashlight, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves/mining) +"wRP" = ( +/turf/open/floor/dark, +/area/bigredv2/outside/engineering/reactor) "wSj" = ( /obj/structure/sign/safety/life_support, /obj/structure/sign/safety/maint{ @@ -37983,7 +38113,7 @@ dir = 10 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "wVQ" = ( /turf/open/mars_cave/mars_cave_17, /area/bigredv2/caves/mining) @@ -38938,6 +39068,9 @@ /obj/structure/prop/dam/crane, /turf/open/mars_cave/mars_cave_13, /area/bigredv2/caves/mining) +"xSu" = ( +/turf/open/floor/darkyellow2, +/area/bigredv2/outside/engineering/reactor) "xTk" = ( /obj/limb/arm/l_arm, /obj/effect/decal/cleanable/blood/drip, @@ -39036,7 +39169,7 @@ pixel_y = 9 }, /turf/open/floor/darkyellow2/northeast, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "xXP" = ( /obj/structure/prop/invuln/minecart_tracks/bumper, /turf/open/mars_cave/mars_cave_2, @@ -39270,7 +39403,7 @@ dir = 8 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ykb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -39290,7 +39423,7 @@ /area/bigredv2/outside/s) "ykR" = ( /turf/closed/wall/mineral/uranium, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ykW" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -3; @@ -40055,10 +40188,10 @@ aao aao aao aao -jCY -fLj -fLj -fmn +fxK +csE +csE +sQw aao aao aao @@ -40273,10 +40406,10 @@ aao aao fxK xmy -rDP -rDP -rDP -fmn +xmy +xmy +xmy +sQw aao aao aao @@ -40490,10 +40623,10 @@ aao fxK xmy xmy -rDP -iwG -rDP -rDP +xmy +lrH +xmy +xmy fmn aao aao @@ -40707,10 +40840,10 @@ aao rCA xmy xmy -rDP -rDP -rDP -rDP +xmy +xmy +xmy +xmy rDP rDP rDP @@ -40924,10 +41057,10 @@ fxK xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41141,10 +41274,10 @@ rCA xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41358,10 +41491,10 @@ rCA xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41575,10 +41708,10 @@ xmy xmy hcb xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41792,10 +41925,10 @@ xmy xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi aao aao aao @@ -42009,10 +42142,10 @@ xmy xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi aao aao aao @@ -42075,10 +42208,10 @@ cYJ vMj vMj cYJ -cYJ -wog -wog -wog +jBC +nGN +nGN +nGN wog wog wog @@ -42227,10 +42360,10 @@ xmy gda gda fOc -rDP -rDP -iwG -fmn +xmy +xmy +lrH +sQw aao aao aao @@ -42288,15 +42421,15 @@ cYJ cYJ ski eEy -ski -cYJ -cYJ +whG cYJ ovB +cYJ +jBC +nGN +nGN +wog wog -icQ -gYt -gYt wog sLy gYt @@ -42443,10 +42576,10 @@ gda eci aao aao -fwa -gJw -gJw -vNh +rCA +pQM +pQM +eOd vNm aao aao @@ -42508,12 +42641,12 @@ cYJ cYJ uyk cYJ -cYJ -cYJ -wog +jBC +jBC +nGN wog jAo -gYt +wog wog wog wog @@ -42660,7 +42793,7 @@ aao aao aao aao -mZC +eci aao wvk aGo @@ -42725,9 +42858,9 @@ cYJ cYJ uyk cYJ -tDv -wog -wog +jBC +nGN +nGN wog wog wog @@ -42825,7 +42958,7 @@ aaf aaf aar aaf -aaf +qtZ aaf aaf aaf @@ -42941,11 +43074,11 @@ aao aao aao bQb -ski -ski +jBC +jBC +nGN +nGN wog -gYt -gYt wog wog wog @@ -43160,9 +43293,9 @@ aao aao aao aao -kvp -gYt -gYt +nGN +wog +wog wog sLy wog @@ -43255,7 +43388,7 @@ aaf aaf aaf aaf -aaf +qtZ aaf aaf aaf @@ -43490,7 +43623,7 @@ acJ aaf aaf aaf -aaf +hLq aaf aaf aaf @@ -43686,7 +43819,7 @@ aao aao aae aag -aaf +qtZ aaf aaf aaf @@ -43710,7 +43843,7 @@ aaf aaf aaf aaf -aaf +hLq aaf aaf aae @@ -44226,7 +44359,7 @@ cVY cVY cVY cVY -cVY +ehN cVY ayf ayf @@ -44362,7 +44495,7 @@ aah aei aaf aaf -aaf +hLq acJ aae aao @@ -44439,7 +44572,7 @@ nbu cVY cVY cVY -cVY +ehN hpg mMf cVY @@ -44673,12 +44806,12 @@ tVp fFO cVY cVY -uSC +qGD tVp fFO cVY cVY -cVY +hbg ayf ayf aao @@ -45087,7 +45220,7 @@ cVY cVY hpg tVp -bgX +oCA eWd eWd eWd @@ -45764,7 +45897,7 @@ bie bsc eWd dAX -tVp +nAJ tVp ayf aao @@ -46315,7 +46448,7 @@ aah aej aaf aaf -aaf +lOV acJ aae aao @@ -46507,7 +46640,7 @@ aao aao aae aaf -aaf +cjS aap aav aaG @@ -47180,7 +47313,7 @@ jmQ lrf mSz dbO -aah +keO rIx iuI hyO @@ -47611,7 +47744,7 @@ dbO skZ skZ dbO -aah +keO aah aah aah @@ -47684,7 +47817,7 @@ aSB mQY jzO jzO -jzO +uyS vDS woe tVp @@ -47812,7 +47945,7 @@ aae aae wHg aah -aah +pXM aaU abc aah @@ -48034,7 +48167,7 @@ aah aah aah aah -aah +pXM abD aah aah @@ -48562,7 +48695,7 @@ tVp bgX sbm eWd -dAX +nxl kOv qNH mDt @@ -48578,13 +48711,13 @@ qcQ tVp tVp tVp -qet +mrc mVp mqK tVp qcQ tVp -tVp +iWP tVp aao aao @@ -48608,11 +48741,11 @@ aao aao aao aao -fus -kgx -qEs -hEE -wBi +kvp +wog +sLy +icQ +jMm uxx fOM kcx @@ -48825,10 +48958,10 @@ aao aao aao aao -fus -kgx -kgx -kgx +kvp +wog +wog +wog vct bvV rUn @@ -49044,9 +49177,9 @@ aao aao fus kgx -kgx -kgx -fvu +wog +wog +rGz uHQ tBf qjA @@ -49263,7 +49396,7 @@ lQN kgx kgx kgx -dVA +feS uHQ uHQ uHQ @@ -49449,7 +49582,7 @@ eKY tCn mic mic -tCn +ugT tCn tCn tCn @@ -52070,18 +52203,18 @@ euF euF aao aao -buz -ibZ -ibZ -ibZ -wog -trk -wog -wog -wog -trk -trk -trk +sSU +vCU +vCU +vCU +kgx +nEl +kgx +kgx +kgx +nEl +nEl +nEl wog wog aao @@ -52287,17 +52420,17 @@ aao aao aao aao -wog -wog -wog -wog -jXX +kgx +kgx +kgx +kgx +tsK aao aao aao aao aao -dxV +euF dxV qgY wog @@ -52502,12 +52635,12 @@ aao aao aao aao -wog -oQI -wog -wog -wog -wog +kgx +syJ +kgx +kgx +kgx +kgx aao bRC aao @@ -52715,16 +52848,16 @@ bpx aao aao aao -wog -wog -wog -wog +kgx +kgx +kgx +kgx sAG -wog -oQI -wog -wog -wog +kgx +syJ +kgx +kgx +kgx aao aao aao @@ -52932,15 +53065,15 @@ bpx aao aao aao -wog -wog -wog -wog -wog -wog -wog -icQ -wog +kgx +kgx +kgx +kgx +kgx +kgx +kgx +hEE +kgx aao aao aao @@ -53360,23 +53493,23 @@ ayZ axX axX axX -axX -axX -axX -axX -axX -axX -axX -axX +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy wwT -axX -axX -axX -axX -axX -axX -axX -axX +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy aao aao aao @@ -53577,23 +53710,23 @@ kVT ayZ bsP ayZ -ouh -lck +mqu +eyR jXJ -btr +nxG sDO pOg saX pVv saX eIN -lck -btr -ayZ -btr -kVT -axX -axX +eyR +nxG +hkR +nxG +dLd +uZy +uZy aao aao wog @@ -53794,23 +53927,23 @@ tTI nIi bte nIi -btu -gwg -gwg -gwg -tTI -btu -gwg -gwg -tTI -btu -btu -ndw +bLE +vYf +vYf +vYf +chw +bLE +vYf +vYf +chw +bLE +bLE +jFG fUp -nVq -sCt +wRP +xSu wpn -axX +uZy aao wog wog @@ -54018,16 +54151,16 @@ mqh fEv iig iig -ayZ +hkR fEv ueL ueL -ayZ -axX +hkR +uZy fEv -ayZ -axX -axX +hkR +uZy +uZy aao wog wog @@ -54240,10 +54373,10 @@ kka pog iAI wVB -ayZ -ndw -sCt -axX +hkR +jFG +xSu +uZy aao aao wog @@ -54457,10 +54590,10 @@ kka duA ykR iaC -ayZ -hhK -sCt -axX +hkR +mge +xSu +uZy aao wog qgY @@ -54674,10 +54807,10 @@ kka duA iNR iaC -ayZ -hhK -sCt -axX +hkR +mge +xSu +uZy aao wog wog @@ -54891,10 +55024,10 @@ kka duA ykR iaC -ayZ -hhK -sCt -axX +hkR +mge +xSu +uZy uVn wog wog @@ -55108,10 +55241,10 @@ kka duA iNR iaC -ayZ -hhK -sCt -axX +hkR +mge +xSu +uZy dQw wog qgY @@ -55326,8 +55459,8 @@ duA ykR iaC ueL -nzN -sCt +pTY +xSu tcP dQw wog @@ -55535,16 +55668,16 @@ duA iNR iaC gUD -btr +nxG jxS -btr +nxG oWp duA iNR iaC ueL -nzN -cKu +pTY +dyA tcP rvS wog @@ -55753,16 +55886,16 @@ ykR iaC dBU guu -axX +uZy cNb nuz duA ykR iaC -ayZ -hhK -cKu -axX +hkR +mge +dyA +uZy rvS wog wog @@ -55969,17 +56102,17 @@ duA iNR iaC xXq -btu +bLE uJj -gwg +vYf voG duA iNR iaC -ayZ -hhK -sCt -axX +hkR +mge +xSu +uZy rvS wog wog @@ -56193,10 +56326,10 @@ jxA duA ykR iaC -ayZ -nzN -sCt -axX +hkR +pTY +xSu +uZy rvS wog jXX @@ -56410,10 +56543,10 @@ kka duA iNR iaC -ayZ -nzN -sCt -axX +hkR +pTY +xSu +uZy aao aao aao @@ -56628,9 +56761,9 @@ duA ykR iaC iig -nzN -sCt -axX +pTY +xSu +uZy aao aao aao @@ -56844,10 +56977,10 @@ kka duA iNR iaC -ayZ -hhK -sCt -axX +hkR +mge +xSu +uZy aao aao aao @@ -57061,10 +57194,10 @@ kka duA ykR iaC -ayZ -hhK -sCt -axX +hkR +mge +xSu +uZy aao aao aao @@ -57278,10 +57411,10 @@ kka nug rUN oIK -ayZ -slC -sCt -axX +hkR +pVi +xSu +uZy aao aao aao @@ -57483,23 +57616,23 @@ wFL axX axX axX -ayZ -ayZ -ayZ -ayZ +hkR +hkR +hkR +hkR fEv -ayZ +hkR sNP ueL gPh sNP -ayZ -ayZ -axX +hkR +hkR +uZy fEv -ayZ -axX -axX +hkR +uZy +uZy aao aao aao @@ -57700,23 +57833,23 @@ tTI nIi gZc nIi -btr -lck -lck -lck -tTI -lck -lck +nxG +eyR +eyR +eyR +chw +eyR +eyR ouh -tTI -btr -btr -slC +chw +nxG +nxG +pVi fUp -nVq -sCt +wRP +xSu wpn -axX +uZy aao aao aao @@ -57917,23 +58050,23 @@ pMi ayZ bsP ayZ -btu +bLE iFa snv -btu +bLE gFR tvH gML tvH gML gFR -btu -btu -ayZ -btu -gdx -axX -axX +bLE +bLE +hkR +bLE +oHc +uZy +uZy aao aao aao @@ -58134,22 +58267,22 @@ sDZ axX axX axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy aao aao aao diff --git a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm index 897f76d0f656..c5dc410ba02e 100644 --- a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm +++ b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm @@ -576,14 +576,14 @@ /area/bigredv2/outside/lz2_south_cas) "cP" = ( /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cS" = ( /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cT" = ( /turf/open/mars/mars_dirt_13, /area/bigredv2/outside/lz2_south_cas) @@ -602,12 +602,12 @@ /area/bigredv2/outside/lz2_south_cas) "da" = ( /turf/closed/wall/mineral/uranium, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "db" = ( /obj/effect/decal/cleanable/dirt, /obj/item/tool/extinguisher, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dc" = ( /turf/open/mars_cave/mars_dirt_7, /area/bigredv2/outside/lz2_south_cas) @@ -621,7 +621,7 @@ "df" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "di" = ( /obj/structure/machinery/light{ dir = 8 @@ -632,7 +632,7 @@ "dj" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dk" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -648,19 +648,19 @@ dir = 1 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light_construct{ dir = 8 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dq" = ( /obj/item/bananapeel, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dr" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "rad_door"; @@ -674,21 +674,21 @@ "dv" = ( /obj/structure/machinery/power/turbine, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dx" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dy" = ( /obj/structure/machinery/power/reactor/colony{ name = "Reactor Turbine" }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dz" = ( /obj/structure/machinery/light_construct, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dA" = ( /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/outside/s) @@ -706,7 +706,7 @@ /obj/structure/machinery/power/port_gen/pacman, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dJ" = ( /obj/effect/landmark/hunter_primary, /turf/open/mars_cave/mars_cave_2, @@ -717,7 +717,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dO" = ( /turf/open/mars_cave/mars_cave_6, /area/bigredv2/outside/lz2_south_cas) @@ -726,17 +726,17 @@ /area/bigredv2/outside/lz2_south_cas) "dS" = ( /turf/open/mars_cave/mars_cave_7, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "dT" = ( /turf/closed/wall/solaris/rock, /area/bigredv2/caves) "dU" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_10, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "dV" = ( /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "dW" = ( /turf/open/mars_cave/mars_cave_23, /area/bigredv2/outside/lz2_south_cas) @@ -747,47 +747,47 @@ "dY" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dZ" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ec" = ( /obj/structure/catwalk/bigred, /turf/open/gm/river/desert/shallow/covered, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ee" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ef" = ( /obj/structure/machinery/light_construct{ dir = 4 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ei" = ( /obj/structure/machinery/compressor{ dir = 1 }, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ej" = ( /obj/structure/machinery/light_construct{ dir = 4 }, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ek" = ( /obj/structure/machinery/camera/autoname{ dir = 4 @@ -796,42 +796,42 @@ dir = 8 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "el" = ( /obj/structure/machinery/light_construct{ dir = 8 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "em" = ( /obj/structure/machinery/light_construct{ dir = 1 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "en" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/girder, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eo" = ( /obj/effect/decal/cleanable/dirt/greenglow, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_7, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "ep" = ( /obj/item/tool/extinguisher, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eq" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "er" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/molten_item, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "et" = ( /obj/structure/bed/chair/office/light, /turf/open/floor/plating/panelscorched, @@ -839,7 +839,7 @@ "ev" = ( /obj/structure/machinery/light_construct, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ew" = ( /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/engineering) @@ -847,14 +847,14 @@ /obj/effect/decal/cleanable/molten_item, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ey" = ( /obj/structure/machinery/light_construct{ dir = 4 }, /obj/effect/decal/cleanable/ash, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ez" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/panelscorched, @@ -864,7 +864,7 @@ dir = 1 }, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eB" = ( /obj/effect/decal/cleanable/dirt/greenglow, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -893,11 +893,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eH" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eI" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/darkyellow2/west, @@ -905,28 +905,28 @@ "eJ" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eK" = ( /obj/effect/decal/cleanable/molten_item, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eL" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eM" = ( /obj/effect/decal/cleanable/dirt/greenglow, /obj/effect/decal/cleanable/molten_item, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eN" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "eO" = ( /turf/closed/wall/mineral/uranium/leaking, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "fI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, @@ -969,6 +969,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellow2/west, /area/bigredv2/outside/engineering) +"pK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/engineering/reactor) +"sy" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "sU" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_dirt_6, @@ -986,6 +994,10 @@ }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/telecomm/engi) +"wu" = ( +/obj/structure/machinery/power/apc/power/west, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "xl" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/darkyellowcorners2/west, @@ -1000,6 +1012,9 @@ }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/telecomm/engi) +"Af" = ( +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/engineering/reactor) "Ah" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars, @@ -1022,14 +1037,24 @@ "Dq" = ( /turf/open/floor/darkyellow2/east, /area/bigredv2/outside/engineering) +"EG" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "ET" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/darkyellow2/west, /area/bigredv2/outside/engineering) +"FO" = ( +/turf/open/mars_cave/mars_cave_2, +/area/bigredv2/caves_sw) +"GC" = ( +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/engineering/reactor) "IE" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_7, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "KJ" = ( /obj/structure/window_frame/solaris/reinforced, /turf/open/floor/plating, @@ -1079,6 +1104,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellow2/east, /area/bigredv2/outside/engineering) +"YX" = ( +/turf/open/mars_cave/mars_cave_23, +/area/bigredv2/caves_sw) (1,1,1) = {" au @@ -1141,7 +1169,7 @@ dW dR dR dR -dR +FO dT "} (3,1,1) = {" @@ -1172,9 +1200,9 @@ dR dR dO dR -dR -dR -dR +FO +FO +FO "} (4,1,1) = {" au @@ -1204,9 +1232,9 @@ kN kN kN dn -dR -dR -dR +FO +FO +FO "} (5,1,1) = {" au @@ -1221,24 +1249,24 @@ aF aq aq aq -dX -dX -aq -aq -dk -aq -aq +EG +EG +Af +Af +sy +Af +Af ex eG -dk -dk -aq -aq +sy +sy +Af +Af dT dT dS -dW -dR +YX +FO "} (6,1,1) = {" au @@ -1256,7 +1284,7 @@ aq cP cR dp -cP +wu df do dv @@ -1265,12 +1293,12 @@ dZ dG dK dv -aq -aq +Af +Af dT dS dV -dR +FO "} (7,1,1) = {" au @@ -1286,23 +1314,23 @@ cn cB cn cP -ez -ez +pK +pK cR cR cP eh eh eh -ew -ew -ew -aq -aq +GC +GC +GC +Af +Af dT dT dS -dR +FO "} (8,1,1) = {" au @@ -1321,20 +1349,20 @@ db cR cR eH -ew +GC cR eh eh -ew -ez -ez +GC +pK +pK cP -aq -aq -aq +Af +Af +Af dT dS -dR +FO "} (9,1,1) = {" au @@ -1362,11 +1390,11 @@ cS cS cS cP -aq -aq +Af +Af dT dS -dR +FO "} (10,1,1) = {" bC @@ -1394,11 +1422,11 @@ cS da cS dz -aq -aq +Af +Af dT dS -dR +FO "} (11,1,1) = {" au @@ -1426,11 +1454,11 @@ dj dj dj cP -aq -aq +Af +Af dT dS -dR +FO "} (12,1,1) = {" au @@ -1459,10 +1487,10 @@ eO dj dZ dZ -aq +Af dT dS -dR +FO "} (13,1,1) = {" au @@ -1491,10 +1519,10 @@ dj dj eh dZ -aq +Af dU dV -dR +FO "} (14,1,1) = {" au @@ -1515,7 +1543,7 @@ da cS ec ev -aq +Af em ec cS @@ -1526,7 +1554,7 @@ eb dY eo eN -dR +FO "} (15,1,1) = {" au @@ -1546,19 +1574,19 @@ cS cS cS cP -ew +GC ek eq -ez +pK cS cS cS -ez +pK cR eL eo -dR -dR +FO +FO "} (16,1,1) = {" ak @@ -1577,20 +1605,20 @@ oE cS da cS -ew +GC ee dy -ez +pK er cS da cS -ew +GC ee en IE -dR -dR +FO +FO "} (17,1,1) = {" au @@ -1609,20 +1637,20 @@ oE cS cS cS -ew -ew +GC +GC ey -ez -ez +pK +pK cS cS cS cP cP -aq +Af IE -dR -dR +FO +FO "} (18,1,1) = {" au @@ -1643,7 +1671,7 @@ da cS ec dz -aq +Af eA ec cS @@ -1651,10 +1679,10 @@ da dj cP cR -dk +sy IE -dR -dR +FO +FO "} (19,1,1) = {" au @@ -1682,8 +1710,8 @@ dj dj dj dZ -ez -dX +pK +EG dT dT dT @@ -1713,9 +1741,9 @@ ec dj eO dj -ez -ez -aq +pK +pK +Af dT dT dT @@ -1746,8 +1774,8 @@ cS dj dj cP -aq -aq +Af +Af dT dT dT @@ -1809,9 +1837,9 @@ ec cS cS cS -ew -dX -aq +GC +EG +Af dT dT dT @@ -1835,15 +1863,15 @@ dZ dZ dZ dZ -ew -ez -ez -ew +GC +pK +pK +GC cP cP ee -dX -aq +EG +Af dT dT dT @@ -1869,12 +1897,12 @@ cR eh eb ep -ez +pK cP cP cP -dk -aq +sy +Af dT dT dT @@ -1900,12 +1928,12 @@ dZ df ei dv -ew +GC cP df do dv -aq +Af dT dT dT @@ -1926,18 +1954,18 @@ aq aq dX dY -aq -aq -dk +Af +Af +sy eJ eJ eJ -aq -dk -dX -dk -aq -aq +Af +sy +EG +sy +Af +Af dT dT dT diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index b63cffee2f78..27df07c96d49 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -36148,6 +36148,7 @@ icon_state = "E" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/sentry_landmark/lz_2/bottom_right, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cXD" = ( @@ -44152,6 +44153,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_civilian) +"dWU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) "dWV" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -47178,6 +47184,16 @@ /obj/structure/prop/dam/boulder/boulder1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"kcc" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_cargo) "kcH" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/exterior/telecomm/lz2_containers) @@ -47965,6 +47981,10 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_two) +"niQ" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/landing_pad_two) "nji" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/cell_stripe/east, @@ -48499,6 +48519,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"pAn" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) "pAE" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, @@ -49085,6 +49109,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) +"rSC" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) "rTP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -49534,6 +49562,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"trD" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_cargo) "trP" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/desert/dirt, @@ -49635,6 +49667,10 @@ /obj/effect/decal/remains/human, /turf/open/desert/rock, /area/desert_dam/interior/caves/temple) +"tIJ" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_cargo) "tKQ" = ( /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/valley/valley_crashsite) @@ -49767,6 +49803,10 @@ "ulg" = ( /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/exterior/telecomm/lz2_storage) +"uli" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) "ulm" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -50281,6 +50321,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/building/cafeteria/loading) +"wkI" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) "wnE" = ( /obj/structure/closet/crate/hydroponics/prespawned, /obj/effect/landmark/objective_landmark/close, @@ -50752,6 +50799,11 @@ /obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"xMh" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) "xMr" = ( /obj/effect/blocker/toxic_water/Group_2, /obj/structure/barricade/wooden{ @@ -56266,9 +56318,9 @@ crx dlM crx crx -crx +tIJ dFo -doE +rSC doE cDb cGS @@ -57434,11 +57486,11 @@ crx crx crx dlM -crx +tIJ crx crx dFo -doE +pAn doE alh cMC @@ -57670,7 +57722,7 @@ cMJ cUk crx crx -crx +trD dFo doE doE @@ -57686,7 +57738,7 @@ cDX cDX cDX cDX -cDX +niQ cDX cDX cDX @@ -57929,7 +57981,7 @@ djl djl djl djl -djl +xMh djl djl djl @@ -58386,7 +58438,7 @@ vGu dws bhp mfH -bhp +dWU bhp mfH bhp @@ -58401,7 +58453,7 @@ vGu dws dws vGu -dws +uli dws dws tlh @@ -58606,7 +58658,7 @@ doE cAV cuJ cuJ -cuJ +kcc cuJ cuJ cuJ @@ -58629,7 +58681,7 @@ djk djk djk djk -djk +wkI djk djk eCk diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 2042a78f845d..3f5ae8bcbc41 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -47,7 +47,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ace" = ( /obj/effect/landmark{ icon_state = "hive_spawn"; @@ -151,7 +151,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "agh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -232,7 +232,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "aje" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -281,7 +281,7 @@ "akM" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "akW" = ( /obj/structure/bed/chair/janicart, /turf/open/floor/prison, @@ -328,7 +328,7 @@ /area/fiorina/tumor/civres) "amn" = ( /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "amF" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/aux_engi) @@ -337,7 +337,7 @@ dir = 4 }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ane" = ( /obj/item/weapon/unathiknife{ name = "ceremonial knife" @@ -350,7 +350,7 @@ /obj/item/restraint/handcuffs, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "anm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -438,7 +438,7 @@ pixel_y = 11 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ape" = ( /obj/structure/bed/chair{ dir = 4; @@ -449,6 +449,16 @@ "apf" = ( /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"apg" = ( +/turf/open/floor/prison/whitepurple, +/area/fiorina/station/research_cells/east) +"apm" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) "apu" = ( /turf/open/floor/prison/blue, /area/fiorina/station/power_ring) @@ -480,13 +490,13 @@ "arl" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "arn" = ( /obj/effect/landmark/nightmare{ insert_tag = "researchprestine" }, /turf/closed/wall/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "art" = ( /obj/structure/platform{ dir = 8 @@ -517,7 +527,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "ask" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -549,6 +559,10 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, /area/fiorina/station/transit_hub) +"asF" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/fiorina/station/research_cells/east) "asI" = ( /obj/item/toy/deck, /turf/open/floor/prison/whitegreenfull/southwest, @@ -591,7 +605,7 @@ "atY" = ( /obj/structure/bedsheetbin, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "auj" = ( /obj/item/frame/rack, /turf/open/floor/prison/floor_plate, @@ -613,14 +627,14 @@ /obj/structure/closet/wardrobe/orange, /obj/item/clothing/under/color/orange, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "avc" = ( /obj/structure/stairs/perspective{ dir = 5; icon_state = "p_stair_full" }, /turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "avJ" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison, @@ -644,7 +658,7 @@ pixel_y = 19 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "axb" = ( /obj/item/clothing/suit/storage/marine/specialist, /turf/open/floor/plating/prison, @@ -663,6 +677,9 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"axz" = ( +/turf/closed/wall/r_wall/prison, +/area/fiorina/station/lowsec/east) "axA" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ density = 0; @@ -693,7 +710,7 @@ "ayG" = ( /obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "ayH" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -706,7 +723,7 @@ /obj/item/explosive/grenade/incendiary/molotov, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "ayX" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -807,6 +824,9 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/prison, /area/fiorina/station/park) +"aCw" = ( +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "aCC" = ( /obj/item/tool/soap{ pixel_x = 2; @@ -992,7 +1012,7 @@ pixel_y = 13 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "aLC" = ( /obj/structure/sink{ dir = 8; @@ -1000,7 +1020,7 @@ }, /obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "aLT" = ( /obj/item/trash/uscm_mre, /turf/open/floor/plating/prison, @@ -1011,7 +1031,7 @@ layer = 2.7 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "aMg" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/ice_lab) @@ -1070,6 +1090,10 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) +"aNY" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "aOc" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_3"; @@ -1206,7 +1230,7 @@ /area/fiorina/station/medbay) "aSz" = ( /turf/closed/wall/r_wall/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "aSA" = ( /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison, @@ -1252,7 +1276,7 @@ pixel_y = 13 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "aTO" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck/uno, @@ -1326,7 +1350,7 @@ /area/fiorina/lz/near_lzII) "aXC" = ( /turf/open/floor/prison/damaged2/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "aXO" = ( /turf/open/floor/prison/damaged2, /area/fiorina/station/central_ring) @@ -1352,10 +1376,16 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"aYR" = ( +/turf/open/floor/prison/whitepurple/west, +/area/fiorina/station/research_cells/east) "aZi" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/tumor/servers) +"aZA" = ( +/turf/open/floor/prison/blue, +/area/fiorina/station/power_ring/reactor) "aZD" = ( /obj/structure/platform{ dir = 8 @@ -1396,7 +1426,7 @@ "baM" = ( /obj/effect/spawner/random/gun/smg, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bbn" = ( /obj/item/device/motiondetector, /turf/open/floor/prison/floor_plate, @@ -1419,7 +1449,7 @@ pixel_y = 23 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bbU" = ( /obj/structure/sign/safety/fire_haz, /turf/open/floor/prison/floor_plate, @@ -1546,7 +1576,7 @@ req_access = null }, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "bgy" = ( /obj/item/trash/pistachios, /turf/open/floor/plating/prison, @@ -1573,7 +1603,10 @@ pixel_y = 13 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"bhC" = ( +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/lowsec/east) "bhW" = ( /turf/open/floor/prison/greencorner/east, /area/fiorina/tumor/civres) @@ -1610,7 +1643,7 @@ "bjZ" = ( /obj/item/weapon/twohanded/spear, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "bkg" = ( /obj/structure/bed/chair, /turf/open/floor/prison, @@ -1624,7 +1657,7 @@ icon_state = "casing_7_1" }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bkU" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, @@ -1638,7 +1671,11 @@ "blf" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) +"blt" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/showers_laundry) "blA" = ( /obj/item/shard{ icon_state = "medium"; @@ -1652,7 +1689,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bma" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper, @@ -1756,7 +1793,7 @@ pixel_y = 8 }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bqC" = ( /obj/structure/platform{ dir = 8 @@ -1822,7 +1859,7 @@ name = "ice shard" }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "bso" = ( /turf/closed/shuttle/ert{ icon_state = "stan_l_w" @@ -1834,13 +1871,16 @@ dir = 4 }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bsR" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, /obj/item/trash/cigbutt, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"btJ" = ( +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/showers_laundry) "buz" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -1907,7 +1947,7 @@ "bwk" = ( /obj/item/tool/wrench, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bww" = ( /obj/item/trash/candy, /turf/open/floor/prison/floor_plate/southwest, @@ -1940,7 +1980,7 @@ "bxv" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "bxy" = ( /turf/open/floor/prison/darkyellow2/northeast, /area/fiorina/lz/near_lzI) @@ -2071,7 +2111,7 @@ "bAM" = ( /obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bBr" = ( /obj/structure/barricade/metal/wired{ dir = 1 @@ -2148,7 +2188,7 @@ "bEm" = ( /obj/effect/landmark/wo_supplies/storage/belts/knifebelt, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "bEA" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -2274,12 +2314,12 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bIR" = ( /obj/structure/closet/secure_closet/security, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "bIZ" = ( /turf/closed/shuttle/elevator{ dir = 6 @@ -2296,7 +2336,7 @@ "bJn" = ( /obj/item/stack/cable_coil/pink, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bJp" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -2368,7 +2408,7 @@ /obj/structure/surface/rack, /obj/item/restraint/handcuffs/zip, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bMI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/folder/black_random, @@ -2407,7 +2447,7 @@ "bOx" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bOK" = ( /obj/item/reagent_container/food/snacks/donkpocket, /turf/open/floor/corsat/squares, @@ -2525,7 +2565,7 @@ name = "\improper Fiorina Purple Block Canteen Vendor" }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bRo" = ( /obj/structure/sink{ pixel_y = 23 @@ -2606,13 +2646,13 @@ "bTr" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bTC" = ( /obj/structure/machinery/power/terminal{ dir = 8 }, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "bTI" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ explo_proof = 1; @@ -2642,6 +2682,12 @@ /obj/structure/closet/boxinggloves, /turf/open/floor/prison, /area/fiorina/station/central_ring) +"bVO" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison/whitepurple/east, +/area/fiorina/station/research_cells/east) "bVZ" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1"; @@ -2673,7 +2719,7 @@ "bXz" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bXA" = ( /obj/item/tool/screwdriver, /turf/open/floor/prison, @@ -2701,7 +2747,7 @@ }, /obj/item/device/flashlight/lamp, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bZY" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, @@ -2709,7 +2755,11 @@ "car" = ( /obj/structure/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"cas" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/showers_laundry) "caA" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/floor_plate, @@ -2719,7 +2769,7 @@ /area/fiorina/station/transit_hub) "caF" = ( /turf/open/floor/wood, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "caX" = ( /obj/structure/inflatable/popped/door, /obj/item/ammo_casing{ @@ -2763,7 +2813,7 @@ "cbY" = ( /obj/item/newspaper, /turf/open/floor/prison/whitepurplecorner, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ccH" = ( /obj/structure/machinery/newscaster, /turf/closed/wall/prison, @@ -2839,7 +2889,7 @@ dir = 1 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cfG" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 1 @@ -2849,7 +2899,7 @@ "cfU" = ( /obj/item/prop/helmetgarb/gunoil, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cgx" = ( /obj/structure/bed/chair, /turf/open/floor/prison/sterile_white/southwest, @@ -2958,7 +3008,7 @@ "ckS" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "ckZ" = ( /obj/structure/platform, /turf/open/floor/prison, @@ -2985,7 +3035,7 @@ "clA" = ( /obj/item/weapon/baton/cattleprod, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "clN" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -3027,7 +3077,7 @@ "coj" = ( /obj/item/stool, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cpv" = ( /obj/structure/platform{ dir = 8 @@ -3062,7 +3112,7 @@ "cqW" = ( /obj/item/stool, /turf/open/floor/prison/damaged2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cqX" = ( /obj/item/stool, /turf/open/floor/prison/floor_plate, @@ -3128,7 +3178,7 @@ }, /obj/effect/spawner/random/goggles/lowchance, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ctW" = ( /obj/structure/bed{ icon_state = "abed" @@ -3153,7 +3203,7 @@ }, /obj/item/frame/rack, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "cvc" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -3334,7 +3384,7 @@ /area/fiorina/station/medbay) "cCe" = ( /turf/open/floor/prison/whitepurplecorner, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cCh" = ( /obj/item/ammo_casing{ dir = 6; @@ -3405,7 +3455,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cEw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/transit_hub) @@ -3488,7 +3538,7 @@ "cHC" = ( /obj/item/trash/popcorn, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cHF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright, @@ -3502,13 +3552,16 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) +"cIa" = ( +/turf/closed/wall/prison, +/area/fiorina/station/research_cells/east) "cIt" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "cIJ" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -3516,7 +3569,7 @@ }, /obj/structure/inflatable, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cIQ" = ( /obj/structure/bed/chair{ dir = 4 @@ -3570,7 +3623,7 @@ /area/fiorina/tumor/aux_engi) "cKa" = ( /turf/closed/wall/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cKb" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -3593,7 +3646,7 @@ /obj/effect/decal/cleanable/blood/gibs/up, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "cKJ" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -3662,7 +3715,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cNe" = ( /obj/structure/bed/chair{ dir = 8 @@ -3682,7 +3735,7 @@ /area/fiorina/station/park) "cOF" = ( /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cOL" = ( /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/telecomm/lz1_cargo) @@ -3763,7 +3816,7 @@ opacity = 0 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cRI" = ( /obj/structure/closet{ density = 0; @@ -3771,7 +3824,7 @@ }, /obj/item/stool, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cRK" = ( /obj/structure/window, /turf/open/floor/prison/darkpurplefull2, @@ -3779,7 +3832,7 @@ "cRM" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "cRZ" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 4 @@ -3852,7 +3905,7 @@ "cVV" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "cXp" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison/floor_plate, @@ -3880,14 +3933,14 @@ pixel_y = 4 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cYj" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cYI" = ( /turf/open/floor/prison/green/northeast, /area/fiorina/tumor/aux_engi) @@ -3913,7 +3966,7 @@ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "cYV" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -3922,6 +3975,16 @@ /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"cYY" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "cZe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone, @@ -4003,7 +4066,7 @@ "dbh" = ( /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dbi" = ( /obj/item/storage/toolbox/electrical, /turf/open/floor/prison, @@ -4026,7 +4089,7 @@ "dbI" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/floor_marked/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "dbW" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/donkpockets{ @@ -4039,7 +4102,7 @@ "dcv" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "dcy" = ( /obj/structure/bed/chair{ dir = 8 @@ -4063,7 +4126,7 @@ pixel_y = 7 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "ddv" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/structure/machinery/light/double/blue{ @@ -4117,6 +4180,9 @@ }, /turf/closed/wall/prison, /area/fiorina/tumor/servers) +"deg" = ( +/turf/open/floor/prison/whitepurplecorner/west, +/area/fiorina/station/research_cells/east) "deB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -4163,7 +4229,7 @@ pixel_y = -1 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "dhi" = ( /obj/structure/platform_decoration/kutjevo, /turf/open/space/basic, @@ -4185,11 +4251,11 @@ "diF" = ( /obj/item/stack/sheet/cardboard, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "diJ" = ( /obj/item/stool, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "diL" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -4213,11 +4279,11 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "djF" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dkb" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, @@ -4254,7 +4320,7 @@ "dlj" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dlr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/radio{ @@ -4310,6 +4376,10 @@ "dnX" = ( /turf/open/floor/prison/darkyellow2/west, /area/fiorina/lz/near_lzI) +"doc" = ( +/obj/item/stool, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/east) "doe" = ( /obj/item/tool/kitchen/utensil/pspoon, /turf/open/space/basic, @@ -4337,7 +4407,7 @@ dir = 1 }, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "doY" = ( /obj/item/paper/crumpled/bloody, /turf/open/floor/prison/chapel_carpet/doubleside/north, @@ -4402,7 +4472,7 @@ "drk" = ( /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "drt" = ( /obj/structure/machinery/vending/hydroseeds, /turf/open/floor/prison/blue_plate/north, @@ -4410,7 +4480,7 @@ "drZ" = ( /obj/item/clothing/mask/cigarette, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dsS" = ( /obj/structure/barricade/handrail/type_b{ dir = 4; @@ -4430,7 +4500,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "dtk" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/golden_cup, @@ -4462,7 +4532,10 @@ "duF" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"duL" = ( +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/east) "duM" = ( /obj/structure/machinery/photocopier, /turf/open/floor/wood, @@ -4471,7 +4544,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "duW" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, @@ -4587,14 +4660,14 @@ /area/fiorina/station/flight_deck) "dzB" = ( /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dzE" = ( /obj/structure/machinery/shower{ dir = 1; pixel_y = -1 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "dAd" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -4765,7 +4838,7 @@ pixel_y = -1 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dFK" = ( /obj/structure/surface/rack, /obj/item/ammo_box/magazine/nailgun, @@ -4821,12 +4894,15 @@ "dIo" = ( /turf/closed/wall/prison, /area/fiorina/tumor/civres) +"dIp" = ( +/turf/open/floor/prison/blue/east, +/area/fiorina/station/power_ring/reactor) "dIx" = ( /obj/structure/platform{ dir = 4 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "dJd" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/item/ammo_magazine/rifle/mar40, @@ -4843,13 +4919,13 @@ pixel_y = 10 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dJt" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "dKo" = ( /obj/effect/spawner/random/gun/shotgun, /turf/open/floor/carpet, @@ -4973,13 +5049,13 @@ "dQe" = ( /obj/item/tool/surgery/scalpel, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "dQV" = ( /obj/structure/platform_decoration{ dir = 4 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "dQW" = ( /obj/item/ammo_casing{ dir = 8; @@ -5070,13 +5146,13 @@ pixel_x = 12 }, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dVu" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "dVx" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -5087,12 +5163,12 @@ "dVA" = ( /obj/item/stool, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dVC" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "dVD" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/whitegreen, @@ -5151,7 +5227,7 @@ "dXS" = ( /obj/structure/bed/chair/office/light, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dXT" = ( /obj/structure/platform_decoration, /obj/effect/spawner/random/toolbox, @@ -5206,6 +5282,10 @@ "dZK" = ( /turf/open/floor/prison/bluecorner/east, /area/fiorina/station/chapel) +"dZM" = ( +/obj/structure/window/framed/prison/cell, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "dZQ" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/darkyellow2/east, @@ -5221,7 +5301,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "eca" = ( /obj/structure/platform{ dir = 1 @@ -5234,7 +5314,7 @@ "ecd" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ecu" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, @@ -5406,7 +5486,7 @@ "eio" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "eip" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -5415,11 +5495,17 @@ /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/station/security) +"eja" = ( +/obj/item/ammo_casing{ + icon_state = "casing_6_1" + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "ejf" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ejq" = ( /obj/structure/machinery/space_heater, /turf/open/floor/plating/plating_catwalk/prison, @@ -5453,7 +5539,7 @@ pixel_y = 2 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ekb" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_tram) @@ -5489,11 +5575,15 @@ /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ele" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) +"elm" = ( +/obj/structure/window/framed/prison/cell, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "elO" = ( /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/lowsec) @@ -5514,6 +5604,9 @@ }, /turf/open/space, /area/fiorina/oob) +"emE" = ( +/turf/open/floor/prison/bluecorner/west, +/area/fiorina/station/power_ring/reactor) "end" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, @@ -5542,10 +5635,10 @@ desc = "A huge chunk of metal used to seperate rooms."; name = "metal wall" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "eow" = ( /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "eoW" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/prison, @@ -5658,7 +5751,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "esw" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/medbay) @@ -5684,7 +5777,7 @@ dir = 4 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "etL" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/prison, @@ -5703,7 +5796,7 @@ dir = 8 }, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "euz" = ( /obj/structure/bed/chair{ dir = 4 @@ -5875,7 +5968,7 @@ "ezd" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "eze" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 @@ -5969,7 +6062,7 @@ pixel_y = 10 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "eEx" = ( /obj/item/circuitboard/machine/rdserver, /turf/open/floor/prison/darkpurplefull2, @@ -5982,7 +6075,7 @@ pixel_y = 22 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "eED" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/paper_bin{ @@ -6065,7 +6158,7 @@ dir = 8 }, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "eGO" = ( /obj/item/storage/toolbox/electrical, /obj/structure/surface/rack, @@ -6157,7 +6250,7 @@ "eJy" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "eJK" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/floor_plate, @@ -6183,7 +6276,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "eLB" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 @@ -6203,7 +6296,7 @@ pixel_y = 21 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "eLX" = ( /obj/structure/platform_decoration{ dir = 1 @@ -6233,6 +6326,14 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) +"eMN" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/east) "eMU" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -6254,7 +6355,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/storage/surgical_tray/empty, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "eNv" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkyellowfull2/east, @@ -6321,7 +6422,7 @@ "eQb" = ( /obj/item/clothing/gloves/boxing/green, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "eQk" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -6330,6 +6431,12 @@ }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) +"eQs" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "eQz" = ( /obj/structure/machinery/gibber, /obj/effect/decal/cleanable/blood{ @@ -6391,6 +6498,10 @@ }, /turf/open/floor/prison, /area/fiorina/tumor/servers) +"eSI" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/west) "eSO" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light/double/blue, @@ -6399,7 +6510,7 @@ "eTa" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "eTb" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -6469,6 +6580,9 @@ /obj/structure/machinery/computer/arcade, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"eVD" = ( +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/lowsec/east) "eVK" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -6623,7 +6737,7 @@ "eZW" = ( /obj/item/stack/rods/plasteel, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fac" = ( /obj/structure/platform/shiva{ dir = 1 @@ -6636,7 +6750,7 @@ icon_state = "metal_1" }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "faD" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -6647,6 +6761,9 @@ /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"fbn" = ( +/turf/closed/wall/prison, +/area/fiorina/station/power_ring/reactor) "fbo" = ( /obj/structure/barricade/plasteel, /obj/structure/barricade/metal{ @@ -6686,7 +6803,7 @@ dir = 1 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "fdf" = ( /obj/structure/closet, /obj/item/stack/cable_coil, @@ -6729,6 +6846,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/medbay) +"ffx" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/east) "ffA" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/greenfull/northwest, @@ -6740,7 +6861,7 @@ "fgq" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fgM" = ( /obj/structure/platform, /obj/item/ammo_casing{ @@ -6790,7 +6911,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "fiw" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/bluefull, @@ -6817,13 +6938,13 @@ dir = 4 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fjg" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fjo" = ( /obj/item/ammo_casing{ icon_state = "casing_5_1" @@ -6871,6 +6992,9 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"flG" = ( +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/disco/east_disco) "fmb" = ( /obj/item/storage/firstaid/toxin, /turf/open/floor/prison/floor_plate, @@ -6890,6 +7014,13 @@ /obj/item/device/cassette_tape/ocean, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"fna" = ( +/obj/structure/toilet{ + dir = 4; + pixel_y = 8 + }, +/turf/open/floor/prison/whitepurple/northwest, +/area/fiorina/station/research_cells/east) "fnn" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/plating/prison, @@ -6990,7 +7121,7 @@ "fqI" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "frc" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/blue/west, @@ -7080,6 +7211,9 @@ }, /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/park) +"fvx" = ( +/turf/open/floor/prison/whitepurple/northwest, +/area/fiorina/station/research_cells/east) "fvH" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/oob) @@ -7149,10 +7283,10 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/mask/surgical, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "fyi" = ( /turf/open/floor/wood, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "fyt" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "ywflowers_3" @@ -7175,7 +7309,7 @@ "fyL" = ( /obj/structure/platform_decoration, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fyO" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -7251,10 +7385,16 @@ /obj/structure/closet/secure_closet/engineering_materials, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) +"fBA" = ( +/turf/open/floor/prison/yellow/east, +/area/fiorina/station/lowsec/showers_laundry) "fBD" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) +"fBK" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "fCf" = ( /obj/structure/bed/roller, /obj/structure/machinery/iv_drip{ @@ -7336,7 +7476,7 @@ "fDW" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fEn" = ( /turf/open/floor/prison, /area/fiorina/tumor/ice_lab) @@ -7350,7 +7490,7 @@ /obj/item/fuel_cell, /obj/structure/surface/rack, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fEH" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/station_alert, @@ -7359,7 +7499,7 @@ "fEY" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/floor/delivery, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fFv" = ( /obj/structure/barricade/sandbags{ icon_state = "sandbag_0"; @@ -7367,7 +7507,7 @@ pixel_y = -14 }, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fFw" = ( /obj/structure/largecrate/random, /turf/open/floor/prison/floor_marked/southwest, @@ -7415,7 +7555,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "fIn" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/redfull, @@ -7489,11 +7629,11 @@ }, /obj/item/trash/syndi_cakes, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "fLb" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "fLu" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/bluefull, @@ -7503,7 +7643,7 @@ dir = 4 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "fLS" = ( /obj/structure/bed/chair, /turf/open/floor/wood, @@ -7549,7 +7689,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fOg" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -7630,7 +7770,7 @@ }, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "fRo" = ( /obj/structure/bed/chair, /turf/open/floor/plating/prison, @@ -7658,7 +7798,7 @@ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "fSz" = ( /turf/closed/shuttle/ert{ icon_state = "stan25" @@ -7790,13 +7930,13 @@ /area/fiorina/oob) "fWV" = ( /turf/open/floor/prison/damaged1/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fXo" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fXB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/security) @@ -7821,7 +7961,7 @@ "fXW" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/bluecorner/west, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fYa" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitegreenfull/southwest, @@ -7847,7 +7987,7 @@ icon_state = "casing_6" }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "fZc" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/fancy/cigarettes/arcturian_ace{ @@ -7855,7 +7995,7 @@ pixel_y = 9 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "fZd" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 @@ -7914,7 +8054,7 @@ "gbk" = ( /obj/item/trash/burger, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gbv" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -7972,7 +8112,7 @@ pixel_y = 13 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "gec" = ( /obj/structure/prop/structure_lattice{ dir = 8; @@ -7994,7 +8134,7 @@ current_rounds = 0 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "geF" = ( /obj/structure/lattice, /turf/open/floor/almayer_hull, @@ -8102,7 +8242,7 @@ "gjr" = ( /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "gjs" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -8139,13 +8279,13 @@ "glj" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "glD" = ( /obj/structure/bed{ icon_state = "abed" }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "glG" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, @@ -8176,7 +8316,7 @@ "gmG" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gmN" = ( /obj/structure/closet/secure_closet/engineering_materials, /obj/effect/spawner/random/gun/smg, @@ -8211,10 +8351,13 @@ }, /obj/item/storage/bible/hefa, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "goo" = ( /turf/open/floor/prison/yellow/west, /area/fiorina/lz/near_lzII) +"gos" = ( +/turf/open/floor/prison/yellow/east, +/area/fiorina/station/lowsec/east) "goG" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, @@ -8242,6 +8385,10 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/tumor/servers) +"gqo" = ( +/obj/structure/machinery/power/apc/power/north, +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/showers_laundry) "gqM" = ( /obj/structure/platform_decoration, /turf/open/floor/prison/floor_plate, @@ -8276,7 +8423,7 @@ dir = 6 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gsN" = ( /obj/structure/closet, /obj/effect/spawner/random/gun/shotgun/midchance, @@ -8318,7 +8465,7 @@ "gtr" = ( /obj/structure/bedsheetbin, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "gtH" = ( /obj/structure/safe, /obj/item/storage/beer_pack, @@ -8355,7 +8502,7 @@ "gux" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "guz" = ( /turf/open/floor/prison/greenfull/northwest, /area/fiorina/station/transit_hub) @@ -8380,6 +8527,9 @@ /obj/item/storage/pill_bottle/inaprovaline/skillless, /turf/open/floor/prison/blue_plate/north, /area/fiorina/station/botany) +"gvy" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco/east_disco) "gvz" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -8400,7 +8550,7 @@ dir = 9 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gvZ" = ( /obj/item/stack/sheet/wood{ pixel_x = 1; @@ -8514,12 +8664,12 @@ "gzu" = ( /obj/item/clothing/mask/cigarette/bcigarette, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gzN" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/handcard/aceofspades, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "gAh" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -8543,6 +8693,9 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"gAD" = ( +/turf/open/floor/prison/whitepurple/east, +/area/fiorina/station/research_cells/east) "gAQ" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -8556,7 +8709,7 @@ "gBw" = ( /obj/item/trash/chunk, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gBx" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -8623,7 +8776,7 @@ "gCK" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "gDx" = ( /obj/structure/surface/table/woodentable, /obj/item/newspaper{ @@ -8653,7 +8806,7 @@ }, /obj/structure/platform, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gFg" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, @@ -8664,7 +8817,7 @@ }, /obj/item/fuel_cell, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gFp" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/sterile_white/southwest, @@ -8672,7 +8825,7 @@ "gFN" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "gFW" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/green/southeast, @@ -8688,7 +8841,13 @@ dir = 4 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"gGn" = ( +/turf/closed/wall/r_wall/prison_unmeltable{ + desc = "A huge chunk of metal used to seperate rooms."; + name = "metal wall" + }, +/area/fiorina/station/research_cells/east) "gGx" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, @@ -8699,7 +8858,7 @@ pixel_y = 21 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gHn" = ( /obj/structure/filingcabinet{ pixel_x = 8; @@ -8750,7 +8909,7 @@ pixel_y = 25 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "gIo" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/cups{ @@ -8775,6 +8934,10 @@ /obj/effect/alien/weeds/node, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"gJM" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison/whitepurple/east, +/area/fiorina/station/research_cells/east) "gKg" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/floor_plate, @@ -8802,6 +8965,9 @@ /obj/item/stool, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"gLq" = ( +/turf/closed/wall/prison, +/area/fiorina/station/disco/east_disco) "gLu" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -8880,7 +9046,7 @@ "gOU" = ( /obj/item/bodybag, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gPk" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -8905,7 +9071,7 @@ dir = 8 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gPS" = ( /obj/item/stack/rods, /turf/open/floor/prison/chapel_carpet/doubleside/north, @@ -8919,7 +9085,7 @@ "gQc" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gQz" = ( /obj/structure/bed/chair, /turf/open/floor/prison/whitegreenfull/southwest, @@ -8950,7 +9116,7 @@ /area/fiorina/station/flight_deck) "gRA" = ( /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gRT" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/sign/poster{ @@ -9047,7 +9213,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gVs" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/prison, @@ -9073,7 +9239,7 @@ /obj/structure/powerloader_wreckage, /obj/effect/decal/cleanable/blood/gibs/robot/limb, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "gWq" = ( /obj/item/ammo_casing{ icon_state = "casing_1" @@ -9083,7 +9249,10 @@ }, /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"gWA" = ( +/turf/open/floor/prison/bluecorner/east, +/area/fiorina/station/power_ring/reactor) "gXd" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ density = 0; @@ -9104,11 +9273,11 @@ "gXI" = ( /obj/item/book/manual/atmospipes, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gYD" = ( /obj/item/tool/wrench, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gYH" = ( /obj/structure/closet/secure_closet/security_empty, /obj/structure/window/reinforced{ @@ -9182,7 +9351,7 @@ "haQ" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hbn" = ( /obj/structure/bed/chair{ dir = 8 @@ -9383,6 +9552,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"hhX" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/fiorina/station/lowsec/east) "hil" = ( /obj/structure/surface/rack, /obj/item/tool/plantspray/pests, @@ -9402,6 +9575,9 @@ /obj/item/stack/rods, /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) +"hjg" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/lowsec/showers_laundry) "hjp" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/prison/whitegreenfull/southwest, @@ -9409,7 +9585,7 @@ "hjB" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hjC" = ( /obj/structure/platform{ dir = 8 @@ -9428,6 +9604,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) +"hjI" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/east) "hjM" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -9468,7 +9651,7 @@ "hkH" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "hkM" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, /turf/open/floor/prison/whitegreenfull/southwest, @@ -9485,7 +9668,7 @@ "hlB" = ( /obj/item/tool/kitchen/knife, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hlT" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -9573,7 +9756,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "hpW" = ( /obj/item/stack/cable_coil/orange, /turf/open/floor/plating/prison, @@ -9581,7 +9764,7 @@ "hpX" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hqb" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -9598,7 +9781,7 @@ dir = 4 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hqG" = ( /obj/structure/platform{ dir = 1 @@ -9624,7 +9807,7 @@ pixel_y = 13 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "hre" = ( /obj/structure/platform_decoration{ dir = 4 @@ -9677,7 +9860,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hsc" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -9700,7 +9883,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "hsC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/southleft, @@ -9749,7 +9932,7 @@ "htT" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "htX" = ( /turf/open/floor/prison/green/southwest, /area/fiorina/station/chapel) @@ -9762,7 +9945,7 @@ "hul" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "huB" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger{ @@ -9777,13 +9960,13 @@ "huG" = ( /obj/item/tool/wirecutters, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "huJ" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ name = "computer" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "hva" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -9823,7 +10006,7 @@ "hwN" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hwS" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -9868,7 +10051,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "hyc" = ( /turf/open/floor/prison/darkbrowncorners2, /area/fiorina/maintenance) @@ -9890,6 +10073,12 @@ /obj/structure/grille, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) +"hyM" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring/reactor) "hyT" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -9960,14 +10149,14 @@ pixel_y = 13 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hAX" = ( /turf/open/floor/prison/darkpurple2/northwest, /area/fiorina/tumor/ice_lab) "hBc" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hBf" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/darkbrown2/north, @@ -9978,7 +10167,7 @@ pixel_y = 5 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hCc" = ( /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/plating/plating_catwalk/prison, @@ -10001,11 +10190,20 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) +"hCG" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/research_cells/east) "hCR" = ( /obj/item/stack/sheet/wood, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"hCX" = ( +/obj/structure/machinery/door/airlock/prison/horizontal{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "hDb" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/landmark/objective_landmark/close, @@ -10020,6 +10218,9 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"hDF" = ( +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/lowsec/showers_laundry) "hDS" = ( /obj/structure/platform{ dir = 4 @@ -10049,14 +10250,14 @@ "hEs" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hEv" = ( /obj/structure/stairs/perspective{ dir = 8; icon_state = "p_stair_full" }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "hEZ" = ( /turf/open/floor/prison/platingdmg3, /area/fiorina/station/security) @@ -10075,7 +10276,7 @@ "hFW" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hGg" = ( /obj/structure/sign/poster{ desc = "You are becoming hysterical."; @@ -10150,7 +10351,7 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "hIO" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison/floor_plate, @@ -10166,7 +10367,11 @@ }, /obj/item/reagent_container/food/drinks/flask/barflask, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"hJu" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring/reactor) "hKN" = ( /turf/open/floor/prison/sterile_white, /area/fiorina/station/civres_blue) @@ -10196,7 +10401,7 @@ current_rounds = 0 }, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hMA" = ( /obj/item/tool/crowbar, /turf/open/floor/prison/whitegreen, @@ -10264,7 +10469,7 @@ "hPu" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hPL" = ( /obj/item/tool/wrench, /turf/open/floor/prison/darkpurple2/southeast, @@ -10318,7 +10523,7 @@ dir = 9 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hQM" = ( /obj/structure/bed/chair{ dir = 4 @@ -10341,7 +10546,7 @@ }, /obj/item/stack/barbed_wire, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "hRb" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -10464,7 +10669,7 @@ "hVA" = ( /obj/structure/largecrate/random/case, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hVG" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -10524,18 +10729,25 @@ pixel_y = 8 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hXF" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hXG" = ( /obj/structure/barricade/metal/wired{ dir = 1 }, /turf/open/floor/prison/darkyellow2, /area/fiorina/lz/near_lzI) +"hXJ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "hXN" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, @@ -10571,7 +10783,7 @@ pixel_y = -14 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "hYx" = ( /obj/item/tool/wet_sign, /obj/item/tool/mop{ @@ -10606,6 +10818,12 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) +"hZU" = ( +/obj/structure/machinery/door/airlock/prison/horizontal{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "iaa" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/disco) @@ -10672,7 +10890,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/storage/briefcase/inflatable, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "idP" = ( /obj/structure/platform{ dir = 1 @@ -10878,7 +11096,7 @@ icon_state = "abed" }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ikt" = ( /obj/structure/closet/bodybag, /turf/open/floor/prison/whitegreen/northwest, @@ -10953,6 +11171,14 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"inv" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "inA" = ( /obj/structure/surface/table/reinforced/prison{ flipped = 1 @@ -11012,6 +11238,10 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/botany) +"ipy" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "ipz" = ( /obj/item/device/flashlight, /turf/open/floor/prison, @@ -11066,6 +11296,9 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) +"isw" = ( +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/disco/east_disco) "itd" = ( /obj/item/tool/lighter/random, /turf/open/floor/plating/plating_catwalk/prison, @@ -11091,7 +11324,7 @@ "iuC" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "iuN" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -11169,7 +11402,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "iwZ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -11272,7 +11505,7 @@ }, /obj/structure/platform, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "iAA" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gib5" @@ -11285,6 +11518,9 @@ "iBr" = ( /turf/open/floor/prison, /area/fiorina/station/flight_deck) +"iBI" = ( +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/showers_laundry) "iBM" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/greenblue/northeast, @@ -11299,7 +11535,11 @@ /obj/item/clothing/gloves/boxing/blue, /obj/item/clothing/gloves/boxing/blue, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"iCC" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "iCE" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -11313,11 +11553,11 @@ "iCN" = ( /obj/item/tool/wrench, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "iCU" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "iDg" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -11411,7 +11651,7 @@ pixel_y = 8 }, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "iFC" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, @@ -11422,7 +11662,7 @@ dir = 4 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "iFZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/hugemushroomslice, @@ -11443,6 +11683,9 @@ /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) +"iHi" = ( +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/lowsec/showers_laundry) "iHu" = ( /obj/item/newspaper, /turf/open/floor/prison, @@ -11506,7 +11749,7 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "iIS" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/plating/prison, @@ -11541,7 +11784,7 @@ }, /obj/effect/spawner/random/gun/pistol, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "iKF" = ( /obj/structure/inflatable, /turf/open/floor/prison/floor_plate, @@ -11563,7 +11806,7 @@ pixel_y = 13 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "iLJ" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/prison, @@ -11720,7 +11963,7 @@ /obj/item/storage/pill_bottle/tramadol/skillless, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "iTs" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -11840,10 +12083,16 @@ }, /turf/open/floor/prison/whitegreen/west, /area/fiorina/station/central_ring) +"iWX" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) "iXq" = ( /obj/item/stool, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "iXs" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -11852,6 +12101,13 @@ /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"iXB" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/turf/open/floor/prison/whitepurple/northeast, +/area/fiorina/station/research_cells/east) "iXJ" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -11868,7 +12124,7 @@ "iYe" = ( /obj/item/tool/wirecutters, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "iYw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/central_ring) @@ -11904,11 +12160,11 @@ dir = 1 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "jbm" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jbq" = ( /turf/open/floor/prison/whitegreen/east, /area/fiorina/station/medbay) @@ -11942,7 +12198,7 @@ icon_state = "large" }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jci" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/window/reinforced{ @@ -11996,7 +12252,7 @@ "jfc" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "jfd" = ( /turf/open/gm/river/pool, /area/fiorina/station/park) @@ -12006,7 +12262,7 @@ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "jft" = ( /obj/structure/barricade/sandbags{ icon_state = "sandbag_0"; @@ -12066,6 +12322,9 @@ /obj/item/clothing/suit/armor/bulletproof/badge, /turf/open/floor/prison/yellow/southeast, /area/fiorina/station/lowsec) +"jii" = ( +/turf/open/floor/prison/sterile_white/southwest, +/area/fiorina/station/research_cells/east) "jiq" = ( /obj/structure/lz_sign/prison_sign, /turf/open/floor/prison, @@ -12080,13 +12339,13 @@ dir = 1 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "jiz" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jiA" = ( /obj/item/storage/firstaid/regular, /turf/open/floor/prison/sterile_white/southwest, @@ -12118,13 +12377,16 @@ pixel_y = 4 }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jjs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"jjx" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/disco/east_disco) "jjH" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison, @@ -12220,13 +12482,13 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jmG" = ( /turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jna" = ( /turf/open/floor/prison/whitepurplecorner/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jnd" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -12253,7 +12515,7 @@ "jnX" = ( /obj/item/storage/pill_bottle/spaceacillin/skillless, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jor" = ( /obj/effect/spawner/random/attachment, /obj/structure/disposalpipe/segment{ @@ -12279,7 +12541,7 @@ /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "joU" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison, @@ -12314,7 +12576,7 @@ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jpQ" = ( /obj/structure/bed/chair{ dir = 4 @@ -12403,7 +12665,7 @@ pixel_y = 7 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jsU" = ( /obj/item/stack/tile/plasteel{ pixel_x = 3; @@ -12428,6 +12690,12 @@ /obj/effect/alien/weeds/node, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"juV" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "juX" = ( /obj/structure/machinery/door/poddoor/almayer{ density = 0; @@ -12442,11 +12710,11 @@ }, /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "jvi" = ( /obj/structure/closet/wardrobe/orange, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jvm" = ( /obj/item/storage/surgical_tray, /obj/structure/surface/table/reinforced/prison, @@ -12532,7 +12800,7 @@ "jAW" = ( /obj/structure/largecrate/supply/ammo, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jBn" = ( /obj/structure/closet/secure_closet/medical3, /obj/structure/machinery/light/double/blue{ @@ -12600,7 +12868,7 @@ "jEa" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "jEr" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison, @@ -12618,7 +12886,7 @@ dir = 8 }, /turf/open/floor/wood, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jEQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/shuttle/dropship/flight/lz2, @@ -12629,7 +12897,7 @@ dir = 4 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "jFh" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -12684,7 +12952,7 @@ /obj/effect/spawner/random/tool, /obj/item/clothing/gloves/combat, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jGC" = ( /obj/structure/platform{ dir = 8 @@ -12723,7 +12991,7 @@ /obj/item/paper, /obj/structure/inflatable/door, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jIw" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -12806,7 +13074,7 @@ "jLe" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "jLC" = ( /obj/item/ammo_casing{ dir = 8; @@ -12829,7 +13097,7 @@ pixel_y = 5 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jMh" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/medbay) @@ -12860,7 +13128,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "jNw" = ( /turf/open/floor/prison/blue/northwest, /area/fiorina/tumor/servers) @@ -12907,7 +13175,7 @@ icon_state = "S" }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "jPY" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "Residential Apartment" @@ -12977,7 +13245,7 @@ }, /obj/item/reagent_container/food/drinks/flask/marine, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jSD" = ( /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating/prison, @@ -13011,7 +13279,7 @@ /area/fiorina/station/medbay) "jTJ" = ( /turf/closed/wall/r_wall/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jTN" = ( /obj/structure/filingcabinet{ pixel_x = 8; @@ -13091,7 +13359,7 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "jWE" = ( /obj/item/trash/used_stasis_bag{ desc = "Wow, instant sand. They really have everything in space."; @@ -13101,14 +13369,14 @@ /area/fiorina/station/civres_blue) "jWI" = ( /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jWY" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/storage/fancy/cigar/tarbacks, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "jXj" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -13120,6 +13388,9 @@ "jXz" = ( /turf/closed/wall/prison, /area/fiorina/tumor/servers) +"jXU" = ( +/turf/open/floor/prison/yellowcorner/east, +/area/fiorina/station/lowsec/showers_laundry) "jXV" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/plating/plating_catwalk/prison, @@ -13130,7 +13401,7 @@ "jYm" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "jYn" = ( /obj/structure/platform, /turf/open/floor/prison/floor_plate, @@ -13140,7 +13411,7 @@ dir = 1 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jYt" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -13154,7 +13425,7 @@ "jYM" = ( /obj/item/trash/chips, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jYU" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -13171,7 +13442,7 @@ dir = 4 }, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "jZc" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -13222,7 +13493,7 @@ "kbh" = ( /obj/item/explosive/grenade/incendiary/molotov, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "kbi" = ( /obj/item/ammo_casing{ dir = 6; @@ -13272,6 +13543,13 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzI) +"keb" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/prison/whitepurple/southeast, +/area/fiorina/station/research_cells/east) "kfL" = ( /obj/structure/machinery/photocopier, /turf/open/floor/prison, @@ -13298,7 +13576,7 @@ "kgp" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "kgG" = ( /turf/open/floor/prison/darkyellow2/east, /area/fiorina/station/telecomm/lz1_cargo) @@ -13309,7 +13587,7 @@ "kgQ" = ( /obj/item/stool, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "kgT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper/carbon, @@ -13339,7 +13617,7 @@ "khw" = ( /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/prison/blue/west, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "khY" = ( /obj/structure/closet/secure_closet/medical3, /turf/open/floor/prison/whitegreenfull/southwest, @@ -13369,10 +13647,10 @@ "kiT" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "kjt" = ( /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kjP" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/northleft, @@ -13469,7 +13747,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "kmN" = ( /obj/structure/machinery/computer/cameras{ dir = 1; @@ -13481,7 +13759,7 @@ "knb" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "knh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/plating/prison, @@ -13574,7 +13852,7 @@ /obj/effect/spawner/random/gun/smg, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "kpv" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -13634,7 +13912,7 @@ "ksE" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ksL" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -13773,7 +14051,7 @@ pixel_y = -1 }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kyW" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/plating/prison, @@ -13793,7 +14071,7 @@ dir = 4 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kzs" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/green/east, @@ -13828,7 +14106,7 @@ dir = 4 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kAc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/processor{ @@ -13895,7 +14173,7 @@ "kCT" = ( /obj/effect/spawner/random/gun/smg, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "kCY" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/prison, @@ -13956,11 +14234,11 @@ "kGd" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "kGo" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kGB" = ( /obj/structure/platform, /turf/open/floor/prison/floor_plate, @@ -14010,7 +14288,7 @@ "kHH" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "kHI" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/darkpurplefull2, @@ -14030,7 +14308,7 @@ "kIb" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "kIg" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, @@ -14059,7 +14337,7 @@ "kIO" = ( /obj/structure/machinery/vending/snack/packaged, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kJd" = ( /obj/item/tool/warning_cone, /turf/open/floor/prison/darkbrown2/east, @@ -14123,7 +14401,7 @@ icon_state = "p_stair_ew_full_cap" }, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "kLs" = ( /obj/vehicle/powerloader{ dir = 8 @@ -14296,7 +14574,7 @@ /area/fiorina/station/medbay) "kSe" = ( /turf/open/floor/prison/yellow, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "kSh" = ( /turf/closed/shuttle/elevator{ dir = 9 @@ -14386,7 +14664,7 @@ pixel_y = 4 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kWL" = ( /turf/open/floor/prison/floor_marked/southwest, /area/fiorina/lz/near_lzII) @@ -14396,7 +14674,7 @@ /area/fiorina/tumor/ice_lab) "kXk" = ( /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kXm" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/heavy, @@ -14426,6 +14704,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) +"kXT" = ( +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/lowsec/showers_laundry) "kYd" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -14501,7 +14782,7 @@ "laK" = ( /obj/item/stool, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "laX" = ( /obj/structure/toilet{ dir = 8 @@ -14537,7 +14818,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/trash/cigbutt, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "lbZ" = ( /obj/structure/platform{ dir = 1 @@ -14567,7 +14848,7 @@ "lcE" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lcJ" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/prison/whitegreencorner/east, @@ -14601,7 +14882,7 @@ "ldF" = ( /obj/structure/machinery/fuelcell_recycler/full, /turf/open/floor/prison/blue/southwest, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "ldW" = ( /obj/item/stack/sandbags, /turf/open/floor/prison/kitchen, @@ -14627,7 +14908,7 @@ dir = 8 }, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "leZ" = ( /obj/item/trash/cigbutt, /turf/open/floor/prison/whitegreenfull/southwest, @@ -14636,10 +14917,14 @@ /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"lfx" = ( +/obj/item/stack/sheet/cardboard, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "lfX" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lge" = ( /turf/open/floor/prison/blue/northeast, /area/fiorina/station/civres_blue) @@ -14704,7 +14989,7 @@ "ljc" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ljd" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/prison, @@ -14723,7 +15008,7 @@ /obj/item/tool/kitchen/knife, /obj/structure/bed/roller, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lkr" = ( /turf/open/floor/prison/whitegreen/northwest, /area/fiorina/tumor/ice_lab) @@ -14809,6 +15094,9 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/flight_deck) +"lmC" = ( +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/east) "lnK" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/telecomm/lz1_tram) @@ -14876,7 +15164,7 @@ dir = 4 }, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "lpW" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison/floor_plate/southwest, @@ -14884,11 +15172,11 @@ "lpX" = ( /obj/structure/machinery/door/airlock/prison/horizontal, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lpZ" = ( /obj/item/trash/boonie, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lqa" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -14961,7 +15249,7 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lsZ" = ( /obj/item/tool/soap, /obj/structure/machinery/shower{ @@ -14972,7 +15260,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ltd" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/sterile_white/southwest, @@ -15009,7 +15297,7 @@ "lux" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "luy" = ( /obj/item/trash/candle, /turf/open/floor/prison/chapel_carpet/doubleside/north, @@ -15112,6 +15400,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"lyp" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut/alt, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "lyJ" = ( /obj/item/tool/crowbar, /turf/open/floor/plating/prison, @@ -15131,7 +15426,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced/tinted, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lzn" = ( /obj/structure/machinery/portable_atmospherics/canister/phoron, /turf/open/floor/corsat/squares, @@ -15150,7 +15445,7 @@ }, /obj/item/storage/fancy/crayons, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "lzB" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" @@ -15190,7 +15485,7 @@ pixel_y = 5 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "lAN" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -15285,7 +15580,7 @@ "lEd" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lEg" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/floor_plate, @@ -15346,7 +15641,7 @@ "lFg" = ( /obj/item/paper, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lFm" = ( /obj/structure/bed/roller, /obj/item/trash/used_stasis_bag, @@ -15365,11 +15660,18 @@ /area/fiorina/station/disco) "lFB" = ( /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lFD" = ( /obj/item/tool/crowbar/red, /turf/open/floor/prison/darkbrown2/east, /area/fiorina/tumor/aux_engi) +"lFK" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/disco/east_disco) "lFM" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, @@ -15407,6 +15709,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/security) +"lHH" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "lIj" = ( /obj/structure/prop/ice_colony/surveying_device, /turf/open/floor/prison/blue/east, @@ -15469,7 +15775,7 @@ "lIG" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lIH" = ( /obj/structure/machinery/processor, /turf/open/floor/prison/blue_plate/west, @@ -15477,7 +15783,7 @@ "lIJ" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "lJf" = ( /obj/structure/reagent_dispensers/fueltank/gas/hydrogen{ layer = 2.6 @@ -15538,7 +15844,7 @@ "lMi" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "lMq" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ @@ -15553,7 +15859,7 @@ dir = 1 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "lNc" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/redfull, @@ -15565,11 +15871,14 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lNv" = ( /obj/item/restraint/adjustable/cable/pink, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/fiorina/station/chapel) +"lNC" = ( +/turf/open/floor/prison/yellowcorner, +/area/fiorina/station/lowsec/east) "lNP" = ( /obj/structure/bed/roller, /turf/open/floor/prison, @@ -15662,11 +15971,11 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lSq" = ( /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lSS" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 @@ -15680,6 +15989,10 @@ }, /turf/open/floor/almayer/plate, /area/fiorina/tumor/ship) +"lTs" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison/sterile_white/southwest, +/area/fiorina/station/research_cells/east) "lTW" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_29"; @@ -15703,7 +16016,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "lUu" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -15730,7 +16043,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lVA" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/lz/near_lzII) @@ -15754,7 +16067,7 @@ /obj/item/fuel_cell, /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "lXs" = ( /obj/item/book/manual/marine_law, /obj/item/book/manual/marine_law{ @@ -15806,7 +16119,7 @@ /area/fiorina/tumor/fiberbush) "lZp" = ( /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lZs" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -15827,7 +16140,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "maA" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison/whitegreenfull/southwest, @@ -15942,6 +16255,9 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"meE" = ( +/turf/open/floor/prison/whitepurple/southwest, +/area/fiorina/station/research_cells/east) "mfe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/twohanded/sledgehammer{ @@ -15969,7 +16285,7 @@ /area/fiorina/tumor/ice_lab) "mgz" = ( /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mgE" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 @@ -16049,7 +16365,7 @@ "mlg" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mlu" = ( /obj/structure/prop/invuln/minecart_tracks/bumper{ dir = 1 @@ -16060,6 +16376,9 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/disco) +"mlE" = ( +/turf/open/floor/prison/yellowcorner, +/area/fiorina/station/lowsec/showers_laundry) "mlU" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -16100,7 +16419,7 @@ "mns" = ( /obj/item/stool, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "mny" = ( /turf/closed/wall/prison, /area/fiorina/station/flight_deck) @@ -16125,7 +16444,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/tool/surgery/surgicaldrill, /turf/open/floor/prison/yellowcorner, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "moK" = ( /obj/item/clothing/under/shorts/red, /turf/open/floor/prison/yellowfull, @@ -16137,7 +16456,7 @@ }, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "moW" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/plating/prison, @@ -16181,7 +16500,7 @@ "mpR" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mpY" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -16205,6 +16524,10 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) +"mqL" = ( +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "mqM" = ( /obj/item/stack/sandbags_empty/half, /turf/open/floor/prison/darkyellow2/east, @@ -16220,7 +16543,7 @@ /obj/structure/extinguisher_cabinet, /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "mrI" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med, /turf/closed/wall/prison, @@ -16232,7 +16555,7 @@ "mrW" = ( /obj/item/stack/rods, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "mrX" = ( /obj/structure/bed/chair{ dir = 8 @@ -16302,7 +16625,7 @@ pixel_y = 18 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "muD" = ( /obj/structure/tunnel, /turf/open/organic/grass/astroturf, @@ -16316,7 +16639,7 @@ "mvl" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mvp" = ( /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) @@ -16356,7 +16679,7 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "mwK" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -16377,7 +16700,7 @@ icon_state = "abed" }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "mxc" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison, @@ -16529,7 +16852,7 @@ "mCF" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "mCH" = ( /obj/item/newspaper, /turf/open/floor/prison, @@ -16665,7 +16988,7 @@ }, /obj/item/reagent_container/food/snacks/wrapped/barcardine, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "mIu" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, @@ -16710,10 +17033,14 @@ /obj/item/device/flashlight/flare/on, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"mKa" = ( +/obj/structure/machinery/power/apc/power/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "mKd" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "mKo" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/objective_landmark/close, @@ -16835,7 +17162,7 @@ "mOI" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "mOU" = ( /obj/structure/barricade/handrail/type_b{ dir = 4 @@ -16945,7 +17272,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "mTl" = ( /obj/item/storage/box/gloves, /turf/open/floor/prison/greenfull/northwest, @@ -16966,7 +17293,7 @@ }, /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "mUA" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, @@ -17013,6 +17340,9 @@ /obj/structure/largecrate/random, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/station/telecomm/lz1_tram) +"mVE" = ( +/turf/open/floor/prison/whitepurple/northeast, +/area/fiorina/station/research_cells/east) "mVO" = ( /obj/item/tool/extinguisher, /turf/open/floor/prison, @@ -17091,7 +17421,7 @@ }, /obj/effect/spawner/random/gun/smg/lowchance, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mZH" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -17105,7 +17435,7 @@ "naI" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "naW" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/civres) @@ -17171,7 +17501,7 @@ "ndQ" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ndZ" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -17263,7 +17593,7 @@ "ngg" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "ngn" = ( /obj/structure/machinery/deployable/barrier, /turf/open/floor/prison/redfull, @@ -17272,7 +17602,7 @@ /obj/item/device/flashlight/lamp/tripod, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nho" = ( /obj/structure/platform{ dir = 1 @@ -17325,7 +17655,7 @@ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "njg" = ( /obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/floor/prison/darkyellow2/west, @@ -17379,7 +17709,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "nkF" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/park) @@ -17414,10 +17744,10 @@ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nmm" = ( /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "nmy" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison/sterile_white/southwest, @@ -17447,7 +17777,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nny" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/cigbutt/bcigbutt, @@ -17549,7 +17879,7 @@ icon_state = "p_stair_sn_full_cap" }, /turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nsD" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -17574,13 +17904,13 @@ "ntv" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "ntw" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/lz/near_lzI) "ntx" = ( /turf/open/floor/prison/yellow/north, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "ntE" = ( /obj/structure/barricade/handrail/type_b, /turf/open/floor/prison/floor_plate, @@ -17661,6 +17991,13 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"nvx" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "nvD" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/botany) @@ -17707,6 +18044,9 @@ }, /turf/open/floor/prison, /area/fiorina/station/chapel) +"nxC" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/power_ring/reactor) "nxW" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 @@ -17739,7 +18079,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nyO" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -17805,14 +18145,14 @@ "nAs" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "nAK" = ( /turf/open/floor/prison/yellowcorner/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "nAV" = ( /obj/structure/machinery/fuelcell_recycler/full, /turf/open/floor/prison/bluecorner/west, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "nBb" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -17874,6 +18214,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"nDu" = ( +/obj/structure/toilet{ + dir = 4; + pixel_y = 8 + }, +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/lowsec/east) "nDI" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison/floor_plate, @@ -17894,13 +18241,13 @@ /obj/item/clothing/glasses/material, /obj/structure/barricade/handrail, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "nEP" = ( /obj/structure/closet, /obj/item/reagent_container/spray/cleaner, /obj/item/stack/sheet/plasteel/small_stack, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "nEW" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ @@ -17938,7 +18285,7 @@ dir = 1 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nGy" = ( /obj/item/newspaper, /turf/open/floor/wood, @@ -17946,21 +18293,21 @@ "nGB" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nGO" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nGV" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nGZ" = ( /turf/open/floor/prison, /area/fiorina/lz/near_lzI) @@ -18006,6 +18353,10 @@ }, /turf/open/floor/prison/darkredfull2, /area/fiorina/station/security) +"nIU" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "nJq" = ( /obj/structure/platform{ dir = 1 @@ -18025,7 +18376,7 @@ dir = 1 }, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "nKl" = ( /obj/structure/platform{ dir = 1 @@ -18062,6 +18413,10 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"nLO" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "nLS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/condiment/saltshaker{ @@ -18267,7 +18622,7 @@ /area/fiorina/station/transit_hub) "nSx" = ( /turf/closed/wall/r_wall/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nSS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/dropper, @@ -18301,6 +18656,9 @@ }, /turf/open/floor/prison, /area/fiorina/station/park) +"nUh" = ( +/turf/open/floor/prison/yellow/west, +/area/fiorina/station/lowsec/east) "nUm" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/floor_plate, @@ -18345,11 +18703,14 @@ }, /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nVE" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"nVK" = ( +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) "nVN" = ( /obj/item/trash/cigbutt, /turf/open/floor/prison/floor_plate, @@ -18544,7 +18905,14 @@ "odQ" = ( /obj/structure/largecrate/supply, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) +"oeh" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/east) "oer" = ( /turf/open/floor/prison/darkbrown2, /area/fiorina/station/park) @@ -18612,6 +18980,10 @@ }, /turf/open/floor/prison/whitegreen/northeast, /area/fiorina/station/medbay) +"ogc" = ( +/obj/item/reagent_container/food/drinks/cans/aspen, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "ogf" = ( /obj/structure/monorail{ name = "launch track" @@ -18771,13 +19143,13 @@ pixel_y = -10 }, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "okG" = ( /obj/structure/barricade/deployable{ dir = 4 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "okJ" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -18786,7 +19158,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "okT" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, @@ -18903,13 +19275,13 @@ pixel_y = 13 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ooq" = ( /obj/structure/platform_decoration{ dir = 8 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oou" = ( /obj/structure/closet/emcloset, /obj/item/clothing/head/cmcap{ @@ -18924,7 +19296,7 @@ "oox" = ( /obj/structure/bed/chair, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "ooF" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/floor/wood, @@ -18932,7 +19304,7 @@ "ooO" = ( /obj/item/storage/briefcase/inflatable, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oph" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/reagent_container/food/drinks/bottle/holywater, @@ -18942,7 +19314,7 @@ "opj" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "opM" = ( /obj/structure/bed/chair, /turf/open/floor/prison/bluefull, @@ -19006,7 +19378,7 @@ /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "osQ" = ( /obj/structure/bed{ icon_state = "abed" @@ -19079,6 +19451,10 @@ }, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/fiorina/station/chapel) +"owc" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "owd" = ( /obj/item/storage/backpack/souto, /turf/open/floor/prison, @@ -19094,7 +19470,7 @@ pixel_y = 13 }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oxp" = ( /obj/structure/platform{ dir = 4; @@ -19150,7 +19526,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oyC" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/wood, @@ -19212,7 +19588,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "oCe" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/park) @@ -19257,7 +19633,7 @@ pixel_y = 21 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "oDV" = ( /obj/item/stack/rods, /turf/open/floor/prison/whitegreen/west, @@ -19394,7 +19770,7 @@ "oHi" = ( /obj/item/stool, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oHm" = ( /turf/open/floor/prison/darkbrown2/northeast, /area/fiorina/tumor/aux_engi) @@ -19491,7 +19867,7 @@ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "oKq" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, @@ -19500,6 +19876,9 @@ /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat/plate, /area/fiorina/station/civres_blue) +"oLE" = ( +/turf/open/floor/prison, +/area/fiorina/station/lowsec/showers_laundry) "oLF" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/darkbrown2, @@ -19517,7 +19896,7 @@ /obj/structure/surface/rack, /obj/item/tank/emergency_oxygen/engi, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "oMf" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison/floor_plate, @@ -19538,7 +19917,10 @@ pixel_y = -1 }, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"oMW" = ( +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/showers_laundry) "oNu" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.4 @@ -19550,11 +19932,11 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "oNC" = ( /obj/structure/inflatable, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oOg" = ( /obj/structure/barricade/handrail/type_b{ dir = 4; @@ -19606,7 +19988,7 @@ pixel_y = 16 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oOV" = ( /obj/structure/machinery/filtration/console{ pixel_y = 22 @@ -19620,7 +20002,7 @@ "oPN" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "oPR" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) @@ -19650,7 +20032,7 @@ pixel_y = 21 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oRg" = ( /turf/open/floor/prison/darkyellow2/north, /area/fiorina/station/telecomm/lz1_cargo) @@ -19661,7 +20043,7 @@ "oSn" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "oSz" = ( /obj/item/shard{ icon_state = "medium" @@ -19700,6 +20082,13 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/civres_blue) +"oTL" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/showers_laundry) "oTP" = ( /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/telecomm/lz1_tram) @@ -19739,7 +20128,7 @@ "oWC" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -19837,7 +20226,7 @@ "oZj" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oZk" = ( /turf/open/floor/prison/darkpurple2/southwest, /area/fiorina/tumor/ice_lab) @@ -19872,7 +20261,7 @@ "oZU" = ( /obj/structure/largecrate/random/case, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "pab" = ( /obj/item/tool/weldpack{ pixel_x = 6 @@ -19894,14 +20283,14 @@ dir = 1 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pai" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society."; name = "\improper Fiorina Green Block Canteen Vendor" }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "paF" = ( /obj/item/tool/shovel/etool, /turf/open/floor/prison/floor_plate, @@ -19971,7 +20360,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "pdB" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -20035,7 +20424,7 @@ "pho" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "phz" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) @@ -20052,7 +20441,7 @@ "pim" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison/redfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "piw" = ( /obj/structure/platform{ dir = 1 @@ -20163,7 +20552,7 @@ "pnP" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pnS" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/plating_catwalk/prison, @@ -20171,7 +20560,7 @@ "poC" = ( /obj/structure/machinery/photocopier, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ppq" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/flora/pottedplant{ @@ -20212,7 +20601,7 @@ "pqz" = ( /obj/item/clothing/suit/storage/labcoat, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "pqC" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -20222,6 +20611,14 @@ icon_state = "stan20" }, /area/fiorina/tumor/ship) +"pqQ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "pqY" = ( /obj/structure/monorail{ dir = 9; @@ -20276,6 +20673,12 @@ /obj/structure/platform, /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/botany) +"psG" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/east) "psL" = ( /obj/structure/machinery/optable{ desc = "This maybe could be used for advanced medical procedures."; @@ -20346,7 +20749,7 @@ "pvE" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pvF" = ( /turf/open/floor/prison/whitegreencorner, /area/fiorina/tumor/ice_lab) @@ -20398,7 +20801,7 @@ "pxX" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "pyK" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat/plate, @@ -20436,6 +20839,14 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) +"pBD" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "pBT" = ( /obj/structure/barricade/metal{ health = 250; @@ -20487,7 +20898,7 @@ pixel_y = 6 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pCX" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, @@ -20497,7 +20908,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "pDQ" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison/redfull, @@ -20563,7 +20974,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pHh" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -20589,7 +21000,7 @@ }, /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pIs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 @@ -20685,7 +21096,7 @@ pixel_y = 15 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pLM" = ( /obj/item/trash/cigbutt, /turf/open/floor/prison/blue/west, @@ -20698,6 +21109,11 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/greencorner/west, /area/fiorina/tumor/aux_engi) +"pMr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cups, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "pNj" = ( /obj/structure/bookcase, /turf/open/floor/carpet, @@ -20751,7 +21167,7 @@ /obj/structure/closet/basketball, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "pQs" = ( /turf/open/floor/prison, /area/fiorina/station/civres_blue) @@ -20763,7 +21179,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "pRp" = ( /obj/structure/platform, /obj/structure/machinery/light/double/blue, @@ -20836,7 +21252,7 @@ "pUG" = ( /obj/item/stack/rods, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "pUO" = ( /obj/item/trash/boonie, /turf/open/floor/prison/whitegreenfull/southwest, @@ -20869,7 +21285,7 @@ "pVY" = ( /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pWc" = ( /obj/item/tool/crowbar/red, /turf/open/floor/prison/floor_plate, @@ -20959,14 +21375,14 @@ /area/fiorina/oob) "pZn" = ( /turf/open/floor/prison/yellowcorner/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pZp" = ( /obj/item/tool/soap, /obj/structure/machinery/shower{ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qaA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, @@ -21139,11 +21555,15 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison, /area/fiorina/station/civres_blue) +"qfh" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "qfi" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/research_cells/east) "qgd" = ( /obj/item/explosive/grenade/incendiary/molotov{ pixel_x = 8; @@ -21402,7 +21822,7 @@ pixel_y = -1 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qqQ" = ( /turf/open/floor/prison/green/northeast, /area/fiorina/station/transit_hub) @@ -21436,7 +21856,7 @@ "qrU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qsc" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, @@ -21466,6 +21886,10 @@ "qsF" = ( /turf/open/floor/prison/darkbrown2/north, /area/fiorina/maintenance) +"qtp" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) "qtP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/prop/helmetgarb/raincover, @@ -21498,7 +21922,7 @@ dir = 2 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qvN" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" @@ -21517,14 +21941,14 @@ /area/fiorina/maintenance) "qwH" = ( /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qwK" = ( /turf/open/floor/prison/floorscorched2, /area/fiorina/station/civres_blue) "qxx" = ( /obj/item/ammo_magazine/smg/mp5, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qxy" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/greenfull/northwest, @@ -21547,7 +21971,7 @@ pixel_y = -3 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qya" = ( /obj/structure/closet{ density = 0; @@ -21556,7 +21980,7 @@ /obj/item/clothing/gloves/combat, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qyq" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/structure/machinery/light/double/blue{ @@ -21565,10 +21989,10 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "qyM" = ( /turf/open/floor/prison/darkyellowfull2/east, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qzb" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -21594,7 +22018,7 @@ pixel_y = 2 }, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qAe" = ( /obj/item/trash/eat, /turf/open/floor/prison/floor_plate, @@ -21625,6 +22049,9 @@ /obj/item/storage/briefcase, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security/wardens) +"qBw" = ( +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/east) "qBB" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "A ticket to Souto Man's raffle!"; @@ -21645,7 +22072,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qBT" = ( /obj/structure/sink{ dir = 4; @@ -21653,7 +22080,7 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qCa" = ( /obj/structure/prop/resin_prop{ dir = 1; @@ -21677,7 +22104,7 @@ "qCx" = ( /obj/item/reagent_container/food/drinks/sillycup, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "qCE" = ( /obj/structure/machinery/computer/emails{ dir = 1; @@ -21688,7 +22115,7 @@ /area/fiorina/station/medbay) "qCK" = ( /turf/open/floor/prison/damaged1/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qCW" = ( /turf/closed/shuttle/elevator{ dir = 6 @@ -21732,7 +22159,7 @@ "qEC" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qFf" = ( /obj/item/tool/kitchen/rollingpin, /turf/open/floor/prison/kitchen, @@ -21771,6 +22198,12 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"qFW" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/east) "qGe" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -21795,7 +22228,7 @@ "qGB" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qGO" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light/double/blue, @@ -21867,7 +22300,7 @@ icon_state = "linenbin-empty" }, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qJr" = ( /turf/open/floor/prison, /area/fiorina/tumor/fiberbush) @@ -21912,6 +22345,9 @@ /obj/item/disk/data, /turf/open/floor/prison/darkpurplefull2, /area/fiorina/tumor/servers) +"qJY" = ( +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/east) "qKq" = ( /obj/structure/machinery/computer/arcade, /obj/item/toy/syndicateballoon{ @@ -22027,7 +22463,7 @@ "qOq" = ( /obj/structure/grille, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qOu" = ( /turf/open/floor/prison/damaged3, /area/fiorina/station/disco) @@ -22066,7 +22502,7 @@ pixel_y = 8 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "qQa" = ( /turf/open/floor/prison/darkpurple2/north, /area/fiorina/station/central_ring) @@ -22107,7 +22543,7 @@ dir = 1 }, /turf/open/floor/prison/blue/northwest, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "qQA" = ( /obj/item/reagent_container/food/drinks/bottle/holywater{ desc = "A flask of the holy HEFA grenade oil."; @@ -22128,14 +22564,14 @@ "qRa" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qRf" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/toy/beach_ball/holoball, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "qRg" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -22153,7 +22589,7 @@ dir = 4 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qRK" = ( /turf/open/floor/prison/darkpurple2/southeast, /area/fiorina/station/central_ring) @@ -22182,7 +22618,7 @@ /obj/structure/closet/wardrobe/orange, /obj/item/clothing/gloves/boxing/yellow, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qSA" = ( /obj/item/trash/candy, /turf/open/floor/prison/whitegreen/east, @@ -22194,7 +22630,7 @@ "qTt" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qTx" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -22230,7 +22666,7 @@ "qUw" = ( /obj/item/device/multitool, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qUC" = ( /obj/item/ammo_casing{ dir = 2; @@ -22249,7 +22685,7 @@ }, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qXM" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating/prison, @@ -22329,7 +22765,7 @@ pixel_y = 11 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rcg" = ( /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) @@ -22378,7 +22814,7 @@ dir = 4 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "reZ" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -22413,7 +22849,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rgg" = ( /obj/item/tool/candle{ pixel_x = -2 @@ -22422,7 +22858,7 @@ /area/fiorina/station/chapel) "rhf" = ( /turf/open/floor/prison/cell_stripe, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rhh" = ( /obj/structure/monorail{ dir = 4; @@ -22435,7 +22871,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rie" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/whitegreen/west, @@ -22447,10 +22883,19 @@ "rja" = ( /turf/closed/wall/prison, /area/fiorina/station/civres_blue) +"rjw" = ( +/turf/closed/wall/prison, +/area/fiorina/station/lowsec/showers_laundry) "rjy" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/tumor/civres) +"rjD" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ + icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/west) "rjP" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -22472,14 +22917,14 @@ }, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rkv" = ( /turf/open/floor/prison/greencorner/west, /area/fiorina/station/chapel) "rkF" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/research_cells/east) "rkH" = ( /obj/structure/grille, /obj/structure/lattice, @@ -22489,6 +22934,10 @@ /obj/item/clothing/glasses/science, /turf/open/space, /area/fiorina/oob) +"rkX" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "rle" = ( /obj/item/stack/cable_coil/green, /turf/open/floor/wood, @@ -22515,7 +22964,7 @@ pixel_y = 13 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rmX" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -22524,7 +22973,7 @@ dir = 8 }, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "rmZ" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -22555,7 +23004,7 @@ "rnE" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rnM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/fancy/crayons, @@ -22605,7 +23054,7 @@ "rpf" = ( /obj/structure/grille, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "rpt" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/floor_plate, @@ -22627,7 +23076,7 @@ }, /obj/structure/platform/stair_cut, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "rqq" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -22660,7 +23109,7 @@ "rru" = ( /obj/effect/spawner/random/goggles/midchance, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "rrD" = ( /obj/structure/machinery/landinglight/ds1{ dir = 1 @@ -22752,7 +23201,7 @@ pixel_x = -12 }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rwu" = ( /obj/structure/bed/chair{ dir = 1 @@ -22771,7 +23220,7 @@ /obj/item/clothing/under/color/orange, /obj/structure/surface/rack, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rwQ" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/greenblue/west, @@ -22824,7 +23273,7 @@ pixel_y = 25 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rAm" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, @@ -22833,7 +23282,7 @@ "rAw" = ( /obj/structure/bed/chair, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "rAK" = ( /obj/structure/barricade/metal{ dir = 4; @@ -22886,17 +23335,17 @@ dir = 4 }, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "rCq" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rCt" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/wood, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rDu" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -22908,6 +23357,9 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"rEx" = ( +/turf/open/floor/prison/whitepurplecorner/east, +/area/fiorina/station/research_cells/east) "rFu" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/chapel_carpet/doubleside, @@ -22931,7 +23383,7 @@ /area/fiorina/station/medbay) "rGf" = ( /turf/open/auto_turf/sand/layer1, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "rGq" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) @@ -22986,7 +23438,7 @@ pixel_y = -3 }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rIy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone{ @@ -23053,7 +23505,7 @@ pixel_y = 32 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rKm" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/redfull, @@ -23080,11 +23532,11 @@ /area/fiorina/station/botany) "rLG" = ( /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rLJ" = ( /obj/item/clothing/gloves/boxing, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rMo" = ( /obj/effect/landmark/objective_landmark/far, /obj/structure/closet/secure_closet/engineering_personal, @@ -23098,7 +23550,7 @@ "rMw" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "rMT" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ density = 0; @@ -23200,7 +23652,7 @@ "rPS" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "rPW" = ( /obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/floor/prison/floor_plate, @@ -23224,7 +23676,7 @@ /area/fiorina/maintenance) "rQB" = ( /turf/open/floor/prison/sterile_white/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rQK" = ( /obj/item/bananapeel{ name = "tactical banana peel" @@ -23254,7 +23706,7 @@ req_one_access = null }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rSN" = ( /obj/structure/platform{ dir = 8 @@ -23301,9 +23753,12 @@ }, /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) +"rTY" = ( +/turf/open/floor/prison/bluecorner, +/area/fiorina/station/power_ring/reactor) "rTZ" = ( /turf/open/floor/prison/whitepurplecorner/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rUf" = ( /turf/open/floor/prison/darkyellow2/northwest, /area/fiorina/tumor/servers) @@ -23393,13 +23848,13 @@ pixel_y = 32 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rYK" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rYY" = ( /obj/structure/bed/roller, /obj/structure/machinery/filtration/console{ @@ -23418,6 +23873,11 @@ icon_state = "stan_rightengine" }, /area/fiorina/station/power_ring) +"rZF" = ( +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/spawner/random/gun/rifle, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "rZI" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, @@ -23457,7 +23917,7 @@ pixel_y = 8 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "sbf" = ( /obj/effect/landmark/corpsespawner/prisoner, /turf/open/gm/river/darkred_pool, @@ -23628,7 +24088,7 @@ pixel_y = 12 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sga" = ( /obj/effect/decal{ icon = 'icons/obj/items/policetape.dmi'; @@ -23642,11 +24102,14 @@ "sgt" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sgw" = ( /obj/structure/window_frame/prison, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"sgI" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "sgJ" = ( /obj/structure/surface/rack, /obj/item/storage/belt/gun/flaregun/full, @@ -23668,7 +24131,7 @@ pixel_y = -1 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "shH" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, @@ -23684,11 +24147,11 @@ "siy" = ( /obj/item/stack/cable_coil, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "siB" = ( /obj/item/poster, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "siE" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison/darkbrownfull2, @@ -23705,7 +24168,7 @@ /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "sjd" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -23766,14 +24229,14 @@ pixel_y = -3 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "skj" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "skG" = ( /turf/open/floor/prison/blue/southwest, /area/fiorina/tumor/servers) @@ -23870,7 +24333,7 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "spm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/flora/pottedplant{ @@ -23908,7 +24371,7 @@ "spR" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sqx" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; @@ -23919,7 +24382,7 @@ "sqC" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sqR" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/supply_kit, @@ -23945,7 +24408,7 @@ "srQ" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ssb" = ( /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) @@ -23988,7 +24451,7 @@ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "stf" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison, @@ -24025,7 +24488,7 @@ "suq" = ( /obj/item/stool, /turf/open/floor/prison/damaged2/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "suX" = ( /turf/open/floor/prison, /area/fiorina/station/central_ring) @@ -24058,10 +24521,13 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "svP" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"svS" = ( +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/disco/east_disco) "svW" = ( /obj/structure/surface/rack, /obj/item/clothing/gloves/latex, @@ -24161,7 +24627,7 @@ "sAF" = ( /obj/item/inflatable, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "sBf" = ( /obj/structure/platform{ dir = 1 @@ -24223,6 +24689,9 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitegreen, /area/fiorina/station/medbay) +"sDw" = ( +/turf/open/floor/prison, +/area/fiorina/station/lowsec/east) "sDL" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -24236,12 +24705,18 @@ icon_state = "human2" }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sDS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/prison/darkyellow2, /area/fiorina/lz/near_lzI) +"sEK" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison/whitepurple/southeast, +/area/fiorina/station/research_cells/east) "sEO" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/lz/near_lzII) @@ -24271,7 +24746,7 @@ }, /obj/item/tool/stamp, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sFY" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -24321,7 +24796,7 @@ pixel_y = 9 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sHe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stock_parts/subspace/amplifier{ @@ -24333,7 +24808,7 @@ pixel_y = 8 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "sHj" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -24341,7 +24816,7 @@ pixel_y = -3 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sHL" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/greenfull/east, @@ -24379,7 +24854,7 @@ pixel_y = 13 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "sIs" = ( /obj/item/weapon/gun/smg/nailgun, /obj/structure/surface/rack, @@ -24422,6 +24897,9 @@ /obj/item/stack/folding_barricade, /turf/open/floor/prison, /area/fiorina/station/security) +"sJH" = ( +/turf/open/floor/prison/whitepurple/southeast, +/area/fiorina/station/research_cells/east) "sJN" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -24438,14 +24916,14 @@ pixel_y = 18 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sKt" = ( /obj/structure/bed/chair{ dir = 1; layer = 2.7 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sKu" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -24505,7 +24983,7 @@ "sNi" = ( /obj/item/device/flashlight, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sNj" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -24518,7 +24996,7 @@ "sNN" = ( /obj/structure/platform, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "sNQ" = ( /obj/structure/monorail{ name = "launch track" @@ -24619,7 +25097,7 @@ "sRv" = ( /obj/item/clothing/shoes/marine/upp/knife, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "sRE" = ( /obj/structure/platform, /obj/structure/machinery/light/double/blue, @@ -24632,7 +25110,7 @@ pixel_y = 21 }, /turf/open/floor/prison/damaged2/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sSM" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -24737,7 +25215,7 @@ "sUX" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "sUY" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/corsat/squares, @@ -24818,14 +25296,14 @@ icon_state = "p_stair_full" }, /turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sXa" = ( /obj/structure/machinery/filtration/console, /turf/open/floor/prison, /area/fiorina/station/power_ring) "sXe" = ( /turf/open/floor/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "sXi" = ( /turf/open/floor/corsat/plate, /area/fiorina/tumor/aux_engi) @@ -24872,7 +25350,7 @@ "tad" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "tai" = ( /obj/structure/bed/chair, /obj/structure/prop/souto_land/pole, @@ -24897,7 +25375,7 @@ "taI" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "taL" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/floor_plate, @@ -24905,7 +25383,7 @@ "taS" = ( /obj/item/stack/cable_coil, /turf/open/floor/prison/blue/northeast, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "taY" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/space/basic, @@ -25066,7 +25544,7 @@ pixel_y = 4 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "thI" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -25115,10 +25593,14 @@ }, /turf/open/floor/prison/whitegreen/west, /area/fiorina/tumor/ice_lab) +"tiP" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison/whitepurple/west, +/area/fiorina/station/research_cells/west) "tiX" = ( /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tiY" = ( /turf/open/floor/prison/floorscorched2, /area/fiorina/tumor/civres) @@ -25128,6 +25610,13 @@ "tja" = ( /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"tjh" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/lowsec/east) "tji" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -25158,7 +25647,7 @@ pixel_y = -1 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tkd" = ( /obj/structure/filingcabinet, /obj/structure/filingcabinet{ @@ -25170,6 +25659,9 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) +"tkh" = ( +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/disco/east_disco) "tkj" = ( /turf/open/floor/prison/darkbrown2/north, /area/fiorina/station/park) @@ -25187,7 +25679,7 @@ pixel_y = -3 }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tle" = ( /obj/structure/filingcabinet{ pixel_x = 8; @@ -25205,7 +25697,7 @@ dir = 4 }, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "tlq" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp{ @@ -25425,7 +25917,7 @@ }, /obj/item/storage/fancy/cigarettes/blackpack, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "trS" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -25543,7 +26035,7 @@ pixel_y = 21 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "txh" = ( /obj/structure/bed/sofa/vert/grey, /turf/open/floor/prison, @@ -25585,13 +26077,13 @@ pixel_y = 29 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tzM" = ( /obj/structure/platform_decoration{ dir = 8 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "tzN" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4 @@ -25626,7 +26118,7 @@ "tAE" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "tAR" = ( /obj/structure/surface/rack, /obj/item/tool/extinguisher, @@ -25642,7 +26134,7 @@ dir = 1 }, /turf/open/floor/interior/plastic, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "tCv" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison/greenfull/east, @@ -25706,6 +26198,9 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"tEU" = ( +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring/reactor) "tEX" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/floor_plate, @@ -25758,7 +26253,7 @@ "tHl" = ( /obj/structure/inflatable, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tHw" = ( /obj/item/stack/rods, /turf/open/floor/prison/darkbrown2/east, @@ -25909,6 +26404,12 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) +"tMW" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison/blue/southeast, +/area/fiorina/station/power_ring/reactor) "tNf" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -25933,11 +26434,11 @@ /area/fiorina/station/park) "tOc" = ( /turf/open/floor/wood, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "tOp" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tOG" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/pill_bottle/kelotane/skillless, @@ -25974,7 +26475,7 @@ /area/fiorina/station/telecomm/lz1_cargo) "tPB" = ( /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tPC" = ( /turf/open/floor/prison/darkyellowcorners2, /area/fiorina/station/flight_deck) @@ -26003,7 +26504,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tSm" = ( /turf/open/floor/prison/greenblue/west, /area/fiorina/station/botany) @@ -26030,7 +26531,7 @@ pixel_y = 12 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tTv" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/darkyellow2/west, @@ -26079,15 +26580,15 @@ "tVI" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tVV" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tVY" = ( /obj/structure/machinery/power/smes/buildable, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "tWf" = ( /obj/structure/inflatable/popped, /turf/open/floor/plating/plating_catwalk/prison, @@ -26099,12 +26600,12 @@ "tWs" = ( /obj/item/toy/deck, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tWz" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "tWI" = ( /obj/structure/platform/kutjevo/smooth, /obj/structure/platform/kutjevo/smooth{ @@ -26170,7 +26671,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tZk" = ( /turf/open/floor/prison/greenfull/northwest, /area/fiorina/tumor/aux_engi) @@ -26212,12 +26713,15 @@ pixel_y = 21 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ubo" = ( /obj/item/stack/sheet/metal/medium_stack, /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) +"ubx" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "ubA" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/emails{ @@ -26241,7 +26745,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "ubX" = ( /turf/open/floor/prison/whitegreen/northeast, /area/fiorina/tumor/ice_lab) @@ -26329,7 +26833,7 @@ "ufE" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ufL" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -26346,14 +26850,14 @@ /area/fiorina/tumor/aux_engi) "ufR" = ( /turf/open/floor/prison/whitepurplecorner/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ugg" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ugk" = ( /turf/open/floor/prison/darkbrowncorners2, /area/fiorina/tumor/aux_engi) @@ -26405,11 +26909,11 @@ "uhm" = ( /obj/structure/window_frame/prison/reinforced, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "uhA" = ( /obj/structure/closet/bodybag, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "uhX" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitegreen/northeast, @@ -26452,7 +26956,7 @@ name = "ice shard" }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "ujz" = ( /obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison/floor_plate/southwest, @@ -26480,7 +26984,11 @@ "ulc" = ( /obj/item/paper, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"ulN" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "ume" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee{ @@ -26500,6 +27008,12 @@ "umm" = ( /turf/open/floor/prison/yellow/north, /area/fiorina/station/central_ring) +"umu" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "umy" = ( /obj/structure/prop/resin_prop{ dir = 4; @@ -26516,6 +27030,9 @@ /obj/item/clothing/gloves/boxing/blue, /turf/open/floor/prison/yellow/northwest, /area/fiorina/station/central_ring) +"umN" = ( +/turf/closed/wall/prison, +/area/fiorina/station/lowsec/east) "umW" = ( /obj/structure/bed/sofa/pews, /turf/open/floor/wood, @@ -26568,7 +27085,15 @@ }, /obj/item/storage/toolbox/syndicate, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"uow" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "uoH" = ( /obj/structure/barricade/sandbags{ dir = 4; @@ -26577,7 +27102,7 @@ }, /obj/item/storage/pouch/tools/full, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "upf" = ( /obj/structure/closet/toolcloset, /turf/open/floor/prison/darkbrown2/west, @@ -26602,7 +27127,7 @@ "upM" = ( /obj/structure/disposalpipe/broken, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "upX" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/prison, @@ -26627,11 +27152,15 @@ "uqV" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "urv" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, /area/fiorina/station/flight_deck) +"urw" = ( +/obj/structure/machinery/power/apc/power/north, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) "urJ" = ( /obj/structure/platform/kutjevo/smooth, /turf/open/floor/almayer_hull, @@ -26651,7 +27180,7 @@ dir = 4 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "utL" = ( /obj/structure/bed/chair, /turf/open/floor/prison/darkbrown2/north, @@ -26663,7 +27192,7 @@ "uud" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "uuk" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison/floor_plate, @@ -26675,7 +27204,7 @@ }, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "uuJ" = ( /obj/structure/holohoop{ dir = 8; @@ -26686,7 +27215,7 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "uuL" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; @@ -26742,7 +27271,7 @@ "uwk" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "uws" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -26791,7 +27320,7 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "uyM" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, @@ -26854,6 +27383,13 @@ }, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) +"uBX" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/west) "uCO" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -26868,6 +27404,10 @@ /obj/structure/platform, /turf/open/floor/plating/prison, /area/fiorina/station/park) +"uDF" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "uDX" = ( /obj/structure/prop/structure_lattice{ health = 300 @@ -26953,7 +27493,7 @@ name = "Insta-Sand! bag" }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "uGT" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -27009,7 +27549,7 @@ "uJp" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "uJG" = ( /obj/item/ammo_casing{ icon_state = "casing_10_1" @@ -27041,7 +27581,7 @@ /obj/structure/bed/roller, /obj/item/bedsheet/green, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "uKX" = ( /turf/open/floor/prison/redfull, /area/fiorina/station/security/wardens) @@ -27052,7 +27592,7 @@ "uLj" = ( /obj/effect/decal/cleanable/blood/gibs/robot/limb, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "uLq" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/cell_stripe/east, @@ -27080,7 +27620,7 @@ "uLV" = ( /obj/item/bedsheet, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "uMc" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, @@ -27271,6 +27811,13 @@ }, /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"uTq" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/open/floor/prison/whitepurple/southwest, +/area/fiorina/station/research_cells/east) "uTr" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison/whitegreen/west, @@ -27283,10 +27830,14 @@ /obj/item/device/flashlight/flare, /turf/open/floor/prison/darkyellowcorners2/north, /area/fiorina/station/telecomm/lz1_cargo) +"uTv" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "uTw" = ( /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "uTA" = ( /obj/structure/bed/chair{ dir = 8 @@ -27485,7 +28036,7 @@ "vao" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "vaC" = ( /obj/structure/closet/bombcloset, /obj/item/clothing/suit/armor/bulletproof, @@ -27507,6 +28058,14 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) +"vcn" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "vcq" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/prison/blue_plate/west, @@ -27520,7 +28079,7 @@ "vcv" = ( /obj/item/tool/screwdriver, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vcC" = ( /obj/item/stack/rods, /turf/open/space, @@ -27619,7 +28178,7 @@ /area/fiorina/station/power_ring) "vfO" = ( /turf/open/floor/prison/floor_marked/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vgi" = ( /obj/item/stack/rods, /turf/open/floor/prison/floor_plate, @@ -27635,6 +28194,10 @@ }, /turf/open/floor/prison/darkyellow2/northwest, /area/fiorina/lz/near_lzI) +"vgG" = ( +/obj/structure/machinery/power/apc/power/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) "vgL" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -27660,7 +28223,7 @@ }, /obj/structure/platform, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vhy" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison/floor_plate/southwest, @@ -27713,7 +28276,7 @@ "vjR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vjT" = ( /obj/effect/alien/weeds/node, /turf/open/floor/plating/prison, @@ -27840,7 +28403,7 @@ "voh" = ( /obj/item/tool/warning_cone, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "voi" = ( /turf/open/floor/prison/darkbrownfull2, /area/fiorina/station/park) @@ -27860,7 +28423,7 @@ "voI" = ( /obj/item/tool/wrench, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "voK" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -27904,18 +28467,18 @@ "vqs" = ( /obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vqW" = ( /obj/item/stack/sheet/cardboard, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vrp" = ( /obj/structure/ice/thin/indestructible{ icon_state = "Corner" }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "vrA" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 @@ -27930,7 +28493,7 @@ /obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "vrO" = ( /obj/structure/closet/secure_closet/engineering_materials, /turf/open/floor/prison/darkbrownfull2, @@ -27956,7 +28519,7 @@ "vsr" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "vsL" = ( /obj/structure/prop/dam/crane, /turf/open/floor/prison/floor_marked/west, @@ -27967,7 +28530,7 @@ }, /obj/item/ammo_magazine/smg/mp5, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vsT" = ( /obj/structure/cable/heavyduty{ icon_state = "1-8" @@ -28034,7 +28597,7 @@ dir = 8 }, /turf/open/floor/prison/bright_clean2/southwest, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vuV" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -28105,7 +28668,7 @@ dir = 8 }, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "vxm" = ( /obj/structure/platform{ dir = 4 @@ -28153,6 +28716,9 @@ }, /turf/open/floor/prison/darkyellow2/east, /area/fiorina/station/telecomm/lz1_cargo) +"vza" = ( +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/showers_laundry) "vzh" = ( /obj/structure/foamed_metal, /turf/open/floor/plating/prison, @@ -28200,7 +28766,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vAX" = ( /turf/open/floor/prison/blue_plate/west, /area/fiorina/station/botany) @@ -28209,7 +28775,7 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vBF" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -28351,11 +28917,15 @@ "vFV" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vFY" = ( /obj/item/reagent_container/glass/bucket, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) +"vGf" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/prison, +/area/fiorina/station/power_ring/reactor) "vGM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -28401,7 +28971,7 @@ "vJh" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "vJn" = ( /obj/structure/platform{ dir = 4 @@ -28499,7 +29069,7 @@ pixel_y = 13 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vOm" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/botany) @@ -28568,7 +29138,7 @@ "vRk" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/prison/blue/northwest, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vRu" = ( /obj/structure/sink{ dir = 4; @@ -28579,7 +29149,7 @@ /area/fiorina/oob) "vRA" = ( /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vRF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/pamphlet/skill/powerloader, @@ -28654,7 +29224,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vUv" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced, @@ -28667,7 +29237,7 @@ /area/fiorina/tumor/civres) "vUP" = ( /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vUZ" = ( /obj/structure/platform{ dir = 1 @@ -28725,6 +29295,16 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) +"vYp" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) "vYw" = ( /obj/structure/girder/reinforced, /turf/open/floor/almayer/plate, @@ -28732,7 +29312,7 @@ "vYX" = ( /obj/item/roller, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vYY" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_29"; @@ -28744,7 +29324,7 @@ "vZe" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vZs" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, @@ -28756,7 +29336,7 @@ "vZL" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vZV" = ( /turf/closed/wall/strata_ice/jungle{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -28769,7 +29349,10 @@ "wam" = ( /obj/item/stack/medical/bruise_pack, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"wat" = ( +/turf/open/floor/prison/yellow/west, +/area/fiorina/station/lowsec/showers_laundry) "waN" = ( /obj/structure/platform{ dir = 1 @@ -28833,7 +29416,7 @@ "wbW" = ( /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "wcB" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/gun/pistol/midchance, @@ -28844,7 +29427,7 @@ /obj/item/storage/pill_bottle/bicaridine/skillless, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wcP" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, @@ -28862,20 +29445,20 @@ "wdo" = ( /obj/structure/closet, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "wdL" = ( /obj/structure/barricade/wooden{ dir = 8 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wdU" = ( /obj/structure/foamed_metal, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) "wef" = ( /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wet" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/darkyellow2/north, @@ -29017,7 +29600,7 @@ "wjH" = ( /obj/item/stack/barbed_wire, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wjO" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/blood, @@ -29056,7 +29639,7 @@ "wlv" = ( /obj/item/trash/barcardine, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wly" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/lz/near_lzII) @@ -29164,7 +29747,7 @@ dir = 1 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wpW" = ( /obj/structure/sign/kiddieplaque{ desc = "It is a warning sign that describes the process by which fiberbush expands in humid environments, behaving similar to kudzu vines."; @@ -29177,7 +29760,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/poster, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wqz" = ( /obj/structure/closet{ density = 0; @@ -29185,14 +29768,14 @@ }, /obj/item/clothing/gloves/combat, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wqY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "wrR" = ( /turf/closed/wall/prison, /area/fiorina/station/botany) @@ -29205,7 +29788,7 @@ "wsw" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "wsz" = ( /turf/open/floor/prison/darkbrown2/west, /area/fiorina/tumor/aux_engi) @@ -29319,7 +29902,7 @@ "wxW" = ( /obj/structure/prop/almayer/computers/mapping_computer, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wxX" = ( /obj/structure/machinery/computer/cameras{ dir = 8; @@ -29374,7 +29957,7 @@ "wyQ" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wyT" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -29382,7 +29965,7 @@ "wyU" = ( /obj/effect/decal/cleanable/blood/gibs/robot/up, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "wzd" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -29539,7 +30122,7 @@ pixel_y = 13 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wFM" = ( /obj/structure/machinery/power/apc/power/west, /turf/open/floor/prison/floor_plate/southwest, @@ -29602,6 +30185,12 @@ }, /turf/open/floor/prison/red/west, /area/fiorina/station/security) +"wHu" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "wHw" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -29613,6 +30202,9 @@ /obj/item/clothing/gloves/botanic_leather, /turf/open/floor/prison/floor_plate, /area/fiorina/station/botany) +"wHV" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "wId" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/prison, @@ -29668,7 +30260,7 @@ "wJd" = ( /obj/structure/barricade/handrail, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "wJw" = ( /obj/structure/closet/crate/trashcart, /obj/item/weapon/gun/rifle/m16, @@ -29682,6 +30274,9 @@ /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, /area/fiorina/station/park) +"wKi" = ( +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/east) "wKl" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison/floor_plate, @@ -29803,7 +30398,7 @@ "wOG" = ( /obj/structure/largecrate/random, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "wPz" = ( /turf/closed/shuttle/elevator, /area/fiorina/station/telecomm/lz1_cargo) @@ -29915,7 +30510,7 @@ }, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wSD" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison, @@ -29924,7 +30519,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wSU" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/transit_hub) @@ -29945,7 +30540,7 @@ "wUz" = ( /obj/item/frame/toolbox_tiles, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wVc" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee{ @@ -29954,6 +30549,9 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/fiberbush) +"wWm" = ( +/turf/open/floor/prison/yellowcorner/north, +/area/fiorina/station/lowsec/east) "wWs" = ( /turf/open/floor/greengrid, /area/fiorina/station/security) @@ -29994,7 +30592,7 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wYq" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/chem_dispenser/soda, @@ -30009,10 +30607,10 @@ /obj/structure/surface/rack, /obj/item/tank/emergency_oxygen/engi, /turf/open/floor/prison/blue/southeast, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "wZt" = ( /turf/open/floor/prison/floor_marked/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wZv" = ( /obj/item/stack/sheet/metal, /turf/open/floor/wood, @@ -30060,7 +30658,7 @@ pixel_y = 2 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xbp" = ( /obj/item/card/id/silver/clearance_badge/cl{ desc = "Wow sorry, didn't mean to drop that in front of you, it's real, btw."; @@ -30085,6 +30683,9 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) +"xct" = ( +/turf/open/floor/prison/blue/north, +/area/fiorina/station/power_ring/reactor) "xcz" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/structure/machinery/light/double/blue{ @@ -30093,7 +30694,7 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "xcS" = ( /obj/structure/platform{ dir = 8 @@ -30109,7 +30710,7 @@ /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "xdt" = ( /obj/structure/platform/kutjevo/smooth{ dir = 4 @@ -30138,7 +30739,7 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xei" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/organic/grass/astroturf, @@ -30146,7 +30747,7 @@ "xel" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xew" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -30193,7 +30794,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xgF" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, @@ -30201,7 +30802,7 @@ "xgH" = ( /obj/item/toy/handcard/uno_reverse_blue, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xgU" = ( /obj/item/circuitboard/machine/rdserver, /turf/open/floor/prison/floorscorched1, @@ -30235,6 +30836,9 @@ /obj/structure/machinery/vending/cigarette/free, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) +"xiZ" = ( +/turf/open/floor/prison/yellowcorner/west, +/area/fiorina/station/lowsec/east) "xja" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null @@ -30282,12 +30886,16 @@ dir = 8 }, /turf/open/floor/wood, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xlx" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/tomatosoup, /turf/open/floor/prison/blue, /area/fiorina/station/power_ring) +"xlC" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "xlZ" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/box/pillbottles, @@ -30326,7 +30934,7 @@ }, /obj/item/clothing/gloves/combat, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xnU" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating/prison, @@ -30364,6 +30972,13 @@ /obj/item/storage/belt/marine, /turf/open/floor/prison, /area/fiorina/station/security) +"xpy" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/lowsec/east) "xpM" = ( /obj/structure/platform, /turf/open/floor/prison/floor_plate, @@ -30374,6 +30989,10 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) +"xqi" = ( +/obj/item/tool/wrench, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "xqP" = ( /obj/structure/surface/rack, /obj/item/tool/plantspray/weeds, @@ -30495,6 +31114,9 @@ /obj/item/trash/eat, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"xwm" = ( +/turf/open/floor/prison, +/area/fiorina/station/power_ring/reactor) "xwo" = ( /obj/structure/surface/rack, /obj/item/storage/box/sprays, @@ -30507,6 +31129,9 @@ "xwC" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/fiberbush) +"xxg" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/lowsec/east) "xxD" = ( /turf/open/floor/wood, /area/fiorina/station/civres_blue) @@ -30554,6 +31179,9 @@ }, /turf/open/space, /area/fiorina/oob) +"xAn" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/showers_laundry) "xAo" = ( /obj/item/trash/cigbutt/bcigbutt, /obj/item/device/flashlight/lamp/tripod, @@ -30562,7 +31190,7 @@ "xAq" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xAs" = ( /obj/item/device/reagent_scanner, /turf/open/organic/grass/astroturf, @@ -30578,7 +31206,7 @@ "xBc" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xBl" = ( /obj/structure/surface/table/woodentable, /obj/item/circuitboard/apc, @@ -30600,6 +31228,9 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"xBF" = ( +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/lowsec/east) "xBN" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; @@ -30608,7 +31239,7 @@ pixel_y = -1 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xCa" = ( /obj/item/toy/crayon/rainbow, /turf/open/floor/plating/prison, @@ -30616,13 +31247,13 @@ "xCg" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "xCh" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "xCp" = ( /obj/structure/inflatable/popped, /turf/open/floor/prison/whitegreen, @@ -30637,6 +31268,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/medbay) +"xCR" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/whitepurple, +/area/fiorina/station/research_cells/east) "xCV" = ( /obj/item/reagent_container/food/drinks/bottle/orangejuice, /turf/open/floor/prison, @@ -30689,7 +31324,7 @@ "xFJ" = ( /obj/item/tool/soap, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "xFL" = ( /obj/effect/decal{ icon = 'icons/obj/items/policetape.dmi'; @@ -30714,7 +31349,7 @@ icon_state = "ucigoff" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xGi" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -30768,7 +31403,7 @@ "xJn" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xJw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/civres_blue) @@ -30805,11 +31440,11 @@ pixel_y = 8 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xKP" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "xKX" = ( /turf/open/floor/plating/prison, /area/fiorina/station/disco) @@ -30841,7 +31476,7 @@ "xLx" = ( /obj/item/bedsheet, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "xLD" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -30914,7 +31549,7 @@ }, /obj/item/frame/rack, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xNU" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -30988,7 +31623,10 @@ }, /obj/item/card/id/visa, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"xSw" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "xSz" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -31043,7 +31681,7 @@ pixel_y = 21 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xVJ" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green, @@ -31075,7 +31713,7 @@ "xWG" = ( /obj/item/weapon/twohanded/spear, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xWV" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -31137,7 +31775,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xYN" = ( /obj/item/device/t_scanner, /turf/open/floor/prison/floor_plate, @@ -31221,6 +31859,13 @@ /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"yaS" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "yaY" = ( /obj/item/stack/sheet/metal, /turf/open/space, @@ -31326,7 +31971,7 @@ pixel_y = 21 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "yfA" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -31359,7 +32004,7 @@ current_rounds = 0 }, /turf/open/floor/prison/yellowcorner, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ygr" = ( /obj/structure/platform, /turf/open/floor/prison/cell_stripe/west, @@ -31388,6 +32033,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) +"ygL" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) +"ygS" = ( +/turf/open/floor/prison/yellow/east, +/area/fiorina/station/disco/east_disco) "yhs" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -31410,7 +32062,7 @@ pixel_y = -1 }, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "yhR" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -31478,7 +32130,7 @@ pixel_y = 13 }, /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ylu" = ( /obj/item/tool/wrench, /turf/open/floor/plating/prison, @@ -59183,14 +59835,14 @@ mCp rHu rJu uzw -kqC -rzp -vds -vds -elO +rjw +kXT +wat +wat +iHi abJ -ioc -ioc +iBI +iBI abJ ubP ubP @@ -59395,14 +60047,14 @@ eLu eLu kfW cME -kqC -dHD +rjw +btJ lkb -upY -fHo +oLE +oMW vRA -ioc -ioc +iBI +iBI vRA ubP nXX @@ -59607,15 +60259,15 @@ eLu cME cME cME -oFI -dHD +wHu +btJ qRa -upY -voO -kqC +oLE +blt +rjw pGS -kgN -kqC +cas +rjw sOj uye ubP @@ -59819,14 +60471,14 @@ uvF cME ljd cME -oFI -dHD -upY -upY +wHu +btJ +oLE +oLE ger abJ -ioc -ioc +iBI +iBI abJ aUg ubP @@ -60031,14 +60683,14 @@ cME cME cME eLu -kqC -dHD -upY -eNa -efW +rjw +btJ +oLE +mlE +vza vRA -ioc -ioc +iBI +iBI vRA ubP ubP @@ -60243,11 +60895,11 @@ cME cME cME eLu -kqC -dHD -upY +rjw +btJ +oLE skj -uGY +rjw ceC xGt xGt @@ -60455,11 +61107,11 @@ uvF cME cME cME -kqC -dHD -upY -fHo -uGY +rjw +btJ +oLE +oMW +rjw jIw cRl sQC @@ -60667,11 +61319,11 @@ eLu cYP qso gsN -kqC -dHD -upY -fHo -hVG +rjw +btJ +oLE +oMW +yaS yiL cZV wNG @@ -60879,11 +61531,11 @@ kqC kqC kqC kqC -kqC +rjw oSn hwN eJy -uGY +rjw lEF tsN tsN @@ -61091,11 +61743,11 @@ bjt kqC sfu jyF -kqC -ioc -ioc -ioc -uGY +rjw +iBI +iBI +iBI +rjw xGt xGt xGt @@ -61303,11 +61955,11 @@ bjt kqC qNF ctW -kqC -rzp -vds -vds -vds +rjw +kXT +wat +wat +wat car gOU gOU @@ -61515,14 +62167,14 @@ kgN kqC ryJ end -kqC -dHD +rjw +btJ wbW -upY +oLE ufE ugg -upY -upY +oLE +oLE gmG ksE xGt @@ -61728,13 +62380,13 @@ vds vds elO nAs -dHD -upY -upY +btJ +oLE +oLE hMj -upY +oLE dQe -upY +oLE ygk rnE xGt @@ -61941,14 +62593,14 @@ xRI efW nAs fcB -upY +oLE hlB -upY -upY +oLE +oLE vYX ugg ksE -ceC +jTJ ceC sIh ihB @@ -62151,13 +62803,13 @@ end kqC ryJ end -kqC +rjw lNf -upY -upY +oLE +oLE elc -upY -upY +oLE +oLE eNr ksE xGt @@ -62363,11 +63015,11 @@ tKk kqC rzp osQ -kqC -dHD -upY -upY -upY +rjw +btJ +oLE +oLE +oLE ufE wbW fxS @@ -62575,13 +63227,13 @@ dpe kqC qLi dpe -kqC -dHD -upY +rjw +btJ +oLE sRv -upY +oLE wam -upY +oLE mom rnE xGt @@ -62789,11 +63441,11 @@ kqC kqC mCF sAF -upY -upY +oLE +oLE vRA -upY -upY +oLE +oLE ksE ceC ceC @@ -62999,10 +63651,10 @@ ioc kqC sfu iEG -kqC -dHD -upY -upY +rjw +btJ +oLE +oLE vRA cKH joJ @@ -63211,13 +63863,13 @@ ioc kqC qNF mDO -kqC -dHD -upY +rjw +btJ +oLE vRA vZL -upY -upY +oLE +oLE ksE xGt mEJ @@ -63423,12 +64075,12 @@ kgN kqC ryJ end -kqC -nBb -upY +rjw +oTL +oLE vRA -upY -upY +oLE +oLE ejf ksE xGt @@ -63638,10 +64290,10 @@ elO nAs fcB gQc -upY -upY -upY -upY +oLE +oLE +oLE +oLE ksE ceC ceC @@ -63849,15 +64501,15 @@ xRI efW nAs fcB -upY -upY +oLE +oLE vRA osN xdb pZn kIb vFV -hZR +ipy kPz kPz kPz @@ -64059,17 +64711,17 @@ kgN kqC ryJ end -kqC -nBb -upY -upY -upY -upY +rjw +oTL +oLE +oLE +oLE +oLE siW bEm -upY +oLE ksE -hZR +ipy kPz bQM kPz @@ -64271,17 +64923,17 @@ ioc kqC rzp ldz -kqC -qNF -xRI -xRI -xRI -xRI -xRI -xRI -xRI +rjw +hDF +fBA +fBA +fBA +fBA +fBA +fBA +fBA rnE -hZR +ipy kPz kPz kPz @@ -64483,20 +65135,20 @@ ioc kqC qLi dpe -kqC +rjw okG -ioc +iBI okG -kqC -kqC +rjw +rjw dbI dbI dbI -kqC -wzE -hZR -hZR -hZR +rjw +hjg +ipy +ipy +ipy nqN xGt xGt @@ -64699,19 +65351,19 @@ mCF uJp kIb vFV -kqC +rjw lsR lZp lZp lZp svN -kqC -rzp -vds -elO +rjw +kXT +wat +iHi abJ -ioc -ioc +iBI +iBI abJ goo goo @@ -64907,23 +65559,23 @@ ioc kqC sfu jyF -kqC -dHD +rjw +btJ xLx -voO -kqC +blt +rjw ubh xFJ eao lZp qXj -kqC -nBb -xbM -fHo +rjw +oTL +xAn +oMW vRA -ioc -ioc +iBI +iBI vRA fAf fAf @@ -65119,24 +65771,24 @@ ioc kqC qNF eub -kqC -dHD -xbM -fHo -kqC +rjw +btJ +xAn +oMW +rjw sIk dzE -kqC +rjw sIk dzE -kqC -dHD -xbM -fHo -kqC -ioc -ioc -kqC +rjw +btJ +xAn +oMW +rjw +iBI +iBI +rjw nAm nAm fAf @@ -65253,17 +65905,17 @@ loE eIx mvp mvp -lZA +rjD vUP vUP vUP -lZA +rjD byY byY byY byY byY -lZA +rjD kjt kjt rLG @@ -65331,10 +65983,10 @@ kgN kqC ryJ end -kqC +rjw rgc -xbM -fHo +xAn +oMW vfO lZp lZp @@ -65342,12 +65994,12 @@ jmv uLV lZp vfO -dHD -xbM -fHo +btJ +xAn +oMW abJ -ioc -ioc +iBI +iBI abJ fAf fAf @@ -65543,10 +66195,10 @@ lvV vds vds elO -ioc -dHD -xbM -fHo +iBI +btJ +xAn +oMW vfO lZp lZp @@ -65554,12 +66206,12 @@ eao lZp lZp vfO -dHD -xbM -fHo +btJ +xAn +oMW vRA -ioc -ioc +iBI +iBI vRA fAf fAf @@ -65755,24 +66407,24 @@ eNa xRI xRI efW -ioc -dHD -xbM -fHo -kqC +iBI +btJ +xAn +oMW +rjw hAP dzE -kqC +rjw sIk dzE -kqC -dHD -xbM -fHo -kqC -ioc -ioc -kqC +rjw +btJ +xAn +oMW +rjw +iBI +iBI +rjw goo goo fAf @@ -65889,11 +66541,11 @@ gDI agh mvp mvp -lZA +rjD vUP vUP vUP -lZA +rjD jWI eow eow @@ -65967,23 +66619,23 @@ jlq kqC ryJ end -kqC -nBb -xbM -voO -kqC +rjw +oTL +xAn +blt +rjw ubh lZp jmv lZp qXj -kqC -nBb -xbM -fHo +rjw +oTL +xAn +oMW abJ -ioc -ioc +iBI +iBI abJ fAf fAf @@ -66179,23 +66831,23 @@ rzp kqC rzp jln -kqC +rjw eQb -xbM +xAn kgp -kqC +rjw erU lZp lZp xFJ hrL -kqC -dHD -xbM -fHo +rjw +btJ +xAn +oMW vRA -ioc -ioc +iBI +iBI vRA nAm nAm @@ -66391,20 +67043,20 @@ dHD kqC qLi jhN -kqC +rjw rYy -xbM -fHo -kqC -kqC +xAn +oMW +rjw +rjw vfO vfO vfO -kqC -kqC -dHD -xbM -fHo +rjw +rjw +btJ +xAn +oMW vMK goG goG @@ -66530,7 +67182,7 @@ wSN kzR wSC mvl -knb +eSI vUP vUP kjt @@ -66578,7 +67230,7 @@ oEH oEH vkt bLJ -xKX +vgG iaa iaa tZO @@ -66586,37 +67238,37 @@ iaa iaa ecM mlC -wzE -wzE -wzE -wzE +xxg +xxg +xxg +xxg rzF -fHo -xbM -xbM +qJY +fBK +fBK xel -xbM -xbM -xbM -dHD +fBK +fBK +fBK +wKi jbg -kqC -kqC -kqC -kqC +umN +umN +umN +umN rKd -xbM +xAn pZn atY atY -vds -vds -vds +wat +wat +wat qJl atY -qEs -xbM -fHo +jXU +xAn +oMW goG dYq chg @@ -66798,37 +67450,37 @@ oPR oPR jnQ oPR -kqC -ioc -ioc -ioc -ioc -ioc -xbM -xbM -xbM -xbM +umN +lmC +lmC +lmC +lmC +lmC +fBK +fBK +fBK +fBK bkQ -xbM -qNF -dHD -kqC +fBK +eVD +wKi +umN rkp iKy -kqC -dHD -xbM +umN +gqo +xAn jbm -xbM +xAn xLx -xbM +xAn jbm -xbM -xbM -xbM -xbM -xbM -fHo +xAn +xAn +xAn +xAn +xAn +oMW goG xoR ioW @@ -66966,7 +67618,7 @@ uwk uwk uwk aSz -cIt +uBX vUP vUP cKa @@ -67011,36 +67663,36 @@ qBe qBe eFQ wpO -ioc -ioc -ioc -efW -xbM -cxA -cZh -xbM -oFf -voV -xbM -xbM -qNF -kqC -qNF -efW -kqC -qNF -xRI +lmC +lmC +lmC +duL +fBK +ygL +rZF +fBK +ogc +eja +fBK +fBK +eVD +umN +eVD +duL +umN +hDF +fBA iXq -xRI -xRI -xRI -xRI -xRI +fBA +fBA +fBA +fBA +fBA mKd -xRI -xRI -xRI -efW +fBA +fBA +fBA +vza goG egd pYB @@ -67223,32 +67875,32 @@ qBe lFv eFQ wpO -ioc -ioc -ioc -dHD +lmC +lmC +lmC +wKi kbh -xbM -xbM -cxA +fBK +fBK +ygL jET -xbM -cZh +fBK +rZF fYY -voO -kqC +ffx +umN qRi -end -wzE -wzE -wzE -kqC -ioc -ioc -ioc -ioc +elm +xxg +hjg +hjg +rjw +iBI +iBI +iBI +iBI pvE -kqC +rjw jTJ goG goG @@ -67435,30 +68087,30 @@ qBe qBe oPR wpO -ioc -ioc -ioc -qNF -nAK -xbM -xbM -xbM -xbM +lmC +lmC +lmC +eVD +wWm +fBK +fBK +fBK +fBK jET -xbM -xbM -pZn -vds -vds -elO -hZR -bQM -hZR +fBK +fBK +xiZ +nUh +nUh +bhC +uTv +bQM +ipy iCf -rzp -vds -vds -vds +kXT +wat +wat +wat rLJ jvi duF @@ -67575,7 +68227,7 @@ lAh bQM bQM bQM -jmG +lAh cAW cAW jmG @@ -67646,32 +68298,32 @@ hxj wis sGa gNU -kqC -kqC -ecd -kqC -kqC -dHD -xbM -xbM +umN +umN +nIU +umN +umN +wKi +fBK +fBK pHx -xbM -eNa -xRI -xRI -xRI -xRI -xRI -efW -hZR +fBK +lNC +gos +gos +gos +gos +gos +duL +uTv kPz -hZR +ipy auS -dHD +btJ jbm -xbM -xbM -fHo +xAn +xAn +oMW jvi duF fEH @@ -67785,7 +68437,7 @@ bQM bQM lAh lAh -jmG +lAh cAW cAW cAW @@ -67853,37 +68505,37 @@ qBe eXz qBe oPR -kqC -kqC +umN +umN dAd hbp -kqC -kqC +umN +umN rCq -vRA -vRA -kqC +xSw +xSw +umN fLb ayW -xbM -xbM -xbM +fBK +fBK +fBK rYK -kqC +umN cRB -end -kqC +elm +umN cRB -end -wzE +elm +xxg bQM -hZR +ipy qSz -dHD -eNa +btJ +mlE rwK nAK -fHo +oMW kpu duF fAU @@ -68065,37 +68717,37 @@ qBe qBe qBe sGa -kqC -kqC -vRA +umN +umN +xSw blG -kqC -kqC -kqC +umN +umN +umN tVV arl -oFI +eQs kCT opj -xRI -nAK -xbM -fHo -kqC -rzp +gos +wWm +fBK +qJY +umN +xBF bIP -kqC -rzp +umN +xBF mwP -wzE +xxg kPz jTJ vUl -dHD -fHo +btJ +oMW pLE -dHD -fHo +btJ +oMW uuG jTJ gHn @@ -68278,36 +68930,36 @@ qBe qBe vcu qQM -abJ -rzp -vds -elO +umu +xBF +nUh +bhC sKt -kqC -vRA +umN +xSw tiX -kqC -kqC -kqC -kqC -dHD -xbM -fHo -kqC -qLi -dpe -kqC -qLi -dpe -wzE -bQM -hZR +umN +umN +umN +umN +wKi +fBK +qJY +umN +xpy +oeh +umN +xpy +oeh +xxg +bQM +ipy pLE -dHD -fHo +btJ +oMW pLE -dHD -fHo +btJ +oMW pLE duF mWR @@ -68490,35 +69142,35 @@ bno bno vrR jOb -vRA -dHD +xSw +wKi bAM -fHo +qJY sKt -oFI -vRA +eQs +xSw glD -kqC +umN pVY mwP -kqC -dHD -xbM +umN +wKi +fBK rYK -mCF -kqC -kqC -kqC -kqC -kqC -wzE +hhX +umN +umN +umN +umN +umN +xxg kPz -hZR +ipy pLE -dHD -fHo +btJ +oMW pLE -dHD +btJ naI pLE duF @@ -68701,37 +69353,37 @@ eac dPe mcJ uIL -kqC -kqC -nBb -xbM -fHo +umN +umN +hjI +fBK +qJY sKt -kqC -kqC -kqC -kqC -ryJ -end -kqC -nBb -xbM -fHo -kqC -sfu -jyF -kqC +umN +umN +umN +umN +hCX +elm +umN +hjI +fBK +qJY +umN +nDu +tjh +umN hHX -jyF -wzE +tjh +xxg bQM -hZR +ipy pLE -qNF -efW +hDF +vza pLE -qNF -efW +hDF +vza pLE duF chg @@ -68913,38 +69565,38 @@ fWH fWH fWH fWH -kqC +umN mue bbI -xbM +fBK rYK -kqC -kqC +umN +umN wyQ eTa -vds -vds -vds -elO -dHD -xbM -fHo -kqC -qNF -mDO -kqC -qNF -mDO -wzE -wzE -wzE -kqC +nUh +nUh +nUh +bhC +wKi +fBK +qJY +umN +eVD +qFW +umN +eVD +qFW +xxg +hjg +hjg +rjw ecd ecd -kqC +rjw ecd ecd -kqC +rjw jTJ vMK mGZ @@ -69073,7 +69725,7 @@ vUP pDo jWI bXz -kGd +tiP ufR sNi jna @@ -69082,7 +69734,7 @@ eow lFB vUP pRa -kGd +tiP eow eow lFB @@ -69125,37 +69777,37 @@ izZ oPR oPR oPR -kqC +umN pCQ -dHD -xbM -fHo -abJ -ioc -rzp -vds -vds -vds -elO -efW -dHD -xbM +wKi +fBK +qJY +umu +lmC +xBF +nUh +nUh +nUh +bhC +duL +wKi +fBK rYK -kqC -ryJ -end -kqC -ryJ -end -kqC -wzE +umN +hCX +elm +umN +hCX +elm +umN +hjg pah vNQ -xbM +xAn iCN qOq -xbM -xbM +xAn +xAn pah bhu goG @@ -69337,37 +69989,37 @@ wKm qBe qBe oPR -kqC +umN cRI -dHD -xbM -fHo -vRA -ioc -qNF -xRI -xRI -xRI -efW -elO +wKi +fBK +qJY +xSw +lmC +eVD +gos +gos +gos +duL +bhC cHC -xbM -fHo -ioc -rzp -vds -vds -vds -elO -ioc +fBK +qJY +lmC +xBF +nUh +nUh +nUh +bhC +lmC duF hQv gsL mOI -xbM +xAn qOq -xbM -xbM +xAn +xAn gFj sNN goG @@ -69503,7 +70155,7 @@ wef wef xgH vUP -knb +eSI wef wef tOp @@ -69549,37 +70201,37 @@ qBe qBe qBe oPR -kqC +umN mue gIa -xbM +fBK rYK -kqC -kqC -ioc -qNF -xRI -xRI -xRI -efW -dHD -xbM -fHo -ioc -qNF -xRI -xRI -xRI -efW +umN +umN +lmC +eVD +gos +gos +gos +duL +wKi +fBK +qJY +lmC +eVD +gos +gos +gos +duL sDR hBF vcv iLl -xbM -xbM +xAn +xAn qOq huG -xbM +xAn pah rmJ goG @@ -69725,11 +70377,11 @@ oyy cKa kjt mgz -rLG -vUP -cKa +apg +qBw +cIa sXe -wef +wHV sXe aSz jmG @@ -69761,38 +70413,38 @@ qBe qBe qBe pUf -kqC -kqC -nBb -xbM -fHo +umN +umN +hjI +fBK +qJY sKt -kqC -ryJ -end -kqC -ryJ -end -kqC -dHD -xbM +umN +hCX +elm +umN +hCX +elm +umN +wKi +fBK rYK -kqC -ryJ -end -kqC -ryJ -end -kqC -wzE -kqC -kqC +umN +hCX +elm +umN +hCX +elm +umN +hjg +rjw +rjw ecd ecd -kqC +rjw ecd ecd -kqC +rjw jTJ vMK pFW @@ -69936,15 +70588,15 @@ iFB qBT cKa kjt -mgz -rLG -vUP +jii +apg +qBw glj sXe -wef +wHV sXe odQ -uwk +nLO bQM bQM bQM @@ -69974,28 +70626,28 @@ okE qBe vcu qQM -abJ -dHD -xbM -fHo +umu +wKi +fBK +qJY sKt -kqC -qNF -mDO -kqC -qNF -mDO -kqC -nBb -xbM -fHo -kqC -rzp +umN +eVD +qFW +umN +eVD +qFW +umN +hjI +fBK +qJY +umN +xBF mwP -kqC -rzp +umN +xBF mwP -kqC +umN rKs tOM wGA @@ -70147,16 +70799,16 @@ cKa cKa cKa cKa -xVw -mgz -rLG -vUP +apm +jii +apg +qBw glj sXe -wef +wHV sXe vJh -uwk +nLO kPz kPz kPz @@ -70186,28 +70838,28 @@ qBe eUP sGa jOb -vRA -qNF +xSw +eVD eux -efW -ioc -kqC -kqC -kqC -mCF -kqC -kqC -kqC -dHD -xbM -fHo -kqC -qLi -dpe -kqC -qLi -dpe -kqC +duL +lmC +umN +umN +umN +hhX +umN +umN +umN +wKi +fBK +qJY +umN +xpy +oeh +umN +xpy +oeh +umN lbz gLk gbf @@ -70345,30 +70997,30 @@ dbh eov doe cAW -eov -bqu -rwm -cKa +gGn +fna +uTq +cIa gzN -vUP -vUP -cKa -bqu -rwm -cKa -bqu -rwm -cKa -kjt -xAq -rLG -vUP -cKa +qBw +qBw +cIa +fna +uTq +cIa +fna +uTq +cIa +nVK +lTs +apg +qBw +cIa dcv -wef +wHV sXe lMi -uwk +nLO bQM bQM bQM @@ -70397,29 +71049,29 @@ mlC eUP qBe xIq -kqC -kqC -vRA +umN +umN +xSw blG -kqC -kqC -kqC -xbM -xbM -xbM +umN +umN +umN +mKa +fBK +fBK kgQ -xbM -xbM -dHD -xbM +fBK +fBK +wKi +fBK rYK -kqC -kqC -kqC -kqC -kqC -kqC -kqC +umN +umN +umN +umN +umN +umN +umN mxQ tOM gbf @@ -70557,30 +71209,30 @@ taI eov ivb cAW -eov -kXk -tPB -cKa +gGn +mVE +sJH +cIa fLH gCK -vUP -cKa -kXk -rhH -cKa -kXk -rhH -cKa -kjt -mgz -rLG -cKa -cKa -cKa -hul -cKa -cKa -jmG +qBw +cIa +mVE +sEK +cIa +mVE +sEK +cIa +nVK +jii +apg +cIa +cIa +cIa +aNY +cIa +cIa +hCG vnr hxq hxq @@ -70601,37 +71253,37 @@ oPR qBe vtX dYo -mlC +uDF kPz kPz kPz -mlC -qBe -qBe -qBe -kqC -kqC +uDF +aCw +aCw +aCw +umN +umN jva gEX -wzE -kqC +xxg +umN pai kgQ tSl diJ ddt -ioc +lmC kgQ diF -xbM -fHo -kqC -sfu -jyF -kqC -sfu -jyF -kqC +fBK +qJY +umN +nDu +tjh +umN +nDu +tjh +umN hNj ijd gbf @@ -70769,28 +71421,28 @@ mpR eov hxJ qgd -eov -kzh -tOp -cKa +gGn +hZU +dZM +cIa oDH -vUP -dFI -cKa -kzh -tOp -cKa -kzh -tOp -cKa -xVw -mgz -bOx -cKa -vUP -vUP -vUP -cKa +qBw +psG +cIa +hZU +dZM +cIa +hZU +dZM +cIa +apm +jii +xCR +cIa +qBw +qBw +qBw +cIa xRl cPz ixl @@ -70806,44 +71458,44 @@ mlC kPz kPz kPz -mlC +uDF hdR oPR oPR qBe aZL nGB -ecM -mlC -mlC -mlC -ecM +jjx +uDF +uDF +uDF +jjx eLU -qBe -qBe -qBe +aCw +aCw +aCw jis dQV nGp dQV -kqC +umN pai kgQ nkg diJ iuC -ioc +lmC pnP -dHD -xbM -fHo -kqC -qNF -mDO -kqC -qNF -mDO -kqC +wKi +fBK +qJY +umN +eVD +qFW +umN +eVD +qFW +umN lbz hnh gbf @@ -70977,31 +71629,31 @@ jmG jmG jmG jmG -jmG -eov -eov -eov -eov -vUP -wef -vUP +hCG +gGn +gGn +gGn +gGn +qBw +wHV +qBw ika -vUP -vUP +qBw +qBw bjZ -jWI -eow +fvx +aYR aiv kGd -lFB -vUP -kjt -mgz -rLG +meE +qBw +nVK +jii +apg lZA -jWI -eow -lFB +fvx +aYR +meE lZA ixl ixl @@ -71010,53 +71662,53 @@ hHH hHH ixl rmX -qBe -oPR -oPR -roQ -mlC +aCw +gvy +gvy +isw +uDF bQM kPz bQM -mlC -aZL -oPR -oPR -qBe -qBe +uDF +flG +gvy +gvy +aCw +aCw gbk -qBe -eUP -qBe -qBe -qBe -qBe -qBe -hdR -roQ -qBe -qBe -qBe +aCw +iCC +aCw +aCw +aCw +aCw +aCw +svS +isw +aCw +aCw +aCw fjg -kqC +umN pai kgQ tTm diJ aga diJ -xbM -dHD -xbM +fBK +wKi +fBK rYK -kqC -ryJ -end -kqC -ryJ -end -kqC -kqC +umN +hCX +elm +umN +hCX +elm +umN +umN pFW cTy fOT @@ -71189,32 +71841,32 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa +hCG +cIa +cIa +cIa rpf -vUP -vUP -vUP -vUP +qBw +qBw +qBw +qBw mIr -vUP +qBw knb -kXk -xYJ -qGB -amn +mVE +bVO +gJM +gAD hkH -vUP -kjt -mgz -rLG -wef -kjt -mgz -rLG -wef +qBw +nVK +jii +apg +wHV +nVK +jii +apg +wHV ixl ixl ixl @@ -71222,52 +71874,52 @@ ixl ixl gpr nnr -oPR -oPR -oPR -kJJ -ecM -mlC -mlC -mlC -ecM -iCE -oPR -oPR -qBe -qBe -qBe -qBe -qBe -qBe -qBe -qBe -qBe -qBe +gvy +gvy +gvy +lFK +jjx +uDF +uDF +uDF +jjx +cYY +gvy +gvy +aCw +aCw +aCw +aCw +aCw +aCw +aCw +aCw +aCw +aCw rMw -mEU -qBe -qBe -qBe +tkh +aCw +aCw +aCw jLe -kqC -kqC +umN +umN sRJ iuC coj -ioc -ioc -xbM -dHD -xbM -fHo -ioc -rzp -vds -vds -vds -elO -ioc +lmC +lmC +fBK +wKi +fBK +qJY +lmC +xBF +nUh +nUh +nUh +bhC +lmC ntv tOM gbf @@ -71401,31 +72053,31 @@ jmG jmG jmG jmG -jmG -cKa -cKa -cKa -cKa -vUP -vUP -vUP +hCG +cIa +cIa +cIa +cIa +qBw +qBw +qBw jfc -wef -wef -wef -wef -wef +wHV +wHV +wHV +wHV +wHV rPS -wef -wef +wHV +wHV jfc -kjt -mgz -rLG +nVK +jii +apg lZA -kjt -mgz -rLG +nVK +jii +apg lZA ixl ixl @@ -71434,52 +72086,52 @@ ixl ixl ixl nnr -oPR -oPR -oPR -aZL +gvy +gvy +gvy +flG eLy -roQ -qBe -aZL +isw +aCw +flG eLy -roQ -oPR -oPR -hdR -roQ -qBe -qBe -hdR -roQ -qBe -qBe -qBe -qBe +isw +gvy +gvy +svS +isw +aCw +aCw +svS +isw +aCw +aCw +aCw +aCw hYs uou -qBe +aCw mrW -qBe +aCw fWV tHl qCK lIJ qCK -ioc +lmC idj -ioc -xbM -qNF -xRI -efW -ioc -qNF -xRI -xRI -xRI -efW -ioc +lmC +fBK +eVD +gos +duL +lmC +eVD +gos +gos +gos +duL +lmC ntv tOM gbf @@ -71613,32 +72265,32 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa +hCG +cIa +cIa +cIa rpf -jWI -eow -lFB -hqD -jWI +fvx +aYR +meE +juV +fvx clA -wef -jWI -lFB +wHV +fvx +meE jfc -jWI -lFB +fvx +meE rPS -kjt -mgz -rLG -wef -kXk -amn -tPB -wef +nVK +jii +apg +wHV +mVE +gAD +sJH +wHV ixl ixl ixl @@ -71647,52 +72299,52 @@ ghS ixl lpS ooq -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -aZL -mEU -qBe -eUP -aZL -mEU -qBe -qBe -qBe -qBe +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +flG +tkh +aCw +iCC +flG +tkh +aCw +aCw +aCw +aCw hYs -qBe -qBe -qBe +aCw +aCw +aCw oHi -miU +qfh sgt -vRA -upY -vRA -vRA -ioc +xSw +sDw +xSw +xSw +lmC diJ -xbM -vRA -xbM -xbM -kqC -ryJ -end -kqC -kqC -ecd -kqC -kqC +fBK +xSw +fBK +fBK +umN +hCX +elm +umN +umN +nIU +umN +umN pFW gbf gbf @@ -71825,32 +72477,32 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa -cKa -kjt -mgz -rLG -hqD +hCG +cIa +cIa +cIa +cIa +nVK +jii +apg +juV fRc -dUx -hqD -iFB -dUx +keb +juV +iXB +keb jfc -iFB -dUx -wef -kjt -mgz -rLG -cKa -vUP -vUP -vUP -cKa +iXB +keb +wHV +nVK +jii +apg +cIa +qBw +qBw +qBw +cIa xRl ixl ixl @@ -71860,8 +72512,8 @@ bjf vNq gvz ooq -mEU -roQ +tkh +isw fyL fje rCe @@ -71870,35 +72522,35 @@ gGc dIx rCe gPE -qBe -qBe +aCw +aCw fyL gGc gGc tzM -hdR -roQ -qBe +svS +isw +aCw kHH fFv uoH -qBe -qBe -qBe -qBe +aCw +aCw +aCw +aCw oPN -vRA +xSw aXC -vRA +xSw qCK lIJ -vRA -upY -upY -upY +xSw +sDw +sDw +sDw tZe -kqC -rzp +umN +xBF mwP mxQ fCZ @@ -72037,32 +72689,32 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa -cKa -wdL -mgz -rLG -hEs -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa -xVw -mgz -rLG -jmG -uwk -uwk -uwk -jmG +hCG +cIa +cIa +cIa +cIa +iWX +jii +apg +asF +cIa +cIa +cIa +cIa +cIa +cIa +cIa +cIa +cIa +apm +jii +apg +hCG +nLO +nLO +nLO +hCG vnr ixl ixl @@ -72071,31 +72723,31 @@ ixl ixl vNq vNq -dAd -ode -ode -cry +lyp +hXJ +hXJ +pqQ vNq vNq vnr -mlC -mlC -ecM +uDF +uDF +jjx yfp hEv hEv -hbp -ecM +pBD +jjx nSx gVc xbo qzZ -qBe -qBe -aZL -mEU -qBe -qBe +aCw +aCw +flG +tkh +aCw +aCw ooO faw lux @@ -72104,14 +72756,14 @@ cqW ckS voh dtg -ioc -upY -upY -upY +lmC +sDw +sDw +sDw tZe -kqC -qLi -dpe +umN +xpy +oeh mxQ gRW ssO @@ -72249,28 +72901,28 @@ cAW cAW cAW cAW -jmG -cKa -bqu +hCG +cIa +fna moQ -cKa -kjt -mgz +cIa +urw +jii vwX -cKa -bqu -rwm -cKa -bqu -rwm -cKa -bqu +cIa +fna +uTq +cIa +fna +uTq +cIa +fna aLC -cKa -kjt -mgz -rLG -uwk +cIa +nVK +jii +apg +nLO bQM kPz kPz @@ -72297,33 +72949,33 @@ ovq vyw bix uTb -ecM +jjx nSx gux eio -qBe -qBe -qBe -qBe -qBe -wKm -qBe -qBe +aCw +aCw +aCw +aCw +aCw +lfx +aCw +aCw faw tHl jYm -xbM +fBK thz suq -xbM +fBK wFB -xbM -xbM +fBK +fBK xdZ -xbM -kqC -kqC -kqC +fBK +umN +umN +umN mxQ tUs tUs @@ -72461,28 +73113,28 @@ cAW cAW cAW cAW -jmG -cKa -kXk +hCG +cIa +mVE qRf -cKa -kjt -mgz -rLG -cKa -kXk +cIa +nVK +jii +apg +cIa +mVE jWY -cKa -kXk +cIa +mVE lzz -cKa -kXk -rhH -cKa -kXk -amn -tPB -uwk +cIa +mVE +sEK +cIa +mVE +gAD +sJH +nLO bQM kPz kPz @@ -72509,31 +73161,31 @@ lOx oRg ixl uvn -ecM +jjx nSx ayG laK gRA -qBe -hdR -roQ +aCw +svS +isw gRA -qBe -qBe -qBe +aCw +aCw +aCw hQT -jTJ -jTJ -kqC -kqC -kqC -jTJ -jTJ -vRA +axz +axz +umN +umN +umN +axz +axz +xSw blG -jTJ -jTJ -jTJ +axz +axz +axz bMG anl ffZ @@ -72673,28 +73325,28 @@ cAW cAW cAW cAW -jmG -cKa -kzh -tOp -cKa -kjt -mgz -rLG -cKa -kzh -tOp -cKa -kzh -tOp -cKa -kzh -tOp -cKa +hCG +cIa +hZU +dZM +cIa +nVK +jii +apg +cIa +hZU +dZM +cIa +hZU +dZM +cIa +hZU +dZM +cIa cIt -vUP -vUP -uwk +qBw +qBw +nLO bQM kPz kPz @@ -72724,27 +73376,27 @@ kGc nSx cVV oWC -xKX +ubx qTt gRA -aZL -hdR -roQ +flG +svS +isw gRA -qBe -qBe +aCw +aCw uud wXQ ntv hqX -vds -vds +nUh +nUh rQB gdS -ioc -ioc +lmC +lmC qxZ -duF +lHH sFH rCt xGd @@ -72885,28 +73537,28 @@ cAW cAW cAW cAW -jmG -cKa -jWI -eow -eow -ufR -mgz -jna -eow -eow +hCG +cIa +fvx +aYR +aYR +rEx +jii +deg +aYR +aYR kGd -wef -eow -eow -eow -eow -lFB -vUP -jWI -eow -lFB -uwk +wHV +aYR +aYR +aYR +aYR +meE +qBw +fvx +aYR +meE +nLO bQM kPz kPz @@ -72935,28 +73587,28 @@ ovq uvn nSx nSx -xKX +ubx rGf -xKX +ubx qUw gRA -aZL -mEU -roQ -qBe -qBe -qBe -kqC -kqC -kqC +flG +tkh +isw +aCw +aCw +aCw +umN +umN +umN fKX -upY +sDw rQB -iLl -ioc -ioc +eMN +lmC +lmC sjZ -kqC +umN huJ caF xKE @@ -73097,28 +73749,28 @@ cAW cAW cAW cAW -jmG -cKa -kjt -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -wef -mgz -mgz -mgz -mgz -rLG -vUP -kjt -mgz -rLG -uwk +hCG +cIa +nVK +jii +jii +jii +jii +jii +jii +jii +jii +wHV +jii +jii +jii +jii +apg +qBw +nVK +jii +apg +nLO bQM kPz kPz @@ -73148,30 +73800,30 @@ uvn cVV nSx nVE -xKX +ubx uGL -mEU -qBe +tkh +aCw gRA -aZL -mEU -qBe -qBe +flG +tkh +aCw +aCw uud mwu ntv hqX -vds -vds -jTJ -jTJ -vRA +nUh +nUh +axz +axz +xSw blG -jTJ -jTJ -kqC +axz +axz +umN pim -kqC +umN mxQ tUs mxQ @@ -73309,28 +73961,28 @@ cAW cAW cAW cAW -jmG -cKa +hCG +cIa ndQ -amn -amn -amn -amn -amn -amn -amn -amn +gAD +gAD +gAD +gAD +gAD +gAD +gAD +gAD ljc -amn -amn -amn -amn -tPB -vUP -kXk +gAD +gAD +gAD +gAD +sJH +qBw +mVE ylr -tPB -uwk +sJH +nLO bQM kPz kPz @@ -73360,21 +74012,21 @@ peP nSx nSx xgC -roQ +isw gRA -qBe -hdR +aCw +svS dVu nSx -okE -qBe -qBe -qBe -kqC -kqC -kqC -xbM -upY +nvx +aCw +aCw +aCw +umN +umN +umN +fBK +sDw sqC vVx qQb @@ -73396,12 +74048,12 @@ tOM tYD egz xkq -mxQ -mxQ +fbn +fbn kKQ vhk -mxQ -mxQ +fbn +fbn tSL egz jOv @@ -73521,28 +74173,28 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa -cKa +hCG +cIa +cIa +cIa +cIa wsw -dVA -vUP -dVA -vUP -mgz -mgz -mgz -vUP -dVA +doc +qBw +doc +qBw +jii +jii +jii +qBw +doc gtr gtr gtr -cKa -cKa -cKa -jmG +cIa +cIa +cIa +hCG bQM kPz kPz @@ -73571,22 +74223,22 @@ vdN uvn uFC qyM -aZL -hdR -roQ +flG +svS +isw gRA -aZL -hdR +flG +svS dhc nSx -okE -qBe +nvx +aCw uud wXQ ntv hqX -vds -vds +nUh +nUh ntv kUR sIj @@ -73606,16 +74258,16 @@ tOM rko egz xkq -mxQ -jjg -mxQ -wGA -pYB -pYB -cwM -mxQ -jjg -mxQ +fbn +qtp +fbn +inv +tEU +tEU +uow +fbn +qtp +fbn cBn egz sGg @@ -73732,26 +74384,26 @@ cAW cAW cAW cAW -jmG -jmG -cKa -cKa -cKa +hCG +hCG +cIa +cIa +cIa pQc -mgz -mgz -mgz -mgz -vUP -mgz -mgz -mgz -vUP -mgz -mgz +jii +jii +jii +jii +qBw +jii +jii +jii +qBw +jii +jii mns -vUP -vUP +qBw +qBw tBP vNq vnr @@ -73784,21 +74436,21 @@ uvn ovq qyM gRA -aZL -mEU -roQ +flG +tkh +isw gRA -aZL +flG qEC -roQ +isw gRA -qBe -qBe -kqC -kqC -kqC +aCw +aCw +umN +umN +umN sKr -upY +sDw ntv kUR sIj @@ -73816,20 +74468,20 @@ gbf ekx tOM xpM -mxQ -jjg -mxQ +fbn +qtp +fbn tVY -jzP -gbf -pYB -pYB -gbf +rTY +sgI +tEU +tEU +sgI blf fDW -mxQ -jjg -mxQ +fbn +qtp +fbn vUZ tOM beB @@ -73944,13 +74596,13 @@ cAW cAW cAW cAW -jmG -jmG -cKa -cKa -cKa -cKa -mgz +hCG +hCG +cIa +cIa +cIa +cIa +jii rAw rAw xKP @@ -73960,10 +74612,10 @@ oKn niw jfp pho -mgz -mgz -vUP -vUP +jii +jii +qBw +qBw tBP vNq vnr @@ -73995,22 +74647,22 @@ jUP uvn ovq qyM -roQ +isw gRA -aZL -hdR +flG +svS dVu nSx asf -hdR -roQ +svS +isw gRA uud iIG ntv hqX -vds -vds +nUh +nUh ntv kUR sIj @@ -74028,20 +74680,20 @@ gbf tOM tYD xkq -jjg +qtp vRk -pRD +gWA bTC -apu -gbf -pYB +aZA +sgI +tEU voI -gbf -fOT -nBw +sgI +xct +emE fXW ldF -jjg +qtp cBn jOv tOM @@ -74156,13 +74808,13 @@ cAW cAW cAW cAW -jmG -jmG -jmG -jmG +hCG +hCG +hCG +hCG pcN -vUP -mgz +qBw +jii rAw rAw vsr @@ -74171,11 +74823,11 @@ gWg nmm nmm wJd -lFB +meE mns -mgz -vUP -vUP +jii +qBw +qBw tBP vNq vnr @@ -74207,23 +74859,23 @@ xHi uvn ovq qyM -mEU -roQ +tkh +isw gRA -aZL -mEU +flG +tkh nGO nSx hsz -mEU -roQ +tkh +isw gRA -kqC -kqC -kqC -xbM -upY -jTJ +umN +umN +umN +fBK +sDw +axz veW vVN vVN @@ -74239,22 +74891,22 @@ gbf tOM tOM xpM -mxQ -mxQ -pRD -gbf -gbf -jzP -gbf -pYB -pYB -gbf +fbn +fbn +gWA +sgI +sgI +rTY +sgI +tEU +tEU +sgI iYe -bnx +mqL siy nAV -mxQ -mxQ +fbn +fbn vUZ tOM tOM @@ -74371,10 +75023,10 @@ cAW cAW bQM fwn -jmG +hCG dVC -vUP -mgz +qBw +jii rAw vrH tAE @@ -74383,9 +75035,9 @@ pqz nmm nmm wJd -rLG -mgz -mgz +apg +jii +jii rkF qfi vNq @@ -74420,22 +75072,22 @@ uvn vja nSx oQS -aZL -roQ +flG +isw gRA -aZL -hdR -roQ +flG +svS +isw gRA -aZL -hdR -roQ +flG +svS +isw cfa qwH qwH -rzp -elO -jTJ +xBF +bhC +axz lmu sIj hkA @@ -74451,22 +75103,22 @@ gbf tOM rko xkq -jjg +qtp tVY bxv -gbf -gbf +sgI +sgI oox lMV -pYB -pYB +tEU +tEU vjR doQ upM vjR -nBw +emE fDW -jjg +qtp cBn rxM tOM @@ -74583,10 +75235,10 @@ cAW cAW tan geF -jmG +hCG qPL -vUP -mgz +qBw +jii rAw rAw uLj @@ -74595,8 +75247,8 @@ rru nmm djB wJd -tPB -mgz +sJH +jii uhA oUg oUg @@ -74632,22 +75284,22 @@ iHB reZ qyM gRA -aZL -mEU +flG +tkh dVu nSx hsz -mEU -roQ +tkh +isw gRA -aZL -mEU +flG +tkh cfa -upY +sDw qwH -qNF -efW -jTJ +eVD +duL +axz hcB sIj hkA @@ -74662,24 +75314,24 @@ gbf tOM tOM xpM -mxQ -mxQ +fbn +fbn vZe -ydK -jzP +dIp +rTY tlj -ekW -rKs +tMW +pMr ngg -pYB -bnx +tEU +mqL taS jEa hPu -ydK +dIp blf -mxQ -mxQ +fbn +fbn jLD tOM tOM @@ -74795,10 +75447,10 @@ cAW cAW kPz cAW -jmG -uwk -jmG -mgz +hCG +nLO +hCG +jii xCg iFP kiT @@ -74807,9 +75459,9 @@ nmm nmm nmm wJd -vUP -mgz -mgz +qBw +jii +jii oUg oUg oUg @@ -74843,23 +75495,23 @@ ovq uvn uFC qyM -roQ +isw gRA -aZL -hdR +flG +svS dVu nSx hsz tad -izZ +gLq oQS vao -kqC +umN cYj qwH -mCF -kqC -jTJ +hhX +umN +axz oaa sIj hkA @@ -74874,24 +75526,24 @@ dxW gbf gbf gSg -mxQ +fbn qyq -gbf -gbf -gbf +sgI +sgI +sgI eEC -rKs +pMr saL qCx fEY -bzO -gbf +nxC +sgI drk -gbf -gbf -gbf -jHj -mxQ +sgI +sgI +sgI +ulN +fbn aNz gbf gbf @@ -75009,10 +75661,10 @@ bQM cAW cAW cAW -uwk -mgz -mgz -mgz +nLO +jii +jii +jii jPM oBC jNl @@ -75020,8 +75672,8 @@ vrp mTa bsm wqY -mgz -mgz +jii +jii oUg kSh wPz @@ -75055,14 +75707,14 @@ xZV uvn ovq qyM -mEU -roQ +tkh +isw gRA -aZL -mEU -roQ +flG +tkh +isw gRA -aZL +flG xNJ gRA gRA @@ -75087,22 +75739,22 @@ pYB pYB ont eGm -pYB -pYB -pYB -pYB +tEU +tEU +tEU +tEU qCx -pYB -pYB -pYB -pYB -pYB -pYB -pYB +tEU +tEU +tEU +tEU +tEU +tEU +tEU hpX -pYB -pYB -pYB +tEU +tEU +tEU vuT uBV pYB @@ -75221,10 +75873,10 @@ tan cAW cAW cAW -jmG -mgz -mgz -mgz +hCG +jii +jii +jii mUd ubQ okF @@ -75232,8 +75884,8 @@ fis lUs pqz wqY -mgz -mgz +jii +jii mPW cpP aFK @@ -75267,10 +75919,10 @@ xFL pmC xFL gRA -aZL -mEU -cGS -mEU +flG +tkh +ygS +tkh gRA gRA wOG @@ -75299,23 +75951,23 @@ pYB pYB aMr jYV -pYB -pYB +tEU +tEU ngg -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -qzb +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +vYp nmM pYB pYB @@ -75433,10 +76085,10 @@ eeI cAW cAW cAW -uwk -mgz +nLO +jii xCh -mgz +jii mUd hpz hxM @@ -75445,7 +76097,7 @@ iwT nmm wqY pUG -mgz +jii puE hTf qGn @@ -75480,13 +76132,13 @@ lAE vja nSx hsz -mEU +tkh gRA dJt -izZ -bEX -bEX -bEX +gLq +owc +owc +owc iCU gRA gRA @@ -75510,24 +76162,24 @@ gbf dxW gbf gSg -mxQ +fbn xcz -gbf -gbf -gbf +sgI +sgI +sgI ubo ubo -mxQ -opM -pYB +fbn +hJu +tEU tWz duV lAM -gbf -gbf -gbf -jHj -mxQ +sgI +sgI +sgI +ulN +fbn dNc gbf dxW @@ -75645,9 +76297,9 @@ kPz cAW cAW cAW -jmG -mgz -mgz +hCG +jii +jii rAw kiT wyU @@ -75655,9 +76307,9 @@ ujs nmm nmm wJd -vUP -mgz -wef +qBw +jii +wHV puE cJv eqQ @@ -75690,16 +76342,16 @@ uVH xFL pmC xFL -hdR +svS ntx kSe leN -mEU -izZ +tkh +gLq fOe rez xJn -bEX +owc cRM gRA bhX @@ -75722,24 +76374,24 @@ gbf tOM tOM xpM -mxQ -mxQ +fbn +fbn fEv uTw -pYB -pYB +tEU +tEU nKf -gbf -pYB -pYB +sgI +tEU +tEU hWG qQy -pRD -pRD +gWA +gWA khw htT -mxQ -mxQ +fbn +fbn vUZ tOM tOM @@ -75857,8 +76509,8 @@ emC cAW cAW cAW -uwk -mgz +nLO +jii rAw rAw vsr @@ -75867,9 +76519,9 @@ nmm cYT nmm wJd -lFB -wef -mgz +meE +wHV +jii qrz puE lzn @@ -75902,18 +76554,18 @@ oRg ovq uvn uZP -aZL -aZL -mEU +flG +flG +tkh gRA gRA -izZ +gLq bIR gWq xJn -bEX +owc lbL -xKX +ubx iyc bhX iBr @@ -75935,22 +76587,22 @@ gbf tOM rdt rsQ -mxQ +fbn lWy -gbf -gbf -jMv -pYB -gbf -pYB -ioW +sgI +sgI +xqi +tEU +sgI +tEU +hyM hXF -pRD -ota -gbf -jzP -pRx -jjg +gWA +rkX +sgI +rTY +vGf +qtp tlC kyh tOM @@ -76069,8 +76721,8 @@ bQM cAW cAW cAW -jmG -mgz +hCG +jii rAw rAw gFN @@ -76079,8 +76731,8 @@ nmm nmm nmm wJd -rLG -mgz +apg +jii pUG puE eqQ @@ -76119,7 +76771,7 @@ ntx kSe gRA gRA -izZ +gLq nyF tOc tOc @@ -76147,22 +76799,22 @@ gbf tOM tOM xpM -mxQ -mxQ -tOM +fbn +fbn +xwm gjr -gbf +sgI fgq drk -pYB -pYB -gbf -pRD -gbf -gbf +tEU +tEU +sgI +gWA +sgI +sgI oLX -mxQ -mxQ +fbn +fbn vUZ tOM tOM @@ -76281,8 +76933,8 @@ cAW bQM cAW cAW -uwk -mgz +nLO +jii rAw rAw srQ @@ -76291,9 +76943,9 @@ sUX nmm nmm nEN -tPB -mgz -mgz +sJH +jii +jii mPW vvM tet @@ -76327,15 +76979,15 @@ ovq uvn ovq ovq -aZL -mEU +flG +tkh gRA fXo -izZ -bEX +gLq +owc mrG -bEX -izZ +owc +gLq oQS lco oZx @@ -76360,20 +77012,20 @@ gbf tOM kTD rsQ -mxQ -tOM -tOM -gbf -pYB -gbf -pYB -pYB -gbf -fOT -jzP +fbn +xwm +xwm +sgI +tEU +sgI +tEU +tEU +sgI +xct +rTY oLX wYT -jjg +qtp tlC jrO tOM @@ -76493,8 +77145,8 @@ bce kPz bce cAW -jmG -mgz +hCG +jii rAw xCg xKP @@ -76503,9 +77155,9 @@ oNx uuJ oNx jWy -vUP -mgz -mgz +qBw +jii +jii jqt pTU wPz @@ -76572,20 +77224,20 @@ gbf rsR tOM xpM -mxQ -mxQ -mxQ +fbn +fbn +fbn sHe -pYB -kBt -pYB -pYB -gbf +tEU +xlC +tEU +tEU +sgI wdo nEP -mxQ -jjg -mxQ +fbn +qtp +fbn vUZ tOM oEQ @@ -76705,19 +77357,19 @@ cAW fiq cAW cAW -uwk -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz +nLO +jii +jii +jii +jii +jii +jii +jii +jii +jii +jii +jii +jii oUg oUg oUg @@ -76786,16 +77438,16 @@ tOM rdt jGC rsQ -mxQ -mxQ -mxQ +fbn +fbn +fbn aLz -pYB -pYB -mPn -mxQ -jjg -mxQ +tEU +tEU +vcn +fbn +qtp +fbn tlC jGC kyh @@ -76917,19 +77569,19 @@ cAW fiq fiq tan -jmG -mgz -mgz -mgz -mgz -mgz -vUP -vUP -vUP -vUP -mgz -mgz -mgz +hCG +jii +jii +jii +jii +jii +qBw +qBw +qBw +qBw +jii +jii +jii oUg oUg oUg @@ -77000,12 +77652,12 @@ tOM kTD jGC rsQ -mxQ -mxQ +fbn +fbn rqh iAr -mxQ -mxQ +fbn +fbn tlC jGC jrO @@ -77129,19 +77781,19 @@ tan tan tan tan -jmG -jmG -uwk -jmG -uwk -jmG -wef +hCG +hCG +nLO +hCG +nLO +hCG +wHV kmL -wef +wHV kmL -jmG -jmG -jmG +hCG +hCG +hCG vnr vnr vnr diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index 6c1c5460a935..d3e33b478df6 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -1648,7 +1648,7 @@ }, /obj/item/stack/snow, /turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "aje" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -1705,7 +1705,7 @@ }, /obj/item/tool/shovel/snow, /turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "ajF" = ( /obj/item/tool/shovel/etool, /turf/open/auto_turf/snow/layer3, @@ -3184,7 +3184,7 @@ dir = 1 }, /turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "avz" = ( /obj/structure/surface/rack, /obj/item/bodybag/tarp/snow{ @@ -4709,6 +4709,9 @@ /obj/structure/machinery/colony_floodlight, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) +"aOk" = ( +/turf/closed/wall/shiva/ice, +/area/shiva/exterior/southwest_valley) "aOo" = ( /obj/item/dogtag, /obj/effect/decal/cleanable/blood, @@ -5307,8 +5310,8 @@ /turf/open/shuttle/can_surgery/black, /area/shiva/interior/aerodrome) "aWb" = ( -/obj/structure/foamed_metal, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/effect/sentry_landmark/lz_2/bottom_right, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) "aWs" = ( @@ -5807,7 +5810,7 @@ "bhN" = ( /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "bhS" = ( /turf/open/floor/shiva/wred/north, /area/shiva/interior/colony/medseceng) @@ -6150,6 +6153,10 @@ "bFg" = ( /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard/cp_bar) +"bFx" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "bFC" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; @@ -6198,7 +6205,7 @@ dir = 8 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "bHN" = ( /obj/item/ammo_magazine/rifle/boltaction{ pixel_x = -7; @@ -6500,6 +6507,10 @@ "caS" = ( /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/lz2_fortress) +"cbe" = ( +/obj/structure/flora/tree/dead/tree_4, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "cbk" = ( /obj/structure/prop/invuln{ desc = "The mounting points are ground down from heavy use. They'll need some maintenance work before they can be used again."; @@ -6557,6 +6568,10 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) +"ceh" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/snow/layer3, +/area/shiva/interior/caves/cp_camp) "cex" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -6687,6 +6702,9 @@ icon_state = "stan23" }, /area/shiva/interior/aerodrome) +"coD" = ( +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "cpb" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -7815,6 +7833,10 @@ "dQF" = ( /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) +"dQH" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/lz1_valley) "dQZ" = ( /obj/structure/window/reinforced/tinted{ dir = 8 @@ -7849,6 +7871,9 @@ "dWp" = ( /turf/open/floor/shiva/yellow/southeast, /area/shiva/interior/colony/medseceng) +"dWq" = ( +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/southwest_valley) "dWw" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -8031,7 +8056,7 @@ dir = 1 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "eit" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/ice/layer1, @@ -8124,6 +8149,9 @@ }, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) +"eoE" = ( +/turf/closed/wall/shiva/prefabricated/reinforced, +/area/shiva/exterior/southwest_valley) "eoG" = ( /obj/effect/landmark/corpsespawner/security/marshal, /turf/open/floor/shiva/green/southeast, @@ -8189,7 +8217,7 @@ pixel_y = 7 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "etm" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 28 @@ -8248,7 +8276,7 @@ dir = 4 }, /turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "eAZ" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) @@ -8502,7 +8530,7 @@ "eSN" = ( /obj/vehicle/train/cargo/engine, /turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "eTV" = ( /obj/structure/flora/bush/ausbushes/lavendergrass{ icon_state = "lavendergrass_2" @@ -8848,7 +8876,7 @@ icon_state = "p_stair_sn_full_cap" }, /turf/open/auto_turf/snow/layer1, -/area/shiva/interior/warehouse/caves) +/area/shiva/exterior/southwest_valley) "fqJ" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -9001,7 +9029,7 @@ "fCs" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "fDd" = ( /obj/structure/surface/table, /obj/item/storage/box/donkpockets, @@ -9188,7 +9216,7 @@ pixel_y = 23 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "fLk" = ( /obj/item/clothing/shoes/snow, /obj/structure/surface/rack, @@ -9686,7 +9714,7 @@ icon_state = "p_stair_sn_full_cap" }, /turf/open/auto_turf/snow/layer0, -/area/shiva/interior/warehouse/caves) +/area/shiva/exterior/southwest_valley) "gso" = ( /obj/structure/platform/strata, /turf/open/gm/river, @@ -9740,6 +9768,10 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/lz2_habs) +"guC" = ( +/obj/structure/flora/tree/dead/tree_2, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "guH" = ( /obj/structure/prop/ice_colony/surveying_device, /turf/open/auto_turf/ice/layer0, @@ -9794,7 +9826,7 @@ dir = 6 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "gzc" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber{ icon_state = "psiphon:1" @@ -9904,6 +9936,10 @@ /obj/item/ammo_magazine/rifle/m41aMK1, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"gGg" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/shiva/floor3, +/area/shiva/exterior/lz2_fortress) "gGB" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgibdown1" @@ -10146,6 +10182,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/north, /area/shiva/interior/colony/n_admin) +"gSC" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "gSG" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/landmark/objective_landmark/close, @@ -10223,6 +10263,10 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/aux_power) +"gYj" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "gYu" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, @@ -10258,13 +10302,6 @@ /obj/structure/platform/strata, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/oob/dev_room) -"hbp" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard) "hbu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/flour{ @@ -10303,6 +10340,10 @@ /obj/structure/surface/table, /turf/open/floor/shiva/wred/west, /area/shiva/interior/colony/medseceng) +"hgd" = ( +/obj/item/lightstick/red/variant/planted, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "hgI" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer2, @@ -10511,6 +10552,10 @@ /obj/item/tool/screwdriver, /turf/open/floor/shiva/bluefull/west, /area/shiva/interior/aerodrome) +"hsU" = ( +/obj/structure/machinery/power/apc/no_power/north, +/turf/open/floor/plating, +/area/shiva/exterior/southwest_valley) "hsZ" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -10599,7 +10644,7 @@ dir = 8 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "hyu" = ( /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) @@ -10815,7 +10860,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "hHV" = ( /obj/structure/surface/table, /obj/structure/machinery/cell_charger, @@ -10853,6 +10898,10 @@ /obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) +"hIW" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "hJH" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/plating, @@ -11641,6 +11690,9 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_lz2) +"iDu" = ( +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "iDy" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -11687,7 +11739,7 @@ dir = 8 }, /turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "iHN" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/shiva/green/east, @@ -11751,7 +11803,7 @@ dir = 4 }, /turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "iLf" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; @@ -11773,7 +11825,7 @@ "iMC" = ( /obj/item/tool/shovel/snow, /turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "iMW" = ( /obj/item/stack/cable_coil/cut, /turf/open/auto_turf/snow/layer0, @@ -11814,7 +11866,7 @@ pixel_y = 28 }, /turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "iPg" = ( /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/n_admin) @@ -12032,7 +12084,7 @@ dir = 4 }, /turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "jay" = ( /turf/open/floor/shiva/yellowcorners/north, /area/shiva/interior/colony/medseceng) @@ -12105,7 +12157,7 @@ dir = 8 }, /turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "jhq" = ( /turf/open/floor/shiva/radiator_tile, /area/shiva/interior/colony/n_admin) @@ -12690,7 +12742,7 @@ icon_state = "p_stair_full" }, /turf/open/auto_turf/snow/layer0, -/area/shiva/interior/warehouse/caves) +/area/shiva/exterior/southwest_valley) "jWL" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -12909,7 +12961,7 @@ dir = 4 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "khz" = ( /obj/item/device/flashlight, /turf/open/floor/shiva, @@ -12964,7 +13016,7 @@ icon_state = "p_stair_full" }, /turf/open/auto_turf/snow/layer4, -/area/shiva/interior/warehouse/caves) +/area/shiva/exterior/southwest_valley) "klF" = ( /obj/structure/bed/chair{ dir = 4 @@ -13079,6 +13131,10 @@ "ktd" = ( /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/interior/garage) +"ktn" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/shiva/radiator_tile, +/area/shiva/exterior/lz2_fortress) "kts" = ( /obj/structure/surface/table, /obj/item/storage/box/beakers, @@ -13344,6 +13400,12 @@ /obj/effect/landmark/static_comms/net_one, /turf/open/floor/wood, /area/shiva/interior/aerodrome) +"kGE" = ( +/obj/structure/flora/bush/snow{ + icon_state = "snowgrassbb_1" + }, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "kGW" = ( /obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, @@ -13828,7 +13890,7 @@ dir = 10 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "liD" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/floor3, @@ -14285,7 +14347,7 @@ icon_state = "snowgrassbb_1" }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/lz1_valley) +/area/shiva/exterior/southwest_valley) "lNK" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 5 @@ -14417,7 +14479,7 @@ pixel_y = -1 }, /turf/open/floor/plating, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "lWL" = ( /obj/effect/spider/cocoon{ icon_state = "cocoon_large3" @@ -14469,7 +14531,7 @@ icon_state = "p_stair_sn_full_cap" }, /turf/open/auto_turf/snow/layer0, -/area/shiva/interior/warehouse/caves) +/area/shiva/exterior/southwest_valley) "lYf" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -14846,7 +14908,7 @@ icon_state = "p_stair_sn_full_cap" }, /turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "myR" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -15171,6 +15233,10 @@ /obj/structure/dispenser, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) +"mNQ" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/snow/layer0, +/area/shiva/interior/caves/cp_camp) "mOu" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva/yellow, @@ -15590,6 +15656,10 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/medseceng) +"npK" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/snow/layer2, +/area/shiva/interior/caves/cp_camp) "npM" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/plating, @@ -15645,6 +15715,10 @@ "ntc" = ( /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) +"nte" = ( +/obj/vehicle/train/cargo/trolley, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "ntJ" = ( /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/cp_camp) @@ -15719,6 +15793,10 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"nxV" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "nyc" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer3, @@ -15767,7 +15845,7 @@ "nAs" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "nAY" = ( /turf/open/floor/shiva/yellowcorners, /area/shiva/interior/colony/medseceng) @@ -16039,7 +16117,7 @@ icon_state = "p_stair_full" }, /turf/open/auto_turf/snow/layer1, -/area/shiva/interior/warehouse/caves) +/area/shiva/exterior/southwest_valley) "nSI" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -16339,6 +16417,9 @@ /obj/structure/girder/displaced, /turf/open/floor/plating, /area/shiva/interior/colony/botany) +"onk" = ( +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "onl" = ( /obj/structure/surface/table, /obj/item/evidencebag, @@ -16563,7 +16644,7 @@ pixel_y = -5 }, /turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "oDH" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -16680,6 +16761,10 @@ /obj/structure/window/reinforced, /turf/open/floor/wood, /area/shiva/interior/colony/central) +"oKt" = ( +/obj/vehicle/train/cargo/engine, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "oKM" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/assistantformal, @@ -17513,7 +17598,11 @@ "pKK" = ( /obj/item/lightstick/red/variant, /turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) +"pKO" = ( +/obj/item/lightstick/planted, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "pKP" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp/green{ @@ -18122,7 +18211,11 @@ "que" = ( /obj/item/lightstick/red/variant/planted, /turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) +"quv" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/shiva/floor3, +/area/shiva/exterior/lz2_fortress) "qvr" = ( /obj/structure/machinery/alarm{ dir = 8; @@ -18741,7 +18834,7 @@ "rli" = ( /obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "rnz" = ( /obj/structure/flora/pottedplant, /turf/open/floor/wood, @@ -19052,7 +19145,7 @@ "rNY" = ( /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "rNZ" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -19307,7 +19400,7 @@ dir = 4 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "scN" = ( /obj/structure/surface/table, /obj/item/device/assembly/infra, @@ -19416,6 +19509,10 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"siG" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/lz1_valley) "siZ" = ( /turf/closed/wall/shiva/prefabricated/orange, /area/shiva/exterior/cp_s_research) @@ -19631,7 +19728,7 @@ dir = 4 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "sAe" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -19962,6 +20059,10 @@ /obj/item/stack/rods, /turf/open/floor/shiva/floor3, /area/shiva/exterior/lz2_fortress) +"sWW" = ( +/obj/item/lightstick/red/variant/planted, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "sXr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -20018,6 +20119,12 @@ /obj/item/clothing/shoes/snow, /turf/open/floor/interior/plastic/alt, /area/shiva/interior/warehouse) +"sZr" = ( +/obj/structure/flora/bush/snow{ + icon_state = "snowgrassall_1" + }, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "sZx" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 @@ -20225,6 +20332,9 @@ /obj/structure/largecrate/random/case/double, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/aerodrome) +"tmT" = ( +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "tmV" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/arrivals, /turf/open/shuttle/elevator/grating, @@ -20296,7 +20406,7 @@ /area/shiva/interior/caves/cp_camp) "tpg" = ( /turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "tpL" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -20307,6 +20417,10 @@ }, /turf/open/floor/shiva/purplefull/west, /area/shiva/interior/colony/research_hab) +"tpP" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "tqs" = ( /obj/structure/prop/ice_colony/dense/ice_tray{ pixel_y = 5 @@ -20697,6 +20811,10 @@ }, /turf/open/floor/shiva/radiator_tile, /area/shiva/exterior/cp_lz2) +"tMZ" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "tNm" = ( /obj/structure/surface/table, /obj/item/tool/kitchen/utensil/fork, @@ -21367,7 +21485,7 @@ icon_state = "W-corner" }, /turf/open/floor/plating, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "uyI" = ( /obj/structure/largecrate/random/mini/small_case/c{ pixel_x = 11; @@ -21904,6 +22022,9 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/s_lz2) +"vdy" = ( +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/southwest_valley) "vdC" = ( /obj/structure/flora/pottedplant, /turf/open/floor/shiva/north, @@ -22072,7 +22193,7 @@ dir = 8 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "voH" = ( /obj/structure/machinery/landinglight/ds2/spoke{ pixel_x = 1; @@ -22106,7 +22227,7 @@ dir = 9 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "vrm" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -22969,6 +23090,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/shiva/multi_tiles/east, /area/shiva/interior/colony/research_hab) +"wFU" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/snow/layer0, +/area/shiva/interior/caves/cp_camp) "wGD" = ( /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/s_admin) @@ -23071,7 +23196,7 @@ dir = 4 }, /turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "wOq" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/shiva/red/southwest, @@ -23494,13 +23619,13 @@ "xwk" = ( /obj/item/lightstick/red/variant, /turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "xwo" = ( /obj/structure/platform/shiva/catwalk{ dir = 8 }, /turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "xwL" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -23600,7 +23725,7 @@ pixel_y = 25 }, /turf/open/floor/plating, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "xCA" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/kitchen, @@ -23651,6 +23776,10 @@ /obj/structure/machinery/disposal, /turf/open/floor/shiva/wred/southeast, /area/shiva/interior/colony/medseceng) +"xEx" = ( +/obj/structure/flora/tree/dead/tree_5, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "xEB" = ( /obj/item/tool/warning_cone, /turf/open/floor/shiva, @@ -26352,7 +26481,7 @@ mFm mFm uRn mFm -mFm +tMZ xYx mFm nNd @@ -26424,7 +26553,7 @@ aFO aFO aFO aFO -aFO +wFU xAS oRH oRH @@ -26516,7 +26645,7 @@ mFm fOE mFm mFm -mFm +tMZ mFm xYx mFm @@ -26588,7 +26717,7 @@ elf too xAS oRH -aFO +wFU aFO xAS aFO @@ -26746,7 +26875,7 @@ aFO aFO xAS xAS -oRH +npK uIO oRH oRH @@ -26842,7 +26971,7 @@ mFm mFm mFm xYx -mFm +tMZ mFm caS caS @@ -27753,7 +27882,7 @@ iQq kLM kLM uqb -kLM +nxV uqb puZ puZ @@ -28074,7 +28203,7 @@ cQW cQW iQq iQq -iQq +siG kLM kLM ath @@ -28400,7 +28529,7 @@ kLM cQW iQq kLM -kLM +nxV wgM kLM ath @@ -28943,7 +29072,7 @@ mhP mFm wMj wMj -iuK +gGg mFm kEh jMD @@ -29081,7 +29210,7 @@ mFm mFm mFm mFm -mFm +hIW mFm mFm mFm @@ -29093,7 +29222,7 @@ iuK mFm mFm mFm -mFm +gSC mFm mFm mFm @@ -29179,10 +29308,10 @@ tlB tlB hBq tlB -tlB +ceh tlB xAS -aFO +mNQ tlB xAS tlB @@ -29240,17 +29369,17 @@ caS caS mFm mFm +hIW mFm mFm mFm mFm mFm +hIW mFm mFm mFm -mFm -mFm -iuK +quv iuK mFm mFm @@ -29259,7 +29388,7 @@ mFm mFm mFm mFm -mFm +gSC mFm mFm mFm @@ -29272,7 +29401,7 @@ ftm umj hjx vOd -slj +ktn mFm hlO kAp @@ -29668,7 +29797,7 @@ aFO aFO xAS tlB -tlB +ceh tlB xAS aFO @@ -30009,11 +30138,11 @@ kLM iQq iQq iQq +dQH iQq iQq iQq -iQq -iQq +dQH kLM kLM qoU @@ -30168,7 +30297,7 @@ kLM knI iQq iQq -iQq +dQH iQq iQq iQq @@ -30488,20 +30617,20 @@ ibP dMo uji uji -kLM +hsU lNE -uqb -iOu -kLM -iQq -iQq -iQq -iQq -kLM -kLM -uqb -uqb -uqb +coD +sWW +iDu +tmT +tmT +tmT +tmT +iDu +iDu +coD +coD +coD hzJ huz huz @@ -30649,22 +30778,22 @@ pvv pvv fRg uji -ofw -kop -kop -kop -tHd -tHd -kyD -kyD -kyD -kyD -tHd -tHd -rtZ -jMf -ofw -ofw +vdy +coD +coD +coD +iDu +iDu +tmT +tmT +tmT +tmT +iDu +iDu +hgd +onk +vdy +vdy huz huz huz @@ -30811,22 +30940,22 @@ pvv pvv fRg hGj -tHd -xvp -kop +iDu +sWW +coD xwk -kop -kyD -kyD -kyD -kyD -tHd -kyD -tHd -kop -tHd +coD +tmT +tmT +tmT +tmT +iDu +tmT +iDu +coD +iDu que -ofw +vdy huz kys pef @@ -30973,22 +31102,22 @@ pvv pvv fRg hGj -tHd -kyD -tHd -kop -tHd -kyD -kyD -kyD -kyD -kyD -tHd -kyD -kyD -tHd -tHd -tHd +iDu +tmT +iDu +coD +iDu +tmT +tmT +tmT +tmT +tmT +iDu +tmT +tmT +iDu +iDu +iDu huz krU axJ @@ -31135,22 +31264,22 @@ pvv pvv gxK hGj -kyD -kyD -kyD -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kyD -kyD -kyD +tmT +tmT +tmT +iDu +tmT +tmT +tmT +tmT +tmT +tmT +tmT +iDu +iDu +tmT +tmT +tmT huz axJ axJ @@ -31297,21 +31426,21 @@ dbH fhv fRg hGj -tHd -tHd -kyD -kyD -tHd -fHx -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD +iDu +iDu +tmT +tmT +iDu +oKt +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT tpg exX qIr @@ -31459,21 +31588,21 @@ aUA gIQ fRg hGj -kop -kop -kop -tHd -kyD -dyt -kyD -kyD -kyD +coD +coD +coD +iDu +tmT +nte +tmT +tmT +tmT rNY -kyD -kyD -kyD -kyD -kyD +tmT +tmT +tmT +tmT +tmT eSN akF alS @@ -31621,21 +31750,21 @@ deV eVG fRg hGj -kop -tHd -tHd -kyD -kyD -dyt -kyD -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD +coD +iDu +iDu +tmT +tmT +nte +tmT +iDu +tmT +tmT +tmT +tmT +tmT +tmT +tmT tpg exX qIr @@ -31783,21 +31912,21 @@ dKR pvv fRg hGj -tHd -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kop -tHd -kyD -kyD -kyD -kyD -kyD +iDu +tmT +tmT +tmT +tmT +tmT +iDu +iDu +coD +iDu +tmT +tmT +tmT +tmT +tmT tpg exX qIr @@ -31945,22 +32074,22 @@ pvv pvv fRg hGj -kyD -kyD -kyD -kyD -kyD -kyD -tHd -ofw -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD +tmT +tmT +tmT +tmT +tmT +tmT +iDu +vdy +iDu +tmT +tmT +tmT +tmT +tmT +tmT +tmT huz aut rdS @@ -32107,22 +32236,22 @@ pvv pvv fRg hGj -kyD -xvp -tHd -xvp -tHd -tHd -kyD -tHd -kyD -kyD -kyD -kyD +tmT +sWW +iDu +sWW +iDu +iDu +tmT +iDu +tmT +tmT +tmT +tmT pKK -kyD -xvp -tHd +tmT +sWW +iDu huz rdS axJ @@ -32274,12 +32403,12 @@ khx jac khx iHu -jXD -tHd -kyD -kyD -tHd -tHd +cbe +iDu +tmT +tmT +iDu +iDu huz huz huz @@ -32436,12 +32565,12 @@ iMA iMA uKZ ehV -ofw -aQJ -kyD -kyD -tHd -kop +vdy +gYj +tmT +tmT +iDu +coD huz cio ieD @@ -32599,10 +32728,10 @@ cLq iMA avx voo -tHd -kyD -kyD -tHd +iDu +tmT +tmT +iDu tpg exX qIr @@ -32760,11 +32889,11 @@ fRg xQa iMA avx -kop -tHd -kyD -kyD -tHd +coD +iDu +tmT +tmT +iDu tpg exX alW @@ -32922,12 +33051,12 @@ fRg uKZ uKZ vqV -tHd -tHd -kyD -kyD -kyD -tHd +iDu +iDu +tmT +tmT +tmT +iDu huz pJM ayZ @@ -33084,12 +33213,12 @@ fRg iMA nIA scp -tHd -kyD -kyD -tHd -kyD -kyD +iDu +tmT +tmT +iDu +tmT +tmT huz aQq axJ @@ -33245,13 +33374,13 @@ pvv oCG kjM oCG -kyD -kyD -kyD -tHd -ofw -tHd -kyD +tmT +tmT +tmT +iDu +vdy +iDu +tmT huz huz avz @@ -33407,14 +33536,14 @@ pvv oCG wRm oCG -kyD -kyD -kyD +tmT +tmT +tmT szU -tHd -kyD -kyD -kop +iDu +tmT +tmT +coD ncS pTp pTp @@ -33570,13 +33699,13 @@ fRg iMA tLC hye -tHd -kyD -tHd -kyD -kyD -tHd -kop +iDu +tmT +iDu +tmT +tmT +iDu +coD ncS mRc rdS @@ -33732,13 +33861,13 @@ iMA uKZ uKZ ehV -tHd -kyD -kyD -kyD -tHd -tHd -kop +iDu +tmT +tmT +tmT +iDu +iDu +coD ncS bWB auh @@ -33894,12 +34023,12 @@ obb vHX iMA ehV -tHd -kyD -kyD -tHd -kop -kop +iDu +tmT +tmT +iDu +coD +coD huz huz auh @@ -34056,11 +34185,11 @@ krm iXx iMA ehV -kop -tHd -kyD +coD +iDu +tmT nAs -kop +coD ajE huz qSW @@ -34218,11 +34347,11 @@ iMA iMA uKZ ehV -kop -tHd -kyD -kyD -tHd +coD +iDu +tmT +tmT +iDu ajd huz fjS @@ -34380,11 +34509,11 @@ jhm bHC bHC iKW -tHd -kyD -kyD -kyD -kyD +iDu +tmT +tmT +tmT +tmT qIr oWk qIr @@ -34537,16 +34666,16 @@ pvv pvv fRg hvZ -tHd -xvp -tHd -xvp -tHd -kyD -tHd -kyD -kyD -kyD +iDu +sWW +iDu +sWW +iDu +tmT +iDu +tmT +tmT +tmT qIr oWk qIr @@ -34699,16 +34828,16 @@ aSA pvv fRg hvZ -tHd -kyD -kyD -kyD -kyD -tHd -kyD -kyD -kyD -kyD +iDu +tmT +tmT +tmT +tmT +iDu +tmT +tmT +tmT +tmT qIr akF alS @@ -34861,16 +34990,16 @@ wTz pvv fRg hvZ -kyD -tHd -kyD -kyD -kyD -kyD -kyD -tHd -kyD -kyD +tmT +iDu +tmT +tmT +tmT +tmT +tmT +iDu +tmT +tmT qIr exX qIr @@ -35023,16 +35152,16 @@ dbH wvx fRg hvZ -tHd -kyD -tHd -kyD -kyD -kyD -tHd +iDu +tmT +iDu +tmT +tmT +tmT +iDu rli -aQJ -kyD +gYj +tmT huz huz kLi @@ -35185,16 +35314,16 @@ dCS eoH fRg hvZ -kyD -kyD -tHd -kyD -kyD -tHd -qLS -ofw -jMf -tHd +tmT +tmT +iDu +tmT +tmT +iDu +tpP +vdy +onk +iDu huz huz dLi @@ -35347,16 +35476,16 @@ deV uyI fRg hvZ -kyD -kyD -kyD -kyD -kyD -kyD -tHd -ofw -kop -kyD +tmT +tmT +tmT +tmT +tmT +tmT +iDu +vdy +coD +tmT huz huz huz @@ -35509,17 +35638,17 @@ pti pvv fRg hvZ -tHd -kyD -kyD -kyD -kyD -kyD -tHd -jMf -tHd -kyD -kyD +iDu +tmT +tmT +tmT +tmT +tmT +iDu +onk +iDu +tmT +tmT huz huz huz @@ -35671,18 +35800,18 @@ pvv pvv fRg hvZ -tHd -tHd -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kyD -kyD -kyD +iDu +iDu +tmT +tmT +tmT +tmT +tmT +iDu +iDu +tmT +tmT +tmT lXQ cwZ kAw @@ -35833,18 +35962,18 @@ pvv pvv fRg hvZ -tHd -xvp -tHd -xvp -tHd -tHd -kyD -tHd -kyD -kyD -tHd -kyD +iDu +sWW +iDu +sWW +iDu +iDu +tmT +iDu +tmT +tmT +iDu +tmT jWh cwZ kAw @@ -35996,17 +36125,17 @@ pvv fWq uji iOA -ofw -jMf -tHd -kop -kop -kyD -kyD -tHd -tHd -tHd -tHd +vdy +onk +iDu +coD +coD +tmT +tmT +iDu +iDu +iDu +iDu fpF wSv kAw @@ -36157,9 +36286,9 @@ bxL gGc rzR uji -qrY -qrY -qrY +eoE +eoE +eoE hHR hHR xCz @@ -36319,17 +36448,17 @@ uKZ uKZ uKZ uji -ofw -ofw -jMf -tHd -kop -kop -kyD -kyD -kyD -tHd -kop +vdy +vdy +onk +iDu +coD +coD +tmT +tmT +tmT +iDu +coD gzb sax sax @@ -36472,26 +36601,26 @@ uKZ jLX uKZ uji -tHd -rtZ -tHd -tHd -rtZ -kop -kop -xvp -tHd -jMf -xvp -kop -kop -kop -tHd -kyD -kyD -kyD -tHd -kop +iDu +hgd +iDu +iDu +hgd +coD +coD +sWW +iDu +onk +sWW +coD +coD +coD +iDu +tmT +tmT +tmT +iDu +coD bhN fCs sax @@ -36634,26 +36763,26 @@ qnJ jOi qnJ mkC -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +iDu iMC -kyD -kyD -tHd -tHd -kyD -tHd -kyD -kyD -tHd -kop +tmT +tmT +iDu +iDu +tmT +iDu +tmT +tmT +iDu +coD bhN fCs sax @@ -36796,26 +36925,26 @@ ajy jOi ajy ppS -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd -kop +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +iDu +coD lip sax sax @@ -36958,27 +37087,27 @@ ajy jOi ajy ppS -kyD -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kyD -tHd -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd -ofw +tmT +tmT +tmT +tmT +tmT +tmT +iDu +iDu +tmT +iDu +iDu +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +iDu +vdy sax hrk llZ @@ -37120,27 +37249,27 @@ ajy jOi ajy ppS -tHd -tHd -tHd -kop -aQJ -kop +iDu +iDu +iDu +coD +gYj +coD eyx -kop -tHd -kop -kop -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD +coD +iDu +coD +coD +iDu +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT +tmT grk hrk kAw @@ -37282,26 +37411,26 @@ ajy jOi ajy lGT -jMf -tHd -kop -jMf -sJo -ofw +onk +iDu +coD +onk +guC +vdy etl fLi -gGT -kop -tHd -xvp -kyD -kyD -kyD -tHd -kyD -kyD -kyD -tHd +bFx +coD +iDu +sWW +tmT +tmT +tmT +iDu +tmT +tmT +tmT +iDu oDi nRD kAw @@ -37444,27 +37573,27 @@ bni bni bni uir -ofw -jMf -tHd -kop -jMf -gGT -kop +vdy +onk +iDu +coD +onk +bFx +coD rli -kop -kop -tHd -kyD -kyD -kyD -tHd -kyD -tHd -kyD -kyD -kyD -tHd +coD +coD +iDu +tmT +tmT +tmT +iDu +tmT +iDu +tmT +tmT +tmT +iDu kjX kAw vPr @@ -37609,25 +37738,25 @@ kyD kyD kyD tHd -kyD -kyD -kyD -kyD -kyD -kop -kop -kop -tHd -tHd -jMf -jMf -qLS -ofw -ofw -kop -kyD -kop -hbp +tmT +tmT +tmT +tmT +tmT +coD +coD +coD +iDu +iDu +onk +onk +tpP +vdy +vdy +coD +tmT +coD +kjX kAw llZ nZA @@ -37773,23 +37902,23 @@ fDH kyD tHd kyD -kyD -kyD -kop -kop -kop -kop -jMf -jMf -jMf -qLS -bRU -ofw -kop -mwE -ofw -kyD -hbp +tmT +tmT +coD +coD +coD +coD +onk +onk +onk +tpP +xEx +vdy +coD +dWq +vdy +tmT +kjX kAw kAw jaT @@ -37936,21 +38065,21 @@ kyD kyD kyD kyD -kyD -kyD -kyD -kyD -jMf -ofw -jMf -jMf -jMf -ofw -qLS -kop -kyD -kop -kyD +tmT +tmT +tmT +tmT +onk +vdy +onk +onk +onk +vdy +tpP +coD +tmT +coD +tmT mxr kAw vPr @@ -38099,21 +38228,21 @@ kyD kyD kyD kyD -kyD -tHd -kyD -tHd -tHd -jMf -jMf -jMf -ofw -jMf -ofw -bhB -kop -kop -gss +tmT +iDu +tmT +iDu +iDu +onk +onk +onk +vdy +onk +vdy +sZr +coD +coD +aOk sax sax sax @@ -38262,18 +38391,18 @@ kyD kyD kyD kyD -kyD -kyD -tHd -tHd -jMf -jMf -tHd -jMf -kop -jMf -ofw -ofw +tmT +tmT +iDu +iDu +onk +onk +iDu +onk +coD +onk +vdy +vdy rgy jMf gss @@ -38425,16 +38554,16 @@ kyD kyD tHd kyD -kop -kop -kop -bnD -kop -kop -rgy -tHd -kop -ofw +coD +coD +coD +pKO +coD +coD +kGE +iDu +coD +vdy oxP ofw ofw @@ -38589,13 +38718,13 @@ kyD kyD kyD jMf -jMf -kop -kop -jMf -kop -kop -tHd +onk +coD +coD +onk +coD +coD +iDu jMf jMf jMf diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 1d66a6e0f75c..dd111dd4465b 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -317,6 +317,10 @@ }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/colony_north) +"auz" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "avf" = ( /obj/structure/machinery/light{ dir = 4 @@ -554,9 +558,6 @@ }, /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/construction) -"aNn" = ( -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/interior/power/comms) "aOh" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/kutjevo/colors/cyan, @@ -1259,7 +1260,7 @@ "bTa" = ( /obj/effect/landmark/hunter_secondary, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "bTt" = ( /obj/structure/bed/chair{ dir = 4 @@ -1672,7 +1673,7 @@ dir = 4 }, /turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "cBq" = ( /obj/structure/flora/bush/ausbushes/ausbush{ icon_state = "pointybush_2"; @@ -1786,7 +1787,7 @@ /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/colors, -/area/kutjevo/interior/power) +/area/kutjevo/interior/power/comms) "cIZ" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -2176,6 +2177,10 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) +"ddU" = ( +/obj/structure/platform/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "deo" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -2345,7 +2350,7 @@ /area/kutjevo/exterior/scrubland) "dsp" = ( /turf/open/desert/desert_shore/desert_shore1/north, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "dsN" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 5 @@ -2381,6 +2386,10 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) +"dut" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "duu" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ name = "\improper South Power Shutters" @@ -2627,7 +2636,7 @@ /area/kutjevo/interior/complex/botany) "dJs" = ( /turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "dJT" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -2676,7 +2685,7 @@ dir = 1 }, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "dNI" = ( /obj/structure/platform/kutjevo/rock, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -2700,7 +2709,7 @@ dir = 5 }, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "dQs" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/complex/med/locks) @@ -2718,7 +2727,7 @@ "dQY" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/power) +/area/kutjevo/interior/power/comms) "dRj" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/exterior/runoff_bridge) @@ -3244,6 +3253,10 @@ }, /turf/open/desert/desert_shore/shore_edge1/west, /area/kutjevo/exterior/runoff_bridge) +"exu" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/kutjevo/tan/alt_edge/north, +/area/kutjevo/exterior/lz_pad) "exD" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/bed{ @@ -3356,7 +3369,7 @@ "eDS" = ( /obj/structure/prop/dam/boulder/boulder3, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "eEb" = ( /obj/structure/flora/grass/tallgrass/desert, /obj/structure/blocker/invisible_wall, @@ -3599,6 +3612,9 @@ /obj/structure/girder, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) +"eTY" = ( +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "eUA" = ( /turf/open/floor/kutjevo/tan/grey_edge/north, /area/kutjevo/interior/construction) @@ -3655,6 +3671,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) +"eZS" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_pad) "eZT" = ( /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand/layer1, @@ -3756,7 +3776,7 @@ "ffu" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/power) +/area/kutjevo/interior/power/comms) "ffv" = ( /obj/structure/surface/table/almayer, /obj/item/device/defibrillator, @@ -3969,7 +3989,7 @@ /area/kutjevo/interior/power) "fui" = ( /turf/open/desert/desert_shore/shore_edge1/north, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "fuz" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/power) @@ -4022,7 +4042,11 @@ dir = 1 }, /turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) +"fCu" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "fDY" = ( /obj/structure/platform/kutjevo/smooth/stair_plate, /obj/structure/platform/kutjevo/smooth{ @@ -4216,7 +4240,7 @@ dir = 8 }, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "fRu" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer0, @@ -4253,6 +4277,12 @@ /obj/item/toy/handcard/aceofspades, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_pad) +"fSU" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "fTk" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/colony_South/power2) @@ -4536,6 +4566,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/cyan/inner_corner/north, /area/kutjevo/interior/complex/med) +"gtg" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_pad) "gtr" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -4589,7 +4623,7 @@ /area/kutjevo/interior/complex/med) "gxs" = ( /turf/open/desert/desert_shore/shore_edge1/east, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "gxD" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -4615,7 +4649,7 @@ "gzv" = ( /obj/structure/platform/kutjevo, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "gzI" = ( /obj/structure/platform/kutjevo/rock{ dir = 8 @@ -4979,7 +5013,7 @@ dir = 4 }, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "gYr" = ( /obj/structure/surface/table/almayer, /obj/item/ammo_magazine/shotgun/buckshot{ @@ -5800,6 +5834,9 @@ "iyd" = ( /turf/open/floor/kutjevo/colors/cyan/inner_corner/north, /area/kutjevo/interior/complex/med/operating) +"iyz" = ( +/turf/closed/wall/kutjevo/rock, +/area/kutjevo/exterior/scrubland/south) "iyP" = ( /turf/open/floor/coagulation/icon7_8_2, /area/kutjevo/exterior/scrubland) @@ -6456,7 +6493,7 @@ /area/kutjevo/interior/power/comms) "jvt" = ( /turf/open/desert/desert_shore/desert_shore1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "jvQ" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1 @@ -6785,9 +6822,12 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) +"kcX" = ( +/turf/open/floor/kutjevo/multi_tiles/east, +/area/kutjevo/interior/power/comms) "kdf" = ( /turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "kdK" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_4" @@ -6880,7 +6920,7 @@ "kjo" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "kkB" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/kutjevo/colors/cyan, @@ -7012,6 +7052,10 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/operating) +"ksL" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "ksN" = ( /obj/item/prop/helmetgarb/spent_buckshot, /turf/open/floor/kutjevo/tan, @@ -7034,7 +7078,7 @@ dir = 8 }, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "kut" = ( /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/tan/multi_tiles, @@ -8038,6 +8082,10 @@ /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) +"lUq" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "lUM" = ( /obj/structure/platform/kutjevo/rock{ dir = 1 @@ -8070,7 +8118,7 @@ /area/kutjevo/interior/power) "lVZ" = ( /turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/runoff_dunes) "lXe" = ( /obj/structure/platform/kutjevo/rock{ dir = 1 @@ -8131,7 +8179,7 @@ "mbh" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/desert/desert_shore/shore_edge1/north, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "mbp" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -8260,7 +8308,7 @@ dir = 10 }, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "mhY" = ( /obj/item/device/camera, /obj/structure/blocker/invisible_wall, @@ -8352,7 +8400,7 @@ /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/kutjevo/multi_tiles/north, -/area/kutjevo/interior/power) +/area/kutjevo/interior/power/comms) "msK" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/med_rec) @@ -8613,7 +8661,7 @@ dir = 1 }, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "mGb" = ( /obj/structure/platform/kutjevo/smooth, /turf/open/floor/plating/kutjevo, @@ -8679,7 +8727,7 @@ /area/kutjevo/interior/complex/botany/east) "mIA" = ( /turf/open/gm/river/desert/shallow_edge/east, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "mIB" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 8; @@ -8880,6 +8928,10 @@ "naK" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/oob) +"nba" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_pad) "nbp" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer0, @@ -8948,6 +9000,12 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/construction) +"nhl" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 9 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "nhT" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgibleg" @@ -9002,6 +9060,10 @@ /obj/structure/platform/kutjevo, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_central) +"nlY" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/lz_dunes) "nmw" = ( /obj/structure/surface/table/almayer, /obj/item/paper/janitor, @@ -9350,7 +9412,7 @@ /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) "nJC" = ( /turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "nJY" = ( /obj/structure/machinery/light{ dir = 4 @@ -9423,6 +9485,12 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/kutjevo/colors/orange/tile, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"nMA" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_3" + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "nOx" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32 @@ -9495,6 +9563,7 @@ "nRd" = ( /obj/item/tool/wrench, /obj/item/prop/alien/hugger, +/obj/effect/sentry_landmark/lz_2/bottom_right, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/Northwest_Colony) "nRk" = ( @@ -9551,7 +9620,7 @@ dir = 8 }, /turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "nWu" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -10321,6 +10390,10 @@ /obj/item/device/analyzer/plant_analyzer, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) +"phg" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/exterior/lz_pad) "phv" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -11263,7 +11336,7 @@ "qAk" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan/multi_tiles/north, -/area/kutjevo/interior/power) +/area/kutjevo/interior/power/comms) "qAP" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river/red_pool, @@ -11391,6 +11464,10 @@ "qJx" = ( /turf/open/floor/kutjevo/colors/orange/edge/southwest, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"qJS" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "qKm" = ( /obj/structure/machinery/disposal, /obj/effect/decal/medical_decals{ @@ -11398,6 +11475,12 @@ }, /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/operating) +"qKp" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 9 + }, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland/south) "qLa" = ( /obj/structure/platform/kutjevo{ dir = 4 @@ -11405,6 +11488,9 @@ /obj/structure/platform/kutjevo, /turf/open/gm/river/desert/deep, /area/kutjevo/interior/complex/botany/east_tech) +"qLS" = ( +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland/south) "qLV" = ( /obj/structure/tunnel, /turf/open/auto_turf/sand/layer0, @@ -11422,6 +11508,10 @@ /obj/structure/platform/kutjevo/smooth, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) +"qNS" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/Northwest_Colony) "qOw" = ( /turf/open/gm/river/desert/shallow_edge/southeast, /area/kutjevo/exterior/runoff_river) @@ -11788,7 +11878,7 @@ /area/kutjevo/interior/colony_South/power2) "rsV" = ( /turf/open/desert/desert_shore/desert_shore1/west, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "rte" = ( /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer0, @@ -12239,6 +12329,12 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_central) +"sbg" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 8 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "sbz" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/kutjevo, @@ -12452,7 +12548,7 @@ "sqr" = ( /obj/structure/platform/kutjevo, /turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "sqP" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32 @@ -12511,7 +12607,7 @@ "swl" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "swq" = ( /obj/item/stack/sheet/metal, /turf/open/floor/kutjevo/tan, @@ -12865,6 +12961,12 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/lz_pad) +"sXc" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_4" + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "sXj" = ( /obj/structure/largecrate/random/case/small, /obj/effect/spawner/random/toolbox{ @@ -12920,7 +13022,7 @@ dir = 9 }, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "tax" = ( /turf/open/gm/river/desert/shallow_edge, /area/kutjevo/exterior/runoff_dunes) @@ -13765,7 +13867,7 @@ /area/kutjevo/interior/colony_central) "umQ" = ( /turf/open/desert/desert_shore/shore_edge1/west, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "una" = ( /obj/structure/platform/kutjevo/rock{ dir = 1 @@ -14487,7 +14589,7 @@ "via" = ( /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "vin" = ( /turf/open/floor/coagulation/icon2_0, /area/kutjevo/exterior/lz_river) @@ -14609,7 +14711,7 @@ "vvE" = ( /obj/structure/flora/grass/tallgrass/desert/corner, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "vxe" = ( /turf/open/floor/kutjevo/tan/alt_edge/west, /area/kutjevo/interior/colony_South) @@ -14644,6 +14746,10 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/complex_border/med_rec) +"vAL" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/almayer/research/containment/floor1, +/area/kutjevo/exterior/Northwest_Colony) "vBr" = ( /obj/structure/prop/dam/gravestone{ icon_state = "gravestone2" @@ -14949,6 +15055,10 @@ /obj/structure/platform_decoration/kutjevo, /turf/open/desert/desert_shore/desert_shore1/east, /area/kutjevo/exterior/runoff_river) +"vTp" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/kutjevo/tan/alt_edge/west, +/area/kutjevo/exterior/lz_pad) "vVr" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/colony_S_East) @@ -14987,7 +15097,7 @@ /area/kutjevo/interior/colony_South/power2) "vYC" = ( /turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "vYD" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/colors/cyan, @@ -15021,7 +15131,7 @@ dir = 6 }, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "wax" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/exterior/lz_pad) @@ -15191,6 +15301,9 @@ }, /turf/open/floor/kutjevo/tan/grey_edge/east, /area/kutjevo/interior/complex/Northwest_Dorms) +"wph" = ( +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "wpq" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river/desert/shallow, @@ -15213,6 +15326,9 @@ /obj/structure/bed/chair, /turf/open/gm/dirtgrassborder2/east, /area/kutjevo/exterior/complex_border/med_park) +"wqU" = ( +/turf/closed/wall/kutjevo/colony/reinforced, +/area/kutjevo/exterior/scrubland/south) "wrk" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 @@ -15464,6 +15580,10 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) +"wJy" = ( +/obj/structure/flora/grass/tallgrass/desert, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "wJZ" = ( /obj/structure/flora/grass/desert/lightgrass_4, /obj/structure/blocker/invisible_wall, @@ -15498,6 +15618,10 @@ }, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) +"wMr" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "wMw" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/kutjevo/multi_tiles, @@ -15684,6 +15808,10 @@ /obj/item/clothing/accessory/storage/black_vest, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/power/comms) +"xeG" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_pad) "xfW" = ( /obj/item/reagent_container/glass/bucket, /turf/open/auto_turf/sand/layer0, @@ -16023,7 +16151,7 @@ pixel_y = 14 }, /turf/open/desert/desert_shore/desert_shore1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "xIo" = ( /obj/structure/prop/dam/large_boulder/boulder2, /turf/open/auto_turf/sand/layer0, @@ -16081,6 +16209,12 @@ /obj/structure/barricade/wooden, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/botany) +"xOZ" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "xPU" = ( /obj/effect/landmark/nightmare{ insert_tag = "communications" @@ -16180,7 +16314,7 @@ /area/kutjevo/exterior/scrubland) "xYt" = ( /turf/open/desert/desert_shore/shore_edge1, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "xYR" = ( /obj/item/stack/sheet/wood, /obj/item/storage/belt/marine, @@ -18801,7 +18935,7 @@ kWX kWX lKk lKk -dmy +phg dmy jGF bEt @@ -19303,14 +19437,14 @@ lzD dBj dmy dmy -dmy -lKk -lKk +phg lKk lKk +gtg lKk lKk lKk +eZS lKk lKk lKk @@ -20146,7 +20280,7 @@ fmN fmN fmN jGF -qnd +exu lKk mAb ggC @@ -20980,7 +21114,7 @@ lKk lKk lKk lKk -lKk +eZS lKk cpD mAb @@ -21033,13 +21167,13 @@ mxB mxB tlN ozq -xzY -xzY -xzY -xzY -xzY +boR +boR +boR +boR +boR msF -pyp +tlN dxF dxF vei @@ -21710,7 +21844,7 @@ kMP pmu qzd ubV -wGH +dut vei vei prJ @@ -21745,7 +21879,7 @@ qZO wGH uQJ wGH -vei +nlY wGH wGH wGH @@ -21785,7 +21919,7 @@ rSU rSU lKk rSU -rSU +vTp lKk rSU rSU @@ -21855,7 +21989,7 @@ dxF dsp dJs xIk -bXl +wph tlN uKW moL @@ -21949,13 +22083,13 @@ lKk tHh lKk lKk +xeG lKk lKk lKk lKk lKk -lKk -tHh +nba lKk lKk tHh @@ -22022,7 +22156,7 @@ dxF gxs kjo umQ -bXl +wph fFH rwX boR @@ -22064,7 +22198,7 @@ jqt vei vei wGH -wGH +wMr wGH prJ prJ @@ -22072,10 +22206,10 @@ wGH wGH wGH wGH +lUq wGH wGH -wGH -wGH +lUq wGH wGH vei @@ -22186,10 +22320,10 @@ dxF dxF dxF dxF -sYd -sYd -sYd -sYd +eTY +eTY +eTY +eTY xjf aAe kMP @@ -22213,7 +22347,7 @@ dfa eRE prJ prJ -wGH +dut vei vei gPW @@ -22351,12 +22485,12 @@ dxF dxF dxF dxF -bXl -bXl -sYd -sYd -sYd -sYd +wph +wph +eTY +eTY +eTY +eTY qGQ bNN pPn @@ -22383,7 +22517,7 @@ prJ vei vei vei -prJ +fCu vei wGH wGH @@ -22401,7 +22535,7 @@ wGH szJ wGH wGH -prJ +qJS prJ prJ prJ @@ -22517,13 +22651,13 @@ dxF dxF dxF dxF -bXl -bXl -sYd -sYd -kIn -sYd -sYd +wph +wph +eTY +eTY +qLS +eTY +eTY nOx gTy boR @@ -22573,7 +22707,7 @@ prJ prJ prJ prJ -prJ +qJS prJ prJ wGH @@ -22684,13 +22818,13 @@ dxF dxF dxF dxF -bXl -bXl -sYd -sYd -bXl -sYd -bXl +wph +wph +eTY +eTY +wph +eTY +wph tlN bmk moL @@ -22721,7 +22855,7 @@ vei prJ prJ wGH -wGH +ksL prJ wGH wGH @@ -22851,13 +22985,13 @@ dxF dxF dxF dxF -bXl -kIn -sYd -sYd -bXl -bXl -bXl +wph +qLS +eTY +eTY +wph +wph +wph tlN tWM tWM @@ -22890,7 +23024,7 @@ prJ wGH wGH prJ -prJ +auz prJ prJ wGH @@ -23018,13 +23152,13 @@ dxF dxF dxF dxF -bXl -sYd -sYd -bXl -bXl -bEp -bXl +wph +eTY +eTY +wph +wph +iyz +wph tlN tWM tWM @@ -23185,13 +23319,13 @@ dxF dxF swl mFf -bXl -sYd -bXl -bXl -bXl -bXl -bXl +wph +eTY +wph +wph +wph +wph +wph tlN tWM tWM @@ -23352,13 +23486,13 @@ dxF dxF swl mFf -bXl -sYd -bXl -bXl -bEp -bEp -bEp +wph +eTY +wph +wph +iyz +iyz +iyz tlN tWM tWM @@ -23389,7 +23523,7 @@ wGH jqt jqt wGH -prJ +auz wGH wGH wGH @@ -23519,13 +23653,13 @@ dxF dxF swl mFf -bXl -bXl -bXl -sYd -bEp -bEp -bEp +wph +wph +wph +eTY +iyz +iyz +iyz tlN tlN tlN @@ -23683,16 +23817,16 @@ dxF dxF dxF dxF -dez -dez -hSC -bXl -kIn -kIn -bXl -sYd -kIn -bEp +sbg +sbg +qKp +wph +qLS +qLS +wph +eTY +qLS +iyz tlN tlN tlN @@ -23850,19 +23984,19 @@ hrz hrz dxF dxF -kIn -kIn -bXl -sYd -bXl -bXl -bXl -bXl -sYd -kIn +qLS +qLS +wph +eTY +wph +wph +wph +wph +eTY +qLS bfg bfg -aNn +qLS dSQ wWk mOe @@ -24014,28 +24148,28 @@ hrz hrz hrz hrz -kIn -kIn -bXl -sYd -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -bXl -bXl -sYd -sYd -sYd -sYd -kIn -sYd -sYd +qLS +qLS +wph +eTY +wph +wph +wph +wph +wph +wph +wph +wph +eTY +wph +wph +eTY +eTY +eTY +eTY +qLS +eTY +eTY gzv ezX mZE @@ -24181,28 +24315,28 @@ hrz hrz hrz hrz -kIn -kIn -pEJ -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bXl -bXl -sYd +qLS +qLS +nMA +wph +wph +wph +wph +wph +wph +wph +wph +wph +eTY +eTY +eTY +eTY +eTY +eTY +wph +wph +wph +eTY gzv ezX mZE @@ -24347,29 +24481,29 @@ hrz hrz sVF hrz -bXl -sYd -sYd -bXl -bXl -bXl -bXl -kIn -sYd -sYd -sYd -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -kIn -kIn -sYd -sYd +wph +eTY +eTY +wph +wph +wph +wph +qLS +eTY +eTY +eTY +wph +eTY +eTY +eTY +eTY +eTY +eTY +wph +qLS +qLS +eTY +eTY gzv ezX aCo @@ -24477,12 +24611,12 @@ hrz hrz hrz hrz -iin +qNS huR huR huR lRy -dht +vAL dht dht dht @@ -24513,38 +24647,38 @@ dxF hrz sVF hrz -bXl -bXl -kIn -sYd -sYd -bXl -bXl -kIn -sYd -bXl -sYd -sYd -sYd -bXl -bXl -sYd -bXl -bXl -bXl -bEp -bEp -sYd -sYd -sYd -pBi +wph +wph +qLS +eTY +eTY +wph +wph +qLS +eTY +wph +eTY +eTY +eTY +wph +wph +eTY +wph +wph +wph +iyz +iyz +eTY +eTY +eTY +ddU tlN vlt lsy -kdY -kdY +kcX +kcX cIE -pBV +ezX kMx nWo cBi @@ -24678,32 +24812,32 @@ dxF dxF dxF sVF -kIn -bXl -sYd -kIn -sYd -bXl -bXl -sYd -bXl -kIn -bXl -bXl +qLS +wph +eTY +qLS +eTY +wph +wph +eTY +wph +qLS +wph +wph fui rsV xYt via -bEp -bXl -bEp -bEp -bEp -bEp -bEp -sYd -sYd -sYd +iyz +wph +iyz +iyz +iyz +iyz +iyz +eTY +eTY +eTY sqr tlN tlN @@ -24713,9 +24847,9 @@ ezX tlN tlN tlN -nrk -sYd -bXl +wqU +eTY +wph cTz goT goT @@ -24845,44 +24979,44 @@ dxF dxF kIn kIn -kIn -bXl -sYd -bXl -bXl -bEp -bEp -sYd -bXl -sYd -bXl -bEp +qLS +wph +eTY +wph +wph +iyz +iyz +eTY +wph +eTY +wph +iyz dsp dJs jvt bTa -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -sYd -sYd +iyz +iyz +iyz +iyz +iyz +iyz +iyz +iyz +eTY +eTY fBL -lCa +fSU ktP ktP ktP ktP ktP -ruM -sYd -sYd -sYd -sYd +xOZ +eTY +eTY +eTY +eTY ePx soe gCb @@ -25013,43 +25147,43 @@ kIn sYd aSu sYd -sYd -sYd -bXl -bXl -bEp -sYd -bXl -bXl -kIn -bEp -bEp +eTY +eTY +wph +wph +iyz +eTY +wph +wph +qLS +iyz +iyz gxs kjo umQ -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -kIn -sYd -bXl -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd +iyz +iyz +iyz +iyz +iyz +iyz +iyz +iyz +iyz +qLS +eTY +wph +eTY +eTY +eTY +eTY +eTY +eTY +eTY +eTY +eTY +eTY +eTY cTz cTz cTz @@ -25181,42 +25315,42 @@ bXl sYd sYd sYd -sYd -sYd -bXl -bXl -bXl -bXl -sYd -kIn -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp +eTY +eTY +wph +wph +wph +wph +eTY +qLS +wph +iyz +iyz +iyz +iyz +iyz +iyz +iyz +iyz +iyz swl swl mFf -kIn -sYd -sYd -sYd -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -bXl +qLS +eTY +eTY +eTY +wph +wph +wph +wph +wph +wph +wph +wph +wph +eTY +wph cTz cTz cTz @@ -25349,41 +25483,41 @@ sYd sYd sYd sYd -sYd -sYd -bXl -bXl -bXl -kIn -sYd -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp +eTY +eTY +wph +wph +wph +qLS +eTY +wph +iyz +iyz +iyz +iyz +iyz +iyz +iyz swl swl -dez -dez -eLO -sYd -sYd -sYd -sYd -sYd -bXl -bXl -bXl -bXl -bXl -bXl -sYd -sYd -bXl -bXl +sbg +sbg +nhl +eTY +eTY +eTY +eTY +eTY +wph +wph +wph +wph +wph +wph +eTY +eTY +wph +wph ePx cTz cTz @@ -25516,41 +25650,41 @@ bXl bXl sYd bXl -sYd -sYd -sYd -sYd -bXl -bXl -kIn -kIn -bXl -bEp -bEp -bEp -bEp -bEp -voI +eTY +eTY +eTY +eTY +wph +wph +qLS +qLS +wph +iyz +iyz +iyz +iyz +iyz +wJy swl dNg -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -bXl -bXl -bXl +wph +eTY +eTY +eTY +eTY +eTY +eTY +wph +wph +wph +wph +wph +wph +wph +eTY +wph +wph +wph ePx cTz ePx @@ -25684,41 +25818,41 @@ bXl bXl bEp bEp -kIn -bXl -sYd -bXl -bXl -bXl -kIn -bXl -bXl -bEp -bEp -bEp -bEp +qLS +wph +eTY +wph +wph +wph +qLS +wph +wph +iyz +iyz +iyz +iyz swl -voI +wJy sZZ -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bEp -bXl -bXl -bXl -sYd -sYd -sYd -bEp -bEp -bEp -bEp -bEp +eTY +eTY +eTY +eTY +eTY +eTY +wph +iyz +wph +wph +wph +eTY +eTY +cTz +iyz +iyz +iyz +iyz +iyz xXI cTz ePx @@ -25851,41 +25985,41 @@ bXl bEp bEp bEp -kIn -sYd -bXl -bXl -bXl -bXl -sYd -bXl -bXl -bXl -bEp -bEp -dez -fQJ -eLO -sYd -sYd -sYd -bXl -sYd -bXl -bEp -bEp -bEp -bEp -bEp -nrk -nJC -lVZ -wbV -nrk -bEp -bEp -bEp -bEp +qLS +eTY +wph +wph +wph +wph +eTY +wph +wph +wph +iyz +iyz +sbg +fQJ +nhl +eTY +eTY +eTY +wph +eTY +wph +iyz +iyz +iyz +iyz +iyz +wqU +nJC +lVZ +wbV +wqU +iyz +iyz +iyz +iyz niT ePx ePx @@ -26019,40 +26153,40 @@ bEp bEp bEp bEp -bXl -sYd -bXl -bXl -bXl -sYd -bXl -kIn -sYd -bXl -bXl -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp -sYd +wph +eTY +wph +wph +wph +eTY +wph +qLS +eTY +wph +wph +wph +eTY +eTY +eTY +eTY +eTY +eTY +wph +iyz +iyz +iyz +iyz +iyz +iyz +iyz +cTz cTz cTz ePx ePx -bEp -bEp -bEp +iyz +iyz +iyz niT ePx cTz @@ -26187,39 +26321,39 @@ bEp bEp kIn bXl -sYd -sYd -bXl -sYd -sYd -sYd -bXl -bXl -kIn -kIn -sYd -sYd -sYd -sYd -kIn -bXl -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp +eTY +eTY +wph +eTY +eTY +eTY +wph +wph +qLS +qLS +eTY +eTY +eTY +eTY +qLS +wph +wph +iyz +iyz +iyz +iyz +iyz +iyz +iyz +iyz ePx cTz ePx hii cTz -bEp -bEp -bEp +iyz +iyz +iyz gCb cTz ePx @@ -26355,29 +26489,29 @@ kIn bXl sYd bXl -bXl -sYd -sYd -sYd -bXl -sYd -kIn -sYd -sYd -sYd -sYd -sYd -kIn -kIn +wph +eTY +eTY +eTY +wph +eTY +qLS +eTY +eTY +eTY +eTY +eTY +qLS +qLS jhS jhS jhS -bEp -bEp +iyz +iyz ePx ePx -bEp -bEp +iyz +iyz ePx cTz cTz @@ -26523,19 +26657,19 @@ sYd sYd sYd bXl -bXl -bXl -bXl -sYd -jtJ -sYd -sYd -sYd -sYd -sYd -kIn -kIn -bXl +wph +wph +wph +eTY +sXc +eTY +eTY +eTY +eTY +eTY +qLS +qLS +wph jhS naK jhS @@ -26544,7 +26678,7 @@ prU cTz cTz ePx -bEp +iyz cTz ePx cTz @@ -26690,18 +26824,18 @@ sYd bXl bXl bXl -bXl -bXl -sYd -sYd -sYd -sYd -sYd +wph +wph +eTY +eTY +eTY +eTY +eTY wae gYa dQq -bXl -kIn +wph +qLS jhS jhS iSw @@ -26857,18 +26991,18 @@ bXl bXl bXl bXl -sYd -bEp -sYd -sYd -sYd -sYd -sYd +eTY +iyz +eTY +eTY +eTY +eTY +eTY vvE swl dNg -bXl -bXl +wph +wph uSG oOs naK @@ -27024,18 +27158,18 @@ bEp bEp bXl sYd -bEp -bEp -kIn -sYd -sYd -sYd -sYd +iyz +iyz +qLS +eTY +eTY +eTY +eTY vvE -bEp +iyz dNg -bXl -kIn +wph +qLS uSG trU uRm @@ -27192,17 +27326,17 @@ bEp bXl bXl sYd -bEp -sYd -sYd -sYd -sYd -sYd +iyz +eTY +eTY +eTY +eTY +eTY vvE -bEp +iyz dNg -bXl -sYd +wph +eTY uSG trU uRm @@ -27360,16 +27494,16 @@ bXl bXl bXl sYd -sYd -sYd -sYd -kIn -sYd +eTY +eTY +eTY +qLS +eTY mhN -dez -eLO -bXl -kIn +sbg +nhl +wph +qLS uSG trU uRm @@ -27527,16 +27661,16 @@ bXl bXl bXl sYd -sYd -bXl -sYd -kIn -kIn -sYd -bXl -sYd -bXl -bXl +eTY +wph +eTY +qLS +qLS +eTY +wph +eTY +wph +wph uSG ymc uRm @@ -27694,16 +27828,16 @@ sYd bXl sYd sYd -sYd -sYd -bXl -bXl -kIn +eTY +eTY +wph +wph +qLS eDS -bXl -bXl -bXl -bXl +wph +wph +wph +wph uSG trU uRm @@ -27862,15 +27996,15 @@ sYd sYd sYd bXl -bXl -sYd -bXl -bXl -sYd -bXl -bXl -sYd -bXl +wph +eTY +wph +wph +eTY +wph +wph +eTY +wph uSG lrO kPw @@ -28029,15 +28163,15 @@ sYd sYd bXl sYd -bXl -bEp -bEp -bEp -sYd -bXl -sYd -bXl -sYd +wph +iyz +iyz +iyz +eTY +wph +eTY +wph +eTY jhS jhS iSw @@ -28196,16 +28330,16 @@ sYd sYd sYd kIn -bXl -bEp -bEp -bEp -bEp -bXl -bXl -bXl -bXl -sYd +wph +iyz +iyz +iyz +iyz +wph +wph +wph +wph +eTY jhS naK naK @@ -28363,16 +28497,16 @@ sYd sYd sYd bXl -bEp -bEp -bEp -bEp -bEp -sYd -bXl -bXl -bXl -sYd +iyz +iyz +iyz +iyz +iyz +eTY +wph +wph +wph +eTY jhS naK naK @@ -28530,16 +28664,16 @@ sYd sYd kIn bXl -bEp -bEp -bEp -bEp -bEp -sYd -sYd -bXl -bXl -bXl +iyz +iyz +iyz +iyz +iyz +eTY +eTY +wph +wph +wph jhS jhS jhS @@ -28696,18 +28830,18 @@ sYd sYd pEJ bXl -bEp -bEp -bEp +iyz +iyz +iyz grx -bEp -bEp -bEp -bXl -sYd -bXl -bXl -sYd +iyz +iyz +iyz +wph +eTY +wph +wph +eTY raN raN dDj @@ -28863,18 +28997,18 @@ sYd sYd bXl bXl -bEp -bEp +iyz +iyz grx sXo grx -bEp -bEp -bEp -sYd -bXl -bXl -sYd +iyz +iyz +iyz +eTY +wph +wph +eTY raN raN dDj @@ -29030,19 +29164,19 @@ sYd bXl sYd bXl -bEp -bEp +iyz +iyz grx sXo dgs grx -bEp -bEp -sYd -bXl -bXl -bXl -sYd +iyz +iyz +eTY +wph +wph +wph +eTY ewL plf pIK @@ -29197,14 +29331,14 @@ bXl sYd bXl bXl -bEp -bEp -bEp +iyz +iyz +iyz grx sXo grx -bEp -bEp +iyz +iyz dic tKY tKY @@ -29365,13 +29499,13 @@ bXl bXl bXl sYd -bEp -bEp -bEp +iyz +iyz +iyz grx -bEp -bEp -bEp +iyz +iyz +iyz dKu lKV lKV @@ -29533,11 +29667,11 @@ mda sYd sYd sYd -bEp -bEp -bEp -bEp -bEp +iyz +iyz +iyz +iyz +iyz dKu qny sxy @@ -29701,9 +29835,9 @@ sbX dic dic dic -bEp -bEp -bEp +iyz +iyz +iyz dKu vmB dyz diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index a91c0373595c..14a0d7f584a7 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -11122,6 +11122,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) +"dkq" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/gm/grass/grass1, +/area/lv624/lazarus/landing_zones/lz2) "dkN" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/rock/brown, @@ -13723,6 +13727,10 @@ "iJJ" = ( /turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"iJK" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/plating/asteroidwarning/west, +/area/lv624/lazarus/landing_zones/lz2) "iKp" = ( /obj/structure/surface/rack, /turf/open/shuttle/bright_red, @@ -15489,6 +15497,10 @@ }, /turf/open/floor/whitebluefull, /area/lv624/lazarus/medbay) +"mpW" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/gm/dirt, +/area/lv624/lazarus/landing_zones/lz2) "mqf" = ( /obj/item/tool/wrench, /turf/open/floor/plating, @@ -15816,6 +15828,10 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"nfi" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/gm/dirt, +/area/lv624/lazarus/landing_zones/lz2) "nfD" = ( /obj/effect/landmark/survivor_spawner, /turf/open/gm/dirt, @@ -17506,6 +17522,10 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) +"qnh" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/plating, +/area/lv624/lazarus/landing_zones/lz2) "qns" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, @@ -17821,6 +17841,10 @@ /obj/item/ammo_magazine/smg/mp5, /turf/open/floor/whiteblue/west, /area/lv624/lazarus/corporate_dome) +"qUL" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/plating/asteroidwarning, +/area/lv624/lazarus/landing_zones/lz2) "qUM" = ( /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/west_central_jungle) @@ -18614,6 +18638,10 @@ }, /turf/open/floor/whiteblue/southeast, /area/lv624/lazarus/corporate_dome) +"sBp" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/plating/asteroidfloor/north, +/area/lv624/lazarus/landing_zones/lz2) "sBC" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, @@ -19145,6 +19173,13 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) +"twz" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/plating, +/area/lv624/lazarus/landing_zones/lz2) "twC" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/barrens/east_barrens) @@ -20034,6 +20069,10 @@ /obj/effect/decal/grass_overlay/grass1/inner, /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) +"viY" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/gm/dirtgrassborder/west, +/area/lv624/lazarus/landing_zones/lz2) "vjH" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/grass/grass1, @@ -27834,7 +27873,7 @@ aJF aJF uRE uRE -uRE +viY uRE uRE aJF @@ -28060,7 +28099,7 @@ uzH uzH uzH uzH -uzH +iJK uzH uzH uzH @@ -28522,7 +28561,7 @@ aRg aRg aCi aRg -odw +twz aRg wLz tZD @@ -28751,7 +28790,7 @@ aRg aKO aRg aEw -aRg +qnh wLz tZD aAp @@ -29664,7 +29703,7 @@ aRg aRg aEw aRg -wLz +qUL gef mxW oOf @@ -30119,7 +30158,7 @@ aRg aRg aRg aZT -aRg +qnh wLz lUb tZD @@ -31692,7 +31731,7 @@ aAp nmO aZP aDv -aDv +nfi aDv aRx aXX @@ -31710,7 +31749,7 @@ aDv aDv aDv aOB -wHp +sBp wLz aDv tZD @@ -32153,12 +32192,12 @@ aDv aRx aXX aXX -aXX +dkq aXX aXX azD aEs -aDv +mpW aDv aDv aRx @@ -32616,7 +32655,7 @@ aXX aZP aDv aCI -aDv +mpW aRx twg aXX @@ -32842,7 +32881,7 @@ ado aXX aXX aZP -aDv +nfi aDv aDv aRx diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 02f546e52bda..58ab414b1411 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -56,7 +56,7 @@ req_one_access = null }, /turf/open/floor/plating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "abK" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -366,7 +366,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "apt" = ( /obj/structure/platform/kutjevo/smooth{ climb_delay = 1; @@ -745,6 +745,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) +"aCM" = ( +/obj/structure/surface/rack, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "aCW" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -1044,7 +1048,7 @@ pixel_y = 6 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "aKJ" = ( /obj/item/tool/warning_cone, /obj/structure/prop/invuln/lattice_prop{ @@ -1079,6 +1083,9 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) +"aNT" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "aOg" = ( /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) @@ -2115,7 +2122,7 @@ pixel_y = 17 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "bFV" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -2313,7 +2320,7 @@ "bPk" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "bPl" = ( /obj/structure/bed/chair{ dir = 1 @@ -2597,6 +2604,10 @@ }, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) +"caE" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz2_near) "cba" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, @@ -2667,10 +2678,10 @@ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "cdb" = ( /turf/closed/wall, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "cdc" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/strata/grey_multi_tiles, @@ -2986,7 +2997,7 @@ dir = 9 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "cpF" = ( /obj/structure/barricade/handrail{ desc = "Your platforms look pretty heavy king, let me support them for you."; @@ -3034,7 +3045,7 @@ "crC" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "csb" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/sofa/vert/grey/bot, @@ -3782,7 +3793,7 @@ "cYB" = ( /obj/structure/window_frame/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "cYC" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/gm/dirt, @@ -4550,7 +4561,7 @@ /obj/item/fuel_cell, /obj/item/fuel_cell, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "dJX" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood, @@ -4774,11 +4785,17 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "dUS" = ( /obj/effect/landmark/xeno_spawn, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) +"dVh" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "dVq" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/medical/glass{ @@ -4875,6 +4892,7 @@ /obj/item/reagent_container/glass/bucket/mopbucket{ pixel_x = 11 }, +/obj/effect/sentry_landmark/lz_2/bottom_left, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/eastbeach) "dYX" = ( @@ -4995,6 +5013,12 @@ }, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/interior/caves/north_research) +"edM" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "eea" = ( /obj/vehicle/train/cargo/engine{ dir = 2 @@ -5006,6 +5030,15 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/shiva/yellow/northeast, /area/varadero/interior/technical_storage) +"eev" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "efw" = ( /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) @@ -5187,7 +5220,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/barricade/wooden, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "elP" = ( /turf/open/gm/dirt/desert2, /area/varadero/exterior/monsoon) @@ -5236,7 +5269,7 @@ icon_state = "medium" }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "eov" = ( /turf/open/gm/dirt, /area/varadero/interior_protected/caves/central) @@ -5720,7 +5753,7 @@ pixel_y = 5 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "eGd" = ( /obj/structure/machinery/power/reactor/colony, /obj/structure/machinery/light{ @@ -5818,6 +5851,7 @@ /obj/structure/barricade/handrail/wire{ dir = 4 }, +/obj/effect/sentry_landmark/lz_2/bottom_left, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/eastbeach) "eJS" = ( @@ -5840,7 +5874,7 @@ pixel_y = 9 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "eKL" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -5972,7 +6006,7 @@ pixel_y = 16 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "eQm" = ( /obj/structure/window/framed/wood, /turf/open/floor/wood, @@ -6256,7 +6290,7 @@ "fbr" = ( /obj/effect/landmark/corpsespawner/miner, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "fbw" = ( /obj/structure/prop/ice_colony/dense/planter_box/hydro{ desc = "A high-power hydroelectric generator."; @@ -6384,7 +6418,7 @@ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "feV" = ( /obj/structure/surface/table, /obj/effect/spawner/random/attachment, @@ -6429,7 +6463,7 @@ /obj/structure/surface/rack, /obj/item/tool/wrench, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "fgS" = ( /obj/structure/closet/crate/secure, /obj/effect/landmark/objective_landmark/close, @@ -6513,6 +6547,10 @@ /obj/structure/prop/rock/brown, /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/farocean) +"fjw" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz2_near) "fjx" = ( /obj/structure/bed/chair{ dir = 1 @@ -6848,6 +6886,17 @@ /obj/structure/catwalk, /turf/open/gm/river/desert/deep/no_slowdown, /area/varadero/interior/maintenance/north) +"fyz" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_3"; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "fyH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6951,7 +7000,7 @@ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "fEI" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" @@ -7628,7 +7677,7 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "geK" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1; @@ -7677,7 +7726,7 @@ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "gfk" = ( /obj/structure/girder/displaced, /turf/open/gm/dirt, @@ -7720,7 +7769,7 @@ "gfu" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "gfA" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -7734,7 +7783,7 @@ "gfG" = ( /obj/structure/closet/crate/trashcart, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "ggk" = ( /turf/closed/wall/r_wall/elevator{ dir = 8 @@ -7754,7 +7803,7 @@ "gha" = ( /obj/structure/surface/table, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "ghb" = ( /obj/item/tool/crowbar, /turf/open/floor/shiva/red, @@ -7836,7 +7885,7 @@ pixel_y = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "gjC" = ( /obj/effect/overlay/palmtree_r, /turf/open/gm/dirt, @@ -8065,7 +8114,7 @@ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "gun" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/shiva/purple/east, @@ -8224,7 +8273,7 @@ dir = 1 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "gBi" = ( /obj/item/stool{ icon_state = "stool_alt" @@ -8328,7 +8377,7 @@ "gDh" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "gDr" = ( /obj/item/tool/warning_cone, /turf/open/gm/dirt, @@ -8863,7 +8912,7 @@ pixel_y = 6 }, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "hds" = ( /turf/open/gm/coast/north, /area/varadero/exterior/eastocean) @@ -8898,7 +8947,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "hfo" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -9406,6 +9455,10 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"hCK" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "hCZ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -9500,6 +9553,10 @@ /obj/effect/landmark/hunter_secondary, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"hHz" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "hHE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9535,6 +9592,10 @@ }, /turf/open/floor/wood/wood_broken, /area/varadero/interior/court) +"hIt" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/gm/dirt/desert0, +/area/varadero/exterior/lz2_near) "hJl" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -10048,7 +10109,7 @@ pixel_y = -6 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "icM" = ( /obj/structure/bed/chair{ dir = 8 @@ -10250,7 +10311,7 @@ pixel_y = 16 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "imz" = ( /turf/closed/wall/r_wall/elevator/gears, /area/varadero/interior/records) @@ -10776,7 +10837,7 @@ dir = 5 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "iGm" = ( /turf/open/floor/wood/wood_broken6, /area/varadero/interior/court) @@ -10785,7 +10846,7 @@ dir = 1 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "iGS" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/shiva/multi_tiles/north, @@ -10873,7 +10934,7 @@ "iLc" = ( /obj/structure/surface/table/woodentable, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "iLd" = ( /obj/structure/window/reinforced{ dir = 4; @@ -11199,7 +11260,7 @@ pixel_y = 11 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "iXX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -11303,6 +11364,12 @@ }, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) +"jcl" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "jcr" = ( /turf/closed/wall/rock/brown, /area/varadero/interior_protected/caves/swcaves) @@ -11358,7 +11425,7 @@ pixel_y = 3 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "jeO" = ( /obj/structure/machinery/conveyor, /obj/structure/plasticflaps, @@ -11386,7 +11453,7 @@ "jeW" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "jfn" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -11412,7 +11479,7 @@ pixel_x = 3 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "jfA" = ( /obj/item/device/motiondetector/hacked, /turf/open/floor/carpet, @@ -11638,7 +11705,7 @@ "joV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "jpm" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Underground Maintenance"; @@ -12301,7 +12368,7 @@ dir = 1 }, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "jQa" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/swcaves) @@ -12622,7 +12689,7 @@ "keY" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "kfc" = ( /obj/structure/machinery/storm_siren{ pixel_y = 5 @@ -12765,12 +12832,15 @@ "kkF" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/exterior/farocean) +"kkT" = ( +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "klf" = ( /obj/structure/barricade/wooden{ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "kli" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1; @@ -12861,6 +12931,10 @@ /obj/structure/machinery/light/small, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) +"knR" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "kof" = ( /obj/structure/filingcabinet, /turf/open/floor/shiva/red/northwest, @@ -12917,7 +12991,7 @@ /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "kqN" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/gm/dirt, @@ -13156,16 +13230,16 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"kAz" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "kAH" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass{ icon_state = "sparsegrass_2" }, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) -"kAL" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/north_research) "kAN" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -13192,7 +13266,7 @@ /area/varadero/interior/library) "kBZ" = ( /turf/closed/wall/rock/brown, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "kCb" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/phoron/medium_stack, @@ -13806,7 +13880,7 @@ dir = 10 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "lat" = ( /obj/item/device/camera, /turf/open/floor/plating/icefloor/asteroidplating, @@ -14098,6 +14172,10 @@ }, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) +"lni" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "lnw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -14480,7 +14558,7 @@ }, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "lDz" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/corsat/squareswood/north, @@ -14936,7 +15014,7 @@ "lVc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "lVf" = ( /obj/item/tool/warning_cone{ pixel_x = -9 @@ -15237,7 +15315,7 @@ "mdj" = ( /obj/item/clothing/head/helmet, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "mdy" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1; @@ -15696,7 +15774,7 @@ }, /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "mvI" = ( /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_SE) @@ -15887,7 +15965,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "mCx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -15992,7 +16070,7 @@ "mHh" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "mHM" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -16146,7 +16224,7 @@ pixel_y = 11 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "mOx" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -16449,7 +16527,7 @@ /obj/structure/closet/crate, /obj/item/prop/magazine/dirty/torn/alt, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "mZC" = ( /obj/structure/surface/table/woodentable{ icon_state = "reinf_table" @@ -16524,7 +16602,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "ncn" = ( /obj/item/trash/cheesie, /obj/effect/decal/cleanable/blood, @@ -16994,6 +17072,12 @@ }, /turf/open/floor/asteroidfloor/north, /area/varadero/interior/comms1) +"nAM" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "nBc" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/lz2_near) @@ -17753,7 +17837,7 @@ icon_state = "warning_s" }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "oep" = ( /obj/structure/platform/kutjevo/smooth{ climb_delay = 1; @@ -17910,13 +17994,13 @@ /obj/structure/surface/rack, /obj/item/implantpad, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "okJ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "ola" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, @@ -18104,7 +18188,7 @@ "ouP" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "ouV" = ( /obj/effect/spawner/random/bomb_supply, /turf/open/floor/shiva/yellow/north, @@ -18412,7 +18496,7 @@ /area/varadero/exterior/lz1_near) "oET" = ( /turf/closed/wall/r_wall/unmeltable, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "oEX" = ( /obj/structure/closet/crate, /obj/item/clothing/head/helmet, @@ -18486,7 +18570,7 @@ "oJW" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "oJX" = ( /obj/item/stack/sheet/metal, /obj/structure/shuttle/engine/heater{ @@ -18629,7 +18713,7 @@ /area/varadero/interior/caves/north_research) "oPV" = ( /turf/open/floor/plating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "oRx" = ( /obj/structure/closet/crate/secure, /obj/item/trash/eat, @@ -18918,7 +19002,7 @@ req_one_access = null }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "pbM" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -19005,6 +19089,12 @@ }, /turf/open/floor/shiva/multi_tiles/west, /area/varadero/interior/medical) +"peY" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "pfd" = ( /turf/open/gm/coast/beachcorner/north_east, /area/varadero/exterior/pontoon_beach) @@ -19013,7 +19103,7 @@ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "pfL" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -19166,6 +19256,7 @@ /area/varadero/exterior/eastbeach) "plm" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, +/obj/effect/sentry_landmark/lz_1/bottom_right, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) "plq" = ( @@ -19566,7 +19657,7 @@ /obj/structure/surface/rack, /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "pCa" = ( /obj/structure/blocker/invisible_wall/water, /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -19715,7 +19806,7 @@ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "pIz" = ( /obj/structure/surface/table, /obj/item/trash/plate{ @@ -19923,7 +20014,7 @@ pixel_x = 3 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "pOz" = ( /obj/structure/machinery/computer/card{ dir = 8 @@ -20494,7 +20585,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/remains/human, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "qjU" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -20547,6 +20638,12 @@ /obj/structure/disposalpipe/junction, /turf/open/floor/shiva/floor3, /area/varadero/interior/administration) +"qnl" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "qnm" = ( /obj/structure/closet/emcloset, /turf/open/floor/shiva/yellowfull/west, @@ -20716,7 +20813,7 @@ "quP" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "quR" = ( /obj/item/stack/sheet/metal, /turf/open/floor/wood, @@ -20735,7 +20832,7 @@ }, /obj/structure/surface/rack, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "qvQ" = ( /obj/structure/bed/chair{ dir = 1 @@ -21356,7 +21453,7 @@ "qQd" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "qQe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -21428,7 +21525,7 @@ "qRP" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "qSj" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/yellow, @@ -22008,7 +22105,7 @@ "rpd" = ( /obj/structure/bed/chair, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "rpu" = ( /turf/closed/wall, /area/varadero/interior/oob) @@ -22236,6 +22333,10 @@ /obj/structure/machinery/light, /turf/open/floor/shiva/redfull/west, /area/varadero/interior/security) +"rwO" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "rwP" = ( /obj/structure/closet/crate/ammo/alt/flame, /obj/item/ammo_magazine/shotgun/buckshot, @@ -22271,7 +22372,7 @@ /area/varadero/interior/maintenance/research) "ryD" = ( /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "ryG" = ( /obj/structure/surface/rack, /obj/item/clothing/under/shorts/red{ @@ -22377,7 +22478,7 @@ dir = 1 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "rDK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/item/stack/sheet/metal, @@ -22671,7 +22772,7 @@ "rRq" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "rRz" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/blue/north, @@ -22817,6 +22918,9 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_console/two) +"rVG" = ( +/turf/closed/wall/r_wall, +/area/varadero/interior/maintenance/security/north) "rVI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -22868,7 +22972,7 @@ pixel_y = 11 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "rXf" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/shiva/redcorners, @@ -23243,7 +23347,7 @@ pixel_x = 7 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "slB" = ( /obj/structure/filingcabinet{ density = 0; @@ -23274,7 +23378,7 @@ }, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "smO" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/faxmachine, @@ -23295,7 +23399,7 @@ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "snE" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -23430,7 +23534,7 @@ pixel_y = -3 }, /turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "stK" = ( /obj/structure/blocker/invisible_wall/water, /turf/open/floor/plating/icefloor/asteroidplating, @@ -23555,7 +23659,7 @@ "sxY" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "syb" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/pistol/mod88, @@ -23711,7 +23815,7 @@ "sCA" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "sCJ" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/shiva/north, @@ -23824,7 +23928,7 @@ pixel_y = 16 }, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "sHV" = ( /obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/asteroidfloor/north, @@ -23927,7 +24031,7 @@ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "sKz" = ( /obj/structure/closet/crate/supply, /obj/item/storage/box/wy_mre, @@ -24193,7 +24297,7 @@ pixel_y = 6 }, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "sVH" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice1"; @@ -24555,7 +24659,7 @@ "tkF" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "tkT" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -24585,6 +24689,10 @@ }, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach/lz) +"tkY" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "tlq" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -10; @@ -24612,7 +24720,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "tlT" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/electrical) @@ -24919,7 +25027,7 @@ /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "tCl" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, @@ -24999,7 +25107,7 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "tFX" = ( /obj/structure/closet/secure_closet/security_empty, /obj/item/ammo_box/magazine/shotgun/buckshot, @@ -25094,7 +25202,7 @@ "tLu" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "tLS" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, @@ -25387,7 +25495,7 @@ "tWA" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "tWT" = ( /obj/structure/blocker/invisible_wall/water, /turf/open/gm/coast/west, @@ -25440,7 +25548,7 @@ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "tYP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25850,7 +25958,7 @@ /obj/structure/surface/rack, /obj/item/reagent_container/blood/OMinus, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "uqx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25897,7 +26005,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "usQ" = ( /obj/item/facepaint/sunscreen_stick, /turf/open/gm/dirt, @@ -25948,7 +26056,7 @@ "uvr" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "uvw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25981,7 +26089,7 @@ /obj/structure/surface/rack, /obj/item/tool/screwdriver, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "uwN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26082,6 +26190,10 @@ "uCe" = ( /turf/open/floor/prison/chapel_carpet, /area/varadero/interior/chapel) +"uCG" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "uCJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green, @@ -26105,7 +26217,7 @@ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "uEz" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -26416,10 +26528,16 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/north) "uTu" = ( /turf/open/gm/coast/beachcorner/south_east, /area/varadero/exterior/pontoon_beach) +"uTy" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "uTA" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/squareswood/north, @@ -26580,6 +26698,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"uYT" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "uZa" = ( /obj/structure/machinery/light{ dir = 4 @@ -26638,6 +26760,11 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"vbK" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "vbS" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2"; @@ -26867,7 +26994,7 @@ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "viP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26950,7 +27077,7 @@ "vlw" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "vlB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/gm/dirt, @@ -26972,6 +27099,13 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"vmC" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior_protected/caves/swcaves) "vmY" = ( /obj/item/stack/rods, /obj/item/shard{ @@ -27342,6 +27476,10 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/redfull/west, /area/varadero/interior/hall_SE) +"vAU" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "vAZ" = ( /obj/item/facepaint/sunscreen_stick, /turf/open/gm/dirt/desert0, @@ -27584,6 +27722,10 @@ "vHs" = ( /turf/closed/wall/r_wall, /area/varadero/interior/records) +"vHV" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "vHY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27616,7 +27758,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "vKv" = ( /obj/structure/window/framed/colony/reinforced/hull{ explo_proof = 1 @@ -28011,7 +28153,7 @@ "vXx" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "vXG" = ( /obj/structure/closet/crate/construction, /obj/item/grown/log, @@ -28395,7 +28537,7 @@ "wjV" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "wkp" = ( /obj/structure/platform/kutjevo/smooth{ dir = 1; @@ -28442,6 +28584,12 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/technical_storage) +"wkL" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "wkM" = ( /obj/structure/window/reinforced{ dir = 4; @@ -28521,7 +28669,7 @@ dir = 1 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "wno" = ( /turf/open/floor/shiva/green/north, /area/varadero/interior/mess) @@ -28646,7 +28794,7 @@ /area/varadero/interior/bunks) "wqb" = ( /turf/closed/wall/r_wall, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "wqc" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -29080,7 +29228,7 @@ "wMn" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "wMw" = ( /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) @@ -29362,11 +29510,11 @@ dir = 4 }, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "wXu" = ( /obj/structure/surface/rack, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "wXC" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor/asteroidplating, @@ -29594,6 +29742,10 @@ /obj/item/storage/belt/utility, /turf/open/floor/shiva/floor3, /area/varadero/interior/cargo) +"xju" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "xka" = ( /obj/structure/window/framed/colony/reinforced{ color = "#aba9a9" @@ -29682,7 +29834,7 @@ pixel_y = 16 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "xpw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/circuitboard/computer/crew{ @@ -29900,7 +30052,7 @@ "xxs" = ( /obj/structure/closet/crate, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "xxE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29970,7 +30122,7 @@ "xza" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "xzc" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/dirt/desert0, @@ -30196,7 +30348,7 @@ /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "xJx" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light{ @@ -30210,7 +30362,7 @@ /area/varadero/exterior/lz2_near) "xJZ" = ( /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "xKo" = ( /obj/structure/surface/table, /obj/item/storage/wallet/random{ @@ -30321,6 +30473,10 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) +"xNc" = ( +/obj/structure/machinery/power/apc/no_power/north, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "xNw" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/carpet, @@ -30657,7 +30813,7 @@ pixel_y = 11 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "ybY" = ( /obj/structure/surface/table, /obj/item/paper_bin, @@ -30727,7 +30883,7 @@ /obj/item/reagent_container/glass/bucket/mopbucket, /obj/item/tool/mop, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "yeG" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/frame/camera, @@ -31990,9 +32146,9 @@ xCn oPQ xCn cBI -xCn -xCn -ljt +jQa +jQa +vmC pGs pGs pGs @@ -32172,10 +32328,10 @@ xCn oPQ xCn cBI -xCn -oPQ -oPQ -xCn +jQa +rgz +rgz +jQa pGs pGs pGs @@ -32354,12 +32510,12 @@ xCn srg xCn cBI -xCn -xCn -oPQ -kAL -xCn -fHk +jQa +jQa +rgz +qwE +jQa +abL jQa jQa jQa @@ -32536,12 +32692,12 @@ srg srg xCn fzc -xCn -oVt -xCn -xCn -kAL -xCn +jQa +uCG +jQa +jQa +qwE +jQa gxQ jQa jQa @@ -32718,12 +32874,12 @@ tqh tqh tqh uJT -srg -xCn -xCn -xCn -xCn -xCn +geo +jQa +jQa +jQa +jQa +jQa jQa jQa jQa @@ -32900,12 +33056,12 @@ mEA sBk ksn pGc -srg -xCn -xCn -xCn -xCn -xCn +geo +jQa +jQa +jQa +jQa +jQa jQa jQa jQa @@ -33082,12 +33238,12 @@ aJc hDA xrA pGc -srg -xCn -xCn -xCn -xCn -xCn +geo +jQa +jQa +jQa +jQa +jQa jQa jQa jQa @@ -33264,17 +33420,17 @@ gwC hDA tMx tqh -dxK -xCn -xCn -xCn -xCn -xCn -vYW -vYW -vYW -vYW -hto +xZa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +gxQ pGs jQa jQa @@ -33446,12 +33602,12 @@ gwC odD rjE fay -qul -qul -uHY -xCn -xCn -srg +pGs +pGs +gxQ +jQa +vYW +neq vYW vYW vYW @@ -33629,8 +33785,8 @@ ftA fay fay fay -ebr -ebr +pGs +pGs pKK vYW loA @@ -33811,8 +33967,8 @@ hBX eEY xhx fay -ebr -ebr +pGs +pGs vYW vYW hto @@ -33993,9 +34149,9 @@ eWR oXi gEy fay -ebr -ebr -ebr +pGs +pGs +pGs vYW vYW vYW @@ -34175,9 +34331,9 @@ izs oyi wvI fay -ebr -ebr -ebr +pGs +pGs +pGs vYW vYW uQa @@ -34357,8 +34513,8 @@ ltW qQF okB fay -ebr -ebr +pGs +pGs vYW vYW uQa @@ -34539,7 +34695,7 @@ ltW qQF eXr fay -ebr +pGs vYW neq vYW @@ -41565,11 +41721,11 @@ wMw wMw wMw wMw +tkY wMw wMw wMw -wMw -wMw +tkY wMw kME wMw @@ -41932,15 +42088,15 @@ wMw wMw wMw wMw -wMw +tkY wMw wMw nFB wMw sIQ +lni wMw -wMw -wMw +lni wMw oJm hyr @@ -42304,7 +42460,7 @@ wMw wMw wMw wMw -wMw +lni sTT bgE jTL @@ -44669,7 +44825,7 @@ miF mrC wMw wMw -wMw +hHz wMw xVQ kyz @@ -45190,15 +45346,18 @@ fZB asx wMw wMw +rwO wMw wMw wMw wMw +rwO wMw wMw wMw wMw wMw +rwO wMw wMw wMw @@ -45207,10 +45366,7 @@ wMw wMw wMw wMw -wMw -wMw -wMw -wMw +hHz wMw wMw mrC @@ -50156,19 +50312,19 @@ ftF bEX pnL juW -gDh -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -gDh -uEc -viK +vAU +kkT +kkT +kkT +kkT +kkT +kkT +vAU +nAM +jcl gAV -xJZ -wqb +kkT +rVG kBZ hPj wVf @@ -50338,19 +50494,19 @@ eFJ trh qdk wUj -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -viK +kkT +kkT +kkT +kkT +kkT +kkT +kkT +kkT +kkT +jcl gAV -xJZ -wqb +kkT +rVG kBZ hPj wVf @@ -50520,19 +50676,19 @@ hus wuR rVS kSN -lVc -lVc -lVc -lVc -lVc +uYT +uYT +uYT +uYT +uYT uTq -lVc -lVc -lVc +uYT +uYT +uYT qRP -xJZ -xJZ -wqb +kkT +kkT +rVG kBZ wVf wVf @@ -50703,18 +50859,18 @@ trh qdk wUj gtz -sKu -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ +edM +kkT +kkT +kkT +kkT +kkT +kkT +kkT mvA -xJZ -xJZ -wqb +kkT +kkT +rVG kBZ wVf swj @@ -50884,19 +51040,19 @@ ktN che qdk juW -wqb +rVG crC -xJZ -ryD -xJZ -ryD +kkT +aNT +kkT +aNT joV -wqb -wqb -viK -xJZ +rVG +rVG +jcl +kkT tBm -wqb +rVG kBZ wVf unw @@ -51069,16 +51225,16 @@ juW kBZ kBZ joV -keY -xJZ -ryD -ryD -ryD -ryD -viK -xJZ -wXu -wqb +kAz +kkT +aNT +aNT +aNT +aNT +jcl +kkT +aCM +rVG kBZ wVf wVf @@ -51251,16 +51407,16 @@ juW kBZ kBZ kBZ -xJZ +kkT quP -ryD +aNT fbr -ryD -ryD -viK +aNT +aNT +jcl sHO -ryD -wqb +aNT +rVG kBZ hPj wVf @@ -51433,16 +51589,16 @@ juW kBZ kBZ kBZ -xJZ -xJZ -ryD -ryD -ryD -ryD -viK -xJZ -ryD -ryD +kkT +kkT +aNT +aNT +aNT +aNT +jcl +kkT +aNT +aNT kBZ hPj hHR @@ -51617,14 +51773,14 @@ wOO wOO kBZ kBZ -ryD -ryD -ryD -ryD +aNT +aNT +aNT +aNT lDm -xJZ +kkT joV -ryD +aNT kBZ hPj wVf @@ -51800,12 +51956,12 @@ wOO kBZ kBZ kBZ -ryD +aNT kBZ -wqb +rVG smE -xJZ -ryD +kkT +aNT jeW joV hPj @@ -51984,12 +52140,12 @@ kBZ kBZ kBZ kBZ -wqb -viK -xJZ -ryD -ryD -ryD +rVG +jcl +kkT +aNT +aNT +aNT wVf wVf rpT @@ -52166,12 +52322,12 @@ hlp kBZ kBZ kBZ -wqb -viK -xJZ -ryD -ryD -ryD +rVG +jcl +kkT +aNT +aNT +aNT sPs cYa lVB @@ -52347,13 +52503,13 @@ tlT mQh kBZ kBZ -ryD +aNT hcI -wXs -xJZ -ryD -ryD -ryD +qnl +kkT +aNT +aNT +aNT sPs etE swi @@ -52528,14 +52684,14 @@ cuc tlT mrT kBZ -ryD -ryD -ryD -wXs -xJZ -ryD -ryD -ryD +aNT +aNT +aNT +qnl +kkT +aNT +aNT +aNT wVf wVf pIC @@ -52711,20 +52867,20 @@ eGL mrT kBZ tkF -ryD -ryD -wXs -xJZ -ryD -ryD +aNT +aNT +qnl +kkT +aNT +aNT eyt eyt -wVf +ouy wVf wVf wVf eyt -wqb +ouy wXu viK xJZ @@ -52893,20 +53049,20 @@ sdZ hwZ kBZ kBZ -ryD -ryD +aNT +aNT apj -xJZ -ryD -ryD -kbQ +kkT +aNT +aNT +aNT kbQ eyt eyt eyt eyt eyt -wqb +ouy xJZ viK xJZ @@ -53078,17 +53234,17 @@ wOO oSX wOO jPM -xJZ -xJZ -ryD -lFk +kkT +kkT +aNT +vHV kbQ kbQ eyt eyt jqw eyt -wqb +ouy xJZ viK xJZ @@ -53259,18 +53415,18 @@ eGd pkT pAZ wOO -rWY -xJZ -xJZ -ryD -kbQ +fyz +kkT +kkT +aNT +aNT kbQ kbQ kbQ jqw kbQ eyt -wqb +ouy rDD wng lVc @@ -53441,18 +53597,18 @@ fEu fEu pCO oSX -viK -xJZ -xJZ -wqb -tVj +jcl +kkT +kkT +rVG +kkT kbQ kbQ kbQ kbQ kbQ lFk -bPk +lFE xJZ viK xJZ @@ -53623,18 +53779,18 @@ lur fEu thp oSX -viK -xJZ -ryD -ryD -tVj +jcl +kkT +aNT +aNT +kkT kbQ jqw kbQ kbQ kbQ ofC -uvr +nZP xJZ viK xJZ @@ -53806,17 +53962,17 @@ fEu thp oSX mZk -xJZ -xJZ +kkT +kkT imu +kkT tVj tVj tVj tVj tVj tVj -tVj -uvr +nZP xJZ viK xJZ @@ -53987,18 +54143,18 @@ cbg fEu swM wOO -viK -xJZ -xJZ -wqb -tVj +jcl +kkT +kkT +rVG +kkT tVj qIF kbQ qIF tTU kbQ -uvr +nZP xJZ viK gDh @@ -54169,18 +54325,18 @@ osr aDZ aDZ nOg -pfr -lVc -lVc -iFZ -kbQ +uTy +uYT +uYT +dVh +aNT kbQ kbQ kbQ kbQ sgk eyt -wqb +ouy xJZ viK xJZ @@ -54353,16 +54509,16 @@ rrr wOO fga uwJ -xJZ -viK -kbQ +kkT +jcl +aNT kbQ qIF kbQ qIF uet eyt -wqb +ouy rpd viK xJZ @@ -54534,17 +54690,17 @@ mEB mEB oSX dJI -xJZ -xJZ -viK -ryD +kkT +kkT +jcl +aNT ouy ofC qIF jJf cFz eyt -wqb +ouy xJZ viK xJZ @@ -54572,7 +54728,7 @@ eyt eyt eyt wqb -xJZ +xNc viK xJZ xJZ @@ -54715,18 +54871,18 @@ wOO wOO wOO wOO -wqb -xJZ -xJZ -viK -xJZ +rVG +kkT +kkT +jcl +kkT tCA kbQ kbQ vcR eyt eyt -wqb +ouy xJZ viK xJZ @@ -54848,10 +55004,10 @@ wlB aQN wlB wlB -bbK +vbK wlB iQr -iQr +caE bSQ qNu wlB @@ -54897,18 +55053,18 @@ kBZ kBZ kBZ kBZ -wqb -gDh -xJZ -viK -xJZ +rVG +vAU +kkT +jcl +kkT tCA kbQ kbQ eyt eyt eyt -wqb +ouy xJZ viK wXu @@ -55079,10 +55235,10 @@ kBZ kBZ kBZ kBZ -wqb -rDD -xJZ -viK +rVG +wkL +kkT +jcl stw ouy kbQ @@ -55090,7 +55246,7 @@ kbQ kbQ eyt eyt -wqb +ouy rDD viK gha @@ -55197,7 +55353,7 @@ wlB wlB lTg wlB -wlB +knR wlB wlB jwX @@ -55261,18 +55417,18 @@ kBZ kBZ kBZ kBZ -wqb +rVG bFD -xJZ -viK -xJZ +kkT +jcl +kkT lFE kbQ kbQ kbQ eyt eyt -wqb +ouy xJZ viK xJZ @@ -55373,7 +55529,7 @@ dYd wlB kAH lTg -wlB +knR wlB wlB wlB @@ -55383,7 +55539,7 @@ wlB lTg wlB wlB -mdg +hIt wlB beK cVq @@ -55443,18 +55599,18 @@ kBZ kBZ kBZ kBZ -wqb -wqb -xJZ -viK -sKu +rVG +rVG +kkT +jcl +edM ouy kbQ kbQ kbQ eyt eyt -wqb +ouy rWY viK xJZ @@ -55626,17 +55782,17 @@ kBZ kBZ kBZ kBZ -wqb -xJZ -viK -gDh +rVG +kkT +jcl +vAU ouy sgk kbQ qIF eyt eyt -wqb +ouy oJW viK xJZ @@ -55761,7 +55917,7 @@ wlB wlB tfc tCV -iQr +caE wlB ghW wlB @@ -55802,23 +55958,23 @@ apH iQS vVH kBZ -wqb -wqb -wqb -wqb +vVH +vVH +vVH +vVH kBZ kBZ -wqb -xJZ -viK -gDh +rVG +kkT +jcl +vAU lFE sgk kbQ jqw eyt eyt -wqb +ouy xJZ viK xJZ @@ -55950,7 +56106,7 @@ wlB wlB nCl wlB -xmL +eev cFw cFw cFw @@ -55988,18 +56144,18 @@ rql qcD kAl vVH -wqb +vVH kBZ -wqb -xJZ -viK +rVG +kkT +jcl klf ouy kbQ sgk kbQ eyt -wqb +ouy xxs xJZ viK @@ -56171,17 +56327,17 @@ iQS iQS tkr imu -xJZ -xJZ -xJZ -viK -xJZ +kkT +kkT +kkT +jcl +kkT ouy tCA kbQ tCA -wqb -wqb +ouy +ouy xJZ xJZ viK @@ -56352,17 +56508,17 @@ pDW pDW pDW pDW -lVc -lVc -lVc -lVc -pfr -lVc -lVc -lVc -lVc -lVc -lVc +uYT +uYT +uYT +uYT +uTy +uYT +uYT +uYT +uYT +uYT +uYT pbw lVc lVc @@ -56534,16 +56690,16 @@ iQS axs iQS iQS -xJZ -xJZ -xJZ -xJZ -xJZ -ryD -ryD +kkT +kkT +kkT +kkT +kkT +aNT +aNT oPV -xJZ -xJZ +kkT +kkT eKF bPk xJZ @@ -56717,14 +56873,14 @@ vVH vVH vVH gfu -xJZ -xJZ +kkT +kkT gfu -sny +peY sVr -ryD -ryD -xJZ +aNT +aNT +kkT iLc dUL bPk @@ -57952,7 +58108,7 @@ kgp kgp kgp wlB -cFw +xju cFw xmL cFw @@ -58862,7 +59018,7 @@ hPq kgp nCl wlB -nwq +hCK cFw ihY ihY @@ -59406,7 +59562,7 @@ aQN tMZ pvQ lTg -aQN +fjw wlB kyp cFh diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 886f1ee7c1b9..fa20f05f5e1d 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -20396,6 +20396,10 @@ /obj/structure/surface/table/woodentable, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outpost/canteen) +"caw" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "cay" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -23681,6 +23685,10 @@ }, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) +"epz" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) "eqO" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -26643,6 +26651,10 @@ /obj/structure/prop/dam/drill, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/crash) +"jpC" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "jqg" = ( /obj/structure/surface/rack, /obj/item/book/manual/detective, @@ -28529,6 +28541,10 @@ /obj/structure/sign/safety/maint, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/engineering/parts_storage) +"mpU" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "mqs" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/multi_tiles/southwest, @@ -29130,6 +29146,10 @@ /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/plating, /area/strata/ug/interior/jungle/carplake/north) +"nxc" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/marsh/water_marshes) "nxh" = ( /obj/structure/surface/rack, /obj/item/paper_bin, @@ -29761,6 +29781,10 @@ "oKo" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/engi) +"oKr" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "oKV" = ( /obj/structure/machinery/light{ dir = 1 @@ -30367,6 +30391,10 @@ }, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/research) +"pAZ" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "pDb" = ( /obj/structure/dropship_equipment/sentry_holder, /turf/open/floor/strata/floor3/east, @@ -34760,6 +34788,10 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"xgU" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "xhA" = ( /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/strata/orange_cover, @@ -40865,7 +40897,7 @@ aac wXw qPu uhM -wXw +nxc rNI rNI bvE @@ -41042,7 +41074,7 @@ uTt tJX bvE rNI -bvE +jpC rNI bxh aac @@ -41391,7 +41423,7 @@ aac aac bwA rNI -rNI +oKr bvE bvE bwv @@ -41757,7 +41789,7 @@ bvE bvD mcX rxL -bvD +caw bvE rNI bvE @@ -41928,7 +41960,7 @@ bxC bvD bvD bvD -bvD +caw bvM mcX rxL @@ -42110,7 +42142,7 @@ bwt bwb jLc bwt -bwt +epz bwt aac aac @@ -44006,7 +44038,7 @@ buK tFA wSb wSb -bvE +pAZ bvD bvD bvD @@ -44707,7 +44739,7 @@ wSb tFA rni bvD -bvE +pAZ bvE bvE xTU @@ -45059,7 +45091,7 @@ wSb bvD bvD bvD -bvD +xgU bvD xTU bwt @@ -45946,7 +45978,7 @@ kBL bwt bvE bvE -bvD +mpU bvD bwI bxH @@ -46126,7 +46158,7 @@ bvD bvD bvD bvE -bvD +mpU bvD bvE bvE @@ -46298,7 +46330,7 @@ naw bvE bvE bvD -bvD +mpU bvD bvE bvE From 674cd37d5651999b0a49c8c0d6b323cbff5edc67 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:11:42 +0000 Subject: [PATCH 10/15] Automatic changelog for PR #7363 [ci skip] --- html/changelogs/AutoChangeLog-pr-7363.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-7363.yml diff --git a/html/changelogs/AutoChangeLog-pr-7363.yml b/html/changelogs/AutoChangeLog-pr-7363.yml new file mode 100644 index 000000000000..bf3481cc8bfe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-7363.yml @@ -0,0 +1,8 @@ +author: "Nanu, HarryOb, Spartanbobby" +delete-after: True +changes: + - rscadd: "Added a feature that will delete weeds in the surrounding area of the Marines selected landing zone, and keep them subject to be unweedable for the next eight minutes." + - balance: "Maps currently affected by this change/test - Big Red, LV-624, Kutjevo, New Varadero, Sorokyne Strata, Prison Station Science Annex, Shiva's Snowball." + - maptweak: "Slight area tweaks and changes to allow more subjective control over areas." + - maptweak: "Big Red, South West Cave now has timed blockers to hinder a SW hive and Marines alike from going a straight line to attack each other. These blockers dissappear in a \"cavein\" at fourty minutes, Roughly on average twenty minutes after marines land." + - balance: "Queens can only ovi and build the hivecore on \"their\" side of the map at roundstart, this protection drops off 25min from roundstart." \ No newline at end of file From f186329f1a70615ae85b92d9da17fcda10d08758 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:02:25 -0400 Subject: [PATCH 11/15] Plasma Caster Fix (#7425) # About the pull request The plasma caster properly unequips, where previously it would fail to unregister the firing signals # Explain why it's good for the game The game thought you would fire the plasma caster whenever you clicked even if it was stored # Changelog :cl: fix: Fixes chat showing "You fire the plasma caster" when firing an energy weapon after equipping the plasma caster /:cl: --- code/modules/cm_preds/yaut_weapons.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index 01e063d31380..c66263ba96f8 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -1229,7 +1229,7 @@ force = 0 fire_delay = 3 flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT - flags_item = NOBLUDGEON|DELONDROP|IGNITING_ITEM //Can't bludgeon with this. + flags_item = NOBLUDGEON|IGNITING_ITEM //Can't bludgeon with this. flags_gun_features = GUN_UNUSUAL_DESIGN has_empty_icon = FALSE explo_proof = TRUE @@ -1353,7 +1353,6 @@ if(source) forceMove(source) source.caster_deployed = FALSE - return ..() /obj/item/weapon/gun/energy/yautja/plasma_caster/able_to_fire(mob/user) From 6d2399f865291f3b4e849e7f7207f1f652073b8e Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:17:04 +0000 Subject: [PATCH 12/15] Automatic changelog for PR #7425 [ci skip] --- html/changelogs/AutoChangeLog-pr-7425.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-7425.yml diff --git a/html/changelogs/AutoChangeLog-pr-7425.yml b/html/changelogs/AutoChangeLog-pr-7425.yml new file mode 100644 index 000000000000..33ded0916f19 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-7425.yml @@ -0,0 +1,4 @@ +author: "BeagleGaming1" +delete-after: True +changes: + - bugfix: "Fixes chat showing \"You fire the plasma caster\" when firing an energy weapon after equipping the plasma caster" \ No newline at end of file From 19dbe58feaead91c7dc67d4ecfc200a12bf42c48 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 01:37:35 +0000 Subject: [PATCH 13/15] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-7363.yml | 8 ------ html/changelogs/AutoChangeLog-pr-7418.yml | 4 --- html/changelogs/AutoChangeLog-pr-7419.yml | 5 ---- html/changelogs/AutoChangeLog-pr-7420.yml | 4 --- html/changelogs/AutoChangeLog-pr-7422.yml | 4 --- html/changelogs/AutoChangeLog-pr-7425.yml | 4 --- html/changelogs/AutoChangeLog-pr-7429.yml | 5 ---- html/changelogs/archive/2024-10.yml | 30 +++++++++++++++++++++++ 8 files changed, 30 insertions(+), 34 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-7363.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-7418.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-7419.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-7420.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-7422.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-7425.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-7429.yml diff --git a/html/changelogs/AutoChangeLog-pr-7363.yml b/html/changelogs/AutoChangeLog-pr-7363.yml deleted file mode 100644 index bf3481cc8bfe..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7363.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "Nanu, HarryOb, Spartanbobby" -delete-after: True -changes: - - rscadd: "Added a feature that will delete weeds in the surrounding area of the Marines selected landing zone, and keep them subject to be unweedable for the next eight minutes." - - balance: "Maps currently affected by this change/test - Big Red, LV-624, Kutjevo, New Varadero, Sorokyne Strata, Prison Station Science Annex, Shiva's Snowball." - - maptweak: "Slight area tweaks and changes to allow more subjective control over areas." - - maptweak: "Big Red, South West Cave now has timed blockers to hinder a SW hive and Marines alike from going a straight line to attack each other. These blockers dissappear in a \"cavein\" at fourty minutes, Roughly on average twenty minutes after marines land." - - balance: "Queens can only ovi and build the hivecore on \"their\" side of the map at roundstart, this protection drops off 25min from roundstart." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7418.yml b/html/changelogs/AutoChangeLog-pr-7418.yml deleted file mode 100644 index 4a98d2f71ea0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7418.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "harryob" -delete-after: True -changes: - - bugfix: "stops a crisis in the part fabricator point economy by preventing infinite money generation through cancelling items in the queue" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7419.yml b/html/changelogs/AutoChangeLog-pr-7419.yml deleted file mode 100644 index 6834aa7b3b8a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7419.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Blundir" -delete-after: True -changes: - - rscadd: "new minimap icons for numerous things" - - bugfix: "fixed squads having incorrect colors on minimap" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7420.yml b/html/changelogs/AutoChangeLog-pr-7420.yml deleted file mode 100644 index da3fc6ff17e0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7420.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "joookschad" -delete-after: True -changes: - - qol: "Toy mechs will now fit into storage." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7422.yml b/html/changelogs/AutoChangeLog-pr-7422.yml deleted file mode 100644 index 92b53a40f259..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7422.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Joe lampost" -delete-after: True -changes: - - bugfix: "Changes what armor is spawned from the pred vendor" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7425.yml b/html/changelogs/AutoChangeLog-pr-7425.yml deleted file mode 100644 index 33ded0916f19..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7425.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BeagleGaming1" -delete-after: True -changes: - - bugfix: "Fixes chat showing \"You fire the plasma caster\" when firing an energy weapon after equipping the plasma caster" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7429.yml b/html/changelogs/AutoChangeLog-pr-7429.yml deleted file mode 100644 index 03822d634e03..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7429.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "BeagleGaming1" -delete-after: True -changes: - - bugfix: "Bracer attachments get properly deleted on bracer destruction" - - bugfix: "One bracer attachment cannot be attached to both bracer attachment slots" \ No newline at end of file diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml index 9d72ca7ca5bf..a3f872914464 100644 --- a/html/changelogs/archive/2024-10.yml +++ b/html/changelogs/archive/2024-10.yml @@ -414,3 +414,33 @@ - bugfix: SMES units made explosion proof ihatethisengine: - balance: limbs are now only be delimb-able if they were fractured BEFORE the hit +2024-10-30: + BeagleGaming1: + - bugfix: Fixes chat showing "You fire the plasma caster" when firing an energy + weapon after equipping the plasma caster + - bugfix: Bracer attachments get properly deleted on bracer destruction + - bugfix: One bracer attachment cannot be attached to both bracer attachment slots + Blundir: + - rscadd: new minimap icons for numerous things + - bugfix: fixed squads having incorrect colors on minimap + Joe lampost: + - bugfix: Changes what armor is spawned from the pred vendor + Nanu, HarryOb, Spartanbobby: + - rscadd: Added a feature that will delete weeds in the surrounding area of the + Marines selected landing zone, and keep them subject to be unweedable for the + next eight minutes. + - balance: Maps currently affected by this change/test - Big Red, LV-624, Kutjevo, + New Varadero, Sorokyne Strata, Prison Station Science Annex, Shiva's Snowball. + - maptweak: Slight area tweaks and changes to allow more subjective control over + areas. + - maptweak: Big Red, South West Cave now has timed blockers to hinder a SW hive + and Marines alike from going a straight line to attack each other. These blockers + dissappear in a "cavein" at fourty minutes, Roughly on average twenty minutes + after marines land. + - balance: Queens can only ovi and build the hivecore on "their" side of the map + at roundstart, this protection drops off 25min from roundstart. + harryob: + - bugfix: stops a crisis in the part fabricator point economy by preventing infinite + money generation through cancelling items in the queue + joookschad: + - qol: Toy mechs will now fit into storage. From ee281c52463e5bd39e2b58d274d5a348a65b473d Mon Sep 17 00:00:00 2001 From: spartanbobby <71467726+spartanbobby@users.noreply.github.com> Date: Wed, 30 Oct 2024 18:23:29 +0000 Subject: [PATCH 14/15] Almayer Mapping: Psychiatric Care Unit (#7434) # About the pull request This PR adds a new room to the upper medical "Psychiatric Care Unit" deeply inspired by alien Dark descent this area aims to provide a place for the stressed marine to unwind This RP also rearranges the upper medical to accommodate this new room ![jRi0vtt](https://github.com/user-attachments/assets/e572d0d2-cdc6-4b4d-a7bc-128ac0df64e3) https://i.imgur.com/QIYsiOz.png https://i.imgur.com/MGY6GTe.png # Explain why it's good for the game The room serves as both a neat nod to dark descent as well as a place for potential roleplay to accure, CMO conducting psychological evaluations for the MPs, marines stressed from the retreat from the planet trying to unwind quietly or just somewhere to relax before briefing # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: SpartanBobby maptweak: Rearranges Almayer Upper Medical to accommodate a Psychiatric Care Unit /:cl: --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 3723 +++++++++++--------- 1 file changed, 1965 insertions(+), 1758 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 80389906d448..5ee138c5d5ad 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1463,7 +1463,13 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) "akx" = ( -/turf/open/floor/almayer/sterile_green_side/north, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + name = "\improper Medical Bay"; + req_one_access = null; + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "akz" = ( /obj/structure/surface/table/almayer, @@ -1565,6 +1571,11 @@ /turf/closed/wall/almayer, /area/almayer/shipboard/starboard_missiles) "alD" = ( +/obj/item/paper_bin/uscm{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "alE" = ( @@ -1763,12 +1774,8 @@ /turf/open/floor/plating/almayer/no_build, /area/almayer/stair_clone) "anp" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer/redfull, +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "anq" = ( /obj/item/device/radio/intercom{ @@ -1790,12 +1797,12 @@ /turf/open/floor/almayer/redfull, /area/almayer/medical/upper_medical) "anr" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/machinery/computer/med_data, +/obj/structure/sign/safety/terminal{ + pixel_x = 3; + pixel_y = 29 }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer/redfull, +/turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) "ans" = ( /turf/open/floor/almayer/sterile_green_side/west, @@ -1886,19 +1893,19 @@ /turf/open/floor/almayer/silver/west, /area/almayer/command/cichallway) "aop" = ( -/obj/structure/closet/secure_closet/personal/patient{ - name = "morgue closet" +/obj/structure/machinery/shower{ + pixel_y = 16 }, /obj/structure/machinery/light{ - dir = 1 + dir = 4 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/upper_medical) "aoq" = ( /turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "aor" = ( -/obj/structure/curtain/medical, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "aos" = ( @@ -2577,18 +2584,28 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "asu" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/bed/chair/office/dark{ + dir = 8 }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer/redfull, +/obj/structure/sign/safety/terminal{ + pixel_x = -10; + pixel_y = -27 + }, +/obj/structure/closet/secure_closet/professor_dummy{ + pixel_y = -30 + }, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "asw" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) "asA" = ( /obj/structure/pipes/standard/simple/hidden/supply, @@ -2652,11 +2669,17 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) "asU" = ( -/obj/structure/morgue{ - dir = 8 +/obj/item/device/flashlight/lamp{ + pixel_y = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/item/clothing/glasses/science{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/device/flash, +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "asX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer/plate, @@ -3178,11 +3201,10 @@ /turf/open/floor/almayer/plate, /area/almayer/living/starboard_garden) "awj" = ( -/obj/structure/machinery/photocopier, -/obj/structure/sign/safety/terminal{ - pixel_x = -17 +/obj/structure/machinery/status_display{ + pixel_y = -30 }, -/turf/open/floor/almayer/sterile_green_side/west, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "awk" = ( /turf/open/floor/almayer/silver, @@ -3191,24 +3213,14 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/command/cic) "awn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/plating/northeast, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) "awp" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "Research Armory"; - name = "\improper Armory Shutters" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/test_floor4, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) "awq" = ( /obj/structure/machinery/light{ @@ -3386,14 +3398,22 @@ /turf/open/floor/almayer/redcorner/west, /area/almayer/shipboard/weapon_room) "axl" = ( -/obj/structure/machinery/door_control{ - dir = 1; - id = "Research Armory"; - name = "Research Armory"; - pixel_x = -27; - req_one_access_txt = "4;28" +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMO Shutters"; + name = "\improper CMO Office Shutters" }, -/turf/open/floor/almayer/sterile_green_side/southwest, +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; + name = "\improper CMO's Office"; + req_one_access = null; + req_one_access_txt = "1;5" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "axm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -3729,15 +3749,13 @@ /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering) "ayW" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/morgue{ + dir = 8 }, -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = -32 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/plate, +/turf/open/floor/almayer/test_floor5, /area/almayer/medical/morgue) "ayX" = ( /obj/structure/surface/table/almayer, @@ -4024,15 +4042,17 @@ /turf/open/floor/almayer, /area/almayer/command/cic) "aAG" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - access_modified = 1; - dir = 2; - name = "Morgue"; - req_access_txt = "25"; - req_one_access = null +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) +/obj/structure/platform_decoration{ + dir = 10; + layer = 3.51 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "aAK" = ( /obj/structure/surface/table/almayer, /obj/item/device/camera, @@ -4112,8 +4132,12 @@ /turf/open/floor/almayer/plate, /area/almayer/command/telecomms) "aBd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, /turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/morgue) +/area/almayer/medical/upper_medical) "aBe" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -4398,18 +4422,14 @@ /turf/open/floor/almayer/silvercorner, /area/almayer/command/cic) "aCo" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm, -/obj/item/tool/pen, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/morgue) +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "aCp" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/sterile_green_side/north, +/obj/structure/platform_decoration{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "aCt" = ( /obj/structure/bed/sofa/south/white/right, @@ -4424,8 +4444,21 @@ /turf/open/floor/almayer/green/east, /area/almayer/hallways/lower/port_midship_hallway) "aCw" = ( -/obj/structure/window/framed/almayer/white, -/turf/open/floor/plating, +/obj/structure/surface/rack, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "aCA" = ( /obj/structure/largecrate/random/barrel/white, @@ -4761,22 +4794,15 @@ /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) "aEN" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4; - layer = 3.25 - }, -/turf/open/floor/almayer/dark_sterile, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) "aEO" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 8 +/obj/structure/machinery/light/double/blue{ + light_color = "#a7dbc7" }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/morgue) +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "aEQ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/mono, @@ -5096,15 +5122,12 @@ /turf/open/floor/almayer/plate, /area/almayer/living/numbertwobunks) "aGW" = ( -/turf/open/floor/almayer/sterile_green_side, +/turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/morgue) "aGX" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/morgue) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "aGY" = ( /turf/open/floor/almayer/plate, /area/almayer/living/numbertwobunks) @@ -5810,14 +5833,12 @@ /turf/open/floor/almayer, /area/almayer/command/cic) "aLS" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/bed/chair, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/surgery/circular_saw, +/obj/item/tool/surgery/retractor, +/obj/item/tool/surgery/cautery, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "aLT" = ( /turf/closed/wall/almayer, /area/almayer/squads/alpha) @@ -5825,20 +5846,9 @@ /turf/open/floor/almayer, /area/almayer/shipboard/starboard_point_defense) "aLZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/pen, -/obj/item/paper_bin/wy, -/obj/structure/machinery/computer/cameras/containment{ - dir = 4; - layer = 2.981; - name = "Research Cameras"; - pixel_y = 16 - }, -/obj/item/clothing/accessory/stethoscope, -/obj/structure/closet/secure_closet/professor_dummy{ - pixel_x = -32 - }, -/turf/open/floor/almayer/sterile_green_corner/west, +/obj/structure/bed/sofa/south/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) "aMd" = ( /obj/structure/filingcabinet/seeds{ @@ -6660,18 +6670,14 @@ /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) "aRF" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - access_modified = 1; - dir = 2; - name = "Morgue Processing"; - req_access_txt = "25"; - req_one_access = null +/obj/structure/toilet{ + dir = 4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/upper_medical) "aRJ" = ( /obj/structure/ladder{ height = 2; @@ -6681,14 +6687,14 @@ pixel_x = 23; pixel_y = -32 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = -8 - }, /obj/structure/sign/safety/refridgeration{ pixel_x = -17; pixel_y = 7 }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -8 + }, /turf/open/floor/plating/almayer, /area/almayer/medical/upper_medical) "aRK" = ( @@ -6719,6 +6725,8 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/upper_medical) "aRT" = ( @@ -8659,9 +8667,12 @@ /turf/open/floor/almayer/silver/west, /area/almayer/living/cryo_cells) "bho" = ( -/obj/structure/machinery/computer/med_data, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/lower_medical_lobby) "bhq" = ( /obj/structure/machinery/light{ dir = 4 @@ -9650,6 +9661,17 @@ /obj/effect/landmark/ert_spawns/distress_cryo, /turf/open/floor/almayer/cargo, /area/almayer/living/cryo_cells) +"bqa" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/item/device/autopsy_scanner, +/obj/item/tool/surgery/scalpel, +/obj/item/tool/surgery/hemostat, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "bqc" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_aft_hallway) @@ -10827,7 +10849,10 @@ /turf/open/floor/plating, /area/almayer/medical/lower_medical_lobby) "bCe" = ( -/turf/open/floor/almayer/sterile_green_side/northeast, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/lower_medical_lobby) "bCg" = ( /obj/structure/machinery/light{ @@ -15211,27 +15236,62 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/computerlab) "cnV" = ( +/obj/structure/machinery/photocopier, /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/morgue) "cnW" = ( -/obj/structure/machinery/optable, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/morgue) +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 10; + layer = 3.51 + }, +/obj/structure/platform_decoration{ + dir = 5; + layer = 3.51 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "cnZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel, -/obj/item/tool/surgery/hemostat, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/morgue) +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/folder/white, +/obj/item/folder/black, +/obj/item/folder/black, +/obj/item/clipboard, +/obj/item/clipboard, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) "coa" = ( -/obj/item/tool/surgery/circular_saw, -/obj/item/tool/surgery/cautery, -/obj/item/tool/surgery/retractor, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/sterile_green_side, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = -4 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -21 + }, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/morgue) "cod" = ( /obj/structure/machinery/cm_vending/clothing/dress{ @@ -15732,10 +15792,10 @@ /turf/open/floor/plating, /area/almayer/maint/lower/constr) "cyU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer/dark_sterile, +/obj/structure/bed/sofa/south/white/left, +/obj/structure/platform, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "cyZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -16945,12 +17005,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/mp_bunks) "cXW" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/structure/machinery/door_control{ + dir = 1; + id = "Research Armory"; + name = "Research Armory"; + req_one_access_txt = "4;28" }, -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm, -/turf/open/floor/almayer/sterile_green_side/north, +/turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/upper_medical) "cXX" = ( /obj/structure/disposalpipe/segment, @@ -17971,11 +18032,11 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/u_f_s) "dwA" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 32 +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/mono, +/turf/open/floor/almayer/redfull, /area/almayer/medical/upper_medical) "dwI" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ @@ -18358,14 +18419,11 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) "dDL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/research/main_terminal{ +/obj/structure/machinery/light/double/blue{ + light_color = "#a7dbc7"; dir = 4 }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/west, +/turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/upper_medical) "dDM" = ( /obj/effect/decal/cleanable/blood/oil, @@ -19066,12 +19124,11 @@ /turf/open/floor/almayer/bluecorner/west, /area/almayer/hallways/upper/midship_hallway) "dSJ" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -28 +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "dSX" = ( /obj/structure/disposalpipe/segment{ @@ -20389,6 +20446,16 @@ }, /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) +"eto" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control{ + id = "CMO Shutters"; + name = "Office Shutters"; + req_access_txt = "5"; + pixel_x = -29 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "ets" = ( /obj/structure/machinery/power/apc/almayer/east, /obj/effect/decal/warning_stripes{ @@ -20869,11 +20936,15 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/u_m_s) "eDo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/turf/open/floor/almayer/plating/northeast, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -28 + }, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/upper_medical) "eDq" = ( /obj/structure/largecrate/random/secure, @@ -21515,6 +21586,19 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) +"eSN" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + access_modified = 1; + dir = 2; + name = "Morgue"; + req_access_txt = "25"; + req_one_access = null + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) "eSU" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer1" @@ -22001,8 +22085,14 @@ /turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/lower_medical_medbay) "fbB" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/almayer/dark_sterile, +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Psychiatric Care Unit" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "fbC" = ( /obj/structure/closet/toolcloset, @@ -22471,14 +22561,16 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) "fnA" = ( -/obj/structure/surface/rack, -/obj/item/tool/crowbar, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + access_modified = 1; + name = "\improper CMO's Bedroom"; + req_one_access_txt = "1;5" }, -/turf/open/floor/almayer/redfull, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "fnH" = ( /obj/structure/pipes/vents/pump{ @@ -22825,9 +22917,13 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "fvd" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) "fvf" = ( /turf/open/floor/almayer/silver/north, /area/almayer/living/briefing) @@ -23187,9 +23283,14 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) "fEC" = ( -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "fEF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23207,10 +23308,13 @@ /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) "fFh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/autopsy_scanner, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/morgue) +/obj/structure/bed, +/obj/item/bedsheet/green, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -23232,14 +23336,9 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_medbay) "fFO" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/morgue{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/upper_medical) "fFQ" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/spray/cleaner{ @@ -23650,6 +23749,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/sterile_green_side/southwest, /area/almayer/medical/upper_medical) "fPn" = ( @@ -23718,12 +23818,8 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/engineering/lower/engine_core) "fQu" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "CMO Shutters"; - name = "\improper CMO Office Shutters" - }, -/obj/structure/window/framed/almayer/white, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/upper_medical) "fQy" = ( /obj/structure/machinery/light/small{ @@ -23938,12 +24034,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) "fXg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "fXx" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/silver/southeast, @@ -23984,6 +24082,17 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/stern_point_defense) "fYb" = ( +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 7; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/morgue) "fYf" = ( @@ -25235,13 +25344,25 @@ }, /turf/open/floor/plating, /area/almayer/living/pilotbunks) +"gzJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/morgue) "gzK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "gzM" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/sign/safety/stairs{ @@ -25749,11 +25870,14 @@ /turf/open/floor/almayer/silvercorner, /area/almayer/hallways/lower/repair_bay) "gKR" = ( -/obj/structure/closet/emcloset, -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMO Shutters"; + name = "\improper CMO Office Shutters" }, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, /area/almayer/medical/upper_medical) "gKZ" = ( /obj/structure/surface/table/almayer, @@ -26311,10 +26435,10 @@ /turf/open/floor/plating, /area/almayer/medical/upper_medical) "gXl" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access_txt = "5" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/mono, +/turf/open/floor/almayer/sterile_green, /area/almayer/medical/upper_medical) "gXs" = ( /obj/effect/step_trigger/ares_alert/terminals, @@ -26541,12 +26665,8 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) "hbI" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer/redfull, +/obj/structure/closet/secure_closet/CMO, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "hcf" = ( /obj/item/bedsheet/brown{ @@ -28004,13 +28124,13 @@ /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) "hFF" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - access_modified = 1; - name = "Autopsy"; - req_access_txt = "25"; - req_one_access = null +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ + dir = 1; + name = "Morgue Processing" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/morgue) "hGb" = ( @@ -28404,14 +28524,8 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "hQU" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/sign/safety/intercom{ - pixel_x = -17 - }, -/turf/open/floor/almayer/plate, +/obj/structure/morgue, +/turf/open/floor/almayer/test_floor5, /area/almayer/medical/morgue) "hQW" = ( /obj/structure/disposalpipe/segment{ @@ -28685,11 +28799,10 @@ /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/medical_science) "hVz" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/morgue) "hVL" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer/plate, @@ -29418,8 +29531,11 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_lobby) "imp" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/plating, /area/almayer/medical/morgue) "imt" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ @@ -29712,12 +29828,10 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/lifeboat_pumps/north1) "isN" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/almayer/sterile_green_side/west, +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/morgue) "itg" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ @@ -30249,6 +30363,11 @@ }, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/operating_room_four) +"iGA" = ( +/obj/structure/bed/sofa/south/white/left, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) "iGQ" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 @@ -30458,7 +30577,7 @@ pixel_x = 32; pixel_y = 7 }, -/turf/open/floor/almayer/sterile_green_corner/east, +/turf/open/floor/plating/almayer, /area/almayer/medical/lower_medical_lobby) "iLG" = ( /obj/structure/disposalpipe/junction{ @@ -31150,7 +31269,10 @@ /area/almayer/living/briefing) "iXW" = ( /obj/structure/machinery/power/apc/almayer/east, -/turf/open/floor/almayer/sterile_green_corner, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/sterile_green, /area/almayer/medical/lower_medical_lobby) "iYe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -31825,8 +31947,10 @@ /turf/open/floor/almayer/cargo/southwest, /area/almayer/engineering/starboard_atmos) "jkl" = ( -/obj/structure/morgue, -/turf/open/floor/almayer/plate, +/obj/structure/morgue{ + dir = 8 + }, +/turf/open/floor/almayer/test_floor5, /area/almayer/medical/morgue) "jkq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -32665,10 +32789,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) "jBy" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/sterile_green_side/east, +/turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/morgue) "jBO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -32937,7 +33058,8 @@ pixel_x = -24; req_access_txt = "25" }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "jIs" = ( /obj/structure/disposalpipe/segment{ @@ -33265,11 +33387,11 @@ /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) "jOG" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/firealarm{ dir = 4; pixel_x = 24 }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) "jPd" = ( @@ -33435,10 +33557,25 @@ /turf/open/floor/almayer/green/west, /area/almayer/living/offices) "jTj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light, +/obj/structure/machinery/computer/cameras/containment{ + dir = 8; + name = "Research Cameras"; + pixel_y = 10 }, -/turf/open/floor/almayer/plating/northeast, +/obj/structure/machinery/computer/research/main_terminal{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/machinery/door_control{ + id = "CMO Shutters"; + name = "Office Shutters"; + req_access_txt = "5"; + pixel_x = -11; + pixel_y = -6 + }, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "jTt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -33792,8 +33929,7 @@ /turf/open/floor/almayer, /area/almayer/medical/containment/cell/cl) "jZY" = ( -/obj/structure/closet/l3closet/virology, -/turf/open/floor/almayer/redfull, +/turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/upper_medical) "kac" = ( /obj/structure/surface/rack, @@ -33892,6 +34028,10 @@ /obj/structure/machinery/light, /turf/open/floor/plating/almayer/no_build, /area/almayer/hallways/upper/fore_hallway) +"kbn" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "kbv" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) @@ -34069,20 +34209,9 @@ /turf/open/floor/plating, /area/almayer/powered/agent) "kgp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/transmitter{ - name = "CMO Office Telephone"; - phone_category = "Offices"; - phone_id = "CMO Office"; - pixel_y = 29 - }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = 23; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_side/north, +/obj/structure/bed/sofa/south/white/right, +/obj/structure/platform, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "kgs" = ( /obj/structure/window/framed/almayer/white, @@ -34330,6 +34459,14 @@ /obj/item/circuitboard/airalarm, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) +"kln" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "klH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -34436,11 +34573,23 @@ /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/living/gym) "koB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +/obj/structure/mirror{ + pixel_x = -27 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/upper_medical) "koC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -35244,9 +35393,17 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "kEp" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/morgue) +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/safety/rewire{ + pixel_x = -20; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) "kEq" = ( /obj/structure/machinery/door/window/ultra{ dir = 8; @@ -36558,14 +36715,8 @@ /turf/open/floor/almayer/orange/southeast, /area/almayer/engineering/upper_engineering/starboard) "lhv" = ( -/obj/structure/machinery/door_control{ - id = "CMO Shutters"; - name = "Office Shutters"; - pixel_y = -20; - req_access_txt = "5" - }, -/obj/structure/machinery/computer/crew, -/turf/open/floor/almayer/sterile_green_corner/east, +/obj/structure/closet/firecloset, +/turf/open/floor/almayer/cargo, /area/almayer/medical/upper_medical) "lhB" = ( /obj/structure/window/framed/almayer, @@ -36808,8 +36959,10 @@ /turf/closed/wall/almayer, /area/almayer/hallways/lower/starboard_umbilical) "lmi" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/bed/sofa/south/white/left, /turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "lml" = ( @@ -37689,10 +37842,8 @@ /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) "lFn" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/turf/open/floor/almayer/sterile_green_corner/north, +/obj/structure/machinery/optable, +/turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "lFp" = ( /turf/closed/wall/almayer, @@ -38568,11 +38719,10 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "maT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/upper_medical) @@ -38597,12 +38747,11 @@ /turf/open/floor/almayer/plate, /area/almayer/living/gym) "mcW" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/gloves, +/obj/structure/morgue, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer/test_floor5, /area/almayer/medical/morgue) "mdk" = ( /obj/structure/machinery/door/poddoor/railing{ @@ -39271,13 +39420,12 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "mrL" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "mrM" = ( /obj/structure/closet/secure_closet/quartermaster_uscm, /turf/open/floor/almayer/green, @@ -40387,13 +40535,15 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) "mNI" = ( -/obj/structure/machinery/door/window/westleft{ - dir = 2 +/obj/structure/morgue{ + dir = 8 }, -/obj/structure/machinery/shower, -/obj/item/tool/soap, -/turf/open/floor/almayer/sterile, -/area/almayer/medical/upper_medical) +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/test_floor5, +/area/almayer/medical/morgue) "mNK" = ( /obj/structure/closet/secure_closet/brig/restraints, /turf/open/floor/almayer/red/west, @@ -42266,13 +42416,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) "nzv" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/folder/black, -/obj/item/folder/black, -/obj/item/folder/white, -/turf/open/floor/almayer/sterile_green_side, +/obj/structure/bed/sofa/south/white/right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/upper_medical) "nzD" = ( /obj/effect/step_trigger/clone_cleaner, @@ -42695,6 +42841,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) +"nHP" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + light_color = "#a7dbc7" + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "nHX" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -42851,10 +43004,8 @@ /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) "nMV" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer/sterile_green_side/north, +/obj/structure/closet/emcloset, +/turf/open/floor/almayer/cargo, /area/almayer/medical/upper_medical) "nNg" = ( /obj/structure/bed, @@ -44066,7 +44217,16 @@ /turf/open/floor/almayer_hull/outerhull_dir, /area/space) "okO" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer, +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5; + layer = 3.51 + }, /turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "old" = ( @@ -44074,6 +44234,12 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/s_bow) +"olz" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "olF" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, @@ -44202,11 +44368,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) "onQ" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = 8; - pixel_y = 32 +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/floor/almayer/sterile_green_side/northeast, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "onU" = ( /obj/effect/step_trigger/teleporter_vector{ @@ -45515,14 +45681,18 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/medical/hydroponics) "oNJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" +/obj/structure/transmitter{ + name = "CMO Office Telephone"; + phone_category = "Offices"; + phone_id = "CMO Office"; + dir = 4; + pixel_x = -20 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 +/obj/structure/sign/safety/commline_connection{ + pixel_x = -17; + pixel_y = 32 }, -/turf/open/floor/almayer/plating/northeast, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/upper_medical) "oNK" = ( /obj/structure/machinery/power/apc/almayer/north, @@ -46621,11 +46791,12 @@ /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/p_bow) "pjF" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper, -/obj/item/tool/lighter/random, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + pixel_y = 20; + density = 0 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "pjG" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -46635,6 +46806,13 @@ }, /turf/open/floor/almayer/plating_striped, /area/almayer/squads/req) +"pjO" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) "pjP" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -46993,13 +47171,10 @@ /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) "pth" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/blue, -/obj/effect/landmark/map_item, -/obj/structure/pipes/vents/scrubber{ - dir = 8 +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/turf/open/floor/almayer/sterile_green_side/east, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "ptj" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, @@ -47641,6 +47816,14 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/lifeboat_pumps/north1) +"pJl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 2 + }, +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/upper_medical) "pJq" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -48771,18 +48954,14 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) "qhx" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = -17; - pixel_y = 7 +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access_txt = "5" }, -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = -8 +/obj/item/clothing/accessory/stethoscope, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_side/north, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "qhD" = ( /obj/structure/closet{ @@ -50550,12 +50729,8 @@ /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) "qQc" = ( -/obj/structure/closet/secure_closet/personal/patient{ - name = "morgue closet" - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "qQp" = ( @@ -51566,6 +51741,20 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/living/gym) +"rkK" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/bed/sofa/south/white/right, +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/plush/therapy/random_color{ + pixel_y = -3 + }, +/obj/structure/sign/nosmoking_2{ + pixel_y = 29 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "rkV" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -51720,12 +51909,8 @@ /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) "rnN" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/greenfull, +/area/almayer/hallways/upper/fore_hallway) "rob" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -51898,6 +52083,9 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/bridgebunks) +"rrD" = ( +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/upper_medical) "rrK" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -52144,6 +52332,13 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/maint/hull/upper/u_f_p) +"rxc" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "rxe" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -52559,6 +52754,13 @@ }, /turf/open/floor/almayer/sterile_green_side/southwest, /area/almayer/medical/lower_medical_medbay) +"rGc" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "rGj" = ( /turf/open/floor/almayer/red, /area/almayer/squads/alpha) @@ -53156,6 +53358,13 @@ }, /turf/open/floor/almayer/orangefull, /area/almayer/squads/alpha_bravo_shared) +"rSq" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/redfull, +/area/almayer/medical/upper_medical) "rSx" = ( /obj/structure/surface/table/almayer, /obj/item/stack/rods/plasteel{ @@ -53680,14 +53889,17 @@ /turf/open/floor/almayer/red, /area/almayer/hallways/upper/starboard) "sdn" = ( -/obj/structure/sink{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/double/blue{ dir = 4; - pixel_x = 11 + light_color = "#a7dbc7" }, -/obj/structure/mirror{ - pixel_x = 28 +/obj/structure/reagent_dispensers/water_cooler/stacks{ + pixel_y = 23; + pixel_x = -8; + density = 0 }, -/turf/open/floor/almayer/sterile, +/turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/upper_medical) "sdu" = ( /obj/structure/disposalpipe/segment, @@ -53715,7 +53927,7 @@ height = 1; id = "med1" }, -/turf/open/floor/almayer/sterile_green_side, +/turf/open/floor/plating/almayer, /area/almayer/medical/lower_medical_lobby) "seL" = ( /obj/structure/pipes/vents/pump{ @@ -54020,10 +54232,8 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) "skl" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer/dark_sterile, +/obj/structure/machinery/computer/crew, +/turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/upper_medical) "skn" = ( /turf/open/floor/almayer/plating_striped, @@ -55211,6 +55421,10 @@ /turf/open/floor/almayer/orange/north, /area/almayer/living/port_emb) "sKa" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/morgue) "sKf" = ( @@ -55407,11 +55621,24 @@ /turf/open/floor/almayer/orange/northwest, /area/almayer/maint/upper/mess) "sOZ" = ( -/obj/structure/sign/safety/ammunition{ - pixel_y = 32 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer/redfull, +/obj/item/paper_bin/wy{ + pixel_y = 8; + pixel_x = -7 + }, +/obj/structure/surface/table/almayer, +/obj/item/tool/pen{ + pixel_y = 4; + pixel_x = -8 + }, +/obj/item/folder/blue{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/effect/landmark/map_item, +/turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/upper_medical) "sPa" = ( /obj/structure/surface/rack, @@ -55809,13 +56036,11 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) "sYT" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMO Shutters"; - name = "\improper CMO Office Shutters" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/obj/structure/window/framed/almayer/white, -/turf/open/floor/plating, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/upper_medical) "sYU" = ( /obj/structure/disposalpipe/segment{ @@ -56909,16 +57134,11 @@ /turf/open/floor/almayer/bluefull, /area/almayer/command/cichallway) "tsC" = ( -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/structure/surface/table/almayer, -/obj/structure/sign/poster{ - icon_state = "poster8"; - pixel_y = 32 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Research Armory"; + name = "\improper Armory Shutters" }, -/turf/open/floor/almayer/sterile_green_corner/north, +/turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) "tsE" = ( /obj/structure/largecrate/random/barrel/blue, @@ -57216,6 +57436,13 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) +"txW" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "tyb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -57477,17 +57704,8 @@ /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) "tEi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "Research Armory"; - name = "Research Armory"; - pixel_x = 27; - req_one_access_txt = "4;28" - }, -/turf/open/floor/almayer/plating/northeast, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) "tEu" = ( /obj/structure/machinery/disposal, @@ -58218,21 +58436,12 @@ /turf/open/floor/almayer/silver, /area/almayer/hallways/lower/repair_bay) "tWY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMO Shutters"; - name = "\improper CMO Office Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - access_modified = 1; - name = "\improper CMO's Office"; - req_one_access = null; - req_one_access_txt = "1;5" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer/test_floor4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/upper_medical) "tXa" = ( /obj/item/storage/toolbox/mechanical{ @@ -59037,10 +59246,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) "upM" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/turf/open/floor/almayer/dark_sterile, +/turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) "upO" = ( /obj/structure/disposalpipe/segment, @@ -59888,6 +60099,12 @@ }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) +"uGk" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "uGN" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -60248,13 +60465,11 @@ /turf/open/floor/almayer/red/northwest, /area/almayer/command/lifeboat) "uRt" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/sterile_green_side/west, +/turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) "uRD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -61164,14 +61379,15 @@ /turf/open/floor/almayer/plate, /area/almayer/living/chapel) "vih" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/candle_box, /obj/structure/sign/safety/medical{ - pixel_x = 8; + pixel_x = 15; pixel_y = -32 }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -32 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) "vil" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -61871,10 +62087,8 @@ /turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, /area/almayer/powered/agent) "vtx" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" - }, -/turf/open/floor/almayer/test_floor4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) "vtG" = ( /obj/structure/toilet{ @@ -62693,10 +62907,7 @@ /turf/open/floor/almayer/redfull, /area/almayer/command/cic) "vIf" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) "vIg" = ( @@ -63133,11 +63344,16 @@ /turf/open/floor/almayer, /area/almayer/command/computerlab) "vQN" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -32 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 16 + }, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/upper_medical) "vQR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood/ship, @@ -63196,15 +63412,16 @@ /turf/open/floor/almayer/red/north, /area/almayer/hallways/upper/port) "vRX" = ( -/obj/structure/surface/table/almayer, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/item/device/megaphone, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +/obj/structure/platform_decoration{ + dir = 4 }, -/turf/open/floor/almayer/sterile_green_corner, +/obj/structure/platform_decoration{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/medical/upper_medical) "vSl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -63578,12 +63795,20 @@ /turf/open/floor/almayer, /area/almayer/engineering/lower) "vXv" = ( -/obj/structure/machinery/light{ +/obj/structure/platform{ dir = 1 }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5; + layer = 3.51 + }, /obj/structure/flora/pottedplant{ - icon_state = "pottedplant_10"; - pixel_y = 14 + icon_state = "pottedplant_22"; + pixel_y = 6; + pixel_x = 2 }, /turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) @@ -64156,13 +64381,11 @@ /turf/open/floor/almayer/orangefull, /area/almayer/engineering/upper_engineering) "wjz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer/plating/northeast, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/upper_medical) "wjC" = ( /obj/structure/closet/firecloset, @@ -64475,17 +64698,11 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cic) "wpu" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/flashlight/lamp{ - pixel_y = 8 - }, -/obj/item/clothing/glasses/science{ - pixel_x = 3; - pixel_y = -3 +/obj/structure/sign/safety/refridgeration{ + pixel_y = -32 }, -/obj/item/device/flash, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) "wpI" = ( /turf/open/floor/almayer/green/east, /area/almayer/living/grunt_rnr) @@ -64527,11 +64744,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_aft_hallway) "wqW" = ( -/obj/structure/closet/secure_closet/CMO, -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 }, -/turf/open/floor/almayer/sterile_green_corner/north, +/obj/structure/platform_decoration{ + dir = 10; + layer = 3.51 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 12; + pixel_x = 2 + }, +/turf/open/floor/almayer/mono, /area/almayer/medical/upper_medical) "wra" = ( /obj/structure/machinery/light/small{ @@ -65141,12 +65368,11 @@ /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) "wDH" = ( -/obj/structure/morgue, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) +/obj/structure/surface/table/almayer, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/device/megaphone, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/upper_medical) "wDJ" = ( /turf/open/floor/almayer/emerald/north, /area/almayer/squads/charlie_delta_shared) @@ -65428,14 +65654,7 @@ /turf/open/floor/plating, /area/almayer/shipboard/brig/cryo) "wJo" = ( -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - access_modified = 1; - dir = 1; - name = "\improper CMO's Bedroom"; - req_one_access_txt = "1;5" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, +/turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/medical/upper_medical) "wJC" = ( /obj/structure/largecrate/random/barrel/yellow, @@ -66024,14 +66243,8 @@ /turf/open/floor/almayer/plate, /area/almayer/living/auxiliary_officer_office) "wUd" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/gloves{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/storage/fancy/candle_box, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "wUJ" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer/plate, @@ -66577,10 +66790,7 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "xgP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer/mono, +/turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/upper_medical) "xgS" = ( /obj/structure/disposalpipe/segment{ @@ -67114,10 +67324,13 @@ /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_medbay) "xsz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/plating/northeast, +/obj/structure/machinery/photocopier{ + layer = 2.9 + }, +/turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) "xsQ" = ( /obj/structure/surface/table/almayer, @@ -67135,7 +67348,11 @@ /area/almayer/maint/lower/constr) "xtM" = ( /obj/structure/machinery/light, -/turf/open/floor/almayer/sterile_green_side/southeast, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/lower_medical_lobby) "xub" = ( /obj/structure/disposalpipe/segment{ @@ -67157,6 +67374,10 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) +"xur" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/morgue) "xuy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -68149,11 +68370,8 @@ /turf/open/floor/almayer/cargo, /area/almayer/hallways/hangar) "xNu" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/sterile, +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/gm/grass/grass1, /area/almayer/medical/upper_medical) "xNv" = ( /obj/structure/bed/chair/office/dark{ @@ -68684,19 +68902,12 @@ /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "xZt" = ( -/obj/structure/sign/safety/refridgeration{ - pixel_y = -32 - }, -/obj/structure/sign/safety/medical{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/morgue) "xZG" = ( /obj/structure/machinery/light{ dir = 4 @@ -69175,13 +69386,9 @@ /turf/open/floor/almayer, /area/almayer/living/synthcloset) "yjb" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/morgue) +/obj/structure/flora/bush/ausbushes/ausbush, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "yjq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -73025,7 +73232,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aab aaa @@ -73209,10 +73416,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -73230,13 +73461,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -73310,10 +73538,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(21,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -73331,14 +73563,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(21,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -73391,10 +73619,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -73433,15 +73685,6 @@ aaa aaa aaa aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa aaa aaa aaa @@ -73498,10 +73741,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(22,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -73534,15 +73781,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(22,1,1) = {" aaa aaa -aab -aaa aaa aaa aaa @@ -73551,6 +73793,10 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -73576,20 +73822,40 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa aaa aaa aaa -bdH -bdH -bdH -bdH aaa aaa aaa @@ -73636,13 +73902,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -73681,10 +73944,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(23,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -73729,6 +73996,10 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -73737,14 +74008,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(23,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -73758,10 +74025,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -73789,10 +74080,6 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH aaa aaa aaa @@ -73839,13 +74126,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -73863,10 +74147,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(24,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -73911,6 +74199,10 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -73936,18 +74228,38 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa aab aaa aaa -"} -(24,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -73992,10 +74304,6 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH aaa aaa aaa @@ -74045,7 +74353,8 @@ aaa aab aaa aaa -aKQ +"} +(25,1,1) = {" aaa aaa aab @@ -74093,6 +74402,10 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -74118,10 +74431,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -74143,14 +74480,8 @@ aaa aaa aaa aaa -aab -aaa -aaa -"} -(25,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -74195,10 +74526,6 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH aaa aaa aaa @@ -74226,10 +74553,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(26,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -74245,13 +74576,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -74277,6 +74605,10 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -74302,10 +74634,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -74346,14 +74702,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(26,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -74398,20 +74750,20 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH aaa aaa aaa aaa aaa aaa +aab aaa aaa +"} +(27,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -74448,17 +74800,18 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -74484,10 +74837,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -74549,15 +74926,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(27,1,1) = {" aaa aaa -aab -aaa aaa aaa aaa @@ -74587,10 +74959,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(28,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -74601,11 +74977,6 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH -aaa aaa aaa aaa @@ -74640,6 +75011,10 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -74651,14 +75026,8 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ -aaa -aaa -aab -aaa aaa aaa aaa @@ -74671,10 +75040,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -74752,14 +75145,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(28,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -74773,10 +75162,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(29,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -74804,10 +75197,6 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH aaa aaa aaa @@ -74854,6 +75243,27 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -74959,7 +75369,7 @@ aab aaa aaa "} -(29,1,1) = {" +(30,1,1) = {" aaa aaa aab @@ -75020,6 +75430,15 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -75027,36 +75446,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75162,7 +75572,7 @@ aab aaa aaa "} -(30,1,1) = {" +(31,1,1) = {" aaa aaa aab @@ -75239,27 +75649,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75365,7 +75775,7 @@ aab aaa aaa "} -(31,1,1) = {" +(32,1,1) = {" aaa aaa aab @@ -75442,27 +75852,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75568,7 +75978,7 @@ aab aaa aaa "} -(32,1,1) = {" +(33,1,1) = {" aaa aaa aab @@ -75645,10 +76055,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -75666,26 +76100,6 @@ aaa aaa aaa aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -75763,18 +76177,17 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(34,1,1) = {" aaa aaa aab aaa aaa -"} -(33,1,1) = {" -aaa aaa -aab aaa aaa aaa @@ -75808,8 +76221,21 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa +aac +aaf +aaf +aaf +aaf +aaf +aaf +aaf +ajY aaa aaa aaa @@ -75841,10 +76267,25 @@ bdH bdH bdH bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -75869,13 +76310,9 @@ aaa aaa aaa aaa -aab -aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -75943,10 +76380,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(35,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -75970,19 +76411,16 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(34,1,1) = {" aaa aaa -aab aaa aaa aaa aaa aaa +bdH aaa aaa aaa @@ -75992,6 +76430,15 @@ aaa aaa aaa aaa +aad +feb +feb +feb +feb +feb +feb +feb +ajZ aaa aaa aaa @@ -76018,22 +76465,30 @@ bdH bdH bdH bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa -aac -aaf -aaf -aaf -aaf -aaf -aaf -aaf -ajY -aaa -aaa -aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -76072,13 +76527,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -76131,10 +76583,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(36,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -76167,20 +76623,36 @@ aaa aaa aaa aaa +bdH aaa aaa aaa aaa +aac +aaf +aaf +aaf +aaf +aag +feb +qmR +oog +dsA +rbK +tmH +feb +aag +aaf +aaf +aaf +aaf +ajY aaa aaa -aab aaa aaa -"} -(35,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -76192,10 +76664,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -76213,7 +76709,6 @@ aaa aaa aaa aaa -bdH aaa aaa aaa @@ -76223,15 +76718,6 @@ aaa aaa aaa aaa -aad -feb -feb -feb -feb -feb -feb -feb -ajZ aaa aaa aaa @@ -76275,13 +76761,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -76303,10 +76786,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(37,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -76339,10 +76826,30 @@ aaa aaa aaa aaa +bdH aaa aaa aaa aaa +aad +hPI +hPI +hPI +hPI +hPI +feb +dhd +oog +jNT +fag +qCA +feb +hRu +hRu +hRu +hRu +hRu +ajZ aaa aaa aaa @@ -76360,10 +76867,34 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa +aKQ aaa aaa +aab aaa aaa aaa @@ -76376,14 +76907,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(36,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -76416,30 +76943,10 @@ aaa aaa aaa aaa -bdH aaa aaa aaa aaa -aac -aaf -aaf -aaf -aaf -aag -feb -qmR -oog -dsA -rbK -tmH -feb -aag -aaf -aaf -aaf -aaf -ajY aaa aaa aaa @@ -76478,318 +76985,18 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa aab aaa aaa +"} +(38,1,1) = {" aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(37,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bdH -aaa -aaa -aaa -aaa -aad -hPI -hPI -hPI -hPI -hPI -feb -dhd -oog -jNT -fag -qCA -feb -hRu -hRu -hRu -hRu -hRu -ajZ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(38,1,1) = {" -aaa -aaa -aab +aab aaa aaa aaa @@ -76863,27 +77070,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -77066,27 +77273,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -77270,25 +77477,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -77473,25 +77680,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -77676,25 +77883,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -77879,25 +78086,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78082,25 +78289,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78285,25 +78492,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78488,25 +78695,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78691,25 +78898,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78894,25 +79101,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79097,25 +79304,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79300,25 +79507,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79503,25 +79710,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79706,25 +79913,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79909,25 +80116,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -80112,25 +80319,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -80530,9 +80737,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -80729,17 +80936,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -80932,17 +81139,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -81135,17 +81342,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -81338,17 +81545,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -81540,19 +81747,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -81743,19 +81950,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -81946,19 +82153,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -82150,17 +82357,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82353,17 +82560,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82556,17 +82763,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82759,17 +82966,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82966,9 +83173,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -95706,6 +95913,7 @@ gLl gvu xCB tJm +rnN aoe aoe aoe @@ -95723,9 +95931,8 @@ aoe aoe aoe aoe -aoe -aoe -hwB +rnN +gvu xCB kaj vIo @@ -95908,27 +96115,27 @@ qhg gLl pzw xCB -tJm +vih +aoe aoe -aoh jHQ -jkl -jkl -jkl -wDH +hQU +hQU +hQU +hQU dSJ hQU -pjF +hQU mcW -vih -aoe +hQU +vbS imp fYb cnV isN -cnZ aoe -gvu +aoe +hwB xCB tJm vIo @@ -96111,24 +96318,24 @@ gtI kYF dME nbH -tJm +wpu aoe -vbS -arb -aoq +aoh +aor +aor aoq aoq aoq -arb ccs aoq aoq aoq -aor -aEi -aEi -cnW +aoq +aoq +imp +gzJ aEi +xur coa aoe lXR @@ -96313,26 +96520,26 @@ gxm gxm gxm lXR -nbH -tJm -aoe +lYS +mzn +hSI qQc -fXg -dfa -dfa -dfa -dfa +pMp +xZt +hVz +hVz dfa -gzK +rxc arb arb arb +aEN aor -sKa +eSN sKa jBy aEi -fFh +aHa aoe gvu nbH @@ -96519,21 +96726,21 @@ gpp xCB tJm aoe -vbS -koB -asU -asU -asU -asU -arb -fEC -aoe -aoe -aCw aoe aoe aoe aoe +aor +aor +aoq +aoq +aor +aor +aCw +aGW +aGW +aGW +fvd hFF aoe aoe @@ -96636,7 +96843,7 @@ gGJ qjN qjN qjN -qjN +bho xtM baZ sbE @@ -96720,21 +96927,21 @@ aps gxm sHC nbH -tJm -aoe +pjO +ajl aop koB +aRF +aoe jkl +mNI jkl -jkl -jkl -arb ayW -aoe +bqa lFn -imp -kEp -aoe +aLS +aGW +rSq tsC uRt aQz @@ -96922,25 +97129,25 @@ aps aps gxm gvu -lYS -mzn -hSI -pMp +nbH +tJm +ajl +ajl gzK -aoq -aoq -aoq -aoq -aoq -aoq -aAG -aBd -aEi +ajl +aoe +aoe +aoe +aoe +aoe +aoe +aoe +aoe aGW -aRF -akx -akw -aQz +anq +tsC +uRt +onQ aRK ajl aUB @@ -97126,23 +97333,23 @@ asm gxm gvu lSN -xZt -aoe +tJm +ajl pjF wUd +wub asU -asU -asU -fFO -mrL +ajl +ajl +ajl mrL -aoe +rGc yjb -aEN -aGX -aoe -aLS -akw +ajl +sqf +dwA +tsC +uRt fOL aRS ajl @@ -97329,25 +97536,25 @@ asm gxm gvu nbH -vQN -sqf -sqf -sqf -sqf -sqf -sqf -sqf +tJm ajl +qhx +hbI +uGk +fFh ajl ajl +nHP +xNu +cnW aCo aEO -aHa -aoe +sqf +sqf cXW upM akw -alD +vtx vEx dME nbH @@ -97533,24 +97740,24 @@ gxm gvu nbH tJm -sqf -anp -wjz -fnA -jZY -jZY -sqf -wpu -okO -ajl ajl ajl ajl +fnA ajl ajl +xNu +aCo +okO +vRX +aAG +kbn +aCo ajl -onQ -alD +iGA +aos +akw +txW ajl bgN nbH @@ -97736,26 +97943,26 @@ gxm gvu xCB tJm -sqf +ajl sOZ oNJ +axm eDo -eDo -eDo -sqf +ajl +pth vXv -wub +olz gXl -ajl +aCp wqW awj -dDL -aLZ ajl -aCp +aLZ +akw +akw alD -ajl -evM +gWG +gvu xCB tJm gxm @@ -97939,24 +98146,24 @@ gxm gvu lSN kaj -sqf -anq -awn +ajl +cnZ +akw xsz jTj -jTj -sqf +ajl +yjb lmi xgP -dwA +axm wJo cyU -eme -skl +anp +ajl nzv fQu -akx -alD +rrD +vQN gWG gvu xCB @@ -98142,26 +98349,26 @@ gxm gvu xCB tJm -sqf +ajl anr -awn +eme tEi asu -hbI -sqf ajl +ajl +rkK vtx +axm +akw +kgp ajl ajl -kgp -fbB -cyU -bho -fQu +ajl +fEC akx -alD -gWG -gvu +ajl +ajl +evM xCB tJm gxm @@ -98345,24 +98552,24 @@ gxm hwB xCB tJm -sqf -sqf +ajl +skl awp -sqf -sqf -sqf -sqf -mNI -sdn -xNu +axm +jZY +wDH ajl -vRX -pth +ajl +sdn axm -lhv +dDL ajl -hVz -alD +ajl +nMV +lhv +aBd +alE +wjz ajl lXR xCB @@ -98549,22 +98756,22 @@ atz nbH tyC ajl -qhx -akw +gKR +gKR axl gKR -fvd +gKR ajl ajl ajl +fbB ajl ajl -sYT -sYT +kEp tWY sYT -ajl -nMV +pJl +akw vIf ajl hwB @@ -98752,23 +98959,23 @@ gre nbH dME bVE -aos -akw -akw -akw -alE -ans ans -asw ans +axm ans +aGX +eto ans ans axm ans -ans -aos -alE +aGX +fFO +akw +akw +akw +akw +akw bVE dME nbH @@ -98956,20 +99163,20 @@ hWa cEG aEe akA -akA -akA +kln +asw akA jOG akA akA akA +fXg akA -rnN akA akA maT akA -akA +awn oap aSb aEe From 6a6b301a257bf0aa804def185e3afc8871293f10 Mon Sep 17 00:00:00 2001 From: "cmss13-ci[bot]" <180991813+cmss13-ci[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 18:29:07 +0000 Subject: [PATCH 15/15] Automatic changelog for PR #7434 [ci skip] --- html/changelogs/AutoChangeLog-pr-7434.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-7434.yml diff --git a/html/changelogs/AutoChangeLog-pr-7434.yml b/html/changelogs/AutoChangeLog-pr-7434.yml new file mode 100644 index 000000000000..eb6acc7fa824 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-7434.yml @@ -0,0 +1,4 @@ +author: "SpartanBobby" +delete-after: True +changes: + - maptweak: "Rearranges Almayer Upper Medical to accommodate a Psychiatric Care Unit" \ No newline at end of file