From c410593ddc50ef6534c031daf9dcb812212b58cf Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 21 Feb 2022 00:33:20 +0000 Subject: [PATCH 1/7] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15414.yml | 5 --- html/changelogs/AutoChangeLog-pr-15510.yml | 36 ------------------ html/changelogs/AutoChangeLog-pr-15513.yml | 4 -- html/changelogs/AutoChangeLog-pr-15515.yml | 4 -- html/changelogs/archive/2022-02.yml | 44 ++++++++++++++++++++++ 5 files changed, 44 insertions(+), 49 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15414.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15510.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15513.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15515.yml diff --git a/html/changelogs/AutoChangeLog-pr-15414.yml b/html/changelogs/AutoChangeLog-pr-15414.yml deleted file mode 100644 index b483e8437c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15414.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "BlueWildrose and tralezab, Wjohnston, Mey Ha Zah, ArcaneDefense, Jack7D1, Papaporo, Sheits & Mqiib from TG and Yog" -delete-after: True -changes: - - rscadd: "TG wing port - All species can now use flight potions and grow wings. Your wing sprite will be based off of what wings you have on your character, or otherwise what species you are if you have no wings." - - bugfix: "Jellypeople did not call the species parent proc on spec_life. Fixed." diff --git a/html/changelogs/AutoChangeLog-pr-15510.yml b/html/changelogs/AutoChangeLog-pr-15510.yml deleted file mode 100644 index 206bf8c13e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15510.yml +++ /dev/null @@ -1,36 +0,0 @@ -author: "TripleShades" -delete-after: True -changes: - - rscadd: "[Omega] Gateway shutter button" - - rscadd: "[Omega] Signs to the airlocks that lead to space that say SPACE" - - rscadd: "[Omega] Air Alarm for the Turbine itself" - - rscadd: "[Omega] SMES Unit for the Turbine itself" - - rscadd: "[Omega] Firelock to Robotics airlock" - - rscadd: "[Omega] Captain's Office now has a hand teleporter and medal box" - - rscadd: "[Omega] Screwdriver to Chemistry" - - rscadd: "[Omega] Space Cleaner bottle to Medbay" - - rscadd: "[Omega] Limb Grower and Spare Limb Crate to Surgery" - - rscadd: "[Omega] Kinkmate in Dorms" - - rscadd: "[Omega] Lightbulb fixture to Secure Tech Storage" - - rscadd: "[Omega] Armsky is now in the Armoury" - - rscdel: "[Omega] Extra automated announcement machine" - - rscdel: "[Omega] Wall inside of southwest Solar Array window" - - rscdel: "[Omega] Wall inside library maint airlock" - - rscdel: "[Omega] Duplicate Robotics airlock -tweak: [Omega] HoS gun now spawns in HoS locker instead of Captain's locker -tweak: [Omega] Both Solar Arrays now have more windows -tweak: [Omega] PACMAN moved out from behind a Command airlock in Engineering -tweak: [Omega] A few cameras so that they're not sitting improperly on windows -tweak: [Omega] Medbay Surgery now has a surgical duffel instead of strewn about tools -tweak: [Omega] Security Cell 1 is now properly named and has a bed instead of a chair -tweak: [Omega] Toxins scrubber piping now goes through a wall -tweak: [Omega] Robotics trash can is now moved to the small hallway between Robotics and Toxins -tweak: [Omega] Maint Pool drain moved down a tile so it's easier to retrieve lost items" - - bugfix: "[Omega] Lawyer Office access" - - bugfix: "[Omega] Both Solar Arrays are now wired up to power the station properly" - - bugfix: "[Omega] Wire leading to the single Supermatter Emitter should now be properly connected and not diagonal" - - bugfix: "[Omega] Gateway Maint airlock access" - - bugfix: "[Omega] Toxins Launch not being connected to the main air supply" - - bugfix: "[Omega] Toxins Mix Chamber no longer starts bolted" - - bugfix: "[Omega] Missing pipe above Security leading into Perma" - - bugfix: "[Omega] Secure Tech Storage now properly has an area" diff --git a/html/changelogs/AutoChangeLog-pr-15513.yml b/html/changelogs/AutoChangeLog-pr-15513.yml deleted file mode 100644 index 077fb57101..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15513.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Default features on linux auxmos compile now formatted correctly" diff --git a/html/changelogs/AutoChangeLog-pr-15515.yml b/html/changelogs/AutoChangeLog-pr-15515.yml deleted file mode 100644 index dcd230897e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15515.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "reinforced plasma glass windows are buildable" diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index 17000e958a..8ae10a7f5c 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -84,3 +84,47 @@ 2022-02-20: jupyterkat: - refactor: switched equalization method to katmos +2022-02-21: + BlueWildrose and tralezab, Wjohnston, Mey Ha Zah, ArcaneDefense, Jack7D1, Papaporo, Sheits & Mqiib from TG and Yog: + - rscadd: TG wing port - All species can now use flight potions and grow wings. + Your wing sprite will be based off of what wings you have on your character, + or otherwise what species you are if you have no wings. + - bugfix: Jellypeople did not call the species parent proc on spec_life. Fixed. + Putnam3145: + - bugfix: Default features on linux auxmos compile now formatted correctly + - bugfix: reinforced plasma glass windows are buildable + TripleShades: + - rscadd: '[Omega] Gateway shutter button' + - rscadd: '[Omega] Signs to the airlocks that lead to space that say SPACE' + - rscadd: '[Omega] Air Alarm for the Turbine itself' + - rscadd: '[Omega] SMES Unit for the Turbine itself' + - rscadd: '[Omega] Firelock to Robotics airlock' + - rscadd: '[Omega] Captain''s Office now has a hand teleporter and medal box' + - rscadd: '[Omega] Screwdriver to Chemistry' + - rscadd: '[Omega] Space Cleaner bottle to Medbay' + - rscadd: '[Omega] Limb Grower and Spare Limb Crate to Surgery' + - rscadd: '[Omega] Kinkmate in Dorms' + - rscadd: '[Omega] Lightbulb fixture to Secure Tech Storage' + - rscadd: '[Omega] Armsky is now in the Armoury' + - rscdel: '[Omega] Extra automated announcement machine' + - rscdel: '[Omega] Wall inside of southwest Solar Array window' + - rscdel: '[Omega] Wall inside library maint airlock' + - rscdel: '[Omega] Duplicate Robotics airlock tweak: [Omega] HoS gun now spawns + in HoS locker instead of Captain''s locker tweak: [Omega] Both Solar Arrays + now have more windows tweak: [Omega] PACMAN moved out from behind a Command + airlock in Engineering tweak: [Omega] A few cameras so that they''re not sitting + improperly on windows tweak: [Omega] Medbay Surgery now has a surgical duffel + instead of strewn about tools tweak: [Omega] Security Cell 1 is now properly + named and has a bed instead of a chair tweak: [Omega] Toxins scrubber piping + now goes through a wall tweak: [Omega] Robotics trash can is now moved to the + small hallway between Robotics and Toxins tweak: [Omega] Maint Pool drain moved + down a tile so it''s easier to retrieve lost items' + - bugfix: '[Omega] Lawyer Office access' + - bugfix: '[Omega] Both Solar Arrays are now wired up to power the station properly' + - bugfix: '[Omega] Wire leading to the single Supermatter Emitter should now be + properly connected and not diagonal' + - bugfix: '[Omega] Gateway Maint airlock access' + - bugfix: '[Omega] Toxins Launch not being connected to the main air supply' + - bugfix: '[Omega] Toxins Mix Chamber no longer starts bolted' + - bugfix: '[Omega] Missing pipe above Security leading into Perma' + - bugfix: '[Omega] Secure Tech Storage now properly has an area' From de3ea65587689d9313da6fc8db925b8fa727a538 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Feb 2022 16:20:41 -0800 Subject: [PATCH 2/7] fixes parallax whitifier applying when parallax is disabled (#15516) * :) * that * move those there * refactor that too * wew * stuff * almost. * sigh * just need speed * stuf * pain * hm * tweaks * that * eh * wack * a * done * that's important * wacky * all that * fixes * typo * that * a * funny * that * that * woo * help im losing my fucking mind * okay * fix * a * woops --- code/_rendering/parallax/parallax_holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_rendering/parallax/parallax_holder.dm b/code/_rendering/parallax/parallax_holder.dm index 8a9e4b71a9..cbe095c02b 100644 --- a/code/_rendering/parallax/parallax_holder.dm +++ b/code/_rendering/parallax/parallax_holder.dm @@ -174,7 +174,7 @@ L.SetView(C.view, TRUE) . |= L C.screen |= . - if(!secondary_map) + if(!secondary_map && (owner.prefs.parallax != PARALLAX_DISABLE)) var/atom/movable/screen/plane_master/parallax_white/PM = locate() in C.screen if(PM) PM.color = list( From 6c347a9186d46c5775227084b48ffb398dbd0848 Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Tue, 22 Feb 2022 19:50:32 -0300 Subject: [PATCH 3/7] Fixes targets (#15521) * Automatic changelog compile [ci skip] * Update files Co-authored-by: Changelogs --- code/game/objects/items/shooting_range.dm | 1 + code/game/objects/structures/target_stake.dm | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index ced0ee3160..989cc5a73e 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -34,6 +34,7 @@ /obj/item/target/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(pinnedLoc) pinnedLoc.removeTarget(user) + . = ..() /obj/item/target/syndicate icon_state = "target_s" diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index c5f3a089f7..dc920556f7 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -58,13 +58,10 @@ pinned_target.nullPinnedLoc() nullPinnedTarget() handle_density() - if(ishuman(user)) - if(!user.get_active_held_item()) - user.put_in_hands(pinned_target) - to_chat(user, "You take the target out of the stake.") - else - pinned_target.forceMove(user.drop_location()) - to_chat(user, "You take the target out of the stake.") + pinned_target.forceMove(get_turf(src)) + to_chat(user, "You take the target out of the stake.") + if(user.can_hold_items()) + user.put_in_hands(pinned_target) /obj/structure/target_stake/bullet_act(obj/item/projectile/P) if(pinned_target) From 74abf95c3238c08f099733312372c1060363bc2a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 22 Feb 2022 16:50:35 -0600 Subject: [PATCH 4/7] Automatic changelog generation for PR #15521 [ci skip] --- html/changelogs/AutoChangeLog-pr-15521.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15521.yml diff --git a/html/changelogs/AutoChangeLog-pr-15521.yml b/html/changelogs/AutoChangeLog-pr-15521.yml new file mode 100644 index 0000000000..15950ad33c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15521.yml @@ -0,0 +1,4 @@ +author: "SandPoot" +delete-after: True +changes: + - bugfix: "You know the training targets? You can grab them again now with your own hands, instead of using telekinesis." From 42c29ab318d1f700d315f93915495d35984d2056 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Tue, 22 Feb 2022 17:50:56 -0500 Subject: [PATCH 5/7] More Omega (#15519) * Update OmegaStation.dmm * Update OmegaStation.dmm * Update OmegaStation.dmm * Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 694 ++++++++++-------- 1 file changed, 404 insertions(+), 290 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index e9fec9bb24..bf0a0cb141 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -9230,7 +9230,7 @@ /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/west, /obj/item/folder/blue, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "aoE" = ( /obj/machinery/airalarm{ @@ -16206,6 +16206,9 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "azq" = ( @@ -16213,14 +16216,17 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "azr" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/visible{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -18293,10 +18299,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/camera{ - c_tag = "Central Hallway East"; - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -19245,11 +19247,6 @@ name = "Station Intercom"; pixel_x = -26 }, -/obj/machinery/camera{ - c_tag = "Engineering Secure Storage"; - dir = 4; - network = list("ss13","engine") - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -19534,6 +19531,10 @@ pixel_x = 24 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/camera{ + c_tag = "Central Hallway West"; + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aEK" = ( @@ -20344,10 +20345,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Central Hallway West"; - dir = 8 - }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/port) @@ -21268,7 +21265,7 @@ "aHg" = ( /obj/machinery/camera{ c_tag = "Gravity Generator Room"; - dir = 8; + dir = 6; network = list("ss13","engine") }, /obj/effect/turf_decal/bot_white/left, @@ -21461,15 +21458,13 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/vending/wardrobe/engi_wardrobe, /turf/open/floor/engine, /area/engineering/main) "aHv" = ( @@ -23360,10 +23355,6 @@ /area/solars/port/aft) "aKs" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Gravity Generator Chamber"; - req_access_txt = "19; 61" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -23379,6 +23370,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Gravity Generator"; + req_access_txt = "11" + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aKt" = ( @@ -24809,10 +24804,6 @@ /area/tcommsat/server) "aML" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Telecomms Control Room"; - req_access_txt = "19; 61" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -24820,6 +24811,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/airlock/engineering{ + name = "Telecommunications"; + req_access_txt = "61" + }, /turf/open/floor/plasteel, /area/tcommsat/server) "aMM" = ( @@ -27271,10 +27266,6 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/command{ - name = "Telecomms Server Room"; - req_access_txt = "61" - }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -27282,6 +27273,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, /turf/open/floor/plasteel/grimy, /area/tcommsat/server) "aQI" = ( @@ -28313,10 +28308,6 @@ }, /area/maintenance/port/aft) "aSM" = ( -/obj/machinery/door/airlock/command{ - name = "Telecomms Server Room"; - req_access_txt = "61" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -28337,6 +28328,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "aSN" = ( @@ -28354,7 +28349,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/structure/sign/warning/vacuum/external{ + pixel_x = -32 + }, /turf/open/floor/engine, /area/engineering/main) "aSQ" = ( @@ -28669,15 +28666,13 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "aTv" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation Room"; + req_access_txt = "39" }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 }, /turf/open/floor/plasteel/freezer, /area/medical/virology) @@ -28960,10 +28955,12 @@ /turf/open/floor/plasteel/dark, /area/maintenance/port/aft) "aTW" = ( -/obj/structure/bed, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/freezer, /area/medical/virology) "aTX" = ( @@ -31103,10 +31100,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, /turf/open/floor/plasteel, /area/medical/virology) "aXE" = ( @@ -32302,13 +32295,12 @@ /turf/open/floor/plasteel/dark, /area/medical/chemistry) "aZB" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/virology/glass{ - name = "Isolation Room"; - req_access_txt = "39" +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel, /area/medical/virology) "aZC" = ( /obj/structure/table/wood, @@ -34237,6 +34229,7 @@ /area/science/robotics/lab) "bcA" = ( /obj/effect/turf_decal/stripes/line, +/obj/machinery/rnd/production/circuit_imprinter, /turf/open/floor/plasteel, /area/science/robotics/lab) "bcB" = ( @@ -36708,37 +36701,10 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Xenobiology Central"; - dir = 4; - network = list("ss13","rd"); - pixel_y = -5 - }, /turf/open/floor/plasteel, /area/science/xenobiology) "bgd" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes, -/obj/item/extinguisher/mini, -/obj/machinery/airalarm/unlocked{ - dir = 4; - pixel_x = -23 - }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology Lab"; - dir = 4; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, +/obj/structure/closet/l3closet/scientist, /turf/open/floor/plasteel, /area/science/xenobiology) "bge" = ( @@ -36776,21 +36742,14 @@ }, /area/hallway/primary/aft) "bgg" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/machinery/camera{ - c_tag = "Xenobiology South"; - dir = 1; - network = list("ss13","rd") +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bgh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -38042,10 +38001,6 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "biD" = ( -/obj/machinery/shower{ - dir = 8; - name = "emergency shower" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" @@ -38053,6 +38008,12 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, +/obj/machinery/camera{ + c_tag = "Xenobiology Central"; + dir = 8; + network = list("ss13","rd"); + pixel_y = -5 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "biF" = ( @@ -38478,15 +38439,13 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjr" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjs" = ( /obj/effect/turf_decal/tile/purple{ @@ -38608,51 +38567,38 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bjD" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjE" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/scientist, /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/turf/open/floor/plasteel, /area/science/xenobiology) "bjF" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjG" = ( -/obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjH" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/stripes/end{ + dir = 8 }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -38708,67 +38654,33 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bjR" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 1 - }, -/obj/machinery/light, -/obj/machinery/requests_console{ - department = "Xenobiology Lab"; - name = "Xenobiology RC"; - pixel_y = -32; - receive_ore_updates = 1 - }, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/scientist, /obj/structure/cable/white{ - icon_state = "1-4" + icon_state = "1-2" }, -/turf/open/floor/circuit/green, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjS" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjT" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_y = 5 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/power/apc{ - areastring = "/area/science/xenobiology"; - dir = 4; - name = "Xenobiology Lab APC"; - pixel_x = 24 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = -24 - }, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_y = -24 - }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjU" = ( /obj/machinery/status_display{ @@ -39196,7 +39108,6 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/main) "blF" = ( -/obj/structure/fans/tiny, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/service/chapel/main) @@ -39209,12 +39120,6 @@ dir = 8 }, /obj/machinery/light/small, -/obj/machinery/button/massdriver{ - id = "chapelmassdoor"; - name = "mass driver blast door button"; - pixel_x = 24; - pixel_y = -8 - }, /obj/machinery/button/massdriver{ id = "chapelgun"; pixel_x = 24; @@ -39236,11 +39141,11 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/main) "blI" = ( +/obj/structure/fans/tiny, /obj/machinery/door/poddoor{ - id = "chapelmassdoor"; + id = "chapelgun"; name = "Chapel Launcher Door" }, -/obj/structure/fans/tiny, /turf/open/floor/plating, /area/service/chapel/main) "blJ" = ( @@ -40419,6 +40324,10 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall, /area/command/gateway) +"bRW" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "bVs" = ( /obj/structure/girder, /obj/effect/turf_decal/sand/plating, @@ -40459,6 +40368,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"cfq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/space/nearstation) "cfz" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/stripes/line{ @@ -40476,13 +40392,13 @@ /turf/open/floor/plasteel, /area/science/mixing) "chJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/bot, /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -40576,6 +40492,12 @@ /obj/machinery/pool/controller, /turf/open/floor/wood, /area/maintenance/starboard/aft) +"cLO" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "cRz" = ( /obj/machinery/button/door{ id = "supplybridge"; @@ -40722,6 +40644,14 @@ /obj/structure/sink/puddle, /turf/open/floor/plating/asteroid, /area/maintenance/port/aft) +"dxC" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_x = 30 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "dFV" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -40745,7 +40675,7 @@ /area/engineering/atmos) "dMl" = ( /obj/structure/sign/warning/fire, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -41046,7 +40976,6 @@ /turf/open/floor/plasteel, /area/science/mixing) "fbH" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/fireaxecabinet{ pixel_x = -30 @@ -41054,6 +40983,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -41099,6 +41029,13 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/asteroid/nearstation) +"fji" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "fjs" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -41153,7 +41090,7 @@ /obj/structure/window/reinforced/spawner/west, /obj/item/flashlight/lamp/green, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "fnp" = ( /obj/machinery/air_sensor/atmos/nitrous_tank, @@ -41367,6 +41304,33 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/port/aft) +"gia" = ( +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/machinery/power/apc{ + areastring = "/area/science/xenobiology"; + dir = 4; + name = "Xenobiology Lab APC"; + pixel_x = 24 + }, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = -24 + }, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_y = -24 + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "gii" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -41522,7 +41486,6 @@ }, /area/maintenance/starboard/aft) "gSv" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -41536,6 +41499,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark, /area/engineering/atmos) "gVX" = ( @@ -41578,6 +41542,12 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"hfm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) "hhM" = ( /turf/closed/mineral/random/labormineral, /area/science/test_area) @@ -41630,6 +41600,12 @@ }, /turf/closed/wall/r_wall/rust, /area/engineering/atmos) +"hvC" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "hyX" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -41648,6 +41624,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/plasteel, /area/science/mixing) "hDi" = ( @@ -41874,9 +41851,6 @@ }, /area/maintenance/starboard/aft) "ixk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 }, @@ -42017,7 +41991,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "iZQ" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input, @@ -42128,6 +42102,12 @@ dir = 1 }, /area/engineering/atmos) +"jpG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "jqM" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -42152,8 +42132,7 @@ /turf/open/floor/engine, /area/science/mixing) "jtZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/plasteel, @@ -42399,6 +42378,18 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"koJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/bed{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/freezer, +/area/medical/virology) "koL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -42477,13 +42468,13 @@ /turf/open/floor/plasteel, /area/science/mixing) "kCU" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/meter/atmos, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "kFf" = ( @@ -42570,6 +42561,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/maintenance/starboard/aft) +"kWQ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plasteel, +/area/science/mixing) "kYh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -42638,12 +42637,12 @@ /turf/open/floor/grass, /area/hallway/secondary/entry) "lvw" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/decal/cleanable/dirt, /obj/machinery/meter/atmos, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -42853,6 +42852,12 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"mrI" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) "msl" = ( /turf/closed/wall/rust, /area/command/gateway) @@ -42862,12 +42867,12 @@ /area/science/mixing) "msJ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "mvB" = ( @@ -42928,7 +42933,7 @@ "mTT" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; - name = "Port to Fuel Pipe" + name = "Port to Incinerator" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43151,7 +43156,7 @@ icon_state = "0-4" }, /turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) +/area/maintenance/disposal/incinerator) "nXb" = ( /obj/machinery/pool/drain, /turf/open/pool, @@ -43476,6 +43481,10 @@ pixel_y = 6; req_access_txt = "55" }, +/obj/machinery/shower{ + dir = 8; + name = "emergency shower" + }, /turf/open/floor/plasteel, /area/science/xenobiology) "pmx" = ( @@ -43539,7 +43548,6 @@ /area/maintenance/starboard/aft) "pvX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, @@ -43559,6 +43567,7 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/checker, /area/engineering/atmos) "pAN" = ( @@ -43733,8 +43742,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/item/broken_bottle, -/obj/item/pickaxe, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/engineering/atmos) "qeO" = ( @@ -43891,12 +43899,12 @@ /turf/open/floor/wood, /area/service/lawoffice) "qTa" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "qUQ" = ( @@ -44089,6 +44097,12 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/command/gateway) +"snF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "soC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -44238,7 +44252,7 @@ name = "Lawyer RC"; pixel_y = -30 }, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "syT" = ( /turf/closed/wall/r_wall/rust, @@ -46836,12 +46850,12 @@ /area/engineering/atmos) "tdN" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "tfP" = ( @@ -46902,7 +46916,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "ttA" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/bot, /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, @@ -46912,6 +46925,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -46987,6 +47001,26 @@ }, /turf/open/floor/plasteel/dark, /area/service/library) +"uac" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/syringes, +/obj/item/extinguisher/mini, +/obj/machinery/airalarm/unlocked{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "ucd" = ( /obj/machinery/door/airlock/research{ name = "Toxins Storage"; @@ -46998,23 +47032,28 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"udG" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/machinery/status_display{ + pixel_y = -32 + }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Security Checkpoint"; - dir = 10 - }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/hallway/primary/aft) +/turf/open/floor/plasteel, +/area/science/xenobiology) "udT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/power/apc{ @@ -47041,9 +47080,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "ueG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, /obj/machinery/light{ dir = 8 }, @@ -47054,6 +47090,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 6 + }, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -47097,6 +47136,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output, /turf/open/floor/engine/n2o, /area/engineering/atmos) +"ukp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "uok" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 8 @@ -47220,6 +47268,8 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/item/broken_bottle, +/obj/item/pickaxe, /turf/open/floor/plating, /area/engineering/atmos) "uCY" = ( @@ -47298,6 +47348,22 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) +"uTb" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/requests_console{ + department = "Xenobiology Lab"; + name = "Xenobiology RC"; + pixel_y = -32; + receive_ore_updates = 1 + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/turf/open/floor/circuit/green, +/area/science/xenobiology) "uTF" = ( /obj/machinery/door/window/southleft{ name = "Mass Driver Door"; @@ -47494,6 +47560,26 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"vuZ" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) +"vvD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/medical/virology) "vxf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -47539,7 +47625,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "vJt" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/bot, /obj/machinery/space_heater, /obj/machinery/light{ @@ -47553,6 +47638,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -47847,6 +47933,37 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"xjj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Security Checkpoint"; + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"xoR" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology South"; + dir = 1; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "xpX" = ( /obj/structure/toilet{ dir = 8 @@ -47864,11 +47981,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -47908,12 +48025,12 @@ id = "incineratorturbine" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 9 + }, /turf/open/floor/plasteel/checker, /area/maintenance/disposal/incinerator) "xwu" = ( @@ -47997,12 +48114,13 @@ /turf/closed/wall/r_wall, /area/engineering/atmos) "xKp" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" +/obj/machinery/door/airlock/external{ + name = "Engineering External Access"; + req_access_txt = "10;13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/engineering/gravity_generator) +/area/engineering/main) "xMv" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ @@ -48169,14 +48287,10 @@ /turf/open/floor/plasteel, /area/service/bar/atrium) "yhg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/area/asteroid/nearstation) "yin" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -75304,7 +75418,7 @@ aCF qTa oJp hUG -yhg +hUG hUG hUG ueC @@ -75561,7 +75675,7 @@ jpv msJ rjQ rjQ -jtZ +rjQ rjQ bGL vuN @@ -76085,7 +76199,7 @@ xyo hNO bOy uBJ -xKp +aGe aId aIc aJi @@ -78154,8 +78268,8 @@ aPI bwV aRF aSP -aEt -bvo +xKp +yhg aad bvo aad @@ -80190,7 +80304,7 @@ qui awJ axo ayi -diG +jtZ oGc awF aCA @@ -80488,9 +80602,9 @@ aSe aSJ aTm aLw -aaa -aaa -aaa +vuZ +aad +aad aaa aaa aaa @@ -80704,7 +80818,7 @@ aqz aqz axq cBf -diG +ucu aAr aBy aCD @@ -80744,6 +80858,8 @@ aKV aTk aSK aYE +cLO +hvC aKV aad aaa @@ -80761,8 +80877,6 @@ aaa aaa aaa aaa -aaa -aaa jFP jFP jFP @@ -81000,10 +81114,10 @@ aVG aKV aTl aXD -aKV -aKV -aKV -aKV +vvD +ukp +koJ +aLw aaa aaa aaa @@ -89725,7 +89839,7 @@ aUy aWQ tWh aYc -ucu +iey sKB baI bby @@ -90495,7 +90609,7 @@ aVr aUz aWT fgG -aYc +xjj aYW bys byo @@ -91288,10 +91402,10 @@ aae aaa aaa aaa -aaa -aaa -aaa -aaa +aac +aac +aac +aac aaa aaa aaa @@ -91547,9 +91661,9 @@ bjc bfP bfP aad -aaa -aaa -aaa +fji +aac +aac aaa aaa aaa @@ -91804,8 +91918,8 @@ bgY bgm bfP aad -aac -aac +jpG +aKo aad aad aaa @@ -92061,7 +92175,7 @@ bgZ bhM sKZ aad -aac +cfq aad aad aad @@ -92318,7 +92432,7 @@ exb bhN bfP bfP -aad +hfm aad aad aad @@ -92574,8 +92688,8 @@ jdD bhb bhO bgd -bfP -aad +uac +snF aad aad aad @@ -92831,8 +92945,8 @@ bhP bjq bjD bgg -bfP -aad +xoR +snF aad aad aad @@ -93088,8 +93202,8 @@ biY bjr bjE bjR -bfP -aad +uTb +snF aad aad aad @@ -93345,8 +93459,8 @@ biZ bjs bjF bjS -bfP -aad +udG +snF aad aad aad @@ -93602,8 +93716,8 @@ bja bjt bjG bjT -bfP -aad +gia +snF aad aad aad @@ -93858,9 +93972,9 @@ xFw bjb bju bjH -bfP -sKZ -aad +dxC +bRW +mrI aad aad aad @@ -94116,7 +94230,7 @@ bjc bjv bjc bfP -aad +bfP aad aad aad @@ -98206,7 +98320,7 @@ bdI bdM bft ajP -mhf +kWQ kCG ybw vGQ From dcad695889987a4e61b246947bc12a0ca277c424 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 22 Feb 2022 16:50:59 -0600 Subject: [PATCH 6/7] Automatic changelog generation for PR #15519 [ci skip] --- html/changelogs/AutoChangeLog-pr-15519.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15519.yml diff --git a/html/changelogs/AutoChangeLog-pr-15519.yml b/html/changelogs/AutoChangeLog-pr-15519.yml new file mode 100644 index 0000000000..d059119b6c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15519.yml @@ -0,0 +1,15 @@ +author: "TripleShades" +delete-after: True +changes: + - rscadd: "[Omega] Trash chute to space in Virology" + - rscadd: "[Omega] Trash chute to space in Xenobiology" + - rscadd: "[Omega] Airlock leading out to Supermatter cooling pipeline" + - rscadd: "[Omega] Two more air pumps to Toxins" + - rscadd: "[Omega] Robotics circuitry printer" + - rscadd: "[Omega] Windoor to Cargo delivery flaps" + - rscdel: "[Omega] Backdoor to Gravity Generator" + - rscdel: "[Omega] Bunched up cameras +tweak: [Omega] Pipes leading to the Incinerator burn chamber are now black +tweak: [Omega] Gravity Generator airlocks are now accessible by engineers +tweak: [Omega] Chapel mass driver and mass driver bulkhead are now controlled by one button instead of two" + - bugfix: "[Omega] Lawyer's carpet is no longer airless" From 8bfbe427d3cef2eb51997836146f41d664683e75 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 23 Feb 2022 00:38:38 +0000 Subject: [PATCH 7/7] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15519.yml | 15 --------------- html/changelogs/AutoChangeLog-pr-15521.yml | 4 ---- html/changelogs/archive/2022-02.yml | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15519.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15521.yml diff --git a/html/changelogs/AutoChangeLog-pr-15519.yml b/html/changelogs/AutoChangeLog-pr-15519.yml deleted file mode 100644 index d059119b6c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15519.yml +++ /dev/null @@ -1,15 +0,0 @@ -author: "TripleShades" -delete-after: True -changes: - - rscadd: "[Omega] Trash chute to space in Virology" - - rscadd: "[Omega] Trash chute to space in Xenobiology" - - rscadd: "[Omega] Airlock leading out to Supermatter cooling pipeline" - - rscadd: "[Omega] Two more air pumps to Toxins" - - rscadd: "[Omega] Robotics circuitry printer" - - rscadd: "[Omega] Windoor to Cargo delivery flaps" - - rscdel: "[Omega] Backdoor to Gravity Generator" - - rscdel: "[Omega] Bunched up cameras -tweak: [Omega] Pipes leading to the Incinerator burn chamber are now black -tweak: [Omega] Gravity Generator airlocks are now accessible by engineers -tweak: [Omega] Chapel mass driver and mass driver bulkhead are now controlled by one button instead of two" - - bugfix: "[Omega] Lawyer's carpet is no longer airless" diff --git a/html/changelogs/AutoChangeLog-pr-15521.yml b/html/changelogs/AutoChangeLog-pr-15521.yml deleted file mode 100644 index 15950ad33c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15521.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "You know the training targets? You can grab them again now with your own hands, instead of using telekinesis." diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index 8ae10a7f5c..4d58b2e226 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -128,3 +128,20 @@ - bugfix: '[Omega] Toxins Mix Chamber no longer starts bolted' - bugfix: '[Omega] Missing pipe above Security leading into Perma' - bugfix: '[Omega] Secure Tech Storage now properly has an area' +2022-02-23: + SandPoot: + - bugfix: You know the training targets? You can grab them again now with your own + hands, instead of using telekinesis. + TripleShades: + - rscadd: '[Omega] Trash chute to space in Virology' + - rscadd: '[Omega] Trash chute to space in Xenobiology' + - rscadd: '[Omega] Airlock leading out to Supermatter cooling pipeline' + - rscadd: '[Omega] Two more air pumps to Toxins' + - rscadd: '[Omega] Robotics circuitry printer' + - rscadd: '[Omega] Windoor to Cargo delivery flaps' + - rscdel: '[Omega] Backdoor to Gravity Generator' + - rscdel: '[Omega] Bunched up cameras tweak: [Omega] Pipes leading to the Incinerator + burn chamber are now black tweak: [Omega] Gravity Generator airlocks are now + accessible by engineers tweak: [Omega] Chapel mass driver and mass driver bulkhead + are now controlled by one button instead of two' + - bugfix: '[Omega] Lawyer''s carpet is no longer airless'