From 3931b4176e3e6f470991cbb14a18cb1a8d87fe89 Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Wed, 8 Jul 2026 16:08:57 -0700 Subject: [PATCH 01/13] Expand kilo's xenobio --- .../KiloStation_Oculis/KiloStation_Oculis.dmm | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm index d60634f0b3a..6501ea3e466 100644 --- a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm +++ b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm @@ -116716,7 +116716,7 @@ aaa aaa aaa aaa -aaa +aeU aUz aeu aeu @@ -116972,7 +116972,7 @@ aaa aaa aaa aaa -aaa +aUz aeU aeu aeu @@ -117228,12 +117228,12 @@ aaa aaa aaa aaa -aaa -aUz aeU aeu aeu aeu +aeu +aeu vJc hgZ dGR @@ -117483,11 +117483,9 @@ aaa aaa aaa aaa -aaa -aaa aeU aeU -aeu +aeU aeu vJc vJc @@ -117495,6 +117493,8 @@ vJc vJc vJc vJc +vJc +vJc cyn nOw nJj @@ -117740,8 +117740,6 @@ aaa aaa aaa aaa -aaa -aaa aeU aeU aeu @@ -117749,6 +117747,8 @@ aeu vJc gpI ndy +ndy +ndy oBC vJc fxz @@ -117997,15 +117997,15 @@ aaa aaa aaa aaa -aaa -aaa aeU aeU aeu aeu vJc egE +ndy uyR +ndy jYD uNh kYj @@ -118255,14 +118255,14 @@ aaa aaa aaa aaa -aaa -aaa aeU aeu aeu vJc vct +ndy rRz +ndy rFr khV wPC @@ -118512,15 +118512,15 @@ aaa aaa aaa aaa -aaa -aaa -aeU aeU aeu +aeu vJc ndy +ndy uXI ndy +ndy xDe cTH mrL @@ -118769,14 +118769,14 @@ aaa aaa aaa aaa -aaa -aaa aeU aeU aeu vJc jhN ndy +ndy +ndy hSh vJc pak @@ -119026,11 +119026,11 @@ aaa aaa aaa aaa -aaa -aaa aeU aUz -aeU +aeu +vJc +vJc vJc vJc vJc @@ -119284,8 +119284,8 @@ aaa aaa aaa aaa -aaa -aaa +aeU +aeU aeU aeU aeu From a579b6d5ae415701fcea6020a67af74489213ce1 Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Wed, 8 Jul 2026 16:28:13 -0700 Subject: [PATCH 02/13] Add access reqs to sec windoors --- _maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm index 6501ea3e466..fe96243dcac 100644 --- a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm +++ b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm @@ -53857,7 +53857,8 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/right/directional/east{ - name = "Security Delivery Access" + name = "Security Delivery Access"; + req_access = list("security") }, /turf/open/floor/iron/dark, /area/station/security/brig) @@ -54882,7 +54883,8 @@ /obj/item/folder/red, /obj/item/pen, /obj/machinery/door/window/brigdoor/right/directional/south{ - name = "Armory Windoor" + name = "Armory Windoor"; + req_access = list("armory") }, /turf/open/floor/plating, /area/station/security/armory) From c1b78ee7b10d40b7dcb243707a65fb00f0eda2ea Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Wed, 8 Jul 2026 17:12:47 -0700 Subject: [PATCH 03/13] armory --- .../KiloStation_Oculis/KiloStation_Oculis.dmm | 116 +++--------------- modular_oculis/modules/spawners/armory.dm | 4 + tgstation.dme | 1 + 3 files changed, 24 insertions(+), 97 deletions(-) create mode 100644 modular_oculis/modules/spawners/armory.dm diff --git a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm index fe96243dcac..1fa853e5a90 100644 --- a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm +++ b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm @@ -2303,22 +2303,14 @@ /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) "aJb" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/e_gun, -/obj/item/gun/energy/e_gun{ - pixel_x = 3; - pixel_y = -3 - }, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/shotguns, /turf/open/floor/iron/dark/textured_large, /area/station/security/armory) "aJh" = ( @@ -3461,6 +3453,7 @@ }, /obj/item/gun/energy/temperature/security, /obj/item/clothing/suit/hooded/ablative, +/obj/item/gun/ballistic/automatic/battle_rifle, /turf/open/floor/iron/dark/textured_edge, /area/station/security/armory) "bcs" = ( @@ -4498,18 +4491,10 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "btg" = ( -/obj/item/gun/energy/disabler{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/disabler, -/obj/item/gun/energy/disabler{ - pixel_x = 3; - pixel_y = -3 - }, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/rack, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/mod_lasers_small, /turf/open/floor/iron/dark/textured_large, /area/station/security/armory) "btt" = ( @@ -26940,6 +26925,7 @@ /obj/machinery/light/directional/south, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/item/gun/grenadelauncher, /turf/open/floor/iron/dark/textured_corner{ dir = 1 }, @@ -27192,6 +27178,9 @@ /obj/machinery/light/directional/east, /obj/structure/rack, /obj/structure/secure_safe/directional/east, +/obj/item/melee/breaching_hammer, +/obj/item/melee/breaching_hammer, +/obj/item/melee/breaching_hammer, /turf/open/floor/iron/dark/textured_edge{ dir = 4 }, @@ -34769,33 +34758,9 @@ dir = 8 }, /obj/structure/rack, -/obj/item/clothing/suit/armor/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/shield/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/shield/riot, -/obj/item/shield/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/toggleable/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/toggleable/riot, -/obj/item/clothing/head/helmet/toggleable/riot{ - pixel_x = 3; - pixel_y = -3 - }, +/obj/effect/spawner/random/armory/riot_shield, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_helmet, /turf/open/floor/iron/dark/textured_edge{ dir = 8 }, @@ -47075,22 +47040,14 @@ }, /area/station/maintenance/port/fore) "ojW" = ( -/obj/structure/rack, -/obj/item/gun/energy/laser{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser{ - pixel_x = 3; - pixel_y = -3 - }, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/smg, /turf/open/floor/iron/dark/textured_large, /area/station/security/armory) "ojX" = ( @@ -47347,24 +47304,6 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "opH" = ( -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/alt{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/head/helmet/alt{ - pixel_x = 3; - pixel_y = -3 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/red/line{ dir = 8 @@ -47373,6 +47312,8 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 }, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/bulletproof_helmet, /turf/open/floor/iron/dark/textured_edge{ dir = 8 }, @@ -61822,21 +61763,10 @@ /area/station/maintenance/disposal/incinerator) "sDx" = ( /obj/structure/rack, -/obj/item/gun/energy/e_gun/dragnet{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/gun/energy/e_gun/dragnet, -/obj/item/grenade/barrier{ - pixel_x = -4 - }, -/obj/item/grenade/barrier, -/obj/item/grenade/barrier{ - pixel_x = 4 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/spawner/random/armory/barrier_grenades, /turf/open/floor/iron/dark/textured_large, /area/station/security/armory) "sDy" = ( @@ -72507,19 +72437,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "vOw" = ( -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/riot, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = 3; - pixel_y = -3 - }, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/smg, /turf/open/floor/iron/dark/textured_large, /area/station/security/armory) "vOz" = ( diff --git a/modular_oculis/modules/spawners/armory.dm b/modular_oculis/modules/spawners/armory.dm new file mode 100644 index 00000000000..e2b782097c3 --- /dev/null +++ b/modular_oculis/modules/spawners/armory.dm @@ -0,0 +1,4 @@ +/obj/effect/spawner/random/armory/breaching_hammer + name = "breaching_hammer" + icon_state = "breaching_hammer" + loot = list(/obj/item/melee/breaching_hammer) diff --git a/tgstation.dme b/tgstation.dme index fc0c3e64111..0b994756e45 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -10217,6 +10217,7 @@ #include "modular_oculis\modules\relays\code\relays.dm" #include "modular_oculis\modules\slime_luxpens\code\hypospray.dm" #include "modular_oculis\modules\slime_luxpens\code\medicine_reagents.dm" +#include "modular_oculis\modules\spawners\armory.dm" #include "modular_oculis\modules\species\ethereal\code\ethereal.dm" #include "modular_oculis\modules\species\ethereal\code\ethereal_bodyparts.dm" #include "modular_oculis\modules\species\ethereal\code\ethereal_eyes.dm" From 950d160dc954faa31a0a66ca1603dceb3ac9a3ad Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Thu, 9 Jul 2026 01:27:08 -0700 Subject: [PATCH 04/13] Add intercom, convert more to spawners --- .../KiloStation_Oculis/KiloStation_Oculis.dmm | 28 +++++++----------- modular_oculis/modules/spawners/armory.dm | 4 --- .../modules/spawners/code/armory.dm | 7 +++++ .../spawners/icons/oculis_random_spawners.dmi | Bin 0 -> 526 bytes tgstation.dme | 2 +- 5 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 modular_oculis/modules/spawners/armory.dm create mode 100644 modular_oculis/modules/spawners/code/armory.dm create mode 100644 modular_oculis/modules/spawners/icons/oculis_random_spawners.dmi diff --git a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm index 1fa853e5a90..ebe8809b167 100644 --- a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm +++ b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm @@ -9447,6 +9447,12 @@ pixel_y = 11 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/item/radio/intercom/directional/north{ + broadcasting = 1; + name = "Interrogation Intercom"; + frequency = 1423; + listening = 0 + }, /turf/open/floor/iron/dark/textured_large, /area/station/security/interrogation) "cUy" = ( @@ -14254,13 +14260,11 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/item/radio/intercom/directional/west{ +/obj/effect/landmark/start/security_officer, +/obj/item/radio/intercom/directional/north{ name = "Interrogation Intercom"; - frequency = 1423; - pixel_x = 0; - pixel_y = 32 + frequency = 1423 }, -/obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark/textured_large, /area/station/security/interrogation) "eso" = ( @@ -27178,9 +27182,7 @@ /obj/machinery/light/directional/east, /obj/structure/rack, /obj/structure/secure_safe/directional/east, -/obj/item/melee/breaching_hammer, -/obj/item/melee/breaching_hammer, -/obj/item/melee/breaching_hammer, +/obj/effect/spawner/random/armory/oculis/breaching_hammer, /turf/open/floor/iron/dark/textured_edge{ dir = 4 }, @@ -72879,15 +72881,7 @@ }, /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, -/obj/item/storage/box/rubbershot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot{ - pixel_x = 3; - pixel_y = -3 - }, +/obj/effect/spawner/random/armory/rubbershot, /turf/open/floor/iron/dark/textured_large, /area/station/security/armory) "vVx" = ( diff --git a/modular_oculis/modules/spawners/armory.dm b/modular_oculis/modules/spawners/armory.dm deleted file mode 100644 index e2b782097c3..00000000000 --- a/modular_oculis/modules/spawners/armory.dm +++ /dev/null @@ -1,4 +0,0 @@ -/obj/effect/spawner/random/armory/breaching_hammer - name = "breaching_hammer" - icon_state = "breaching_hammer" - loot = list(/obj/item/melee/breaching_hammer) diff --git a/modular_oculis/modules/spawners/code/armory.dm b/modular_oculis/modules/spawners/code/armory.dm new file mode 100644 index 00000000000..4fb1f40d7a7 --- /dev/null +++ b/modular_oculis/modules/spawners/code/armory.dm @@ -0,0 +1,7 @@ +/obj/effect/spawner/random/armory/oculis + icon = 'modular_oculis/modules/spawners/icons/oculis_random_spawners.dmi' + +/obj/effect/spawner/random/armory/oculis/breaching_hammer + name = "breaching_hammer" + icon_state = "breaching_hammer" + loot = list(/obj/item/melee/breaching_hammer) diff --git a/modular_oculis/modules/spawners/icons/oculis_random_spawners.dmi b/modular_oculis/modules/spawners/icons/oculis_random_spawners.dmi new file mode 100644 index 0000000000000000000000000000000000000000..27047134038d544ba7cba5ea7490a4b3e4be2a85 GIT binary patch literal 526 zcmV+p0`dKcP)V=-0C)it+jqzEOU?)Haq-i?)Z{PQSH(P?MXV7mi0To_V6}ZN(!u4_%hyiyN zhy`~N!1p*7{2&4$@Zc7N!h?p;2EW-|8~4QX(+jW!^aZpA-w$82v#u^LW)iGLWQ!dI zmf)%cTfn8~ssP Date: Thu, 9 Jul 2026 01:48:08 -0700 Subject: [PATCH 05/13] Fill in tram brig glass floor --- _maps/map_files/tramstation/tramstation.dmm | 305 +++++++------------- 1 file changed, 106 insertions(+), 199 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ce36df76e92..a81836cab6b 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -8501,9 +8501,6 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "bVN" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating{ dir = 5 }, @@ -9686,6 +9683,12 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"cnK" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 6 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "cnV" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -9965,19 +9968,7 @@ /turf/open/floor/iron, /area/station/security/execution/transfer) "csc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/landmark/event_spawn, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, /turf/open/floor/glass/reinforced, /area/station/security/brig) "csg" = ( @@ -12613,6 +12604,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/science/ordnance/storage) +"dlV" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 5 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "dlZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk, @@ -20911,10 +20908,6 @@ /obj/structure/destructible/cult/item_dispenser/archives/library, /turf/open/floor/engine/cult, /area/station/service/library) -"gmK" = ( -/obj/effect/landmark/firealarm_sanity, -/turf/open/openspace, -/area/station/security/brig) "gmN" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -21627,16 +21620,6 @@ /obj/structure/transport/linear/public, /turf/open/floor/plating/elevatorshaft, /area/station/maintenance/tram/mid) -"gAO" = ( -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "gAQ" = ( /obj/structure/table, /obj/machinery/door/poddoor/shutters{ @@ -25516,16 +25499,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) -"hYN" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/corner, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "hYP" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -26461,7 +26434,6 @@ /turf/open/floor/glass/reinforced, /area/station/science/genetics) "ird" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating{ dir = 9 }, @@ -38153,6 +38125,12 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron, /area/station/command/bridge) +"mfd" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "mfB" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 1 @@ -40627,16 +40605,6 @@ "ney" = ( /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) -"neC" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "nfB" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -43464,21 +43432,6 @@ }, /turf/open/floor/iron, /area/station/tcommsat/computer) -"odr" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "odC" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -45051,15 +45004,6 @@ }, /turf/closed/mineral/random/stationside/asteroid/porus, /area/station/asteroid) -"oMU" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 10 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "oNa" = ( /obj/structure/table, /obj/machinery/airalarm/directional/east, @@ -45472,18 +45416,6 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"oTJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "oTK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue{ @@ -46467,6 +46399,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/vault) +"pnx" = ( +/obj/effect/turf_decal/trimline/red/filled/warning, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "pnD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -47364,15 +47300,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/sorting) -"pBZ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "pCg" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -52702,15 +52629,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) -"ruA" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "ruD" = ( /obj/effect/turf_decal/trimline/dark_green/filled/line, /obj/effect/turf_decal/trimline/purple/filled/warning, @@ -52993,15 +52911,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) -"rzX" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 6 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "rAf" = ( /obj/machinery/camera/emp_proof{ dir = 6; @@ -57476,11 +57385,9 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "tfp" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, -/obj/machinery/door/firedoor/border_only, /turf/open/floor/glass/reinforced, /area/station/security/brig) "tft" = ( @@ -59373,6 +59280,12 @@ /obj/effect/mapping_helpers/mail_sorting/science/xenobiology, /turf/open/floor/iron/white, /area/station/science/lower) +"tMC" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "tMD" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -59778,18 +59691,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"tTJ" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "tTK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister, @@ -62564,6 +62465,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"uMp" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "uMu" = ( /obj/structure/table/glass, /obj/item/storage/box/petridish{ @@ -65987,6 +65894,12 @@ "vUE" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/tram/right) +"vUI" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "vUL" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -67906,6 +67819,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"wEs" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 9 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "wEu" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/camera/directional/south{ @@ -71638,18 +71557,6 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, /area/station/engineering/main) -"ycm" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "yct" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -154371,10 +154278,10 @@ foz ftw bfr ird -oTJ -oTJ -oTJ -oMU +phB +phB +phB +qdY uCZ dSo lNZ @@ -154628,10 +154535,10 @@ awr awy eSM tfp -nca -nca -nca -neC +wEs +uMp +tMC +azy iUE rxE jyR @@ -154885,10 +154792,10 @@ awp dob cmH tfp -nca -nca -nca -neC +mfd +lSo +pnx +azy dER yji ehd @@ -155142,10 +155049,10 @@ iUh iUh tAo tfp -nca -nca -nca -neC +mfd +lSo +pnx +azy niZ yeG oZA @@ -155399,10 +155306,10 @@ udq awz rOh tfp -gmK -nca -nca -neC +mfd +lSo +pnx +azy eOh mwg ceF @@ -155656,10 +155563,10 @@ wOU awz rOh tfp -nca -nca -nca -ycm +mfd +lSo +pnx +nyt qdY eOh pJJ @@ -155913,10 +155820,10 @@ kCm awz rOh tfp -nca -nca -nca -ruA +dlV +vUI +cnK +lSo nyt phB qdY @@ -156169,11 +156076,11 @@ hvZ mGN gNK rOh -gAO -odr +tfp +lSo csc -odr -pBZ +lSo +lSo lSo lSo azy @@ -156427,10 +156334,10 @@ kQy awz rOh tfp -nca -nca -nca -ruA +wEs +uMp +tMC +lSo otz kTT hMA @@ -156684,10 +156591,10 @@ nzz awz rOh tfp -nca -nca -nca -hYN +mfd +tMC +pnx +otz hMA gvQ gvQ @@ -156941,10 +156848,10 @@ pfj awz rOh tfp -nca -nca -nca -neC +mfd +lSo +pnx +azy gvQ gvQ xum @@ -157198,10 +157105,10 @@ iUh iUh aFV tfp -gmK -nca -nca -neC +mfd +lSo +pnx +azy iBO blo fxK @@ -157455,10 +157362,10 @@ awu wOb nCy tfp -nca -nca -nca -neC +mfd +lSo +pnx +azy rco yji qAB @@ -157712,10 +157619,10 @@ rLf dUj mjF tfp -nca -nca -nca -neC +dlV +vUI +cnK +azy fph sHw kil @@ -157969,10 +157876,10 @@ moo nHW bfr bVN -tTJ -tTJ -tTJ -rzX +kTT +kTT +kTT +hMA wEx dSo lNZ From 9752f3f1e421a057de6f99f1b9879f53f55905cb Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Thu, 9 Jul 2026 02:04:14 -0700 Subject: [PATCH 06/13] Fix up tram brig --- _maps/map_files/tramstation/tramstation.dmm | 43 ++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index a81836cab6b..7d835aa00c0 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -8001,12 +8001,6 @@ }, /turf/open/space/openspace, /area/station/solars/port) -"bMV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/central/greater) "bMZ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 @@ -29159,6 +29153,19 @@ /area/station/command/meeting_room) "joG" = ( /obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 9; + pixel_y = 3 + }, /obj/item/book/manual/chef_recipes, /obj/structure/sign/clock/directional/south, /turf/open/floor/iron/cafeteria, @@ -53150,6 +53157,13 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"rFb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/plumbing/synthesizer{ + reagent_id = /datum/reagent/water + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/central/greater) "rGj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, @@ -61138,12 +61152,12 @@ /turf/open/floor/plating, /area/station/science/robotics/mechbay) "usm" = ( -/obj/machinery/plumbing/synthesizer{ - reagent_id = /datum/reagent/water - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/smooth, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) "uss" = ( /obj/effect/decal/cleanable/dirt, @@ -66533,6 +66547,9 @@ /area/station/maintenance/department/medical) "whC" = ( /obj/structure/table, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /obj/machinery/light/directional/south, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) @@ -93608,7 +93625,7 @@ hFr hFr xwf aaf -dqp +nMu dqp anU vEc @@ -93865,8 +93882,8 @@ aab mMK aae mST -bMV nMu +dqp vzY xwf jdt @@ -94124,7 +94141,7 @@ xwf aah dQR usm -vzY +rFb xwf pxW isW From edbb0b577b69379d94f4226f955aa7a0316b64a3 Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Thu, 9 Jul 2026 02:06:22 -0700 Subject: [PATCH 07/13] buh? From 25b9f6de06496ae256115df7b425b232c0e8d75c Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Thu, 9 Jul 2026 02:12:07 -0700 Subject: [PATCH 08/13] rotate water synthesizer, delete extra trimline --- _maps/map_files/tramstation/tramstation.dmm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 7d835aa00c0..5cec373acb5 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -53160,7 +53160,8 @@ "rFb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/plumbing/synthesizer{ - reagent_id = /datum/reagent/water + reagent_id = /datum/reagent/water; + dir = 8 }, /turf/open/floor/iron/smooth, /area/station/maintenance/central/greater) @@ -156609,7 +156610,7 @@ awz rOh tfp mfd -tMC +lSo pnx otz hMA From 894db49e0a52b06ffef0f5244d39d4faccec3b0a Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Thu, 9 Jul 2026 02:38:08 -0700 Subject: [PATCH 09/13] Add dump chute to prison, experimental --- _maps/map_files/tramstation/tramstation.dmm | 37 +++++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 5cec373acb5..77f6b0c1837 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -9961,10 +9961,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"csc" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "csg" = ( /obj/structure/table/glass, /obj/item/stack/sheet/mineral/plasma{ @@ -12877,6 +12873,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) +"dro" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "drq" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -59067,6 +59070,19 @@ }, /turf/open/floor/plating/elevatorshaft, /area/station/maintenance/tram/mid) +"tIS" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/window/brigdoor{ + name = "Dump Chute"; + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "tIT" = ( /obj/structure/table/wood, /obj/structure/mirror/directional/south, @@ -59562,6 +59578,13 @@ /obj/machinery/drone_dispenser, /turf/open/floor/iron/smooth, /area/station/maintenance/department/science) +"tRJ" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/landmark/firealarm_sanity, +/turf/open/openspace, +/area/station/security/brig) "tRT" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -156094,12 +156117,12 @@ hvZ mGN gNK rOh -tfp -lSo -csc +dro lSo lSo lSo +tRJ +tIS lSo azy tFK From f041258878002f3b0afcee37d146519ab182e957 Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Mon, 13 Jul 2026 19:44:50 -0700 Subject: [PATCH 10/13] Undo tram changes --- _maps/map_files/tramstation/tramstation.dmm | 356 +++++++++++--------- 1 file changed, 204 insertions(+), 152 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index d8e514e19a2..f38229c1f37 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2344,6 +2344,15 @@ "ajF" = ( /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"ajH" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "ajM" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -2549,12 +2558,12 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/disposal) "alD" = ( +/obj/machinery/plumbing/synthesizer{ + reagent_id = /datum/reagent/water + }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/east, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, +/turf/open/floor/iron/smooth, /area/station/maintenance/central/greater) "alP" = ( /obj/effect/spawner/random/trash/soap{ @@ -7990,6 +7999,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) +"bMv" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "bMz" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 @@ -8303,19 +8328,6 @@ /area/station/security/prison/workout) "bRo" = ( /obj/structure/table, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 9; - pixel_y = 3 - }, /obj/item/book/manual/chef_recipes, /obj/structure/sign/clock/directional/south, /turf/open/floor/iron/cafeteria, @@ -8442,12 +8454,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel) -"bUz" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 9 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "bUG" = ( /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/directional/south{ @@ -9201,10 +9207,6 @@ /obj/machinery/button/ignition/incinerator/atmos, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"cdT" = ( -/obj/effect/turf_decal/trimline/red/filled/warning, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "cdV" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -17308,6 +17310,18 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/carpet/royalblack, /area/station/command/meeting_room) +"eVI" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "eVK" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -18872,6 +18886,7 @@ /turf/open/floor/iron, /area/station/service/theater) "fyM" = ( +/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating{ dir = 9 }, @@ -19955,10 +19970,13 @@ /turf/closed/wall/r_wall, /area/station/science/xenobiology) "fUO" = ( +/obj/structure/railing/corner, +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, -/obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, /area/station/security/brig) "fUP" = ( @@ -22973,6 +22991,18 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"gYL" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "gZB" = ( /obj/effect/landmark/start/station_engineer, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23755,19 +23785,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"hnw" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/window/brigdoor{ - name = "Dump Chute"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "hnH" = ( /obj/machinery/newscaster/directional/north, /turf/open/floor/wood/large, @@ -23944,10 +23961,8 @@ /turf/open/floor/wood/large, /area/station/service/theater) "hrH" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, +/obj/effect/landmark/firealarm_sanity, +/turf/open/openspace, /area/station/security/brig) "hrS" = ( /obj/effect/turf_decal/trimline/blue/filled/line, @@ -24856,9 +24871,6 @@ /area/station/security/courtroom) "hLu" = ( /obj/structure/table, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/rice, /obj/machinery/light/directional/south, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) @@ -30396,12 +30408,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/lobby) -"jIg" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 6 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "jIj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/thinplating{ @@ -30889,12 +30895,6 @@ }, /turf/open/floor/plating, /area/station/science/lab) -"jRD" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 10 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "jRS" = ( /obj/structure/closet/secure_closet/chemical, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -38205,6 +38205,12 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron, /area/station/command/bridge) +"mfr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/central/greater) "mfB" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 1 @@ -40175,6 +40181,16 @@ /obj/structure/sign/warning/vacuum/directional/south, /turf/open/floor/plating, /area/station/maintenance/disposal) +"mUD" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "mUL" = ( /obj/effect/turf_decal/siding/thinplating, /obj/structure/cable, @@ -43272,12 +43288,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"nZk" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "nZm" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Recreation Area Maintenance Hatch" @@ -44614,11 +44624,13 @@ /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) "oBi" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/landmark/firealarm_sanity, -/turf/open/openspace, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, /area/station/security/brig) "oBP" = ( /obj/machinery/rnd/production/circuit_imprinter/department/science, @@ -45660,6 +45672,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"oXl" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 6 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "oXq" = ( /obj/machinery/door/poddoor/shutters{ name = "MiniSat Teleport Access"; @@ -48941,6 +48962,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"qfh" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "qfs" = ( /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/glass, @@ -49073,6 +49106,9 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "qgZ" = ( +/obj/structure/railing/corner{ + dir = 8 + }, /obj/effect/turf_decal/siding/thinplating{ dir = 5 }, @@ -49268,9 +49304,11 @@ }, /area/station/command/bridge) "qkq" = ( +/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating{ dir = 1 }, +/obj/machinery/door/firedoor/border_only, /turf/open/floor/glass/reinforced, /area/station/security/brig) "qkr" = ( @@ -58817,6 +58855,15 @@ }, /turf/open/floor/glass/reinforced, /area/station/ai/satellite/hallway) +"tDy" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "tDz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, @@ -61357,14 +61404,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/large, /area/station/service/library) -"uuD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/plumbing/synthesizer{ - reagent_id = /datum/reagent/water; - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/central/greater) "uuS" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -66891,6 +66930,16 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"wmY" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/corner, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "wng" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 @@ -69120,12 +69169,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai/satellite/maintenance) -"xeQ" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 5 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "xfd" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -71277,6 +71320,21 @@ }, /turf/open/floor/wood/large, /area/station/service/library) +"xVY" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/station/security/brig) "xWe" = ( /obj/structure/railing{ dir = 4 @@ -71403,12 +71461,6 @@ dir = 8 }, /area/station/medical/paramedic) -"xYA" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/station/security/brig) "xYZ" = ( /mob/living/basic/bot/cleanbot, /obj/effect/turf_decal/stripes/line{ @@ -93629,7 +93681,7 @@ hFr hFr xwf aaf -nMu +dqp dqp anU vEc @@ -93886,8 +93938,8 @@ aab mMK aae mST +mfr nMu -dqp vzY xwf jdt @@ -94145,7 +94197,7 @@ xwf aah dQR alD -uuD +vzY xwf pxW isW @@ -154299,10 +154351,10 @@ foz ftw bfr fyM -phB -phB -phB -qdY +eVI +eVI +eVI +ajH uCZ dSo lNZ @@ -154556,10 +154608,10 @@ awr awy eSM qkq -bUz -nZk -jRD -azy +nca +nca +nca +mUD iUE rxE jyR @@ -154813,10 +154865,10 @@ awp dob cmH qkq -hrH -lSo -cdT -azy +nca +nca +nca +mUD dER yji ehd @@ -155070,10 +155122,10 @@ iUh iUh tAo qkq -hrH -lSo -cdT -azy +nca +nca +nca +mUD niZ yeG oZA @@ -155328,9 +155380,9 @@ awz rOh qkq hrH -lSo -cdT -azy +nca +nca +mUD eOh mwg ceF @@ -155584,10 +155636,10 @@ wOU awz rOh qkq -hrH -lSo -cdT -nyt +nca +nca +nca +qfh qdY eOh pJJ @@ -155841,10 +155893,10 @@ kCm awz rOh qkq -xeQ -xYA -jIg -lSo +nca +nca +nca +tDy nyt phB qdY @@ -156098,11 +156150,11 @@ mGN gNK rOh fUO -lSo -lSo -lSo +xVY +bMv +xVY oBi -hnw +lSo lSo azy tFK @@ -156355,10 +156407,10 @@ kQy awz rOh qkq -bUz -nZk -jRD -lSo +nca +nca +nca +tDy otz kTT hMA @@ -156612,10 +156664,10 @@ nzz awz rOh qkq -hrH -lSo -cdT -otz +nca +nca +nca +wmY hMA gvQ gvQ @@ -156869,10 +156921,10 @@ pfj awz rOh qkq -hrH -lSo -cdT -azy +nca +nca +nca +mUD gvQ gvQ xum @@ -157127,9 +157179,9 @@ iUh aFV qkq hrH -lSo -cdT -azy +nca +nca +mUD iBO blo fxK @@ -157383,10 +157435,10 @@ awu wOb nCy qkq -hrH -lSo -cdT -azy +nca +nca +nca +mUD rco yji qAB @@ -157640,10 +157692,10 @@ rLf dUj mjF qkq -xeQ -xYA -jIg -azy +nca +nca +nca +mUD fph sHw kil @@ -157897,10 +157949,10 @@ moo nHW bfr qgZ -kTT -kTT -kTT -hMA +gYL +gYL +gYL +oXl wEx dSo lNZ From d3d380b79b5b61186cc515f276152dd956cb6cd6 Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Wed, 15 Jul 2026 14:03:18 -0700 Subject: [PATCH 11/13] Change spaced area of sec maints to nearstation --- .../KiloStation_Oculis/KiloStation_Oculis.dmm | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm index ccd52b4dc80..cf46e619830 100644 --- a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm +++ b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm @@ -649,7 +649,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "agL" = ( /obj/structure/table, /obj/item/clipboard, @@ -1351,7 +1351,7 @@ dir = 8 }, /turf/open/floor/iron/recharge_floor, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "aqt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6942,7 +6942,7 @@ "cgU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "cgW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8803,7 +8803,7 @@ /obj/structure/girder, /obj/structure/grille/broken, /turf/open/floor/plating/airless, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "cJH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -12983,10 +12983,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) -"dZA" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/station/maintenance/department/security/greater) "dZM" = ( /obj/machinery/computer/monitor{ dir = 4; @@ -26028,7 +26024,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "hPX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29917,7 +29913,7 @@ /obj/effect/landmark/generic_maintenance_landmark, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "iTo" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ @@ -33590,7 +33586,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "jZu" = ( /obj/effect/turf_decal/tile/green, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35330,7 +35326,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "kEQ" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_dispenser, @@ -36620,7 +36616,7 @@ "kYI" = ( /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "kYU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40122,7 +40118,7 @@ /area/station/service/janitor) "mch" = ( /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "mcs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48657,7 +48653,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "oNr" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -55794,7 +55790,7 @@ "qRD" = ( /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "qRK" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -58262,11 +58258,11 @@ /obj/item/storage/toolbox/emergency, /obj/item/stack/rods/ten, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "rBe" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "rBj" = ( /obj/structure/transit_tube/curved/flipped, /turf/open/space/basic, @@ -64906,6 +64902,10 @@ /obj/effect/turf_decal/box, /turf/open/floor/wood, /area/station/security/detectives_office) +"tDP" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/space/nearstation) "tDT" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -71616,7 +71616,7 @@ name = "Abandoned Mech Bay Toggle" }, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "vEl" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, @@ -80150,7 +80150,7 @@ name = "Abandoned Mech Bay" }, /turf/open/floor/plating, -/area/station/maintenance/department/security/greater) +/area/space/nearstation) "yhI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -95104,11 +95104,11 @@ qCi aOf kiO acm -dZA +acK yhy yhy yhy -cuR +cok xKP xKP ugF @@ -95361,7 +95361,7 @@ aLg aOf qWz aaQ -dZA +acK kEH aqq hPS @@ -95618,7 +95618,7 @@ apL vBM wAt cJx -cuR +cok oNo iTj agH @@ -95876,10 +95876,10 @@ lXL cuR cuR cuR -ovm +tDP cgU mch -cuR +cok rRx ftX xlk From 2f9acc59adaf3df870fadc16350c203ecf2f1914 Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Wed, 15 Jul 2026 14:52:58 -0700 Subject: [PATCH 12/13] Actually undo tram changes From cfd996aee3ed6b935b13fabb378efa443ff8b1f0 Mon Sep 17 00:00:00 2001 From: Shroopy <46693163+Shroopy@users.noreply.github.com> Date: Wed, 15 Jul 2026 15:47:43 -0700 Subject: [PATCH 13/13] atmos fixes, camera fixes --- .../KiloStation_Oculis/KiloStation_Oculis.dmm | 156 +++++++++++++----- 1 file changed, 115 insertions(+), 41 deletions(-) diff --git a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm index cf46e619830..64e7371f07a 100644 --- a/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm +++ b/_maps/map_files/KiloStation_Oculis/KiloStation_Oculis.dmm @@ -1776,6 +1776,13 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/art) +"ayT" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) "ayY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1940,6 +1947,7 @@ /area/station/engineering/supermatter/room) "aCV" = ( /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/processing) "aDa" = ( @@ -3510,6 +3518,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/commons/storage/art) "bdH" = ( @@ -4607,6 +4616,8 @@ /obj/effect/mapping_helpers/airlock/unres/delayed{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/lesser) "bwN" = ( @@ -4721,6 +4732,7 @@ /area/station/hallway/primary/port) "bza" = ( /obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/lesser) "bzb" = ( @@ -4827,6 +4839,11 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo Mech Bay"; + name = "cargo camera"; + network = list("ss13", "qm") + }, /turf/open/floor/iron, /area/station/cargo/storage) "bAc" = ( @@ -4855,6 +4872,8 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/aft) "bAl" = ( @@ -5078,6 +5097,8 @@ /obj/structure/sign/painting/library_private{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/cult, /area/station/service/library) "bFa" = ( @@ -5437,6 +5458,9 @@ id_tag = "Cabin_1"; name = "Cabin 1" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "bKC" = ( @@ -5512,6 +5536,10 @@ "bLX" = ( /obj/structure/cable, /obj/effect/spawner/random/decoration/carpet, +/obj/machinery/camera/directional/east{ + c_tag = "Prison Basketball Court"; + network = list("ss13", "prison") + }, /turf/open/floor/iron, /area/station/security/prison) "bMc" = ( @@ -9319,6 +9347,10 @@ "cTi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/security/lesser) "cTp" = ( @@ -10626,6 +10658,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/camera/directional/north{ + c_tag = "Recreation Fitness Ring"; + name = "recreation camera" + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "dnb" = ( @@ -11024,6 +11060,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/security/lesser) "drG" = ( @@ -18206,6 +18244,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/processing) "fAD" = ( @@ -18390,6 +18429,11 @@ dir = 4 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo Dock"; + network = list("ss13","qm"); + name = "cargo camera" + }, /turf/open/floor/iron, /area/station/cargo/storage) "fCf" = ( @@ -20312,6 +20356,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/processing) "ggS" = ( @@ -22414,6 +22459,12 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/customs) +"gNW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/library) "gOa" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -23037,6 +23088,18 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"gZt" = ( +/obj/effect/turf_decal/trimline/yellow/line, +/obj/structure/closet/secure_closet/miner, +/obj/effect/turf_decal/delivery, +/obj/item/tank/internals/oxygen/yellow, +/obj/machinery/camera/directional/south{ + c_tag = "Mining Dock"; + name = "cargo camera"; + network = list("ss13","qm") + }, +/turf/open/floor/iron/dark/textured_edge, +/area/station/cargo/miningoffice) "gZB" = ( /obj/structure/lattice/catwalk, /obj/structure/sign/directions/supply{ @@ -29692,9 +29755,6 @@ dir = 4 }, /obj/machinery/recharge_station, -/obj/machinery/camera/directional/west{ - name = "security camera" - }, /turf/open/floor/iron/dark, /area/station/security/office) "iRh" = ( @@ -30659,7 +30719,6 @@ /obj/machinery/holopad, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron, /area/station/security/processing) @@ -34286,6 +34345,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/processing) "kno" = ( @@ -39231,6 +39291,11 @@ /obj/machinery/atmospherics/components/unary/passive_vent{ name = "killroom vent" }, +/obj/machinery/camera/directional/north{ + c_tag = "Xenobiology Kill Chamber"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno") + }, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) "lNK" = ( @@ -40596,6 +40661,7 @@ pixel_x = 32 }, /obj/effect/landmark/start/librarian, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/cult, /area/station/service/library) "mkI" = ( @@ -41632,6 +41698,10 @@ /obj/item/clipboard, /turf/open/floor/iron/dark, /area/station/security/office) +"mAf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) "mAj" = ( /obj/effect/turf_decal/bot, /obj/machinery/status_display/ai/directional/east, @@ -45131,22 +45201,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) -"nEW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/bed{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/pillow/random, -/obj/machinery/light/small/directional/west, -/obj/effect/spawner/random/bedsheet{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/commons/fitness/recreation) "nFb" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48806,6 +48860,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/processing) "oQl" = ( @@ -51286,6 +51341,7 @@ dir = 8 }, /obj/machinery/light_switch/directional/north, +/obj/machinery/camera/directional/north, /turf/open/floor/iron/dark, /area/station/security/office) "pyg" = ( @@ -53872,6 +53928,7 @@ }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/processing) "qnK" = ( @@ -59700,9 +59757,6 @@ /turf/open/floor/noslip, /area/station/cargo/bitrunning/den) "rYf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/structure/bookcase/random/nonfiction, /obj/structure/sign/painting/library{ pixel_y = 32 @@ -61187,6 +61241,7 @@ "suA" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/storage) "suB" = ( @@ -61649,6 +61704,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/library) "sCY" = ( @@ -62142,6 +62198,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/library) "sLl" = ( @@ -62962,6 +63019,11 @@ /area/station/security/courtroom) "sWU" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Ordnance Mixing Lab"; + name = "science camera"; + network = list("ss13", "rd") + }, /turf/open/floor/iron/dark, /area/station/science/ordnance) "sWZ" = ( @@ -66179,6 +66241,7 @@ /obj/structure/chair/office{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/processing) "tYO" = ( @@ -66284,6 +66347,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/processing) "tZE" = ( @@ -69621,7 +69685,7 @@ "vct" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/machinery/camera/directional/north{ - c_tag = "Xenobiology Test Chamber"; + c_tag = ssssssssss; name = "xenobiology camera"; network = list("ss13","rd","xeno") }, @@ -70088,6 +70152,9 @@ pixel_x = -29; pixel_y = -37 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/cult, /area/station/service/library) "vjd" = ( @@ -70365,6 +70432,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "vmP" = ( @@ -71468,6 +71538,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/processing) "vBM" = ( @@ -74093,11 +74165,6 @@ dir = 1 }, /obj/machinery/portable_atmospherics/pump/lil_pump, -/obj/machinery/camera/directional/west{ - c_tag = "Ordnance Mixing Lab"; - name = "science camera"; - network = list("ss13","rd") - }, /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/mixingchamber_access, /obj/machinery/power/apc/auto_name/directional/north, @@ -75709,8 +75776,8 @@ }, /obj/machinery/camera/directional/east{ c_tag = "Cargo Ramps"; - name = "cargo camera"; - network = list("ss13","qm") + network = list("ss13","qm"); + name = "cargo camera" }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, @@ -78894,6 +78961,8 @@ req_access = list("library") }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/station/service/library) "xMC" = ( @@ -79437,6 +79506,11 @@ dir = 1 }, /obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/camera/directional/north{ + name = "science camera"; + c_tag = "Ordnance Mixing Lab"; + network = list("ss13","rd") + }, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) "xWc" = ( @@ -101760,7 +101834,7 @@ rBn qao uvA qBZ -nEW +fLU utE iov pVm @@ -105340,7 +105414,7 @@ iFm ocO lbO rYf -fxM +gNW usV wxj fxM @@ -105597,7 +105671,7 @@ pqB sLb igl cyv -fxM +aZi cyv cyv riQ @@ -105854,7 +105928,7 @@ mtm mTy sCU sLf -fxM +aZi fxM fxM fxM @@ -113527,7 +113601,7 @@ acm acm acm aeU -nTB +aeu aLh aeu aeu @@ -118152,7 +118226,7 @@ vJc vct ndy rRz -ndy +rFr rFr khV wPC @@ -121552,7 +121626,7 @@ gUS aSZ aTx jhH -hDs +ayT cwu dME pmy @@ -122066,7 +122140,7 @@ ncH ncH ncH ncH -ncH +mAf xsy era hOc @@ -122323,7 +122397,7 @@ kxu xVK kxu npx -ncH +mAf fOX iIp bBV @@ -124371,7 +124445,7 @@ uCZ uUR bmc gFa -hiZ +gZt oUz aaa aaa