From bd0a431623f8f3c3c63ec4f09c142cad4436e56d Mon Sep 17 00:00:00 2001 From: AbsFree Date: Tue, 24 Dec 2024 11:42:45 +0100 Subject: [PATCH 01/27] started making the energy harvester --- .../code/modules/power/energy_harvester.dm | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 GainStation13/code/modules/power/energy_harvester.dm diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm new file mode 100644 index 0000000000..142c19d714 --- /dev/null +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -0,0 +1,41 @@ + +/obj/machinery/power/energy_harvester + desc = "A Device which upon connection to a node, will harvest the energy and send it to engineerless stations in return for credits, derived from a syndicate powersink model. The instructions say to never use more than 4 harvesters at a time." + name = "Energy Harvesting Module" + density = FALSE + use_power = NO_POWER_USE + anchored = FALSE + circuit = /obj/item/circuitboard/machine/energy_harvester + + var/maximum_net_drain_percentage = 0.05 + var/credit_conversion_rate = 0.00002 + +/obj/machinery/power/rad_collector/anchored + anchored = TRUE + +/obj/machinery/power/energy_harvester/Initialize(mapload) + . = ..() + RefreshParts() + if(anchored) + connect_to_network() + +/obj/machinery/power/emitter/RefreshParts() + var/drain_modifier = 0.0125 + var/credit_conversion_efficiency = 0.0000025 + var/capacitor_rating = 0 + var/manipulator_rating = 0 + + for(var/obj/item/stock_parts/capacitor/capacitor in component_parts) + capacitor_rating += capacitor.rating + maximum_net_drain_percentage = capacitor_rating * drain_modifier + + for(var/obj/item/stock_parts/manipulator/manipulator in component_parts) + manipulator_rating += manipulator.rating + credit_conversion_rate = credit_conversion_efficiency * manipulator_rating + +/obj/item/circuitboard/machine/energy_harvester + name = "Energy Harvester (Machine Board)" + build_path = /obj/machinery/adipoelectric_transformer + req_components = list( + /obj/item/stock_parts/capacitor = 4, + /obj/item/stock_parts/manipulator = 2) From fc0b3a2fae7d0cbe736b2f04607818c2fd7d92d1 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 20 Feb 2025 14:24:41 +0300 Subject: [PATCH 02/27] IPC tech research. IPC tech research. IPC eyes protection from weld flash --- .../research/designs/medical_designs.dm | 52 +++++++++++++++++++ .../research/techweb/nodes/robotics_nodes.dm | 8 +++ code/modules/surgery/organs/eyes.dm | 1 + 3 files changed, 61 insertions(+) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 5d28603055..9ec6ea5dfd 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -834,6 +834,58 @@ category = list("Misc", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL +/datum/design/ipc_heart // GS13 ADDITION + name = "I.P.C heart" + desc = "Allows for the construction of an I.P.C heart." + id = "ipc_heart" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/glass = 400, /datum/material/iron = 800, /datum/material/gold = 300) + build_path = /obj/item/organ/heart/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_liver // GS13 ADDITION + name = "I.P.C reagent processing liver" + desc = "Allows for the construction of an I.P.C reagent processing liver." + id = "ipc_liver" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/diamond = 400, /datum/material/iron = 800) + build_path = /obj/item/organ/liver/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_ears // GS13 ADDITION + name = "I.P.C auditory sensors" + desc = "Allows for the construction of an I.P.C auditory sensors." + id = "ipc_ears" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/gold = 400, /datum/material/iron = 800) + build_path = /obj/item/organ/ears/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_tongue // GS13 ADDITION + name = "I.P.C positronic voicebox" + desc = "Allows for the construction of an I.P.C positronic voicebox." + id = "ipc_tongue" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/gold = 400, /datum/material/iron = 800) + build_path = /obj/item/organ/tongue/robot/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_eyes // GS13 ADDITION + name = "I.P.C eyes" + desc = "Allows for the construction of an I.P.C eyes." + id = "ipc_eyes" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/glass = 500, /datum/material/iron = 800) + build_path = /obj/item/organ/eyes/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + + + ///////////////////// ///Surgery Designs/// ///////////////////// diff --git a/code/modules/research/techweb/nodes/robotics_nodes.dm b/code/modules/research/techweb/nodes/robotics_nodes.dm index 77748de74b..2c1328f768 100644 --- a/code/modules/research/techweb/nodes/robotics_nodes.dm +++ b/code/modules/research/techweb/nodes/robotics_nodes.dm @@ -79,3 +79,11 @@ "reset_module", "purge_module", "remove_module", "freeformcore_module", "asimov_module", "paladin_module", "tyrant_module", "corporate_module", "default_module", "borg_ai_control", "mecha_tracking_ai_control", "aiupload", "intellicard") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + +/datum/techweb_node/ipc_tech + id = "ipc_tech" + display_name = "I.P.C. parts" + description = "I.P.C. parts research." + prereq_ids = list("robotics", "posibrain") + design_ids = list("ipc_eyes", "ipc_stomach", "ipc_heart", "ipc_liver", "ipc_ears", "ipc_tongue", "ci-power-cord" ) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 4e5e2524d3..5796c688b4 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -429,6 +429,7 @@ name = "ipc eyes" icon_state = "cybernetic_eyeballs" organ_flags = ORGAN_SYNTHETIC // GS13 = Fixes IPC organs decaying, we hope. + flash_protect = 2 // GS13 EDIT Non-organic eyes should be protected from welding flash. /obj/item/organ/eyes/ipc/emp_act(severity) . = ..() From 85e1afd2d31e2e54c5458f9610a3aab43ad475f5 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Thu, 20 Feb 2025 14:16:23 +0100 Subject: [PATCH 03/27] added custom stuckage change --- GainStation13/code/machinery/doors/airlock_types.dm | 11 +++++++++++ .../code/modules/client/preferences/preferences.dm | 2 ++ code/modules/client/preferences.dm | 11 +++++++++++ code/modules/client/preferences_savefile.dm | 2 ++ 4 files changed, 26 insertions(+) diff --git a/GainStation13/code/machinery/doors/airlock_types.dm b/GainStation13/code/machinery/doors/airlock_types.dm index 7e2d83ab6c..91f2108c3c 100644 --- a/GainStation13/code/machinery/doors/airlock_types.dm +++ b/GainStation13/code/machinery/doors/airlock_types.dm @@ -7,6 +7,17 @@ if(isnull(stuckage_weight) || (stuckage_weight < 10)) return ..() // They aren't able to get stuck + var/chance_to_get_stuck = L?.client?.prefs?.stuckage_chance * 100 + if(chance_to_get_stuck && L.fatness > stuckage_weight) + if(prob(chance_to_get_stuck)) + L.doorstuck = 1 + L.visible_message("[L] gets stuck in the doorway!") + to_chat(L, "As you attempt to pass through \the [src], your ample curves get wedged in the narrow opening. You find yourself stuck in the [src] frame, struggling to free yourself from the tight squeeze.") + L.Stun(55, updating = TRUE, ignore_canstun = TRUE) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/door/airlock/, AsyncDoorstuckCall), L), 55) + return ..() + + if(L.fatness > (stuckage_weight * 2)) if(rand(1, 3) == 1) L.doorstuck = 1 diff --git a/GainStation13/code/modules/client/preferences/preferences.dm b/GainStation13/code/modules/client/preferences/preferences.dm index 4919d3703e..3ad11a65e4 100644 --- a/GainStation13/code/modules/client/preferences/preferences.dm +++ b/GainStation13/code/modules/client/preferences/preferences.dm @@ -27,6 +27,8 @@ var/weight_gain_permanent = FALSE /// At what weight will you start to get stuck in airlocks? var/stuckage = FALSE + // Percentage chance to get stuck in doors. Setting this to 0 will make the chance depend on the person's weight + var/stuckage_chance = 0 /// At what weight will you start to break chairs? var/chair_breakage = FALSE /// Are items that only affect those at high weights able to affect the player? diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0c86d86668..00af91d8b9 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -328,6 +328,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) wl_rate = 0.5 if(isnull(stuckage)) stuckage = 0 + if (stuckage_chance == null) + stuckage_chance = 0 if(isnull(max_weight)) max_weight = 0 if(isnull(chair_breakage)) @@ -1422,6 +1424,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat +="" dat += "

GS13 Gameplay Preferences

" dat += "Stuckage (at what weight will you get stuck in doors?):[stuckage == FALSE ? "Disabled" : stuckage]
" + if(stuckage) + dat += "Stuckage Chance : [stuckage_chance]
" dat += "Chair Breakage (at what weight will you break chairs?):[chair_breakage == FALSE ? "Disabled" : chair_breakage]
" dat += "

" dat += "This preference will allow items that work based on weight to work to you, usually to your detriment.
" @@ -3021,6 +3025,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/new_wl_rate = input(user, "Choose your weight loss rate from 0.1 (10%) to 2 (200%).\n Decimals such as 0.2 indicate 20% rate.\nDefault recommended rate is 0.5 (50%)", "Character Preference", wl_rate) as num|null if (new_wl_rate) wl_rate = max(min(round(text2num(new_wl_rate),0.01),2),0) + + if("stuckage_chance") + var/new_stuckage_chance = input(user, "Choose your chance to get stuck in doors from 0.1 (10%) to 1 (100%).\nDecimals such as 0.2 indicate 20% chance.\nSetting this to 0 restores default values.", "Character Preference", stuckage_chance) as num|null + if(new_stuckage_chance) + stuckage_chance = clamp(new_stuckage_chance, 0.1, 1) + else + stuckage_chance = 0 if("marking_down") // move the specified marking down diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 20278d34de..4bf91a6e0f 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -952,6 +952,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["helplessness_clothing_back"] >> helplessness_clothing_back S["helplessness_no_buckle"] >> helplessness_no_buckle S["stuckage"] >> stuckage + S["stuckage_chance"] >> stuckage_chance S["chair_breakage"] >> chair_breakage S["fatness_vulnerable"] >> fatness_vulnerable S["extreme_fatness_vulnerable"] >> extreme_fatness_vulnerable @@ -1247,6 +1248,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["helplessness_clothing_back"], helplessness_clothing_back) WRITE_FILE(S["helplessness_no_buckle"], helplessness_no_buckle) WRITE_FILE(S["stuckage"], stuckage) + WRITE_FILE(S["stuckage_chance"], stuckage_chance) WRITE_FILE(S["chair_breakage"], chair_breakage) WRITE_FILE(S["fatness_vulnerable"], fatness_vulnerable) WRITE_FILE(S["extreme_fatness_vulnerable"], extreme_fatness_vulnerable) From 3c2da809018dc2ccc18af9757bf6bb1004964b73 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Fri, 21 Feb 2025 09:22:52 +0100 Subject: [PATCH 04/27] added test functionalities --- .../code/modules/power/energy_harvester.dm | 44 +++++++++++++++++-- tgstation.dme | 1 + 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 142c19d714..f84d4abdda 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -1,3 +1,6 @@ +#define DRAIN_MODIFIER 0.0125 +#define CREDIT_CONVERSION_EFFICIENCY 0.0000025 + /obj/machinery/power/energy_harvester desc = "A Device which upon connection to a node, will harvest the energy and send it to engineerless stations in return for credits, derived from a syndicate powersink model. The instructions say to never use more than 4 harvesters at a time." @@ -5,13 +8,18 @@ density = FALSE use_power = NO_POWER_USE anchored = FALSE + icon = 'GainStation13/icons/obj/adipoelectric_transformer.dmi' + icon_state = "state_off" circuit = /obj/item/circuitboard/machine/energy_harvester var/maximum_net_drain_percentage = 0.05 + var/set_power_drain = 0.05 var/credit_conversion_rate = 0.00002 + var/power_avaliable = 0 + var/obj/structure/cable/attached -/obj/machinery/power/rad_collector/anchored - anchored = TRUE +// /obj/machinery/power/rad_collector/anchored +// anchored = TRUE /obj/machinery/power/energy_harvester/Initialize(mapload) . = ..() @@ -19,7 +27,7 @@ if(anchored) connect_to_network() -/obj/machinery/power/emitter/RefreshParts() +/obj/machinery/power/energy_harvester/RefreshParts() var/drain_modifier = 0.0125 var/credit_conversion_efficiency = 0.0000025 var/capacitor_rating = 0 @@ -33,9 +41,37 @@ manipulator_rating += manipulator.rating credit_conversion_rate = credit_conversion_efficiency * manipulator_rating +/obj/machinery/power/energy_harvester/process() + if(!is_operational()) + return + if(!attached) + src.visible_message("[src] buzzes. Seems like it's not attached to a working power net.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) + return PROCESS_KILL + + if(!powernet) + return + + power_avaliable = powernet.avail + if(power_avaliable <= 0) + return + + var/power_drain = power_avaliable * set_power_drain + powernet.add_load(power_drain) + +/obj/machinery/power/energy_harvester/default_unfasten_wrench(mob/user, obj/item/I, time = 20) + . = ..() + if(. == SUCCESSFUL_UNFASTEN) + if(anchored) + connect_to_network() + /obj/item/circuitboard/machine/energy_harvester name = "Energy Harvester (Machine Board)" - build_path = /obj/machinery/adipoelectric_transformer + build_path = /obj/machinery/power/energy_harvester req_components = list( /obj/item/stock_parts/capacitor = 4, /obj/item/stock_parts/manipulator = 2) + + +#undef DRAIN_MODIFIER +#undef CREDIT_CONVERSION_EFFICIENCY diff --git a/tgstation.dme b/tgstation.dme index 3478a43ce9..64f968cfc0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4087,6 +4087,7 @@ #include "GainStation13\code\obj\items\reskinable_floor_tile.dm" #include "GainStation13\code\obj\items\sensors\weight_infared.dm" #include "GainStation13\code\obj\structure\airlock.dm" +#include "GainStation13\code\modules\power\energy_harvester.dm" #include "GainStation13\code\obj\structure\calorite_doors.dm" #include "GainStation13\code\obj\structure\candylight.dm" #include "GainStation13\code\obj\structure\fountain.dm" From a82e41921d8af03cbd989070c8dca031742859a2 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Fri, 21 Feb 2025 10:39:11 +0100 Subject: [PATCH 05/27] it sucks power (I think?) and turns it into credits, beginning of maintenance functions --- .../code/modules/power/energy_harvester.dm | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index f84d4abdda..7677f46b55 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -7,19 +7,17 @@ name = "Energy Harvesting Module" density = FALSE use_power = NO_POWER_USE - anchored = FALSE + // anchored = FALSE icon = 'GainStation13/icons/obj/adipoelectric_transformer.dmi' icon_state = "state_off" circuit = /obj/item/circuitboard/machine/energy_harvester + var/maximum_net_drain_percentage = 0.05 var/set_power_drain = 0.05 var/credit_conversion_rate = 0.00002 var/power_avaliable = 0 - var/obj/structure/cable/attached - -// /obj/machinery/power/rad_collector/anchored -// anchored = TRUE + // var/obj/structure/cable/attached /obj/machinery/power/energy_harvester/Initialize(mapload) . = ..() @@ -28,36 +26,41 @@ connect_to_network() /obj/machinery/power/energy_harvester/RefreshParts() - var/drain_modifier = 0.0125 - var/credit_conversion_efficiency = 0.0000025 var/capacitor_rating = 0 var/manipulator_rating = 0 for(var/obj/item/stock_parts/capacitor/capacitor in component_parts) capacitor_rating += capacitor.rating - maximum_net_drain_percentage = capacitor_rating * drain_modifier + maximum_net_drain_percentage = capacitor_rating * DRAIN_MODIFIER for(var/obj/item/stock_parts/manipulator/manipulator in component_parts) manipulator_rating += manipulator.rating - credit_conversion_rate = credit_conversion_efficiency * manipulator_rating + credit_conversion_rate = manipulator_rating * CREDIT_CONVERSION_EFFICIENCY /obj/machinery/power/energy_harvester/process() if(!is_operational()) return - if(!attached) - src.visible_message("[src] buzzes. Seems like it's not attached to a working power net.") - playsound(src, 'sound/machines/buzz-two.ogg', 50) - return PROCESS_KILL - + if(!powernet) return - power_avaliable = powernet.avail + power_avaliable = avail() if(power_avaliable <= 0) return - + var/power_drain = power_avaliable * set_power_drain - powernet.add_load(power_drain) + add_load(power_drain) + var/credits_earned = credit_conversion_rate * power_drain + + var/datum/bank_account/engineering_budget = SSeconomy.get_dep_account(ACCOUNT_ENG) + if(engineering_budget) + engineering_budget.adjust_money(credits_earned / 2) + + var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR) + if(cargo_budget) + cargo_budget.adjust_money(credits_earned / 2) + + /obj/machinery/power/energy_harvester/default_unfasten_wrench(mob/user, obj/item/I, time = 20) . = ..() @@ -65,6 +68,12 @@ if(anchored) connect_to_network() +/obj/machinery/power/energy_harvester/screwdriver_act(mob/living/user, obj/item/I) + if(..()) + return TRUE + default_deconstruction_screwdriver(user, "state_open", "state_off", I) + return TRUE + /obj/item/circuitboard/machine/energy_harvester name = "Energy Harvester (Machine Board)" build_path = /obj/machinery/power/energy_harvester From 2f4f5a0b6a9b478c42b44f69f39a509de0cf3381 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Fri, 21 Feb 2025 18:03:44 +0100 Subject: [PATCH 06/27] functionality implemented, but the UI is suspiciously slow --- .../code/modules/power/energy_harvester.dm | 74 +++++++++++++++++-- tgstation.dme | 2 +- .../tgui/interfaces/EnergyHarvester.js | 57 ++++++++++++++ 3 files changed, 124 insertions(+), 9 deletions(-) create mode 100644 tgui/packages/tgui/interfaces/EnergyHarvester.js diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 7677f46b55..e8ae7bae70 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -15,15 +15,16 @@ var/maximum_net_drain_percentage = 0.05 var/set_power_drain = 0.05 - var/credit_conversion_rate = 0.00002 - var/power_avaliable = 0 - // var/obj/structure/cable/attached + var/credit_conversion_rate = 0.000005 + var/power_available = 0 + var/active = FALSE /obj/machinery/power/energy_harvester/Initialize(mapload) . = ..() RefreshParts() if(anchored) connect_to_network() + power_available = avail() /obj/machinery/power/energy_harvester/RefreshParts() var/capacitor_rating = 0 @@ -38,17 +39,20 @@ credit_conversion_rate = manipulator_rating * CREDIT_CONVERSION_EFFICIENCY /obj/machinery/power/energy_harvester/process() + if(!active) + return + if(!is_operational()) return if(!powernet) return - power_avaliable = avail() - if(power_avaliable <= 0) + power_available = avail() + if(power_available <= 0) return - var/power_drain = power_avaliable * set_power_drain + var/power_drain = power_available * set_power_drain add_load(power_drain) var/credits_earned = credit_conversion_rate * power_drain @@ -67,12 +71,66 @@ if(. == SUCCESSFUL_UNFASTEN) if(anchored) connect_to_network() + power_available = avail() + else + disconnect_from_network() + power_available = 0 /obj/machinery/power/energy_harvester/screwdriver_act(mob/living/user, obj/item/I) if(..()) return TRUE - default_deconstruction_screwdriver(user, "state_open", "state_off", I) - return TRUE + if(!active) + default_deconstruction_screwdriver(user, "state_open", "state_off", I) + return TRUE + return FALSE + +/obj/machinery/power/energy_harvester/wrench_act(mob/living/user, obj/item/I) + if(panel_open) + default_unfasten_wrench(user, I) + return TRUE + + return FALSE + +/obj/machinery/power/energy_harvester/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "EnergyHarvester", name) + ui.open() + +/obj/machinery/power/energy_harvester/ui_data(mob/user) + var/list/data = list() + data["active"] = active + + data["power_available"] = power_available + data["set_power_drain"] = set_power_drain * 100 + data["power_drain"] = power_available * set_power_drain * active + data["credit_conversion_rate"] = credit_conversion_rate + data["maximum_drain"] = maximum_net_drain_percentage * 100 + + return data + +/obj/machinery/power/energy_harvester/ui_act(action, params) + if(..()) + return + + switch(action) + if("power") + if(panel_open) + return + if(!anchored) + return + if(!powernet) + return + active = !active + if("drain_percentage") + var/target = params["target"] + // var/adjust = text2num(params["adjust"]) + if(text2num(target) != null) + target = text2num(target) + . = TRUE + if(.) + set_power_drain = clamp(target, 1, maximum_net_drain_percentage * 100) + set_power_drain /= 100 /obj/item/circuitboard/machine/energy_harvester name = "Energy Harvester (Machine Board)" diff --git a/tgstation.dme b/tgstation.dme index 52c6e69151..ae19121abb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4062,6 +4062,7 @@ #include "GainStation13\code\modules\mob\living\species.dm" #include "GainStation13\code\modules\mob\living\vore\eating\trasheat_lists.dm" #include "GainStation13\code\modules\mod\modules\modules_fat.dm" +#include "GainStation13\code\modules\power\energy_harvester.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\fatty_drinks.dm" @@ -4097,7 +4098,6 @@ #include "GainStation13\code\obj\items\reskinable_floor_tile.dm" #include "GainStation13\code\obj\items\sensors\weight_infared.dm" #include "GainStation13\code\obj\structure\airlock.dm" -#include "GainStation13\code\modules\power\energy_harvester.dm" #include "GainStation13\code\obj\structure\calorite_doors.dm" #include "GainStation13\code\obj\structure\candylight.dm" #include "GainStation13\code\obj\structure\fountain.dm" diff --git a/tgui/packages/tgui/interfaces/EnergyHarvester.js b/tgui/packages/tgui/interfaces/EnergyHarvester.js new file mode 100644 index 0000000000..4c990e48e7 --- /dev/null +++ b/tgui/packages/tgui/interfaces/EnergyHarvester.js @@ -0,0 +1,57 @@ +import { round, toFixed } from 'common/math'; +import { formatPower } from '../format'; +import { useBackend } from '../backend'; +import { AnimatedNumber, Button, LabeledList, Slider, Section } from '../components'; +import { Window } from '../layouts'; + +const POWER_MUL = 1e3; + +export const EnergyHarvester = (props, context) => { + const { act, data } = useBackend(context); + return( + + +
+ + + {formatPower(data.power_available)} + + + {formatPower(data.power_drain)} + + + round(value, 0)} + /> + + +
+
act('power')} + />) + } + > + + + act('drain_percentage', { + target: value, + })} + /> + + +
+ + + ); +}; \ No newline at end of file From 6b2b5b8f78329d986178a037f760d5717f20da9d Mon Sep 17 00:00:00 2001 From: AbsFree Date: Fri, 21 Feb 2025 18:15:42 +0100 Subject: [PATCH 07/27] fixed UI being slow --- GainStation13/code/modules/power/energy_harvester.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index e8ae7bae70..13140aac73 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -19,7 +19,7 @@ var/power_available = 0 var/active = FALSE -/obj/machinery/power/energy_harvester/Initialize(mapload) +/obj/machinery/power/energy_harvester/Initialize(mapload) // TODO: make sure we can only place 4 of those . = ..() RefreshParts() if(anchored) @@ -122,6 +122,7 @@ if(!powernet) return active = !active + . = TRUE if("drain_percentage") var/target = params["target"] // var/adjust = text2num(params["adjust"]) From caee10c015917531ce45918a4b0c10fa79e38caf Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 22 Feb 2025 11:21:52 +0100 Subject: [PATCH 08/27] can be ordered in cargo and limited to 4 per grid --- GainStation13/code/modules/cargo/packs.dm | 7 ++++ .../code/modules/power/energy_harvester.dm | 32 +++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/GainStation13/code/modules/cargo/packs.dm b/GainStation13/code/modules/cargo/packs.dm index b9e3bcd9fc..3836cb713a 100644 --- a/GainStation13/code/modules/cargo/packs.dm +++ b/GainStation13/code/modules/cargo/packs.dm @@ -4,3 +4,10 @@ cost = 10000 contains = list(/obj/item/vending_refill/mealdor) crate_name = "meal vendor supply crate" + +/datum/supply_pack/engineering/energy_harvester_board + name = "Energy Harvester Board" + desc = "Engineering made some crazy power device that seems to be creating massive amounts of energy out of thin air? With the parts found in this crate, you'll be able to make some sweet cash out of the engineers hard labor. Half of the credits made by this machine go to the engineering budget." + cost = 5000 + contains = list(/obj/item/circuitboard/machine/energy_harvester) + crate_name = "Energy Harvester Board supply crate" diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 13140aac73..54af763bb1 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -19,11 +19,16 @@ var/power_available = 0 var/active = FALSE -/obj/machinery/power/energy_harvester/Initialize(mapload) // TODO: make sure we can only place 4 of those +/obj/machinery/power/energy_harvester/Initialize(mapload) . = ..() RefreshParts() if(anchored) connect_to_network() + if(too_many_harvesters_in_network()) + src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) + disconnect_from_network() + return power_available = avail() /obj/machinery/power/energy_harvester/RefreshParts() @@ -46,10 +51,14 @@ return if(!powernet) + src.visible_message("[src] buzzes. Seems like it's not connected to a powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) return power_available = avail() if(power_available <= 0) + src.visible_message("[src] buzzes. Seems like there is no energy in the connected powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) return var/power_drain = power_available * set_power_drain @@ -71,6 +80,11 @@ if(. == SUCCESSFUL_UNFASTEN) if(anchored) connect_to_network() + if(too_many_harvesters_in_network()) + src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) + disconnect_from_network() + return power_available = avail() else disconnect_from_network() @@ -79,9 +93,11 @@ /obj/machinery/power/energy_harvester/screwdriver_act(mob/living/user, obj/item/I) if(..()) return TRUE + if(!active) default_deconstruction_screwdriver(user, "state_open", "state_off", I) return TRUE + return FALSE /obj/machinery/power/energy_harvester/wrench_act(mob/living/user, obj/item/I) @@ -91,6 +107,16 @@ return FALSE +/obj/machinery/power/energy_harvester/proc/too_many_harvesters_in_network() + var/counter = 0 + for(var/machine in powernet.nodes) + if(istype(machine, /obj/machinery/power/energy_harvester)) + counter += 1 + if(counter > 4) + return TRUE + + return FALSE + /obj/machinery/power/energy_harvester/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -119,7 +145,9 @@ return if(!anchored) return - if(!powernet) + if(!active && !powernet) + src.visible_message("[src] buzzes. Seems like it's not connected to a powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) return active = !active . = TRUE From 3d433aa7e57ef9114b8f8ebc1b26d74cdc7b3e32 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 22 Feb 2025 19:24:54 +0100 Subject: [PATCH 09/27] added icons (by AlManiak), lighting and sound, as well as made it dense --- .../code/modules/power/energy_harvester.dm | 23 ++++++++++++++---- GainStation13/icons/obj/energy_harvester.dmi | Bin 0 -> 1775 bytes 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 GainStation13/icons/obj/energy_harvester.dmi diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 54af763bb1..74ccf93a82 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -5,12 +5,12 @@ /obj/machinery/power/energy_harvester desc = "A Device which upon connection to a node, will harvest the energy and send it to engineerless stations in return for credits, derived from a syndicate powersink model. The instructions say to never use more than 4 harvesters at a time." name = "Energy Harvesting Module" - density = FALSE + density = TRUE use_power = NO_POWER_USE - // anchored = FALSE - icon = 'GainStation13/icons/obj/adipoelectric_transformer.dmi' - icon_state = "state_off" + icon = 'GainStation13/icons/obj/energy_harvester.dmi' // by AlManiak + icon_state = "off" circuit = /obj/item/circuitboard/machine/energy_harvester + var/datum/looping_sound/generator/soundloop var/maximum_net_drain_percentage = 0.05 @@ -21,6 +21,7 @@ /obj/machinery/power/energy_harvester/Initialize(mapload) . = ..() + soundloop = new(src, active) RefreshParts() if(anchored) connect_to_network() @@ -31,6 +32,10 @@ return power_available = avail() +/obj/machinery/power/energy_harvester/Destroy() + QDEL_NULL(soundloop) + return ..() + /obj/machinery/power/energy_harvester/RefreshParts() var/capacitor_rating = 0 var/manipulator_rating = 0 @@ -95,7 +100,7 @@ return TRUE if(!active) - default_deconstruction_screwdriver(user, "state_open", "state_off", I) + default_deconstruction_screwdriver(user, "open", "off", I) return TRUE return FALSE @@ -150,6 +155,14 @@ playsound(src, 'sound/machines/buzz-two.ogg', 50) return active = !active + if(active) + icon_state = "on" + set_light(1, 1, "#9999FF") + soundloop.start() + else + icon_state = "off" + set_light(0) + soundloop.stop() . = TRUE if("drain_percentage") var/target = params["target"] diff --git a/GainStation13/icons/obj/energy_harvester.dmi b/GainStation13/icons/obj/energy_harvester.dmi new file mode 100644 index 0000000000000000000000000000000000000000..07ca91a822ba918cd992ead064d27fa573a6016d GIT binary patch literal 1775 zcmVK@nE;o;$P(b0X}-2D9fis|Wt;^K_!>zSFE zhK7d0!NG1d4Kp({YRJf;p`nyU5>ZW4X=-XPFE8Y59M_6fdv$e`l$2gxUfG>=->;70 z&AvN3JAr|LadB}~R91w3hmeYttf#KZ$IOf?D{ew0ytOAXSr@D_GOT1W`|>twzA*m) z0842v6a;oPOCZ)68UJYj*3#LrcpG2K=Xc%fUd-uf&);9o<&L0KmY&4@$JV00001bW%=J06^y0W&i*He0o$^bVOxy zV{&P5bZKvH004NLQ&wG2rI&tr+nv+-w z64rr2E@cH*KNqlj0l=>@S%@gs)c^nl^+`lQRA_@;2X{XfQZK_D)YFyh&>KX#r3E4(`ApaVF+0|2C~(KHMo zF%@s!`^=R3w>$Sgmqbu;%iOVAU&s=48eiU*B~b8guhr`9$PzRf@)am}&+PTAT}guK z=fJkf#{+xsq0ApVY8sEKaGU%f-s?;K4bU{e{`TCCHU>Db9Erc{x=q8~Z&c$p=H{;Z zRfF4=u?{{$S9}C=ZX@39gMm1{0ftRuD6UZnZdzW+H z4!|W4*FeP|qdQ@TavNQ@b~Zj*Ar2s{ftq{3v|?`Cb~-+-fVc)_xaUPRDl}99QUXy8 z%J5zvIF5kh#ghPn8kFK)3jnY9ULzGi-)5)=`$cOk!3W-GG(t5h;N$sBDS1i|UE`SHow+1WSWqRq+i{Mjkm zIje_*5ZSpuM@A>$k$;Z&*2Bp`T%7xh%gZ^j%gcp-evvMsCTA0tSI?hcEyV$@>suSFhi^eH{w<@|Sl7 z{s51IF!cQ;TH>!)%cbv!A=#Pbi?=vKDCEWdHF*7<-B$8kClwe^gTqsdn>vA$NtxUN)p&&eGdVIP{N6k{@}eN!Oe=-_b~c^kd4#& ze;s|S*KCiZKiF)@$Ahlb=MFj^!DxKI^K~*}IZ~WAHaDg3A)lgvCkf(lQGb9Bj!n(z zdq|HiiJ#%??5M~;N9+?oeP1~t7#>=Ej0(*Q>_1Ux(;&w!xiN)?HyMDsaHP24E_hMi`P-@H%hwhx>;O#3Hc;{jH$rsc32Y&P`fSPOXS0P!i!@@$DC{V&w_ ztUnmw8l+Al{flzG#@P%+-{VGItpA;xhfc)#OAN;TH+|keeJv4vZ(B0`?-2b@c`gC= zce-MKvci#E|MUF;ccnn)?@9UxS^=59&+7m9UWKtgxa0Vm`OAtT*m%L}viLZJ;pc_AWKOlYnuNR-{d-?N!T~oau&^6Wj0WDMY z2fESa`d&M}O5f{R8GWy7N_}5b0-^rb4X@Dm+VK_d5426G?{)1zrSG@4e*h0F$2kD3 RZM^^h002ovPDHLkV1gveqnQ8z literal 0 HcmV?d00001 From 886a7c99bd92d6f1d4fa9c6d452a73d044a4367c Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 22 Feb 2025 20:01:13 +0100 Subject: [PATCH 10/27] moved the file to dedicated folder --- .../tgui/interfaces/{ => GainStation13}/EnergyHarvester.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tgui/packages/tgui/interfaces/{ => GainStation13}/EnergyHarvester.js (100%) diff --git a/tgui/packages/tgui/interfaces/EnergyHarvester.js b/tgui/packages/tgui/interfaces/GainStation13/EnergyHarvester.js similarity index 100% rename from tgui/packages/tgui/interfaces/EnergyHarvester.js rename to tgui/packages/tgui/interfaces/GainStation13/EnergyHarvester.js From ba6c637432ee035d2b04f35b83c78d77c627991a Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 22 Feb 2025 22:56:04 +0300 Subject: [PATCH 11/27] Moved some code to GS13 folder --- .../modules/research/designs/ipc_designs.dm | 53 +++++++++++++++++++ .../modules/research/techweb/robotic_nodes.dm | 11 ++++ .../research/designs/medical_designs.dm | 52 ------------------ .../research/techweb/nodes/robotics_nodes.dm | 8 --- code/modules/surgery/organs/eyes.dm | 1 + tgstation.dme | 2 + 6 files changed, 67 insertions(+), 60 deletions(-) create mode 100644 GainStation13/code/modules/research/designs/ipc_designs.dm create mode 100644 GainStation13/code/modules/research/techweb/robotic_nodes.dm diff --git a/GainStation13/code/modules/research/designs/ipc_designs.dm b/GainStation13/code/modules/research/designs/ipc_designs.dm new file mode 100644 index 0000000000..98a7fb2822 --- /dev/null +++ b/GainStation13/code/modules/research/designs/ipc_designs.dm @@ -0,0 +1,53 @@ +///////////////////////////// +/////Synth and IPC Organs//// +///////////////////////////// + +/datum/design/ipc_heart + name = "IPC heart" + desc = "Allows for the construction of an IPC heart." + id = "ipc_heart" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/glass = 400, /datum/material/iron = 800, /datum/material/gold = 300) + build_path = /obj/item/organ/heart/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_liver + name = "IPC reagent processing liver" + desc = "Allows for the construction of an IPC reagent processing liver." + id = "ipc_liver" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/plasma = 100, /datum/material/iron = 800, /datum/material/glass = 300, /datum/material/silver = 500, /datum/material/gold = 400) + build_path = /obj/item/organ/liver/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_ears + name = "IPC auditory sensors" + desc = "Allows for the construction of an IPC auditory sensors." + id = "ipc_ears" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/gold = 400, /datum/material/iron = 800) + build_path = /obj/item/organ/ears/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_tongue + name = "IPC positronic voicebox" + desc = "Allows for the construction of an IPC positronic voicebox." + id = "ipc_tongue" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/gold = 400, /datum/material/iron = 800) + build_path = /obj/item/organ/tongue/robot/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/ipc_eyes + name = "IPC eyes" + desc = "Allows for the construction of an IPC eyes." + id = "ipc_eyes" + build_type = PROTOLATHE | MECHFAB + materials = list(/datum/material/glass = 500, /datum/material/iron = 800, /datum/material/glass = 300,) + build_path = /obj/item/organ/eyes/ipc + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE diff --git a/GainStation13/code/modules/research/techweb/robotic_nodes.dm b/GainStation13/code/modules/research/techweb/robotic_nodes.dm new file mode 100644 index 0000000000..7687363899 --- /dev/null +++ b/GainStation13/code/modules/research/techweb/robotic_nodes.dm @@ -0,0 +1,11 @@ +////////////////////////////// +/////Any new robotic nodes//// +////////////////////////////// + +/datum/techweb_node/ipc_tech + id = "ipc_tech" + display_name = "IPC. parts" + description = "IPC. parts research." + prereq_ids = list("biotech") + design_ids = list("ipc_eyes", "ipc_stomach", "ipc_heart", "ipc_liver", "ipc_ears", "ipc_tongue", "ci-power-cord" ) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 9ec6ea5dfd..5d28603055 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -834,58 +834,6 @@ category = list("Misc", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL -/datum/design/ipc_heart // GS13 ADDITION - name = "I.P.C heart" - desc = "Allows for the construction of an I.P.C heart." - id = "ipc_heart" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/glass = 400, /datum/material/iron = 800, /datum/material/gold = 300) - build_path = /obj/item/organ/heart/ipc - category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - -/datum/design/ipc_liver // GS13 ADDITION - name = "I.P.C reagent processing liver" - desc = "Allows for the construction of an I.P.C reagent processing liver." - id = "ipc_liver" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/diamond = 400, /datum/material/iron = 800) - build_path = /obj/item/organ/liver/ipc - category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - -/datum/design/ipc_ears // GS13 ADDITION - name = "I.P.C auditory sensors" - desc = "Allows for the construction of an I.P.C auditory sensors." - id = "ipc_ears" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/gold = 400, /datum/material/iron = 800) - build_path = /obj/item/organ/ears/ipc - category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - -/datum/design/ipc_tongue // GS13 ADDITION - name = "I.P.C positronic voicebox" - desc = "Allows for the construction of an I.P.C positronic voicebox." - id = "ipc_tongue" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/gold = 400, /datum/material/iron = 800) - build_path = /obj/item/organ/tongue/robot/ipc - category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - -/datum/design/ipc_eyes // GS13 ADDITION - name = "I.P.C eyes" - desc = "Allows for the construction of an I.P.C eyes." - id = "ipc_eyes" - build_type = PROTOLATHE | MECHFAB - materials = list(/datum/material/glass = 500, /datum/material/iron = 800) - build_path = /obj/item/organ/eyes/ipc - category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - - - ///////////////////// ///Surgery Designs/// ///////////////////// diff --git a/code/modules/research/techweb/nodes/robotics_nodes.dm b/code/modules/research/techweb/nodes/robotics_nodes.dm index 2c1328f768..77748de74b 100644 --- a/code/modules/research/techweb/nodes/robotics_nodes.dm +++ b/code/modules/research/techweb/nodes/robotics_nodes.dm @@ -79,11 +79,3 @@ "reset_module", "purge_module", "remove_module", "freeformcore_module", "asimov_module", "paladin_module", "tyrant_module", "corporate_module", "default_module", "borg_ai_control", "mecha_tracking_ai_control", "aiupload", "intellicard") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - -/datum/techweb_node/ipc_tech - id = "ipc_tech" - display_name = "I.P.C. parts" - description = "I.P.C. parts research." - prereq_ids = list("robotics", "posibrain") - design_ids = list("ipc_eyes", "ipc_stomach", "ipc_heart", "ipc_liver", "ipc_ears", "ipc_tongue", "ci-power-cord" ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 5796c688b4..3cf62c69ee 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -240,6 +240,7 @@ /obj/item/organ/eyes/robotic/glow name = "High Luminosity Eyes" desc = "Special glowing eyes, used by snowflakes who want to be special." + flash_protect = 2 // GS13 EDIT Non-organic eyes should be protected from welding flash. left_eye_color = "000" right_eye_color = "000" actions_types = list(/datum/action/item_action/organ_action/use, /datum/action/item_action/organ_action/toggle) diff --git a/tgstation.dme b/tgstation.dme index 365f21daff..61a79dc2d5 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4127,6 +4127,8 @@ #include "GainStation13\icons\obj\vairous_weapons.dm" #include "GainStation13\icons\obj\structure\beds.dm" #include "GainStation13\icons\obj\structure\flora.dm" +#include "GainStation13\code\modules\research\techweb\robotic_nodes.dm" +#include "GainStation13\code\modules\research\designs\ipc_designs.dm" #include "hyperstation\code\datums\mood_events\events.dm" #include "hyperstation\code\game\objects\railings.dm" #include "hyperstation\code\game\objects\structures\bench.dm" From 0880681dd4352ec7410bfa6f01cb8423677aa73e Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 23 Feb 2025 14:07:07 +0100 Subject: [PATCH 12/27] start of changes --- _maps/map_files/MetaStation/MetaStation.dmm | 123 +++++++++++--------- 1 file changed, 65 insertions(+), 58 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 99bfc49a30..eb6d659353 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -19162,7 +19162,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 9 + dir = 10 }, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) @@ -39076,11 +39076,12 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "cGZ" = ( -/obj/machinery/atmospherics/components/trinary/mixer/airmix{ - dir = 4 +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/space, +/area/space/nearstation) "cHa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, @@ -41078,7 +41079,7 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) @@ -50438,7 +50439,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) @@ -51754,7 +51755,7 @@ /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "fhB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/closed/wall/r_wall, /area/engineering/atmos) "fhK" = ( @@ -52453,7 +52454,7 @@ /area/solars/port/aft) "fGc" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, /turf/closed/wall, @@ -52462,6 +52463,12 @@ /obj/structure/chair, /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) +"fGB" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "fGC" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -53809,11 +53816,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/components/trinary/mixer/on/layer3{ +/obj/machinery/atmospherics/components/trinary/mixer/airmix{ dir = 4; - node1_concentration = 0.79; - node2_concentration = 0.21; - target_pressure = 4500 + piping_layer = 3 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -54078,9 +54083,7 @@ name = "Atmospherics External Airlock"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plating, /area/engineering/atmos) "gBI" = ( @@ -54251,14 +54254,12 @@ /turf/open/floor/wood, /area/service/library) "gGH" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/engineering/atmos) +/turf/open/space, +/area/space/nearstation) "gGT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ dir = 8 @@ -54981,7 +54982,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/purple/visible/layer3{ dir = 4 }, @@ -56028,7 +56029,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, /turf/open/floor/plasteel/dark/corner{ @@ -61110,7 +61111,7 @@ /turf/open/floor/plasteel, /area/security/office) "ktI" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) @@ -62616,7 +62617,7 @@ /turf/open/floor/plasteel/grimy, /area/service/chapel/office) "ldb" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 9 }, /turf/closed/wall, @@ -63453,6 +63454,12 @@ }, /turf/open/floor/carpet, /area/maintenance/fore) +"lAB" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "lAF" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -64284,7 +64291,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, /turf/open/floor/plasteel/dark/corner{ @@ -65384,6 +65391,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/engineering/main) +"mDD" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix to Air" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "mDF" = ( /obj/structure/sign/map/left{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; @@ -68279,7 +68293,7 @@ /area/commons/cryopod) "okm" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 8 }, /turf/open/floor/plasteel, @@ -70084,9 +70098,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) "pjG" = ( @@ -71428,7 +71439,7 @@ /area/engineering/main) "pUB" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - piping_layer = 3 + dir = 3 }, /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -71876,11 +71887,10 @@ /turf/open/floor/carpet/black, /area/service/bar) "qha" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 6 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/engineering/atmos) "qhe" = ( /obj/effect/turf_decal/stripes/line{ @@ -74043,9 +74053,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 6 - }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; name = "Air to Pure" @@ -76539,8 +76546,8 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "sGo" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 }, /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/spawner/structure/window/reinforced, @@ -77089,7 +77096,7 @@ /turf/open/floor/plasteel/freezer, /area/service/kitchen) "sWZ" = ( -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "sXr" = ( @@ -77490,7 +77497,7 @@ /turf/open/floor/grass, /area/service/hydroponics/garden) "thi" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, @@ -78485,7 +78492,7 @@ /turf/open/floor/plasteel/white, /area/medical/patients_rooms/room_a) "tNF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -80040,7 +80047,7 @@ /turf/open/floor/engine, /area/hallway/secondary/entry) "uED" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -82797,7 +82804,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/green/visible/layer3{ dir = 4 }, @@ -84729,7 +84736,7 @@ /turf/open/floor/plasteel, /area/cargo/warehouse) "xbR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 10 }, /turf/closed/wall/r_wall, @@ -85194,7 +85201,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) @@ -86067,7 +86074,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer3, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "xMA" = ( @@ -129638,7 +129645,7 @@ mMn mMn mMn mMn -cGZ +mMn mMn tSa pUZ @@ -130908,11 +130915,11 @@ iYP iod qxd lYe -mtM +mDD vms vOz wAs -qha +uED kdB xaR htZ @@ -130929,7 +130936,7 @@ xaR mze rlJ vxg -cfy +gGH leN eBD rAS @@ -131184,9 +131191,9 @@ iyn dLm veq ugm -gGH -qxd -aaf +rSI +qha +cGZ dPI dPI dPI @@ -131442,7 +131449,7 @@ jfi wFu wFu pjr -qxd +fGB aaf aaf aaf @@ -131699,7 +131706,7 @@ fhB fhB fhB gBn -qxd +lAB aaf aaa aaa From 9c487d90e7b1b4239a5f6644b17e4800addbd3fa Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 23 Feb 2025 16:35:13 +0100 Subject: [PATCH 13/27] minor tweaks, interface should work properly now --- .../code/modules/power/energy_harvester.dm | 39 ++++++++++--------- .../{GainStation13 => }/EnergyHarvester.js | 0 2 files changed, 21 insertions(+), 18 deletions(-) rename tgui/packages/tgui/interfaces/{GainStation13 => }/EnergyHarvester.js (100%) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 74ccf93a82..24d53f0ea3 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -11,7 +11,7 @@ icon_state = "off" circuit = /obj/item/circuitboard/machine/energy_harvester var/datum/looping_sound/generator/soundloop - + var/maximum_net_drain_percentage = 0.05 var/set_power_drain = 0.05 @@ -24,15 +24,16 @@ soundloop = new(src, active) RefreshParts() if(anchored) - connect_to_network() - if(too_many_harvesters_in_network()) - src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") - playsound(src, 'sound/machines/buzz-two.ogg', 50) - disconnect_from_network() - return - power_available = avail() + if(connect_to_network()) + if(too_many_harvesters_in_network()) + src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) + disconnect_from_network() + return + power_available = avail() /obj/machinery/power/energy_harvester/Destroy() + disconnect_from_network() QDEL_NULL(soundloop) return ..() @@ -58,12 +59,14 @@ if(!powernet) src.visible_message("[src] buzzes. Seems like it's not connected to a powernet.") playsound(src, 'sound/machines/buzz-two.ogg', 50) + active = FALSE return power_available = avail() if(power_available <= 0) src.visible_message("[src] buzzes. Seems like there is no energy in the connected powernet.") playsound(src, 'sound/machines/buzz-two.ogg', 50) + active = FALSE return var/power_drain = power_available * set_power_drain @@ -77,20 +80,20 @@ var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR) if(cargo_budget) cargo_budget.adjust_money(credits_earned / 2) - + /obj/machinery/power/energy_harvester/default_unfasten_wrench(mob/user, obj/item/I, time = 20) . = ..() if(. == SUCCESSFUL_UNFASTEN) if(anchored) - connect_to_network() - if(too_many_harvesters_in_network()) - src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") - playsound(src, 'sound/machines/buzz-two.ogg', 50) - disconnect_from_network() - return - power_available = avail() + if(connect_to_network()) + if(too_many_harvesters_in_network()) + src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) + disconnect_from_network() + return + power_available = avail() else disconnect_from_network() power_available = 0 @@ -109,7 +112,7 @@ if(panel_open) default_unfasten_wrench(user, I) return TRUE - + return FALSE /obj/machinery/power/energy_harvester/proc/too_many_harvesters_in_network() @@ -143,7 +146,7 @@ /obj/machinery/power/energy_harvester/ui_act(action, params) if(..()) return - + switch(action) if("power") if(panel_open) diff --git a/tgui/packages/tgui/interfaces/GainStation13/EnergyHarvester.js b/tgui/packages/tgui/interfaces/EnergyHarvester.js similarity index 100% rename from tgui/packages/tgui/interfaces/GainStation13/EnergyHarvester.js rename to tgui/packages/tgui/interfaces/EnergyHarvester.js From 5a10708c31f876378c433b7cdc5fa16626934019 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 23 Feb 2025 17:11:10 +0100 Subject: [PATCH 14/27] makes sure it actually turns itself off --- GainStation13/code/modules/power/energy_harvester.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 24d53f0ea3..e451c4010d 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -60,6 +60,9 @@ src.visible_message("[src] buzzes. Seems like it's not connected to a powernet.") playsound(src, 'sound/machines/buzz-two.ogg', 50) active = FALSE + icon_state = "off" + set_light(0) + soundloop.stop() return power_available = avail() @@ -67,6 +70,9 @@ src.visible_message("[src] buzzes. Seems like there is no energy in the connected powernet.") playsound(src, 'sound/machines/buzz-two.ogg', 50) active = FALSE + icon_state = "off" + set_light(0) + soundloop.stop() return var/power_drain = power_available * set_power_drain @@ -157,19 +163,21 @@ src.visible_message("[src] buzzes. Seems like it's not connected to a powernet.") playsound(src, 'sound/machines/buzz-two.ogg', 50) return - active = !active + if(active) + active = FALSE icon_state = "on" set_light(1, 1, "#9999FF") soundloop.start() else + active = TRUE icon_state = "off" set_light(0) soundloop.stop() . = TRUE + if("drain_percentage") var/target = params["target"] - // var/adjust = text2num(params["adjust"]) if(text2num(target) != null) target = text2num(target) . = TRUE From e066495631372afe0014757bfe3c33ab7ba4b880 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 23 Feb 2025 17:57:57 +0100 Subject: [PATCH 15/27] now it works --- .../code/modules/power/energy_harvester.dm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index e451c4010d..63c90b962c 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -121,6 +121,13 @@ return FALSE +/obj/machinery/power/energy_harvester/crowbar_act(mob/living/user, obj/item/I) + if(panel_open) + default_deconstruction_crowbar(I) + return TRUE + + return FALSE + /obj/machinery/power/energy_harvester/proc/too_many_harvesters_in_network() var/counter = 0 for(var/machine in powernet.nodes) @@ -166,14 +173,14 @@ if(active) active = FALSE - icon_state = "on" - set_light(1, 1, "#9999FF") - soundloop.start() - else - active = TRUE icon_state = "off" set_light(0) soundloop.stop() + else + active = TRUE + icon_state = "on" + set_light(1, 1, "#9999FF") + soundloop.start() . = TRUE if("drain_percentage") From 75c84daaebd4ce124fafbdd9c763874d04433d79 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 23 Feb 2025 18:20:59 +0100 Subject: [PATCH 16/27] last of the minor tweaks. It's done --- GainStation13/code/modules/power/energy_harvester.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 63c90b962c..d6881328d6 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -177,6 +177,9 @@ set_light(0) soundloop.stop() else + power_available = avail() + if(power_available <= 0) + return active = TRUE icon_state = "on" set_light(1, 1, "#9999FF") @@ -195,6 +198,7 @@ /obj/item/circuitboard/machine/energy_harvester name = "Energy Harvester (Machine Board)" build_path = /obj/machinery/power/energy_harvester + needs_anchored = FALSE req_components = list( /obj/item/stock_parts/capacitor = 4, /obj/item/stock_parts/manipulator = 2) From a27000b34ed48c5a49f41d24bdf988bf4f293127 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 23 Feb 2025 19:34:17 +0100 Subject: [PATCH 17/27] don't you love how everytime you think it's done something else pops up? wanna bet I'll find another bug after this commit... --- .../code/modules/power/energy_harvester.dm | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index d6881328d6..4f1ebfbafe 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -25,11 +25,6 @@ RefreshParts() if(anchored) if(connect_to_network()) - if(too_many_harvesters_in_network()) - src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") - playsound(src, 'sound/machines/buzz-two.ogg', 50) - disconnect_from_network() - return power_available = avail() /obj/machinery/power/energy_harvester/Destroy() @@ -94,11 +89,6 @@ if(. == SUCCESSFUL_UNFASTEN) if(anchored) if(connect_to_network()) - if(too_many_harvesters_in_network()) - src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") - playsound(src, 'sound/machines/buzz-two.ogg', 50) - disconnect_from_network() - return power_available = avail() else disconnect_from_network() @@ -128,6 +118,20 @@ return FALSE +/obj/machinery/power/energy_harvester/connect_to_network() + . = ..() + + if(!.) + return FALSE + + if(too_many_harvesters_in_network()) + src.visible_message("[src] buzzes. Seems like there are too many energy harvesters connected to this powernet.") + playsound(src, 'sound/machines/buzz-two.ogg', 50) + disconnect_from_network() + return FALSE + + return TRUE + /obj/machinery/power/energy_harvester/proc/too_many_harvesters_in_network() var/counter = 0 for(var/machine in powernet.nodes) From baefe6c31364e320f048a1fae52d170dfd37bccc Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 23 Feb 2025 20:55:58 +0100 Subject: [PATCH 18/27] fixes gas overlays --- code/modules/atmospherics/gasmixtures/auxgm.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm index 9c6a533646..114b6b4b3d 100644 --- a/code/modules/atmospherics/gasmixtures/auxgm.dm +++ b/code/modules/atmospherics/gasmixtures/auxgm.dm @@ -186,6 +186,6 @@ GLOBAL_DATUM_INIT(gas_data, /datum/auxgm, new) appearance_flags = TILE_BOUND vis_flags = NONE -/obj/effect/overlay/gas/Initialize(mapload, state) +/obj/effect/overlay/gas/New(state) . = ..() - icon_state = state + icon_state = state \ No newline at end of file From 32187d3158b40f18f8e827219491feee8d397391 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 08:54:36 +0100 Subject: [PATCH 19/27] tweaks to piping in and around atmospherics --- _maps/map_files/MetaStation/MetaStation.dmm | 331 ++++++++++---------- 1 file changed, 158 insertions(+), 173 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index eb6d659353..8368a5da04 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -18016,8 +18016,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 }, /turf/open/floor/plasteel/dark/corner, @@ -19138,7 +19137,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, /turf/open/floor/plasteel/white/corner{ @@ -19152,7 +19151,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -19161,9 +19160,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/supply/visible{ + dir = 1 }, +/obj/machinery/meter, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) "bAS" = ( @@ -19440,7 +19440,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, /turf/open/floor/plasteel/white/corner{ @@ -19451,8 +19451,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer3{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 9 }, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) @@ -19890,7 +19890,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, /turf/open/floor/plasteel/white/corner{ @@ -19904,7 +19904,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -20449,7 +20449,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, /turf/open/floor/plasteel/white/corner{ @@ -20465,7 +20465,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -20477,10 +20477,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/meter, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) "bFY" = ( @@ -25273,6 +25271,7 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 6 }, +/obj/machinery/meter, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "ccU" = ( @@ -34643,6 +34642,9 @@ "cyt" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cyu" = ( @@ -38429,10 +38431,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, @@ -39025,10 +39024,7 @@ pixel_y = -24; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -39083,7 +39079,7 @@ /turf/open/space, /area/space/nearstation) "cHa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "cHc" = ( @@ -40742,6 +40738,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cJZ" = ( @@ -41033,14 +41032,13 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "cKD" = ( -/obj/machinery/atmospherics/components/binary/pump/on/layer3{ - dir = 8; - name = "Air to External Air Ports" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 5 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cKE" = ( @@ -42681,9 +42679,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cOC" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -44050,7 +44046,8 @@ /area/science/xenobiology) "cSZ" = ( /obj/machinery/atmospherics/components/binary/pump{ - dir = 8 + dir = 8; + name = "Distro to Waste" }, /obj/machinery/firealarm{ pixel_y = 26 @@ -46976,7 +46973,7 @@ /turf/open/space, /area/solars/starboard/aft) "dlF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, /turf/closed/wall/r_wall, @@ -47515,6 +47512,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "dtl" = ( @@ -47823,7 +47823,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "dwW" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -49246,10 +49246,7 @@ /obj/effect/turf_decal/loading_area{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -49939,7 +49936,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, +/obj/machinery/meter, /turf/open/floor/plasteel, /area/engineering/atmos) "elE" = ( @@ -50131,7 +50128,7 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "esR" = ( -/obj/machinery/atmospherics/components/binary/pump/on/layer3{ +/obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; name = "Mix to Waste" }, @@ -50247,7 +50244,8 @@ /area/cargo/storage) "exg" = ( /obj/machinery/atmospherics/components/binary/pump{ - dir = 1 + dir = 1; + name = "Pure to Mix" }, /turf/closed/wall/r_wall, /area/engineering/atmos) @@ -50430,7 +50428,7 @@ /turf/open/floor/wood, /area/command/heads_quarters/captain/private) "eBe" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 6 }, /turf/open/floor/plasteel, @@ -51824,10 +51822,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "flE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, /turf/closed/wall/r_wall, @@ -52303,11 +52301,11 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/on/layer3{ +/obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; name = "Air to Distro" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -52489,7 +52487,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "fHu" = ( @@ -52696,7 +52694,7 @@ /area/engineering/atmos) "fNh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 + dir = 6 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -52916,8 +52914,8 @@ /turf/open/floor/plasteel, /area/cargo/miningoffice) "fVg" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer3, -/obj/machinery/atmospherics/components/binary/pump/on/layer3{ +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; name = "Unfiltered & Air to Mix" }, @@ -53684,13 +53682,12 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/solars/port/fore) "grX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 3 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, /turf/open/floor/plasteel, /area/engineering/atmos) "gsp" = ( @@ -54544,9 +54541,6 @@ /area/commons/dorms) "gRu" = ( /obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, @@ -54983,7 +54977,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/purple/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -55253,11 +55247,9 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "hop" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 5 +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "External to Filter" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, /turf/open/floor/plasteel, /area/engineering/atmos) "hoq" = ( @@ -56097,9 +56089,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -56298,6 +56288,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -56828,7 +56821,7 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "hZk" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, /turf/closed/wall/r_wall, @@ -56981,6 +56974,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/engineering/atmos) "ieX" = ( @@ -57769,10 +57765,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -57865,7 +57858,7 @@ "iDK" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ dir = 1; - piping_layer = 3 + initialize_directions = 1 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -58760,7 +58753,7 @@ /area/command/gateway) "jdV" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/purple/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -59001,6 +58994,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 10 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "jji" = ( @@ -59472,12 +59468,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/ai_monitored/command/storage/eva) -"jxw" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/engineering/atmos) "jxD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral, @@ -59487,11 +59477,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -61325,9 +61312,10 @@ /turf/open/floor/plasteel/dark, /area/engineering/storage/tech) "kyJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{ - dir = 9 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "kyL" = ( @@ -61836,11 +61824,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, /area/engineering/atmos) -"kKa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, -/turf/open/floor/plasteel, -/area/engineering/atmos) "kKl" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -62655,9 +62638,8 @@ /turf/open/floor/plasteel, /area/commons/locker) "ldI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/components/binary/pump/on/layer1{ - name = "External to Filter" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ + dir = 8 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -63903,7 +63885,7 @@ /turf/open/floor/plasteel, /area/engineering/main) "lOJ" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -64124,11 +64106,8 @@ /obj/machinery/door/window/westleft{ req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 4 - }, /obj/structure/plasticflaps/opaque, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -64355,7 +64334,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 8 }, /obj/machinery/light{ @@ -65057,7 +65036,7 @@ /turf/open/floor/plasteel/dark, /area/engineering/break_room) "mtM" = ( -/obj/machinery/atmospherics/components/binary/pump/layer3{ +/obj/machinery/atmospherics/components/binary/pump{ dir = 1; name = "Pure to Mix" }, @@ -67137,8 +67116,10 @@ /turf/open/floor/plating, /area/maintenance/port) "nJr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/turf/closed/wall, /area/engineering/atmos) "nKi" = ( /obj/machinery/conveyor{ @@ -68746,7 +68727,7 @@ /area/solars/starboard/fore) "oyV" = ( /obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/pipe/simple/green/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 6 }, /turf/open/floor/plasteel, @@ -68776,6 +68757,12 @@ dir = 5 }, /area/hallway/secondary/service) +"ozs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "ozS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -69543,7 +69530,7 @@ /turf/closed/wall, /area/hallway/secondary/entry) "oVH" = ( -/obj/machinery/atmospherics/components/binary/pump/on/layer3{ +/obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste to Filter" }, /turf/open/floor/plasteel, @@ -70136,6 +70123,12 @@ }, /turf/open/floor/plasteel, /area/engineering/break_room) +"pkm" = ( +/mob/living/simple_animal/opossum/poppy{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "pko" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -70865,11 +70858,8 @@ /turf/open/floor/carpet/red, /area/commons/locker) "pCS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -71276,7 +71266,7 @@ /turf/open/floor/plasteel/white, /area/medical/treatment_center) "pPS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, /turf/open/floor/plasteel, @@ -71438,9 +71428,7 @@ }, /area/engineering/main) "pUB" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 3 - }, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -72225,7 +72213,7 @@ /turf/open/floor/plasteel/dark, /area/commons/fitness/recreation) "qoD" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -73321,7 +73309,7 @@ c_tag = "Atmospherics - Distro Loop"; pixel_y = 12 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer3, +/obj/machinery/atmospherics/pipe/manifold4w/supply/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -73711,7 +73699,7 @@ name = "Distribution Loop"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/layer_manifold{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -73936,9 +73924,9 @@ /turf/open/floor/engine, /area/engineering/main) "rid" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ - dir = 9 +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 5 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -74922,11 +74910,11 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/layer3{ +/obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Distro to Waste" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -75700,6 +75688,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "sfV" = ( @@ -77407,7 +77398,8 @@ /area/service/bar) "tfk" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - piping_layer = 3 + dir = 4; + initialize_directions = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -77733,9 +77725,6 @@ /area/ai_monitored/command/storage/eva) "toN" = ( /obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/engineering/glass{ dir = 4; name = "Power Monitoring"; @@ -78002,15 +77991,8 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) "tyC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/machinery/meter, /turf/open/floor/plasteel, /area/engineering/atmos) "tyM" = ( @@ -78163,14 +78145,14 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 + }, /turf/open/floor/plasteel/white/corner{ dir = 1 }, /area/engineering/atmos) "tFH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{ dir = 1 }, @@ -78178,6 +78160,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 10 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "tFJ" = ( @@ -78492,9 +78477,11 @@ /turf/open/floor/plasteel/white, /area/medical/patients_rooms/room_a) "tNF" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Air to External Air Ports" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "tNG" = ( @@ -81186,7 +81173,7 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "vms" = ( -/obj/machinery/atmospherics/pipe/manifold/purple/visible/layer3, +/obj/machinery/atmospherics/pipe/manifold/purple/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "vmE" = ( @@ -82110,7 +82097,7 @@ /area/engineering/atmos) "vOz" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/green/visible/layer3{ +/obj/machinery/atmospherics/pipe/manifold/green/visible{ dir = 1 }, /turf/open/floor/plasteel, @@ -82382,10 +82369,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible/layer3{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 10 }, /turf/open/floor/plasteel, @@ -82805,7 +82789,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, /obj/machinery/light, @@ -83552,7 +83536,7 @@ /turf/open/floor/plasteel/dark, /area/commons/fitness/recreation) "wAs" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 }, /turf/open/floor/plasteel, @@ -84028,10 +84012,10 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "wMJ" = ( -/obj/machinery/atmospherics/components/binary/pump/layer3{ +/obj/machinery/atmospherics/components/binary/pump{ name = "Air to Mix" }, -/obj/machinery/atmospherics/pipe/simple/purple/visible/layer3{ +/obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 }, /turf/open/floor/plasteel, @@ -85050,9 +85034,10 @@ /turf/open/floor/plasteel, /area/security/office) "xnt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ + dir = 4 }, +/obj/machinery/meter, /turf/open/floor/plasteel, /area/engineering/atmos) "xnG" = ( @@ -86127,7 +86112,7 @@ /turf/open/floor/plasteel, /area/engineering/break_room) "xNr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{ +/obj/machinery/atmospherics/pipe/manifold/supply{ dir = 1 }, /turf/closed/wall/r_wall, @@ -125535,7 +125520,7 @@ uHc wWN wWN pvA -apc +pkm bZE bZE bZE @@ -127318,9 +127303,9 @@ bve qxd pxy jje -woN -jAn -tyC +kyJ +rid +jxI mMn plN plN @@ -127577,7 +127562,7 @@ jJw usM woN cyt -tyC +jxI mMn gmD gmD @@ -128605,13 +128590,13 @@ oBX olw sKv izT -sKv +nJr uKL uKL sKv tFA hHh -jxw +cOC cOC jDD xGN @@ -128619,7 +128604,7 @@ xGN gxl wda bvN -bvN +tyC pZc rVI qHn @@ -128866,10 +128851,10 @@ grX hop ldI elC -kKa -rid -ooB cRg +mMn +mMn +mMn diP bvN bvN @@ -129378,10 +129363,10 @@ sKv fFR fNh tNF -mMn +cRg nwU lOv -bvN +tyC bvN bvN djh @@ -129887,10 +129872,10 @@ hWA gRu hZk maO -nJr +ooB oVH -xnt -kyJ +ldI +cRg uED vRu kJQ @@ -130658,7 +130643,7 @@ iYP dFX dlF fCZ -qVE +ozs qoD oyV mtM @@ -130921,7 +130906,7 @@ vOz wAs uED kdB -xaR +xnt htZ kEE mMn From 1a84862b8404d7182075b15e522ac2d65fd5db3e Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 13:29:45 +0100 Subject: [PATCH 20/27] fixed offsets and removed a redundant manifold --- .../StationRuins/Box/Engine/budget.dmm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm index 7363e7a81c..9a043a64c1 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/budget.dmm @@ -323,8 +323,8 @@ /turf/open/floor/plating, /area/engineering/main) "ur" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -472,8 +472,7 @@ /area/engineering/main) "Im" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - pixel_y = 5 + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/main) @@ -546,13 +545,6 @@ "Oj" = ( /turf/closed/wall/r_wall, /area/space/nearstation) -"Ow" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4; - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "Po" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -1043,7 +1035,7 @@ Un Im Un Un -Ow +mf Un Un to From 0c61b8aa2478e6696cfbd6aad7970a6f76754d9c Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 13:31:55 +0100 Subject: [PATCH 21/27] connected a scrubber pipe section --- .../StationRuins/Box/Engine/engine_am.dmm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm index f7fa98fcf7..ced7da0735 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm @@ -132,6 +132,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/engineering/main) +"lL" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/main) "lY" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -197,6 +201,13 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"vz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/main) "xx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -1275,9 +1286,9 @@ MJ MJ "} (26,1,1) = {" -fh -kh -mB +Pg +vz +lL ZY Tr rT From a9fab547d1330204e33ff5e7ca1a9c3b361945d1 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 13:37:13 +0100 Subject: [PATCH 22/27] fixed disconnected piping --- .../StationRuins/Box/Engine/engine_rbmk.dmm | 15 +++++---------- .../StationRuins/Box/Engine/engine_singulo.dmm | 17 ++++++++++++++--- .../StationRuins/Box/Engine/engine_tesla.dmm | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_rbmk.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_rbmk.dmm index 4c45f7e919..e9d01a507a 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_rbmk.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_rbmk.dmm @@ -336,6 +336,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/engineering/main) "kR" = ( @@ -1310,12 +1313,6 @@ }, /turf/closed/wall/r_wall, /area/engineering/main) -"Ve" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "Vi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/engine, @@ -1406,9 +1403,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/engine, /area/engineering/main) "YM" = ( @@ -1809,7 +1804,7 @@ yf "} (13,1,1) = {" uR -Ve +bQ uj gF JS diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm index 8c00a63bee..f0a4f5f990 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_singulo.dmm @@ -672,6 +672,10 @@ }, /turf/open/floor/engine, /area/engineering/main) +"MC" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/main) "MD" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line{ @@ -718,6 +722,13 @@ }, /turf/open/floor/engine, /area/engineering/main) +"OS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/main) "Pg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, @@ -1585,9 +1596,9 @@ MJ MJ "} (26,1,1) = {" -fh -kh -mB +Pg +OS +MC ZY kC mZ diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm index ed44d0a0ad..0e96fce19c 100644 --- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm +++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm @@ -197,6 +197,13 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"hk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/main) "ht" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -680,6 +687,10 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"KV" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/engineering/main) "Lr" = ( /obj/structure/table, /obj/item/clothing/gloves/color/yellow, @@ -1734,9 +1745,9 @@ MJ MJ "} (26,1,1) = {" -fh -kh -mB +Pg +hk +KV ZY Tr rT From cf7a5da6773c260d02a71457e9d98e838730a76e Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 13:38:47 +0100 Subject: [PATCH 23/27] fixed air supply and scrubber pipes being merged and wrongly placed, added a few layer manifolds for QoL --- _maps/map_files/BoxStation/BoxStation.dmm | 73 ++++++++++++----------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9cd5f293ff..a6966bf28a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -358,12 +358,12 @@ "agT" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "hos"},/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating,/area/command/heads_quarters/hos) "agU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/security/office) "agV" = (/obj/machinery/door/window/eastright{dir = 8; name = "Holding Cell"; req_access_txt = "2"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/button/flasher{id = "waitingflash"; pixel_x = 6; pixel_y = 24},/turf/open/floor/plasteel,/area/security/prison) -"agW" = (/obj/structure/disposalpipe/segment{dir = 6},/turf/open/floor/plasteel,/area/security/office) +"agW" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) "agX" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"},/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "1-8"},/obj/structure/cable,/turf/open/floor/plating,/area/security/execution/transfer) "agY" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "0-8"},/obj/machinery/power/apc{areastring = "/area/security/prison/cells"; damage_deflection = 21; desc = "A control terminal for the area's electrical systems. It's secured with a durable antitampering plasteel cage."; dir = 4; name = "Armored Prison Wing Cells APC"; pixel_x = 24},/turf/open/floor/plasteel,/area/security/prison/cells) "agZ" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel/white,/area/security/prison/upper) -"aha" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 8},/turf/open/floor/plasteel,/area/security/office) -"ahb" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 7},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office) +"aha" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) +"ahb" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 7},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/effect/turf_decal/loading_area{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office) "ahc" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Security Delivery"; req_access_txt = "1"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/security/office) "ahd" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; dir = 8; freq = 1400; location = "Security"},/obj/structure/plasticflaps/opaque,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/security/office) "ahe" = (/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plating/airless,/area/space/nearstation) @@ -387,12 +387,12 @@ "ahw" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/disposalpipe/segment{dir = 6},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plasteel,/area/security/office) "ahx" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "hos"},/obj/structure/cable{icon_state = "0-8"},/turf/open/floor/plating,/area/command/heads_quarters/hos) "ahy" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/button/door{id = "permacells2"; name = "Privacy Shutters"; pixel_x = 25},/turf/open/floor/plasteel/dark,/area/security/prison/cells) -"ahz" = (/obj/item/paper_bin/bundlenatural{pixel_x = 6; pixel_y = 4},/obj/item/paper_bin{pixel_x = -6; pixel_y = 4},/obj/item/pen/fountain,/obj/item/folder/red,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/pen,/obj/structure/table,/turf/open/floor/plasteel,/area/security/office) -"ahA" = (/obj/structure/disposalpipe/junction/yjunction{dir = 1},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) +"ahz" = (/obj/item/paper_bin/bundlenatural{pixel_x = 6; pixel_y = 4},/obj/item/paper_bin{pixel_x = -6; pixel_y = 4},/obj/item/pen/fountain,/obj/item/folder/red,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/pen,/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) +"ahA" = (/obj/structure/disposalpipe/junction/yjunction{dir = 1},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office) "ahB" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/airalarm{dir = 8; pixel_x = 24},/turf/open/floor/plasteel/dark,/area/security/range) -"ahC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) -"ahD" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 10},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) -"ahE" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) +"ahC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office) +"ahD" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 10},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office) +"ahE" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office) "ahF" = (/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/light{dir = 1},/obj/structure/cable{icon_state = "2-4"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/prison) "ahG" = (/obj/effect/spawner/lootdrop/prison_contraband,/obj/structure/closet/crate,/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/turf/open/floor/plating,/area/security/prison/upper) "ahH" = (/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/maintenance/fore/secondary) @@ -1580,7 +1580,7 @@ "aEJ" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/commons/dorms) "aEK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/closed/wall,/area/commons/toilet) "aEL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/carpet/red,/area/service/bar) -"aEM" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/freezer,/area/commons/toilet) +"aEM" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/open/floor/plasteel/freezer,/area/commons/toilet) "aEN" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/kirbyplants/random,/turf/open/floor/plasteel,/area/command/gateway) "aEP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/starboard/fore) "aEQ" = (/obj/machinery/door/airlock{name = "Service Hall"; req_one_access_txt = "25;26;35;28"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/hallway/secondary/service) @@ -3052,7 +3052,7 @@ "bhQ" = (/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plating/airless,/area/space/nearstation) "bhR" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/security/office) "bhS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office) -"bhT" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 8},/turf/open/floor/plasteel,/area/security/office) +"bhT" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 4; sortType = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) "bhU" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/atmospherics/components/binary/pump{dir = 4; layer = 2.4},/turf/open/floor/plating,/area/security/execution/transfer) "bhV" = (/obj/effect/landmark/start/security_officer,/obj/effect/turf_decal/tile/red{dir = 1},/obj/structure/chair{dir = 4},/turf/open/floor/plasteel,/area/security/office) "bhW" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/obj/machinery/camera{c_tag = "Prisoner Processing"; dir = 8},/obj/machinery/airalarm{dir = 8; pixel_x = 24},/turf/open/floor/plasteel,/area/security/processing) @@ -3065,19 +3065,19 @@ "bid" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel,/area/security/office) "bie" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) "bif" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) -"big" = (/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/open/floor/plasteel,/area/security/office) -"bih" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/book/manual/gato_spacelaw,/obj/item/book/manual/gato_spacelaw,/turf/open/floor/plasteel,/area/security/office) +"big" = (/obj/effect/landmark/start/security_officer,/obj/structure/chair{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/security/office) +"bih" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/book/manual/gato_spacelaw,/obj/item/book/manual/gato_spacelaw,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) "bii" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "Prison Gate"; name = "prison blast door"},/obj/structure/cable{icon_state = "0-2"},/obj/machinery/door/poddoor/shutters/preopen{id = "Prison Gate"; name = "Prison Lockdown Shutters"},/turf/open/floor/plating,/area/security/prison/upper) -"bij" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office) +"bij" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office) "bik" = (/obj/structure/closet/crate/bin,/obj/effect/spawner/lootdrop/prison_contraband,/obj/item/trash/sosjerky,/obj/item/trash/boritos,/obj/item/trash/can,/obj/effect/turf_decal/tile/green{dir = 8},/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/item/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; name = "Prison Intercom (General)"; pixel_x = -27; pixel_y = -27; prison_radio = 1},/turf/open/floor/plasteel,/area/security/prison/upper) "bil" = (/obj/structure/noticeboard{dir = 1; pixel_y = -27},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office) "bim" = (/obj/machinery/light_switch{pixel_y = -23},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office) "bin" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/office) -"bio" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) -"bip" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) -"biq" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office) +"bio" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/security/office) +"bip" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/office) +"biq" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plasteel,/area/security/office) "bir" = (/obj/effect/turf_decal/delivery,/obj/machinery/door/poddoor/shutters/window{id = "armory2"},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) -"bis" = (/obj/machinery/power/apc{areastring = "/area/security/office"; dir = 4; name = "Security Office APC"; pixel_x = 24},/obj/structure/cable{icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office) +"bis" = (/obj/machinery/power/apc{areastring = "/area/security/office"; dir = 4; name = "Security Office APC"; pixel_x = 24},/obj/structure/cable{icon_state = "0-8"},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office) "bit" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/security/prison/upper) "biu" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/security/prison/cells) "biv" = (/obj/structure/chair{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/cafeteria,/area/security/prison/upper) @@ -4133,10 +4133,10 @@ "bCZ" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/camera{c_tag = "Medbay West"; network = list("ss13","medbay")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/airalarm{pixel_y = 23},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDa" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDb" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel/white,/area/medical/medbay/central) -"bDc" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/medbay/central) +"bDc" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDd" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/medbay/central) -"bDe" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/white,/area/medical/medbay/central) -"bDf" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plasteel/white,/area/medical/medbay/central) +"bDe" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) +"bDf" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDg" = (/obj/structure/cable{icon_state = "1-8"},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDh" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bDi" = (/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) @@ -4351,7 +4351,7 @@ "bHl" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/white/corner{dir = 8},/area/medical/medbay/central) "bHm" = (/obj/structure/chair/comfy/brown,/turf/open/floor/carpet/blue,/area/medical/medbay/central) "bHn" = (/obj/structure/table/wood,/obj/item/flashlight/lamp/green{pixel_x = -4; pixel_y = 14},/obj/machinery/airalarm{pixel_y = 23},/obj/item/folder/white{pixel_x = 6; pixel_y = -1},/turf/open/floor/carpet/blue,/area/medical/medbay/central) -"bHo" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/open/floor/plasteel/white,/area/medical/surgery) +"bHo" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/surgery) "bHp" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/medbay/central) "bHq" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bHr" = (/obj/structure/sign/warning/nosmoking,/turf/closed/wall,/area/medical/medbay/central) @@ -4496,7 +4496,7 @@ "bKc" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/carpet/blue,/area/medical/medbay/central) "bKd" = (/obj/structure/chair/sofa/left{desc = "More inviting than the average couch."; dir = 8; name = "comfy couch"},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/carpet/blue,/area/medical/medbay/central) "bKe" = (/obj/machinery/airalarm{dir = 4; pixel_x = -22},/obj/machinery/shower{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) -"bKf" = (/obj/effect/landmark/start/medical_doctor,/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/surgery) +"bKf" = (/obj/effect/landmark/start/medical_doctor,/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel/white,/area/medical/surgery) "bKg" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/medical/medbay/central) "bKh" = (/obj/machinery/atmospherics/pipe/manifold4w/general/visible,/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central6"},/turf/open/floor/plasteel,/area/medical/medbay/central) "bKi" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 10},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/medical/medbay/central) @@ -4710,7 +4710,7 @@ "bOi" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/maintenance/aft) "bOj" = (/obj/machinery/vending/cigarette,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/hallway/primary/central) "bOk" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 8},/obj/structure/table,/obj/item/storage/backpack/duffelbag/med/surgery,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/medical/surgery) -"bOl" = (/obj/machinery/computer/operating,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white/side,/area/medical/surgery) +"bOl" = (/obj/machinery/computer/operating,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white/side,/area/medical/surgery) "bOm" = (/obj/item/stack/sheet/glass{amount = 20; pixel_x = -3; pixel_y = 6},/obj/item/stack/sheet/metal/fifty,/obj/structure/rack,/turf/open/floor/plating,/area/maintenance/department/medical/morgue) "bOn" = (/obj/structure/table,/obj/item/storage/backpack/duffelbag/med/surgery,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white/side,/area/medical/surgery) "bOo" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/computer/operating,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/medical/surgery) @@ -4777,10 +4777,10 @@ "bPx" = (/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plating,/area/maintenance/aft) "bPy" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/maintenance/aft) "bPz" = (/obj/structure/disposalpipe/segment,/obj/structure/curtain{pixel_y = -32},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white/side{dir = 4},/area/medical/surgery) -"bPA" = (/obj/structure/curtain{pixel_y = -32},/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white,/area/medical/surgery) +"bPA" = (/obj/structure/curtain{pixel_y = -32},/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel/white,/area/medical/surgery) "bPB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/medical/morgue) -"bPC" = (/obj/structure/curtain{pixel_y = -32},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white,/area/medical/surgery) -"bPD" = (/obj/structure/curtain{pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery) +"bPC" = (/obj/structure/curtain{pixel_y = -32},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/surgery) +"bPD" = (/obj/structure/curtain{pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/table/optable,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery) "bPE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/medical/surgery) "bPF" = (/obj/structure/table,/obj/structure/bedsheetbin{pixel_x = 2},/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bPG" = (/obj/effect/landmark/start/medical_doctor,/turf/open/floor/plasteel/white,/area/medical/medbay/central) @@ -4861,7 +4861,7 @@ "bRd" = (/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/plating,/area/maintenance/aft) "bRg" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/power/apc{areastring = "/area/medical/surgery"; dir = 8; name = "Treatment Center APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plasteel/white,/area/medical/surgery) "bRh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel/white,/area/medical/surgery) -"bRi" = (/obj/structure/table,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/suit/apron/surgical,/obj/item/clothing/suit/apron/surgical,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/surgery) +"bRi" = (/obj/structure/table,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/gloves/color/latex,/obj/item/clothing/suit/apron/surgical,/obj/item/clothing/suit/apron/surgical,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/surgery) "bRj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel/white,/area/medical/surgery) "bRk" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel/white,/area/medical/surgery) "bRl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/medical/surgery) @@ -4934,7 +4934,7 @@ "bSC" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/maintenance/aft) "bSD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white/side{dir = 4},/area/medical/surgery) "bSE" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/surgery) -"bSF" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery) +"bSF" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white/side{dir = 8},/area/medical/surgery) "bSG" = (/obj/effect/turf_decal/tile/blue{dir = 1},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bSH" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "bSI" = (/obj/machinery/vending/wallmed{pixel_x = 28},/obj/machinery/camera{c_tag = "Medbay Recovery Room"; dir = 8; network = list("ss13","medbay")},/turf/open/floor/plasteel/white,/area/medical/medbay/central) @@ -5949,7 +5949,7 @@ "cml" = (/obj/effect/turf_decal/bot,/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "Mix to Turbine"},/turf/open/floor/plasteel,/area/engineering/atmos) "cmm" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/floor/plasteel,/area/engineering/atmos) "cmn" = (/obj/machinery/computer/atmos_control/tank/toxin_tank{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 4},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/floor/plasteel,/area/engineering/atmos) -"cmo" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/floor/plating,/area/engineering/atmos) +"cmo" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "cmp" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/orange/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/space,/area/space/nearstation) "cmq" = (/obj/effect/spawner/structure/window/plasma/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 10},/turf/open/floor/plating/airless,/area/engineering/atmos) "cmr" = (/obj/machinery/air_sensor/atmos/toxin_tank,/turf/open/floor/engine/plasma,/area/engineering/atmos) @@ -6520,7 +6520,7 @@ "cxo" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/layer_manifold,/turf/open/floor/plating,/area/engineering/atmos) "cxp" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/open/floor/plating,/area/engineering/atmos) "cxq" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/engineering/atmos) -"cxr" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/closed/wall/r_wall,/area/engineering/atmos) +"cxr" = (/obj/machinery/atmospherics/pipe/layer_manifold,/turf/closed/wall/r_wall,/area/engineering/atmos) "cxs" = (/obj/structure/window/reinforced{dir = 1},/turf/open/space/basic,/area/space) "cxt" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/orange/visible,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/open/space,/area/space/nearstation) "cxu" = (/obj/machinery/door/window/northright{req_access_txt = "24"},/obj/machinery/door/window/southleft{req_access_txt = "24"},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/open/floor/plating,/area/engineering/atmos) @@ -7186,6 +7186,7 @@ "cTh" = (/obj/structure/table,/obj/item/reagent_containers/glass/bottle/morphine{pixel_x = -4; pixel_y = 1},/obj/item/reagent_containers/glass/bottle/chloralhydrate,/obj/item/reagent_containers/glass/bottle/toxin{pixel_x = 6; pixel_y = 8},/obj/item/reagent_containers/glass/bottle/morphine{pixel_x = 5; pixel_y = 1},/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/bottle/facid{name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6},/obj/item/reagent_containers/syringe{pixel_y = 5},/obj/item/reagent_containers/dropper,/obj/machinery/airalarm/directional/west,/obj/item/assembly/signaler{pixel_x = -3; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple{dir = 10},/turf/open/floor/plasteel/dark,/area/security/execution/transfer) "cXA" = (/obj/machinery/shower{dir = 8; pixel_y = -4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/security/prison/cells) "dcw" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/structure/fans/tiny,/obj/machinery/door/airlock/external{name = "Labor Camp Shuttle Airlock"; dir = 4},/turf/open/floor/plating,/area/security/processing) +"dcZ" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "ddd" = (/obj/machinery/camera{c_tag = "Prison Cafeteria"; dir = 8; network = list("ss13","prison")},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/security/prison/upper) "ddJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark/side{dir = 4},/area/security/prison/upper) "dgb" = (/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/cargo/storage) @@ -7563,6 +7564,7 @@ "pwP" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/vg_decals/department/sci{pixel_y = -32},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "pAd" = (/obj/effect/decal/cleanable/dirt,/obj/structure/grille,/turf/open/floor/plating,/area/maintenance/prison/starboard) "pDu" = (/obj/structure/table,/obj/item/flashlight/lamp,/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel/dark,/area/security/brig) +"pFb" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/medical/surgery) "pFC" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/grille/broken,/turf/open/space/basic,/area/space/nearstation) "pHs" = (/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/obj/structure/mirror{pixel_y = 28; pixel_x = -3},/obj/item/restraints/handcuffs/fake/kinky,/turf/open/floor/wood,/area/maintenance/port/fore) "pNo" = (/obj/machinery/computer/security,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/dark,/area/security/brig) @@ -7633,6 +7635,7 @@ "rWE" = (/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel/yellowsiding{dir = 4},/area/crew_quarters/fitness) "rZe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/item/radio/intercom{pixel_y = 20},/obj/machinery/firealarm{dir = 8; pixel_x = 24},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central7"},/turf/open/floor/plasteel,/area/security/processing) "sbO" = (/obj/structure/window/reinforced{dir = 1},/turf/open/floor/carpet,/area/cargo/miningdock) +"sdQ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/closed/wall,/area/medical/surgery) "sem" = (/obj/structure/railing{dir = 1},/obj/structure/chair/bench/left,/turf/open/indestructible/hotelwood,/area/security/courtroom) "sky" = (/obj/structure/table,/obj/item/stamp,/turf/open/floor/plating,/area/maintenance/port/fore) "skF" = (/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "1-2"},/obj/structure/sign/warning/securearea{pixel_x = -32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/delivery,/obj/machinery/door/poddoor/shutters/preopen{id = "Prison Gate"; name = "Prison Lockdown Shutters"},/turf/open/floor/plasteel/dark,/area/security/prison) @@ -7969,8 +7972,8 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbwubtobwvbuWbwwbwxbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybwzbwAbwBbwCbwDbvdbvdbvdbwEbvdbvdbwFbwGbwHbtPbwIbwJbtPbwKbwLbwMbswbwNbeVbwObwPbbfbtUbwQbwRbwRbwRbwRbwSbwTbwRaadaaaaAxaEnaHbaEobwUaEqaAxbaWbaWbaWbwVbwWbwXbwYbwZaZDbxaaZDbxbaIPbxcbfvbxdbxebxfbxgbxhbfvbxibunbvLbvQbxkbrtbxlberoaMbxmbxnberbxobxpbxqbxrbxsbxybxybxubxyxkXxkXxkXaDybxzbqIbxAbxBbxCbxDbxEbxFbxGbxHbxIbxJbxKbxLaRhbfLbrSbxMbxNbfSbxObxPbxQbxRbgRbxSbfSbxTbxUbxVbwtbxWbwtatJatJaaabhraaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbxXbtobtobtobdrbdrbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybxYbxZbyabybcpacpacpacpabybbybbybbycbsqbydbyebyfbygbyhbyibeVbyjbswbykbeVbqCbylbjXbtUbtUbwRbymbynbyobcxbypbwRaaaaaaaAxaFybyqbyrbysaFCaAxhmEdNEwPPcnlbpjlzeaZDbyuaZDbyvaZDbxbaIPbywbfvbyxbxebyybsHbyzbfvbqGamDbyAbyBbyCbrtbyDberbfDbxvbxtberbfBbyFbfBbyHbyIbyJbyJbyJbyJbyJbyJbyJbyJbyLbyMbfIbfIbfIbfIbfIbyNbyObtcbyPbxLbxLbyQbyRbyNbySbyTbyUbyVbyWbyXbyYbyZbzabzbbfSbzcbfSbzdbzebzebzebzebzebzebzfatJatJatJatJiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaatJaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaabzgbwybwybzhbxZbzibvdbzjdjRdjRbzjbvdbvdbvdbzkbsqbzlbzmbznbzobzpbeVbeVbzqaZJbeVbeVbzrbzsbztbzubzvbzwbzxbzybzzbzAbzBbwRbzCbwRaAxaAxbzDaHcbzEaAxaAxgpLwFFrDkbzFbzGbzHaZDbzIaZDbzJaZDbxbaIPbywbfvbzKbxebzLbzMbzNbfvbzObunbzPbyBbuubzQbqGbqGbzRbzSbzTbzUbzVbzWbzXbzYrFabAabAbbAcbAdbAebAfbAgbAhbuAbAibAjbAkbAlbAmbAnbAobApbAqbArbAsbAtbxLbAubAvbAwbAxaSxbyVbAybAzbAAbABbgRbACbADbAEbAFbAGjkMjkMjkMjkMbAHbAIbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabAKbALbAKbAMbANbAObAPbAQxtbxtbxtbbvdbARbvdbASbsqbATbAUbAVbAWbAXbAYbtPbBabBbbBcbBdbBebylbjXasFbBfbBgbBhbBibBjbzAbBkbwRbBlbBmaTBbBnbBovzbbBpbBqaTBaZDaZDbBrbBsbBtbBrbBrbBrbBrbBubBrbBvaLzbBwbfvbfvbBxbBybBzbfvbfvbrtbBAbBBbjnbBDbBCbBEbjnbBFbyEbrtbrtbrtbyEbrtbrsbzZbAabBGbBHbBIbBJbBKbBLbAhbBMbBNbBObBPbBPbBPbBQbBRbBSbBTbBUbBVbBWbBXbBYbBZbCabuJbCbbyVbyVbCcbCdbCebCcbyVbCfbCfbCfbCfbCfbCfbCfbCfbCfbCgbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabChbCibCjbCkbvdbzibvdbzjdjRbClbzjbvdbvdbCmbsqbsqbeVbCobCpbCqbCrbCrbswbCtbCubCvbCwbBebylbjXasJbCxbCybCzbCAbCAbCBbCCbCDbCEbCFaTBbCGbCHbCIbCJbCKaTBaadaadbBrbCLbCMbCNbCObCPbCQbCRbBrbnYaIPbCSbCTbCUbCVbCWbCXbCYbCZbDabDbbDcbDdbDdbDdbDdbDdbDebDfbDdbDdbDdbDgbusbDhbDibAabDjbDkbDlbDlbDmbDnbAhbuAbAibDobDpbDqbDrbDsbDtbDubtcbDvbtcbtcbtcbDwbyNbDxbDybDzbDAbDBbDCbDDbDEbDFbDGbDHbDIbDJbDKbDLbDKbDMbDNbDObDPbAJatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabAKbALbAKbAMbANbAObAPbAQxtbxtbxtbbvdbARbvdbASbsqbATbAUbAVbAWbAXbAYbtPbBabBbbBcbBdbBebylbjXasFbBfbBgbBhbBibBjbzAbBkbwRbBlbBmaTBbBnbBovzbbBpbBqaTBaZDaZDbBrbBsbBtbBrbBrbBrbBrbBubBrbBvaLzbBwbfvbfvbBxbBybBzbfvbfvbrtbBAbBBbjnbBDbBCbBEbjnbBFdcZbrtbrtbrtbyEbrtbrsbzZbAabBGbBHbBIbBJbBKbBLbAhbBMbBNbBObBPbBPbBPbBQbBRbBSbBTbBUbBVbBWbBXbBYbBZbCabuJbCbbyVbyVbCcbCdbCebCcbyVbCfbCfbCfbCfbCfbCfbCfbCfbCfbCgbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabChbCibCjbCkbvdbzibvdbzjdjRbClbzjbvdbvdbCmbsqbsqbeVbCobCpbCqbCrbCrbswbCtbCubCvbCwbBebylbjXasJbCxbCybCzbCAbCAbCBbCCbCDbCEbCFaTBbCGbCHbCIbCJbCKaTBaadaadbBrbCLbCMbCNbCObCPbCQbCRbBrbnYaIPbCSbCTbCUbCVbCWbCXbCYbCZbDabDbbDccmocmocmocmocmobDebDfbDdbDdbDdbDgbusbDhbDibAabDjbDkbDlbDlbDmbDnbAhbuAbAibDobDpbDqbDrbDsbDtbDubtcbDvbtcbtcbtcbDwbyNbDxbDybDzbDAbDBbDCbDDbDEbDFbDGbDHbDIbDJbDKbDLbDKbDMbDNbDObDPbAJatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabzgbwybwybDQbvdbzibvddgbdgbdgbdgbbvdbvdbDRbDSbDTbeVbDUbDVbDWbDXbDXbDXbDYbDZbCvbCwbBebylbjXbEabBfbwRbEbbEcbEdbEebEfbEgbEhbEiaTBbEjbCHbEkbElbEmaTBaaaaaabBrbEnbEobEpbEqbErbErbEsbEtbEubEvbEwbExbEybEzbEAbEBbEBbECbEDbEEbEFbEGbEHbEIbEJbEKbELbEMbHqbrtbENbEObEObEPbAabAabAabEQbERbESbBKbDnbAhbETbAibfLbyNbyNbyNbyNbyNbyNbyNbyNbyNbEUbEVbEUbyNbEWbEXbEYbEZbEZbEZbFabFbbFcbFdbFebFfbFgbFhbFibFhbFjbFkbFlbFmbFnbwtbFobFobwtaadiWgiWgiWgaadiWgiWgiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaabFpbChbCibCjbxYbFqbvebFrbwDbvdbFqbvdbvdbvdbDRbFsbFtbeVbFubFvbFwbswbswbswbFxbswbCvbCwbBebylbjXbFybFzbwRbFAbFBbFCbFDbypbwRbFEbFFaTBbFGbFHaMZbjWbFIaTBaaaaaabBrbFJbFKbFLbFMbFNbFObFPbBrbFQaIPbFRbqGbqGbFTbFUbFVbqGbqGbFWbfzbfzbFWbqGbFWbqGbFWbqGbFWbqGbfzbfzbEObFZbDlbGabGbbAabEQbGcbGdbGebGfbAhbGgbGhbGibGjbGkbEZbEZbGlbEZbEZbGmbGnbGobGpbGqbEZbGrbGsbGtbGubGubGubGvbGvbGvbGvbGwbGxbGybGzbGAbGzbGBbGCbCfriRbGEbGFbGGbGHbwtaadaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabGIbGJbGIbGKbGLbGKbGKbGKbGKbGKbGKbGMbvdbDRbFsbGNbeVbGObGPbGQbGRbswbGTbGSpYcbGUbBdbBebylaKebGVbBfbwRbGWbGXbGYbGZbHabwRaTBaTBaTBaTBbHbbHcbHdaTBaTBaTBaTBbBrbHebHfbHgbHhbFNbFObFPbBrbHiaIPaxxbqGbHjbHkbHlbHmbHnbqGvnpbrtbHpbLvbHrbHsbHtbHuhoZbHvbqGbrtbHwbEObHxbDlbHybHzbHAbHBbHCbHDbHDbHEbHFbHGbHHbHIbHJbHKbHLbHMbHLbHLbHNbHLbHLbHObHPbHLbHLbHQbHRbHSbHTbHUbHVbHWbHXbHYbHZbGwbIabGybGzbIbbGzbGBbIcbCfriRbAJbIdbIebIfbwtaaaaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG @@ -7979,11 +7982,11 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbKVbKWbKXaFcaFcaFcbKYbKZbKZaFcaFcbLabLbbLcbLdbLebLfbLgbLhbLibIobxbbLjaIPmMXthejqfaIPaIPbLkaIPbylaIPmMXthejqfaIPbLlbLmbLnaIPmMXthejqfaIPaIPaIPaLzaIPaIPmMXthejqfbJYbLobjXbqGbLpbLqbLrbLsbLtbqGbLubrtmIMbLvbqGbLwbLxbLybLxbLzbqGbrtbHwbEObEObEObEObEObAhbAhbAhbAhbAhbAhbLAwHdbLCbJbbLDbLEbLFbLGbLHbLIbJbbLJbLKbLLbLMbLNbJgbCabLObLPbLQbLRbLSbLSbLTbLUbLVbCfbLWbLXbLYbLZbLYbMabLWbCfriRbAJbMbbIebMcbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaFcaFcbMdaFcaFcbMebMfbMgbMhbMibMjbMkbMlbMmbMnbMobMpbMqbMrbMsbMtbIobMubMvbMwaKlbMwbMxbMwbMwbMybMwbMzbfQbMAbMBbfQbMCbMDbMEbMFbMGbMHbMIbMJbMJbMKbMJbMLbMMbMJbMNbMObMPbMQbfQbMRbqGbMSbMTbMUbqGbqGbqGbFWbMVbFWbqGbqGbqGbqGbqGbqGbqGbqGbrtbrtbMWbMXbMYbMZbNabNbbNcbNdbNebNfbNbbNgbNhbNibJbbKubNjbNkbNlbNmbNnbJbbNobNpbNqbNrbNsbJgbCabNtbNubGvbNvbNwbNxbNybNzbNAbCfbNBbNCbNDbNEbNDbNCbNFbCfbNGbNHbNIbIebIfbwtaaaaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeDWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaabhratJbhrbhratJbhratJbNJbhrbhrbhrbNJatJatJatJatJatJatJbMkaZybMgbNKbNLbNMbNNbNObNPbNQbNRbNSbNTbNUbNVaTRbIobNWbNXbNYbNZbIobOabObaITaITaITaITbOcbOcbOcbOcbOcbOcbOcbOcbOcbOcbOdaHpbOebOfbOfbOfbOfbOfbOgbOfbOfbOfbOfbOhbOibOhaIUaKfbOjbFYbOkbOlbFYbOnbOobOpbOqbrtbOrbyBbOsbOtbOubOvbOwbOxbyBbutbrtbrtbrtbrtbrtbBFbOybOzbOAbOzbOBbNbbOCwHdbODbODbODbODbODbODbODbODbODbOEbOEbOEbOEbOEbOEbOFbOGbOHbGvbGvbGvbGvbGvbGvbGvbCfbCfbCfbCfbCfbCfbCfbCfbCfriRbAJbOIbOJbwtbwtaadatJaaeaaeaaeaaeaaeaaeaaeaaeaaeaadaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbOLbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPabPabPabPabPbbPcbObaaaaaaaadaaabOcbPdbPebPfbPgbPhbPibPjbPkbOcbPlbPmbPnbOfbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybOhbOhbOhbOhbFYbPzbPAbFYbPCbPDbPEbPFbEBbPHbPIbEBbEBbEBbPJbrtbPKbPLbPMbPNbPNbPObPPbPQbPRbOybPSbPTbPUbPVbNbbOCwHdbODbPWbPWbPWbPXbPWbPWhLRbODbPYbPYbPZbPYbPYbOEbQabQbbQcbQdbQebQfbQgbQhbQibQjbQkbQlbQmbQnbQobQpbQqbQrbQrbQsbQtbQebQebwtaadaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbOLbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPabPabPabPabPbbPcbObaaaaaaaadaaabOcbPdbPebPfbPgbPhbPibPjbPkbOcbPlbPmbPnbOfbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybOhbOhbOhbOhbFYbPzbPApFbbPCbPDbPEbPFbEBbPHbPIbEBbEBbEBbPJbrtbPKbPLbPMbPNbPNbPObPPbPQbPRbOybPSbPTbPUbPVbNbbOCwHdbODbPWbPWbPWbPXbPWbPWhLRbODbPYbPYbPZbPYbPYbOEbQabQbbQcbQdbQebQfbQgbQhbQibQjbQkbQlbQmbQnbQobQpbQqbQrbQrbQsbQtbQebQebwtaadaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbQubQvbQwaFcaFcbKZbKZbKZbKZaFcaFcbQxbMmbQybQzbQAbQBbQCbQDaDObQEbQFbQGaadbQHbQIbQJbQKbQLbQMbQNbQMbQObQMbQMbQMbOcbQPbQQbQRbOfbQSbQTbQUbQVbQWbQXbQYbOfbOfbQZbRabRbbRcbRdcpHcyzbRgbRhbRibRjbRkbRlbRmbRnbRocqsbRqbzXbrtbrtbrtbRsbqGbqGbqGbqGbqGbRtbRubRvbOybRwbRxbOzbRybNbbOCwHdbODbPWbPWbPWbPWbPWbPWbPWbODbRzbRAbRBbRCbRDbREbRFbRGbQcbRHbRIbRJbRJbRJbRJbRJbRJbRKbRLbRMbQobwtbRNbRObRPbRPbRQbRRbRSbQeatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbRTbRUbRTaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabKZbKZbKZbKZbiRbRWbRXbRXbRXbRXbRYbRZbSabSbbScsbObSebIkbObbSfbObbObbSgbShaaabSibSjbSkbSlbQMbQMbSmbQMbSnbSobSpbQMbOcbQPbQQaTWbOfbSqbSrbSsbStbSubSvbSwbOfbLAbSxbSybSzbSAbSBbSCbRpbSDbSEbKfbHobSFbUnbSGbSHbSIbqGbSJbrtbrtbrtbrtbSKbqGtdxbuzbSNbSObrtbVQbSRbSSbSTbOzbSUbSVbSWbSXbSYbODbPWbPWbSZbPWbPWbPWbPWbODbTabTbbTbbTcbTdbTebTfbTgbQcbThbTibRJbRJbRJbTjbTkbTlbTlbTlbTlbTmbTnbTobTpbTqbTrbTsbTtbTubRIatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbRUbRTbTvbRTbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbTxbTybTzbIkbTAbTBbTBbTCbTDbTEbTFbTBbSbbSdbTHbSdbIkbTJbTKbTLbOblrDbShaadbSibTMbTNbTObTPbTQbTPbTPbTRbTSbTTbTTbTUbTVbTWbTXbOfbOfbOfbOfbOfbTYbTZbOfbOfbUabUbbUcbUdbUcbUebUdbFYbUgbUhbUibUjbUkbFYbUlbUmbUlbqGbUobUpbUqbUrbUsbUtbqGtrUbrtbrtbUvbrtbUwbUxbUybUzbUAbUBbUCbNbbOCbLBbODbODbUDbPWbPWbUEbUDbODbODbUFbUGbUHbUHbUIbOEbUJbUKbQcbULbRIbRJbRJbUMbUNbUObRJbUPbUQbURbUSbUTbUUbUVbUWbUXbUYbUZbVabRIatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaadaadbVbbRUbVcbVdbVebRUbVbaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatJaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVfbVgwkmhatbVibVjbVhbTBbVkbTBbTBbTBbTBbTBbVlbTGfEcbTIbIkbVnbTLbVobOblrDbShaaabSibVpbVqbVrbQMbQMbVsbQMbVtbVubVvbVwbOcbVxbVybVzbVAqTAqTAqTAqTAbVCbVDqTAqTAbVEbVFbVGbVHbVIbVJbVKbVLbVLbVLbVLbVLbVLbVLbExbExbExbVMbVMbVMbVMbVMbVMbVNbVObqGbqGaYQbqGbVPbVQbunbNbbNbbNbbNbbNbbNbbOCbLBbODbVRbVSbVTbVUbVVbVWbVXbVYbUFbUGbVZbUHbUIbOEbWabWbbQcbWcbQebWdbWebWfbWgbWhbWibRJbRJbWjbQobWkbWlbWmbQebWnbWobWobQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbWpbWqbWqbWqbWrbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatJaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVfbVgwkmhatbVibVjbVhbTBbVkbTBbTBbTBbTBbTBbVlbTGfEcbTIbIkbVnbTLbVobOblrDbShaaabSibVpbVqbVrbQMbQMbVsbQMbVtbVubVvbVwbOcbVxbVybVzbVAqTAqTAqTAqTAbVCbVDqTAqTAbVEbVFbVGbVHbVIbVJbVKbVLbVLbVLbVLsdQbVLbVLbExbExbExbVMbVMbVMbVMbVMbVMbVNbVObqGbqGaYQbqGbVPbVQbunbNbbNbbNbbNbbNbbNbbOCbLBbODbVRbVSbVTbVUbVVbVWbVXbVYbUFbUGbVZbUHbUIbOEbWabWbbQcbWcbQebWdbWebWfbWgbWhbWibRJbRJbWjbQobWkbWlbWmbQebWnbWobWobQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbWpbWqbWqbWqbWrbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbWsbWtbWubWvbWwbWxbWxbWxbWybWzbWAbWBlkPbWCbWDbVmbIkbObbObbObbOblrDbWFaadbWGbQIbWHbQKbWIbQMbWJbQMbQMbQMbWKbWLbWMbWNbWObWPbWQbWRbWRbWRbWRbWSbWRbWTbWUbWVbWWbWXbWYbWZbXabXbiDWbXdiDWiDWiDWiDWiDWiDWbXcbXcbXciDWiDWiDWiDWbXebXfbSLusxbWEbXibXjbPQbSQbXkbXleLcbXmbXnbXobWWbWXbXpbODbXqbXrbXsbXtbXubXvbXwbVYbVYbVYbVYbVYbVYbXxbXybXzbXAbXBbQebQobQobQobQobXCbQobXDbRJbRJbQobXEbXFbXGbQebXHbXIbXJbXKbXLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabXMbXNbXMbWqbXObWqbXPbXQbRTaadaadaadeDWaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbTwbTwbTwbIkbIkbTwbTwbTwbTwbIkbIkbTwbTwbTwbIkbIkbIkbXRbObaaabXSbXTbShaaaaaaaadaaabOcbXUbXVbXWbXXbQMbXYbQMbQMbOcbXZbYabYbbYcbYdbYebYfbYgbYhbYdbYdbYdbYdbYdbYibYjbYdbYdbYkbYdbYlbYdbYdbYdbYdbYdbOhbOhbOhbOhbOhbOhbOhbOhwHdbXffWDbUubYobYpbYqnSibYrbYsbYtbYubYubYvbYubYurpGbYxbODbYybYzbYAbYzbYzbYzbYBbYCbYDbYEbYFbYGbYHbYIbYJbUKbQcbYKaadbYLbYMbYNbYObYPbYObYQbYRbYSbQobYTbYUbYVbQebQebQebQebQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbYWbWqbWqbWqbYXbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadbYYaaaaaaaaaaaaaaaaaaaaFaadaoBaadaaFaadbXSbTLbXSaadbXSlrDbShaadbYZbZabZabZabZabZabZabZabZabZabZbbZcbZdbZebYabZfbZgbYdbYebYfbYgbYhbYdbYdbZhbZibZjbZkbZlbZmbZnbZobZpbZqbZrbZsbZtbZubYdaadaadaadaadaadaadaadbOhwHdbZvccdccdccdwfAbZwbZwbZxbZybZwbZwbZwbZwbZwbZwbZvbZzbZAbZBbZCbZDbZCbZEbZCbZFbZGbZHbZGbZGbZGbZGbZIbZJbZKbQcbYKaadbYLbZLbZMbZNbZObZPbZQbZRbZSbQobZTbYUbZUbXEbZVbZWbZXbZYaadatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbVbbRUbZZcaacabcacbVbaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG @@ -7997,7 +8000,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGby byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaachXchYchYchYchYchZciaciacibciccidciecifcigcihciibObcijbObbObbObbObbObcikbObbObbWFbXTcilcilcilcilcilcilcilcilcimcimcimcimcimbXRcinbObchnchocgsciocipciqcircisceucitciucivceuciwcixciycizciAciBciCciDbZuchBciEciFceCceDcbYciGfUccgGcaBaadcccciHbOhbOhbOhwHdbZvciIcaKcaKciJciKciLcaGchNcaGciMbZvwHdbODciNcgTcgTciOciPbYzciQcePciRciSbPWbPWbPWbVYciTciUciVcdHciWcdHcdHcdHciXciYciZcjacjbcjccjdcjecjfrWbbXEccDbXEaadaadatJatJbXEaPaaPaaPaaPaevKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaoBaadaoBaoBbXSbXSbXSbTLcjgcjhcjicjjcjkbObbTLbObcjlcjmcjlcjncjogOkcjpbWFbXTcilcjqcjrcjscjtcjucjvcjqcjwcjxcjycjzcimcimcinbObcjAchocgscjBcjCcjDcjDcjEcjFcjFcjFcjFbYdcjGcjHcjIcjIcjIcjJbZuchzcjKcjLcjMcjNcjOcjPcaBcaBcaBcaBcaBaadcccciHcjQcjRbLAwHdcaCcjScjTcjUcjVcjWcjXcjYchNcjYcjZbZvwHdbODckabPWbPWckbckcbYzcfUbYzcfVckdbPWckecfXbVYckfckgckhckickjckkcklcklckmcknckockpckqckrckscktcjfrWbbXEccDbXEbXEbXEaadaadaadaadaadaadatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaaeaaeaaeaaeckubTLckvbTLckwckxcjhckybTLckzbTLbObcjlckAcjlckBckCcjlckDbWFbXTcilcjqckEckFckGckHckIcjqckJckKckLggkckNcimcinbObchnchocgsbYdckObYdckPckQcjFckRckSckTbYdckUcfAckVcjIckWciDckXckYckZclacgDclbcjOclccbYcldcleclfcaBaadbOhciHbOhclgclhwHdbZvclicljclkcllclmcljclnchNclnclocckwHdbODbPWbPWbPWclpclqcePclrbYzcgRclscgTcgTcgUbODcltcluclvclwcltcltclxclyclzclAclBclCclDclEcjfclFcjfrWbbXEclGbXEclHbXEatJcsjaadaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaaaaoBaoBaoBaadaadbXSbXSbXSclIclJclKclLclMccHbObbObclNcjlclOclPcnRcnRclRclRbWFbXTcilclSclTclUckGclVclSclSckJclWclXclYclZcimcinbObchnchoaYncjFcmbcmccmccmdcjFcmfcmgcmhbYdbZucfAcmicmjckWcmkckXckYcmlcmmcgDcmncmocmpcmqcmrcmscmtcaBaadbOhciHbOhbUcbUcbLBbZvbZwcmucmvbZwcmwbZwbZwbZwbZwbZwbZvwHdbODbVYbVYbVYbVYchQcmxcfUcmychQbVYbVYbVYbVYbODcmzcmAcmzcmBcmzcltclxclycmCcmDcjfcmEcmFcmEcjfcmGcjfrWbbXEcmHcmIcblbZYatJaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaaaaoBaoBaoBaadaadbXSbXSbXSclIclJclKclLclMccHbObbObclNcjlclOclPcnRcnRclRclRbWFbXTcilclSclTclUckGclVclSclSckJclWclXclYclZcimcinbObchnchoaYncjFcmbcmccmccmdcjFcmfcmgcmhbYdbZucfAcmicmjckWcmkckXckYcmlcmmcgDcmncjOcmpcmqcmrcmscmtcaBaadbOhciHbOhbUcbUcbLBbZvbZwcmucmvbZwcmwbZwbZwbZwbZwbZwbZvwHdbODbVYbVYbVYbVYchQcmxcfUcmychQbVYbVYbVYbVYbODcmzcmAcmzcmBcmzcltclxclycmCcmDcjfcmEcmFcmEcjfcmGcjfrWbbXEcmHcmIcblbZYatJaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaadaadaadbXScmJcmKcmKcmLcjkbXRbObcmMcmNcjlcmOclPcnRcnRmUPpmpbShbXTcilclSclScmScmTcmUcmVcmWcmXcmYcmZcnacnbcimcinbObcnccndcnecjFcnfcngcnhcnicnjcnjcnjcnjcbOcbQcfAckVcjIckWcnpckXcmkcnqchBcnrcnsceCcntcnucnvbfoclecaBaadcccciHcnwbOhcnxbLBcnycgIcgIcnzbZwcnAcnBcnCbOhcnDcnEbOCwHdbODciNcgTcgTcnFciPbYzciQcePcnGcnHbPWbPWbPWbODcnIcmzcmzcmzcmzcltcnJcnJcnKcmDcjfcnLcnLcnLcnLcnLcjfrWbbXEcnMcbmcnNbZYatJaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaQaaQaaQaaQaaQaaQaaQaaQaaYaaQaaQaaQaaQaaQaaaaaabObbObbObbObbObbObcnObObbObbObbObcnPcnQcjlcmOclPcnRcnRcmOcmRbShbXTcilcnScnTcnUcnVcjqcmSapccnWaWYcnXcnYcnZcimcoacobcoccodcgscjFcoecnkcogcohcoicojcokcolbYdbZuconcjIcjIcjIcoobZucopcoqchBchCbZucdtcorcoscaBcaBcaBcaBaadccccotcoubOhcovcowcoxiDWcoycozbOhcoAcoBcoCbOhcoDbYubYwcoEbODckackebPWcoFckcbYzcfUbYzcfVcoGbPWbPWcfXbODcoHcmzcoIcoJcoKcoLcoMcoNcoOcmDcjfcnLcoPcoQcnLcnLcjfrWbbXEcoScoTccDbZYatJaaaatJaaaaaaaaahAVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaadaaaaadaaaacfaaaaadaaaaadaaaaaQaadaadbObcoUcoVbTLcoWbTLbTLbTLbTLbXRbObcoXcoYcoZkJiclPcnRcnRjXNjXNbShbXTcilcpccpdcmUcmUcmUcpecpfcpgcphcpicpjcpkcimbObbObcplcpmcpncjFcjFcpobnZcohcprcprcprcprbYdcnncnocptcpucpvcpwcpxcpycpzclacgDcpAcjOclccnucpBcpCcpCcaBaadcccbLAciHbOhbOhcpDbKtbOhcpEwKnbOhbOhcpGbOhbOhwKncpHbSXcpIbODbPWbPWbPWcpJcpKcePclrbYzcgRcpLcgTcgTcgUbODcmzcmzcpMcmzcmzcltcnJcnJcpNcpOcjfcnLcnLcpPcnLcnLcjfrWbbXEbXEbXEccDbXEaadaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG From 2330b25581468b872b7d4e61292f8925147fed08 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 13:43:41 +0100 Subject: [PATCH 24/27] added layer manifolds to gas tanks outputs. Also added Poppy to all the maps --- _maps/map_files/PubbyStation/PubbyStation.dmm | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 53399490ec..36da042a5b 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -42566,7 +42566,7 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "bKZ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -44227,7 +44227,7 @@ /area/engineering/atmos) "bPf" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, @@ -45485,7 +45485,7 @@ "bSi" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /turf/open/floor/plating, @@ -46422,7 +46422,7 @@ "bUz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/purple/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /turf/open/floor/plating, @@ -46699,7 +46699,7 @@ /area/engineering/atmos) "bVl" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -55578,6 +55578,10 @@ }, /turf/open/floor/plasteel, /area/cargo/qm) +"dEo" = ( +/mob/living/simple_animal/opossum/poppy, +/turf/open/floor/plating, +/area/maintenance/department/engine) "dGd" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/machinery/meter, @@ -58185,7 +58189,7 @@ /area/maintenance/department/security/brig) "iSL" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engineering/atmos) "iTE" = ( @@ -59349,6 +59353,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"lDN" = ( +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engineering/atmos) "lDW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/corner, @@ -90470,7 +90482,7 @@ bva bva bva tvP -bDi +dEo wRk bva bva @@ -101263,7 +101275,7 @@ myn bVX bWM bXv -bWc +iSL tmi bZL caB @@ -102291,7 +102303,7 @@ bVh bVY bWM bXy -bWc +iSL bZe bZL caE @@ -103319,7 +103331,7 @@ bVi bMe bWP bXy -bQO +lDN bZe bZN caH From 98ab756b2973e35b7f1ec6a5f42d3c22ed5f688a Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 13:55:50 +0100 Subject: [PATCH 25/27] added Poppy, removed some walls under windows, added tiny fans on some airlocks around engineering --- _maps/map_files/KiloStation/KiloStation.dmm | 31 +++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b2afab5c14..41b3a6f171 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -19418,7 +19418,7 @@ dir = 8 }, /obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "aHy" = ( /obj/structure/table, @@ -20287,7 +20287,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "aIP" = ( /obj/effect/turf_decal/delivery, @@ -20771,7 +20771,7 @@ "aJI" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "aJJ" = ( /obj/machinery/status_display/evac, @@ -50278,7 +50278,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "bGp" = ( /obj/effect/turf_decal/tile/red{ @@ -51349,7 +51349,7 @@ dir = 4 }, /obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "bIc" = ( /obj/effect/turf_decal/delivery, @@ -51367,7 +51367,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "bIf" = ( /obj/structure/table, @@ -59146,7 +59146,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "bUN" = ( /turf/open/floor/plating/airless, @@ -66230,6 +66230,7 @@ name = "Engineering External Airlock"; req_one_access_txt = "10;24" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/engineering/main) "cgI" = ( @@ -67948,6 +67949,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/engineering/atmos) "cjn" = ( @@ -72953,7 +72955,7 @@ /turf/open/floor/engine, /area/engineering/gravity_generator) "csK" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ dir = 1 }, /obj/machinery/light/small{ @@ -74844,7 +74846,8 @@ /area/maintenance/port/fore) "cwz" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 + dir = 1; + volume_rate = 200 }, /obj/machinery/light/small{ dir = 4 @@ -75325,6 +75328,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/maintenance/disposal) "cxq" = ( @@ -75483,7 +75487,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, +/turf/open/floor/plating, /area/engineering/atmos) "cxU" = ( /obj/structure/disposalpipe/segment{ @@ -83936,6 +83940,11 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, /area/hallway/secondary/entry) +"rUJ" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/opossum/poppy, +/turf/open/floor/plating, +/area/maintenance/aft) "rWp" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -114955,7 +114964,7 @@ bFc cbd bGJ cdr -bGG +rUJ ssF cgF chz From 31e33f813c96b9e695efd44207bb32d82909a9f0 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 14:15:55 +0100 Subject: [PATCH 26/27] removed random catwalks in space, added tiny fans to commonly used airlocks --- _maps/map_files/BoxStation/BoxStation.dmm | 30 ++++----- _maps/map_files/KiloStation/KiloStation.dmm | 34 +++++----- _maps/map_files/MetaStation/MetaStation.dmm | 5 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 62 ++++++++++++------- 4 files changed, 77 insertions(+), 54 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a6966bf28a..f843814441 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -502,7 +502,7 @@ "ajH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/flora/ausbushes/sparsegrass,/turf/open/floor/grass,/area/security/courtroom) "ajI" = (/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/security/courtroom) "ajJ" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/maintenance/solars/port/fore) -"ajK" = (/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/turf/open/floor/plating,/area/maintenance/solars/port/fore) +"ajK" = (/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/structure/fans/tiny,/turf/open/floor/plating,/area/maintenance/solars/port/fore) "ajL" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/structure/sign/warning/electricshock{pixel_y = 32},/turf/open/floor/plasteel,/area/hallway/primary/fore) "ajM" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/prison/cells) "ajN" = (/obj/machinery/light/small{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/item/radio/intercom{desc = "Talk through this. It looks like it has been modified to not broadcast."; name = "Prison Intercom (General)"; pixel_x = -27; pixel_y = -27; prison_radio = 1},/obj/machinery/flasher{id = "Cell 3"; pixel_x = -24; pixel_y = -36},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/obj/structure/bed,/obj/item/bedsheet/yellow,/turf/open/floor/plasteel,/area/security/brig) @@ -622,7 +622,7 @@ "alY" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/meter,/turf/open/floor/plating,/area/maintenance/fore/secondary) "alZ" = (/obj/structure/railing,/turf/open/indestructible/hotelwood,/area/security/courtroom) "ama" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/maintenance/solars/starboard/fore) -"amb" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/plating,/area/maintenance/solars/starboard/fore) +"amb" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/maintenance/solars/starboard/fore) "amc" = (/obj/structure/chair{dir = 1},/turf/open/floor/plating,/area/maintenance/starboard/fore) "amd" = (/obj/structure/chair/stool{pixel_y = 8},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/fore) "ame" = (/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/fore) @@ -3363,7 +3363,7 @@ "bnS" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/flora/ausbushes/ywflowers,/turf/open/floor/grass,/area/hallway/secondary/exit) "bnT" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 4},/obj/structure/chair{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/exit) "bnU" = (/obj/machinery/light{dir = 4},/turf/open/floor/grass,/area/hallway/secondary/exit) -"bnV" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Port Docking Bay 2"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) +"bnV" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Port Docking Bay 2"},/obj/effect/turf_decal/delivery,/obj/structure/fans/tiny,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) "bnW" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "bnX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/closed/wall,/area/crew_quarters/fitness/sauna) "bnY" = (/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) @@ -3565,8 +3565,8 @@ "brZ" = (/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit) "bsa" = (/obj/machinery/vending/cola/random,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit) "bsb" = (/obj/machinery/vending/cigarette,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit) -"bsc" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 4"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) -"bsd" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 3"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) +"bsc" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 4"},/obj/effect/turf_decal/delivery,/obj/structure/fans/tiny,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) +"bsd" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Port Docking Bay 3"},/obj/effect/turf_decal/delivery,/obj/structure/fans/tiny,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) "bse" = (/obj/machinery/conveyor{id = "garbage"},/turf/open/floor/plating,/area/maintenance/disposal) "bsf" = (/obj/structure/disposalpipe/trunk{dir = 2},/obj/machinery/disposal/deliveryChute{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; layer = 3},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating,/area/maintenance/disposal) "bsg" = (/obj/machinery/mineral/stacking_machine{input_dir = 1; stack_amt = 10},/turf/open/floor/plating,/area/maintenance/disposal) @@ -4088,7 +4088,7 @@ "bCe" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/door/firedoor/heavy,/obj/machinery/door/poddoor/shutters/preopen{id = "rnd2"; name = "research lab shutters"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/white,/area/science/lab) "bCf" = (/turf/closed/wall/r_wall,/area/science/circuit) "bCg" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/structure/sign/warning/securearea{pixel_x = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/starboard) -"bCh" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Supply Dock Airlock"; req_access_txt = "31"},/turf/open/floor/plating,/area/cargo/storage) +"bCh" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Supply Dock Airlock"; req_access_txt = "31"},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/cargo/storage) "bCi" = (/turf/open/floor/plating,/area/cargo/storage) "bCj" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/obj/machinery/door/airlock/external{dir = 4; name = "Supply Dock Airlock"; req_access_txt = "31"},/turf/open/floor/plating,/area/cargo/storage) "bCk" = (/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/plasteel,/area/cargo/storage) @@ -6485,7 +6485,7 @@ "cwF" = (/obj/structure/cable{icon_state = "0-8"},/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/port/aft) "cwG" = (/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/port/aft) "cwH" = (/obj/structure/cable{icon_state = "0-4"},/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/port/aft) -"cwI" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft) +"cwI" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{dir = 4; name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/fans/tiny,/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft) "cwJ" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft) "cwK" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/obj/machinery/door/airlock/external{dir = 4; name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft) "cwL" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/catwalk_floor,/area/maintenance/solars/port/aft) @@ -6495,7 +6495,7 @@ "cwP" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft) "cwQ" = (/obj/structure/cable{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft) "cwR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft) -"cwS" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 8; sortType = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/pet/cat,/turf/open/floor/catwalk_floor,/area/maintenance/port/aft) +"cwS" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 8; sortType = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/opossum/poppy{dir = 4},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft) "cwT" = (/obj/structure/cable{icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/catwalk_floor,/area/maintenance/port/aft) "cwU" = (/obj/machinery/shieldgen,/turf/open/floor/plating,/area/engineering/main) "cwV" = (/obj/machinery/vending/engineering,/turf/open/floor/plating,/area/engineering/main) @@ -6843,7 +6843,7 @@ "cDB" = (/obj/structure/table,/obj/item/weldingtool,/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard/aft) "cDC" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance,/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/plating,/area/maintenance/starboard/aft) "cDD" = (/obj/machinery/space_heater,/turf/open/floor/plating,/area/maintenance/starboard/aft) -"cDE" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/turf/open/floor/plating,/area/maintenance/solars/starboard/aft) +"cDE" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/structure/fans/tiny,/turf/open/floor/plating,/area/maintenance/solars/starboard/aft) "cDF" = (/obj/machinery/power/port_gen/pacman,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/plasteel,/area/engineering/main) "cDG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/engineering/main) "cDH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/engineering/main) @@ -7186,7 +7186,6 @@ "cTh" = (/obj/structure/table,/obj/item/reagent_containers/glass/bottle/morphine{pixel_x = -4; pixel_y = 1},/obj/item/reagent_containers/glass/bottle/chloralhydrate,/obj/item/reagent_containers/glass/bottle/toxin{pixel_x = 6; pixel_y = 8},/obj/item/reagent_containers/glass/bottle/morphine{pixel_x = 5; pixel_y = 1},/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/bottle/facid{name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6},/obj/item/reagent_containers/syringe{pixel_y = 5},/obj/item/reagent_containers/dropper,/obj/machinery/airalarm/directional/west,/obj/item/assembly/signaler{pixel_x = -3; pixel_y = 2},/obj/machinery/atmospherics/pipe/simple{dir = 10},/turf/open/floor/plasteel/dark,/area/security/execution/transfer) "cXA" = (/obj/machinery/shower{dir = 8; pixel_y = -4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/security/prison/cells) "dcw" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/structure/fans/tiny,/obj/machinery/door/airlock/external{name = "Labor Camp Shuttle Airlock"; dir = 4},/turf/open/floor/plating,/area/security/processing) -"dcZ" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "ddd" = (/obj/machinery/camera{c_tag = "Prison Cafeteria"; dir = 8; network = list("ss13","prison")},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/security/prison/upper) "ddJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark/side{dir = 4},/area/security/prison/upper) "dgb" = (/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/cargo/storage) @@ -7238,6 +7237,7 @@ "eZw" = (/turf/open/floor/plasteel/freezer,/area/crew_quarters/fitness/sauna) "faO" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate/secure/weapon{desc = "A secure clothing crate."; name = "formal uniform crate"; req_access = "3"},/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/officer/formal,/obj/item/clothing/under/rank/security/warden/formal,/obj/item/clothing/under/rank/security/head_of_security/formal,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/navyblue,/obj/item/clothing/suit/armor/vest/warden/navyblue,/obj/item/clothing/suit/armor/hos/navyblue,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navyofficer,/obj/item/clothing/head/beret/sec/navywarden,/obj/item/clothing/head/beret/sec/navyhos,/turf/open/floor/plasteel/dark,/area/security/office) "ffH" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/toilet{dir = 4},/obj/structure/window/reinforced/tinted{dir = 1},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel/dark,/area/security/prison/cells) +"fho" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "fls" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/grass,/area/security/courtroom) "fmC" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/button/door{id = "permacells4"; name = "Privacy Shutters"; pixel_y = 25},/turf/open/floor/plasteel/dark,/area/security/prison/cells) "fmH" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) @@ -7564,7 +7564,6 @@ "pwP" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/vg_decals/department/sci{pixel_y = -32},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "pAd" = (/obj/effect/decal/cleanable/dirt,/obj/structure/grille,/turf/open/floor/plating,/area/maintenance/prison/starboard) "pDu" = (/obj/structure/table,/obj/item/flashlight/lamp,/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel/dark,/area/security/brig) -"pFb" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/medical/surgery) "pFC" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/grille/broken,/turf/open/space/basic,/area/space/nearstation) "pHs" = (/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/obj/structure/mirror{pixel_y = 28; pixel_x = -3},/obj/item/restraints/handcuffs/fake/kinky,/turf/open/floor/wood,/area/maintenance/port/fore) "pNo" = (/obj/machinery/computer/security,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/dark,/area/security/brig) @@ -7635,7 +7634,6 @@ "rWE" = (/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel/yellowsiding{dir = 4},/area/crew_quarters/fitness) "rZe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/item/radio/intercom{pixel_y = 20},/obj/machinery/firealarm{dir = 8; pixel_x = 24},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central7"},/turf/open/floor/plasteel,/area/security/processing) "sbO" = (/obj/structure/window/reinforced{dir = 1},/turf/open/floor/carpet,/area/cargo/miningdock) -"sdQ" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/closed/wall,/area/medical/surgery) "sem" = (/obj/structure/railing{dir = 1},/obj/structure/chair/bench/left,/turf/open/indestructible/hotelwood,/area/security/courtroom) "sky" = (/obj/structure/table,/obj/item/stamp,/turf/open/floor/plating,/area/maintenance/port/fore) "skF" = (/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "1-2"},/obj/structure/sign/warning/securearea{pixel_x = -32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/delivery,/obj/machinery/door/poddoor/shutters/preopen{id = "Prison Gate"; name = "Prison Lockdown Shutters"},/turf/open/floor/plasteel/dark,/area/security/prison) @@ -7678,6 +7676,7 @@ "tmt" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/medical/paramedic) "tnQ" = (/obj/machinery/microwave,/obj/structure/table,/turf/open/floor/plasteel/cafeteria,/area/maintenance/port/fore) "toG" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plating,/area/security/prison/upper) +"tqG" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/closed/wall,/area/medical/surgery) "trI" = (/obj/structure/table/reinforced,/obj/structure/reagent_dispensers/servingdish,/turf/open/floor/plasteel,/area/security/prison/upper) "trU" = (/obj/structure/bed,/obj/item/bedsheet/medical,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "tsD" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-4"},/obj/machinery/light{dir = 8; light_color = "#e8eaff"},/turf/open/floor/plasteel,/area/security/prison/cells) @@ -7794,6 +7793,7 @@ "xdc" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/sign/warning/vacuum/external{pixel_y = 32},/turf/open/floor/plating,/area/security/processing) "xen" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/freezer,/area/crew_quarters/fitness/sauna) "xeR" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plasteel,/area/maintenance/fore/secondary) +"xgh" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/medical/surgery) "xgz" = (/obj/structure/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/security/processing) "xiB" = (/obj/effect/landmark/start/warden,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "xkX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/catwalk_floor,/area/maintenance/department/medical/morgue) @@ -7972,7 +7972,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbwubtobwvbuWbwwbwxbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybwzbwAbwBbwCbwDbvdbvdbvdbwEbvdbvdbwFbwGbwHbtPbwIbwJbtPbwKbwLbwMbswbwNbeVbwObwPbbfbtUbwQbwRbwRbwRbwRbwSbwTbwRaadaaaaAxaEnaHbaEobwUaEqaAxbaWbaWbaWbwVbwWbwXbwYbwZaZDbxaaZDbxbaIPbxcbfvbxdbxebxfbxgbxhbfvbxibunbvLbvQbxkbrtbxlberoaMbxmbxnberbxobxpbxqbxrbxsbxybxybxubxyxkXxkXxkXaDybxzbqIbxAbxBbxCbxDbxEbxFbxGbxHbxIbxJbxKbxLaRhbfLbrSbxMbxNbfSbxObxPbxQbxRbgRbxSbfSbxTbxUbxVbwtbxWbwtatJatJaaabhraaaaaaatJaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJbdrbxXbtobtobtobdrbdrbdraaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaabwybxYbxZbyabybcpacpacpacpabybbybbybbycbsqbydbyebyfbygbyhbyibeVbyjbswbykbeVbqCbylbjXbtUbtUbwRbymbynbyobcxbypbwRaaaaaaaAxaFybyqbyrbysaFCaAxhmEdNEwPPcnlbpjlzeaZDbyuaZDbyvaZDbxbaIPbywbfvbyxbxebyybsHbyzbfvbqGamDbyAbyBbyCbrtbyDberbfDbxvbxtberbfBbyFbfBbyHbyIbyJbyJbyJbyJbyJbyJbyJbyJbyLbyMbfIbfIbfIbfIbfIbyNbyObtcbyPbxLbxLbyQbyRbyNbySbyTbyUbyVbyWbyXbyYbyZbzabzbbfSbzcbfSbzdbzebzebzebzebzebzebzfatJatJatJatJiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaatJaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaabzgbwybwybzhbxZbzibvdbzjdjRdjRbzjbvdbvdbvdbzkbsqbzlbzmbznbzobzpbeVbeVbzqaZJbeVbeVbzrbzsbztbzubzvbzwbzxbzybzzbzAbzBbwRbzCbwRaAxaAxbzDaHcbzEaAxaAxgpLwFFrDkbzFbzGbzHaZDbzIaZDbzJaZDbxbaIPbywbfvbzKbxebzLbzMbzNbfvbzObunbzPbyBbuubzQbqGbqGbzRbzSbzTbzUbzVbzWbzXbzYrFabAabAbbAcbAdbAebAfbAgbAhbuAbAibAjbAkbAlbAmbAnbAobApbAqbArbAsbAtbxLbAubAvbAwbAxaSxbyVbAybAzbAAbABbgRbACbADbAEbAFbAGjkMjkMjkMjkMbAHbAIbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabAKbALbAKbAMbANbAObAPbAQxtbxtbxtbbvdbARbvdbASbsqbATbAUbAVbAWbAXbAYbtPbBabBbbBcbBdbBebylbjXasFbBfbBgbBhbBibBjbzAbBkbwRbBlbBmaTBbBnbBovzbbBpbBqaTBaZDaZDbBrbBsbBtbBrbBrbBrbBrbBubBrbBvaLzbBwbfvbfvbBxbBybBzbfvbfvbrtbBAbBBbjnbBDbBCbBEbjnbBFdcZbrtbrtbrtbyEbrtbrsbzZbAabBGbBHbBIbBJbBKbBLbAhbBMbBNbBObBPbBPbBPbBQbBRbBSbBTbBUbBVbBWbBXbBYbBZbCabuJbCbbyVbyVbCcbCdbCebCcbyVbCfbCfbCfbCfbCfbCfbCfbCfbCfbCgbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabAKbALbAKbAMbANbAObAPbAQxtbxtbxtbbvdbARbvdbASbsqbATbAUbAVbAWbAXbAYbtPbBabBbbBcbBdbBebylbjXasFbBfbBgbBhbBibBjbzAbBkbwRbBlbBmaTBbBnbBovzbbBpbBqaTBaZDaZDbBrbBsbBtbBrbBrbBrbBrbBubBrbBvaLzbBwbfvbfvbBxbBybBzbfvbfvbrtbBAbBBbjnbBDbBCbBEbjnbBFfhobrtbrtbrtbyEbrtbrsbzZbAabBGbBHbBIbBJbBKbBLbAhbBMbBNbBObBPbBPbBPbBQbBRbBSbBTbBUbBVbBWbBXbBYbBZbCabuJbCbbyVbyVbCcbCdbCebCcbyVbCfbCfbCfbCfbCfbCfbCfbCfbCfbCgbAJaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabChbCibCjbCkbvdbzibvdbzjdjRbClbzjbvdbvdbCmbsqbsqbeVbCobCpbCqbCrbCrbswbCtbCubCvbCwbBebylbjXasJbCxbCybCzbCAbCAbCBbCCbCDbCEbCFaTBbCGbCHbCIbCJbCKaTBaadaadbBrbCLbCMbCNbCObCPbCQbCRbBrbnYaIPbCSbCTbCUbCVbCWbCXbCYbCZbDabDbbDccmocmocmocmocmobDebDfbDdbDdbDdbDgbusbDhbDibAabDjbDkbDlbDlbDmbDnbAhbuAbAibDobDpbDqbDrbDsbDtbDubtcbDvbtcbtcbtcbDwbyNbDxbDybDzbDAbDBbDCbDDbDEbDFbDGbDHbDIbDJbDKbDLbDKbDMbDNbDObDPbAJatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabzgbwybwybDQbvdbzibvddgbdgbdgbdgbbvdbvdbDRbDSbDTbeVbDUbDVbDWbDXbDXbDXbDYbDZbCvbCwbBebylbjXbEabBfbwRbEbbEcbEdbEebEfbEgbEhbEiaTBbEjbCHbEkbElbEmaTBaaaaaabBrbEnbEobEpbEqbErbErbEsbEtbEubEvbEwbExbEybEzbEAbEBbEBbECbEDbEEbEFbEGbEHbEIbEJbEKbELbEMbHqbrtbENbEObEObEPbAabAabAabEQbERbESbBKbDnbAhbETbAibfLbyNbyNbyNbyNbyNbyNbyNbyNbyNbEUbEVbEUbyNbEWbEXbEYbEZbEZbEZbFabFbbFcbFdbFebFfbFgbFhbFibFhbFjbFkbFlbFmbFnbwtbFobFobwtaadiWgiWgiWgaadiWgiWgiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaabFpbChbCibCjbxYbFqbvebFrbwDbvdbFqbvdbvdbvdbDRbFsbFtbeVbFubFvbFwbswbswbswbFxbswbCvbCwbBebylbjXbFybFzbwRbFAbFBbFCbFDbypbwRbFEbFFaTBbFGbFHaMZbjWbFIaTBaaaaaabBrbFJbFKbFLbFMbFNbFObFPbBrbFQaIPbFRbqGbqGbFTbFUbFVbqGbqGbFWbfzbfzbFWbqGbFWbqGbFWbqGbFWbqGbfzbfzbEObFZbDlbGabGbbAabEQbGcbGdbGebGfbAhbGgbGhbGibGjbGkbEZbEZbGlbEZbEZbGmbGnbGobGpbGqbEZbGrbGsbGtbGubGubGubGvbGvbGvbGvbGwbGxbGybGzbGAbGzbGBbGCbCfriRbGEbGFbGGbGHbwtaadaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG @@ -7982,11 +7982,11 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbKVbKWbKXaFcaFcaFcbKYbKZbKZaFcaFcbLabLbbLcbLdbLebLfbLgbLhbLibIobxbbLjaIPmMXthejqfaIPaIPbLkaIPbylaIPmMXthejqfaIPbLlbLmbLnaIPmMXthejqfaIPaIPaIPaLzaIPaIPmMXthejqfbJYbLobjXbqGbLpbLqbLrbLsbLtbqGbLubrtmIMbLvbqGbLwbLxbLybLxbLzbqGbrtbHwbEObEObEObEObEObAhbAhbAhbAhbAhbAhbLAwHdbLCbJbbLDbLEbLFbLGbLHbLIbJbbLJbLKbLLbLMbLNbJgbCabLObLPbLQbLRbLSbLSbLTbLUbLVbCfbLWbLXbLYbLZbLYbMabLWbCfriRbAJbMbbIebMcbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaFcaFcbMdaFcaFcbMebMfbMgbMhbMibMjbMkbMlbMmbMnbMobMpbMqbMrbMsbMtbIobMubMvbMwaKlbMwbMxbMwbMwbMybMwbMzbfQbMAbMBbfQbMCbMDbMEbMFbMGbMHbMIbMJbMJbMKbMJbMLbMMbMJbMNbMObMPbMQbfQbMRbqGbMSbMTbMUbqGbqGbqGbFWbMVbFWbqGbqGbqGbqGbqGbqGbqGbqGbrtbrtbMWbMXbMYbMZbNabNbbNcbNdbNebNfbNbbNgbNhbNibJbbKubNjbNkbNlbNmbNnbJbbNobNpbNqbNrbNsbJgbCabNtbNubGvbNvbNwbNxbNybNzbNAbCfbNBbNCbNDbNEbNDbNCbNFbCfbNGbNHbNIbIebIfbwtaaaaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeDWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaabhratJbhrbhratJbhratJbNJbhrbhrbhrbNJatJatJatJatJatJatJbMkaZybMgbNKbNLbNMbNNbNObNPbNQbNRbNSbNTbNUbNVaTRbIobNWbNXbNYbNZbIobOabObaITaITaITaITbOcbOcbOcbOcbOcbOcbOcbOcbOcbOcbOdaHpbOebOfbOfbOfbOfbOfbOgbOfbOfbOfbOfbOhbOibOhaIUaKfbOjbFYbOkbOlbFYbOnbOobOpbOqbrtbOrbyBbOsbOtbOubOvbOwbOxbyBbutbrtbrtbrtbrtbrtbBFbOybOzbOAbOzbOBbNbbOCwHdbODbODbODbODbODbODbODbODbODbOEbOEbOEbOEbOEbOEbOFbOGbOHbGvbGvbGvbGvbGvbGvbGvbCfbCfbCfbCfbCfbCfbCfbCfbCfriRbAJbOIbOJbwtbwtaadatJaaeaaeaaeaaeaaeaaeaaeaaeaaeaadaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbOLbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPabPabPabPabPbbPcbObaaaaaaaadaaabOcbPdbPebPfbPgbPhbPibPjbPkbOcbPlbPmbPnbOfbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybOhbOhbOhbOhbFYbPzbPApFbbPCbPDbPEbPFbEBbPHbPIbEBbEBbEBbPJbrtbPKbPLbPMbPNbPNbPObPPbPQbPRbOybPSbPTbPUbPVbNbbOCwHdbODbPWbPWbPWbPXbPWbPWhLRbODbPYbPYbPZbPYbPYbOEbQabQbbQcbQdbQebQfbQgbQhbQibQjbQkbQlbQmbQnbQobQpbQqbQrbQrbQsbQtbQebQebwtaadaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbOLbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPabPabPabPabPbbPcbObaaaaaaaadaaabOcbPdbPebPfbPgbPhbPibPjbPkbOcbPlbPmbPnbOfbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybOhbOhbOhbOhbFYbPzbPAxghbPCbPDbPEbPFbEBbPHbPIbEBbEBbEBbPJbrtbPKbPLbPMbPNbPNbPObPPbPQbPRbOybPSbPTbPUbPVbNbbOCwHdbODbPWbPWbPWbPXbPWbPWhLRbODbPYbPYbPZbPYbPYbOEbQabQbbQcbQdbQebQfbQgbQhbQibQjbQkbQlbQmbQnbQobQpbQqbQrbQrbQsbQtbQebQebwtaadaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbQubQvbQwaFcaFcbKZbKZbKZbKZaFcaFcbQxbMmbQybQzbQAbQBbQCbQDaDObQEbQFbQGaadbQHbQIbQJbQKbQLbQMbQNbQMbQObQMbQMbQMbOcbQPbQQbQRbOfbQSbQTbQUbQVbQWbQXbQYbOfbOfbQZbRabRbbRcbRdcpHcyzbRgbRhbRibRjbRkbRlbRmbRnbRocqsbRqbzXbrtbrtbrtbRsbqGbqGbqGbqGbqGbRtbRubRvbOybRwbRxbOzbRybNbbOCwHdbODbPWbPWbPWbPWbPWbPWbPWbODbRzbRAbRBbRCbRDbREbRFbRGbQcbRHbRIbRJbRJbRJbRJbRJbRJbRKbRLbRMbQobwtbRNbRObRPbRPbRQbRRbRSbQeatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbRTbRUbRTaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabKZbKZbKZbKZbiRbRWbRXbRXbRXbRXbRYbRZbSabSbbScsbObSebIkbObbSfbObbObbSgbShaaabSibSjbSkbSlbQMbQMbSmbQMbSnbSobSpbQMbOcbQPbQQaTWbOfbSqbSrbSsbStbSubSvbSwbOfbLAbSxbSybSzbSAbSBbSCbRpbSDbSEbKfbHobSFbUnbSGbSHbSIbqGbSJbrtbrtbrtbrtbSKbqGtdxbuzbSNbSObrtbVQbSRbSSbSTbOzbSUbSVbSWbSXbSYbODbPWbPWbSZbPWbPWbPWbPWbODbTabTbbTbbTcbTdbTebTfbTgbQcbThbTibRJbRJbRJbTjbTkbTlbTlbTlbTlbTmbTnbTobTpbTqbTrbTsbTtbTubRIatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbRUbRTbTvbRTbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbTxbTybTzbIkbTAbTBbTBbTCbTDbTEbTFbTBbSbbSdbTHbSdbIkbTJbTKbTLbOblrDbShaadbSibTMbTNbTObTPbTQbTPbTPbTRbTSbTTbTTbTUbTVbTWbTXbOfbOfbOfbOfbOfbTYbTZbOfbOfbUabUbbUcbUdbUcbUebUdbFYbUgbUhbUibUjbUkbFYbUlbUmbUlbqGbUobUpbUqbUrbUsbUtbqGtrUbrtbrtbUvbrtbUwbUxbUybUzbUAbUBbUCbNbbOCbLBbODbODbUDbPWbPWbUEbUDbODbODbUFbUGbUHbUHbUIbOEbUJbUKbQcbULbRIbRJbRJbUMbUNbUObRJbUPbUQbURbUSbUTbUUbUVbUWbUXbUYbUZbVabRIatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaadaadbVbbRUbVcbVdbVebRUbVbaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatJaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVfbVgwkmhatbVibVjbVhbTBbVkbTBbTBbTBbTBbTBbVlbTGfEcbTIbIkbVnbTLbVobOblrDbShaaabSibVpbVqbVrbQMbQMbVsbQMbVtbVubVvbVwbOcbVxbVybVzbVAqTAqTAqTAqTAbVCbVDqTAqTAbVEbVFbVGbVHbVIbVJbVKbVLbVLbVLbVLsdQbVLbVLbExbExbExbVMbVMbVMbVMbVMbVMbVNbVObqGbqGaYQbqGbVPbVQbunbNbbNbbNbbNbbNbbNbbOCbLBbODbVRbVSbVTbVUbVVbVWbVXbVYbUFbUGbVZbUHbUIbOEbWabWbbQcbWcbQebWdbWebWfbWgbWhbWibRJbRJbWjbQobWkbWlbWmbQebWnbWobWobQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbWpbWqbWqbWqbWrbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacatJaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVfbVgwkmhatbVibVjbVhbTBbVkbTBbTBbTBbTBbTBbVlbTGfEcbTIbIkbVnbTLbVobOblrDbShaaabSibVpbVqbVrbQMbQMbVsbQMbVtbVubVvbVwbOcbVxbVybVzbVAqTAqTAqTAqTAbVCbVDqTAqTAbVEbVFbVGbVHbVIbVJbVKbVLbVLbVLbVLtqGbVLbVLbExbExbExbVMbVMbVMbVMbVMbVMbVNbVObqGbqGaYQbqGbVPbVQbunbNbbNbbNbbNbbNbbNbbOCbLBbODbVRbVSbVTbVUbVVbVWbVXbVYbUFbUGbVZbUHbUIbOEbWabWbbQcbWcbQebWdbWebWfbWgbWhbWibRJbRJbWjbQobWkbWlbWmbQebWnbWobWobQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbWpbWqbWqbWqbWrbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbWsbWtbWubWvbWwbWxbWxbWxbWybWzbWAbWBlkPbWCbWDbVmbIkbObbObbObbOblrDbWFaadbWGbQIbWHbQKbWIbQMbWJbQMbQMbQMbWKbWLbWMbWNbWObWPbWQbWRbWRbWRbWRbWSbWRbWTbWUbWVbWWbWXbWYbWZbXabXbiDWbXdiDWiDWiDWiDWiDWiDWbXcbXcbXciDWiDWiDWiDWbXebXfbSLusxbWEbXibXjbPQbSQbXkbXleLcbXmbXnbXobWWbWXbXpbODbXqbXrbXsbXtbXubXvbXwbVYbVYbVYbVYbVYbVYbXxbXybXzbXAbXBbQebQobQobQobQobXCbQobXDbRJbRJbQobXEbXFbXGbQebXHbXIbXJbXKbXLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabXMbXNbXMbWqbXObWqbXPbXQbRTaadaadaadeDWaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTwbTwbTwbTwbIkbIkbTwbTwbTwbTwbIkbIkbTwbTwbTwbIkbIkbIkbXRbObaaabXSbXTbShaaaaaaaadaaabOcbXUbXVbXWbXXbQMbXYbQMbQMbOcbXZbYabYbbYcbYdbYebYfbYgbYhbYdbYdbYdbYdbYdbYibYjbYdbYdbYkbYdbYlbYdbYdbYdbYdbYdbOhbOhbOhbOhbOhbOhbOhbOhwHdbXffWDbUubYobYpbYqnSibYrbYsbYtbYubYubYvbYubYurpGbYxbODbYybYzbYAbYzbYzbYzbYBbYCbYDbYEbYFbYGbYHbYIbYJbUKbQcbYKaadbYLbYMbYNbYObYPbYObYQbYRbYSbQobYTbYUbYVbQebQebQebQebQebQeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatJaadaadbRUbRUbYWbWqbWqbWqbYXbRUbRUaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadbYYaaaaaaaaaaaaaaaaaaaaFaadaoBaadaaFaadbXSbTLbXSaadbXSlrDbShaadbYZbZabZabZabZabZabZabZabZabZabZbbZcbZdbZebYabZfbZgbYdbYebYfbYgbYhbYdbYdbZhbZibZjbZkbZlbZmbZnbZobZpbZqbZrbZsbZtbZubYdaadaadaadaadaadaadaadbOhwHdbZvccdccdccdwfAbZwbZwbZxbZybZwbZwbZwbZwbZwbZwbZvbZzbZAbZBbZCbZDbZCbZEbZCbZFbZGbZHbZGbZGbZGbZGbZIbZJbZKbQcbYKaadbYLbZLbZMbZNbZObZPbZQbZRbZSbQobZTbYUbZUbXEbZVbZWbZXbZYaadatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadbVbbRUbZZcaacabcacbVbaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 41b3a6f171..8e8a53b324 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -19417,8 +19417,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 8 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/turf/closed/wall, /area/engineering/atmos) "aHy" = ( /obj/structure/table, @@ -20770,8 +20769,7 @@ /area/engineering/atmos) "aJI" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/turf/closed/wall, /area/engineering/atmos) "aJJ" = ( /obj/machinery/status_display/evac, @@ -72592,9 +72590,6 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - pixel_y = 24 - }, /turf/open/floor/plating, /area/engineering/atmos) "csg" = ( @@ -72623,6 +72618,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm{ + pixel_y = 24 + }, /turf/open/floor/plating, /area/engineering/atmos) "csj" = ( @@ -81363,6 +81361,14 @@ }, /turf/open/floor/mineral/calorite, /area/space/nearstation) +"edN" = ( +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "eeU" = ( /obj/item/kirbyplants, /turf/open/floor/wood, @@ -83940,11 +83946,6 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, /area/hallway/secondary/entry) -"rUJ" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/opossum/poppy, -/turf/open/floor/plating, -/area/maintenance/aft) "rWp" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -84152,6 +84153,11 @@ icon_state = "wood-broken4" }, /area/ruin/space/djstation) +"sUA" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/opossum/poppy, +/turf/open/floor/plating, +/area/maintenance/aft) "sWL" = ( /obj/structure/cable{ icon_state = "0-4" @@ -112149,7 +112155,7 @@ bUM bUS cxT bGC -cxT +edN cBH cjs aks @@ -114964,7 +114970,7 @@ bFc cbd bGJ cdr -rUJ +sUA ssF cgF chz diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8368a5da04..cb523702b4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -27074,9 +27074,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) -"cgJ" = ( -/turf/open/floor/catwalk_floor, -/area/space/station_ruins) "cgL" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -90895,7 +90892,7 @@ pNo pNo pNo pNo -cgJ +aaa pNo pNo pNo diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 36da042a5b..90458d1494 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -49367,6 +49367,7 @@ name = "Atmospherics External Access"; req_access_txt = "24" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "cdm" = ( @@ -50275,6 +50276,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/engineering/main) "chw" = ( @@ -51067,6 +51069,7 @@ name = "Telecommunications External Access"; req_access_txt = "61" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/tcommsat/computer) "clB" = ( @@ -55578,10 +55581,6 @@ }, /turf/open/floor/plasteel, /area/cargo/qm) -"dEo" = ( -/mob/living/simple_animal/opossum/poppy, -/turf/open/floor/plating, -/area/maintenance/department/engine) "dGd" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/machinery/meter, @@ -55618,8 +55617,13 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "dKs" = ( -/turf/open/floor/catwalk_floor, -/area/space/station_ruins) +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/entry) "dLY" = ( /obj/structure/table, /obj/item/assembly/igniter, @@ -57175,6 +57179,16 @@ }, /turf/closed/wall, /area/science/mixing) +"gMM" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/entry) "gMO" = ( /obj/structure/plasticflaps/opaque, /turf/open/floor/plating, @@ -58077,6 +58091,14 @@ }, /turf/open/floor/plasteel, /area/cargo/office) +"iIx" = ( +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engineering/atmos) "iJi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -59353,14 +59375,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"lDN" = ( -/obj/machinery/atmospherics/pipe/layer_manifold, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engineering/atmos) "lDW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/corner, @@ -60216,6 +60230,10 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"nmB" = ( +/mob/living/simple_animal/opossum/poppy, +/turf/open/floor/plating, +/area/maintenance/department/engine) "nnf" = ( /obj/structure/rack, /obj/item/stack/packageWrap, @@ -61003,6 +61021,7 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/solars/starboard) "oDP" = ( @@ -62593,6 +62612,7 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/solars/port) "rKL" = ( @@ -70744,7 +70764,7 @@ uIu uIu uIu uIu -dKs +aaa uIu uIu uIu @@ -84526,14 +84546,14 @@ aZy aFS aGS aGW -aHv +gMM aaa aaa aaa aaa aaa aaa -aGS +dKs aGW aHv aIF @@ -86068,14 +86088,14 @@ aZA aGn aGS aGW -aHv +gMM aaa aaa aaa aaa aaa aaa -aGS +dKs aGW aHv aJg @@ -90482,7 +90502,7 @@ bva bva bva tvP -dEo +nmB wRk bva bva @@ -103331,7 +103351,7 @@ bVi bMe bWP bXy -lDN +iIx bZe bZN caH From f454350875d76eb07026b2873ddf98c8b351888f Mon Sep 17 00:00:00 2001 From: AbsFree Date: Mon, 24 Feb 2025 14:19:45 +0100 Subject: [PATCH 27/27] minor piping tweak --- _maps/map_files/MetaStation/MetaStation.dmm | 57 +++++++++++++-------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index cb523702b4..fdb1a0f31b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -27074,6 +27074,12 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/port/aft) +"cgJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "cgL" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -39734,6 +39740,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cIk" = ( @@ -41033,9 +41042,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 5 - }, /turf/open/floor/plasteel, /area/engineering/atmos) "cKE" = ( @@ -52440,6 +52446,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 10 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "fFY" = ( @@ -52690,8 +52699,9 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "fNh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Air to External Air Ports" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -53679,9 +53689,6 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/solars/port/fore) "grX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 }, @@ -60394,6 +60401,14 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"jUM" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plating, +/area/engineering/atmos) "jVR" = ( /obj/structure/cable{ icon_state = "4-8" @@ -63664,6 +63679,9 @@ dir = 1; name = "Port to External" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "lIk" = ( @@ -73696,9 +73714,6 @@ name = "Distribution Loop"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/atmos) "rdv" = ( @@ -78157,9 +78172,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 10 - }, /turf/open/floor/plasteel, /area/engineering/atmos) "tFJ" = ( @@ -78474,11 +78486,9 @@ /turf/open/floor/plasteel/white, /area/medical/patients_rooms/room_a) "tNF" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Air to External Air Ports" +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "tNG" = ( @@ -82154,6 +82164,9 @@ /area/hallway/secondary/entry) "vRu" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "vRz" = ( @@ -82367,7 +82380,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 10 + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -129360,7 +129373,7 @@ sKv fFR fNh tNF -cRg +cgJ nwU lOv tyC @@ -129872,8 +129885,8 @@ maO ooB oVH ldI -cRg -uED +ooB +jUM vRu kJQ wqG