From 98d47aadb63672ec36b39d90b4ec0167fedb1bfa Mon Sep 17 00:00:00 2001 From: Kar4es <144079671+Kar4es@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:50:54 +0700 Subject: [PATCH 1/4] Fix: More cyborg rechargers (#594) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Добавил чутка зарядок для боргов. На дельту 2 - в бриг и ассистентскую. На коробку 3 - две в мед и одну в бриг. ## Почему это хорошо для игры Боргам дано больше времени робастить. ## Изображения изменений В боте ## Тестирование Нет ## Changelog :cl: add: Дельта: 2 новых зарядника для боргов. Один в бриге, второй в ассистентской. add: Кибериада: 3 новых зарядника для боргов. Два в меде, один в бриге. /:cl: --- _maps/map_files220/cyberiad/cyberiad.dmm | 28 +++++++++++++++--------- _maps/map_files220/delta/delta.dmm | 11 ++++++---- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index e3e0266c1820..e0ada16859c0 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -3319,13 +3319,8 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "apc" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, /obj/machinery/newscaster/security_unit/east, +/obj/machinery/recharge_station, /turf/simulated/floor/plasteel, /area/station/security/processing) "apd" = ( @@ -3987,9 +3982,6 @@ }, /area/station/security/brig) "arE" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/machinery/light_switch/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -5794,6 +5786,12 @@ pixel_y = -22; dir = 1 }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -25043,6 +25041,7 @@ }, /area/station/medical/sleeper) "bXI" = ( +/obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -60241,6 +60240,7 @@ c_tag = "Medbay Treatment East"; dir = 8 }, +/obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -62382,6 +62382,14 @@ icon_state = "darkyellowcorners" }, /area/station/engineering/hallway) +"jZQ" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redcorner" + }, +/area/station/security/processing) "kaa" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -133250,7 +133258,7 @@ avB avB aAF aAF -axR +jZQ lSU azW aBb diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 6b44dc1badae..cce58224a6ae 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -66851,6 +66851,11 @@ icon_state = "green" }, /area/station/medical/virology/lab) +"lzQ" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/recharge_station, +/turf/simulated/floor/plasteel, +/area/station/public/storage/tools) "lAk" = ( /obj/machinery/power/apc/directional/south, /obj/structure/cable, @@ -94090,9 +94095,7 @@ }, /area/station/public/locker) "uXf" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, +/obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -134633,7 +134636,7 @@ aor bOC bCg bDS -bFr +lzQ bHc bIT bFr From 198812375e878df6c260b5e6f3be274fef86e42b Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Tue, 31 Oct 2023 12:47:04 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9E=D0=B3=D0=BE=D0=BB=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B2=D0=BE=D0=B4=D0=BA=D0=B0?= =?UTF-8?q?=202:=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BB=D1=83=D1=87=D1=88=D0=B5?= =?UTF-8?q?=20(#591)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает * Немного рефактора кода * Фикс обновления иконки при `reinforce()` * Теперь показывает прогресс бар * Теперь при ходьбе уменьшается шанс от удара током ## Почему это хорошо для игры Чуть лучше код Можно законтрить без изолек ## Тестирование Trust me bro ## Changelog :cl: tweak: Через оголенные провода меньше шанс удара током при ходьбе fix: Фиксы у оголенной проводки для прогресс бара и иконки /:cl: --- modular_ss220/wire_splicing/wiresplicing.dm | 89 ++++++++++++--------- 1 file changed, 50 insertions(+), 39 deletions(-) diff --git a/modular_ss220/wire_splicing/wiresplicing.dm b/modular_ss220/wire_splicing/wiresplicing.dm index 87dd7736ffcd..12b56654186a 100644 --- a/modular_ss220/wire_splicing/wiresplicing.dm +++ b/modular_ss220/wire_splicing/wiresplicing.dm @@ -1,3 +1,6 @@ +#define MAX_MESSINESS 10 +#define WALKING_REDUCE_PROBABILITY 50 + /obj/effect/spawner/wire_splicing name = "wiring splicing spawner" icon = 'modular_ss220/wire_splicing/structures_spawners.dmi' @@ -5,14 +8,14 @@ /obj/effect/spawner/wire_splicing/Initialize() . = ..() - new/obj/structure/wire_splicing(get_turf(src)) + new /obj/structure/wire_splicing(get_turf(src)) return INITIALIZE_HINT_QDEL /obj/effect/spawner/wire_splicing/thirty //70% chance to be nothing name = "wiring splicing spawner 30%" /obj/effect/spawner/wire_splicing/thirty/Initialize(mapload) - if (prob(70)) + if(prob(70)) return INITIALIZE_HINT_QDEL . = ..() @@ -26,19 +29,18 @@ flags = CONDUCT layer = WIRE_TERMINAL_LAYER var/messiness = 0 // How bad the splicing was, determines the chance of shock + var/shock_chance_per_messiness = 10 /obj/structure/wire_splicing/Initialize(mapload) . = ..() - messiness = rand (1,10) - icon_state = "wire_splicing[messiness]" - + messiness = rand(1, MAX_MESSINESS) + update_icon(UPDATE_ICON_STATE) //At messiness of 2 or below, triggering when walking on a catwalk is impossible //Above that it becomes possible, so we will change the layer to make it poke through catwalks if (messiness > 2) layer = LOW_OBJ_LAYER // I wont do such stuff on splicing "reinforcement". Take it as nasty feature - //Wire splice can only exist on a cable. Lets try to place it in a good location if (locate(/obj/structure/cable) in get_turf(src)) //if we're already in a good location, no problem! return @@ -90,60 +92,69 @@ loc = pick(candidates) +/obj/structure/wire_splicing/update_icon_state() + icon_state = "wire_splicing[messiness]" + /obj/structure/wire_splicing/examine(mob/user) - ..() - to_chat(user, "It has [messiness] wire[messiness > 1?"s":""] dangling around.") + . = ..() + . += span_warning("It has [messiness] wire[messiness > 1 ? "s" : ""] dangling around.") -/obj/structure/wire_splicing/Crossed(AM as mob|obj) +/obj/structure/wire_splicing/Crossed(atom/movable/AM, oldloc) . = ..() if(isliving(AM)) - var/mob/living/L = AM - //var/turf/T = get_turf(src) - var/chance_to_shock = messiness * 10 + var/chance_to_shock = messiness * shock_chance_per_messiness /* + var/turf/T = get_turf(src) if(locate(/obj/structure/catwalk) in T) chance_to_shock -= 20 */ - shock(L, chance_to_shock) + shock(AM, chance_to_shock) -/obj/structure/wire_splicing/proc/shock(mob/user, prb, siemens_coeff = 1) - if(!in_range(src, user))//To prevent TK and mech users from getting shocked - return FALSE +/obj/structure/wire_splicing/proc/shock(mob/living/user, prb, siemens_coeff = 1) + . = FALSE + if(!in_range(src, user)) //To prevent TK and mech users from getting shocked + return + if(user.m_intent == MOVE_INTENT_WALK) // Walk slowly to try to step over + prb = max(prb - WALKING_REDUCE_PROBABILITY, 0) if(!prob(prb)) - return FALSE + return var/turf/T = get_turf(src) var/obj/structure/cable/C = locate(/obj/structure/cable) in T if(!C) - return FALSE - if (electrocute_mob(user, C.powernet, src, siemens_coeff)) + return + if(electrocute_mob(user, C.powernet, src, siemens_coeff)) do_sparks(5, TRUE, src) - return TRUE - else - return FALSE + . = TRUE +/obj/structure/wire_splicing/wirecutter_act(mob/living/user, obj/item/I) + . = TRUE + if(!I.use_tool(src, user, 2 SECONDS, volume = I.tool_volume)) + return + if(shock(user, 50)) + return + user.visible_message(span_notice("[user] cuts the splicing."), span_notice("You cut the splicing.")) + investigate_log(" was cut by [key_name(usr)] in [AREACOORD(src)]") + qdel(src) /obj/structure/wire_splicing/attackby(obj/item/I, mob/user, params) - if(I.tool_behaviour == TOOL_WIRECUTTER) - if(I.use_tool(src, user, 2 SECONDS, volume = 50)) - if (shock(user, 50)) - return - user.visible_message("[user] cuts the splicing.", span_notice("You cut the splicing.")) - investigate_log(" was cut by [key_name(usr)] in [AREACOORD(src)]") - qdel(src) - if(istype(I, /obj/item/stack/cable_coil) && user.a_intent == INTENT_HARM) var/obj/item/stack/cable_coil/coil = I - if(coil.get_amount() >= 1) - reinforce(user, coil) + reinforce(user, coil) + return + . = ..() /obj/structure/wire_splicing/proc/reinforce(mob/user, obj/item/stack/cable_coil/coil) - if(messiness >= 10) - to_chat(user,span_warning("You can't seem to jam more cable into the splicing!")) + if(messiness >= MAX_MESSINESS) + to_chat(user, span_warning("You can't seem to jam more cable into the splicing!")) return - if(!do_after(user, 2 SECONDS, src)) + if(!do_after(user, 2 SECONDS, target = src, progress = TRUE)) return - messiness = min(messiness + 1, 10) - investigate_log("wire splicing was reinforced to [messiness] by [key_name(usr)] in [AREACOORD(src)]") + if(messiness >= MAX_MESSINESS) + return + messiness = min(messiness + 1, MAX_MESSINESS) coil.use(1) - if(messiness < 10 && coil.get_amount() >= 1) - reinforce(user, coil) + update_icon(UPDATE_ICON_STATE) + investigate_log("wire splicing was reinforced to [messiness] by [key_name(usr)] in [AREACOORD(src)]") + +#undef MAX_MESSINESS +#undef WALKING_REDUCE_PROBABILITY From a06590bbc90d9670e98dbdc2efb0a71d341b4d1d Mon Sep 17 00:00:00 2001 From: Raiden Mei Date: Tue, 31 Oct 2023 12:47:16 +0300 Subject: [PATCH 3/4] FIX: Another code fix for Beretta M9 (#593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Небольшой фикс кода. ## Почему это хорошо для игры Nanofixes, son. ## Изображения изменений Здесь могло быть изображение кода. ## Тестирование Тест прошел на локалке и вполне успешно. ## Changelog :cl: fix: Починил крафт патронов в протолате рнд. Уменьшил количество коробок патронов в ящике карго. Сделал перезарядку магазинов как у магазинов ВТшки. /:cl: --- modular_ss220/objects/code/beretta.dm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/modular_ss220/objects/code/beretta.dm b/modular_ss220/objects/code/beretta.dm index c40b2c934ec6..7eb64a8f52a3 100644 --- a/modular_ss220/objects/code/beretta.dm +++ b/modular_ss220/objects/code/beretta.dm @@ -8,6 +8,7 @@ righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi' icon_state = "beretta" item_state = "beretta" + w_class = WEIGHT_CLASS_NORMAL can_suppress = FALSE mag_type = /obj/item/ammo_box/magazine/beretta fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/beretta_shot.ogg' @@ -20,6 +21,8 @@ multi_sprite_step = 2 ammo_type = /obj/item/ammo_casing/beretta/mmrub919 max_ammo = 10 + multiload = 0 + slow_loading = TRUE caliber = "919mm" /obj/item/ammo_box/magazine/beretta/mm919 @@ -120,8 +123,6 @@ /datum/supply_packs/security/armory/berettarubberammo name = "Beretta M9 Rubber Ammunition Crate" contains = list(/obj/item/ammo_box/beretta, - /obj/item/ammo_box/beretta, - /obj/item/ammo_box/beretta, /obj/item/ammo_box/beretta, /obj/item/ammo_box/magazine/beretta, /obj/item/ammo_box/magazine/beretta) @@ -131,8 +132,6 @@ /datum/supply_packs/security/armory/berettalethalammo name = "Beretta M9 Lethal Ammunition Crate" contains = list(/obj/item/ammo_box/beretta/mm919, - /obj/item/ammo_box/beretta/mm919, - /obj/item/ammo_box/beretta/mm919, /obj/item/ammo_box/beretta/mm919, /obj/item/ammo_box/magazine/beretta/mm919, /obj/item/ammo_box/magazine/beretta/mm919) @@ -142,8 +141,6 @@ /datum/supply_packs/security/armory/berettaexperimentalammo name = "Beretta M9 Bluespace Ammunition Crate" contains = list(/obj/item/ammo_box/beretta/mmbsp919, - /obj/item/ammo_box/beretta/mmbsp919, - /obj/item/ammo_box/beretta/mmbsp919, /obj/item/ammo_box/beretta/mmbsp919, /obj/item/ammo_box/magazine/beretta/mmbsp919, /obj/item/ammo_box/magazine/beretta/mmbsp919) @@ -153,8 +150,6 @@ /datum/supply_packs/security/armory/berettaarmorpiercingammo name = "Beretta M9 Armor-piercing Ammunition Crate" contains = list(/obj/item/ammo_box/beretta/mmap919, - /obj/item/ammo_box/beretta/mmap919, - /obj/item/ammo_box/beretta/mmap919, /obj/item/ammo_box/beretta/mmap919, /obj/item/ammo_box/magazine/beretta/mmap919, /obj/item/ammo_box/magazine/beretta/mmap919) @@ -174,7 +169,7 @@ /datum/design/box_beretta/ap name = "Beretta M9 AP Ammo Box (9mm)" desc = "A box of 20 armor-piercing rounds for Beretta M9" - id = "box_beretta" + id = "box_beretta_ap" req_tech = list("combat" = 3, "materials" = 2) build_type = PROTOLATHE materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000) @@ -184,7 +179,7 @@ /datum/design/box_beretta/bluespace name = "Beretta M9 Bluespace Ammo Box (9mm)" desc = "A box of 20 high velocity bluespace rounds for Beretta M9" - id = "box_beretta" + id = "box_beretta_bsp" req_tech = list("combat" = 6, "materials" = 5, "bluespace" = 6) build_type = PROTOLATHE materials = list(MAT_METAL = 8000, MAT_SILVER = 600, MAT_BLUESPACE = 1000) From 4ff3d22348d4b66ae2f253d855f6fd8cefebfd50 Mon Sep 17 00:00:00 2001 From: Kar4es Date: Tue, 31 Oct 2023 21:13:02 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=D0=BC=D0=B4=D1=8D=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files220/cyberiad/cyberiad.dmm | 156 ++++++++++++++++++----- 1 file changed, 125 insertions(+), 31 deletions(-) diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index e0ada16859c0..cb306c1b1396 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -33532,6 +33532,7 @@ layer = 2 }, /obj/machinery/light/directional/north, +/obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -33545,6 +33546,7 @@ layer = 2 }, /obj/machinery/light/directional/north, +/obj/machinery/atmospherics/portable/pump, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -33786,12 +33788,12 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "cGr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "cGs" = ( @@ -33904,6 +33906,7 @@ layer = 2 }, /obj/machinery/ai_status_display/north, +/obj/machinery/atmospherics/portable/pump, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -34327,12 +34330,10 @@ }, /area/station/engineering/hallway) "cHU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "cHW" = ( @@ -37783,7 +37784,6 @@ }, /area/station/engineering/atmos/control) "cTG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -37793,6 +37793,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellowcorner" @@ -43650,6 +43653,26 @@ /obj/item/lighter/zippo/nt_rep, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) +"dpr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, +/obj/machinery/atmospherics/portable/pump, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/station/engineering/atmos) "dpu" = ( /obj/structure/rack, /obj/item/storage/box/donkpockets{ @@ -46943,6 +46966,19 @@ }, /turf/simulated/floor/plasteel, /area/station/security/brig) +"ekD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/station/engineering/atmos) "ekQ" = ( /obj/machinery/atmospherics/portable/canister/toxins, /obj/effect/decal/cleanable/dirt, @@ -53934,6 +53970,14 @@ /obj/machinery/light_construct/small/south, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"gPm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellow" + }, +/area/station/engineering/atmos) "gPM" = ( /obj/structure/chair{ dir = 1 @@ -58253,6 +58297,7 @@ layer = 2 }, /obj/machinery/status_display/directional/north, +/obj/machinery/atmospherics/portable/scrubber, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -58719,6 +58764,12 @@ icon_state = "freezerfloor" }, /area/station/public/toilet/lockerroom) +"iDh" = ( +/obj/machinery/atmospherics/unary/thermomachine/heater{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "iDk" = ( /obj/machinery/airlock_controller/air_cycler{ ext_button_link_id = "secmaint_btn_ext"; @@ -60367,6 +60418,17 @@ /obj/effect/decal/cleanable/ash, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"jjy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 4; + target_pressure = 303; + name = "Air to connector" + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/aft) "jjD" = ( /obj/structure/grille, /obj/structure/barricade/wooden{ @@ -60406,14 +60468,6 @@ icon_state = "whitegreen" }, /area/station/medical/medbay2) -"jkZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/aft) "jlt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/wire_splicing/thirty, @@ -81023,6 +81077,26 @@ }, /turf/simulated/floor/wood/fancy/oak, /area/station/command/meeting_room) +"qNE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/portables_connector{ + layer = 2 + }, +/obj/machinery/atmospherics/portable/scrubber, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/station/engineering/atmos) "qNM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -84288,6 +84362,18 @@ icon_state = "yellow" }, /area/station/hallway/primary/aft) +"sim" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellowcorner" + }, +/area/station/hallway/primary/aft) "sir" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair{ @@ -89167,7 +89253,6 @@ /area/station/medical/reception) "tTj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -89177,6 +89262,9 @@ name = "Eng Chief Engineer's Office"; sort_type_txt = "5" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "tTz" = ( @@ -90489,6 +90577,12 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry) +"urL" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "urU" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -130253,7 +130347,7 @@ cnA ciN csC cDA -ecs +sim ecs cHO dAq @@ -130510,7 +130604,7 @@ chc chc chc cGJ -cGq +jjy cGq cHM dAq @@ -130768,7 +130862,7 @@ dot chc cGN cHU -jkZ +cGs cTG cLM cUk @@ -130806,7 +130900,7 @@ fXt deJ cSd dfF -cSd +iDh ufc nVh pMy @@ -131063,7 +131157,7 @@ enG deI cSd cUQ -dgg +urL bAO wQr cXW @@ -131318,7 +131412,7 @@ esG tDn uBJ sPg -dgg +yiy dfB fFY dec @@ -131575,7 +131669,7 @@ qmX giQ rWB fwZ -cSd +dfF ehE dsx dqv @@ -131832,7 +131926,7 @@ qmX nrS ctj deJ -cSd +dfF rHu cJD cJD @@ -132089,7 +132183,7 @@ cGK cGK iEE deJ -cSd +dfF eLk mrw esT @@ -132344,9 +132438,9 @@ euu rlm pUZ qmX -dgI -deJ -dop +dpr +sPg +gPm gru oWM dfF @@ -132601,7 +132695,7 @@ cTA dmk cUo qmX -dgI +ekD deJ dop gru @@ -132858,8 +132952,8 @@ cOW oDa fbT qmX -dgI -deJ +qNE +deI dop gru oWM