From 8c6650d5d0e2752d8d3e3299c733dcd6e15a9ecb Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 14 Mar 2024 08:23:23 +0100 Subject: [PATCH 01/28] Balance : adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine to marine squads vendors. (#5908) # About the pull request # Explain why it's good for the game Mainly for consistency and because those ammo are available for free in any prep. allowing marine to buy some if vendor is empty seem fair to me. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor of (medic,comtech, SL) at a cost of 6 each. balance: adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor of (rifleman, TL, IO) at a cost of 10 each. balance: adding VP78 case and SU-6 case in vendor of IO at a cost of 15 each. /:cl: --------- Co-authored-by: Julien --- .../machinery/vending/vendor_types/intelligence_officer.dm | 6 ++++++ .../vending/vendor_types/squad_prep/squad_engineer.dm | 2 ++ .../vending/vendor_types/squad_prep/squad_leader.dm | 2 ++ .../vending/vendor_types/squad_prep/squad_medic.dm | 2 ++ .../vending/vendor_types/squad_prep/squad_rifleman.dm | 2 ++ .../machinery/vending/vendor_types/squad_prep/squad_tl.dm | 2 ++ 6 files changed, 16 insertions(+) diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index 954c3438a4c9..9baa685032de 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -18,9 +18,15 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list( list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/marksman, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", 10, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR), + + list("RESTRICTED FIREARMS", 0, null, null, null), + list("VP78 Pistol", 15, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), list("POUCHES", 0, null, null, null), list("Large Magazine Pouch", 10, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 95864404f4e8..998b17504a44 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -45,9 +45,11 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/marksman, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 3, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 3, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), list("VP78 Magazine", 3, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", 6, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR), list("ARMORS", 0, null, null, null), list("M3 B12 Pattern Marine Armor", 24, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 0039d5b03250..17d3419ac2f8 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -88,9 +88,11 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/marksman, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 3, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 3, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), list("VP78 Magazine", 3, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", 6, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR), list("SPECIAL AMMUNITION", 0, null, null, null), list("M240 Incinerator Tank (Napthal)", 3, /obj/item/ammo_magazine/flamer_tank, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index b29b528ded13..b1961ae9e75b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -67,9 +67,11 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/marksman, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 3, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 3, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), list("VP78 Magazine", 3, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", 6, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR), list("ARMORS", 0, null, null, null), list("M3 B12 Pattern Marine Armor", 24, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 0b980fc31960..65066731070d 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -76,9 +76,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/marksman, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", 10, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR), list("ARMORS", 0, null, null, null), list("M3 B12 Pattern Marine Armor", 30, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index a013ddb15212..c37dd98ed263 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -22,9 +22,11 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/marksman, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", 10, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 10, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), From e7629fcc28164d220db9b15e8ec7b1eb70344eb5 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 14 Mar 2024 07:31:25 +0000 Subject: [PATCH 02/28] Automatic changelog for PR #5908 [ci skip] --- html/changelogs/AutoChangeLog-pr-5908.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5908.yml diff --git a/html/changelogs/AutoChangeLog-pr-5908.yml b/html/changelogs/AutoChangeLog-pr-5908.yml new file mode 100644 index 000000000000..5b62ea4ebe26 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5908.yml @@ -0,0 +1,6 @@ +author: "Huffie56" +delete-after: True +changes: + - balance: "adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor of (medic,comtech, SL) at a cost of 6 each." + - balance: "adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor of (rifleman, TL, IO) at a cost of 10 each." + - balance: "adding VP78 case and SU-6 case in vendor of IO at a cost of 15 each." \ No newline at end of file From f4bbd814d3147bf432ba04de99e4fb9b02561213 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 14 Mar 2024 08:31:06 +0100 Subject: [PATCH 03/28] Changes to SG vendor add the ability to buy more sidearm ammo type and a smartgun battery. (#5913) # About the pull request # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in SG vendor for 10 point each. balance: adding the ability for to buy smartgun DV9 battery for 15 points in SG vendor. /:cl: --------- Co-authored-by: Julien Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../vending/vendor_types/squad_prep/squad_smartgunner.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index 8c64e48f0f84..60afed8b984d 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -22,9 +22,11 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( list("SIDEARM AMMUNITION", 0, null, null, null), list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), + list("M44 Marksman Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/marksman, null, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR), list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR), list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), + list("SU-6 Smartpistol Magazine (.45)", 10, /obj/item/ammo_magazine/pistol/smart, null, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 15, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), @@ -40,6 +42,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Smartgun DV9 Battery", 15, /obj/item/smartgun_battery, null, VENDOR_ITEM_REGULAR), list("BINOCULARS", 0, null, null, null), list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), From 80fcf5ca09f4cd9362c9ae2b3e19930f05559fac Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 14 Mar 2024 07:41:43 +0000 Subject: [PATCH 04/28] Automatic changelog for PR #5913 [ci skip] --- html/changelogs/AutoChangeLog-pr-5913.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5913.yml diff --git a/html/changelogs/AutoChangeLog-pr-5913.yml b/html/changelogs/AutoChangeLog-pr-5913.yml new file mode 100644 index 000000000000..644ce42a8b5f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5913.yml @@ -0,0 +1,5 @@ +author: "Huffie56" +delete-after: True +changes: + - balance: "adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in SG vendor for 10 point each." + - balance: "adding the ability for to buy smartgun DV9 battery for 15 points in SG vendor." \ No newline at end of file From ec7b8cf4e93263967c6a034ee772125304ac8d02 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 14 Mar 2024 15:45:16 +0400 Subject: [PATCH 05/28] Middleclick buckling. (#5899) # About the pull request Drag self onto table = climb table. Middleclick table = climb table. Drag self onto chair = buckle to chair. Middleclick chair = ? # Explain why it's good for the game Is QoL. # Changelog :cl: qol: Middleclicking beds/chairs/etc is now a shortcut for buckling to them. /:cl: --- code/_onclick/other_mobs.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 0bfa0a759287..8176f9e5247c 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -11,7 +11,10 @@ if (mods["middle"]) if (isStructure(A) && get_dist(src, A) <= 1) var/obj/structure/S = A - S.do_climb(src, mods) + if(S.climbable) + S.do_climb(src, mods) + else if(S.can_buckle) + S.buckle_mob(src, src) return TRUE else if(!(isitem(A) && get_dist(src, A) <= 1) && (client && (client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_SWAP_HANDS))) swap_hand() From 3c8c4f2e9e5fe2c4797aa2257a16ed00be7f77e0 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 14 Mar 2024 11:51:42 +0000 Subject: [PATCH 06/28] Automatic changelog for PR #5899 [ci skip] --- html/changelogs/AutoChangeLog-pr-5899.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5899.yml diff --git a/html/changelogs/AutoChangeLog-pr-5899.yml b/html/changelogs/AutoChangeLog-pr-5899.yml new file mode 100644 index 000000000000..9d22f5aa9aeb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5899.yml @@ -0,0 +1,4 @@ +author: "Segrain" +delete-after: True +changes: + - qol: "Middleclicking beds/chairs/etc is now a shortcut for buckling to them." \ No newline at end of file From 6b835c0d8553152c314e2e3ac09d120a82278f4f Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Thu, 14 Mar 2024 11:07:55 -0700 Subject: [PATCH 07/28] Light replacer speeds up colony light repair (#5905) # About the pull request This PR addresses several things: - Colony lights and their switch were capitalized so they were treated as proper nouns when examined - Colony lights don't actually use power, only their switch, so their power status text was incorrect - The light replacer can now be used to speed up the repair of colony lights by skipping 3 steps in the normal process - APC and SMES interfaces now properly close/disable when you are not adjacent to them or incapacitated - General refactoring of the colony_floodlights file to bring it closer to code standards The APC and SMES UI fixes were just because I was very confused why they weren't behaving during testing, so I fixed them. # Explain why it's good for the game I want to push power as a meaningful objective marines want to try to secure if possible. Currently colony lights are too tedious to repair and the light replacer is underused so I hope this can help rectify both problems somewhat. # Testing Photographs and Procedure
Screenshots & Videos https://youtu.be/qJf1V-RdMok
# Changelog :cl: Drathek balance: The light replacer can now be used to skip the crowbar, welding, and wire steps when repairing colony lights. fix: Fixes SMES and APC interfaces not checking adjacency or incapacitated states spellcheck: Fixed examine text for colony lights (improper names and not powered text) /:cl: --------- Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/machinery/colony_floodlights.dm | 152 +++++++++++++--------- code/modules/power/apc.dm | 5 +- code/modules/power/smes.dm | 7 +- 3 files changed, 97 insertions(+), 67 deletions(-) diff --git a/code/game/machinery/colony_floodlights.dm b/code/game/machinery/colony_floodlights.dm index eef05df3352e..13478381e38e 100644 --- a/code/game/machinery/colony_floodlights.dm +++ b/code/game/machinery/colony_floodlights.dm @@ -1,18 +1,19 @@ //Putting these here since it's power-related /obj/structure/machinery/colony_floodlight_switch - name = "Colony Floodlight Switch" + name = "colony floodlight switch" icon = 'icons/obj/structures/machinery/power.dmi' icon_state = "panelnopower" desc = "This switch controls the floodlights surrounding the archaeology complex. It only functions when there is power." density = FALSE anchored = TRUE - var/ispowered = FALSE - var/turned_on = 0 //has to be toggled in engineering use_power = USE_POWER_IDLE unslashable = TRUE unacidable = TRUE - var/list/floodlist = list() // This will save our list of floodlights on the map power_machine = TRUE + var/ispowered = FALSE + var/turned_on = FALSE //has to be toggled in engineering + ///All floodlights under our control + var/list/floodlist = list() /obj/structure/machinery/colony_floodlight_switch/Initialize(mapload, ...) . = ..() @@ -20,9 +21,9 @@ /obj/structure/machinery/colony_floodlight_switch/LateInitialize() . = ..() - for(var/obj/structure/machinery/colony_floodlight/F in GLOB.machines) - floodlist += F - F.fswitch = src + for(var/obj/structure/machinery/colony_floodlight/floodlight in GLOB.machines) + floodlist += floodlight + floodlight.fswitch = src start_processing() /obj/structure/machinery/colony_floodlight_switch/Destroy() @@ -31,7 +32,6 @@ floodlist = null return ..() - /obj/structure/machinery/colony_floodlight_switch/update_icon() if(!ispowered) icon_state = "panelnopower" @@ -42,10 +42,10 @@ /obj/structure/machinery/colony_floodlight_switch/process() var/lightpower = 0 - for(var/obj/structure/machinery/colony_floodlight/C in floodlist) - if(!C.is_lit) + for(var/obj/structure/machinery/colony_floodlight/floodlight as anything in floodlist) + if(!floodlight.is_lit) continue - lightpower += C.power_tick + lightpower += floodlight.power_tick use_power(lightpower) /obj/structure/machinery/colony_floodlight_switch/power_change() @@ -54,37 +54,29 @@ if(ispowered && turned_on) toggle_lights() ispowered = FALSE - turned_on = 0 + turned_on = FALSE update_icon() else ispowered = TRUE update_icon() /obj/structure/machinery/colony_floodlight_switch/proc/toggle_lights() - for(var/obj/structure/machinery/colony_floodlight/F in floodlist) - spawn(rand(0,50)) - F.is_lit = !F.is_lit - if(!F.damaged) - if(F.is_lit) //Shut it down - F.set_light(F.lum_value) - else - F.set_light(0) - F.update_icon() - return 0 + for(var/obj/structure/machinery/colony_floodlight/floodlight as anything in floodlist) + addtimer(CALLBACK(floodlight, TYPE_PROC_REF(/obj/structure/machinery/colony_floodlight, toggle_light)), rand(0, 5 SECONDS)) /obj/structure/machinery/colony_floodlight_switch/attack_hand(mob/user as mob) if(!ishuman(user)) to_chat(user, "Nice try.") - return 0 + return FALSE if(!ispowered) to_chat(user, "Nothing happens.") - return 0 + return FALSE playsound(src,'sound/items/Deconstruct.ogg', 30, 1) use_power(5) toggle_lights() - turned_on = !(src.turned_on) + turned_on = !turned_on update_icon() - return 1 + return TRUE #define FLOODLIGHT_REPAIR_UNSCREW 0 @@ -94,21 +86,26 @@ #define FLOODLIGHT_REPAIR_SCREW 4 /obj/structure/machinery/colony_floodlight - name = "Colony Floodlight" + name = "colony floodlight" icon = 'icons/obj/structures/machinery/big_floodlight.dmi' icon_state = "flood_s_off" density = TRUE anchored = TRUE layer = ABOVE_XENO_LAYER - var/damaged = 0 //Can be smashed by xenos - var/is_lit = 0 //whether the floodlight is switched to on or off. Does not necessarily mean it emits light. unslashable = TRUE unacidable = TRUE - var/power_tick = 50 // power each floodlight takes up per process use_power = USE_POWER_NONE //It's the switch that uses the actual power, not the lights - var/obj/structure/machinery/colony_floodlight_switch/fswitch = null //Reverse lookup for power grabbing in area + needs_power = FALSE + ///Whether it has been smashed by xenos + var/damaged = FALSE + ///Whether the floodlight is switched to on or off. Does not necessarily mean it emits light. + var/is_lit = FALSE + ///The power each floodlight takes up per process + var/power_tick = 50 + ///Reverse lookup for power grabbing in area + var/obj/structure/machinery/colony_floodlight_switch/fswitch = null var/lum_value = 7 - var/repair_state = 0 + var/repair_state = FLOODLIGHT_REPAIR_UNSCREW health = 150 /obj/structure/machinery/colony_floodlight/Destroy() @@ -130,13 +127,13 @@ if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER)) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) - return 0 + return FALSE if(repair_state == FLOODLIGHT_REPAIR_UNSCREW) playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) user.visible_message(SPAN_NOTICE("[user] starts unscrewing [src]'s maintenance hatch."), \ SPAN_NOTICE("You start unscrewing [src]'s maintenance hatch.")) - if(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + if(do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_UNSCREW) return playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) @@ -148,11 +145,11 @@ playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) user.visible_message(SPAN_NOTICE("[user] starts screwing [src]'s maintenance hatch closed."), \ SPAN_NOTICE("You start screwing [src]'s maintenance hatch closed.")) - if(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + if(do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_SCREW) return playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) - damaged = 0 + damaged = FALSE repair_state = FLOODLIGHT_REPAIR_UNSCREW health = initial(health) user.visible_message(SPAN_NOTICE("[user] screws [src]'s maintenance hatch closed."), \ @@ -165,74 +162,100 @@ else if(HAS_TRAIT(I, TRAIT_TOOL_CROWBAR)) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) - return 0 + return FALSE if(repair_state == FLOODLIGHT_REPAIR_CROWBAR) - playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] starts prying [src]'s maintenance hatch open."),\ - SPAN_NOTICE("You start prying [src]'s maintenance hatch open.")) - if(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) + user.visible_message(SPAN_NOTICE("[user] starts prying [src]'s damaged lighting assembly out."),\ + SPAN_NOTICE("You start prying [src]'s damaged lighting assembly out.")) + if(do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_CROWBAR) return - playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) + playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) repair_state = FLOODLIGHT_REPAIR_WELD - user.visible_message(SPAN_NOTICE("[user] pries [src]'s maintenance hatch open."),\ - SPAN_NOTICE("You pry [src]'s maintenance hatch open.")) + user.visible_message(SPAN_NOTICE("[user] pries [src]'s damaged lighting assembly out."),\ + SPAN_NOTICE("You pry [src]'s damaged lighting assembly out.")) return TRUE else if(iswelder(I)) if(!HAS_TRAIT(I, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return - var/obj/item/tool/weldingtool/WT = I + var/obj/item/tool/weldingtool/welder = I if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) - return 0 + return FALSE if(repair_state == FLOODLIGHT_REPAIR_WELD) - if(WT.remove_fuel(1, user)) + if(welder.remove_fuel(1, user)) playsound(loc, 'sound/items/weldingtool_weld.ogg', 25) user.visible_message(SPAN_NOTICE("[user] starts welding [src]'s damage."), SPAN_NOTICE("You start welding [src]'s damage.")) - if(do_after(user, 40, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - if(QDELETED(src) || !WT.isOn() || repair_state != FLOODLIGHT_REPAIR_WELD) + if(do_after(user, 4 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + if(QDELETED(src) || !welder.isOn() || repair_state != FLOODLIGHT_REPAIR_WELD) return playsound(loc, 'sound/items/Welder2.ogg', 25, 1) repair_state = FLOODLIGHT_REPAIR_CABLE user.visible_message(SPAN_NOTICE("[user] welds [src]'s damage."), SPAN_NOTICE("You weld [src]'s damage.")) - return 1 + return TRUE else to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task.")) return TRUE else if(iscoil(I)) - var/obj/item/stack/cable_coil/C = I + var/obj/item/stack/cable_coil/coil = I if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) - return 0 + return FALSE if(repair_state == FLOODLIGHT_REPAIR_CABLE) - if(C.get_amount() < 2) + if(coil.get_amount() < 2) to_chat(user, SPAN_WARNING("You need two coils of wire to replace the damaged cables.")) return playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) user.visible_message(SPAN_NOTICE("[user] starts replacing [src]'s damaged cables."),\ SPAN_NOTICE("You start replacing [src]'s damaged cables.")) - if(do_after(user, 20, INTERRUPT_ALL, BUSY_ICON_GENERIC)) + if(do_after(user, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) if(QDELETED(src) || repair_state != FLOODLIGHT_REPAIR_CABLE) return - if(C.use(2)) + if(coil.use(2)) playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) repair_state = FLOODLIGHT_REPAIR_SCREW - user.visible_message(SPAN_NOTICE("[user] starts replaces [src]'s damaged cables."),\ + user.visible_message(SPAN_NOTICE("[user] replaces [src]'s damaged cables."),\ SPAN_NOTICE("You replace [src]'s damaged cables.")) return TRUE + else if(istype(I, /obj/item/device/lightreplacer)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) + return FALSE - ..() - return 0 + if(repair_state == FLOODLIGHT_REPAIR_UNSCREW) + to_chat(user, SPAN_WARNING("You need to unscrew [src]'s maintenance hatch.")) + return FALSE + if(repair_state == FLOODLIGHT_REPAIR_SCREW) + to_chat(user, SPAN_WARNING("You need to screw [src]'s maintenance hatch.")) + return FALSE + + var/obj/item/device/lightreplacer/replacer = I + if(!replacer.CanUse(user)) + to_chat(user, replacer.failmsg) + return FALSE + playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) + user.visible_message(SPAN_NOTICE("[user] starts replacing [src]'s damaged lighting assembly."),\ + SPAN_NOTICE("You start replacing [src]'s damaged lighting assembly.")) + if(do_after(user, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) + if(QDELETED(src) || repair_state == FLOODLIGHT_REPAIR_SCREW) + return + replacer.Use(user) + repair_state = FLOODLIGHT_REPAIR_SCREW + user.visible_message(SPAN_NOTICE("[user] replaces [src]'s damaged lighting assembly."),\ + SPAN_NOTICE("You replace [src]'s damaged lighting assembly.")) + return TRUE + + return ..() /obj/structure/machinery/colony_floodlight/attack_hand(mob/user) if(ishuman(user)) @@ -240,8 +263,8 @@ to_chat(user, SPAN_WARNING("[src] is damaged.")) else if(!is_lit) to_chat(user, SPAN_WARNING("Nothing happens. Looks like it's powered elsewhere.")) - return 0 - ..() + return FALSE + return ..() /obj/structure/machinery/colony_floodlight/get_examine_text(mob/user) . = ..() @@ -251,13 +274,20 @@ if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) switch(repair_state) if(FLOODLIGHT_REPAIR_UNSCREW) . += SPAN_INFO("You must first unscrew its maintenance hatch.") - if(FLOODLIGHT_REPAIR_CROWBAR) . += SPAN_INFO("You must crowbar its maintenance hatch open.") + if(FLOODLIGHT_REPAIR_CROWBAR) . += SPAN_INFO("You must crowbar its lighting assembly out or use a light replacer.") if(FLOODLIGHT_REPAIR_WELD) . += SPAN_INFO("You must weld the damage to it.") if(FLOODLIGHT_REPAIR_CABLE) . += SPAN_INFO("You must replace its damaged cables.") if(FLOODLIGHT_REPAIR_SCREW) . += SPAN_INFO("You must screw its maintenance hatch closed.") else if(!is_lit) . += SPAN_INFO("It doesn't seem powered.") +/obj/structure/machinery/colony_floodlight/proc/toggle_light() + is_lit = !is_lit + if(!damaged) + set_light(is_lit ? lum_value : 0) + update_icon() + return is_lit + #undef FLOODLIGHT_REPAIR_UNSCREW #undef FLOODLIGHT_REPAIR_CROWBAR #undef FLOODLIGHT_REPAIR_WELD diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index dd0327e3821d..76550fbe079b 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -190,8 +190,9 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( ui.open() /obj/structure/machinery/power/apc/ui_status(mob/user) - if(!opened && can_use(user, 1)) - . = UI_INTERACTIVE + . = ..() + if(opened || !can_use(user, TRUE)) + return UI_DISABLED /obj/structure/machinery/power/apc/ui_state(mob/user) return GLOB.not_incapacitated_and_adjacent_state diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index c9863d3ee9cd..46d9374cb832 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -281,14 +281,13 @@ // TGUI STUFF \\ /obj/structure/machinery/power/smes/ui_status(mob/user) - if(!(stat & BROKEN) && !open_hatch) - . = UI_INTERACTIVE - -/obj/structure/machinery/power/smes/ui_state(mob/user) + . = ..() if(stat & BROKEN) return UI_CLOSE if(open_hatch) return UI_DISABLED + +/obj/structure/machinery/power/smes/ui_state(mob/user) return GLOB.not_incapacitated_and_adjacent_state /obj/structure/machinery/power/smes/tgui_interact(mob/user, datum/tgui/ui) From c4a6cf3c8d5ee8f6e2ef89e1f6513d5e40d0db6a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 14 Mar 2024 18:14:39 +0000 Subject: [PATCH 08/28] Automatic changelog for PR #5905 [ci skip] --- html/changelogs/AutoChangeLog-pr-5905.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5905.yml diff --git a/html/changelogs/AutoChangeLog-pr-5905.yml b/html/changelogs/AutoChangeLog-pr-5905.yml new file mode 100644 index 000000000000..29243f64bf26 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5905.yml @@ -0,0 +1,6 @@ +author: "Drathek" +delete-after: True +changes: + - balance: "The light replacer can now be used to skip the crowbar, welding, and wire steps when repairing colony lights." + - bugfix: "Fixes SMES and APC interfaces not checking adjacency or incapacitated states" + - spellcheck: "Fixed examine text for colony lights (improper names and not powered text)" \ No newline at end of file From 3dc76af9f54b0a6540ba9abfb29e7098cec2241f Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 15 Mar 2024 01:07:44 +0000 Subject: [PATCH 09/28] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5899.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5905.yml | 6 ------ html/changelogs/AutoChangeLog-pr-5908.yml | 6 ------ html/changelogs/AutoChangeLog-pr-5913.yml | 5 ----- html/changelogs/archive/2024-03.yml | 20 ++++++++++++++++++++ 5 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5899.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5905.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5908.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5913.yml diff --git a/html/changelogs/AutoChangeLog-pr-5899.yml b/html/changelogs/AutoChangeLog-pr-5899.yml deleted file mode 100644 index 9d22f5aa9aeb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5899.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Segrain" -delete-after: True -changes: - - qol: "Middleclicking beds/chairs/etc is now a shortcut for buckling to them." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5905.yml b/html/changelogs/AutoChangeLog-pr-5905.yml deleted file mode 100644 index 29243f64bf26..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5905.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - balance: "The light replacer can now be used to skip the crowbar, welding, and wire steps when repairing colony lights." - - bugfix: "Fixes SMES and APC interfaces not checking adjacency or incapacitated states" - - spellcheck: "Fixed examine text for colony lights (improper names and not powered text)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5908.yml b/html/changelogs/AutoChangeLog-pr-5908.yml deleted file mode 100644 index 5b62ea4ebe26..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5908.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Huffie56" -delete-after: True -changes: - - balance: "adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor of (medic,comtech, SL) at a cost of 6 each." - - balance: "adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor of (rifleman, TL, IO) at a cost of 10 each." - - balance: "adding VP78 case and SU-6 case in vendor of IO at a cost of 15 each." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5913.yml b/html/changelogs/AutoChangeLog-pr-5913.yml deleted file mode 100644 index 644ce42a8b5f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5913.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Huffie56" -delete-after: True -changes: - - balance: "adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in SG vendor for 10 point each." - - balance: "adding the ability for to buy smartgun DV9 battery for 15 points in SG vendor." \ No newline at end of file diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index 4962062da515..62e6449f15b3 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -160,3 +160,23 @@ colors, such as on autoinjectors. - bugfix: Fixed invisible cloth tables. - bugfix: Fixed wrong shading on the large floodlight. +2024-03-15: + Drathek: + - balance: The light replacer can now be used to skip the crowbar, welding, and + wire steps when repairing colony lights. + - bugfix: Fixes SMES and APC interfaces not checking adjacency or incapacitated + states + - spellcheck: Fixed examine text for colony lights (improper names and not powered + text) + Huffie56: + - balance: adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor + of (medic,comtech, SL) at a cost of 6 each. + - balance: adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in vendor + of (rifleman, TL, IO) at a cost of 10 each. + - balance: adding VP78 case and SU-6 case in vendor of IO at a cost of 15 each. + - balance: adding M44 Marksman Speed Loader and SU-6 Smartpistol Magazine in SG + vendor for 10 point each. + - balance: adding the ability for to buy smartgun DV9 battery for 15 points in SG + vendor. + Segrain: + - qol: Middleclicking beds/chairs/etc is now a shortcut for buckling to them. From 311e8f06c0eae7c6a0ab71ba04943c93c55850eb Mon Sep 17 00:00:00 2001 From: naut <55491249+nauticall@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:44:09 +0800 Subject: [PATCH 10/28] Fixes pill bottlecaps not showing when closed (#5932) # About the pull request Apparently a little `pills_closed` bottle overlay got accidentally obliterated in one of my commits from #5838 a while back. Whoops. This fixes it. Pill bottles should once again don their hats when they're not opened. # Changelog :cl: nauticall fix: Makes pill bottle caps appear on closed pill bottles again. /:cl: --- icons/obj/items/chemistry.dmi | Bin 24338 -> 26835 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/chemistry.dmi b/icons/obj/items/chemistry.dmi index 77d554fd3b90e19e0baec9a93ccd92178a9824e1..e540af809714e0fd35e9a72bbe013e01f1803551 100644 GIT binary patch literal 26835 zcmcG#WmH^2vo1V?4({#_f#B}$5JIpJ+(~eEcZWc5_uxT-ySsaEcY+7|Ht#uSt^4!d zyT1El*06W)-BVRv{nS%cO}L7(3<@G4A_xRRk&~5F1%bc@ZyyL8a3|O>UlF)C@lexp zk~DQRcCfT_vb41Uf!s0*e~8&`v7!f03{_PxAKR#ZYCa`(C@s+-UheQy6zpV@I9U#1 ze!lUP#SV}>##7e`xONwGx8-zSI68cocv2tJ+uQXQH(4l=SF*Jk*~+wDE|LGEG;Ac% zx>j)eL6J88=WLRBeA%yR;=G@U%#rG>0$;Ny$WcCGg*6A3Fi8H9m}Lp`@GFrC`xjm6 z5owt6kMO&`@xO1QplH4vHYCnH|9-{E6eO(CV7ay6gCOf4m_94ei(PKN(LP(rnJKs{ zE;5T=chYuXTiLCB8dO;DcfVXd>kZUFeIyv}WLz!}ZW=l*T%)e=gu&xetUZRv%-?7v zlOv~8pH^~py2aqK4koVF#X{<9tdwosQI>7g(JJ7>Vq)0h_ek9Npa*Z)z7CG^mfY%g zH$eYVhl|J1A^eF|z&Mkswe)x59S>}!ZgrQJox}mf1eAU?js4I@eX>q^r;8-d*?Nu3 ze6&>uH_8A^c@qa=B(+eC)OXSWO8HphPxISaCWrP+&DXrRh91O`?7&dkcO|U`zDp`^ zSoZx0aih)H3Az()p^ov{6H~nx`0ASa2439+C=iGoBqu4R=9Y2N=IKS;mwNu}`P0L! zAby9ne-R(Sn29N$7|AL!8eAJ-V2%f6;;Jufi|Quff);s6arrM`keMQ`Q(T-I2|rA3 zo_mCkXmByRNA4G0T+kn5o4v2N>5=YKOiTl`m^>?lluI0Gsg)jUB4%G#31e;Y4+->- z9%DKG2wge3sy`o<7H1t5?PqzS;zsrvF^J?%(;3ugF%2+k_`S!CEELxQH)t{aKs1D1 zG^){h7ldN~JXMPRe?O>P_@UFNCMxspuH5|UwQlBzO4DhT`|VuDvuU=-?~_~C^R>)c z5$}K3zgBz?+ZP;e@mBAf@=j;8NM#7xN`ACuXJ@#;pEc97AEXd0=pC<&mDD{)=Hc1D zG-T`D&xmCoA0KF^VI9`+@28Xe6-T|ap>Tlyt-dzk;s>%Gnp7?XOl z+Sa~Q)#P~b{Q775HF##h$9<9w-qv%R=MnAM<&pf+R-~D*SlJGq#POKNcdG@zwZmM< z_snrDtnVL2`0Qr=0{`&4?r&M%N&C-J+1sM$10|Wfuq!WD>%i?6*YmxG2JY6^m&X)t zYeH_@H60BMA3&q~>r#%m7cDAQsSQ`Mvv=A-GN)h}mY=&9>t{rDr+>+O;LW{VW^$}; zMgBq_DFTujd_P`OzI;DYKwDXxo#i}mG&iSvr08a$hW7d!#eupad>1toDBJT^ffe)=W$A1$1;SDP20tJ`V)jSeaX_tvrL8rd`7yx^nle_a+< zRG_5u*zP%mRb%M06o1I{Pd@XEj>Iq|f^N`~hlKx%4S6ramVfK_wqVS!o35xUE@!sz zp&*|cORVLpwgygfSD2-2yho}hcpt~b+m55B;hYK2yE7?oZ||Ygj+?(ou)lXb`(9rb zUpq%9vcEVyX1CTt+m4gAMhh>;R=87yXSjV7jKUZ14Egaq zScwmw@gId1A8m;{$1?@ky#F~VUPVc-`My4{x^&1r8GD{+ z-k05x;zC|{N*eud4@zzMB^u3poAps&_aZq^cp{Z!fah^7JT~{j5&yml&)ZP) z(f4Nc^=9k^YXL0=Jiy$D8;?gu;53SJ{1gdhY2RH5JXx^kq17ad0CQlRHJ|ExyZY-d zdI_*-bCR96Ekvhs5LH{w;6B-}oSHhe*~Yea?(0v6j8|$-&bpE6`Pg&V=syjZ)^=FV z(CXD$V7Q#GMIX)-8_yIeY1LVLd^qtn=a`7f2)Ah?LNVfBi)@ROa;?KL^;Lwjs?mx; z)?4)QtmL3Cz9+PaZI7$fSH9%3TCQU-@5tCnuYJuN3q8SOX!rXs7{GVI9RL3Z75?w> zt-SZT&bl$X!`=Tot6GHQe?YZO0d+BujwW`JaF3Tq4pZ~P!hhxA`7zln(^9Vdi%_E?^2Yl3^QjvcbM+n!BvHqQjkcMhFHPtMQIS;`<) zYnS-Gd$U+m&1P`Q{5O&(&(ANvA~s@Pb%s!i$2-TfpDd+L?p7U;vhDs3-CyU&+I9c^ zUgPSUS5E2m+Htn`iIDJ8%oR`h!I$vz5zPa@9@mZs7O(Chx~-Ym+n%TQ$&ik}M~o-W zt=20<_g5m1wPFLa3k#1f%tAs!fhWEfrvmoFBC8tQj{?lgY=b`f+g}y$Thhb^M$??D zY;V7#qimk({$^4KtlarAuj+B*9!<&sLQvha&(6BsVC=+7Vz0m#p;0#bG{y! z$~Mo#Io4l(H`J0*>a6%+b1vcnj|1)>5qqH*a1mc`3MgIxdx7C-W zh*_K4-SeTv5V+;MM1+H&Uv{r1|q$bp#c zfQ!NWkc4-INlIhY0@BNM{_|q}uC75$M}zCD4Np-f|7rDUW@cufu&o4CM34K{W5k3z=Quu;`l?TTwoHrLwaA zBXHk2{@u?}`Yv6n&+paz?z`Y_uY}Frz~kLk6%jMb7i8vU2b$lRZY5x=wGOh#^NtRy zTg|5})U1~!=@hxf-y+K)-_BZ^t!{m53}Jn5kpohL7=J(GX;$vc^cVsU@T|RneC=~)AaA_>ydc-GY7X&Y-S`gQ}**WQc^3Cdw!R3KHkNbb>Smprx~_YWUeSmgb{8)W)lvIXKhURM)-O+d+LR*o*Q09d5~$S=GftawtEv1NYW7lPxp zAu>^s@{Ct|=X>tOTn0Sx(i4dc;xeZhe%BsC^Q|Mk%y$=4f22lc>J9gpeq0*TZ8H78 zAUyv&02TF6n1MSI-`!kM#SYS0_o(!ynY8cq7HLdJvhKJ%Z+D-agJ$gfk)PoFMSu4j zvsT>0YhUtWgxv!xiN3H;vOmV!2y>g);(HPSp$gL2_WOjJAn$%i)#3eL_v^l7&^=Y}-SdVGclSz7e*OmASZx{@)bVfZ zd;6>mRco^T*IQg>a8M`R-p~(8lxcH8^H1zt^i?7BHx` z!$-pG%W;!Wy0Fb<46ouqa;!cTCRMuxLRHsE$I0}F{W{v&p6Yzx`!D=UkaN$>4o0`A zrPm#-iN6+7iyoaa7{IhX9%P+^q+#o8p~+v!J`ec1^d+-;Y76;|)_1(luQVPnA6LMi zKudd(d0*0uW^#Kk8n3(g^6V+6$MCGJ>n1ewYF~~OyK6WO9pz!H(`CEi)|x4i-7b;{ zxERluA1>Ay-<1e%e)Q}tOV;ZJp;PAMGS{9KEK5Azkq$mRPm2icD^T&SoyP9?-xHvb zC{bO^JPz(xeyb{e6UH{f8yBQ?c@zJ3vHtHLN)xINCq72|O}w+gUPMCl)&nZYKV=IMZ#e4s|wt_wSzo(W!$y;r$-7mm~MbA1bPDvBF_Kq_Xeg zfs~>BmY0{YMqer`D+%W2=Gu9p;@>@-Sl--=2rqI)cRpoL*geK*yh$0_w|v*`3-W#L zhK4ooLb?>`sL4CvXG?tUSoZ25J+*y0Uauf_t$fXAX@|iI07+K{t{D%E1fmH^j&!^@ z!%0^fuRTu)J_?e09pom|4ZJNOEetq{scy|!#%T1roe>ZD7gX|xN9ozjKanCQg0Sjz zzMxi~d3}Cv-t8!kuP$e+?vu6xMHnfsSE&Nl9?V2Jvu;FSyOKOlw&=V>oQ{OmmwZnx z#h*e}Eo-izSfAq`-ucg&-`XEP=tM!#%wM}Z9##x}&!4j-@&h{lbv=6sQd)Hj#X|MW zix}9EFqvvuaNeL@6r(bK{*^Lc6^lCTgDdKV%rfD-;E}U0aacM zeRNk3$;9gElrc9tI)U+6PvxD@u89KMQl$u3^CR{Jym{}Mo9}PiOO+W&QTDuw-D{<; z?qXZTT`GDu zHrcWJ2Jc)7ulz>(PW4+3tG_ir%iLk_PW_nnVUVoHZ~aUc%-SvBsolnMxv_afw&6>X zvE;<>w<%=cxN5Q8H4iO}ICRIV*h9Y%G+RU8kY5-_Px|53zvr0Dt^^h8WuZrYp+lUs z62si!KyXuB3+*1ivxRcBD%B#gPo*TrT>@>uLx^eTkB0=>JTx=aZi?TP(ezkrRGs*t zR^en@_5FxSY25C$ALEcpBwIPW4#jX1EZC$qO1x|%MiXt3^WXMi8e?$NK+kS&`gUcL zK^L1QZGS$=*MPCGvlx;V`v;tCvU+&IJp-R{Xko4p|5(~B4s&YOi})MA=e;-ZQdw*P zV9`hA-^67=6W+iKmnM{>Z=0Tta1m-6@rH4!;+oH+Gbpfa)ys@K^KFIq9sI^zrHw`> z0$3Fst}Y!hLXso(UaiC)eVDs15@e|nmstiVquu~wMsUOy$-b3oXsiQoV8mGy(Xm73 ziYd&vMiB6tUve@;F#ssV^26g-qiyrOYXU$d)ER0(JD3b*PnbA%K@Xudlhp2s4=f#o zBH`YYkE7p-SlwqtKov|3+E~O{^BNs)^y;Tt#-0Hg= z?n;C($cyPKHD;xL>(uEPa2gB%guaNs^65){$AL6%`+Dw!u!}O znn*%I5jvRydb~c+HU{@n9_s( zH=Jl#YG!+yoi_<8vF7>ine9&$x&Y+@{@wm}Tu>!DeAjb9$GPfCzRnhOX)1p)>?jW; zb@F}yFK8MyV7Ug)$Upuzr$dE#1u34Bw^iY ziar3Jug&OQOGWLsP>GF>=4gg5@qAcuFrlnR<%pMTfc`OH2*0XH;=yw|sDP@WIYt~^ ztS%qr>RR3W)oeLF`C2`6?R~PfF=e_b_{NGsKq&=~*W7|uu$UFW_{=++@Ej~T1wOJMGH53dq?E#g9i`nsDFIzrJ_+6)m-~Ux_>p29?ZG$%h^1%sGI_`!mzJP%rVgs->Yv z$a|AMv+xS5Ek)6Hq6uH4zkmI=K)}m6#63-|GZ2F+cy)5+c99$EWl8WR7^c|%ev_dX zCBaqCc)VY@t9TO^b38Wa``(wgk=?I$RPhjgjA^fMINuM@lEdnNI|UY!68=Z^pAzQ* z=zjfQ(SP{YXd?*DIo^gJB82ax?j9s!iqS!7Sc4`tvDTtEWyqZa^(nPVQ2pGw$ZZlN z*Ht5$%RcRXgPvpH`GE@8To|~5edP*%Hb(K7s`|x)RT_Ix;?zpI*5&5cg8WGs*dsifZmb9wVw}s4iL9J^3zOb1(APl!w z{&*|W;qekdgDMDgXb?9U)u>Md3uxAvbnuow`=9AnST3*~yCf+<6i`8MZSv&_Hr4#@ z1v(u><;uU(71_giAYRO2oLEhO$}#-JycKFLZ(4PefM~_S(uwoZb;UekXYNvXvj78i z2o$~)Em!{-r#5RxLVhpzOv9Ha$M&bR@QM!Dd^C3fNONGnAAFKL9LLHqCdj3#+QhKn zh#HN|gx=pexa;Pf$-mBl-E^lO%nxRQZ{Y}e=j%7AiF0(4t;qxbt{#Vd5ix05+v`n% z&pm5_ANRpT7+F5rJ#hmk%X7hhJe$37*0-aZC4V(_@Yj7$C814#62zk>b5#vjDV!MF zD8Qu9gcFAm(u8I((tx2p4mo^?%mublos*tsr>|_DE!(j&tItn4q|if54zVpdz>7cj z?n7|bX9`-vCBGZJFhlO>FZjZ9YO7{5MRWN(H|9p`G_jts%iI3|PN7p7KBx#0t+&kc zMK4dra6|Fec=&j`r0m)R^7wq5%@F5|Al&IJ+6DKT=g7uPq>%~Hc;1BFTql> zAS{EtVQ4;r60kU^aWjYoq@l>;W;{2vmM=2ho4YL3X{o(Q<<8LfXd1<q7g|31!bSk zLR43nwBW7U=1n4AOH+qYXL)XnJXYCF}0jcbh)2Rhv6X0!u8{5-t4SAyM zQQ_P*ny-cfhr#nGFy$CI3c7pxNKgoqg@~&V3V7MFP>MivFsN)cUDN|iQBAs6U@t3O*y&XlS~-}fX$dkLpCk)&-~dCf(Xbocv1#LvvWk@5{6be%#Ql-*g%R9{Qy1FT?%_oDF-GAvlXtCIG}4 zH2r0@3jt3V`ww&CRPLd?hA3F3IEBU+%)j6v8#2UF#_5|9W>DFKL z$E6Xh8}TBXMU7T}Ac|O2U@IpM&`Kb{x=oV&PerC2^o0pmA-MWK={QdJ8_}szgZwwM z`QI8;h=2bhA9NmgaLkX^dqt+GUuq8hr9Tv?RqjIi7=HnK**;wRKfxIN&Ib;3-Y%d0 z+w^)7J*dwiXbWR0s+h4?d;7Av>xdfZvKoL(kGq>UVv*`C{>CaAr}u3MQWM-dAA0gt zpZ4Mnj%9NuZ&01l-Z|S^Jv>SP5O$*(II(mp5f#&83iMI*FN)y)>+Qxi;nSaLxE2>>#KG1~8zjQlvf^`&I zPdcSTSG#hIsRT3GCtj|A)N~Q({)vvSRB{kSgYI)7oOPLU6WcZ$SW8WrrGz=&N*N|o zR=Z4dTD4LU9{SJo)sai|U36Vj2wu6e!*C|JlqhHJ8THD&pRpVpkci;O+qh4-#J7>R zYJrIR4wii}4e~P#u(Ws~V7Jq`%}&d`itfU4=r>E8aM{XyvbNb`aTPJCp8J@}enRm`=A zA4E3_Ps;ME4Cy9!2Lw`nezJ+m6vYECh#td{U#J4(-s-vI`4tO{L5E#`44g5=%V`{3 zYS52CAaQ1Do zIJEuDRO&~+-@+Mx=U--8?|NtRRqOkJz{`r%G+1{owq|qdJF~gho8s=tmeqJiNW6EN z8beD}w=}7s;Okt{bBsgeZ9swdpi7o_I#oSg_nn|#erDXlv(Cb^56RBC1UhIJ>L4j+ z1frGiAMWq;?krSB8xWaPws?y$MYfX=p;-~sM$S~VV^^mp@$pltqA|beO6X(MAQUJ_ z3n}v{CD@Jkef@WUKB617&1RTT%)7UN!X~jnBLHE!C}ZCXCHV)Cri64G>>LFONuD^p zPURd%5=clSUnro39X~p9E!F|lG!nVwZ;-CMO><2Z|FsQY55^ih_bYVgj;rt~*bi7K zI_R?2O)!2aUX%^ON58sJA+vTK^GK=| z%0H;Y120-!#|Jm6e&fOs zXFdV8_P0Yt_B<=WsmrW|xIqI(0cBh6lUYhJ&FbyzuNU8Unz5ke8w=)W0g3uDBmfQ% zXq2Fl4kh0R3~}Adxn$@eG*c4Ac!ZD?FI4?yQS0w-IR&QOzs2|=5pGlU`%wOYy_T?^ zPKSQY@+38e8L<54Fy}WKoN`UffNnJHn4(S%q!e#>BheQ!;K_1?IkcBCaE@X8#z*Ji zO!TLA`Iuil^XpCdtDCJ-h93F$S8Ki+CoS*c{CPTm2qq6gpcX@iNeEE!LF0AYc19|= zG6lqvy64jR&C2LYC+g>t&4_hm0ceKoFhTH zHiSBC(GwfiihI7`X5#WMocD5}?gB{eY)xm9CA0Gh`edlVn4nIbP(C~m>m!uBb!wb^ zD>O*2>(QrH5}rh4W48^vMUfe&E)$=P#VbxEpUC z{x%|p4YI)ec4Ir)?4N2WNXL$wlA7ZT4cq`JL4C|IKif$)O}_!iaB-oR6sQfEiKFM2 zY7iw*jMDg@vjDBp6UPXi+g<&~!NWm>iRkvM?GjNd(Yzmc@z2>PqEtP*Xi4dVp3n#T z_iJ%JB4AAPf#V5^@URko9t)!LNO;YJC84KovUC=GM4}M6W;`<|ybB7v%v$ZmWMAL} zB6}zRdUYPlkQmMCF<~C9%#*hu?c}33F(*eOz80@6T6z^`GTM6sEYsG{9i|`S&x_f@ z;j;Z8WH%{R5pKaX&&}uuLNP^{Ovunit6y1`>IPlToPxoe*>Jl`hFfFvLG&a3ZpA@aZ7`ls=zL(~W=o;0l-M&sZRyLuV!~yW`P?S{>*qwkO zEbAFwiD`+W?sm3(M_1ku;zLdCWzU~b$;t47LNC}(d5{Ry1s9}=WYA3vU{`e>X?5*u z83S%sduO5O$K*TR87QF1pERzhozH+}@np^8=q z?LYao;*Y@6Y#@KLlp{MDx8a`nYCRk8j9LdJvmL{1%;qzZB?+|PHpHg?HLG&A zdI_Rj8iGa;v?Mx>D5rMVeX~>ajk{rC2+1$RI8r~Vu6+K8E$&m&^@`fB6r(W#B?<&g zmAn;XsYsl5aien_y+MOAIvneCQ2S5+aA_F1GIOoL$matX4rfr=uPk5es17P|SDy#K zC)EPPCC4j2HF!7L>TvHXW%izo$EAHwogCiyYc3595g|9QcL{K*7ctGoAhfko2h0VD zPMe~suVfcL5YkgHPoNYY@EldK?n!sqSK1um6VVn@V&|P;lr3rvHyI7u8fDwY$$sNT zXmxsD$Ctd!=q71^(h6^PXa1x|cuy+{9o%ivYtGlOL#3;>)#u@sqA9)C+;G#HAL08j z!c=HRzW)kN8g5{8Byv(PDQ$Z16Mx_CPhX7g8=d>FM-4%rRiU1m>=9C8BI~^uwYA9O z>V5LY{iX2r&nHwgErgFBw7J-)#sb_^;U;J%-Kr zgSpNRtvx7Yl(SuY*tYtc2u=|n;hmHcN>20hvUKhF>$ zq*s4H8Du6pm0y1}-`-4k{FB^AlyXHA4h zuE>H@f$ioIbExIZN@|%#;1$u}PlXA*x+IGdjTyCtE2*{MYUbWHAh5PRdBV}A36sg-?g|4 z<9z2EKz7o@xf~TiPFnNOpu{{>x9tmnUMgG6VFLJrg*n7QbAS{uB}HvayFx>MPg=N2 zIz3M7@F$!WXWVd2nVr|X06`ARk!N6@CSeTVGL#FMvdc>ai7QyxUa>QvC{ zCBENY>r|K7+iFTVz2|aWX$}xkd=kJRaY(u9NQnp1en$PmbR$isV$(mZc=* z7nnmE8JEaIZEJSixB}~Ln{OICms^FpO8`n?UAYu`5ooh;<-#BA41j4?r`)`$mN+`% ze=Pe$l-P11ked0AM^AN$S6yy)-J-t`=-U>yQN%z?ygc^^97mTP>7UW=l@hx6XdU|m zDA{UO;-$scSQ9Tx{1tJ7c-q(BYN6{Zw=qBDommtQhJqH4fXuFK6M^a_*r;#2J`<^9 z!){`pD2sQu;<@-OSsR1Y%;wT}&};jR$@4;TxQUndf#Q!tc>VayF`eXEgPM75|7uR$x8uW{cBIm5xp za3QG~-MTc#D)IY=9#swkcoRYWTFItalySy@HIF|Wu74FRZZLy%&{H}+S5vf4!#0HG zE}_ZxHO@>q$k{WmMTec*r4wZw_5Vt+(q`=9Xr2pW9SyB(MzG^sI*dN@yx(OsgW}dt ziA)W;LVS-@!<;kgF0n*fkx3Pvcjfn%(+(kwgEvVrn@h13KFD;pa3%%WKy8vb1UNn+ zyMwgkw1rrLp5p3WQcXNasCgJEwwlx^DylRC#0ze2L}{NkbYay`hD&l;BeAsxkr1>_ z2d2+AOBATn9h<7&)!$5h6>6F+*D)SAeBYOsG5VFRc%i)f$|Dfq(O9bCt^luMa3(F0 zW8gsXRC!0RnGTA33H*rx-XE|m5Qg=uORU2GuoOhej--0+yyx1VhKCG7H#!CQ2kA`L zHEfx=IVm`934SLFo|wTIABq<{qU4RV9GVo(m?kZoEt~WcB_Xw~`7lgRIy5Z+8PhU5 zo4Z+(z`SSWcH5bQN*z2h@@g5*yTlKI=L1ot;HQ`oX%5#$oxFl{RGXCKxQIdeFBRyR*Pg{q%EdzV~m z;2L3AwuJ}dCl+zzPT0~v1`A$%Fw0gsM`^)E6uOW1(6XS6scUanA=G|>*>Mxv5KATJ z6-0U8Asp2|AK!gXDwC=kqbO#MM^U{5v!>u=6B>^+NL8I0FwWeOOz~FF`!oq`M=@Z7 zto56=>T$4{3z7iYlP$ZC_OPaK3Xk(Nym@xxfS^u+TG`$^-KJIrRXXYf^S!N{C3EP+ zubAU4x9f&$HnciVI(N3XMAw?3{H?oYf=ocyL9DD0B*X5DR^f5wgU5S48fKJ*w5dyg zU_$#7qGfHgX11GBidI-j^q^<;Vllv^IxGUV7S2YWXIDz@G4hh>pHcq5S;-qQIBq9^T;ue^2dO5Ys-Imbq7 z1&w(!#^)K?u?DN3sIte$O1MGpqH=}7wQ92fdKHcOmrr6t< zLMR+0F05Rlez#s}j_i`+9S(U7y$Wi#GVb{G)EYgZKBh8-JjKj8wXRk7x^<(4OodP= zHg-An2J;^wGJPQB*v8xdI1fP-JcYA_bV-CSAfg-D_!dxZ`5v=-r!=nrX#2xR*=K(y z>y2r!0FhG;kc{fa2AW+j-m+jfX6~Po?!Ld9Pii_``nqi7gSGAUUv7F^-HTcdM(mb} zSd?^Z&U00h?Nj#=FQ!X3bPk;z!`)@>t1^r5a(m;73M|coEIYCBp8Ou`4KMOl2VC?oS<>$;joK)$t zzC{&~mviC$C3HuAM&1Ba))LG`cD}oJaw!TjX8Bq-UH!G1uol3dKy4Dfxx!`y7UGwk zd4cmZ8`^NzTb4^Un$8~^EYL$k_xa?;d@I6+C7#3f?-#N&4zzDWMFlsQeC@)p6N%4s zwI9zhcZ22k(4o0P{nw{Gwy*xen-t*cW)T97yi+Pq$B!ne!mpoWv=45I| zrqdn_k)0E|(+e~KVq2@t3+&qY#W#D7=`>v?ufdSSJF{Y(Ql>y24*I;pOK>aC348EuAB`5j~XT;jf47! zCRyfIYhkQeQ!30)-@Q?kn9q(rGpG-LBS5tM`dw3N?8z_Hjg%S2p6Me{AF1r>FsUee zi~Y0{a6%nM$oA{G7yW)nOLnT^=-+e;yE+63yHSGahrYzWA7BY>jfsN4?^<$*Rj8Yl zqv>x0k+Z-|LM3Sfor(`1%1mVG)`@Ok&i}Y_dKepb5hZ}&I#?=E!}iZvLY}JgW#Sg* zf$CRiFios@e-gY^&CaKYTys938K64#QF_2g=zq$h{r~5uvUL&6frFi2-)cj4Qj!Av z4fkt(?aY((_3z(`tGgxrrbpyM3Q2jD(Tv>v&*(-}tqgh9iK~N(-#!Mwi+z4O|1Co! zjV;$`9p}%0`J_nLN_`q}N`L9d3#WsDAZruf=>cg@P;0i{j)=b5#_=SA7M2fhkm-s2 z(`fjiPDuOj?^s|4{h{V&=AG;M>81w|V4eltC1IbsWp2LOth;$-9G;%cLmZicrN?Ph^&2Y3KP?*?a~} zb&F8JOrb@3wC%`I>v0>V+Ebp9=WWe9x47#qyf1?h(e|=ggHc?_I`V0h)NV~9v;LGl z7#e=D;;Ioxg&Tyd!J;Px*mKZsRnz;<75ZFnXbmGL+4nLA9!sZ6qsp`Q2v4A6{&K#CI+eG$OQE}lQWrvnC$2*&2aB2@xRGl zu+ulI%G(gzNfFb$OV|06uk-LqWZCXdpcb)ChJ#EwhLR((+hMpHlG>N}h{4j?uj|uqDQ~lcJ`+#}vCK1v!M{aFQ@NTX7TJc_#aTQZ%9KkT>RFJdSFJ zcnV-I-@3eSZjERI4bq%4J5-TWu(?ox0s5S*Rc3kVkb7LDqsqML53R^jN%_VRl025} z(Fp4_dt_Kskry>5{yihvVk2P>p$Qg_4Nv=)MHPi%Na@NUa!v{d8Z=NGvR7jfy~w)` zqZF&sLDFOQMF!f)d#2@5JaSpXQ3~KEM9Mb54MDx#1N)AeZb%j7GIE!C?|m-As}=FR zYKg?aKl^hq6t>=7udn0oIbtiE5;T#9jRjF8I@u*u21-L{3PUf9SZ7&8T)D$j7m4c)2TwLKs;G zXg^QcD<#y)k)W2&^6);RFvSNXRo`5Sd8DFmqOF33&}a2%I_e4k&e@$I{)A9JK_2n` zIu9K7YUn@Mw#69ibQy$fB)DnUApJd(TH_mB1(r3%Prv=_{3%=WQc;Z(O?`U@{7AOU z;1bA{G2@_EHQB|XDs~+QhzEAiuQbO^{u(r!k|1c$5cZJ;+24`?=L?jGsAkKlIs-|+)`@$5*)~l`}7HASz&{V-f$@$n-Nr&$Y=)ADokCY*f2A5vh038>Vd-PjCt{1sWD#5 zRrK#fPHD2=?)Ll8zB}d^g)Lf8Sz*2_SnGY5Imd-JB`5AXU)m{TDNXSUNjOp_Q*WoR z^wfBxYN+bYFE31XJe+X&jicwBoN&y6{UD^(OwAW0{PL7|LWL!~Q?RF*pJQ#l53(;F zfP#^|*0?{RVLT9f*8?kau)5IES34CIQtZJh zX}=~=Uz2NdY~(zWDZ$fTSdme`&sl9~RJ5>UYV{UT(h89-FqMd@HfsE2S=>(gQ9S#x zVg`LC+#HI*qIE*c1!Cua(RW!$gg$TxF^3QA`s4BA*^=O^y+GO13MvMDt1mkBDaw`W zibfVh?zSda2_5c8`Ng8`_bK8C8dbkr5nxn_8rRrf^1;J;lNjk{>f={s4o-@VMv=56 z-!aLh(#LKc7AN$M>$1z2?OeFe9^gdFQtZ39?sT7jOt?7S-A@5vAQr}9C&#Mv=tLl} zle0q_kNcqzrUSK`kG!BmyZhT+qP;4Ib+GbpHa?N$@_ktZ`pHa{#u%6%mUdB)kCvW3n%><;=D2u zT41U5%Mi#gFBn0|@%`2yf6idpzw8!A!8^big~;cl6fP>|-ZW7>(R`7Vu@DBlgnPxl zSp@&|!W>A-2tVZyRH+>N%K7>W{n z>xD!<8cw2wl>C%6iZLFBqHM;Yg@^hJXx=(r*fdhwt#pD$8O#aN4<&^b;7TXxI<+4< z&@eizG$W^Al980$N++k2pWRS|6XRXIh55#sczSTecaFR^M!(WZ^HojH*{yLp7qnD( z)I7kF2J!?N-8bTec-0U^iZOl1)CMDBisU@lMefdRB3tO|V|SPV#{A3jP=O+y{J>VZ z=3mA?s1)W~bQ~HI_6nip?~5b=Ac3X+VB$dPs`dLF1#6b+AV_pV=uT%!|Mtfkg=VS`G)e6}DS<(GGgYVQba+?c%gg@ewdnvibbTpm-OvC#kRKk)TpyejiX!s1`U z{m{A<6K$ICd$l!f(0T%nB<_X*?e)FS<$LZ`?%A7vG?!`{w4`Hk3`Q^_HBD;I^S*r3 zvj<{Yfsse!@RTE{cdXs(LsNIMK@IW<5U+y?XH}xhRimpiTw>|`hwyY|rXH3JK~3hh zdORBuDoOd<|4aY8*n#Z*mjNKlB%t{B|>pDnPB?w{=>VoDGwt}Z_52)iW z-4Y@!C%I1#w2}f-#?>aJ4%t1#Q0;5&q+k;C?YkILC4t6t^GJp!0-=Fwd`d12kL<>a zU*46|JkSx}YcmaAYyMKsi-xy9WkZMb{A~pn>-|vcEQ4DgYwdi39)in}plm4~(?ckm_oH+7Nn8&+-272MWh4d%N z1rzgv6D|ZT^)w=qVfNZ!?D#n5>HC9!iPDNTwUM5Cj{Jpn<+Ue0GCsms9kY`>_PX?lY0sW1A4-h@?42_JYQ9OoXoT-AAVlb-FW4fe>!zx%ww~N1q=^d z2|!nd0i+kXk@7m}u~OI?X!hR~;$+gn5`z8w>d_Bl!Ggr-mNMv};BxaWIneRXUr8MA zn_&4_gZ*|RdZU02tV*LIiRI9H2C193rPowEm-m;3V>T804dOl$F`3S{1mLc zmZcN;3<`I4tg}!x=ObHNi+x}Jzr?(MbvwApr9H9VuCpQ;jITsMIyar_LZF-!esK9P zqRrXnoO+CMOrZ@^yQ}>ZPf0?N;phJ7H&JQb zF2s+!2l(J`ZP7zkNb)g!5#yRCFkl^ck`ziq+o)P9o-rsyW;Y*4=EX)n&rkq7q$~;&TVwC^|G_HF9k_6ZZVkLjSc~BT8Rmw+ciV$)Lk0WYHds>cWz>Pq9X8>jdX*7wy(vjQtUo>2{NF zCj4`e!!it;QbXLn$Y02_@ubfnwS16B$CQ&PuYIo$6~bA8}5@%nDG2~r#b3U z3KWTJlRT2B1#LZEFEhd}eH3j)fTZQ6;Ut%DV!*9809_-98=UbS%d|fjc~!q0o*$EW zM#Cbjgp(NnS>+%)g4OP*5v4$)2}aew`u>OdC!qWSpO+pU)dbi(lX`7JyB8+e2eV>*% zznXcKIMbeKMtr+6B6L-8_|WfTX5snfpfEId^wG==7j+oKRR*57G+dtsWcQQzn?g1S z4uK`bOC*NAumk+u%qfQx7g19(Ai>xG86Sf)m*4~Mx7ACP4;BRD-xbt+%dUzKA5Ed^pJMdF)s!hFDj2DoDCfrW6%ZUkaWRi@vzVnA)`6Xk_s@ z(gNS}`TQ{KKjnBQs1?f0mXE$_??B2;wo0ZOS<{myEn9|_ApA=B0AovE-p%0rF9ZO^6KTm_NjFDN%r@xVm0xBtT9(@>E2pcj1 z7xjshAT4^{?Ns_A*QA|e1vcpH^e|&>cmoP-JYBR-wZNosf(up5jl2u}NFO zAiSYUPtS)1U(jRTH{c*%WS`m}YDFcX;TD+iC75v>k6@}JI|WxD;EQSmc^KHBjl6x4 z154*uB5`u5gsh%aTKjPCN6J+grM857cSEJZAsYwRy0Sy$(8;Ko_!O>-GbJq)F8rQ%NDT+g2giC zQE89RzDAslDTn}b&L-h989F@@H@f%Q-{G)6SDcC$(bJbcp1R=u1DeI|aP@X{R40ogV8ogxo8fT8jEUmD5d*8#+&>k#dW@Ar*DeM9RWk z(V4<%#Zt&QXHMt8zzhThW|WDEI-s8*EaGz;)@|ZZu3aAy z8tF>+U2fHRLDzU3LXZT~PgaSJZR-Q6KL1V|uo!v8$phjZ@z?nAykveue4lbQ8fGkaz>Y^CW-i#=5u*>|cB z&&hxqE`?&)n^k7s(sJO{CFJ(+u);7Id4;P&+E@SPET@L_l&~^JajO}OQvSts_7Z-h zCOP>93Op(@S7Wsg%Mda=g6apPE$SJxTi`r_zjG?vS2R0Z`9=_Ws4h4S z@L^!-HGy^i4}bpib^( z&<*|9A2J7=pW;(9{0S`5L1pGh7)1T`Dmp|n;~+5y21j}6{TGj&X>sD)=feO|M&!vJ zqIrX#zBiHz4Gb?wHD3!gOCoKP%#J9POT| z)DRL0`qQp(do)9?h;&T81Rk#O+LQ?3vqazBO&{_-(Y^C|4$vI+qzQYWGMAUv;B$SN zf9cpdUq$Kv9gw{XI2tgS|13n7)%T9*cN~il2FXAO6NQe*dgNvB&%L)(!Om_8O=|^L z-mQ$-|K>ATL1KAX25feJ$%oNgFS@mY&HKCi18XvYA7v3SW{a3(W*LD;xlv{8gf?N(Iz|xilauRG*Q=bn#Z$5r_u@x1}5R`k{8a&9zboMIEc|I)8O9y=yo2e-9 z$KN6x2BLS8L>~=wFcSj<30stlnH|0k&s^gZNjGwQ zE3m=JnN2NdOSXPX*c37Msei?8>qSqeaHm<~f?0dveN1Myi-zp2$K;~i%2NhwD!06c z;M@YqpQRs-k&(D8tgN}YxwE?U?+LPPp3%~l4}nMz_9yZjIX7SQ2(&vSpn8Qxep@cr zk_XjF^zlOPuY$46LflO$LXNH$iGLcll7v6y_DbrEGHYsG7NS|P=;^$ z*$pBU^%Ss|!>Y`CQ%(+qP4MyvDiWz$(`r`D-Lrnm#@tbn5MO z+cKl~TqqXv>k{ z3LgD&0TRWJ*pLHEJkafV3B7)Xw`p!%nv&RM4Ouv%=(VosWYJCco;%1S|_blNmBn(K)nFxAvef_HKv4!hwR#eC18ADSoz(z z1OTz4wYqLWo7!`L*Huu%RuD@6>w!Kitq$vd3oKL2npW2om1uyu2wyk^|JVY%8HCHiT`wXkk zRJ}^rvCbmmuH;)e{qbQiV;LP>zF9(K zBgJCDvO#3`VN03po`2Z05dDsHM~`UG?TbcKTgMk$c-V?r4e>Qm@d)VDQUj=V-I4-*5HJV zJoA|r#{D>xG4ptKW$Dv1DvFbGGPzvltR#0kiT_K3h?@gzZbJ_Lb~?Kl>t)s?aS1}h zcTJR_!#a@TvJFhA;Zc9iP9Hs@nDtsC{R*u=ioZty(1;wc zu*VB9idQ@x?HBHLhjqlrMl`S~n$6h?YWj>j4zc!ZJ>4|AV?!tlw!KuX&oy1vlOp<9$s1 zRip$D)R^K&R}ng^W5^Kp^oq|46&Fk838SQYF$E zs6>|OsFWCdo|%b`0setmH1y7=8yH8Etw0&Tx3k#c{8=ht7Q8w2WxMFIHI|$%q z5hS|5Iu`aaj|T0CLcK4D>;PMwnTvGP>Mvh!zM^SkYqIv<2loV9gXGF-v@F2|y6U%M z_O740qF>(SdHlNy52?O(!P~6RWx@X|SD58{h4-6IAebtjKCyqBo1hZ{v!TGNA&S%| zo?ABixv0QeyxemXtHme7X8k-tJoC^XOGD+o+y3tckj$aa_E1wP3g>0!U@Kk!N=U(L zJZPuyA?b?7qFATW&1MDj*NdS$Mwpl^1Pp^Ae1H0C}l$GxfqAowuY_jje-jy=GPt3O|&vUi-Yt zOyEkCj3hM<%PrOrAO1_}ac%WH-%wNV;E`Xjx^s9`OIxye=4v$e_#@Mra_0MpI9ueU zLy{gUmaVPJRu@gd!@~BZ4oC@r=C#yc-g`_S0NRB`*`Q1N zeO>G5ob&?Z)!?`Hj*xiW?BLn^=$ zvE|&V5R8RW_wO;|_GW0`E6$?4jM4R21PA5{*o7ktFn2I?6ZLXkeFt-t1`W7R>75_6 zcD&jsUA5LyYCY5`S$v0%%51%oiX+V2`J3`4(_1Uq5`|4Xsdh9AS%~nDGShVa;^9H$} zK8Gj~jTJlS4K|-i5Ce8F!~Ymr*Q+`~%-FBol|rDd-_a#0utq?a@$RRUR%5ZWY)&%w zW1Bu!ra$L)E5G?nExe$08S}+N-ypJK%^-5V91%^%0bn1Jg8Z;O07oY|a zpVrK#cBOa}?zb|?qN26KGWuWB~T z8#KUuN=9gr0H^!iW)sY)%^L#)BV-0F_@?SD{N^+)+yDJWvTS4FE<`>(?2Z94Zq#1D zEa(tve%~XJl#*XePsN80AZ~Gq;wEQAil&3}<95m9&Xy(qt*MF2%+$0VCI{f+;<{Yh zQ-u=vESp!%Q#-!cp}J_7XCmh^H?3LyaMZ`;sN&z@qSoWM9JDTpAZfBmHI^xi6F-0y z7&~bYBX2CT1jHpI1Pg!LmAyZ8+3Ld?!id;+vzsX?V0u59SX_ZmP%>-=Q>VxdL*>8Tp?j0yg-SzL}~|HTMj^f zg6>?U@z_brsrZ)$6@rk-zxp$?4K}Oz$BT70>8sknM_F&!OcTB{1?PGbsj_Z%^1T=s zekbF9cY<6xjsNCUP2FH~7>ot&M;7b|klz{tb&i*B^EfgputA6>yl5E)K{d{jM zTjq4NjpW%grsM|46+LMC-OXu#$h~i^&BC*Zi3$G}>?Rm0VFFe_y~7eJfZL!k;02c+ z08pr$x%fL&vJElUpwr@UyffNhJZjzKx3a|;ivmDJ6WKUg;J=3+Yx>{O82P(%L&U%H z2Z(%z;0jp*(|OiyFt3kZuw?HCyeIExPB^+(G*thXuLAep_xTY}>a%$;S)i~GEAg;@ zu2inYX=Y|#a8~uEea9>@zH;WPbkqwji_0A#nkRk}V|-E)8o<@!t}zT-=*{?f%2|!| z)b`^!x#%;;g`BYdIfD_2*mUV8e<5RlYSw)g6R{Yh-{hRs+8?qWk<(U6BZV3^hdnctF;M)%vI*)=At4~ z2L7G5!=^E^DBt2D9Rn#Xt(c|k2gF^DVav5EOBwl6E;Ea#M04c(jgfZB1(cX5#t!b} zwesMeZ1^`bPM24_IB)-=;ZFc9C0`@UH&wPTV1!4Jf8P9J_RL6^*skbdGbA3W*KQOY zl=9YEIXLpGUx8A(;Jdpswu?0-wC2s6tuZv`d`4VcZpu2lk13@35wYEofmu>-YUf>e z%lvudQyw_+%&NaRPy{eiM4Evx=1KHlbN|w9ee+CY?tP4>P5748mCKk}4*dRdm68t~ zsZ_OiSv(_LN-C5cOk{p#_w8YZ6OHv`od0)e>k8lRuvSA=XSo~fd7Hv35dxF&`i^TK<=KjYQKnHdUP1D@Ge{AufIPlbZv>dtefas;OB zq)rS1d50Z-dktc)a43n{&xNxk~bOmz1~;kqkWq&Ta@xK|S*c z&aQZx_c+jY@khS>-qe4dCAO>%X#nqUBi!XBj#|jNugr}pKyy*ocymN}RYSX{HY5>KM0ecMC&Baaf*)p> zF0`^|gNoP`Gesj18}Tw{s;61+T(?t}XwC-WyU&MU_V*%Uv`Z4PcFr(Y@fW0LzPXV1 zTp3q#Yh!SW4rq9B0vj)YLgJy_WqW{Ea|OvmLjTAG;FrDB+;psH%Oa;kS}~(1QewxR z3Vye(m*Jt9lt?fENvg8ZJU!x2NRhyR{@-c;FOhLlUhLegY9!F4^`&zA|+x>Gm2`C!bsMSYm9wi+~BeS0S)!>x`}eO!t}r2OjH>6Ic|J7>+vnnAvH9l$VBE_&W{ z^rCwpTZzteVhB~0d?~S_tw)j3t z;M_m}GZME-*P=cmaSNMndhOT_X&g2b2X)bj4r2$Thf*Z6CoF0oPD9%F;qbJJ(OPHQ zgIS7SRAmVKi?NK5@ZE<0NV^gT^nG4m26?-kG9~Zq8j_g>oLqOxI>Ze4oq3|4xD(zg z4laC!goWZu`raptA1fNpwx@Yx9%Et-EmeHc-cxDDxWRHl<;(*+Ix5PY`mMurYoGrA zN574B%bKlto3H-dND>)E`P>uRfaY;j65H?YF7!VpXPHqet5NzLmzjhvk>E8kjfK=Z zhf!*I7KX+QZC|ecoOZj&1Pk7?Dg{xW!pvLFcj^V2GZ=U|BJ52X=q}cLMFb?YE6C%+ zwwuvfpmBB3K7pGOMYJ=-Q?nX=t9E~h%J!psjpTcDSdKKeUZ1xI-p^=4)jcyWi?qz_ z;vweT=vl0Qh)OQAauEp-7TwXG;=AKH{(Ga_sES?4zW~4hX8w(HS^nnGupv6`zR0tH zHQ!|cXi~QHSO1EWyUzA7WS5*FD9RxUX1-U6W;Q8+c}0GJ_SpCV{x(qw5WW*@{~*Xv zKvJ+rZh}!VdkU!U%+O;Fpo*?0G+^6<)N(Mn!0}7ohSVVA*xF2%@7XCkjt@ zL!N!WFXGMz{MdHnBBsj}n%-i&>V))u|9%NP?~=`sSL{MseOK7Z`+<9uCksWL3*^b; z&y;D#7?c2jKCOS=I=F?YNJ;p2J>K$@a=-3~nZL;ey!+vVyZ+-7iV4yZe$)U|k{@GvQ~hybsi2jRFBuy92?oQNY9m6! zv@v~IcV35v;&)opW_7EQp*e3GZEdypAT7Q7f}|&0WD?WF1{(ySCK#*H(pG`Pw?^$X zF2DT);Zzp85WW*xKwwW975khSmclJu7Elh2_Oxke}JRc}I7a^fPfjjpo+Gu6-iHY=y6ozvA%$%Hy@I{ zeiN}z)utR96@Y{%SwHPuBiiC-%1;l7aMdk(UIF<6pqo#=DuQS?M(yBnCr?WJVD248 z=SZ^CqX+C6-&;Q4i7U#|I`k0o%kd@!Pkb8WW#f0p7ca?-hNlpPap?&=)fN4~1E3I- z-=vT_y>p6_s-2t$>mW!*G1{zALiQ;rks=Z*wmebBaoGzhrNwYzpHb5I5pE zIc+Peq};P1g+(m79sBY0eW%m|yQP)I`dJPdGUE$^M%)dMN=ey#ngCrS5MAOV+Xbzr zIgsd7u5?h32nN1%nzWCa%oY?NW6r+Mv(is|7#}W3nc5K>sb@z_WjpoL$2|OAcu@dc zuf99iyi*^k#}1l{olW5Zpx6B(ZuP%1)L^Nz?5Q`2hM@vZh+L-+6xXK71$OZOM4tS4 zPKQxOkTrLT#UfsFlIaE>R;5hV^vZa2B3NEev<|F$2s*tx(SM__5oak@x=_LW{`}9w z?$(D{o{%&LHMp=B2K(@%bPbpMWA#M&xV>AzlYXU!@6Eq#u|5$L=#s1b%*a`o)u#ts z8`PT18JDAQ9oY3{MR}}1<7==e8b9faJ4fUxTZ5I`qC?EnZ3oF?96~EKoO}@eo=TEu ztUzQ}!9HBlRu&15@i*j^Z$CzqoA_LadUu?^WN(l@Fh5fieK)WBd-+8^kY%HB30WwF zhZ|iSZE=-o2H8Tu*zZ)2nBy;09ik?IFx&t-DZqz1uAm^k-;F`Gir>eiMTRw2XMtGq zcmevodZeQZ!49O{DC0r|8meafN$DQZIKWJA>gX`;3pk=AIsn=E*@R#y*irnDSF?6P zB}$U}EBM<~S?a{OS7HSWpALNFCBr9g5`%~fPB}0bUlE`Hu)T14pW|aFJVXS&d<1z7 zF6lHmM!kUr8lo(}`V7x-%O8{Lug6IS9SYe#5?3tO=Goi|u~R(|P!Sn!Cp;K3ulpdU z(rP+70i&5{JGD}FALwF`V)qk1j>AOO*DuTC9br+u^udsA z*d3jg1El;kA{A&99u%aY^Wq%yz(=kv6UUmR7x5S}>sT-CQa(pkdt9*cqW7forUm&} zvV9xKe_YQVgN5Afh9o$j_7ZVk>rQjXo4;zfiSuPb;hb~m{8g?J2PTh0@rh7V!#qgv zHyqdg>4&^KK?ePu!{)b5=5gu;fF4C*wxPWY(e%k}L7q%3+^3!D_2;oq|2>KTF(Z_{ zsOe}tU{Msd8@~{4yIADWVilJ4j=LdV^E(Om8F~`0A34$tn1n!*Vh*-=@ZXTKM?E*H z7{}C{(ua8WvFZ*%Rz(^Fb_|>4@BYUnHpuBxJ!(yED>a@XrXn#&+nH3$b^qDaim&i8 zNYg+xzXj&nh{FjJ->RS6#e4EMH_+%+{N$fUNAVeth6{;nsYt)D0B1zU9~KXQQ+Pfg zg`k^K)G~>qg?}^8K@GVN@d;x&qv8?fy@=e(bAP2UD8xY=3yM zDnheVtN3co8^VsZ^=-22xHAw(1N~LdiADuDSn4v9lT~>_@Jp}VDNevq>X%)=6!Qg z{z?S+(E5fntL&&C2xzG?G>t zT@*Y?jo``cRp&g>{Sl=7&Mg-)k3x}a&)9I4k+-!Qfy87-SV(IlKy0m zk(KB~2Hoc#{kCP11RsQ~GgskiYVl9{XqBfizIvsujX-MpA##m2wx6CphAm7Y;^~(q z<^!__2M}TUzBVUfB{I(C$QJd*iLpF7zdmkdWoAa}4kMaNB%&9mp+o`=a;P*AUG9!d zC61*F5#3!MPZ>U5ZMceFS}7>O-a6Iy9CYtAL-a`rb1xH9k-oQvRacs`swX1vdC2#2 zFM1`I-N@a#jdacldRXHuAQX{8}CJu71Aj->3Tu0B^6mUq7bvjoHl%%Eng}sDwbW-1WV8Yeoz>kH>VUnF|cgoU65)BP=K=NV%HSQS`Qb{cv?< zk^?W-Z|FMX!A=s28n1UrRYh>q()WzmdHisw$1_hq?%MZ={|F66qyL~8@qCG{ zG0=f%xdU0Zk5G|oAoj~^TsP51Vp<~Zp5RhrvXZsaz>})v#7*b0KhBNa8n;ynRjLR= z+V{U(TWO+pRr+&bQ|DIuH6Nk$`?CZu0p6_iQe)fZx7~20JT$bWoZQ@JcB?UcX$^V2 zo{RiB@Ga|*Tsu{5P-S@0%-yXe&DpR7&nL;wm#?F~chft`z>#ZY`NmFHcEQGlOiu76 zA0!Ngj*AcXShqidfJl7DGo =0p#Z{l!Gz>|JSHc2q+g-_;*@6#qVB-G z!uB>S!2E-pUb#nM;r7l>(@ZRU8;=prrjq4WO8@BhlNe$A=)P3`AhTBfEcfw_66)fL z!0>q%vY%bidZ_hyiYHEz3%pZ|(MM38w}AGI!M+RS4@-8vp8_hhh36jE78FAEjoZAt z%O55MCYldNv)X0hhv~re0SOOgF(}9$EG^x>QR)Qji1ciu58a*m^y8Q_ruw>kx-IUX zZdjFXH$Ed;wRV|Kr(T0&`KvqVoN={jHzp$-xtwW@ym9qQ(n}T=lZSiQ$190>D5~95 zXW6Tv`zBP#3wq+WBqserWokaqb7PhFF)Ks8iailN{+JLG^;irsuNG`4+IxfW2RxBg z%ff)WFP04n{+)rA^tcnT;o&AD=|b8`&&kNvYsSP$b06E8W&U1sTmJj8Q5nQ)Hk`tn zDquIOqp9`9jW!zy)(;mq{_&^iR+(Wv3Wi#zgJ;%z6su{z`YDyi`ub?$u(&a3IGGgr za($BA5}Xk}W3CC$9ZtTS#D(T#sqGHwLWeD&Uz{a(hbUWIv*e8vVXj6%gnJU0{c@-E znD4nRGJ#daU#@^>&=*0#)hG2dpZUK--Fx7#ZHy7>XkP*3$BF=Q(#oGIKAHsm7pYL6 ARR910 literal 24338 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 F`!CZO Date: Fri, 15 Mar 2024 02:50:37 +0000 Subject: [PATCH 11/28] Automatic changelog for PR #5932 [ci skip] --- html/changelogs/AutoChangeLog-pr-5932.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5932.yml diff --git a/html/changelogs/AutoChangeLog-pr-5932.yml b/html/changelogs/AutoChangeLog-pr-5932.yml new file mode 100644 index 000000000000..e7584e57568b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5932.yml @@ -0,0 +1,4 @@ +author: "nauticall" +delete-after: True +changes: + - bugfix: "Makes pill bottle caps appear on closed pill bottles again." \ No newline at end of file From 5a93a2dbeb2370731ec69d2fbb8c7399ef0f404a Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 16 Mar 2024 01:05:52 +0000 Subject: [PATCH 12/28] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5932.yml | 4 ---- html/changelogs/archive/2024-03.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5932.yml diff --git a/html/changelogs/AutoChangeLog-pr-5932.yml b/html/changelogs/AutoChangeLog-pr-5932.yml deleted file mode 100644 index e7584e57568b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5932.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "nauticall" -delete-after: True -changes: - - bugfix: "Makes pill bottle caps appear on closed pill bottles again." \ No newline at end of file diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index 62e6449f15b3..4bbaead17437 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -180,3 +180,6 @@ vendor. Segrain: - qol: Middleclicking beds/chairs/etc is now a shortcut for buckling to them. +2024-03-16: + nauticall: + - bugfix: Makes pill bottle caps appear on closed pill bottles again. From 7a436e75207563e5aa18ee59853dc7bf71e20db4 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Sat, 16 Mar 2024 07:15:52 +0000 Subject: [PATCH 13/28] Changes Insanity law description to match new wiki. (#5948) # About the pull request As title # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Updated the Insanity law description. /:cl: --- code/modules/law/laws/precautionary_charge.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/law/laws/precautionary_charge.dm b/code/modules/law/laws/precautionary_charge.dm index c06cd6ca5287..7be4cb2b2e65 100644 --- a/code/modules/law/laws/precautionary_charge.dm +++ b/code/modules/law/laws/precautionary_charge.dm @@ -10,7 +10,7 @@ /datum/law/precautionary_charge/insanity name = "Insanity" - desc = "Acting in such a manner which makes the offender not sound clear of mind. The CMO or Synthetic can declare insanity on a Marine if the Marine is believed to not be of sound mind. The Marine once cleared to be of sound mind may be released from this particular charge." + desc = "Acting in such a manner which makes the offender not sound clear of mind. The subject, once cleared to be of sound mind, may be released from this particular charge. Excepting in cases of Suicide/Attempted Suicide, only the CMO/Synthetic may declare someone insane." /datum/law/precautionary_charge/prisoner_of_war name = "Prisoner of War" From 247859de37a83523710204c1dee0cd36334d45f3 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 16 Mar 2024 07:22:13 +0000 Subject: [PATCH 14/28] Automatic changelog for PR #5948 [ci skip] --- html/changelogs/AutoChangeLog-pr-5948.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5948.yml diff --git a/html/changelogs/AutoChangeLog-pr-5948.yml b/html/changelogs/AutoChangeLog-pr-5948.yml new file mode 100644 index 000000000000..e6c9d6df01de --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5948.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Updated the Insanity law description." \ No newline at end of file From d05c21dc960e277ee1d919de2ce4695886db7129 Mon Sep 17 00:00:00 2001 From: harryob Date: Sat, 16 Mar 2024 07:42:56 +0000 Subject: [PATCH 15/28] use world.Export instead of rustg http for byond account age (#5927) tm change to see if this improves server stability --- code/datums/entities/player.dm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/code/datums/entities/player.dm b/code/datums/entities/player.dm index f30c01b3128b..aefa81672b54 100644 --- a/code/datums/entities/player.dm +++ b/code/datums/entities/player.dm @@ -455,15 +455,19 @@ BSQL_PROTECT_DATUM(/datum/entity/player) LAZYSET(stats, S.stat_id, S) /datum/entity/player/proc/load_byond_account_age() - var/datum/http_request/request = new() - request.prepare(RUSTG_HTTP_METHOD_GET, "https://www.byond.com/members/[ckey]?format=text") - request.execute_blocking() - var/datum/http_response/response = request.into_response() - if(response.errored) + var/list/http_request = world.Export("http://byond.com/members/[ckey]?format=text") + if(!http_request) + log_admin("Could not check BYOND account age for [ckey] - no response from server.") + return + + var/body = file2text(http_request["CONTENT"]) + if(!body) + log_admin("Could not check BYOND account age for [ckey] - invalid response.") return var/static/regex/regex = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"") - if(!regex.Find(response.body)) + if(!regex.Find(body)) + log_admin("Could not check BYOND account age for [ckey] - no valid date in response.") return byond_account_age = regex.group[1] From 1882a1e42eccd42d5a2f6009f739b1a2c34ca8b2 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Sat, 16 Mar 2024 13:53:20 +0100 Subject: [PATCH 16/28] Refactor areas on Almayer in upper deck and tweak map a bit to reflect it. (#5879) # About the pull request 1-added a new hallway area to upper deck so that we have fore mid aft hallway. 2-added two new maintenance fore and aft and change placement of mid to make sense. 3-removed all the emergency shutter that weren't at the borders of each areas. 4-i added back the bear belt because it was deleted when it was move finding no real place to fit it in i settled for a closet in alpha/bravo dormitory # Explain why it's good for the game 1,2-make it easier to relocate and for maintenance it's part of a PR that will come after... 3-to standardize and make it way more clear how they are supposed to placed,used. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: refactor: refactored areas replaced stern hallway by aft added two new hallway area(fore, midship) refactor: refactored areas replaced midship maintenance by for and added two new maintenance areas(fore, aft) with each starboard and port side. maptweak: removed all the emergency shutter that weren't at the borders of each areas. maptweak: added back the bear belt in a closet in a dormitory. maptweak: reconnect some air pipe in an hallway north upper engi. /:cl: --------- Co-authored-by: Julien --- code/game/area/almayer.dm | 20 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 5181 ++++++++++---------- 2 files changed, 2579 insertions(+), 2622 deletions(-) diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index c3898283cbbb..b75baccd7353 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -366,8 +366,12 @@ name = "\improper Upper Deck Aft Hallway" icon_state = "aft" -/area/almayer/hallways/upper/stern_hallway - name = "\improper Upper Deck Stern Hallway" +/area/almayer/hallways/upper/fore_hallway + name = "\improper Upper Deck Fore Hallway" + icon_state = "stern" + +/area/almayer/hallways/upper/midship_hallway + name = "\improper Upper Deck Midship Hallway" icon_state = "stern" /area/almayer/hallways/upper/port @@ -425,6 +429,18 @@ /area/almayer/maint/upper/u_m_s name = "\improper Upper Deck Starboard-Midship Maintenance" +/area/almayer/maint/upper/u_f_p + name = "\improper Upper Deck Port-Fore Maintenance" + +/area/almayer/maint/upper/u_f_s + name = "\improper Upper Deck Starboard-Fore Maintenance" + +/area/almayer/maint/upper/u_a_p + name = "\improper Upper Deck Port-Aft Maintenance" + +/area/almayer/maint/upper/u_a_s + name = "\improper Upper Deck Starboard-Aft Maintenance" + // hull areas /area/almayer/maint/hull diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 0d15799978a9..e8ad897e37ce 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -208,6 +208,12 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/lifeboat_pumps/north1) +"abz" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_f_p) "abB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -502,6 +508,9 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"acB" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_a_p) "acI" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -569,7 +578,7 @@ /area/almayer/shipboard/weapon_room) "acQ" = ( /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "acS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -649,16 +658,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) -"ado" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/living/starboard_garden) "adq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/north1) @@ -1054,7 +1053,7 @@ dir = 9; icon_state = "red" }, -/area/almayer/living/starboard_garden) +/area/almayer/lifeboat_pumps/north1) "afE" = ( /obj/structure/machinery/vending/dinnerware, /obj/structure/machinery/firealarm{ @@ -1268,12 +1267,6 @@ }, /turf/open/floor/plating, /area/almayer/living/basketball) -"agB" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/living/starboard_garden) "agH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/disposalpipe/segment{ @@ -1329,12 +1322,6 @@ icon_state = "test_floor4" }, /area/almayer/living/cafeteria_officer) -"agS" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/living/starboard_garden) "agT" = ( /turf/open/floor/prison{ icon_state = "kitchen" @@ -1388,12 +1375,6 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"ahl" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/living/starboard_garden) "aho" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -1572,12 +1553,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"aiP" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/living/starboard_garden) "aiQ" = ( /obj/structure/machinery/faxmachine, /obj/structure/surface/table/almayer, @@ -1882,25 +1857,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"akS" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) -"akW" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/living/starboard_garden) -"akY" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/starboard_garden) "ald" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -1914,7 +1870,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/living/starboard_garden) +/area/almayer/lifeboat_pumps/north1) "alf" = ( /obj/structure/machinery/light{ dir = 8 @@ -2060,7 +2016,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "amd" = ( /obj/structure/machinery/vending/cola{ density = 0; @@ -2524,13 +2480,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aoV" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/lifeboat_pumps/north1) "aoW" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /obj/structure/machinery/camera/autoname/almayer{ @@ -2604,12 +2553,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"apr" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/lifeboat_pumps/north1) "aps" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -2628,16 +2571,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"apu" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/living/starboard_garden) "apz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -2831,7 +2764,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/living/starboard_garden) +/area/almayer/lifeboat_pumps/north1) "aqm" = ( /obj/item/bedsheet/brown, /obj/structure/bed, @@ -3249,6 +3182,11 @@ icon_state = "dark_sterile" }, /area/almayer/living/pilotbunks) +"ash" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/fore_hallway) "asm" = ( /obj/structure/stairs{ dir = 4 @@ -3414,9 +3352,6 @@ icon_state = "orange" }, /area/almayer/command/cic) -"asS" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/starboard_garden) "asT" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -3656,17 +3591,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "aub" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; pixel_y = 1 }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, +/turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) "auc" = ( /obj/effect/step_trigger/clone_cleaner, @@ -5584,7 +5513,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "aBR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/glass, @@ -6611,6 +6540,11 @@ /obj/structure/window/reinforced/tinted/frosted, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/numbertwobunks) +"aHo" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "aHq" = ( /turf/closed/wall/almayer, /area/almayer/command/computerlab) @@ -7387,6 +7321,11 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"aLh" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/starboard) "aLp" = ( /obj/structure/sign/safety/cryo{ pixel_x = 8; @@ -7843,7 +7782,7 @@ dir = 6; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "aOy" = ( /obj/structure/machinery/light{ dir = 1 @@ -8087,15 +8026,6 @@ icon_state = "emerald" }, /area/almayer/command/cic) -"aPC" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) "aPD" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer{ @@ -8371,7 +8301,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "aRo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -8380,12 +8310,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) -"aRp" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "aRq" = ( /obj/structure/closet/secure_closet/staff_officer/gear, /obj/structure/machinery/camera/autoname/almayer{ @@ -8404,7 +8328,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/south2) "aRt" = ( /turf/open/floor/almayer{ dir = 8; @@ -9527,18 +9451,6 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"aYq" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/living/starboard_garden) -"aYs" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/living/starboard_garden) "aYt" = ( /turf/open/floor/almayer, /area/almayer/hallways/hangar) @@ -9609,7 +9521,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "aZe" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -10549,13 +10461,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"bfb" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/upper/aft_hallway) "bfd" = ( /obj/structure/machinery/light{ dir = 1 @@ -10573,7 +10478,7 @@ dir = 5; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "bfl" = ( /turf/open/floor/almayer{ dir = 5; @@ -10741,7 +10646,7 @@ dir = 9; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "bgj" = ( /obj/structure/machinery/landinglight/ds1{ dir = 8 @@ -11070,7 +10975,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "bij" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -11079,7 +10984,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/port) "biq" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker/large, @@ -11135,7 +11040,7 @@ dir = 5; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "biC" = ( /obj/structure/largecrate/random/case, /obj/structure/machinery/access_button/airlock_exterior, @@ -11192,7 +11097,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/living/starboard_garden) +/area/almayer/lifeboat_pumps/north1) "biV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -11278,11 +11183,14 @@ }, /area/almayer/hallways/hangar) "bkb" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/port) "bkd" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -11878,7 +11786,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "bnH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -12036,14 +11944,11 @@ icon_state = "mono" }, /area/almayer/squads/req) -"boL" = ( -/turf/open/floor/almayer, -/area/almayer/living/starboard_garden) "boU" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldingtool, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "boV" = ( /obj/structure/cargo_container/wy/left, /obj/structure/prop/almayer/minigun_crate{ @@ -12390,7 +12295,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "brn" = ( /obj/structure/machinery/door/airlock/almayer/marine/bravo/smart, /turf/open/floor/almayer{ @@ -12678,6 +12583,12 @@ icon_state = "plate" }, /area/almayer/living/gym) +"btu" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "btv" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -13104,10 +13015,10 @@ pixel_y = 25 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" + dir = 4; + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "bwP" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/almayer{ @@ -13194,7 +13105,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "bxA" = ( /obj/structure/machinery/power/apc/almayer/hardened, /obj/effect/decal/warning_stripes{ @@ -13258,7 +13169,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "bxY" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -13383,7 +13294,7 @@ dir = 5; icon_state = "silver" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "bzg" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -13590,7 +13501,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "bBd" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -13919,7 +13830,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "bDn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/closed/wall/almayer, @@ -13935,12 +13846,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"bDD" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/living/starboard_garden) "bDF" = ( /obj/structure/machinery/door/poddoor/almayer{ dir = 4; @@ -15222,6 +15127,11 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) +"bKU" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/aft_hallway) "bKX" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/masks, @@ -15262,7 +15172,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "bLh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15498,7 +15408,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "bMq" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /obj/structure/machinery/light{ @@ -15659,11 +15569,8 @@ pixel_x = 14; pixel_y = 32 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/hallways/upper/aft_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "bNa" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black, @@ -15683,7 +15590,7 @@ dir = 8; icon_state = "orangecorner" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "bNe" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -15874,7 +15781,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "bNL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -15925,7 +15832,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "bOq" = ( /obj/structure/prop/almayer/cannon_cables, /turf/open/floor/almayer{ @@ -16725,7 +16632,7 @@ dir = 4; icon_state = "greencorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "bTE" = ( /turf/open/floor/almayer{ dir = 4; @@ -17188,6 +17095,11 @@ icon_state = "test_floor4" }, /area/almayer/living/chapel) +"bWx" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/port) "bWJ" = ( /obj/structure/machinery/shower{ dir = 4 @@ -17443,7 +17355,7 @@ dir = 9; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "bZr" = ( /turf/open/floor/almayer{ dir = 1; @@ -17575,7 +17487,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "caq" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -17729,7 +17641,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "cbL" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -17946,12 +17858,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) -"ceu" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/living/starboard_garden) "ceC" = ( /obj/structure/prop/almayer/ship_memorial, /turf/open/floor/plating/almayer, @@ -18224,10 +18130,8 @@ dir = 2; icon_state = "pipe-c" }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "chL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -18442,7 +18346,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "ciN" = ( /turf/open/floor/almayer{ dir = 6; @@ -19462,7 +19366,7 @@ pixel_y = 32 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "cqd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -19683,10 +19587,10 @@ pixel_y = 30 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + dir = 4; + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "cuq" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/wood/ship, @@ -19724,7 +19628,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "cuN" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -19753,7 +19657,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "cvb" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -19774,7 +19678,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "cvx" = ( /turf/closed/wall/almayer, /area/almayer/maint/lower/cryo_cells) @@ -19812,7 +19716,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "cwo" = ( /obj/structure/largecrate/random/mini/chest{ pixel_x = 4 @@ -19834,9 +19738,9 @@ pixel_y = -25 }, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "cwS" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer/aicore/no_build, @@ -19944,7 +19848,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "czN" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -20293,7 +20197,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "cFP" = ( /obj/structure/sign/safety/outpatient{ pixel_x = -17; @@ -20361,7 +20265,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/upper/u_f_p) "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) @@ -20539,7 +20443,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "cKm" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket{ @@ -20558,6 +20462,15 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"cKp" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "cKJ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -20573,12 +20486,6 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/port) -"cKW" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/hallways/upper/aft_hallway) "cLl" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -21012,7 +20919,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "cSP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -21139,7 +21046,7 @@ dir = 6; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "cVZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -21174,7 +21081,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "cWr" = ( /obj/structure/machinery/photocopier{ density = 0; @@ -21213,12 +21120,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"cWv" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/living/starboard_garden) "cWy" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/reagent_container/food/snacks/packaged_burger, @@ -21248,7 +21149,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "cXi" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -21591,7 +21492,7 @@ "dcZ" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/upper/u_f_p) "ddf" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer{ @@ -21616,7 +21517,7 @@ dir = 9; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "ddw" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/sign/safety/terminal{ @@ -21626,15 +21527,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) -"ddx" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/hallways/upper/aft_hallway) "ddz" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -21650,7 +21542,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "ddL" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -21683,7 +21575,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "deD" = ( /obj/structure/machinery/prop/almayer/CICmap{ pixel_x = -5 @@ -21777,12 +21669,17 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) +"dgI" = ( +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "dgP" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "dha" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -21872,13 +21769,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) -"djd" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/hallways/upper/aft_hallway) "djQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -21959,7 +21849,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "dkO" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -22000,7 +21890,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "dmg" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -22095,7 +21985,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "dnm" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer, /obj/structure/machinery/light{ @@ -22233,7 +22123,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "dpO" = ( /obj/structure/machinery/cm_vending/clothing/marine/delta{ density = 0; @@ -22249,7 +22139,7 @@ dir = 4; icon_state = "bluecorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "dqb" = ( /obj/structure/sign/safety/security{ pixel_x = -16 @@ -22351,6 +22241,11 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"dsS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "dsY" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" @@ -22423,11 +22318,6 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"dux" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/living/starboard_garden) "duz" = ( /obj/structure/mirror{ pixel_y = 32 @@ -22451,7 +22341,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "duT" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -22561,7 +22451,7 @@ dir = 6; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/north2) "dxu" = ( /obj/structure/sink{ dir = 1; @@ -22696,7 +22586,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "dyK" = ( /obj/structure/machinery/light{ dir = 8 @@ -22715,6 +22605,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) +"dzV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/fore_hallway) "dzX" = ( /obj/structure/sign/safety/water{ pixel_x = -17 @@ -22752,7 +22654,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/south2) "dAA" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -22902,7 +22804,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "dCe" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -22986,7 +22888,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "dDp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -23141,7 +23043,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "dFk" = ( /turf/open/floor/almayer{ dir = 8; @@ -23395,7 +23297,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/south2) "dJG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -23427,7 +23329,7 @@ dir = 4; icon_state = "silvercorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "dKK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23599,7 +23501,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "dPd" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -23625,7 +23527,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "dPm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23754,7 +23656,6 @@ }, /area/almayer/shipboard/brig/mp_bunks) "dRo" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/bridge{ pixel_x = 15; pixel_y = 32 @@ -23763,9 +23664,10 @@ pixel_y = 32 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "dRs" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -23818,6 +23720,12 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) +"dRQ" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "dRT" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -24226,20 +24134,11 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"dZP" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/upper/aft_hallway) "dZR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "dZZ" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, @@ -24283,7 +24182,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/upper/u_f_p) "eas" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24357,7 +24256,7 @@ pixel_y = 30 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "ecb" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -24395,7 +24294,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "ecS" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -24654,7 +24553,7 @@ pixel_y = 13 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "ehc" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -25048,7 +24947,6 @@ }, /area/almayer/engineering/lower/workshop) "enz" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/bridge{ pixel_x = 15; pixel_y = -32 @@ -25057,15 +24955,16 @@ pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 6; + icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "enF" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "enK" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -25107,6 +25006,17 @@ icon_state = "plate" }, /area/almayer/hallways/lower/port_midship_hallway) +"eoD" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_m_s) "eoE" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -25513,16 +25423,6 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) -"euO" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north1) "euV" = ( /turf/open/floor/almayer/uscm/directional{ dir = 8; @@ -25569,6 +25469,13 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) +"evG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/fore_hallway) "evR" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical/green{ @@ -25612,6 +25519,18 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/execution) +"ewL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "ewO" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -25685,7 +25604,7 @@ name = "hypersleep curtain" }, /turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "eyM" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -25937,6 +25856,12 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) +"eCC" = ( +/obj/structure/bed/chair, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/lifeboat_pumps/north1) "eCI" = ( /obj/structure/window/reinforced/ultra{ pixel_y = -12 @@ -25953,7 +25878,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "eDo" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -26024,7 +25949,7 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "eFa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26069,7 +25994,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "eFK" = ( /obj/structure/bed{ icon_state = "abed" @@ -26218,7 +26143,7 @@ dir = 1; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "eHY" = ( /obj/structure/surface/rack, /obj/item/device/taperecorder, @@ -26251,12 +26176,6 @@ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_fore_hallway) -"eJg" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "eJj" = ( /obj/structure/closet/crate, /obj/item/ammo_box/magazine/l42a, @@ -26264,7 +26183,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "eJQ" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -26284,7 +26203,7 @@ "eJZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "eKa" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ dir = 2; @@ -26583,7 +26502,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "eQh" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -26592,7 +26511,7 @@ /turf/open/floor/almayer{ icon_state = "silvercorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "eQm" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -26668,7 +26587,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "eRR" = ( /obj/item/clothing/head/helmet/marine{ pixel_x = 16; @@ -26918,7 +26837,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "eXb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27361,7 +27280,7 @@ dir = 6; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "fdx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27429,6 +27348,12 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"fes" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "feD" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -27637,15 +27562,10 @@ /obj/item/device/camera_film, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) -"fiH" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/stern_hallway) "fiN" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "fiQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27726,6 +27646,12 @@ icon_state = "bluecorner" }, /area/almayer/living/pilotbunks) +"fmX" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) "fmZ" = ( /turf/open/floor/almayer{ dir = 8; @@ -28084,7 +28010,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "frM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -28101,7 +28027,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "fsf" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -28123,7 +28049,6 @@ }, /area/almayer/living/gym) "fsu" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -28131,9 +28056,10 @@ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "fsR" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -28161,10 +28087,15 @@ dir = 1 }, /turf/open/floor/almayer{ - dir = 5; + dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) +"ftw" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_p) "ftG" = ( /obj/structure/sign/safety/life_support{ pixel_x = 8; @@ -28173,7 +28104,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "ftZ" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -28182,7 +28113,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "fuz" = ( /obj/structure/machinery/cm_vending/clothing/pilot_officer, /turf/open/floor/almayer{ @@ -28253,19 +28184,6 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"fvj" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/aft_hallway) "fvo" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clothing/glasses/welding{ @@ -28298,7 +28216,7 @@ dir = 1; icon_state = "bluecorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "fvJ" = ( /obj/structure/machinery/cm_vending/sorted/medical/bolted, /turf/open/floor/almayer{ @@ -28359,7 +28277,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "fwY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28459,7 +28377,7 @@ dir = 6; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "fzq" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -28536,7 +28454,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "fBi" = ( /turf/open/floor/almayer{ dir = 4; @@ -28562,7 +28480,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "fBO" = ( /obj/structure/machinery/chem_master{ vial_maker = 1 @@ -28614,7 +28532,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "fCT" = ( /obj/structure/surface/table/almayer, /obj/item/fuel_cell, @@ -28652,7 +28570,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -28751,6 +28669,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"fFs" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_f_s) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -28867,13 +28793,8 @@ /area/almayer/maint/hull/lower/l_a_s) "fGD" = ( /obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/aft_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "fHb" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, @@ -28903,7 +28824,7 @@ "fHM" = ( /obj/docking_port/stationary/escape_pod/cl, /turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/command/corporateliaison) "fIM" = ( /obj/effect/landmark/start/marine/tl/bravo, /obj/effect/landmark/late_join/bravo, @@ -29375,7 +29296,7 @@ dir = 1; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "fQn" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -29415,15 +29336,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) -"fQU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) "fRg" = ( /obj/structure/closet/emcloset, /obj/structure/machinery/camera/autoname/almayer{ @@ -29633,7 +29545,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "fXg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -29821,7 +29733,7 @@ pixel_y = 25 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "gaJ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cryo) @@ -29905,10 +29817,10 @@ pixel_y = 32 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" + dir = 4; + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "gcm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -29919,19 +29831,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"gcq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/starboard) "gcN" = ( /obj/structure/machinery/door/airlock/almayer/command{ access_modified = 1; @@ -30078,15 +29977,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"gft" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) "gfu" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -30100,7 +29990,7 @@ /area/almayer/command/airoom) "gfv" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gfE" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/plating, @@ -30359,6 +30249,15 @@ icon_state = "plate" }, /area/almayer/command/cic) +"gkV" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "glc" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -30367,7 +30266,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gll" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -30459,7 +30358,7 @@ dir = 9; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "gnu" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/green, @@ -30594,7 +30493,7 @@ "gqf" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "gqt" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -30606,7 +30505,7 @@ dir = 5; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gqP" = ( /obj/structure/largecrate/random/case, /obj/structure/machinery/camera/autoname/almayer{ @@ -30840,7 +30739,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "guK" = ( /obj/effect/projector{ name = "Almayer_Up3"; @@ -31016,7 +30915,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "gxU" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck, @@ -31034,7 +30933,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gym" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/mp_bunks) @@ -31242,12 +31141,6 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"gBg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) "gBo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -31283,7 +31176,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/north2) "gCf" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -31331,7 +31224,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "gDp" = ( /obj/structure/machinery/light{ dir = 4 @@ -31355,6 +31248,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"gDF" = ( +/obj/structure/largecrate/random/case{ + layer = 2.98 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "gDH" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -31365,7 +31266,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gDW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31438,7 +31339,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gFN" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -31446,7 +31347,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "gFP" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/stern_point_defense) @@ -31589,7 +31490,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "gHZ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -31645,7 +31546,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gIO" = ( /obj/structure/bed/chair/bolted{ dir = 8 @@ -31737,7 +31638,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/upper/u_f_p) "gKd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -31914,7 +31815,7 @@ "gMJ" = ( /obj/structure/largecrate/supply/weapons/pistols, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "gMN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -32023,7 +31924,7 @@ "gNQ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "gNZ" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -32301,7 +32202,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gUf" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -32327,7 +32228,7 @@ dir = 8 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "gUn" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, @@ -32980,7 +32881,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "hfv" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -33062,7 +32963,7 @@ dir = 8; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "hgB" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/intel, @@ -33212,7 +33113,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "hji" = ( /obj/structure/bed/chair{ dir = 4 @@ -33490,7 +33391,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "hmC" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ density = 0; @@ -33635,7 +33536,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "hoK" = ( /turf/open/floor/almayer{ dir = 8; @@ -33743,8 +33644,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "hqW" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "\improper Medical Bay"; @@ -33944,7 +33848,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "htG" = ( /obj/item/tool/soap, /obj/structure/machinery/light/small{ @@ -33973,6 +33877,12 @@ icon_state = "greenfull" }, /area/almayer/living/offices) +"htS" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_m_s) "hux" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -33986,7 +33896,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/port) "huD" = ( /obj/structure/machinery/light{ dir = 1 @@ -34040,7 +33950,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "hvv" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -34240,7 +34150,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "hzs" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -34369,7 +34279,7 @@ pixel_y = 28 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "hBc" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -34401,7 +34311,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "hBz" = ( /obj/item/mortar_kit, /turf/open/floor/almayer{ @@ -34474,7 +34384,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "hCS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin/uscm{ @@ -34575,7 +34485,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "hEl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -34617,6 +34527,12 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"hFt" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) "hFw" = ( /obj/structure/machinery/disposal/broken, /turf/open/floor/almayer{ @@ -34650,7 +34566,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "hGG" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -34771,6 +34687,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) +"hJe" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_p) "hJg" = ( /obj/structure/pipes/trinary/mixer{ dir = 4; @@ -34836,7 +34758,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "hKO" = ( /obj/structure/largecrate/random/barrel/green, /obj/structure/sign/safety/maint{ @@ -34857,7 +34779,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "hLu" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -35021,10 +34943,9 @@ pixel_y = -30 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "hPu" = ( /obj/structure/largecrate/supply, /obj/item/tool/crowbar, @@ -35134,21 +35055,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"hRc" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/port) "hRd" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer{ @@ -35542,7 +35448,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "hXb" = ( /turf/open/floor/almayer{ dir = 1; @@ -35598,15 +35504,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) -"hXV" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south1) "hXX" = ( /obj/effect/projector{ name = "Almayer_Down4"; @@ -35812,6 +35709,12 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) +"icn" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "icp" = ( /turf/open/floor/almayer{ dir = 8; @@ -35869,6 +35772,9 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) +"idM" = ( +/turf/open/floor/plating, +/area/almayer/command/corporateliaison) "idX" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -35880,7 +35786,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "ied" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -36162,7 +36068,7 @@ }, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "ijr" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -36227,7 +36133,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "ikQ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/tool/stamp/hop{ @@ -36307,6 +36213,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) +"imM" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "inh" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -36425,7 +36337,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "ipB" = ( /obj/structure/surface/rack, /obj/item/tool/kitchen/rollingpin, @@ -36574,6 +36486,14 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_p) +"isB" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "isC" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -36679,6 +36599,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_bow) +"iuh" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "iun" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, @@ -36776,12 +36702,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"ivV" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) "iwf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -36963,6 +36883,12 @@ icon_state = "plate" }, /area/almayer/living/offices) +"izu" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "izG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -37270,12 +37196,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"iGE" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "iGQ" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 @@ -37287,15 +37207,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"iGZ" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/aft_hallway) "iHc" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) @@ -37364,7 +37275,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "iIR" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -37642,7 +37553,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "iOX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37702,10 +37613,9 @@ dir = 9 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "iPN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/station_alert, @@ -37734,7 +37644,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "iQd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -37817,6 +37727,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"iQG" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "iQJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37835,7 +37751,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "iRp" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -37919,7 +37835,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "iSB" = ( /obj/structure/platform_decoration{ dir = 8 @@ -38069,7 +37985,7 @@ /turf/open/floor/almayer{ icon_state = "bluecorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "iUW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38268,15 +38184,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/s_stern) -"iYr" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/living/starboard_garden) "iYt" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -38322,6 +38229,11 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) +"iZz" = ( +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "iZE" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /obj/effect/decal/warning_stripes{ @@ -38373,7 +38285,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "jaf" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 4 @@ -38407,7 +38319,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "jas" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -38481,7 +38393,7 @@ "jaW" = ( /obj/effect/landmark/start/reporter, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "jbq" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -38880,7 +38792,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "jhb" = ( /obj/structure/sign/safety/cryo{ pixel_x = -6; @@ -38896,7 +38808,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "jhn" = ( /turf/open/floor/almayer{ dir = 1; @@ -39140,6 +39052,12 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"jkL" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "jkN" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ @@ -39228,6 +39146,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"jlO" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/aft_hallway) "jlQ" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -39354,11 +39278,8 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -39622,13 +39543,6 @@ "juo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) -"jux" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "juD" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -39636,6 +39550,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"juG" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) +"juM" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "juS" = ( /obj/structure/machinery/gear{ id = "vehicle_elevator_gears" @@ -39714,7 +39637,7 @@ dir = 8; icon_state = "silvercorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "jvB" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/aicore/no_build{ @@ -39822,7 +39745,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "jwP" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -40004,15 +39927,6 @@ dir = 8 }, /area/almayer/medical/containment/cell) -"jBX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "jCg" = ( /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, @@ -40323,7 +40237,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "jIC" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; @@ -40520,7 +40434,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "jMQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -40783,7 +40697,7 @@ "jRg" = ( /obj/effect/landmark/crap_item, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "jRm" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -40793,7 +40707,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "jRp" = ( /obj/structure/largecrate/supply/supplies/water, /obj/item/toy/deck{ @@ -41248,7 +41162,16 @@ dir = 9; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) +"jZl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "jZo" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/effect/step_trigger/clone_cleaner, @@ -41318,7 +41241,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "jZY" = ( /obj/structure/closet/l3closet/virology, /turf/open/floor/almayer{ @@ -41468,7 +41391,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "kbV" = ( /obj/structure/platform{ dir = 1 @@ -41584,7 +41507,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "keG" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -41611,9 +41534,6 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) "kfo" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; pixel_x = 1; @@ -41623,8 +41543,13 @@ icon_state = "SE-out"; pixel_x = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "red" }, /area/almayer/hallways/upper/port) "kfB" = ( @@ -41791,7 +41716,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "kiy" = ( /obj/structure/machinery/light{ dir = 8 @@ -41918,6 +41843,12 @@ icon_state = "cargo" }, /area/almayer/hallways/lower/port_midship_hallway) +"kjX" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/aft_hallway) "kjY" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -41963,10 +41894,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"kkI" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) "kkN" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/fourway/hidden/supply, @@ -41988,7 +41915,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "klH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -42023,16 +41950,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"kmx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/hallways/upper/aft_hallway) "kmE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -42756,11 +42673,8 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "kzT" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -42928,9 +42842,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"kCo" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) "kCu" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/almayer{ @@ -43055,6 +42966,12 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"kED" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/upper/fore_hallway) "kEE" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -43155,7 +43072,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "kHd" = ( /obj/structure/machinery/computer/arcade, /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -43373,7 +43290,7 @@ "kLB" = ( /obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "kLE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer{ @@ -43404,7 +43321,7 @@ }, /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "kMa" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -43601,6 +43518,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) +"kON" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "kOR" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -43750,7 +43673,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "kRD" = ( /obj/item/reagent_container/glass/bucket/janibucket, /obj/structure/machinery/light{ @@ -43774,7 +43697,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "kRP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/item/prop/magazine/dirty/torn, @@ -43923,7 +43846,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "kUA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -43990,7 +43913,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "kWk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -44251,7 +44174,7 @@ pixel_x = 32 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "laQ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -44302,7 +44225,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "lbf" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -44408,7 +44331,7 @@ icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "ldt" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -44419,6 +44342,12 @@ icon_state = "plate" }, /area/almayer/living/gym) +"ldz" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "ldC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -44494,6 +44423,9 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"lfc" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_f_s) "lft" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/fire, @@ -44687,7 +44619,7 @@ /obj/item/clothing/head/cmcap, /obj/item/clothing/head/cmcap, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "liJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -44883,6 +44815,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"llt" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "llK" = ( /obj/structure/platform_decoration{ dir = 4 @@ -44982,7 +44923,7 @@ "lnD" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "lnP" = ( /obj/structure/machinery/vending/cola, /obj/structure/window/reinforced, @@ -45078,8 +45019,7 @@ /area/almayer/living/briefing) "loz" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 + icon_state = "W" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) @@ -45167,6 +45107,13 @@ icon_state = "test_floor4" }, /area/almayer/powered/agent) +"lpJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "lql" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -45201,11 +45148,13 @@ /area/almayer/living/port_emb) "lrd" = ( /obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "lrq" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/armory) @@ -45255,7 +45204,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "lsn" = ( /obj/structure/surface/table/almayer, /obj/item/paper{ @@ -45344,7 +45293,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "ltv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45559,6 +45508,11 @@ icon_state = "cargo" }, /area/almayer/living/commandbunks) +"lxJ" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) "lxT" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -45676,7 +45630,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "lAa" = ( /obj/structure/surface/table/almayer, /obj/item/device/lightreplacer{ @@ -45732,7 +45686,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "lBg" = ( /obj/structure/bedsheetbin, /turf/open/floor/almayer{ @@ -45767,7 +45721,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "lBB" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -45775,7 +45729,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "lCc" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -45784,10 +45738,19 @@ dir = 4; icon_state = "pipe-c" }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"lCf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "lCm" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -46406,7 +46369,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "lOr" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -46492,7 +46455,7 @@ "lPW" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "lQa" = ( /obj/structure/machinery/light{ dir = 8 @@ -46919,7 +46882,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "maI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -46961,15 +46924,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"mbu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) "mbx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -47095,7 +47049,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "meT" = ( /obj/structure/machinery/door/poddoor/almayer/open{ id = "Hangar Lockdown"; @@ -47121,7 +47075,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "mfM" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, @@ -47150,7 +47104,7 @@ /obj/item/tool/pen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "mgb" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) @@ -47325,6 +47279,9 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"mjR" = ( +/turf/open/floor/plating, +/area/almayer/maint/upper/u_f_s) "mjS" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -47570,7 +47527,7 @@ dir = 8; icon_state = "greencorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "mnI" = ( /turf/open/floor/almayer{ icon_state = "blue" @@ -47591,7 +47548,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "mnW" = ( /obj/structure/surface/table/almayer, /obj/item/device/reagent_scanner{ @@ -47631,7 +47588,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/upper/u_f_p) "mor" = ( /obj/structure/machinery/light{ dir = 8 @@ -47734,7 +47691,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "mqg" = ( /obj/structure/bed/chair{ dir = 4 @@ -47773,18 +47730,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"mqR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/upper/aft_hallway) "mqU" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -47906,6 +47851,14 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"mtq" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "mtr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48104,7 +48057,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "mxT" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -48418,7 +48371,7 @@ }, /obj/item/tool/soap, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "mDJ" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) @@ -48578,7 +48531,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "mGu" = ( /turf/open/floor/almayer{ dir = 4; @@ -48765,7 +48718,7 @@ dir = 1; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "mJu" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/cic) @@ -48799,6 +48752,12 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"mJX" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "mKb" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -48870,6 +48829,15 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"mKG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "mKJ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -49034,7 +49002,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "mNX" = ( /turf/open/floor/almayer_hull{ dir = 4; @@ -49069,7 +49037,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "mOE" = ( /obj/structure/sign/safety/water{ pixel_x = -17 @@ -49086,7 +49054,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "mPc" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -49201,11 +49169,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/port_atmos) "mQF" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "mQY" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -49390,7 +49357,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "mTp" = ( /obj/structure/window/reinforced{ dir = 4; @@ -49457,7 +49424,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "mUY" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -49611,18 +49578,6 @@ icon_state = "orange" }, /area/almayer/hallways/lower/port_aft_hallway) -"mXP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) "mYd" = ( /obj/structure/sign/safety/escapepod{ pixel_y = 32 @@ -49635,7 +49590,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "mYt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -49708,6 +49663,12 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"mZv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "mZF" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -49783,7 +49744,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "nar" = ( /obj/structure/toilet{ dir = 4 @@ -49855,17 +49816,22 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) "nbW" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/midship_hallway) +"nbY" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "ncf" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -49928,7 +49894,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "ndl" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -50126,14 +50092,15 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"ngE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +"ngF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/hallways/upper/starboard) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "ngI" = ( /turf/open/floor/almayer{ dir = 8; @@ -50257,13 +50224,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"nhT" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/stern_hallway) "nhV" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -50625,7 +50585,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "nnL" = ( /obj/structure/toilet{ dir = 8 @@ -50767,15 +50727,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "nqG" = ( -/obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1 }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, +/turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "nqO" = ( /obj/structure/closet/secure_closet/fridge/fish/stock, @@ -50931,15 +50887,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) -"nub" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/almayer/living/starboard_garden) "nux" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -50997,7 +50944,7 @@ dir = 6; icon_state = "silver" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "nve" = ( /obj/structure/janitorialcart, /obj/item/tool/mop, @@ -51090,13 +51037,13 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "nww" = ( /turf/open/floor/almayer{ dir = 6; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "nwx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -51112,7 +51059,7 @@ dir = 1; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "nwD" = ( /turf/open/floor/almayer{ dir = 1; @@ -51139,7 +51086,7 @@ "nwT" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "nwU" = ( /obj/structure/machinery/light{ dir = 4 @@ -51311,15 +51258,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"nBo" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "nBw" = ( /turf/open/floor/almayer{ dir = 1; @@ -51655,7 +51593,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "nHu" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/structure/machinery/light{ @@ -51754,7 +51692,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "nIG" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -51871,7 +51809,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "nMe" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -51947,7 +51885,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "nNT" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/plating_catwalk, @@ -52147,7 +52085,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "nQA" = ( /turf/open/floor/carpet, /area/almayer/command/corporateliaison) @@ -52243,7 +52181,7 @@ "nTc" = ( /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/upper/u_f_p) "nTl" = ( /turf/open/floor/almayer{ dir = 1; @@ -52436,7 +52374,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "nVB" = ( /turf/open/floor/almayer, /area/almayer/command/securestorage) @@ -52616,6 +52554,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) +"nZK" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_f_p) "nZR" = ( /obj/structure/machinery/power/apc/almayer{ dir = 8 @@ -52707,7 +52653,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "obQ" = ( /obj/structure/bed/chair{ dir = 8 @@ -52767,7 +52713,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "ocX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -52777,7 +52723,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "odb" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -52928,6 +52874,12 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"oeN" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/upper/fore_hallway) "oeZ" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/medical) @@ -52962,18 +52914,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"ogd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/stern_hallway) "ogK" = ( /obj/structure/bed/bedroll{ desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; @@ -53083,13 +53023,6 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) -"oig" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) "oih" = ( /obj/structure/bed{ icon_state = "abed" @@ -53154,12 +53087,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/warden_office) -"oiB" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/hallways/upper/aft_hallway) "oiL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -53270,13 +53197,13 @@ dir = 10; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "okx" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "okD" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer6" @@ -53304,7 +53231,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "olM" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -53384,13 +53311,11 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "omt" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -53439,7 +53364,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "onn" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -53582,7 +53507,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "opV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -53712,10 +53637,13 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 13 }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "orH" = ( /turf/open/floor/almayer/uscm/directional{ dir = 10 @@ -53731,6 +53659,9 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) +"orV" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "osc" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, /obj/structure/machinery/light{ @@ -53754,7 +53685,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "osx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -53875,18 +53806,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) -"otE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) "otW" = ( /obj/structure/machinery/light/small, /obj/structure/prop/invuln/overhead_pipe{ @@ -54069,7 +53988,7 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "oxi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -54220,6 +54139,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/port_umbilical) +"oAp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "oAB" = ( /obj/structure/platform{ dir = 8; @@ -54265,7 +54193,7 @@ allow_construction = 0; icon_state = "plate" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "oBq" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -54549,6 +54477,14 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) +"oFU" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_p) "oFV" = ( /obj/structure/sign/poster{ pixel_x = -32; @@ -54999,7 +54935,7 @@ "oNa" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "oNb" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -55070,7 +55006,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "oOp" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wirecutters, @@ -55160,12 +55096,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) -"oPT" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) "oQn" = ( /turf/open/floor/almayer{ dir = 1; @@ -55370,7 +55300,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "oTe" = ( /obj/item/prop/almayer/box, /obj/item/prop{ @@ -55474,7 +55404,7 @@ name = "ship-grade camera" }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "oUZ" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -55619,18 +55549,6 @@ /obj/effect/decal/cleanable/ash, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"oXt" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/starboard) "oXJ" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ @@ -55718,7 +55636,7 @@ dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "oZp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light, @@ -56028,7 +55946,7 @@ dir = 4; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "peM" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -56078,6 +55996,12 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/starboard_hallway) +"pfe" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "pfp" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Up4"; @@ -56316,7 +56240,7 @@ dir = 10; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "pjR" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -56327,15 +56251,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"pjY" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "pkz" = ( /turf/open/floor/almayer{ icon_state = "redfull" @@ -56544,7 +56459,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "pqw" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -56593,6 +56508,12 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"pqR" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_p) "pqX" = ( /obj/structure/bed/chair{ dir = 4 @@ -56655,7 +56576,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "prX" = ( /obj/structure/ladder{ height = 2; @@ -56830,7 +56751,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "puO" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -56852,12 +56773,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"pvi" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "pvE" = ( /obj/structure/machinery/light{ dir = 1 @@ -56866,7 +56781,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "pvI" = ( /obj/structure/sign/safety/rad_haz{ pixel_x = 8; @@ -56923,7 +56838,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "pwx" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -57022,12 +56937,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) -"pym" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/stern_hallway) "pyx" = ( /obj/structure/machinery/door_display/research_cell{ dir = 4; @@ -57158,7 +57067,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "pBG" = ( /turf/closed/wall/almayer, /area/almayer/command/corporateliaison) @@ -57189,7 +57098,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "pDh" = ( /obj/structure/machinery/power/monitor{ name = "Core Power Monitoring" @@ -57268,12 +57177,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) -"pEd" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/stern_hallway) "pEl" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -57292,6 +57195,14 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"pEA" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/fore_hallway) "pEB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -57325,18 +57236,6 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) -"pFf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/upper/aft_hallway) "pFq" = ( /obj/structure/surface/table/almayer, /obj/item/device/binoculars, @@ -57353,6 +57252,14 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"pFJ" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_s) "pGh" = ( /obj/effect/decal/cleanable/cobweb{ pixel_x = -9; @@ -57409,6 +57316,12 @@ icon_state = "green" }, /area/almayer/hallways/lower/port_midship_hallway) +"pHj" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "pHp" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) @@ -57467,7 +57380,7 @@ /turf/open/floor/almayer{ icon_state = "dark_sterile" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "pIo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -57762,7 +57675,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/port) "pOD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -57894,12 +57807,6 @@ icon_state = "plating" }, /area/almayer/hallways/lower/vehiclehangar) -"pPU" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/upper/aft_hallway) "pQr" = ( /obj/structure/bed, /turf/open/floor/almayer{ @@ -58039,7 +57946,7 @@ pixel_x = -1 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "pSQ" = ( /obj/structure/reagent_dispensers/fueltank{ anchored = 1 @@ -58157,7 +58064,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "pVr" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -58215,6 +58122,16 @@ }, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) +"pVI" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "pWb" = ( /obj/effect/landmark/start/marine/tl/delta, /obj/effect/landmark/late_join/delta, @@ -58383,18 +58300,6 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) -"pZq" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/stern_hallway) "pZH" = ( /obj/structure/machinery/shower{ dir = 8 @@ -58537,7 +58442,7 @@ pixel_y = 32 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "qdk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -58920,6 +58825,9 @@ icon_state = "test_floor4" }, /area/almayer/living/tankerbunks) +"qii" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "qim" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -58984,7 +58892,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "qjV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -59227,7 +59135,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/north2) "qnh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59357,7 +59265,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "qpQ" = ( /obj/item/reagent_container/glass/beaker/bluespace, /obj/structure/machinery/chem_dispenser/medbay, @@ -59383,7 +59291,7 @@ dir = 9; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "qqf" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -59481,9 +59389,6 @@ /turf/open/floor/almayer, /area/almayer/engineering/ce_room) "qtj" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; layer = 2.5 @@ -59491,8 +59396,12 @@ /obj/effect/decal/warning_stripes{ icon_state = "NW-out" }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "red" }, /area/almayer/hallways/upper/port) "qtv" = ( @@ -59529,7 +59438,6 @@ }, /area/almayer/medical/cryo_tubes) "quy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ pixel_x = 8; pixel_y = -32 @@ -59538,9 +59446,7 @@ icon_state = "SW-out"; pixel_x = -1 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/turf/open/floor/almayer, /area/almayer/command/lifeboat) "quJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -59631,7 +59537,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "qwo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -59778,7 +59684,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "qxL" = ( /obj/structure/machinery/medical_pod/autodoc, /turf/open/floor/almayer{ @@ -59902,6 +59808,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/p_bow) +"qzQ" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_s) "qAs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -60141,10 +60053,13 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) +"qDX" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/upper/aft_hallway) "qEc" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "qEk" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -60252,7 +60167,7 @@ /turf/open/floor/almayer{ icon_state = "dark_sterile" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "qFi" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -60352,7 +60267,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "qGU" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -60364,7 +60279,7 @@ icon_state = "S" }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "qHg" = ( /turf/open/floor/almayer{ dir = 1; @@ -60386,7 +60301,10 @@ dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) +"qHA" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_a_s) "qHG" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -60595,6 +60513,15 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"qKU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "qKY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -60722,6 +60649,15 @@ icon_state = "cargo" }, /area/almayer/squads/delta) +"qNe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "qNI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -60815,7 +60751,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "qPD" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) @@ -60884,7 +60820,7 @@ dir = 6; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "qQS" = ( /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -60938,16 +60874,13 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "qSm" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) -"qSw" = ( -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) "qSE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/cholula, @@ -61458,6 +61391,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/engine_core) +"rao" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "raE" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -61611,7 +61551,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "rdt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -61773,10 +61713,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"rfQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) "rfT" = ( /obj/item/frame/camera{ desc = "The Staff Officer insisted he needed to monitor everyone at all times."; @@ -61897,16 +61833,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"rhX" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/stern_hallway) "rib" = ( /obj/structure/sink{ dir = 8; @@ -61975,7 +61901,7 @@ dir = 1; icon_state = "silvercorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "riP" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/rewire{ @@ -62203,7 +62129,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "rmD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -62238,7 +62164,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "rnF" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -62273,15 +62199,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"rnO" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/stern_hallway) "rob" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -62340,7 +62257,7 @@ dir = 9; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/south2) "rpp" = ( /obj/effect/landmark/start/executive, /turf/open/floor/plating/plating_catwalk, @@ -62362,6 +62279,10 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"rpP" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "rqb" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -62488,7 +62409,7 @@ dir = 1; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "rrK" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -62542,6 +62463,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"rsN" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "rsO" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -62734,7 +62660,7 @@ dir = 1; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "rwj" = ( /turf/open/floor/almayer{ dir = 4; @@ -63075,7 +63001,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "rDr" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -63186,7 +63112,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "rEt" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -63282,7 +63208,7 @@ dir = 10; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/north2) "rGj" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -63356,7 +63282,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "rHo" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -63463,7 +63389,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "rIH" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -63580,7 +63506,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "rKd" = ( /turf/open/floor/almayer/uscm/directional{ dir = 5 @@ -63824,6 +63750,17 @@ "rPt" = ( /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) +"rPB" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "rPE" = ( /obj/structure/bed/chair{ dir = 8; @@ -63933,7 +63870,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "rRf" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -63942,7 +63879,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/port) "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) @@ -64045,7 +63982,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/upper/u_f_p) "rTk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -64108,11 +64045,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"rUN" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) "rVc" = ( /obj/structure/bed/chair{ dir = 8; @@ -64188,12 +64120,6 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"rWP" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/upper/aft_hallway) "rWT" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -64302,7 +64228,7 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "rYh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -64345,7 +64271,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "rYI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64399,7 +64325,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "rZP" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack, @@ -64434,7 +64360,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "sbq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -64899,7 +64825,7 @@ dir = 5; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/south2) "siT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64961,7 +64887,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "sjz" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -65377,7 +65303,7 @@ dir = 8; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "sqa" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -65422,7 +65348,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "sqW" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/tomatoseed, @@ -65510,7 +65436,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/port) "ssU" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -65550,7 +65476,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "str" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down3"; @@ -65575,7 +65501,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "stO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/brig, @@ -65705,7 +65631,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "swt" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -65820,7 +65746,7 @@ dir = 1; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "szf" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -65934,7 +65860,7 @@ /turf/open/floor/almayer{ icon_state = "redfull" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/south2) "sBL" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/light, @@ -66043,7 +65969,7 @@ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "sDu" = ( /obj/item/clothing/under/marine/dress, /turf/open/floor/almayer{ @@ -66656,6 +66582,12 @@ icon_state = "plate" }, /area/almayer/living/offices) +"sPk" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "sPF" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -66689,7 +66621,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "sQF" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -66714,7 +66646,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "sSa" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 2; @@ -66893,7 +66825,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "sVT" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -67038,16 +66970,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"sYj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/hallways/upper/aft_hallway) "sYl" = ( /obj/structure/machinery/body_scanconsole{ dir = 8 @@ -67280,12 +67202,12 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "tbF" = ( /turf/open/floor/almayer{ icon_state = "silvercorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "tcd" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio{ @@ -67452,7 +67374,7 @@ "tey" = ( /obj/item/tool/wet_sign, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "tez" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -67656,6 +67578,13 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"tic" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "tig" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/tabasco{ @@ -67664,12 +67593,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha) -"tih" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "tii" = ( /obj/structure/machinery/firealarm{ pixel_x = 6; @@ -67732,6 +67655,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"tiO" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "tiR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ @@ -67776,7 +67705,7 @@ "tiZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "tjj" = ( /turf/open/floor/almayer{ dir = 5; @@ -67810,7 +67739,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "tjH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio/headset/almayer/mt, @@ -67966,15 +67895,11 @@ }, /area/almayer/shipboard/brig/execution) "tmI" = ( -/obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; pixel_x = -1 }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, +/turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "tmK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ @@ -68138,7 +68063,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "tpn" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/evidence_storage) @@ -68414,7 +68339,7 @@ /obj/item/clothing/glasses/mgoggles, /obj/item/clothing/glasses/mgoggles, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "ttB" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -68557,7 +68482,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "tvt" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -68621,7 +68546,7 @@ "tvS" = ( /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "twp" = ( /obj/structure/ladder{ height = 1; @@ -68710,7 +68635,7 @@ dir = 10; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "txp" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -68816,7 +68741,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "tzL" = ( /obj/structure/sign/safety/waterhazard{ pixel_x = 8; @@ -68976,7 +68901,7 @@ dir = 8; icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "tCD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -68986,7 +68911,7 @@ dir = 8; icon_state = "cargo_arrow" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "tCT" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -69078,11 +69003,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"tFQ" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/upper/stern_hallway) "tFS" = ( /obj/structure/machinery/computer/supplycomp, /obj/structure/sign/safety/terminal{ @@ -69179,7 +69099,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "tHk" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -69342,12 +69262,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"tJH" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/stern_hallway) "tJN" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -69374,15 +69288,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"tKf" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/lifeboat) "tKr" = ( /obj/structure/machinery/cryopod/right{ dir = 2 @@ -69462,7 +69367,7 @@ /turf/open/floor/almayer{ icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "tMU" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -69602,7 +69507,7 @@ "tPz" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "tPB" = ( /obj/effect/projector{ name = "Almayer_Down2"; @@ -69612,7 +69517,7 @@ /turf/open/floor/almayer{ allow_construction = 0 }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "tPI" = ( /obj/structure/bed/chair{ dir = 4 @@ -69653,7 +69558,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "tQL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light, @@ -69666,7 +69571,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "tQV" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south1) @@ -69720,15 +69625,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"tSY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/stern_hallway) "tTk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69767,6 +69663,13 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) +"tTE" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) "tTG" = ( /obj/structure/sign/safety/terminal{ pixel_x = 8; @@ -69864,7 +69767,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "tVx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69888,7 +69791,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "tWi" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -69936,7 +69839,7 @@ "tWM" = ( /obj/docking_port/stationary/escape_pod/north, /turf/open/floor/plating, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "tWY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -70121,7 +70024,7 @@ pixel_y = 24 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "tZZ" = ( /obj/structure/machinery/cryopod, /obj/effect/decal/warning_stripes{ @@ -70258,7 +70161,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "ucp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -70557,6 +70460,11 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"uhI" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "uhM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -70625,7 +70533,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "ujz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -70762,13 +70670,13 @@ dir = 1; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "umI" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "umS" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -70912,6 +70820,11 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) +"upQ" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/lifeboat_pumps/north1) "upR" = ( /obj/structure/machinery/light{ dir = 1 @@ -70998,11 +70911,11 @@ /turf/open/floor/almayer{ icon_state = "orangecorner" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "urg" = ( /obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "urk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -71018,7 +70931,7 @@ dir = 1; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "ury" = ( /obj/structure/bed/chair{ dir = 8 @@ -71047,7 +70960,7 @@ pixel_y = 13 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "urM" = ( /obj/structure/machinery/light{ dir = 8 @@ -71062,6 +70975,9 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"usi" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "usm" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -71097,13 +71013,8 @@ }, /area/almayer/medical/medical_science) "usL" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, /obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/turf/open/floor/almayer, /area/almayer/hallways/upper/port) "usX" = ( /obj/structure/disposalpipe/segment{ @@ -71154,7 +71065,7 @@ /turf/open/floor/almayer{ icon_state = "cargo" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "utK" = ( /obj/structure/machinery/light{ dir = 4 @@ -71305,7 +71216,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "uvt" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -71361,7 +71272,7 @@ "uwf" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "uws" = ( /obj/structure/machinery/light{ dir = 4 @@ -71441,7 +71352,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "uxC" = ( /obj/structure/machinery/light{ dir = 4 @@ -71471,6 +71382,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"uxW" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "uxX" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -71555,7 +71472,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "uAj" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, @@ -71943,7 +71860,7 @@ /turf/open/floor/almayer{ icon_state = "greencorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "uIv" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -72220,7 +72137,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "uOJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -72233,6 +72150,12 @@ icon_state = "blue" }, /area/almayer/living/basketball) +"uPB" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "uPE" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) @@ -72241,7 +72164,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "uPP" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -72277,7 +72200,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "uQm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -72426,7 +72349,7 @@ icon_state = "pipe-c" }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "uTk" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, @@ -72450,6 +72373,12 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"uTD" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/fore_hallway) "uTE" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -72616,7 +72545,7 @@ dir = 10; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "uVh" = ( /obj/structure/filingcabinet/seeds, /turf/open/floor/almayer{ @@ -72674,7 +72603,7 @@ dir = 5; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "uWc" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -72861,7 +72790,7 @@ dir = 8; icon_state = "bluecorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "uZV" = ( /obj/structure/reagent_dispensers/fueltank/gas/methane{ anchored = 1 @@ -72961,7 +72890,7 @@ dir = 4; icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "vbB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) @@ -73073,15 +73002,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) -"vcO" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "vdl" = ( /obj/structure/window/reinforced/ultra{ pixel_y = -12 @@ -73136,7 +73056,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "ven" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -73171,7 +73091,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "veW" = ( /obj/structure/machinery/door/airlock/almayer/generic/glass{ name = "\improper Passenger Cryogenics Bay" @@ -73179,7 +73099,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73464,14 +73384,11 @@ }, /area/almayer/lifeboat_pumps/south1) "vjd" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; pixel_y = 1 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/turf/open/floor/almayer, /area/almayer/command/lifeboat) "vjg" = ( /obj/structure/prop/almayer/missile_tube{ @@ -73661,7 +73578,7 @@ dir = 5; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "vkR" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -73675,7 +73592,12 @@ "vkV" = ( /obj/effect/landmark/start/liaison, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) +"vle" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "vlk" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/gas, @@ -73750,7 +73672,7 @@ /turf/open/floor/almayer{ icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "vlX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -73781,7 +73703,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "vmE" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" @@ -73847,7 +73769,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "vop" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73879,6 +73801,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_p) +"vpi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "vpn" = ( /turf/open/floor/almayer{ dir = 9; @@ -73937,6 +73865,9 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) +"vqh" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_f_s) "vqz" = ( /obj/structure/machinery/light{ dir = 4 @@ -74222,7 +74153,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/starboard) "vuF" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ access_modified = 1; @@ -74398,7 +74329,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "vwU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -74619,7 +74550,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "vzP" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/cups, @@ -74841,7 +74772,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_f_s) "vDz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -74862,7 +74793,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "vEf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -74978,7 +74909,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "vFH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -75133,22 +75064,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"vHA" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/starboard) "vHO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -75194,7 +75109,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "vIu" = ( /obj/structure/machinery/light{ dir = 4 @@ -75335,6 +75250,14 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) +"vLM" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "vMb" = ( /obj/item/stool{ pixel_x = -15; @@ -75414,7 +75337,7 @@ "vMQ" = ( /obj/docking_port/stationary/escape_pod/north, /turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "vMU" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -75706,7 +75629,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "vRR" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -75930,7 +75853,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "vUP" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cic_hallway) @@ -75996,9 +75919,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"vVY" = ( -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_s) "vVZ" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -76153,12 +76073,6 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) -"vXk" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/upper/stern_hallway) "vXo" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -76341,7 +76255,7 @@ dir = 8; icon_state = "red" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/starboard) "wbu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname/almayer{ @@ -76881,18 +76795,12 @@ }, /area/almayer/shipboard/port_point_defense) "wjE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "W" }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "red" }, /area/almayer/hallways/upper/starboard) "wjL" = ( @@ -76908,7 +76816,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "wjQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/prop/invuln/overhead_pipe{ @@ -77064,7 +76972,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "wlD" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/effect/decal/warning_stripes{ @@ -77123,7 +77031,7 @@ /turf/open/floor/almayer{ icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "wmK" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -77270,6 +77178,7 @@ pixel_y = 28 }, /obj/structure/closet, +/obj/item/clothing/head/bearpelt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -77295,7 +77204,7 @@ dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "wqc" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -77398,7 +77307,7 @@ pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/living/starboard_garden) +/area/almayer/lifeboat_pumps/north1) "wrT" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio/marine, @@ -77675,6 +77584,15 @@ icon_state = "cargo" }, /area/almayer/living/synthcloset) +"wwi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "wwr" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -77803,6 +77721,9 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"wyc" = ( +/turf/open/floor/plating, +/area/almayer/maint/upper/u_f_p) "wyt" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/microwave{ @@ -77828,7 +77749,7 @@ dir = 4; icon_state = "silvercorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "wyG" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -77871,7 +77792,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "wzZ" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 1; @@ -78326,7 +78247,7 @@ dir = 10; icon_state = "orange" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "wJh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -78544,6 +78465,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) +"wLT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "wMl" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -78579,6 +78509,9 @@ icon_state = "test_floor5" }, /area/almayer/hallways/lower/starboard_midship_hallway) +"wMD" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_f_p) "wMF" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -78738,7 +78671,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/lifeboat_pumps/north2) "wPz" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -78773,7 +78706,7 @@ /obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/cm, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "wQu" = ( /obj/effect/projector{ name = "Almayer_Up3"; @@ -78973,12 +78906,6 @@ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) -"wTy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/lifeboat_pumps/south1) "wTB" = ( /obj/structure/surface/table/almayer, /obj/item/fuel_cell, @@ -79308,7 +79235,7 @@ /turf/open/floor/plating/almayer{ allow_construction = 0 }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "wZp" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -79317,7 +79244,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "wZv" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -79463,7 +79390,8 @@ /area/almayer/command/airoom) "xci" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out" + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) @@ -79479,7 +79407,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "xcI" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -79508,7 +79436,7 @@ dir = 4; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "xdf" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -79516,11 +79444,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) -"xdl" = ( -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "xdx" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular/empty, @@ -79599,7 +79522,7 @@ dir = 4; icon_state = "orangecorner" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "xer" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/plating/plating_catwalk, @@ -79610,7 +79533,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "xfm" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/window/framed/almayer, @@ -79621,7 +79544,7 @@ dir = 10; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "xfq" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -79687,7 +79610,7 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "xgh" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -79729,7 +79652,7 @@ icon_state = "pipe-c" }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "xgJ" = ( /obj/structure/machinery/light{ dir = 1 @@ -79780,11 +79703,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_p) -"xhi" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/stern_hallway) "xhn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -79920,7 +79838,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "xjK" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -79971,7 +79889,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "xkB" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 1 @@ -80129,7 +80047,7 @@ dir = 8; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "xoj" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop) @@ -80423,7 +80341,7 @@ }, /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "xtM" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -80441,7 +80359,7 @@ dir = 1; icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "xub" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -80521,6 +80439,9 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"xvB" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_f_p) "xvE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ @@ -80553,7 +80474,7 @@ dir = 5; icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "xvQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/sentencing{ @@ -80642,7 +80563,7 @@ /turf/open/floor/almayer{ icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "xwX" = ( /turf/open/floor/almayer{ dir = 9; @@ -81005,6 +80926,14 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) +"xCS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "xDe" = ( /obj/effect/projector{ name = "Almayer_Down4"; @@ -81040,7 +80969,7 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/upper/u_a_s) "xDV" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -81095,7 +81024,7 @@ /turf/open/floor/almayer{ icon_state = "silver" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "xFZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -81215,7 +81144,7 @@ dir = 10; icon_state = "silver" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "xHS" = ( /obj/structure/reagent_dispensers/fueltank/oxygentank{ anchored = 1 @@ -81405,6 +81334,12 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/general_equipment) +"xLm" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "xLn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -81584,7 +81519,7 @@ dir = 4; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "xNu" = ( /obj/structure/toilet{ dir = 1 @@ -81698,7 +81633,7 @@ dir = 10 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "xPZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -81811,7 +81746,7 @@ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "xRw" = ( /turf/open/floor/almayer/uscm/directional{ dir = 1 @@ -81846,7 +81781,7 @@ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "xSw" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -81939,6 +81874,15 @@ icon_state = "plate" }, /area/almayer/living/numbertwobunks) +"xTO" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "xTR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -82049,6 +81993,12 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"xVg" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "xVk" = ( /turf/open/space, /area/space/almayer/lifeboat_dock) @@ -82239,7 +82189,7 @@ dir = 6; icon_state = "blue" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "xZk" = ( /obj/item/prop/helmetgarb/gunoil{ layer = 4.2; @@ -82270,7 +82220,7 @@ "xZz" = ( /obj/item/paper/almayer_storage, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_a_p) "xZG" = ( /obj/structure/machinery/light{ dir = 4 @@ -82365,18 +82315,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"yaR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/stern_hallway) "yaX" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2; @@ -82399,7 +82337,7 @@ /area/almayer/command/airoom) "ybk" = ( /turf/closed/wall/almayer, -/area/almayer/hallways/upper/stern_hallway) +/area/almayer/hallways/upper/midship_hallway) "ybm" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/hardhat{ @@ -82511,6 +82449,9 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"yde" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "ydf" = ( /obj/structure/platform{ dir = 1 @@ -82697,7 +82638,7 @@ dir = 9; icon_state = "silver" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/upper/u_m_p) "yfO" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ name = "\improper Warden's Office"; @@ -82997,7 +82938,7 @@ current_rounds = 0 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/upper/u_m_s) "ylc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -106445,7 +106386,7 @@ auZ aiX aiX mJp -bNT +jZl cbK awF hRk @@ -106647,9 +106588,9 @@ pQV apq ana aiX -glc -bNT -rmB +cKp +jZl +dgI awF xTL lmA @@ -106850,8 +106791,8 @@ xQg wWC szO aiX -nLM -bNT +xTO +jZl iPU awF awF @@ -107053,10 +106994,10 @@ yjM qbO aqw hnI -kGS -bNT +ash +jZl gFN -bMi +kED awF nvG vGI @@ -107256,10 +107197,10 @@ aqy nBE pOD bZa -nIF +evG duR gFN -mqd +oeN awF aHn szU @@ -107459,8 +107400,8 @@ aiX aiX aiX aiX -eFI -bNT +rPB +jZl sQu tsr tsr @@ -107662,9 +107603,9 @@ aiX aKG amb aiX -eWN -bNT -rmB +juM +jZl +dgI tsr sOL jIC @@ -107866,8 +107807,8 @@ aKH and aiX umD -bNT -kGS +jZl +ash fyT xIV xIV @@ -108069,7 +108010,7 @@ aiX aiX aiX cwi -bNT +jZl fBA tsr iPN @@ -108272,8 +108213,8 @@ mBe atT aiX fXf -bNT -hCF +jZl +sPk tsr tsr vOY @@ -108474,9 +108415,9 @@ aiX asf atT aiX -cKW -mqR -xZf +juM +qNe +dgI lIj tBY gkE @@ -108678,7 +108619,7 @@ aiX aiX aiX dRo -fsu +ewL enz lIj lIj @@ -108855,12 +108796,12 @@ adq aei aka aWn -njn -njn -njn -njn -njn -njn +lfc +lfc +lfc +lfc +lfc +lfc oGC awW acW @@ -108874,8 +108815,8 @@ fCP fCP stk fCP -kGS -kGS +ash +ash sVA fCP vUO @@ -108902,15 +108843,15 @@ baw sgU baw baw -nIN -nIN -nIN -nIN -nIN -nIN -hXV +xvB +xvB +xvB +xvB +xvB +xvB +gnv yhI -rRz +tTu pgD tQV aaa @@ -109055,15 +108996,15 @@ aaa aaa abs adq -apr -apr -aoV -njn -rWz -rWz -rWz +afr +akc +apg +lfc +mjR +mjR +mjR tWM -njn +lfc aea oGC xjD @@ -109074,24 +109015,24 @@ oAO pIZ qwf jRm -gDQ -gDQ -gDQ -rUN -gDQ -gDQ +dsS +dsS +dsS +rsN +dsS +dsS dFd -rDm -rDm -gDQ +uhI +uhI +dsS saT -gDQ -rUN -rUN +dsS +rsN +rsN bxt tPz tPz -tiZ +rpP tPz tPz tPz @@ -109105,15 +109046,15 @@ aZz nsc baw cxk -nIN -rgL -rgL -rgL +xvB +wyc +wyc +wyc nTc -nIN -wTy -wTy -wTy +xvB +crh +csI +qhb pgD tQV aaa @@ -109259,14 +109200,14 @@ aaa abs adq aub -akc -euO -njn -rWz -rWz -rWz -rWz -njn +akt +awW +lfc +mjR +mjR +mjR +mjR +lfc oGC sHp oGC @@ -109276,7 +109217,7 @@ awW aSJ isI dgP -jao +mKG uIa qxK rYG @@ -109298,7 +109239,7 @@ qxK rYG qxK bTD -jao +mKG uQi dCD aXe @@ -109308,14 +109249,14 @@ baw mnA baw baw -nIN -rgL -rgL -rgL -rgL -nIN -crh -csI +xvB +wyc +wyc +wyc +wyc +xvB +baw +sMM nqG pgD tQV @@ -109465,21 +109406,21 @@ avd akt awW qHq -rWz -rWz -rWz -rWz -njn +mjR +mjR +mjR +mjR +lfc vzO -njn -njn -njn -njn -njn -njn -njn +lfc +lfc +lfc +lfc +lfc +lfc +lfc dgP -jao +mKG uQi aoe aoe @@ -109501,21 +109442,21 @@ aoe aoe aoe maF -jao +mKG mOw -nIN -nIN -nIN -nIN -nIN -nIN -rBD -nIN -nIN -rgL -rgL -rgL -rgL +xvB +xvB +xvB +xvB +xvB +xvB +abz +xvB +xvB +wyc +wyc +wyc +wyc eOM baw sMM @@ -109667,12 +109608,12 @@ adq aGP aka aWu -njn -rWz -rWz -rWz -rWz -njn +lfc +mjR +mjR +mjR +mjR +lfc gur osn vDt @@ -109680,9 +109621,9 @@ puJ deA olC ujf -njn +lfc xky -jao +mKG uQi aoe aoh @@ -109704,22 +109645,22 @@ isN cnZ aoe dgP -jao +mKG uQi -nIN +xvB cHn cHn -gNo -aZv -gNo -xzh +ftw +nZK +ftw +wMD dcZ -nIN -rgL -rgL -rgL -rgL -nIN +xvB +wyc +wyc +wyc +wyc +xvB hWB yhI qSX @@ -109870,22 +109811,22 @@ adq aGQ akc apg -njn -rWz -rWz -rWz -rWz -njn -jsA -cGR +lfc +mjR +mjR +mjR +mjR +lfc +aHo +vqh tey urL tey -cGR -jsA +vqh +aHo tQA -kGS -lOn +ash +wwi uQi aoe vbS @@ -109907,22 +109848,22 @@ aEi coa aoe tWf -lOn -kGS -aZv -gNo -xzh -xzh -nIN +wwi +ash +nZK +ftw +wMD +wMD +xvB gJY -gNo -gNo -nIN -rgL -rgL -rgL -rgL -nIN +ftw +ftw +xvB +wyc +wyc +wyc +wyc +xvB wvj csI iPH @@ -110073,11 +110014,11 @@ aee avd akt qWI -njn -njn -njn -njn -njn +lfc +lfc +lfc +lfc +lfc gxm gxm gxm @@ -110088,7 +110029,7 @@ gxm gxm gxm tWf -lOn +wwi uQi aoe qQc @@ -110110,7 +110051,7 @@ aEi fFh aoe dgP -lOn +wwi uQi gxm gxm @@ -110121,11 +110062,11 @@ gxm gxm gxm gxm -nIN -nIN -nIN -nIN -nIN +xvB +xvB +xvB +xvB +xvB ehj irS ilJ @@ -110273,10 +110214,10 @@ aaa aaa abs adq -aWm -aka -kyY -njn +lpJ +akt +awW +lfc mfR sqP tVs @@ -110291,7 +110232,7 @@ aps aps gxm xtO -jao +mKG uQi aoe vbS @@ -110313,7 +110254,7 @@ hFF aoe aoe dgP -jao +mKG uQi gxm aiJ @@ -110325,12 +110266,12 @@ cJV cJV gxm ear -aGm -xzh +pqR +wMD ear -nIN -rQW -yhI +xvB +baw +sMM tmI pgD tQV @@ -110476,14 +110417,14 @@ aaa aaa abs adq -apr -apr -apr -njn +aWm +aka +kyY +lfc hzl vdT -jsA -jsA +aHo +aHo gxm tPB tPB @@ -110494,7 +110435,7 @@ aps aps gxm hGo -lOn +wwi uQi aoe aop @@ -110516,7 +110457,7 @@ aQz aRJ ajl dgP -lOn +wwi uQi gxm aiJ @@ -110527,14 +110468,14 @@ cJV cJV cJV gxm -aGm -xzh -xzh +pqR +wMD +wMD moq -nIN -wTy -wTy -wTy +xvB +rQW +yhI +rRz pgD tQV aaa @@ -110677,15 +110618,15 @@ bdH bdH bdH bdH -acf -aet -afB -akW -apu -njn -njn +abs +adq +afr +akc +apg +lfc +lfc lBB -cGR +vqh mOR gxm gHX @@ -110719,7 +110660,7 @@ aQz aRK ajl kUs -lOn +wwi uQi gxm aiJ @@ -110731,13 +110672,13 @@ oAY oAY gxm rTe -xzh -gNo -nIN -nIN -crh +wMD +ftw +xvB +xvB +vpn csI -qhb +goL pgD tQV bdH @@ -110880,14 +110821,14 @@ aaf aaf aaf aaf -acv -aez -boL -akY -boL -aiH -hbl -cGR +abw +eCC +awW +akt +awW +upQ +fFs +vqh fwP mOR gxm @@ -110900,7 +110841,7 @@ asm asm gxm dgP -mxg +qNe mnV aoe pjF @@ -110922,7 +110863,7 @@ fOL aRS ajl hGo -jao +mKG uQi gxm alW @@ -110933,10 +110874,10 @@ nVA nVA nVA gxm -aGm +pqR ear -gNo -aZv +ftw +nZK aJU baw sMM @@ -111083,16 +111024,16 @@ aag aag aag aag -acv -aez -boL -akY +abw +eCC +awW +akt wrQ -njn -njn -njn -njn -njn +lfc +lfc +lfc +lfc +lfc gxm tpj tpj @@ -111103,7 +111044,7 @@ asm asm gxm dgP -lOn +wwi tQO sqf sqf @@ -111124,8 +111065,8 @@ upM akw alD vEx -kGS -lOn +ash +wwi uQi gxm alW @@ -111136,11 +111077,11 @@ nVA nVA nVA gxm -nIN -nIN -nIN -nIN -nIN +xvB +xvB +xvB +xvB +xvB nTH sMM baw @@ -111286,15 +111227,15 @@ aag aag aag aag -acf -aet -agS -aiP -aYq -njn -rWz -rWz -rWz +abs +adq +aeZ +aka +aoI +lfc +mjR +mjR +mjR tWM gxm tpj @@ -111306,7 +111247,7 @@ asm asm gxm dgP -lOn +wwi uQi sqf anp @@ -111328,7 +111269,7 @@ onQ alD ajl bNI -lOn +wwi uQi gxm alW @@ -111339,11 +111280,11 @@ nVA nVA nVA gxm -rgL -rgL -rgL +wyc +wyc +wyc nTc -nIN +xvB gnv yhI tTu @@ -111489,16 +111430,16 @@ aag aag aag aag -acf -aet -agB -akW -aYs -njn -rWz -rWz -rWz -rWz +abs +adq +afr +akc +apg +lfc +mjR +mjR +mjR +mjR gxm lbc tpj @@ -111509,7 +111450,7 @@ asm asm gxm dgP -jao +mKG uQi sqf sOZ @@ -111531,7 +111472,7 @@ aCp alD ajl kiq -jao +mKG uQi gxm alW @@ -111542,11 +111483,11 @@ nVA nVA wZk gxm -rgL -rgL -rgL -rgL -nIN +wyc +wyc +wyc +wyc +xvB vpn csI goL @@ -111692,16 +111633,16 @@ aag aag aag aag -acv -aez -boL -akY -boL +abw +eCC +awW +akt +awW avJ -rWz -rWz -rWz -rWz +mjR +mjR +mjR +mjR gxm tpj tpj @@ -111712,7 +111653,7 @@ asm asm gxm dgP -mxg +qNe mOw sqf anq @@ -111734,7 +111675,7 @@ akx alD gWG dgP -jao +mKG uQi gxm alW @@ -111745,10 +111686,10 @@ nVA nVA nVA gxm -rgL -rgL -rgL -rgL +wyc +wyc +wyc +wyc qxz baw sMM @@ -111895,16 +111836,16 @@ aag aag aag aag -acv -aez -boL -akY +abw +eCC +awW +akt aqk -njn -rWz -rWz -rWz -rWz +lfc +mjR +mjR +mjR +mjR gxm tpj tpj @@ -111915,7 +111856,7 @@ asm asm gxm dgP -jao +mKG uQi sqf anr @@ -111937,7 +111878,7 @@ akx alD gWG dgP -jao +mKG uQi gxm alW @@ -111948,11 +111889,11 @@ nVA nVA nVA gxm -rgL -rgL -rgL -rgL -nIN +wyc +wyc +wyc +wyc +xvB xuY sMM baw @@ -112098,16 +112039,16 @@ aag aag aag aag -acf -aet -agS -aiP -aYq -njn -rWz -rWz -rWz -rWz +abs +adq +aeZ +aka +aoI +lfc +mjR +mjR +mjR +mjR gxm tpj tpj @@ -112118,7 +112059,7 @@ asm asm gxm maF -jao +mKG uQi sqf sqf @@ -112140,7 +112081,7 @@ hVz alD ajl tWf -jao +mKG uQi gxm alW @@ -112151,11 +112092,11 @@ nVA nVA nVA gxm -rgL -rgL -rgL -rgL -nIN +wyc +wyc +wyc +wyc +xvB gnv yhI tTu @@ -112301,16 +112242,16 @@ aag aag aag aag -acf -aet +abs +adq afB -akW +akc biT -njn -njn -njn -njn -njn +lfc +lfc +lfc +lfc +lfc gxm hWV hWV @@ -112321,7 +112262,7 @@ gxm gxm gxm mYd -lOn +wwi xwU ajl qhx @@ -112343,7 +112284,7 @@ nMV vIf ajl maF -lOn +wwi nwu gxm gxm @@ -112354,11 +112295,11 @@ hWV hWV hWV gxm -nIN -nIN -nIN -nIN -nIN +xvB +xvB +xvB +xvB +xvB crh csI qhb @@ -112504,28 +112445,28 @@ aag aag aag aag -acv -aez -boL -boL -boL -ahl -cWv -cWv -cWv -cWv +abw +eCC +awW +awW +awW +pEA +fCP +fCP +fCP +fCP omp -kmx +ocX xog xog vFy -ltt +fCP fCP vUO fCP xRn -lOn -kGS +wwi +ash bVE aos akw @@ -112545,23 +112486,23 @@ ans aos alE bVE -kGS -lOn +ash +wwi mnC vUO qRx fCP -ltt +fCP cuI ocX ocX -sYj -fvj +ocX +pVI fCP fCP -kGS fCP -oiB +fCP +pEA baw baw qYC @@ -112707,28 +112648,28 @@ aag aag aag aag -acv -aez -boL -asS -boL -ceu -boL -boL -boL -boL +abw +eCC +awW +aTm +awW +pEA +orV +orV +orV +orV +fGD fGD -bfb qEc qEc qEc -ltt -gfv -gfv -gfv -gfv -aPC -tzF +orV +yde +yde +yde +yde +gkV +uTD aEe akA akA @@ -112748,23 +112689,23 @@ akA oap aSb aEe -tzF +uTD lzF -gfv -gfv -gfv -gfv -ltt +yde +yde +yde +yde +orV qEc qEc qEc -rWP fGD -acQ -acQ -acQ -acQ -uQi +fGD +orV +orV +orV +orV +pEA baw vbB ley @@ -112910,27 +112851,27 @@ aah aah aah aah -acf -acf -boL +abs +abs +awW ale -bDD -nub -dux -iYr -dux -ado -ltt -uVZ +ajE +pEA +ash +rYG +ash +xcY +qxK +qxK qxK qxK rYG -ltt +qxK qxK qxK qxK bTD -mxg +qNe uQi vOy vOy @@ -112952,22 +112893,22 @@ wMO wky sqf bNI -mxg +qNe uIa qxK qxK qxK -ltt +qxK rYG qxK qxK -fdf -ltt qxK -kGS +qxK +qxK +ash ftZ qxK -fdf +pEA baw dBp gVA @@ -113115,10 +113056,10 @@ aaa aaa aaa acf -aet -aet biV +aet biV +aet ekY aet ekY @@ -113157,16 +113098,16 @@ sqf uVZ rnd fdf -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU +pBG +pBG +pBG +pBG +pBG +pBG +pBG +pBG +pBG +pBG oiq mRU mRU @@ -113336,7 +113277,7 @@ aed aeG abE umI -fsu +dzV umI vOy oNp @@ -113360,16 +113301,16 @@ sqf umI uch umI -mRU -qSw -qSw -qSw -qSw +pBG +idM +idM +idM +idM fHM pBG rLp ttX -mRU +pBG vpf mRU vor @@ -113563,16 +113504,16 @@ asn okx cFH xfo -mRU -qSw -qSw -qSw -qSw -qSw +pBG +idM +idM +idM +idM +idM pBG jZU jAe -mRU +pBG jtU mRU tNw @@ -113766,16 +113707,16 @@ asn eWN lOn rmB -mRU -qSw -qSw -qSw -qSw -qSw +pBG +idM +idM +idM +idM +idM pBG cVq nOb -mRU +pBG vpI mRU mRU @@ -113969,16 +113910,16 @@ asn eWN jao hCF -mRU -qSw -qSw -qSw -qSw -qSw +pBG +idM +idM +idM +idM +idM pBG dzp ngV -mRU +pBG jtU jtU uBx @@ -114172,7 +114113,7 @@ sqf jMP jao rmB -mRU +pBG pBG pBG pBG @@ -114181,7 +114122,7 @@ pBG pBG saL pBG -mRU +pBG mRU mRU mRU @@ -116177,7 +116118,7 @@ fcE aef uNN abE -iGZ +ftb lOn rmB vOy @@ -116989,7 +116930,7 @@ aco aco dYu bsw -cKW +kON xNl dpS jao @@ -118396,18 +118337,18 @@ aam gxm hgk tob -cGd -cGd -cGd -cGd -cGd -cGd -cGd -cGd -cGd -cGd -cGd -cGd +njn +njn +njn +njn +njn +njn +njn +njn +njn +njn +njn +aej aej aej aej @@ -118433,22 +118374,22 @@ vOy bxV lOn uAi -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU -mRU +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN +nIN jtU vpf gxm @@ -118599,16 +118540,16 @@ aam gxm bLf tob -cGd -vVY -vVY -vVY -vVY +njn +rWz +rWz +rWz +rWz kLB -vVY -vVY -vVY -vVY +rWz +rWz +rWz +rWz kLB aej aeO @@ -118636,22 +118577,22 @@ vOy eWN lOn rmB -mRU +nIN bnF lBw bnF -mRU -qSw -qSw -qSw -qSw +nIN +rgL +rgL +rgL +rgL urg -qSw -qSw -qSw -qSw +rgL +rgL +rgL +rgL urg -mRU +nIN jtU nVE gxm @@ -118802,17 +118743,17 @@ aam gxm rGz tob -cGd -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY +njn +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz aej aeP agI @@ -118840,21 +118781,21 @@ eWN jao rmB eyI -jtU +xzh jaW vkV -mRU -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +nIN jtU bWg gxm @@ -119005,17 +118946,17 @@ gxm gxm hqb vsd -cGd -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY +njn +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz aej aeQ agK @@ -119046,18 +118987,18 @@ eyI yfL sjw xHD -mRU -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +nIN jZo hQK gxm @@ -119208,25 +119149,25 @@ ouf aLc wBI hGG -cGd -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY -vVY +njn +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz +rWz aej aeR agK agu aej ftb -mqR -djd +mxg +hCF vOy wWz pEJ @@ -119242,25 +119183,25 @@ xQm tfH wTM vOy -ddx -pFf -xZf +nLM +jao +rmB eyI byH -jtU +xzh nvd -mRU -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +rgL +nIN vmJ elv vRR @@ -119411,25 +119352,25 @@ ouf sdf cRL hGG -cGd -cGd -cGd +njn +njn +njn ahi -cGd -cGd -cGd -cGd +njn +njn +njn +njn uux -cGd -cGd +njn +njn aej aej agO aid aej -umI +kON fsu -umI +xZf vOy wWz uwZ @@ -119445,25 +119386,25 @@ vfP sNz wTM vOy -umI +kON fsu -umI -mRU -mRU +xZf +nIN +nIN veW -mRU -mRU -mRU -mRU +nIN +nIN +nIN +nIN nNX -mRU -mRU -mRU -mRU +nIN +nIN +nIN +nIN ayo -mRU -mRU -mRU +nIN +nIN +nIN cna nzD xDV @@ -119615,7 +119556,7 @@ fTj jOD oOw cPK -oXt +wjE loz sAz jZC @@ -119626,10 +119567,10 @@ cQW lQa wjE vuE -bkb -kGS -kGS -pvi +ilq +aLh +aLh +ltt bgh spW pjQ @@ -119651,9 +119592,9 @@ vOy bgh spW pjQ -eJg +ltt bkb -kGS +bWx rRf pOC qtj @@ -119665,7 +119606,7 @@ kMp jkB hlT qNI -hRc +wrX tqO kdn nyS @@ -119818,7 +119759,7 @@ dho wVt wVt jlc -ngE +sVV kbv dTn kbv @@ -119827,12 +119768,12 @@ kbv jlc kbv dTn -ngE -acQ -acQ -acQ -acQ -xdl +sVV +sVV +sVV +sVV +sVV +ltt klr bNT dOW @@ -119855,11 +119796,11 @@ gTV mGk xFW lrd -kkI -kkI -kkI -kkI -usL +cMz +cMz +cMz +cMz +cMz gsC cMz qLg @@ -120021,7 +119962,7 @@ bGa dVn vwC fbR -gcq +xMz xci eON gxn @@ -120030,12 +119971,12 @@ xMz sdv xMO wDg -vHA +xMz waV -iGE -kGS -kGS -pjY +gxn +aLh +aLh +ltt gqv hKJ nww @@ -120057,9 +119998,9 @@ vOy xvO peu nww -vcO +ltt ssF -kGS +bWx bij hux kfo @@ -120071,7 +120012,7 @@ nNx pMA ncT gHh -kfo +oWx dbc cNM ofU @@ -120220,20 +120161,20 @@ vHn ggD tob cGd -cGd -cGd -cGd -cGd -cGd -cGd +njn +njn +njn +njn +njn +njn hZE sVV oON -cGd -cGd +njn +njn cva -cGd -cGd +njn +njn ael ael agQ @@ -120242,43 +120183,43 @@ ael htF bNT jvz -ltt -pPU -pPU +uPB +uPB +uPB ecz -pPU -pPU -pPU -pPU -pPU -pPU -pPU +uPB +uPB +uPB +uPB +uPB +llt +uPB ecz -pPU -pPU -ltt +uPB +uPB +uPB riK bNT hmB -mRU -mRU -gBs -mRU -mRU -mRU -gBs -mRU -mRU -mRU +nIN +nIN +rBD +nIN +nIN +nIN +rBD +nIN +nIN +nIN mKi sfT hGV -mRU -mRU -mRU -mRU -mRU -mRU +nIN +nIN +nIN +nIN +nIN +nIN mRU vpf tMU @@ -120423,16 +120364,16 @@ vHn hgk hoT hoT -cGd -vVY -vVY -vVY +njn +rWz +rWz +rWz tvS -cGd +njn xVe sVV mbx -cGd +njn orq rRb qjT @@ -120442,10 +120383,10 @@ afE agT agT ael -oPT +qHu lOn acQ -ltt +acQ acQ gfv gfv @@ -120459,29 +120400,29 @@ gfv gfv gfv jRg -ltt +acQ acQ bNT oNa -mRU -tih -vpf -tih -mRU +nIN +aGm +gNo +aGm +nIN jwM -jtU -jtU +xzh +xzh jHX -mRU +nIN aDS sfT hGV -mRU -qSw -qSw -qSw +nIN +rgL +rgL +rgL vMQ -mRU +nIN upS jtU jtU @@ -120626,18 +120567,18 @@ vHn vHn tob tob -cGd -vVY -vVY -vVY -vVY -cGd +njn +rWz +rWz +rWz +rWz +njn hHe gxn ioH -cGd +njn mNS -tob +cGR hvq pCQ ael @@ -120648,10 +120589,10 @@ ael bMV jao tbF -ltt -dZP +imM +imM tbF -dZP +imM eQh mTo tCD @@ -120659,32 +120600,32 @@ tCD tCD mTo wyE -dZP +imM dKD -dZP -ltt +imM +imM dKD bNT enF -mRU -mRU -jtU +nIN +nIN +xzh wlB -mRU +nIN bBc -vpf -jtU +gNo +xzh bBc -mRU +nIN uRY pMA waJ -mRU -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +nIN oNM vpf woU @@ -120829,26 +120770,26 @@ aag vHn hoT hoT -cGd -vVY -vVY -vVY -vVY +njn +rWz +rWz +rWz +rWz aba aGA kbv fZo -cGd +njn nnH -hoT -hoT +jsA +jsA eJj ael afI agY oxi xfm -jux +tiZ gIN jvz mOi @@ -120870,24 +120811,24 @@ klr mxg qGZ bMi -mRU -jtU -vpf -rXF -jtU -jtU -jtU -vpf -mRU +nIN +xzh +gNo +aZv +xzh +xzh +xzh +gNo +nIN mzs aPT xyB ceD -qSw -qSw -qSw -qSw -mRU +rgL +rgL +rgL +rgL +nIN isq vpf woU @@ -121032,28 +120973,28 @@ aag vHn hoT tob -cGd -vVY -vVY -vVY -vVY -cGd +njn +rWz +rWz +rWz +rWz +njn mAF ilq pjj -cGd +njn dkt -tob -hoT +cGR +jsA xfW ael afJ agY aiq ajJ -dpS +acQ mxg -iUV +acQ mOi rCw rCw @@ -121073,24 +121014,24 @@ rwf mxg qGZ mqd -mRU -jtU -vzB -mRU +nIN +xzh +pHj +nIN bBc -vpf -jtU -vpf -mRU +gNo +xzh +icn +nIN gfN efj sxE -mRU -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +nIN vpI jtU woU @@ -121235,28 +121176,28 @@ aag vHn tob xLu -cGd -vVY -vVY -vVY -vVY -cGd +njn +rWz +rWz +rWz +rWz +njn hZE kbv mbx -cGd +njn gMJ -tob -hoT +cGR +jsA xfW ael afK ahc air ael -nBo +gar mxg -uZI +acQ mOi wCT sIf @@ -121275,25 +121216,25 @@ cnS klr mxg pSN -mRU -mRU -jtU -oNM -mRU -tih -ycM -jtU -vpf -mRU +nIN +nIN +xzh +iuh +nIN +aGm +vLM +xzh +gNo +nIN aDS aPT hGV -mRU -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +nIN jtU vpf woU @@ -121438,16 +121379,16 @@ aag vHn tob hUb -cGd -cGd -cGd -cGd -cGd -cGd +njn +njn +njn +njn +njn +njn laM kbv nkH -cGd +njn eJZ rRb cXd @@ -121478,25 +121419,25 @@ cnS riK mxg kGS -rXF -vpf -vpf +aZv +gNo +gNo aBQ -mRU -mRU -mRU -gBs -mRU -mRU +nIN +nIN +nIN +rBD +nIN +nIN oIa aPT bqY -mRU -mRU -mRU -mRU -mRU -mRU +nIN +nIN +nIN +nIN +nIN +nIN vpf vpf woU @@ -121641,20 +121582,20 @@ aag vHn tJq bLf -cGd -vVY -vVY -vVY +njn +rWz +rWz +rWz tvS -cGd +njn hZE kbv mbx -cGd +njn cva -cGd -cGd -cGd +njn +njn +njn adO adO adO @@ -121681,25 +121622,25 @@ cnT meS gUk naj -mRU -mRU -mRU -mRU -mRU +nIN +nIN +nIN +nIN +nIN jwM oZn -jtU +xzh lPW -mRU +nIN aDS aPT hGV -mRU -qSw -qSw -qSw +nIN +rgL +rgL +rgL vMQ -mRU +nIN wUJ vpf woU @@ -121844,18 +121785,18 @@ aag vHn hoT rGz -cGd -vVY -vVY -vVY -vVY -cGd +njn +rWz +rWz +rWz +rWz +njn hHe gxn gKd -cGd -hoT -hoT +njn +jsA +jsA svV rIE adO @@ -121888,21 +121829,21 @@ aUH aXx jKI aXx -mRU -tih -vpf -jtU -vpf -mRU +nIN +aGm +gNo +xzh +gNo +nIN lCL pMA gcm -mRU -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +nIN uNz jtU woU @@ -122047,19 +121988,19 @@ aag vHn tob alh -cGd -vVY -vVY -vVY -vVY +njn +rWz +rWz +rWz +rWz bWh hmj kbv fZo -cGd +njn ykY -hoT -hoT +jsA +jsA tjz adO afN @@ -122091,21 +122032,21 @@ aUH oyE mMP mMP -mRU -jtU -vpf -jtU -vpf -mRU +nIN +xzh +gNo +xzh +gNo +nIN mzs aPT xyB cix -qSw -qSw -qSw -qSw -mRU +rgL +rgL +rgL +rgL +nIN bWg jtU woU @@ -122250,28 +122191,28 @@ aag vHn btV hoT -cGd -vVY -vVY -vVY -vVY -cGd +njn +rWz +rWz +rWz +rWz +njn mAF ilq pjj -cGd +njn boU nNI -hoT +jsA veO adO afO ahh aiw adO -mQF -yaR -mQF +acQ +mxg +acQ lmK lmK lmK @@ -122287,28 +122228,28 @@ cnH kzk cnR aHq -mQF -yaR -mQF +acQ +mxg +acQ aUH sIA gSj aXA -mRU -jtU -vpf -jtU +nIN +xzh +gNo +xzh bBc -mRU +nIN gfN efj sxE -mRU -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +nIN kUL tMU woU @@ -122453,19 +122394,19 @@ aag vHn tob tob -cGd -vVY -vVY -vVY -vVY -cGd +njn +rWz +rWz +rWz +rWz +njn xXT sVV tkR -cGd +njn ipr pUL -tob +cGR eQd adO jkj @@ -122473,8 +122414,8 @@ ahh aiw adO ebV -mbu -kCo +bNT +acQ ioU pvK qPE @@ -122492,26 +122433,26 @@ cbn aHq ebV qGP -pym +tzF aUd ckK iKM aHM -mRU -jtU -vpf +nIN +xzh +gNo lPW vwJ -mRU +nIN nme sfT vAH -mRU -qSw -qSw -qSw -qSw -mRU +nIN +rgL +rgL +rgL +rgL +nIN edG vpf woU @@ -122656,28 +122597,28 @@ aag vHn hoT hoT -cGd -cGd -cGd -cGd -cGd -cGd +njn +njn +njn +njn +njn +njn ehL kyr chb -cGd -cGd -cGd -moK -cGd -cGd +njn +njn +njn +htS +njn +njn lFt ahh aiw adO qHu -hqx -kCo +lOn +acQ ioU qyZ wTd @@ -122693,28 +122634,28 @@ liJ qmP uoH aHq -kCo -mbu -kCo +acQ +bNT +acQ aUH dbv lII aWc -mRU -gBs -mRU -mRU -mRU -mRU +nIN +rBD +nIN +nIN +nIN +nIN tCx ncG tZg -mRU -mRU -mRU -mRU -mRU -mRU +nIN +nIN +nIN +nIN +nIN +nIN jtU jtU woU @@ -122868,19 +122809,19 @@ rpG cSa aeA sjz -rpG -hqm -tob -tob -hoT -fkK +hbl +isB +cGR +cGR +jsA +eoD aiw ahh aiw nph -kCo -tSY -kCo +acQ +jao +acQ ioU mSz nIG @@ -122897,18 +122838,18 @@ aGN qrv aHq hBa -gft -kCo +mxg +acQ aGz ckd mQC aHM -rXF -jtU -jtU +aZv +xzh +xzh egQ -ycM -rXF +vLM +aZv wcm lJY guo @@ -123071,19 +123012,19 @@ cGd wYa nBK mzS -cGd -cGd -cGd -cGd -tob -cGd +njn +njn +njn +njn +cGR +njn afP ahh aiw nph -kCo -hqx -kCo +acQ +lOn +acQ ioU ioU ioU @@ -123100,18 +123041,18 @@ aGN pSU aHq qcL -gft -kCo +mxg +acQ aGz drk mQC mkG -mRU -vpI -mRU -mRU -mRU -mRU +nIN +tTE +nIN +nIN +nIN +nIN nuM uHr xwX @@ -123277,16 +123218,16 @@ aeA bbe aeA aeA -cGd -tob -cGd +njn +cGR +njn afQ aiw aiw nph -kCo -hqx -kCo +acQ +lOn +acQ ioU lPO vJg @@ -123303,15 +123244,15 @@ aGN rub aHq gar -gft -kCo +mxg +acQ aGz eqB obC hcf -mRU +nIN cpQ -mRU +nIN lJY lJY lFK @@ -123480,16 +123421,16 @@ asA amF kmE aeA -cGd -iTQ -cGd +njn +mtq +njn ahJ ahJ ahJ adO -kCo -tSY -kCo +acQ +jao +acQ ioU dnS viN @@ -123506,15 +123447,15 @@ aGN qrv aHq oUO -gft -kCo +mxg +acQ aUH aGz aGz aGz -mRU -vzB -mRU +nIN +pHj +nIN lJY qbx dcp @@ -123683,16 +123624,16 @@ aeC vOh gUX ily -cGd -moK -cGd -fiH -fiH -fiH +njn +htS +njn +aeC +aeC +aeC ybk -kCo -tSY -kCo +acQ +jao +acQ ioU pPM qKz @@ -123709,15 +123650,15 @@ iLO bUa aHq qHu -mbu -kCo +bNT +acQ ybk -fiH -fiH -fiH -mRU -gBs -mRU +vcE +vcE +vcE +nIN +rBD +nIN cBb xVS lJY @@ -123886,12 +123827,12 @@ aeC aeC ajs aeC -bZq -fiH +mzS +aeC rGc -xjI -xjI -fzm +izu +izu +dRQ pBg gmZ dpN @@ -123915,12 +123856,12 @@ gmZ onh wJd pBg -iOP -xjI -xjI +pfe +tiO +tiO roY -vXk -jgS +uHr +nuM vcE kUV vcE @@ -124089,15 +124030,15 @@ wXh aeC ydz ayb -rrG +tic gBZ -tGW -rfQ -rfQ -tGW +btu +asA +asA +btu oOi szb -rfQ +tiZ vnZ jvY jvY @@ -124118,12 +124059,12 @@ urs eEF wmH oOi -rrG -rfQ -rfQ -rrG +rao +yeH +yeH +rao sBK -tGW +mZv sSl kkx vcE @@ -124292,12 +124233,12 @@ ngl aeA ajk aeA -iOP -fiH +xVg +aeC dwJ -vXk -vXk -jgS +nBK +nBK +wYa pBg vkQ brm @@ -124321,12 +124262,12 @@ biB uvq cVT pBg -bZq -vXk -vXk +xwX +uHr +uHr siS aRr -fzm +mJX lJY xVS lJY @@ -124495,15 +124436,15 @@ nqV aeA ajk ily -taw -mRI -taw +qHA +qzQ +qHA qnf -fiH +aeC wPm ybk -mQF -mQF +jkL +acQ nbW jvY arh @@ -124520,16 +124461,16 @@ jvY nSG aOs jvY -mQF -pZq +jkL +jao mQF ybk dJF -fiH +vcE dAr -kNq +acB cWo -kNq +acB cBb xVS lJY @@ -124698,14 +124639,14 @@ wXh aeC ajs qon -taw +qHA obJ aep ggQ ggQ aME aep -ivV +jkL jnx iPK jvY @@ -124723,16 +124664,16 @@ axo atm aOr jvY -ivV -otE -ivV +jkL +jao +mQF aep aME ggQ aME aep hog -kNq +acB dHe kUV vcE @@ -124901,14 +124842,14 @@ aeC aeC ajs aeC -taw -oxy +qHA +qii aep afj afk agM aep -pEd +jkL tbD fDk jvY @@ -124926,16 +124867,16 @@ bzD atm aOs jvY -pEd -hqx -xhi +jkL +lOn +mQF aep aHS afk sHo aep vmu -kNq +acB vcE kUV vcE @@ -125104,14 +125045,14 @@ aeC aeA ajk aeA -taw -oxy +qHA +qii aep afk afk afk aep -pEd +jkL tbD fDk jvY @@ -125129,16 +125070,16 @@ axo atm thv jvY -pEd -hqx -xhi +jkL +lOn +mQF aep afk aHl afk aep hLt -kNq +acB lJY itR kKR @@ -125307,16 +125248,16 @@ asA amF ohL aeA -taw -oQL +qHA +vle aep aep aep aep aep -pvE -tbD -fDk +nbY +wLT +oAp jvY alL atk @@ -125332,16 +125273,16 @@ jvY aAy alL jvY -pEd +nbY hqx -xhi +nbY aep aep aep aep aep ddF -kNq +acB lJY ucw dcp @@ -125510,16 +125451,16 @@ ntI aeA aeC puO -taw -oxy +qHA +qii eRG aep aep aep aep -pEd -tbD -fDk +fes +vpi +xCS jvY arl atm @@ -125535,8 +125476,8 @@ alL aMo aOt jvY -pEd -hqx +fes +qKU jhm oIB jgr @@ -125544,7 +125485,7 @@ qUG rtc oIB vmu -kNq +acB lJY uxC lJY @@ -125707,22 +125648,22 @@ atr aeC atr aeC -taw -taw -taw -taw +qHA +qHA +qHA +qHA mRI -taw -taw -oxy +qHA +qHA +qii hja -taw -taw -taw -taw -pEd -tbD -fDk +qHA +qHA +qHA +qHA +fes +vpi +xCS jvY abF atm @@ -125738,7 +125679,7 @@ aIT atm aVF jvY -pEd +fes wZp amc oIB @@ -125747,8 +125688,8 @@ kaS aiQ oIB vmu -kNq -kNq +acB +acB kNq kNq qDB @@ -125910,22 +125851,22 @@ atr aeC atr aeC -taw +qHA hEj cvi -taw +qHA wFX -taw +qHA ncV -oxy -oQL -taw -oQL -oQL -taw +qii +vle +qHA +vle +vle +qHA pqv gqf -fDk +xCS jvY jvY jvY @@ -125942,8 +125883,8 @@ jvY jvY jvY xeq -hqx -xhi +qKU +iZz oIB wqr bZw @@ -125951,7 +125892,7 @@ xUV oIB vmu vDR -kNq +acB toD wDq aPO @@ -126113,12 +126054,12 @@ atu azU aeC ldl -taw -oxy +qHA +qii stA -taw +qHA tvA -taw +qHA oTc nwT ocI @@ -126126,9 +126067,9 @@ mfH nwT nwT mfH -pym +kjX gqf -fDk +xCS alL urM dBG @@ -126144,9 +126085,9 @@ jvY wjv fDG alL -pEd +fes wZp -pym +kjX qgK tEB uBM @@ -126154,7 +126095,7 @@ dXo oIB xPu uOE -kNq +acB swG jei aPO @@ -126316,21 +126257,21 @@ taw taw mRI taw -taw +qHA wpT stA -taw +qHA wTn -taw +qHA nQw -oxy +qii wjP -taw -oQL -oQL -taw +qHA +vle +vle +qHA gbR -tbD +vpi chC aqe amw @@ -126347,17 +126288,17 @@ arq anO qaV kwd -urs -hqx -tFQ +usi +qKU +iZz oIB wKF hzb ltU oIB -aPO +juG eDk -kNq +acB bCR jei aPO @@ -126519,19 +126460,19 @@ qlu taw wTn kCu -taw +qHA uPN stA -taw +qHA wFX -taw +qHA lsh -oxy +qii hja -taw -oQL +qHA +vle hja -taw +qHA bwN gxR lCc @@ -126558,9 +126499,9 @@ phj vEf cNK oIB -aPO -jei -oYr +hFt +lxJ +oFU aPO aPO aPO @@ -126722,22 +126663,22 @@ rWb taw oAK kCu -taw -mRI -taw -taw +qHA +qzQ +qHA +qHA tvA -taw -oQL -oxy -oQL -taw +qHA +vle +qii +vle +qHA cap fiN -taw -vkQ +qHA +fes kzR -mXP +ngF kwd amA atq @@ -126753,17 +126694,17 @@ atq atq aoT kwd -vkQ +usi kzR -oig +jhm oIB cHC dha pxj oIB -aPO -oUx -kNq +juG +fmX +acB fPF jei nNT @@ -126930,17 +126871,17 @@ oQL gqt oxy oxy -kiR -oxy -oxy -oQL -taw -taw -taw -taw -mQF -rnO -ogd +pFJ +qii +qii +vle +qHA +qHA +qHA +qHA +fes +kzR +lCf alO ars amx @@ -126956,9 +126897,9 @@ amx amx aOC alO -mQF -rnO -mQF +fes +kzR +iZz loP loP loP @@ -127126,24 +127067,24 @@ fTl wIu wXJ taw -oxy +ldz kMa qIa iSB oxy oQL hdy -taw -oQL -oxy -oQL -taw +qHA +vle +qii +vle +qHA liF wPR -taw +qHA cui -fQU -onh +kzR +lCf inw amA amx @@ -127159,8 +127100,8 @@ atq amx aoT inw -ivV -fQU +fes +kzR hPr loP iwB @@ -127336,16 +127277,16 @@ iKV oxy oQL oFr -taw +qHA mUL -oxy -oQL -taw -oQL -oQL -taw -pEd -gBg +qii +vle +qHA +vle +vle +qHA +fes +kzR bLg aqj arw @@ -127362,9 +127303,9 @@ atq atq wwJ inw -pEd -tbD -xhi +fes +vpi +iZz loP joG sDu @@ -127539,17 +127480,17 @@ qAG oxy kMa gQu -taw +qHA lsh -oxy +qii wjP -taw -oQL -oQL -taw -rhX -gBg -fDk +qHA +vle +vle +qHA +gbR +kzR +xCS inw qHM emn @@ -127565,9 +127506,9 @@ amx amx aBs inw -pEd -tbD -xhi +fes +vpi +iZz loP kxo wSn @@ -127742,16 +127683,16 @@ ydf oxy wOv ixu -taw -wXJ -oxy -oxy -kiR -oxy -oxy -kiR -fiH -gBg +qHA +uxW +qii +qii +pFJ +qii +qii +pFJ +bKU +kzR xsX alO alO @@ -127768,9 +127709,9 @@ atq atq aBs alO -pEd -gBg -fiH +fes +kzR +bKU fTF xBY xBY @@ -127945,16 +127886,16 @@ cnP oxy wOv qlu -taw -qlu -oxy -oQL -taw -oQL -oQL +qHA +xLm +qii +vle +qHA +vle +vle lnD -pEd -gBg +fes +kzR iea alO gKZ @@ -127972,8 +127913,8 @@ atq aBs alO pvE -tbD -xhi +vpi +iZz gdS wSn kXN @@ -128148,16 +128089,16 @@ lUQ oxy tBU iDs -taw -qlu -oxy +qHA +xLm +qii hja -taw +qHA kLZ tty lnD -pEd -gBg +fes +kzR iea alO arz @@ -128174,9 +128115,9 @@ auB atc aOF alO -pEd -tbD -xhi +fes +vpi +iZz gdS lBg dXd @@ -128346,21 +128287,21 @@ mOE gUG oxy oQL -taw -taw -mRI -taw -taw -taw -ixu -oxy -oQL -taw -taw -taw -taw -pEd -gBg +qHA +qHA +qzQ +qHA +qHA +qHA +gDF +qii +vle +qHA +qHA +qHA +qHA +fes +kzR iea alO arz @@ -128377,9 +128318,9 @@ aIU aMq aOG alO -pEd -gBg -xhi +fes +kzR +iZz loP loP loP @@ -128389,10 +128330,10 @@ vyI lPB oHl jWh -kNq -qDB -kNq -kNq +acB +hJe +acB +acB kNq kNq kNq @@ -128549,21 +128490,21 @@ oxy bCv oxy oQL -taw +qHA gCQ rEs tvr -taw +qHA lsh -oQL -oxy -oQL +vle +qii +vle aYU uxs -iDs -taw -pEd -gBg +iQG +qHA +fes +kzR iea alO arz @@ -128580,9 +128521,9 @@ xBe xBe xBe xBe -pEd -gBg -xhi +fes +kzR +iZz jWh eFK wGd @@ -128595,7 +128536,7 @@ jWh jZj sRP oko -kNq +acB tiY qAK xGK @@ -128752,21 +128693,21 @@ oQL qmq oQL nXo -taw +qHA gCQ bNc tCC -taw +qHA ftG -oQL -oxy -oQL -oQL -oQL +vle +qii +vle +vle +vle keE -taw +qHA pvE -gBg +kzR iea xnR arm @@ -128783,9 +128724,9 @@ aIV qqr arH xBe -pEd -gBg -xhi +fes +kzR +iZz vXd duF hSk @@ -128796,9 +128737,9 @@ hSk uIv jWh eHz -aPO +juG tMT -kNq +acB jei ltm oAT @@ -128951,13 +128892,13 @@ aag aag fTl oxy -taw -taw +qHA +qHA xcs -taw -taw +qHA +qHA utC -oxy +qii ikC vRJ gNQ @@ -128968,7 +128909,7 @@ gNQ gNQ gNQ xDG -tJH +jlO qpH iSu alO @@ -128986,8 +128927,8 @@ azo aJg abR xBe -pEd -gBg +fes +kzR jhm jWh oih @@ -129001,7 +128942,7 @@ jWh nwA xZz kRN -kNq +acB jei ltm ejj @@ -129154,26 +129095,26 @@ aag aag fTl oxy -taw +qHA tZM qEZ frV -taw +qHA gCQ uqJ vbu -taw -taw -taw -mRI -taw -taw -taw -taw -taw -rhX -gBg -xhi +qHA +qHA +qHA +qzQ +qHA +qHA +qHA +qHA +qHA +gbR +kzR +iZz wDM wDM wDM @@ -129189,9 +129130,9 @@ atv auV amE xBe -pEd -gBg -xhi +fes +kzR +iZz jWh jWh uUz @@ -129202,9 +129143,9 @@ jWh jWh jWh fQl -aPO +juG nGZ -kNq +acB xQe jei lVR @@ -129357,15 +129298,15 @@ aag aag fTl lmq -taw +qHA mDz pIf uwf -taw +qHA gCQ rEs bhZ -taw +qHA uiG rTZ tfb @@ -129374,9 +129315,9 @@ tfb tfb tfb ptK -pEd -tbD -xhi +fes +vpi +iZz wDM aOM aoW @@ -129392,9 +129333,9 @@ atv auV amE xBe -pEd -tbD -xhi +fes +vpi +iZz jWh xXa xXa @@ -129407,7 +129348,7 @@ jWh rJY dPl qQG -kNq +acB cfm jei oSR @@ -129560,15 +129501,15 @@ aag aag fTl oxy -taw -taw -taw -taw -taw -taw -mRI -taw -taw +qHA +qHA +qHA +qHA +qHA +qHA +qzQ +qHA +qHA bNM wkX jhx @@ -129577,9 +129518,9 @@ jhx jhx dnH gpc -fiH -tbD -xhi +kjX +gqf +iZz wDM uto aoX @@ -129597,7 +129538,7 @@ abR xBe pvE gxR -pym +kjX dEt soP pDr @@ -129607,10 +129548,10 @@ soP eoG uIv jWh -kNq -qDB -kNq -kNq +acB +hJe +acB +acB kNq fJp ekz @@ -129780,9 +129721,9 @@ nwU owg owg ptK -nhT -gqf -xhi +fes +vpi +iZz wDM aOQ fxI @@ -129798,9 +129739,9 @@ azp qJf anV xBe -pEd -tbD -xhi +fes +vpi +iZz jWh iqH khE @@ -129983,8 +129924,8 @@ eNi eNi eNi eNi -pEd -gBg +fes +kzR jhm wDM aOH @@ -130001,8 +129942,8 @@ xBe xBe xBe xBe -pEd -tbD +fes +vpi rXV jWh jWh @@ -130186,9 +130127,9 @@ olO wiG nWN eNi -pEd -tbD -xhi +fes +vpi +iZz wDM wDM wDM @@ -130204,8 +130145,8 @@ aJh arq ufx alR -pEd -tbD +fes +vpi jhm jWh hSk @@ -130389,9 +130330,9 @@ ueG rPt jyE eNi -pEd -tbD -xhi +fes +vpi +iZz hwC rcS amx @@ -130407,9 +130348,9 @@ aJi azs atq alR -pEd -tbD -xhi +fes +vpi +iZz jlQ tst uUe @@ -130592,9 +130533,9 @@ iKD rPt rPt eNi -pEd -tbD -xhi +fes +vpi +iZz alR amA atq @@ -130610,9 +130551,9 @@ aJj aMD atq alR -pEd -tbD -xhi +fes +vpi +iZz jlQ tZZ gLz @@ -130796,8 +130737,8 @@ eNi gIh eNi iIQ -gBg -xhi +kzR +iZz alR amA atq @@ -130813,9 +130754,9 @@ amA ayl amx alR -pEd -tbD -xhi +fes +vpi +iZz jWh jmQ vcu @@ -130998,9 +130939,9 @@ aWb dyK vzK wYY -pEd -gBg -xhi +fes +kzR +iZz alR amA atq @@ -131016,9 +130957,9 @@ aJl amx atq alR -pEd -tbD -xhi +fes +vpi +iZz jlQ snE sGL @@ -131201,9 +131142,9 @@ tii eJX sAC wYY -pEd -gBg -xhi +fes +kzR +iZz alR amA amx @@ -131219,9 +131160,9 @@ aJk amx atq alR -pEd -tbD -xhi +fes +vpi +iZz jlQ tZZ cBj @@ -131404,9 +131345,9 @@ sjj fzP sAC wYY -pEd -tbD -xhi +fes +vpi +iZz alR amA atq @@ -131422,8 +131363,8 @@ xEO xEO lnP alR -pEd -tbD +fes +vpi jhm jWh qLs @@ -131609,7 +131550,7 @@ qsL nim prV gqf -xhi +iZz alR amA atq @@ -131625,9 +131566,9 @@ iWR iWR kbx alR -pEd -tbD -xhi +fes +vpi +iZz jWh jWh jlQ @@ -131811,8 +131752,8 @@ gyO kTN eNi pvE -tbD -xhi +vpi +iZz alR amA atq @@ -131828,9 +131769,9 @@ xEO xEO aOV alR -pEd -tbD -xhi +fes +vpi +iZz jWh wFQ bop @@ -132013,9 +131954,9 @@ oNb iFC qAA eNi -pEd -gBg -xhi +fes +kzR +iZz alR arK atc @@ -132031,9 +131972,9 @@ aJq aMG aOW alR -pEd -tbD -xhi +fes +vpi +iZz jWh bXy bop @@ -132216,9 +132157,9 @@ eNi eNi eNi eNi -mQF -rnO -mQF +fes +kzR +iZz alO alO alO @@ -132234,9 +132175,9 @@ alO alO alO alO -mQF -rnO -mQF +fes +vpi +iZz jWh wFQ bop @@ -132622,7 +132563,7 @@ keR jhx keR dwI -pym +kjX jae tGW hal @@ -132642,7 +132583,7 @@ uYg hal rrG jae -pym +kjX mPh soP tWi @@ -133028,9 +132969,9 @@ ucp cIW ptK ptK -ybk +qDX sDe -ybk +qDX aHe jlT exi @@ -134453,9 +134394,9 @@ iYm fLl fLl vjd -aRp -jBX -akS +eky +wZX +vUh aHe oxU bsy @@ -134463,9 +134404,9 @@ oir gzw shh aHe -tKf -jBX -aRp +svf +wZX +eky quy eZm eZm From a4c2c9811868d19c83c3d4c9c5f82b6bb8e06154 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 16 Mar 2024 12:59:38 +0000 Subject: [PATCH 17/28] Automatic changelog for PR #5879 [ci skip] --- html/changelogs/AutoChangeLog-pr-5879.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5879.yml diff --git a/html/changelogs/AutoChangeLog-pr-5879.yml b/html/changelogs/AutoChangeLog-pr-5879.yml new file mode 100644 index 000000000000..cbea89465a32 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5879.yml @@ -0,0 +1,8 @@ +author: "Huffie56" +delete-after: True +changes: + - refactor: "refactored areas replaced stern hallway by aft added two new hallway area(fore, midship)" + - refactor: "refactored areas replaced midship maintenance by for and added two new maintenance areas(fore, aft) with each starboard and port side." + - maptweak: "removed all the emergency shutter that weren't at the borders of each areas." + - maptweak: "added back the bear belt in a closet in a dormitory." + - maptweak: "reconnect some air pipe in an hallway north upper engi." \ No newline at end of file From 6aaf7d5ae56a794d17f9939fd96e556fafd81e2b Mon Sep 17 00:00:00 2001 From: spartanbobby <71467726+spartanbobby@users.noreply.github.com> Date: Sat, 16 Mar 2024 12:56:28 +0000 Subject: [PATCH 18/28] Removes unintended hullwalls on LV522, Removes some ledges on LV522 (#5952) # About the pull request This PR cleans up some ledges that were in high combat areas and removes unintended hullwalls Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game Ledges in high combat areas can be incredibly annoying for both sides and the hullwalls were the same wall type as the walls surrounding them leading to some player confusion # 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: Removes some ledges on LV522 maptweak: Removes unintended hullwalls on LV522 /:cl: --- .../LV522_Chances_Claim.dmm | 188 ++++++------------ 1 file changed, 64 insertions(+), 124 deletions(-) diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 6bc30f573dd2..d8c9b888f3d1 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -8990,9 +8990,6 @@ icon_state = "browncorner" }, /area/lv522/oob) -"eds" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/lv522/indoors/c_block/casino) "edw" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/dirt, @@ -14832,7 +14829,7 @@ "gtS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/n_rockies) +/area/lv522/outdoors/colony_streets/north_street) "gtX" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/warning_stripes{ @@ -15763,18 +15760,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/n_rockies) -"gMe" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/n_rockies) "gMy" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -18936,10 +18921,6 @@ "hTe" = ( /turf/open/gm/river, /area/lv522/landing_zone_1/tunnel) -"hTf" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement, -/area/lv522/outdoors/n_rockies) "hTg" = ( /obj/structure/surface/table/almayer, /turf/open/floor/corsat{ @@ -20385,9 +20366,6 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) -"ivK" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/lv522/indoors/lone_buildings/engineering) "ivN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/wooden_tv/prop{ @@ -22583,16 +22561,6 @@ icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) -"jkO" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/n_rockies) "jlc" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -25331,9 +25299,6 @@ icon_state = "floor_plate" }, /area/lv522/atmos/way_in_command_centre) -"khd" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/lv522/indoors/c_block/cargo) "khf" = ( /obj/structure/prop/server_equipment, /turf/open/floor/prison{ @@ -31065,7 +31030,7 @@ }, /area/lv522/atmos/filt) "moe" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, +/turf/closed/wall/strata_outpost, /area/lv522/oob/w_y_vault) "moz" = ( /obj/effect/decal/cleanable/dirt, @@ -35371,9 +35336,6 @@ icon_state = "kitchen" }, /area/lv522/indoors/a_block/fitness) -"nSE" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/lv522/indoors/a_block/admin) "nSF" = ( /obj/structure/barricade/deployable{ dir = 1 @@ -35726,14 +35688,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) -"nYz" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement{ - icon_state = "cement3" - }, -/area/lv522/outdoors/n_rockies) "nYF" = ( /obj/item/weapon/twohanded/folded_metal_chair, /obj/effect/decal/cleanable/dirt, @@ -38989,9 +38943,6 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) -"plz" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/lv522/indoors/a_block/executive) "plN" = ( /obj/structure/platform, /obj/effect/decal/warning_stripes{ @@ -39273,9 +39224,6 @@ icon_state = "brown" }, /area/lv522/atmos/filt) -"psC" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/lv522/indoors/a_block/hallway) "psF" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_magazine/rifle/mar40/lmg, @@ -49499,14 +49447,6 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/south_east_street) -"taS" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement{ - icon_state = "cement14" - }, -/area/lv522/outdoors/n_rockies) "taW" = ( /obj/structure/platform{ dir = 8 @@ -53154,8 +53094,8 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "urp" = ( -/obj/structure/platform{ - dir = 1 +/obj/structure/platform_decoration{ + dir = 4 }, /obj/structure/largecrate/random, /turf/open/asphalt/cement, @@ -70713,10 +70653,10 @@ nJv xvQ gcX kvq -ivK +nJv wng tCg -ivK +nJv xvQ xvQ xvQ @@ -80620,10 +80560,10 @@ lCH vjW pjJ ien -hJZ -hJZ -jqF -vne +ugV +ugV +sSn +oxt hhD ahP xyL @@ -80848,9 +80788,9 @@ pjJ ien ien ien -hJZ -hJZ -vne +ugV +ugV +oxt fjr crH xyL @@ -81074,10 +81014,10 @@ lCH pjJ pjJ pjJ -ien -ien -ien -ien +pjJ +fjr +fjr +oxt fjr crH xyL @@ -81302,7 +81242,7 @@ nCa nCa nCa nCa -nCa +iKF gtS oVO nQx @@ -81522,15 +81462,15 @@ mjF gXI joJ urp -hTf -nYz -nYz -nYz -nYz -nYz -nYz -taS -vjW +gWI +sQu +sQu +sQu +sQu +sQu +sQu +tNr +rxI oxt jDO sSn @@ -81748,8 +81688,8 @@ kri kEj ldy joJ -gMe -jkO +gWI +gWI oUq oUq tVa @@ -85246,11 +85186,11 @@ gwP ild xJd jwM -khd +jmG wZt jwM nPc -khd +jmG xDD xDD jmG @@ -85473,11 +85413,11 @@ eHF ftK pMs jEW -khd +jmG nnB fvN ful -khd +jmG xDD xDD jmG @@ -85700,11 +85640,11 @@ jmG jmG jmG jmG -khd +jmG eNc wZy teO -khd +jmG aZj aZj jmG @@ -86164,7 +86104,7 @@ qNR ifB ptp jmG -khd +jmG ycH gQV piY @@ -87753,7 +87693,7 @@ yhi xPK oTG jmG -khd +jmG pjm opQ ydy @@ -88205,7 +88145,7 @@ yhi spM jmG jmG -khd +jmG vBd brk rdF @@ -89473,9 +89413,9 @@ bjd bjd bjd bjd -alI -alI -alI +mPj +mPj +mPj cpy cpy cpy @@ -89702,7 +89642,7 @@ lfj bjd bjd bjd -alI +mPj cpy cpy cpy @@ -89929,7 +89869,7 @@ xXv lfj bjd bjd -alI +mPj cpy cpy cpy @@ -89954,7 +89894,7 @@ uog xBo nnz oVD -plz +xjF xFp sYk uNB @@ -90156,7 +90096,7 @@ dfK xXv lfj bjd -alI +mPj cpy cpy cpy @@ -90383,7 +90323,7 @@ vFD pqQ qpd bjd -alI +mPj cpy cpy cpy @@ -90610,7 +90550,7 @@ hvh pqQ qpd bjd -alI +mPj cpy cpy cpy @@ -90693,7 +90633,7 @@ fdb vNk vNk vNk -eds +vNk vNk mFA eur @@ -90837,7 +90777,7 @@ hvh pqQ qpd bjd -alI +mPj cpy cpy cpy @@ -90862,7 +90802,7 @@ wgW wgW ydb xRQ -plz +xjF xFp sYk pKX @@ -91064,7 +91004,7 @@ hvh pqQ qpd bjd -alI +mPj cpy cpy cpy @@ -91092,7 +91032,7 @@ xjF xjF xFp aDj -xAw +pKX nvt ykT kGb @@ -91291,7 +91231,7 @@ hvh eZF lfj bjd -alI +mPj cpy cpy cpy @@ -91518,7 +91458,7 @@ hvh pqQ qpd bjd -alI +mPj cpy cpy cpy @@ -91745,7 +91685,7 @@ hvh pqQ qpd bjd -alI +mPj cpy cpy wDj @@ -91773,7 +91713,7 @@ qSH qSH qSH cfv -xAw +pKX xnI ykT djM @@ -91972,7 +91912,7 @@ hvh pqQ qpd bjd -alI +mPj cpy cpy wDj @@ -92199,9 +92139,9 @@ hvh pqQ qpd bjd -alI -alI -alI +mPj +mPj +mPj wDj cPg eJR @@ -93134,7 +93074,7 @@ vGp vGp kqp xFp -xAw +pKX pKX pKX kIZ @@ -96765,7 +96705,7 @@ vGp cpy pZo tWt -nSE +tDS tDS thc thc @@ -99280,10 +99220,10 @@ mgk vUb gdO gdO -psC +gdO ayn wHY -psC +gdO gdO tTK tTK From 0bf3c7e5504280165375e444ec6f0c4d9214c27a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 16 Mar 2024 13:07:38 +0000 Subject: [PATCH 19/28] Automatic changelog for PR #5952 [ci skip] --- html/changelogs/AutoChangeLog-pr-5952.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5952.yml diff --git a/html/changelogs/AutoChangeLog-pr-5952.yml b/html/changelogs/AutoChangeLog-pr-5952.yml new file mode 100644 index 000000000000..bc84bd3c5b6d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5952.yml @@ -0,0 +1,5 @@ +author: "SpartanBobby" +delete-after: True +changes: + - maptweak: "Removes some ledges on LV522" + - maptweak: "Removes unintended hullwalls on LV522" \ No newline at end of file From 2180be5185b32e1d75a7404ea9ea6efb0e99fa61 Mon Sep 17 00:00:00 2001 From: Segrain Date: Sat, 16 Mar 2024 18:34:14 +0400 Subject: [PATCH 20/28] Fix for ghosts and announcements. (#5949) # About the pull request Followup to #5895. # Explain why it's good for the game Is fix. # Changelog :cl: fix: Ghosts no longer miss announcements seemingly at random. /:cl: --- code/defines/procs/announcement.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm index 1963506431f3..2ebba6a774e8 100644 --- a/code/defines/procs/announcement.dm +++ b/code/defines/procs/announcement.dm @@ -162,5 +162,5 @@ to_chat_spaced(T, html = "[SPAN_ANNOUNCEMENT_HEADER(title)]

[SPAN_ANNOUNCEMENT_BODY(message)]", type = MESSAGE_TYPE_RADIO) if(isobserver(T) && !(T.client?.prefs?.toggles_sound & SOUND_OBSERVER_ANNOUNCEMENTS)) - return + continue playsound_client(T.client, sound_to_play, T, vol = 45) From 4897335a7c6b4e0e8cd25be9a5f58693623cb49d Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 16 Mar 2024 14:42:53 +0000 Subject: [PATCH 21/28] Automatic changelog for PR #5949 [ci skip] --- html/changelogs/AutoChangeLog-pr-5949.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5949.yml diff --git a/html/changelogs/AutoChangeLog-pr-5949.yml b/html/changelogs/AutoChangeLog-pr-5949.yml new file mode 100644 index 000000000000..04921b37938e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5949.yml @@ -0,0 +1,4 @@ +author: "Segrain" +delete-after: True +changes: + - bugfix: "Ghosts no longer miss announcements seemingly at random." \ No newline at end of file From f20c88901c4ecf3a33c12d6c577dd292a8353950 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 17 Mar 2024 01:11:27 +0000 Subject: [PATCH 22/28] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5879.yml | 8 -------- html/changelogs/AutoChangeLog-pr-5948.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5949.yml | 4 ---- html/changelogs/AutoChangeLog-pr-5952.yml | 5 ----- html/changelogs/archive/2024-03.yml | 17 +++++++++++++++++ 5 files changed, 17 insertions(+), 21 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5879.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5948.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5949.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-5952.yml diff --git a/html/changelogs/AutoChangeLog-pr-5879.yml b/html/changelogs/AutoChangeLog-pr-5879.yml deleted file mode 100644 index cbea89465a32..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5879.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "Huffie56" -delete-after: True -changes: - - refactor: "refactored areas replaced stern hallway by aft added two new hallway area(fore, midship)" - - refactor: "refactored areas replaced midship maintenance by for and added two new maintenance areas(fore, aft) with each starboard and port side." - - maptweak: "removed all the emergency shutter that weren't at the borders of each areas." - - maptweak: "added back the bear belt in a closet in a dormitory." - - maptweak: "reconnect some air pipe in an hallway north upper engi." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5948.yml b/html/changelogs/AutoChangeLog-pr-5948.yml deleted file mode 100644 index e6c9d6df01de..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5948.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Updated the Insanity law description." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5949.yml b/html/changelogs/AutoChangeLog-pr-5949.yml deleted file mode 100644 index 04921b37938e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5949.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Segrain" -delete-after: True -changes: - - bugfix: "Ghosts no longer miss announcements seemingly at random." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5952.yml b/html/changelogs/AutoChangeLog-pr-5952.yml deleted file mode 100644 index bc84bd3c5b6d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5952.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SpartanBobby" -delete-after: True -changes: - - maptweak: "Removes some ledges on LV522" - - maptweak: "Removes unintended hullwalls on LV522" \ No newline at end of file diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index 4bbaead17437..4f385177094a 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -183,3 +183,20 @@ 2024-03-16: nauticall: - bugfix: Makes pill bottle caps appear on closed pill bottles again. +2024-03-17: + Huffie56: + - refactor: refactored areas replaced stern hallway by aft added two new hallway + area(fore, midship) + - refactor: refactored areas replaced midship maintenance by for and added two new + maintenance areas(fore, aft) with each starboard and port side. + - maptweak: removed all the emergency shutter that weren't at the borders of each + areas. + - maptweak: added back the bear belt in a closet in a dormitory. + - maptweak: reconnect some air pipe in an hallway north upper engi. + Segrain: + - bugfix: Ghosts no longer miss announcements seemingly at random. + SpartanBobby: + - maptweak: Removes some ledges on LV522 + - maptweak: Removes unintended hullwalls on LV522 + realforest2001: + - rscadd: Updated the Insanity law description. From b7410dcb1667d75835c0ec50ceb7c50db38441a0 Mon Sep 17 00:00:00 2001 From: Segrain Date: Sun, 17 Mar 2024 05:40:32 +0400 Subject: [PATCH 23/28] Fixes for Professor Dummy. (#5951) # About the pull request Followup to #5874. # Explain why it's good for the game `human/dummy` is designed to be noninteractive. It has godmode (not that godmode does much), it is not processed (thus no bleeding, no medicaments etc), it is not even added to medical HUD. Medical training dummy should not be a subtype of it. Also shuffled some code around so that, for example, somebody using a dummy in thunderdome does not suddenly lose it on hijack. # Changelog :cl: fix: Professor Dummy in CMO's office now works properly. /:cl: --- .../objects/items/devices/dummy_tablet.dm | 20 +++++++++++++++++++ .../crates_lockers/closets/secure/medical.dm | 10 ++++------ .../mob/living/carbon/human/human_dummy.dm | 17 ++++------------ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/devices/dummy_tablet.dm b/code/game/objects/items/devices/dummy_tablet.dm index 3172c84c8b01..3ce5f933ab94 100644 --- a/code/game/objects/items/devices/dummy_tablet.dm +++ b/code/game/objects/items/devices/dummy_tablet.dm @@ -7,8 +7,28 @@ item_state = "Cotablet" var/mob/living/carbon/human/linked_dummy + ///Should the dummy be destroyed on hijack? + var/dust_on_hijack = FALSE + +/obj/item/device/professor_dummy_tablet/Initialize() + . = ..() + var/turf/actual_location = get_turf(src) + if(is_mainship_level(actual_location.z)) + dust_on_hijack = TRUE + RegisterSignal(SSdcs, COMSIG_GLOB_HIJACK_LANDED, PROC_REF(destroy_dummy_upon_hijack)) + +/obj/item/device/professor_dummy_tablet/proc/destroy_dummy_upon_hijack() + SIGNAL_HANDLER + + if(!dust_on_hijack) + return + if(!linked_dummy) + return + linked_dummy.visible_message(SPAN_WARNING("The [linked_dummy] suddenly disintegrates!")) + linked_dummy.dust(create_cause_data("hijack autodelete")) /obj/item/device/professor_dummy_tablet/Destroy() + UnregisterSignal(src, COMSIG_GLOB_HIJACK_LANDED) linked_dummy = null . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index f7518a8c6058..4f7b14d64092 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -186,9 +186,7 @@ /obj/structure/closet/secure_closet/professor_dummy/Initialize() . = ..() - var/mob/living/carbon/human/dummy/professor_dummy/spawned_dummy = new(src) - var/datum/equipment_preset/dummy_preset = /datum/equipment_preset/other/professor_dummy - arm_equipment(spawned_dummy, initial(dummy_preset.name), TRUE, FALSE) + new /mob/living/carbon/human/professor_dummy(src) /obj/structure/closet/secure_closet/professor_dummy/togglelock(mob/living/user) if(user.job == JOB_CMO || user.job == JOB_SEA) @@ -197,13 +195,13 @@ to_chat(user, SPAN_WARNING("Only the [JOB_CMO] or the [JOB_SEA] can toggle this lock.")) /obj/structure/closet/secure_closet/professor_dummy/dump_contents() - if(locate(/mob/living/carbon/human/dummy/professor_dummy) in src) + if(locate(/mob/living/carbon/human/professor_dummy) in src) visible_message(SPAN_HIGHDANGER("Professor DUMMY should only be used for teaching medical personnel, exclusively done by the [JOB_CMO] or the [JOB_SEA]. Do not abuse it.")) return ..() /obj/structure/closet/secure_closet/professor_dummy/close() for(var/mob/mob in loc) - if(!istype(mob, /mob/living/carbon/human/dummy/professor_dummy)) + if(!istype(mob, /mob/living/carbon/human/professor_dummy)) visible_message(SPAN_WARNING("[src] won't budge!")) return ..() @@ -216,7 +214,7 @@ return /obj/structure/closet/secure_closet/professor_dummy/proc/check_and_destroy_dummy() - var/mob/dummy = locate(/mob/living/carbon/human/dummy/professor_dummy) in src + var/mob/dummy = locate(/mob/living/carbon/human/professor_dummy) in src if(dummy) visible_message(SPAN_DANGER("Something in [src] blows apart!")) playsound(src, 'sound/effects/metal_crash.ogg', 25, 1) diff --git a/code/modules/mob/living/carbon/human/human_dummy.dm b/code/modules/mob/living/carbon/human/human_dummy.dm index b6fb109cd038..0c0584c5292b 100644 --- a/code/modules/mob/living/carbon/human/human_dummy.dm +++ b/code/modules/mob/living/carbon/human/human_dummy.dm @@ -82,17 +82,8 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_TUTORIAL) anchored = TRUE -// Professor Dummy, used by CMOs and SEAs to teach new nurses/doctors -/mob/living/carbon/human/dummy/professor_dummy/Initialize(mapload) +/// Professor Dummy, used by CMOs and SEAs to teach new nurses/doctors +/mob/living/carbon/human/professor_dummy/Initialize() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_HIJACK_LANDED, PROC_REF(destroy_upon_hijack)) - -/mob/living/carbon/human/dummy/professor_dummy/proc/destroy_upon_hijack() - SIGNAL_HANDLER - - visible_message(SPAN_WARNING("The [src] suddenly disintegrates!")) - dust(create_cause_data("hijack autodelete")) - -/mob/living/carbon/human/dummy/professor_dummy/Destroy() - UnregisterSignal(src, COMSIG_GLOB_HIJACK_LANDED) - return ..() + create_hud() + arm_equipment(src, /datum/equipment_preset/other/professor_dummy) From 24a097c5b6e2f7c7c3aa9e4a316a01fc9c5123f5 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 17 Mar 2024 01:47:01 +0000 Subject: [PATCH 24/28] Automatic changelog for PR #5951 [ci skip] --- html/changelogs/AutoChangeLog-pr-5951.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5951.yml diff --git a/html/changelogs/AutoChangeLog-pr-5951.yml b/html/changelogs/AutoChangeLog-pr-5951.yml new file mode 100644 index 000000000000..e69dd94e8b47 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5951.yml @@ -0,0 +1,4 @@ +author: "Segrain" +delete-after: True +changes: + - bugfix: "Professor Dummy in CMO's office now works properly." \ No newline at end of file From 673a7f7f498764f9d6b9b30762591482a793f6aa Mon Sep 17 00:00:00 2001 From: Katskan Date: Sat, 16 Mar 2024 21:41:23 -0400 Subject: [PATCH 25/28] Med Skill Rebalance Mk2 Demon Free Edition (#5950) # About the pull request Got demons in my code, removed them from #5937 . This does 2 main things, the medical 4 generalized multiplier changed to a non-standard value of 0.35, 10% less than it was before but 15% better than most recent. The other part is changing how medical skill affects defibrillators, with medical 4 shocking right as defibrillators finish their charge sound. Medical 2 is still unaffected by how the math works. # Explain why it's good for the game Keeps some of the splint/inject/CPR time from before, while maximizing the speed you can get before the shock sound. # Testing Photographs and Procedure Please TM Tested on local server to make sure all the scaling worked properly. # Changelog :cl: balance: changed medical 4 skill speed multiplier from tier 2 to a non-standard 0.35 balance: changed defib medical skill speed scaling /:cl: --- code/game/objects/items/devices/defibrillator.dm | 2 +- code/modules/mob/mob_helpers.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/defibrillator.dm b/code/game/objects/items/devices/defibrillator.dm index 9da76b9d21b9..bbeb2046aff0 100644 --- a/code/game/objects/items/devices/defibrillator.dm +++ b/code/game/objects/items/devices/defibrillator.dm @@ -175,7 +175,7 @@ playsound(get_turf(src),'sound/items/defib_charge.ogg', 25, 0) //Do NOT vary this tune, it needs to be precisely 7 seconds //Taking square root not to make defibs too fast... - if(!do_after(user, 7 SECONDS * user.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, H, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) + if(!do_after(user, (4 + (3 * user.get_skill_duration_multiplier(SKILL_MEDICAL))) SECONDS, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, H, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) user.visible_message(SPAN_WARNING("[user] stops setting up the paddles on [H]'s chest."), \ SPAN_WARNING("You stop setting up the paddles on [H]'s chest.")) return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 4d64307ad631..fc69f7012a58 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -482,7 +482,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list( // Medical if(SKILL_MEDICAL) if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_MASTER)) - return DURATION_MULTIPLIER_TIER_2 + return 0.35 if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_DOCTOR)) return DURATION_MULTIPLIER_TIER_1 // Surgeon From 23e0d5e195930343c76ff5ab9da856a47351d60d Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 17 Mar 2024 01:55:07 +0000 Subject: [PATCH 26/28] Automatic changelog for PR #5950 [ci skip] --- html/changelogs/AutoChangeLog-pr-5950.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5950.yml diff --git a/html/changelogs/AutoChangeLog-pr-5950.yml b/html/changelogs/AutoChangeLog-pr-5950.yml new file mode 100644 index 000000000000..8991614eb300 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5950.yml @@ -0,0 +1,5 @@ +author: "Katskan" +delete-after: True +changes: + - balance: "changed medical 4 skill speed multiplier from tier 2 to a non-standard 0.35" + - balance: "changed defib medical skill speed scaling" \ No newline at end of file From 8e63a252154b0fce159fc10b247eed1e60cd0d00 Mon Sep 17 00:00:00 2001 From: Nanu308 <59782240+Nanu308@users.noreply.github.com> Date: Sun, 17 Mar 2024 02:49:06 +0100 Subject: [PATCH 27/28] Pizza Station is back on the menu (#5887) # About the pull request Adds a Pizza Galaxy space diner to the game for the Pizza ERT. They deserve their own station as well! The clothed tables will spawn incorrectly spritewise until Naut's PR #5838 is added to the game. Once new cooking sprites are added I'll go back and tweak the kitchen area some more. # Explain why it's good for the game More Soulful lore and RP spots. # Testing Photographs and Procedure
Screenshots & Videos ![bilde](https://github.com/cmss13-devs/cmss13/assets/59782240/d740b48b-a3bf-44ee-bc41-a2579ab32bd5)
# Changelog :cl: mapadd: Added the Galaxy Pizza Space Diner ERT station, for all your outer expanse food needs! maptweak: Placed APC's on ert stations and minor tweaks+fixes. /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/emergency_calls/ert_stations.dm | 3 + code/datums/emergency_calls/pizza.dm | 1 + code/game/area/admin_level.dm | 4 + .../objects/structures/barricade/handrail.dm | 8 + .../structures/stool_bed_chair_nest/bed.dm | 5 + .../stool_bed_chair_nest/xeno_nest.dm | 2 - .../lazy_templates/clf_ert_station.dmm | 13 +- .../lazy_templates/pizza_ert_station.dmm | 6916 +++++++++++++++++ .../lazy_templates/twe_ert_station.dmm | 8 +- .../lazy_templates/weyland_ert_station.dmm | 3 + 10 files changed, 6956 insertions(+), 7 deletions(-) create mode 100644 maps/templates/lazy_templates/pizza_ert_station.dmm diff --git a/code/datums/emergency_calls/ert_stations.dm b/code/datums/emergency_calls/ert_stations.dm index 3e7874572365..312ceeaf9eed 100644 --- a/code/datums/emergency_calls/ert_stations.dm +++ b/code/datums/emergency_calls/ert_stations.dm @@ -12,3 +12,6 @@ /datum/lazy_template/ert/weyland_station map_name = "weyland_ert_station" + +/datum/lazy_template/ert/pizza_station + map_name = "pizza_ert_station" diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm index a2c312887dc9..a0d710f455f9 100644 --- a/code/datums/emergency_calls/pizza.dm +++ b/code/datums/emergency_calls/pizza.dm @@ -8,6 +8,7 @@ objectives = "Make sure you get a tip!" shuttle_id = MOBILE_SHUTTLE_ID_ERT_SMALL name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza + home_base = /datum/lazy_template/ert/pizza_station probability = 1 /datum/emergency_call/pizza/create_member(datum/mind/M, turf/override_spawn_loc) diff --git a/code/game/area/admin_level.dm b/code/game/area/admin_level.dm index 1724f2fdeea3..49bbc43c0b9c 100644 --- a/code/game/area/admin_level.dm +++ b/code/game/area/admin_level.dm @@ -113,6 +113,10 @@ name = "UPP Station" icon_state = "green" +/area/adminlevel/ert_station/pizza_station + name = "Pizza Galaxy" + icon_state = "red" + /area/adminlevel/ert_station/clf_station name = "CLF Station" icon_state = "white" diff --git a/code/game/objects/structures/barricade/handrail.dm b/code/game/objects/structures/barricade/handrail.dm index 1d641479c3d9..2fde8de3fe98 100644 --- a/code/game/objects/structures/barricade/handrail.dm +++ b/code/game/objects/structures/barricade/handrail.dm @@ -198,3 +198,11 @@ /obj/structure/barricade/handrail/sandstone/b icon_state = "hr_sandstone_b" + +/obj/structure/barricade/handrail/pizza + name = "\improper diner half-wall" + icon_state = "hr_sandstone" //temp, getting sprites soontm + color = "#b51c0b" + can_be_reinforced = FALSE + projectile_coverage = PROJECTILE_COVERAGE_LOW + layer = MOB_LAYER + 0.01 diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 7469a568f7e0..240b003ed1a8 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -20,6 +20,7 @@ var/buildstackamount = 1 var/foldabletype //To fold into an item (e.g. roller bed item) var/buckling_y = 0 //pixel y shift to give to the buckled mob. + var/buckling_x = 0 //pixel x shift to give to the buckled mob. var/obj/structure/closet/bodybag/buckled_bodybag var/accepts_bodybag = FALSE //Whether you can buckle bodybags to this bed var/base_bed_icon //Used by beds that change sprite when something is buckled to them @@ -60,11 +61,15 @@ if(. && buckled_mob == M) M.pixel_y = buckling_y M.old_y = buckling_y + M.pixel_x = buckling_x + M.old_x = buckling_x if(base_bed_icon) density = TRUE else M.pixel_y = initial(buckled_mob.pixel_y) M.old_y = initial(buckled_mob.pixel_y) + M.pixel_x = initial(buckled_mob.pixel_x) + M.old_x = initial(buckled_mob.pixel_x) if(base_bed_icon) density = FALSE diff --git a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm index a3ccffc466c4..b8b4432674e6 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm @@ -18,8 +18,6 @@ var/mob/dead/observer/ghost_of_buckled_mob = null var/hivenumber = XENO_HIVE_NORMAL var/force_nest = FALSE - /// counterpart to buckling_y --> offsets the buckled mob when it buckles - var/list/buckling_x /obj/structure/bed/nest/Initialize(mapload, hive) . = ..() diff --git a/maps/templates/lazy_templates/clf_ert_station.dmm b/maps/templates/lazy_templates/clf_ert_station.dmm index 7347be914da2..02a5b01cee03 100644 --- a/maps/templates/lazy_templates/clf_ert_station.dmm +++ b/maps/templates/lazy_templates/clf_ert_station.dmm @@ -1378,6 +1378,17 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirt, /area/adminlevel/ert_station/clf_station) +"Ia" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/machinery/power/apc/antag{ + dir = 1 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/adminlevel/ert_station/clf_station) "Ie" = ( /turf/open/gm/dirtgrassborder{ dir = 1; @@ -3006,7 +3017,7 @@ zO Ch ZI ZI -MQ +Ia mw mw LQ diff --git a/maps/templates/lazy_templates/pizza_ert_station.dmm b/maps/templates/lazy_templates/pizza_ert_station.dmm new file mode 100644 index 000000000000..b154256c0459 --- /dev/null +++ b/maps/templates/lazy_templates/pizza_ert_station.dmm @@ -0,0 +1,6916 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ae" = ( +/obj/structure/machinery/door_control{ + id = "kitchen_pizza_time"; + name = "Main Kitchen Shutters"; + pixel_x = 28 + }, +/obj/structure/safe/floor, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c100, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c50, +/obj/item/spacecash/c500, +/obj/item/spacecash/c500, +/obj/item/spacecash/c500, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"ah" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "Docking Umbilical" + }, +/obj/structure/blocker/invisible_wall, +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/pizza_station) +"am" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + pixel_x = -8; + layer = 2.97 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + anchored = 1; + layer = 2.97 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + pixel_x = 8; + layer = 2.97 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + layer = 4.1; + pixel_x = -4; + pixel_y = 18 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + layer = 4.1; + pixel_x = 4; + pixel_y = 18 + }, +/obj/item/reagent_container/food/drinks/cans/souto/cherry{ + layer = 4.2; + pixel_y = 36 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"an" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"ap" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/pizza_station) +"aq" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"aA" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/microwave{ + pixel_y = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"aD" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = 32 + }, +/obj/structure/sign/safety/manualopenclose{ + pixel_y = 14; + pixel_x = 32 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/pizza_station) +"aJ" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"aP" = ( +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"aS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out" + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = -32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = -32; + pixel_x = 15 + }, +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"bd" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "Docking Umbilical" + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/pizza_station) +"bl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/pizza_station) +"bo" = ( +/obj/structure/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"bB" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"bT" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/recharger, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"bU" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Central Fridge"; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"cq" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"cr" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -4 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"cE" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/ceramic_plate{ + pixel_y = 4; + pixel_x = -2 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"cI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor{ + icon_state = "blueyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"cK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"cL" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"cO" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"cP" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/ceramic_plate{ + pixel_y = 5 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 8 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 11 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 14 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"dc" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"dh" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/diet/cranberry{ + pixel_y = 20; + layer = 3.03; + pixel_x = 4 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"dS" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Freezer" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"ec" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/birthdaycakeslice, +/obj/item/reagent_container/food/drinks/cans/dr_gibb{ + pixel_x = -8; + pixel_y = -6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"ef" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel/mature{ + pixel_x = 1; + pixel_y = -5 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"eh" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/omelette{ + pixel_y = 2; + pixel_x = 1 + }, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 22; + pixel_x = -10 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 2; + pixel_x = -8 + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13; + pixel_x = 5 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"ei" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/pizza_station) +"eo" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/obj/item/reagent_container/food/condiment/coldsauce, +/obj/item/reagent_container/food/condiment/coldsauce, +/obj/structure/machinery/light/small/blue{ + dir = 1; + pixel_y = 20; + pixel_x = 16 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"eD" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -11; + pixel_y = -1 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"eI" = ( +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"eK" = ( +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 6 + }, +/area/adminlevel/ert_station/pizza_station) +"eQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"eW" = ( +/turf/open/mars_dirt{ + icon_state = "mars_cave_11" + }, +/area/space) +"fb" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/space) +"fg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"fj" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"fu" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/pizza_station) +"fE" = ( +/obj/structure/bed/sofa/south/grey/right, +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/pizza_station) +"fH" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/space) +"fN" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/peach{ + pixel_y = 14; + pixel_x = -4 + }, +/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ + pixel_y = 9 + }, +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"fO" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"gb" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor{ + icon_state = "blueyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"gu" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/storage/box/drinkingglasses{ + layer = 2.97; + pixel_x = 12 + }, +/obj/item/reagent_container/food/drinks/shaker{ + pixel_x = -11; + layer = 2.97; + pixel_y = 2 + }, +/obj/item/reagent_container/food/drinks/bottle/rum{ + pixel_y = 2; + pixel_x = -2; + layer = 2.97 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"gy" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor{ + icon_state = "blueyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"gU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"gV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"ha" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/space, +/area/space) +"hb" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"hc" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"hg" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/pizza_station) +"hv" = ( +/obj/structure/closet/crate/freezer/cooler, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/pizza_station) +"hL" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"hR" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"hX" = ( +/obj/structure/bed/chair/bolted{ + pixel_y = -1; + buckling_y = -1 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"ic" = ( +/obj/item/trash/plate{ + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_y = 6 + }, +/obj/item/trash/plate{ + pixel_y = 8 + }, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 14; + pixel_x = 11 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 9; + pixel_x = 12 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"im" = ( +/obj/structure/bed/chair/janicart, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"ir" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"iw" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/tofukabob, +/obj/item/reagent_container/food/snacks/tofukabob{ + pixel_y = 10 + }, +/obj/item/reagent_container/food/snacks/tofukabob{ + pixel_y = 5 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 6 + }, +/area/adminlevel/ert_station/pizza_station) +"iY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = 32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = 32; + pixel_x = 15 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"ja" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/space) +"jb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 5 + }, +/area/adminlevel/ert_station/pizza_station) +"jf" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/toastedsandwich{ + pixel_y = 11 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Kitchen Shutters"; + id = "kitchen_pizza_time" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/pizza_station) +"jo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"jq" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"jx" = ( +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + pixel_y = -6; + buckling_x = 7; + buckling_y = -6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"jy" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 9 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 12 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Kitchen Shutters"; + id = "kitchen_pizza_time" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/pizza_station) +"jH" = ( +/turf/open/mars{ + icon_state = "mars_cave_10" + }, +/area/space) +"jT" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "blueyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"jV" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"kz" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Kitchen" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"kW" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"la" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/door/poddoor/almayer{ + unacidable = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + locked = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"lg" = ( +/turf/closed/shuttle/ert{ + icon_state = "leftengine_1" + }, +/area/adminlevel/ert_station/pizza_station) +"lv" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/drinkingglass/cola{ + pixel_y = 8; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/shaker{ + pixel_y = 5; + pixel_x = -11 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"lw" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 22; + pixel_x = -10 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = 4; + pixel_y = 11 + }, +/obj/item/ashtray/glass{ + pixel_x = -6 + }, +/obj/item/clothing/mask/cigarette{ + pixel_y = 8 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"lx" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"ly" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/grape{ + pixel_y = 16; + pixel_x = 9 + }, +/obj/item/reagent_container/food/drinks/cans/souto/lime{ + pixel_y = 12; + pixel_x = 5 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"lB" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/item/storage/briefcase/stowaway{ + pixel_y = 11; + layer = 4.11 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"lE" = ( +/obj/structure/machinery/vending/dinnerware, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"lH" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway_out" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"lJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"lL" = ( +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/pizza_station) +"lN" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"ma" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/storage/donut_box{ + pixel_y = 10; + pixel_x = 1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"me" = ( +/turf/open/mars_dirt{ + icon_state = "mars_cave_8" + }, +/area/space) +"mj" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_x = 16; + pixel_y = 20 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"mk" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = 16 + }, +/obj/structure/machinery/vending/snack{ + layer = 4.15; + pixel_y = 3 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"mt" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"mP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/fridge{ + pixel_x = 32 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"nf" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan5" + }, +/area/adminlevel/ert_station/pizza_station) +"nl" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"np" = ( +/obj/structure/surface/table/reinforced, +/obj/item/pizzabox{ + pixel_y = 5 + }, +/obj/item/pizzabox{ + pixel_y = 8 + }, +/obj/item/pizzabox{ + pixel_y = 11 + }, +/obj/item/pizzabox{ + pixel_y = 14 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"ny" = ( +/obj/structure/closet/secure_closet/fridge/fish/stock, +/obj/structure/machinery/light/small/blue{ + pixel_x = 16 + }, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/adminlevel/ert_station/pizza_station) +"nA" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/cans/tonic{ + pixel_x = -15; + pixel_y = 10 + }, +/obj/item/reagent_container/food/drinks/cans/tonic{ + pixel_y = 6; + pixel_x = -15 + }, +/obj/structure/machinery/computer/emails{ + dir = 1; + pixel_y = 2; + pixel_x = 3; + layer = 2.97 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"nB" = ( +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"nK" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray, +/obj/item/tool/kitchen/knife{ + pixel_x = 3 + }, +/obj/item/tool/kitchen/knife/butcher{ + pixel_x = -8 + }, +/obj/structure/machinery/firealarm{ + pixel_x = -24 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"nU" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"nX" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"oh" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"ok" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"oo" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"ov" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"oy" = ( +/obj/structure/bedsheetbin{ + icon_state = "linenbin-empty"; + name = "solar lattice"; + pixel_y = 6 + }, +/turf/open/floor/almayer_hull, +/area/space) +"oD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/maint{ + locked = 1; + name = "STAFF ONLY"; + req_one_access = null; + req_one_access_txt = "101" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"oG" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/pizza_station) +"oU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"oX" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"pA" = ( +/obj/structure/machinery/vending/coffee{ + pixel_y = 18; + density = 0 + }, +/obj/structure/machinery/alarm{ + pixel_x = -32 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"pD" = ( +/turf/open/mars_dirt{ + icon_state = "mars_cave_10" + }, +/area/space) +"pE" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/structure/mirror{ + pixel_x = 29 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"pS" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"pT" = ( +/obj/structure/closet/crate/freezer/rations, +/obj/item/reagent_container/food/snacks/meat/fish/crab, +/obj/item/reagent_container/food/snacks/meat/fish/crab, +/obj/item/reagent_container/food/snacks/meat/fish/squid, +/obj/item/reagent_container/food/snacks/meat/fish/squid, +/obj/item/reagent_container/food/snacks/meat/fish/squid, +/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, +/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, +/obj/item/reagent_container/food/snacks/meat/fish/squid/alt, +/obj/item/reagent_container/food/snacks/meat/fish, +/obj/item/reagent_container/food/snacks/meat/fish, +/obj/item/reagent_container/food/snacks/meat/fish, +/obj/item/reagent_container/food/snacks/meat/fish, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/pizza_station) +"qb" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 1; + pixel_y = 9; + pixel_x = 2 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"qh" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_rightengine" + }, +/area/adminlevel/ert_station/pizza_station) +"qo" = ( +/obj/structure/closet{ + pixel_y = 16; + density = 0 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_x = 16; + pixel_y = 20 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"qq" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"qs" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/souto/diet/classic{ + pixel_x = -2 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"qt" = ( +/turf/open/mars_dirt{ + icon_state = "mars_cave_6" + }, +/area/space) +"qv" = ( +/obj/structure/surface/table/reinforced, +/obj/item/book/manual/chef_recipes, +/obj/item/clothing/head/chefhat, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"qy" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/juicer{ + pixel_y = 9 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"qA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"qU" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/obj/structure/machinery/alarm{ + pixel_y = 25 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"qX" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"rj" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/ceramic_plate{ + pixel_y = 1; + pixel_x = 2 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 9; + pixel_y = 14 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"rk" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"rA" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"rK" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"rL" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/door/poddoor/almayer{ + name = "\improper Umbillical Airlock"; + unacidable = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + locked = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"rO" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison{ + dir = 6; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"sa" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"se" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom"; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"sk" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"sl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"sp" = ( +/obj/structure/surface/table/reinforced, +/obj/item/weapon/pizza_cutter, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"sx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"sB" = ( +/turf/open/mars_dirt{ + icon_state = "mars_cave_7" + }, +/area/space) +"sI" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/tool/kitchen/tray{ + pixel_y = 13; + pixel_x = 16 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 13; + pixel_x = 15 + }, +/obj/item/trash/plate{ + pixel_y = 3; + pixel_x = 1 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_y = 3; + pixel_x = -1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"sJ" = ( +/obj/structure/machinery/vending/ingredients, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"sW" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/door/poddoor/almayer{ + name = "\improper Umbillical Airlock"; + unacidable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"sY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"td" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/pizza_station) +"tp" = ( +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_y = 17; + pixel_x = 10; + buckling_y = 17; + buckling_x = 10 + }, +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"tq" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"ty" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/pizza_station) +"tC" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 13; + pixel_y = 12 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 17 + }, +/obj/item/trash/plate{ + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/cheeseburger{ + pixel_x = -1; + pixel_y = 9 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"tH" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Galaxy Pizza!" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"tM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/pizza_station) +"tT" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space, +/area/space) +"tX" = ( +/obj/structure/machinery/disposal{ + layer = 2.97 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"ub" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway_out" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"ug" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"uj" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space, +/area/space) +"uo" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/adminlevel/ert_station/pizza_station) +"uz" = ( +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"uD" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/processor{ + pixel_y = 10 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"uK" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/obj/structure/barricade/handrail/kutjevo{ + dir = 8; + layer = 3.01 + }, +/turf/open/space, +/area/space) +"uN" = ( +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"uY" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/cups, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 4; + pixel_x = 11 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 4; + pixel_x = 19 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Kitchen Shutters"; + id = "kitchen_pizza_time" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/pizza_station) +"vi" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "redcorner"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"vq" = ( +/obj/structure/toilet{ + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"vr" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"vA" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"vI" = ( +/obj/structure/disposalpipe/segment, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/weapon/broken_bottle{ + pixel_y = 7; + pixel_x = -12 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"vR" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"vX" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"wa" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"wb" = ( +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/space) +"wi" = ( +/obj/structure/closet/secure_closet/fridge/meat/stock, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 9 + }, +/area/adminlevel/ert_station/pizza_station) +"wm" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/tomatomeat, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"wo" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/pizza_station) +"wq" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "redcorner"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"wu" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/ceramic_plate{ + pixel_y = 4; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 13; + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/carrotcakeslice{ + pixel_y = 6; + pixel_x = -1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"wz" = ( +/turf/open/floor/prison{ + icon_state = "red"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"wD" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"wP" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 1; + pixel_y = 3 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"wQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"wX" = ( +/obj/structure/closet/crate/freezer/cooler/oj, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/pizza_station) +"xc" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"xe" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"xh" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = -10; + pixel_y = 12 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = -15; + pixel_y = 17 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/item/reagent_container/food/snacks/applecakeslice{ + pixel_y = 8; + pixel_x = 3 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"xl" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/tool/kitchen/tray{ + pixel_y = 20 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 20 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"xp" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/disposalpipe/trunk, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/turf/open/space, +/area/space) +"xy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"xV" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, +/area/adminlevel/ert_station/pizza_station) +"xX" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 3; + pixel_x = 1 + }, +/obj/item/reagent_container/food/snacks/mushroompizzaslice{ + pixel_y = 4 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"yg" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/space/basic, +/area/space) +"yo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "greenbluecorner"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"yr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 10 + }, +/area/adminlevel/ert_station/pizza_station) +"ys" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"yE" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/structure/surface/table/almayer, +/obj/item/trash/ceramic_plate{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/toastedsandwich{ + pixel_y = 17; + pixel_x = -1 + }, +/obj/item/reagent_container/food/snacks/toastedsandwich{ + pixel_y = 15; + pixel_x = 2 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"yG" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, +/area/adminlevel/ert_station/pizza_station) +"yK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"yM" = ( +/obj/structure/sign/safety/fridge{ + pixel_y = -32 + }, +/obj/structure/sign/safety/fridge{ + pixel_x = 32 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"yP" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = -4 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = 3 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 10 + }, +/area/adminlevel/ert_station/pizza_station) +"zf" = ( +/obj/structure/sign/safety/galley{ + pixel_x = -17 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"zh" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"zj" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical{ + pixel_y = -4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"zl" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 28; + pixel_x = 16 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 17 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 13; + pixel_y = 12 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/tool/kitchen/utensil/knife{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"zx" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 2 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 4 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 6 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"zz" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"zC" = ( +/obj/structure/bed/chair/bolted{ + dir = 4; + pixel_x = 7; + buckling_x = 7 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"zE" = ( +/obj/structure/machinery/door_control/airlock{ + id = "pizza_takeaway"; + name = "Airlock - Inside"; + pixel_x = 28; + pixel_y = 8 + }, +/obj/structure/machinery/door_control/airlock{ + id = "pizza_takeaway_out"; + name = "Airlock - Out"; + pixel_x = 28; + pixel_y = 18 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/pizza_station) +"zM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "redcorner"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"zQ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"zW" = ( +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"Ab" = ( +/obj/structure/machinery/gibber{ + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Ac" = ( +/obj/structure/closet/secure_closet/fridge/dry, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/galley{ + pixel_x = -24 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Aj" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor{ + icon_state = "blueyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Ao" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Au" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"Ax" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = -3; + pixel_x = 16 + }, +/obj/item/ashtray/glass{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/clothing/mask/cigarette, +/obj/item/clothing/mask/cigarette{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"AB" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"AD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Central Fridge" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"AH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"AV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor{ + icon_state = "blueyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"AW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = -32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = -32; + pixel_x = 15 + }, +/turf/open/floor/prison{ + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"Bu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"By" = ( +/obj/structure/machinery/suit_storage_unit/standard_unit{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/sign/safety/suit_storage{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"Bz" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/plate{ + pixel_y = 2 + }, +/obj/item/trash/plate{ + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_y = 6 + }, +/obj/item/trash/plate{ + pixel_y = 8 + }, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"BC" = ( +/obj/structure/surface/table/reinforced, +/obj/item/pizzabox{ + pixel_y = 5 + }, +/obj/item/pizzabox{ + pixel_y = 8 + }, +/obj/item/pizzabox{ + pixel_y = 11 + }, +/obj/structure/machinery/light, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"BJ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"BU" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"Ck" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/machinery/light/small{ + pixel_x = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"Cp" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = -6; + pixel_y = 14 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Cv" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/condiment/hotsauce/tabasco, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha, +/obj/item/reagent_container/food/condiment/hotsauce/franks, +/obj/item/reagent_container/food/condiment/hotsauce/cholula, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"CO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"CP" = ( +/turf/open/floor/almayer_hull, +/area/space) +"CT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/chem_dispenser/soda{ + density = 0; + pixel_y = 30 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Db" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Dd" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"Dx" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 8 + }, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 4 + }, +/obj/item/reagent_container/food/snacks/sliceable/bread, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"DF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/chem_dispenser/soda/beer{ + density = 0; + pixel_y = 31 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"DH" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.01 + }, +/turf/open/space/basic, +/area/space) +"DW" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"Ee" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/barricade/handrail/kutjevo{ + dir = 8; + layer = 3.01 + }, +/turf/open/space/basic, +/area/space) +"Eh" = ( +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"Ei" = ( +/turf/closed/wall/almayer/outer, +/area/adminlevel/ert_station/pizza_station) +"Ep" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"EH" = ( +/obj/structure/machinery/vending/cigarette{ + pixel_y = 18; + layer = 3.01; + density = 0 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"EK" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"EO" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"EZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Fd" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"Ff" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 10; + pixel_x = 1 + }, +/obj/item/trash/plate{ + pixel_y = -1 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_y = 13 + }, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 11; + pixel_x = -7 + }, +/obj/item/reagent_container/food/snacks/grilledcheese{ + pixel_y = 6; + pixel_x = -1 + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 2; + pixel_x = 8 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Fj" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/snacks/ricepudding, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/pizza_station) +"Fp" = ( +/obj/structure/closet/crate/freezer, +/obj/structure/machinery/light/blue, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/packaged_burger, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/pizza_station) +"Fz" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray{ + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 5 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"FB" = ( +/obj/structure/machinery/light{ + pixel_x = 16 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"FD" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + icon_state = "almayer_pdoor"; + id = "pizza_takeaway" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"FL" = ( +/turf/closed/shuttle/ert{ + icon_state = "rightengine_1"; + opacity = 0 + }, +/area/adminlevel/ert_station/pizza_station) +"FS" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"FY" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/cans/cola{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/item/reagent_container/food/drinks/cans/cola{ + pixel_y = 4; + pixel_x = -3 + }, +/obj/item/reagent_container/food/drinks/cans/iced_tea{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/reagent_container/food/drinks/cans/iced_tea{ + pixel_x = 11; + pixel_y = 5 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Gd" = ( +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"Gh" = ( +/obj/structure/machinery/disposal{ + layer = 2.97 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/sign/poster{ + desc = "Eat an EAT bar! ...Aren't they called MEAT bars?"; + icon_state = "poster7"; + name = "EAT - poster"; + pixel_y = 30 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Gj" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Gm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"Gn" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"Gp" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/mushroomsoup{ + pixel_y = 6 + }, +/obj/item/tool/kitchen/utensil/spoon{ + pixel_y = 4; + pixel_x = 7 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Gt" = ( +/obj/structure/machinery/atm{ + pixel_y = 32; + pixel_x = 2 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"GB" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = 30 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"GM" = ( +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/space/basic, +/area/space) +"Ha" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_leftengine" + }, +/area/adminlevel/ert_station/pizza_station) +"Hd" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"Hg" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/space) +"HL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_y = 4; + pixel_x = 5 + }, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_y = 2 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"HQ" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_y = 10; + pixel_x = -1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Ib" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"Iq" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = 5; + pixel_y = 13 + }, +/obj/item/trash/ceramic_plate{ + pixel_y = 1 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_x = -1; + pixel_y = 3 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"ID" = ( +/turf/closed/wall/rock/red, +/area/space) +"IJ" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"Jd" = ( +/obj/structure/closet{ + pixel_y = 16; + density = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"Jl" = ( +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"Jm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"Jq" = ( +/obj/structure/closet/secure_closet/fridge/organic/stock, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/adminlevel/ert_station/pizza_station) +"JP" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/knife/butcher, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"JR" = ( +/obj/structure/bed/sofa/vert/grey/bot, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"JU" = ( +/obj/structure/janitorialcart{ + pixel_y = 15 + }, +/obj/item/tool/wet_sign{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/tool/wet_sign{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_container/glass/bucket{ + pixel_x = 9 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"JV" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/bed/chair/bolted{ + pixel_y = -1; + buckling_y = -1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Kb" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 4; + pixel_y = -3 + }, +/obj/item/corncob, +/obj/item/corncob{ + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Kc" = ( +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control/airlock{ + id = "pizza_takeaway_out"; + name = "Airlock - Out"; + pixel_x = 2; + pixel_y = 18 + }, +/obj/structure/sign/safety/manualopenclose{ + pixel_y = -3; + pixel_x = 7 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/pizza_station) +"Kd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/pizza_station) +"Kv" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/sink/kitchen{ + pixel_y = 12 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"KB" = ( +/obj/structure/sign/safety/bathunisex{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/washing_machine{ + pixel_y = 10 + }, +/obj/structure/sign/safety/water{ + pixel_x = -17 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"KC" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"KY" = ( +/turf/open/floor/prison{ + icon_state = "blue_plate" + }, +/area/adminlevel/ert_station/pizza_station) +"La" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ + pixel_y = 11; + pixel_x = -6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = 11; + pixel_x = 6 + }, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 11 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Lk" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Ln" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer{ + icon_state = "security_det"; + name = "Shuttle control deck"; + pixel_y = 6 + }, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/pizza_station) +"Ly" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"LH" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 9 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Mj" = ( +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/pizza_station) +"Mk" = ( +/obj/structure/machinery/vending/coffee{ + pixel_y = 12 + }, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"Mt" = ( +/obj/structure/bed/sofa/south/grey/left, +/obj/item/storage/briefcase/stowaway, +/turf/open/floor/prison{ + dir = 9; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"Mz" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/space) +"MB" = ( +/obj/structure/surface/table/reinforced, +/obj/item/pizzabox/meat, +/obj/item/weapon/pizza_cutter, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"MK" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/bottle/wine{ + pixel_y = 7; + pixel_x = -6 + }, +/obj/item/reagent_container/food/drinks/bottle/vermouth{ + pixel_y = 5; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = -4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"MS" = ( +/obj/structure/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/machinery/light/small{ + pixel_x = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"MT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/pizza_station) +"MX" = ( +/turf/open/floor/prison{ + icon_state = "red"; + dir = 9 + }, +/area/adminlevel/ert_station/pizza_station) +"Nb" = ( +/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ + pixel_y = 18; + pixel_x = -6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = 18; + pixel_x = 6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 16 + }, +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/condiment/coldsauce{ + pixel_y = 13; + pixel_x = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Nl" = ( +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"No" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"Nr" = ( +/obj/structure/machinery/vending/cola{ + pixel_y = 12 + }, +/obj/structure/sign/safety/coffee{ + pixel_y = 32; + pixel_x = -13 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"Ny" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"NG" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"NH" = ( +/obj/structure/bed/sofa/vert/grey/top, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"NJ" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan20" + }, +/area/adminlevel/ert_station/pizza_station) +"NN" = ( +/obj/structure/closet/secure_closet/fridge/groceries/stock, +/obj/structure/machinery/light/small/blue{ + dir = 1; + pixel_y = 20 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 9 + }, +/area/adminlevel/ert_station/pizza_station) +"NP" = ( +/obj/structure/sink/kitchen{ + pixel_x = 11; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/water{ + pixel_x = 38 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"NT" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/space, +/area/space) +"NV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Showers & Bathroom"; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"Og" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza{ + pixel_y = -2; + pixel_x = -16 + }, +/obj/item/trash/plate{ + pixel_y = 8; + pixel_x = 3 + }, +/obj/item/reagent_container/food/snacks/meatpizzaslice{ + pixel_y = 8; + pixel_x = -1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Oh" = ( +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9; + pixel_x = 1 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"OE" = ( +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9; + pixel_x = -1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"OG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space, +/area/space) +"OJ" = ( +/turf/open/floor{ + desc = "A sophisticated device that captures and converts light from the system's star into energy for the station."; + icon_state = "solarpanel"; + name = "solarpanel" + }, +/area/space) +"OK" = ( +/obj/structure/machinery/vending/cigarette{ + pixel_y = 3; + layer = 4.15 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"OQ" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 8; + pixel_y = 13 + }, +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_27"; + pixel_y = 13; + pixel_x = -2; + layer = 4.11 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"OS" = ( +/turf/open/floor/prison{ + icon_state = "red"; + dir = 4 + }, +/area/adminlevel/ert_station/pizza_station) +"Pa" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Pi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"Pl" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -8; + pixel_y = 15; + layer = 4.11 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_x = -8; + pixel_y = 2; + layer = 4.12 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Pn" = ( +/obj/structure/surface/table/reinforced, +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/suit/chef/classic, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Pq" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"Ps" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/tool/mop{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Py" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/space) +"PF" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"PH" = ( +/obj/structure/surface/table/reinforced/cloth, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"PL" = ( +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/pizza_station) +"Qe" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"QN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/pizza_station) +"Ra" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/obj/item/reagent_container/food/snacks/vegetablepizzaslice{ + pixel_y = 10; + pixel_x = -2 + }, +/obj/item/reagent_container/food/drinks/cans/boda{ + pixel_y = 16; + pixel_x = -11; + layer = 3.03 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Rf" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"Rh" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/pizza_station) +"RC" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/space/basic, +/area/space) +"RG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"RN" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12; + layer = 4.11 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"RP" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "blueyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"RV" = ( +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/head/chefhat, +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Se" = ( +/obj/structure/bed/chair/bolted{ + dir = 1; + pixel_y = 12; + buckling_y = 12 + }, +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Sg" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/space) +"So" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"Sp" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Sq" = ( +/obj/structure/kitchenspike, +/obj/item/reagent_container/food/snacks/meat{ + pixel_y = -5 + }, +/obj/item/reagent_container/food/snacks/meat{ + pixel_y = 2 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/adminlevel/ert_station/pizza_station) +"Sr" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_x = -13; + pixel_y = -6 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_y = 1; + pixel_x = 5 + }, +/obj/item/tool/kitchen/utensil/knife{ + pixel_y = 3; + pixel_x = 9 + }, +/obj/item/reagent_container/food/snacks/meatsteak{ + pixel_y = 5; + pixel_x = 1 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Sz" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"SL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 28; + pixel_x = 3 + }, +/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ + pixel_y = 15; + pixel_x = -8 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"ST" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/ad{ + icon_state = "poster41"; + pixel_y = 32 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"SV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Showers" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"Te" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 28; + pixel_x = 16 + }, +/obj/item/tool/kitchen/utensil/pknife{ + pixel_x = 13; + pixel_y = 1 + }, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/reagent_container/food/snacks/chocolatecakeslice{ + pixel_y = 2; + pixel_x = 2 + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13; + pixel_x = 5 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Tu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"TC" = ( +/turf/open/floor/prison{ + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/pizza_station) +"TD" = ( +/turf/open/floor/prison{ + icon_state = "bright_clean2" + }, +/area/adminlevel/ert_station/pizza_station) +"TE" = ( +/turf/open/mars_dirt{ + icon_state = "mars_cave_3" + }, +/area/space) +"TH" = ( +/obj/structure/surface/table/almayer, +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/obj/item/storage/box/drinkingglasses{ + layer = 2.97; + pixel_x = 14 + }, +/obj/item/reagent_container/food/drinks/bottle/orangejuice{ + layer = 2.97 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"TK" = ( +/turf/closed/shuttle/ert, +/area/adminlevel/ert_station/pizza_station) +"TQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_y = -1 + }, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"TY" = ( +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 1; + pixel_y = 3 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 2; + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Uu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/power/apc/antag{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Ux" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/bed/chair/bolted{ + pixel_y = -1; + buckling_y = -1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"UB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Vj" = ( +/obj/structure/closet/secure_closet/fridge/dry/stock, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 5 + }, +/area/adminlevel/ert_station/pizza_station) +"Vm" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray{ + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza{ + pixel_y = 1 + }, +/turf/open/floor/prison{ + icon_state = "greenbluecorner" + }, +/area/adminlevel/ert_station/pizza_station) +"Vs" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/machinery/light{ + pixel_x = 16; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 8 + }, +/area/adminlevel/ert_station/pizza_station) +"Vt" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan25" + }, +/area/adminlevel/ert_station/pizza_station) +"Vv" = ( +/obj/docking_port/stationary/emergency_response/idle_port4, +/turf/open/floor/plating, +/area/adminlevel/ert_station/pizza_station) +"Vx" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"VD" = ( +/obj/structure/barricade/handrail/pizza{ + dir = 1; + pixel_y = 12 + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -3; + pixel_y = 15; + layer = 4.03 + }, +/obj/structure/surface/table/almayer{ + layer = 4.02 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"VK" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"VN" = ( +/obj/structure/bed/chair/bolted{ + dir = 8; + pixel_x = -7; + buckling_x = -7 + }, +/obj/structure/sign/poster{ + desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; + icon_state = "poster12"; + name = "Beach Babe Pinup"; + pixel_x = 6; + pixel_y = 30; + serial_number = 12 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"VQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"VS" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box{ + pixel_y = -8 + }, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"VX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Wb" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"WL" = ( +/obj/structure/window/framed/almayer/hull, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/adminlevel/ert_station/pizza_station) +"WP" = ( +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"WS" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/pizza_station) +"WZ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Kitchen and Cleaning" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"Xa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/sign/safety/debark_lounge{ + pixel_y = 32 + }, +/obj/structure/sign/safety/landingzone{ + pixel_y = 32; + pixel_x = 15 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/pizza_station) +"Xg" = ( +/obj/structure/prop/souto_land/streamer{ + pixel_y = 9; + pixel_x = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"Xj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/sign/safety/airlock{ + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/closet/crate/trashcart, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Xn" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/space, +/area/space) +"Xq" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light/small/blue{ + pixel_x = 16 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = -2 + }, +/obj/item/reagent_container/food/snacks/bigbiteburger{ + pixel_x = 4 + }, +/turf/open/floor/prison{ + icon_state = "greenblue" + }, +/area/adminlevel/ert_station/pizza_station) +"Xr" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) +"Xw" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"Xx" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/sliceable/flatdough, +/obj/item/tool/kitchen/rollingpin, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"XB" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/pizza_station) +"XD" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "red"; + dir = 5 + }, +/area/adminlevel/ert_station/pizza_station) +"XV" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 4; + pixel_y = 9 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "red" + }, +/area/adminlevel/ert_station/pizza_station) +"XZ" = ( +/obj/structure/barricade/handrail/pizza{ + pixel_y = -3 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Ya" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "STAFF ONLY" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"Yf" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/condiment/hotsauce/franks/macho{ + pixel_y = 18; + pixel_x = -6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/franks{ + pixel_y = 18; + pixel_x = 6 + }, +/obj/item/reagent_container/food/condiment/hotsauce/cholula{ + pixel_y = 16 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 1; + pixel_x = -4 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 3; + pixel_x = 6 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"Yj" = ( +/obj/structure/surface/table/reinforced/cloth, +/obj/item/tool/kitchen/utensil/pknife{ + pixel_x = -6 + }, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_y = 3; + pixel_x = -3 + }, +/obj/item/reagent_container/food/drinks/cans/souto/blue{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = -2; + pixel_x = 16 + }, +/turf/open/floor{ + icon_state = "redyellowfull" + }, +/area/adminlevel/ert_station/pizza_station) +"Ym" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = -16 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/prison, +/area/adminlevel/ert_station/pizza_station) +"Yo" = ( +/turf/open/space, +/area/space) +"Yu" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"Yv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/adminlevel/ert_station/pizza_station) +"Yw" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan27" + }, +/area/adminlevel/ert_station/pizza_station) +"Yy" = ( +/turf/open/space/basic, +/area/space) +"YD" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 5 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 6 + }, +/area/adminlevel/ert_station/pizza_station) +"YF" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"YL" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Galaxy Pizza!" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"YM" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall"; + name = "Docking Umbilical" + }, +/obj/structure/blocker/invisible_wall, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer_hull, +/area/adminlevel/ert_station/pizza_station) +"YO" = ( +/turf/closed/wall/almayer, +/area/adminlevel/ert_station/pizza_station) +"ZD" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "\improper Umbillical Airlock"; + id = "pizza_ert_arrival" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/pizza_station) +"ZM" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/drinks/soymilk, +/obj/item/reagent_container/food/condiment/hotsauce/tabasco, +/obj/item/reagent_container/food/condiment/hotsauce/sriracha, +/obj/item/reagent_container/food/condiment/hotsauce/franks, +/obj/item/reagent_container/food/condiment/hotsauce/cholula, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "greenblue"; + dir = 1 + }, +/area/adminlevel/ert_station/pizza_station) +"ZR" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "cmo" + }, +/area/adminlevel/ert_station/pizza_station) +"ZV" = ( +/obj/structure/bed/sofa/vert/grey, +/turf/open/floor/prison, +/area/adminlevel/ert_station/pizza_station) +"ZX" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/sign/poster/ad{ + icon_state = "poster12"; + pixel_y = 32 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 9 + }, +/obj/item/tool/kitchen/tray{ + pixel_y = 12 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/pizza_station) + +(1,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(2,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yo +Yy +Yy +Yy +Yy +Yy +Yy +Yo +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(3,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +yg +qq +qq +qX +yg +uj +qq +qq +NT +yg +qq +qq +qX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(4,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +yg +RG +OJ +OJ +Sg +eI +OJ +OJ +OJ +Sg +wb +OJ +OJ +Py +NT +Yy +Yy +Yy +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(5,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +Yy +yg +Xw +OJ +OJ +OJ +tT +Xw +OJ +OJ +OJ +Gn +Xw +OJ +OJ +OJ +OG +Vx +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(6,1,1) = {" +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +ID +eI +OJ +OJ +OJ +oy +CP +CP +OJ +OJ +OJ +CP +CP +oy +OJ +OJ +tT +rk +Vx +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(7,1,1) = {" +Yy +Yy +Yy +Yy +ID +ID +ID +ID +Vx +Pq +OJ +OJ +oy +CP +fH +fb +OJ +oy +OJ +ja +Mz +CP +oy +OJ +OJ +oX +Yy +Yy +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(8,1,1) = {" +Yy +Yy +Yy +ID +ID +ID +ID +Vx +Yy +RC +PF +xe +CP +lx +Xn +ID +ID +ID +ID +ID +ha +xe +CP +OJ +OJ +oX +Yy +Yy +Vx +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(9,1,1) = {" +Yy +Yy +Yy +ID +ID +ID +Yy +Vx +Yy +Yy +Yy +eI +CP +ID +ID +ID +ID +ID +ID +ID +ID +eI +CP +fH +Hg +fO +Yy +Vx +Vx +Yy +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(10,1,1) = {" +Yy +Yy +Yy +ID +ID +Vx +Vx +Vx +Yy +Yy +Yy +ID +ID +ID +ID +ID +ID +ID +ID +ID +Ei +Ei +WL +WL +WL +uo +Ei +Ei +Vx +Vx +Vx +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(11,1,1) = {" +Yy +Yy +Yy +Yy +ID +Yy +Yy +Vx +yg +qq +ID +ID +ID +ID +ID +ID +ID +ID +ID +Ei +Ei +hX +Ff +rA +uN +Pl +TY +Ei +Ei +Vx +Yy +Yy +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(12,1,1) = {" +Yy +Yy +Yy +Yy +Vx +Yy +Yy +wD +Yu +jH +ID +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Gh +Ly +Sp +uN +Sp +RN +jx +FS +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(13,1,1) = {" +Yy +Yy +Yy +Vx +Vx +Yy +yg +Yu +jH +pD +Ei +Ei +nK +RV +Xx +ef +wm +qy +YO +YO +vA +ug +Au +vr +yr +uN +wu +ly +Rh +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(14,1,1) = {" +Yy +Yy +Yy +Vx +wD +qq +Xw +jH +TE +TE +Ei +Ac +nB +nB +nB +nB +nB +nB +eD +YO +dc +zQ +oU +vi +Gm +uN +ec +xh +Rh +Yy +Yy +Yy +Yy +Ei +uo +uo +uo +Ei +uo +uo +uo +Ei +Yy +Yy +Yy +"} +(15,1,1) = {" +Yy +Yy +Yy +yg +Yu +pD +pD +TE +pD +qt +Rh +qv +nB +ZR +MB +cr +Pn +nB +nB +jy +tq +MK +FY +wz +Gm +hb +pS +pS +Rh +Yy +Yy +Yy +Ei +Ei +Mt +nl +SL +BU +fj +nl +sk +Ei +Ei +Yy +Yy +"} +(16,1,1) = {" +Yy +Yy +Yy +eI +pD +TE +pD +sB +TE +TE +Rh +Dx +nB +jo +np +JP +aA +Lk +nB +uY +tq +WP +TH +wz +uz +cO +KC +mt +Rh +Yy +Yy +Ei +Ei +pA +fE +VS +rK +an +Nl +cL +wo +VK +Ei +Ei +Yy +"} +(17,1,1) = {" +Yy +Yy +Yy +eI +sB +TE +TE +sB +TE +pD +Rh +Yf +UB +AB +Pa +NP +Pa +ov +nB +jf +tq +WP +La +wz +nU +uN +Ax +tC +Rh +Yy +Yy +Ei +Ei +Xa +Jm +Jm +Jm +Jm +Jm +Jm +Jm +aS +Ei +Ei +Yy +"} +(18,1,1) = {" +Yy +Yy +Yy +eI +NJ +TK +TK +Ha +lg +sB +Ei +sJ +jo +nB +ae +YO +uD +Ab +bT +YO +Ao +WP +lv +wz +OE +uN +HQ +fN +Ei +Yy +Yy +Yy +uo +AH +Vv +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(19,1,1) = {" +Yy +Yy +Yy +eI +Yw +Ln +Mj +WS +TE +eW +Ei +YO +Rf +kz +YO +YO +YO +YO +YO +YO +Uu +WP +nA +sa +aP +Db +zz +ys +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(20,1,1) = {" +Yy +Yy +Yy +eI +Vt +nf +nf +qh +FL +TE +uo +Ps +fg +WP +zf +WZ +TD +Fd +lN +Ya +bB +WP +lE +wz +Gm +Jl +Jl +Jl +tH +IJ +Jl +Jl +Ep +AH +fu +fu +fu +fu +fu +fu +fu +gU +la +Yy +Yy +"} +(21,1,1) = {" +Yy +Yy +Yy +eI +sB +sB +TE +eW +TE +pD +uo +JU +Tu +CO +CO +NG +mP +ok +Sz +BJ +vX +WP +yE +wz +hc +ir +ir +ir +Wb +zQ +ir +Dd +EO +AH +fu +fu +fu +fu +fu +fu +fu +gU +sW +Yy +Yy +"} +(22,1,1) = {" +Yy +Yy +Yy +eI +sB +sB +eW +TE +TE +ID +Ei +cP +tq +WP +Bz +YO +YO +AD +YO +YO +gV +WP +zx +DW +Eh +lB +mt +hR +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(23,1,1) = {" +Yy +Yy +Yy +eI +me +TE +TE +pD +ID +ID +Ei +Kv +EZ +Qe +BC +YO +wi +yK +yP +YO +VQ +WP +ic +wz +nU +hb +Iq +xl +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(24,1,1) = {" +Yy +Yy +Yy +RC +xe +me +me +ID +ID +ID +Ei +ZX +tq +WP +Fz +YO +eo +yG +Xq +YO +CT +WP +HL +wz +XV +uN +pS +tp +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(25,1,1) = {" +Yy +Yy +Yy +Yy +RC +uK +PL +Ei +Ei +Ei +Ei +Xj +Xr +WP +sp +YO +ZM +KY +Sq +YO +DF +WP +gu +wz +OE +hb +qs +dh +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(26,1,1) = {" +Yy +Yy +Yy +Yy +Yy +xp +ei +ub +oG +Ym +FD +vI +wa +FB +YO +YO +Cv +KY +Jq +YO +ST +Kb +am +wz +Gd +Db +zz +ys +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(27,1,1) = {" +Yy +Yy +Yy +Yy +Yy +DH +lL +lH +zE +aD +EK +im +sY +fg +YO +NN +yo +KY +ny +YO +Vs +sx +sx +wq +oh +zh +zh +zh +YL +vr +zh +Ib +Ep +AH +fu +fu +fu +fu +fu +fu +fu +gU +rL +Yy +Yy +"} +(28,1,1) = {" +Yy +Yy +Yy +Yy +Yy +vR +Kc +Ei +Ei +Ei +Ei +By +sl +aq +bU +hL +xV +Vm +iw +YO +OS +OS +OS +zM +Gm +OS +OS +OS +ZD +cq +OS +OS +EO +AH +fu +fu +fu +fu +fu +fu +fu +gU +sW +Yy +Yy +"} +(29,1,1) = {" +Yy +Yy +Vx +Yy +Yy +YF +Ee +fO +ID +ID +Ei +Ei +qA +yM +YO +Vj +zW +YD +YO +YO +Nr +Mk +OK +wQ +uz +wP +KC +hR +Ei +ah +bd +YM +Ei +cK +fu +fu +fu +fu +fu +fu +fu +lJ +Ei +GM +Yy +"} +(30,1,1) = {" +Yy +Vx +Vx +Vx +Vx +Vx +Yy +Yy +Yy +ID +ID +Ei +dS +YO +YO +YO +oD +YO +YO +qU +jV +Gj +mk +wQ +aJ +hb +PH +zl +Ei +Yy +Yy +Yy +uo +AH +fu +fu +fu +fu +fu +fu +fu +gU +uo +Yy +Yy +"} +(31,1,1) = {" +Yy +Yy +ID +Yy +Yy +Vx +Vx +Vx +Vx +Vx +Ei +Ei +bl +pT +YO +mj +ty +MS +YO +rj +ma +uN +MX +Pi +Xg +hb +Cp +lw +Rh +Yy +Yy +Ei +Ei +iY +No +No +No +No +No +No +No +AW +Ei +Ei +Yy +"} +(32,1,1) = {" +Yy +ID +ID +ID +ID +Vx +Yy +Yy +Yy +Yy +Rh +Fj +td +Fp +YO +XB +MT +bo +YO +Sr +Ra +uN +jb +xc +qb +uN +pS +pS +Rh +Yy +Yy +Ei +Ei +EH +hg +Nl +NH +ZV +JR +Nl +TC +rO +Ei +Ei +Yy +"} +(33,1,1) = {" +Yy +ID +ID +ID +ID +Vx +Yy +Yy +Yy +Yy +Rh +wX +tM +hv +YO +YO +SV +YO +YO +VN +pS +XZ +jT +So +Oh +uN +zC +zC +Rh +Yy +Yy +Yy +Ei +Ei +Gt +Hd +Hd +GB +Hd +Hd +oo +Ei +Ei +Yy +Yy +"} +(34,1,1) = {" +Yy +Yy +ID +ID +ID +ID +ID +Yy +Yy +Yy +Ei +YO +YO +YO +YO +KB +VX +zj +YO +Aj +RP +gy +gb +XD +eK +hb +Yj +sI +Rh +Yy +Yy +Yy +Yy +Ei +uo +uo +uo +Ei +uo +uo +uo +Ei +Yy +Yy +Yy +"} +(35,1,1) = {" +Yy +Yy +ID +ID +ID +ID +ID +Vx +Yy +Yy +Rh +vq +QN +Yv +se +Bu +TQ +Bu +NV +AV +cI +OQ +jV +uN +kW +RN +Og +xX +Rh +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(36,1,1) = {" +Yy +Yy +Yy +ID +ID +ID +Vx +Vx +Vx +Vx +Rh +vq +ap +Kd +YO +qo +eQ +Ck +YO +YO +tX +JV +Gp +Te +Se +hb +pS +nX +Ei +Yy +Yy +Vx +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(37,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +ID +Ei +Ei +jq +pE +YO +Jd +xy +Ny +YO +YO +YO +Ux +cE +eh +LH +VD +Nb +Ei +Ei +Vx +Vx +Vx +Vx +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(38,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +Ei +Ei +Ei +Ei +WL +WL +WL +Ei +ID +Ei +Ei +WL +WL +WL +uo +Ei +Ei +Vx +Yy +Yy +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(39,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +ID +ID +ID +ID +Yy +Yy +Yy +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Vx +Vx +Vx +Yy +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(40,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +ID +ID +Vx +Yy +Yy +Yy +Vx +Vx +Yy +Vx +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(41,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +Vx +Vx +Yy +Yy +Vx +Yy +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(42,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +Vx +Vx +ID +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(43,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Vx +ID +ID +ID +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(44,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +ID +ID +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(45,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} diff --git a/maps/templates/lazy_templates/twe_ert_station.dmm b/maps/templates/lazy_templates/twe_ert_station.dmm index 78c98b4d16a9..2c9c696d7842 100644 --- a/maps/templates/lazy_templates/twe_ert_station.dmm +++ b/maps/templates/lazy_templates/twe_ert_station.dmm @@ -309,9 +309,7 @@ "go" = ( /obj/structure/platform, /obj/structure/blocker/invisible_wall, -/turf/closed/shuttle/twe_dropship{ - icon_state = "0,0" - }, +/turf/closed/shuttle/twe_dropship, /area/adminlevel/ert_station/royal_marines_station) "gq" = ( /turf/open/floor/almayer{ @@ -1220,7 +1218,6 @@ /area/adminlevel/ert_station/royal_marines_station) "xw" = ( /obj/structure/machinery/door/airlock/almayer/medical{ - id_tag = null; name = "Operating Theatre 1" }, /turf/open/floor/almayer{ @@ -1705,6 +1702,9 @@ "Hg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, +/obj/structure/machinery/power/apc/antag{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "sterile_green" }, diff --git a/maps/templates/lazy_templates/weyland_ert_station.dmm b/maps/templates/lazy_templates/weyland_ert_station.dmm index 1937aa6a61a9..aa6b43ef8422 100644 --- a/maps/templates/lazy_templates/weyland_ert_station.dmm +++ b/maps/templates/lazy_templates/weyland_ert_station.dmm @@ -1506,6 +1506,9 @@ }, /area/adminlevel/ert_station/weyland_station) "sg" = ( +/obj/structure/machinery/power/apc/antag{ + dir = 4 + }, /turf/open/floor/corsat{ dir = 4; icon_state = "yellow" From 9b6f711d57dfc090b87670d6b18ebf81f78803bd Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 17 Mar 2024 02:04:08 +0000 Subject: [PATCH 28/28] Automatic changelog for PR #5887 [ci skip] --- html/changelogs/AutoChangeLog-pr-5887.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5887.yml diff --git a/html/changelogs/AutoChangeLog-pr-5887.yml b/html/changelogs/AutoChangeLog-pr-5887.yml new file mode 100644 index 000000000000..a64228e89274 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5887.yml @@ -0,0 +1,5 @@ +author: "Nanu308" +delete-after: True +changes: + - mapadd: "Added the Galaxy Pizza Space Diner ERT station, for all your outer expanse food needs!" + - maptweak: "Placed APC's on ert stations and minor tweaks+fixes." \ No newline at end of file