From 23b4e65b4c300fb96d0113ddd857507d98f5e078 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 1 Jan 2022 00:30:50 +0000 Subject: [PATCH 1/9] Automatic changelog compile [ci skip] --- html/changelog.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 483c12cddc..f4642b7afe 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -384,14 +384,6 @@ - -

30 October 2021

-

keronshb updated:

- GoonStation 13 Development Team From 2940d141cf66c1e93647181fd54e60bed82b6c76 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 1 Jan 2022 07:10:35 +0100 Subject: [PATCH 2/9] please-dont-smite-us-lummox --- .../configuration/entries/general.dm | 2 ++ code/game/objects/items/charter.dm | 30 +++++++++++++++++-- code/modules/admin/topic.dm | 6 ++++ config/entries/general.txt | 3 ++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 57c933edc5..2fe020d544 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -347,3 +347,5 @@ default = FALSE /datum/config_entry/flag/dynamic_config_enabled + +/datum/config_entry/flag/station_name_needs_approval diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 3f5296a1ef..e9c3842619 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -14,6 +14,7 @@ var/response_timer_id = null var/approval_time = 600 var/allow_unicode = FALSE + var/admin_approved = FALSE var/static/regex/standard_station_regex @@ -62,8 +63,32 @@ to_chat(user, "Your name has been sent to your employers for approval.") // Autoapproves after a certain time - response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) - to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [html_encode(new_name)] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") + var/requires_approval = CONFIG_GET(flag/station_name_needs_approval) + response_timer_id = addtimer(CALLBACK(src, .proc/check_state, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) + to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [html_encode(new_name)] ([requires_approval ? "REQUIRES ADMIN APPROVAL and will autodeny" : "will autoapprove"] in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT)[requires_approval ? " (APPROVE)" : ""] [ADMIN_CENTCOM_REPLY(user)]") + +/obj/item/station_charter/proc/check_state(designation, uname, ureal_name, ukey) + var/requires_approval = CONFIG_GET(flag/station_name_needs_approval) + if(requires_approval && !admin_approved) + var/turf/T = get_turf(src) + T.visible_message("A note appears on [src], stating this sector requires central command approval for its station names, which was not performed in time for this request. Looks like the change has been auto-rejected.") + var/m = "Station rename has been autorejected due to config requiring admin approval." + message_admins(m) + log_admin(m) + else + rename_station(designation, uname, ureal_name, ukey) + response_timer_id = null + admin_approved = FALSE + +/obj/item/station_charter/proc/allow_pass(user) + if(!user) + return + if(!response_timer_id) + return + admin_approved = TRUE + var/m = "[key_name(user)] has approved the proposed station name. It can still be denied prior to the timer expiring." + message_admins(m) + log_admin(m) /obj/item/station_charter/proc/reject_proposed(user) if(!user) @@ -80,6 +105,7 @@ deltimer(response_timer_id) response_timer_id = null + admin_approved = FALSE /obj/item/station_charter/proc/rename_station(designation, uname, ureal_name, ukey) set_station_name(designation) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index a8a7e51611..11270e0d96 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2038,6 +2038,12 @@ var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"]) if(istype(charter)) charter.reject_proposed(usr) + else if(href_list["approve_custom_name"]) + if(!check_rights(R_ADMIN)) + return + var/obj/item/station_charter/charter = locate(href_list["approve_custom_name"]) + if(istype(charter)) + charter.allow_pass(usr) else if(href_list["jumpto"]) if(!isobserver(usr) && !check_rights(R_ADMIN)) return diff --git a/config/entries/general.txt b/config/entries/general.txt index 5fc3512c60..7fef691006 100644 --- a/config/entries/general.txt +++ b/config/entries/general.txt @@ -503,3 +503,6 @@ PAI_CUSTOM_HOLOFORMS ## Enables monstermos/"equalization" step in atmos. # ATMOS_EQUALIZATION_ENABLED + +## Do station renames from the station charter require admin approval to pass, as opposed to autoapproving if not denied. +STATION_NAME_NEEDS_APPROVAL From 32aabe23b0c6e9b6c989cb1b01343ffd63d78981 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 1 Jan 2022 08:33:53 -0600 Subject: [PATCH 3/9] Automatic changelog generation for PR #15450 [ci skip] --- html/changelogs/AutoChangeLog-pr-15450.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15450.yml diff --git a/html/changelogs/AutoChangeLog-pr-15450.yml b/html/changelogs/AutoChangeLog-pr-15450.yml new file mode 100644 index 0000000000..d32b4d42a4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15450.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - admin: "Station names now require admin approval instead of autoaccepting." From c97d09c0ad1abe95c72ed372299427efda1d22bb Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 1 Jan 2022 10:48:03 -0800 Subject: [PATCH 4/9] Fixes bluespace pipes (I think) (#15437) --- code/game/machinery/pipe/construction.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 5b30105409..8a084353e4 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -45,7 +45,8 @@ Buildable meters if(make_from) make_from_existing(make_from) else - pipe_type = _pipe_type + if(!initial(src.pipe_type)) + pipe_type = _pipe_type setDir(_dir) update() From 7f5d23e3ba9af9bb270898b09c20bebfec1430f3 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 1 Jan 2022 12:48:05 -0600 Subject: [PATCH 5/9] Automatic changelog generation for PR #15437 [ci skip] --- html/changelogs/AutoChangeLog-pr-15437.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15437.yml diff --git a/html/changelogs/AutoChangeLog-pr-15437.yml b/html/changelogs/AutoChangeLog-pr-15437.yml new file mode 100644 index 0000000000..b5afc5bc53 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15437.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Bluespace pipes" From 6182321324a7f26b70323103f208917e1a1b3533 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 2 Jan 2022 00:31:26 +0000 Subject: [PATCH 6/9] Automatic changelog compile [ci skip] --- html/changelog.html | 24 +++++++++------------- html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-15437.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15450.yml | 4 ---- 4 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15437.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15450.yml diff --git a/html/changelog.html b/html/changelog.html index f4642b7afe..9a121d098a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,16 @@ -->
+

02 January 2022

+

DeltaFire15 updated:

+
    +
  • Station names now require admin approval instead of autoaccepting.
    • +
+

Putnam3145 updated:

+
    +
  • Bluespace pipes
    • +
+

31 December 2021

SandPoot updated:

    @@ -370,20 +380,6 @@
  • removes required enemies
  • Lowers assassination threat threshold
- -

31 October 2021

-

DeltaFire15 updated:

-
    -
  • You can now drag things over prone people again.
    • -
-

DrPainis updated:

-
    -
  • Walking no longer makes you fat.
    • -
-

keronshb updated:

-
    -
  • Christmas trees are now indestructible
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 07ecd76b3b..2d71a43d5e 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30430,3 +30430,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. SandPoot: - bugfix: You also no longer get every animation sprite and direction sprite of items on the menus. +2022-01-02: + DeltaFire15: + - admin: Station names now require admin approval instead of autoaccepting. + Putnam3145: + - bugfix: Bluespace pipes diff --git a/html/changelogs/AutoChangeLog-pr-15437.yml b/html/changelogs/AutoChangeLog-pr-15437.yml deleted file mode 100644 index b5afc5bc53..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15437.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Bluespace pipes" diff --git a/html/changelogs/AutoChangeLog-pr-15450.yml b/html/changelogs/AutoChangeLog-pr-15450.yml deleted file mode 100644 index d32b4d42a4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15450.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - admin: "Station names now require admin approval instead of autoaccepting." From c63489abe42a3522c116dccaf1e9d62e0b1ed9a1 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 1 Jan 2022 16:57:58 -0800 Subject: [PATCH 7/9] Update say.dm (#15451) --- code/modules/mob/living/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 1a925e8eaf..3aeabd1d51 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -297,7 +297,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( AM.Hear(rendered, src, message_language, message, null, spans, message_mode, source) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_LIVING_SAY_SPECIAL, src, message) - if(!eavesdrop_range && say_test(message) == "2") // Yell hook + if(client && !eavesdrop_range && say_test(message) == "2") // Yell hook process_yelling(listening, rendered, src, message_language, message, spans, message_mode, source) //speech bubble From a0e3dd5205b81cb47e03ccfa780107a41a89d1f4 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sat, 1 Jan 2022 20:15:21 -0500 Subject: [PATCH 8/9] Meta Atmos Layout (#15445) * Update MetaStation.dmm * Update MetaStation.dmm * Update MetaStation.dmm --- _maps/map_files/MetaStation/MetaStation.dmm | 294 +++++++++++--------- 1 file changed, 170 insertions(+), 124 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 32e03957f5..48054115e6 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -19429,6 +19429,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/starboard) "bzi" = ( @@ -21200,10 +21204,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -24661,14 +24661,14 @@ /turf/closed/wall, /area/maintenance/disposal/incinerator) "bZD" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Incinerator Access"; - req_access_txt = "12" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/airlock/atmos{ + name = "Turbine Access"; + req_access_txt = "32" + }, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "bZE" = ( @@ -25285,7 +25285,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, /area/maintenance/disposal/incinerator) "caZ" = ( /obj/structure/cable/yellow{ @@ -25300,7 +25303,7 @@ c_tag = "Atmospherics - Incinerator"; name = "atmospherics camera" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/disposal/incinerator) "cba" = ( /obj/machinery/power/smes{ @@ -25310,7 +25313,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/disposal/incinerator) "cbp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -25905,7 +25908,7 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 6 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/maintenance/disposal/incinerator) "ccU" = ( /obj/structure/table/wood/poker, @@ -44716,9 +44719,6 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/central) "cVp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -44812,12 +44812,8 @@ /turf/open/floor/carpet, /area/service/theater) "cWn" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 6 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -47801,24 +47797,11 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/aisat/exterior) "dtk" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/button/door{ - id = "atmos"; - name = "Atmospherics Lockdown"; - pixel_x = 26; - pixel_y = -26; - req_access_txt = "24" - }, -/turf/open/floor/plasteel, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "dtl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -49353,12 +49336,8 @@ /area/maintenance/port) "dRb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring"; - req_access_txt = "24" +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -50247,13 +50226,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/main) -"erz" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmos) "erD" = ( /obj/machinery/reagentgrinder, /obj/structure/table/glass, @@ -52060,7 +52032,9 @@ dir = 8 }, /obj/machinery/pipedispenser/disposal, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "fpr" = ( @@ -52546,12 +52520,8 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "fFR" = ( -/obj/structure/closet/crate, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Atmospherics - Entrance" - }, -/turf/open/floor/plasteel, +/turf/closed/wall, /area/engineering/atmos) "fFY" = ( /obj/structure/cable, @@ -52799,7 +52769,12 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/light/small, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "fNh" = ( @@ -52807,6 +52782,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Atmospherics - Entrance" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "fNk" = ( @@ -53119,6 +53097,12 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"fYL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/engineering/atmos) "fZR" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/stripes/line{ @@ -53158,9 +53142,6 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/pipedispenser, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ @@ -53170,6 +53151,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "gbt" = ( @@ -53738,7 +53722,7 @@ dir = 6 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -54301,14 +54285,20 @@ /turf/open/floor/plasteel, /area/commons/dorms) "gGc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/obj/machinery/button/door{ + id = "atmos"; + name = "Atmospherics Lockdown"; + pixel_x = 26; + req_access_txt = "24" + }, +/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "gGH" = ( /obj/structure/cable/yellow{ @@ -54897,8 +54887,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, /obj/machinery/suit_storage_unit/atmos, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "hdR" = ( /obj/structure/chair/stool{ @@ -55730,6 +55723,12 @@ /area/ai_monitored/aisat/exterior) "hAI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "hAL" = ( @@ -56917,6 +56916,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/light/small, /turf/open/floor/plasteel, /area/engineering/atmos) "iiE" = ( @@ -57457,11 +57457,11 @@ /turf/open/floor/plating, /area/service/chapel/main) "ixJ" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) "ixL" = ( @@ -60777,7 +60777,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/closed/wall, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, /area/engineering/atmos) "kuk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -61962,12 +61967,13 @@ /area/command/bridge) "kWW" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/light/small{ + dir = 8 }, -/turf/closed/wall, +/obj/structure/closet/crate, +/turf/open/floor/plasteel, /area/engineering/atmos) "kXd" = ( /obj/machinery/power/terminal, @@ -63117,14 +63123,13 @@ /turf/open/floor/plasteel, /area/commons/locker) "lFH" = ( -/obj/machinery/light/small{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/suit_storage_unit/atmos, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "lFQ" = ( /obj/structure/chair/office/dark{ @@ -63624,10 +63629,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, +/obj/machinery/pipedispenser/disposal/transit_tube, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, /area/engineering/atmos) "lUv" = ( /obj/structure/noticeboard{ @@ -63765,10 +63769,7 @@ /area/commons/fitness/recreation) "lXt" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 + icon_state = "1-8" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -65448,6 +65449,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "mSL" = ( @@ -67276,10 +67281,6 @@ /obj/machinery/light_switch{ pixel_x = -26 }, -/obj/machinery/pipedispenser/disposal/transit_tube, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, @@ -67738,6 +67739,13 @@ name = "Atmospherics Monitoring"; req_access_txt = "24" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/engineering/atmos) "olW" = ( @@ -68249,9 +68257,6 @@ /turf/open/floor/plasteel, /area/service/bar) "oBF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -68954,10 +68959,16 @@ /turf/open/floor/plasteel, /area/commons/dorms) "oWF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" }, -/turf/closed/wall, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, /area/engineering/atmos) "oWR" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -72841,6 +72852,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "qXd" = ( @@ -73117,12 +73134,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop"; - req_access_txt = "24" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/engineering/atmos) "rdv" = ( /obj/effect/turf_decal/stripes/line, @@ -77268,6 +77282,13 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solars/starboard/fore) +"tzt" = ( +/obj/machinery/power/floodlight, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/engineering/atmos) "tAp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -77390,6 +77411,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "tFJ" = ( @@ -77416,6 +77440,16 @@ }, /turf/open/floor/plasteel/dark, /area/security/office) +"tGd" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "tGD" = ( /obj/structure/closet/crate, /obj/structure/extinguisher_cabinet{ @@ -78818,8 +78852,11 @@ /turf/open/floor/plasteel/dark, /area/cargo/office) "usM" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -79128,11 +79165,14 @@ /turf/open/floor/wood, /area/commons/vacant_room/office) "uED" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/turf/open/floor/plating, +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Monitoring"; + req_access_txt = "24" + }, +/turf/open/floor/plasteel, /area/engineering/atmos) "uFM" = ( /obj/machinery/power/emitter, @@ -80575,6 +80615,12 @@ dir = 4 }, /obj/effect/landmark/start/atmospheric_technician, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "vzs" = ( @@ -82840,7 +82886,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/closed/wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/engineering/atmos) "wKo" = ( /obj/effect/turf_decal/stripes/line, @@ -84685,9 +84732,8 @@ /turf/open/floor/plasteel, /area/science/mixing) "xHm" = ( -/obj/machinery/holopad, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -126368,7 +126414,7 @@ qxd jJw usM lXt -xHm +lzQ tyC kLr kdi @@ -126625,7 +126671,7 @@ odq ipm hAI oBF -erz +oBF jxI kLr qDJ @@ -126881,9 +126927,9 @@ bvh qxd oNX vzb -iix -woN -tyC +mMn +cWn +xHm kLr iix sKv @@ -127139,7 +127185,7 @@ qxd wtG qWR cVp -woN +gGc dtk lFH hdJ @@ -127395,8 +127441,8 @@ iLe qxd oBX olw -oWF -cWn +sKv +sKv uKL ktV wKg @@ -127653,7 +127699,7 @@ sKv oay fNf kWW -gGc +uKL grX hop ldI @@ -127663,7 +127709,7 @@ ooB ibJ ibJ ibJ -ibJ +tGd ibJ ibJ omb @@ -127910,7 +127956,7 @@ hZe mZD mSB dRb -hAI +oWF tFH tfk sfM @@ -127920,7 +127966,7 @@ eCZ mMn mMn mMn -mMn +fYL mMn mMn eWY @@ -128177,7 +128223,7 @@ pcs mMn mMn mMn -mMn +fYL mMn mMn mMn @@ -128424,7 +128470,7 @@ uhB jiZ mHn mHn -fGc +mHn rdg fGc lHN @@ -128434,7 +128480,7 @@ mMn mMn mMn mMn -mMn +fYL mMn mMn mMn @@ -128691,7 +128737,7 @@ mMn mMn mMn mMn -mMn +tzt mMn mMn mMn From 6a87f805ecec11f4d88eedf5bde2b3655108adb5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 1 Jan 2022 19:15:24 -0600 Subject: [PATCH 9/9] Automatic changelog generation for PR #15445 [ci skip] --- html/changelogs/AutoChangeLog-pr-15445.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15445.yml diff --git a/html/changelogs/AutoChangeLog-pr-15445.yml b/html/changelogs/AutoChangeLog-pr-15445.yml new file mode 100644 index 0000000000..ddd1911895 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15445.yml @@ -0,0 +1,8 @@ +author: "TripleShades" +delete-after: True +changes: + - rscadd: "(Meta) Floodlight to Atmospherics +tweak: (Meta) Atmospherics Entryway layout change +tweak: (Meta) Atmospherics Monitoring room layout tweak +tweak: (Meta) Atmospherics Supply Line room airlock location change" + - bugfix: "(Meta) Incinerator Access airlock now has the correct access"