From f7dcc2d297a7918b02110f9f98cc8206678f60ce Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Feb 2022 17:35:19 -0500 Subject: [PATCH 01/12] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 724 +++++++++--------- 1 file changed, 366 insertions(+), 358 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index cef539c3b6..2bfdeffae3 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1794,6 +1794,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/storage/fancy/donut_box{ + pixel_y = 7 + }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) "acL" = ( @@ -2141,12 +2144,11 @@ /turf/open/floor/plasteel/white, /area/command/heads_quarters/hop) "adm" = ( -/obj/structure/sign/warning/securearea{ - pixel_x = 32; - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/space/basic, -/area/space) +/turf/closed/wall/r_wall, +/area/command/heads_quarters/rd) "adn" = ( /turf/closed/wall, /area/cargo/storage) @@ -2264,6 +2266,7 @@ dir = 8 }, /obj/structure/closet/secure_closet/hos, +/obj/item/gun/energy/e_gun/hos, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) "adE" = ( @@ -4791,6 +4794,7 @@ req_access_txt = "63" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/prison) "ahv" = ( @@ -4924,7 +4928,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/gun/energy/e_gun/hos, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/captain/private) "ahI" = ( @@ -4975,8 +4978,10 @@ pixel_y = -24 }, /obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/obj/item/lighter, +/obj/item/hand_tele{ + pixel_y = 9 + }, +/obj/item/storage/lockbox/medal, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) "ahN" = ( @@ -7561,7 +7566,6 @@ id = "brig2"; pixel_y = 26 }, -/obj/structure/chair, /obj/structure/cable/white{ icon_state = "2-4" }, @@ -7578,6 +7582,8 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/bed, +/obj/item/bedsheet/blue, /turf/open/floor/plasteel, /area/security/brig) "alR" = ( @@ -8113,10 +8119,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/window/brigdoor/security/cell/westright{ - id = "brig2"; - name = "Cell 2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -8126,6 +8128,10 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/door/window/brigdoor/security/cell/eastright{ + id = "Cell 1"; + name = "Cell 1" + }, /turf/open/floor/plasteel, /area/security/brig) "amO" = ( @@ -10562,6 +10568,14 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/mob/living/simple_animal/bot/secbot{ + arrest_type = 1; + health = 45; + icon_state = "secbot1"; + idcheck = 1; + name = "Sergeant-at-Armsky"; + weaponscheck = 1 + }, /turf/open/floor/plasteel, /area/security/brig) "aqH" = ( @@ -16317,8 +16331,6 @@ /turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "azA" = ( -/obj/structure/table, -/obj/item/paicard, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -16329,6 +16341,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel, /area/commons/dorms) "azB" = ( @@ -18309,6 +18322,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/paicard{ + pixel_x = 15 + }, /turf/open/floor/plasteel, /area/commons/dorms) "aCO" = ( @@ -19360,6 +19376,11 @@ dir = 9 }, /obj/item/clothing/glasses/meson/engine, +/obj/machinery/camera{ + c_tag = "Engineering Access"; + dir = 4; + network = list("ss13","engine") + }, /turf/open/floor/plasteel, /area/engineering/main) "aEy" = ( @@ -19555,7 +19576,6 @@ /turf/open/floor/plasteel/dark, /area/commons/dorms) "aEM" = ( -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -19567,6 +19587,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/vending/kink, /turf/open/floor/plasteel/dark, /area/commons/dorms) "aEN" = ( @@ -20137,12 +20158,6 @@ /turf/open/floor/plasteel, /area/engineering/main) "aFB" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/effect/turf_decal/delivery, /obj/machinery/airalarm{ pixel_y = 24 @@ -20151,6 +20166,9 @@ c_tag = "Starboard Bow Solar"; network = list("ss13","engine") }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "aFC" = ( @@ -24135,10 +24153,12 @@ /turf/closed/wall, /area/maintenance/solars/port/aft) "aLD" = ( -/obj/machinery/power/port_gen/pacman, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/table/reinforced, +/obj/item/paper/guides/jobs/engi/gravity_gen, +/obj/item/pen/blue, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aLE" = ( @@ -24190,6 +24210,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/power/port_gen/pacman, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aLI" = ( @@ -27755,13 +27776,12 @@ /turf/open/floor/engine, /area/engineering/main) "aRI" = ( -/obj/structure/cable/white{ - dir = 5; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/engineering/main) "aRJ" = ( @@ -28700,9 +28720,6 @@ /obj/item/kirbyplants{ icon_state = "plant-18" }, -/obj/machinery/camera{ - c_tag = "Arrivals Lounge" - }, /turf/open/floor/plasteel/grimy, /area/commons/lounge) "aTB" = ( @@ -28713,6 +28730,9 @@ "aTC" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, +/obj/machinery/camera{ + c_tag = "Arrivals Lounge" + }, /turf/open/floor/plasteel/grimy, /area/commons/lounge) "aTD" = ( @@ -29449,8 +29469,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/green/line{ - dir = 8; - icon_state = "trimline" + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -29561,8 +29580,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -29575,8 +29593,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -29618,8 +29635,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating{ icon_state = "panelscorched" @@ -29640,8 +29656,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -29654,8 +29669,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -29674,8 +29688,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/corner{ - dir = 1; - icon_state = "trimline_corner" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -29886,11 +29899,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Engineering Access"; - dir = 8; - network = list("ss13","engine") - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -29967,8 +29975,7 @@ /area/commons/dorms) "aVI" = ( /obj/effect/turf_decal/trimline/green/line{ - dir = 9; - icon_state = "trimline" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, @@ -29981,8 +29988,7 @@ icon_state = "2-4" }, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -30008,8 +30014,7 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/green/corner{ - dir = 1; - icon_state = "trimline_corner" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -30313,6 +30318,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/item/screwdriver, /turf/open/floor/plasteel, /area/medical/chemistry) "aWk" = ( @@ -30460,8 +30466,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/trimline/green/line{ - dir = 8; - icon_state = "trimline" + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -30817,8 +30822,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/green/corner{ - dir = 1; - icon_state = "trimline_corner" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -31870,14 +31874,18 @@ }, /obj/structure/table, /obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 6 + pixel_x = -5; + pixel_y = 10 }, /obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 6; + pixel_x = -5; pixel_y = 6 }, -/obj/item/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "aYQ" = ( @@ -32925,11 +32933,10 @@ /area/maintenance/solars/port/aft) "bav" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" }, -/turf/closed/wall, +/turf/open/floor/plating, /area/maintenance/solars/port/aft) "baw" = ( /obj/effect/spawner/structure/window/reinforced, @@ -33289,7 +33296,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/structure/closet/crate/bin, /turf/open/floor/plasteel, /area/science/robotics/lab) "baW" = ( @@ -33363,8 +33369,13 @@ /area/maintenance/port/aft) "bbf" = ( /obj/machinery/power/smes, -/obj/structure/cable/white{ - icon_state = "0-2" +/obj/machinery/camera{ + c_tag = "Port Quarter Solar"; + dir = 4; + network = list("ss13","engine") + }, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -33381,18 +33392,18 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbi" = ( -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/structure/cable/white{ - icon_state = "0-2" - }, /obj/machinery/power/apc{ areastring = "/area/maintenance/solars/port/aft"; dir = 4; name = "Port Quarter Solar APC"; pixel_x = 24 }, +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/obj/structure/cable/white{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbj" = ( @@ -33477,8 +33488,12 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bbo" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, /obj/structure/cable/white{ - icon_state = "1-4" + icon_state = "0-4" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -33825,16 +33840,10 @@ /turf/open/space/basic, /area/solars/starboard/fore) "bbR" = ( +/obj/machinery/light/small, /obj/structure/cable/white{ - icon_state = "0-8" + icon_state = "1-8" }, -/obj/structure/cable/white, -/obj/machinery/power/solar_control{ - dir = 8; - id = "aftport"; - name = "Port Quarter Solar Control" - }, -/obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbS" = ( @@ -33874,12 +33883,8 @@ /turf/open/space/basic, /area/solars/starboard/fore) "bbX" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/emcloset/anchored, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bbY" = ( /obj/structure/lattice/catwalk, @@ -33893,6 +33898,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/fore) "bca" = ( @@ -33943,8 +33951,6 @@ /turf/open/floor/plasteel, /area/maintenance/solars/starboard/fore) "bcd" = ( -/obj/item/retractor, -/obj/item/hemostat, /obj/structure/table/reinforced, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; @@ -33965,6 +33971,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/plasteel/dark, /area/medical/medbay/zone3) "bce" = ( @@ -33987,12 +33994,10 @@ /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bcf" = ( -/obj/machinery/computer/operating{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/computer/operating, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -34003,11 +34008,6 @@ /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bcg" = ( -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/mask/surgical, -/obj/item/surgical_drapes, -/obj/structure/table/reinforced, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -34022,6 +34022,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/limbgrower, /turf/open/floor/plasteel/dark, /area/medical/medbay/zone3) "bch" = ( @@ -34294,28 +34295,34 @@ pixel_x = 32; pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcH" = ( -/obj/machinery/light/small{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/closet/emcloset/anchored, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" + icon_state = "4-8" }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) @@ -34328,24 +34335,24 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/solars/starboard/fore) "bcK" = ( -/obj/machinery/power/smes, -/obj/structure/cable/white{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/fore) -"bcL" = ( -/obj/structure/cable/white{ - icon_state = "0-2" - }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, /obj/machinery/power/solar_control{ id = "forestarboard"; name = "Starboard Bow Solar Control" }, /obj/effect/turf_decal/bot, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcL" = ( +/obj/machinery/power/smes, +/obj/structure/cable/white{ + icon_state = "0-2" + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcM" = ( @@ -34358,9 +34365,6 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -34368,12 +34372,13 @@ pixel_x = 32; pixel_y = -32 }, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/fore) -"bcO" = ( +/obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/turf/open/floor/plating, +/area/maintenance/solars/starboard/fore) +"bcO" = ( /obj/structure/cable/white{ icon_state = "4-8" }, @@ -34381,6 +34386,9 @@ name = "Starboard Bow Solar Access"; req_access_txt = "10" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcP" = ( @@ -34429,10 +34437,6 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcU" = ( -/obj/item/circular_saw, -/obj/item/surgicaldrill{ - pixel_y = 5 - }, /obj/structure/table/reinforced, /obj/structure/mirror{ pixel_x = -28 @@ -34451,6 +34455,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/suit/apron/surgical, +/obj/item/clothing/mask/surgical, /turf/open/floor/plasteel/dark, /area/medical/medbay/zone3) "bcV" = ( @@ -34484,9 +34491,6 @@ /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bcX" = ( -/obj/item/scalpel, -/obj/item/cautery, -/obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -34504,6 +34508,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/item/reagent_containers/glass/beaker/synthflesh, /turf/open/floor/plasteel/dark, /area/medical/medbay/zone3) "bcY" = ( @@ -34514,10 +34520,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Medbay South"; - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -34877,7 +34879,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" + req_one_access_txt = "7;12" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -34896,11 +34898,15 @@ /turf/open/floor/plating/airless, /area/solars/starboard/fore) "bdC" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 +/obj/machinery/power/solar_control{ + id = "aftport"; + name = "Port Quarter Solar Control" + }, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bdD" = ( @@ -34929,17 +34935,17 @@ }, /area/command/heads_quarters/rd) "bdE" = ( -/obj/structure/cable/white{ - icon_state = "0-4" - }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, /obj/machinery/power/apc{ areastring = "/area/maintenance/solars/starboard/fore"; name = "Starboard Bow Solar APC"; pixel_y = -26 }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bdF" = ( @@ -34959,9 +34965,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "bdG" = ( -/obj/structure/cable/white{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -34969,6 +34972,9 @@ dir = 1; pixel_y = -22 }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bdH" = ( @@ -36177,10 +36183,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/item/circuitboard/aicore, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel{ icon_state = "sepia" }, @@ -36219,6 +36223,9 @@ dir = 1; pixel_y = -28 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel{ icon_state = "sepia" }, @@ -36252,7 +36259,7 @@ /area/service/chapel/main) "bfB" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/mixing) "bfC" = ( @@ -36334,6 +36341,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/smartfridge/organ/preloaded{ + pixel_y = -31 + }, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bfG" = ( @@ -36346,7 +36356,7 @@ }, /obj/machinery/camera{ c_tag = "Medbay Recovery Room"; - dir = 8; + dir = 1; network = list("ss13","medbay") }, /obj/effect/turf_decal/tile/neutral{ @@ -36796,6 +36806,9 @@ dir = 1; network = list("ss13","engine") }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "bgi" = ( @@ -36841,12 +36854,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/light/small, -/obj/machinery/camera{ - c_tag = "Port Quarter Solar"; - dir = 1; - network = list("ss13","engine") - }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bgl" = ( @@ -37318,8 +37325,7 @@ "bhn" = ( /obj/machinery/light/floor, /turf/open/floor/plasteel/yellowsiding/corner{ - dir = 8; - icon_state = "yellowcornersiding" + dir = 8 }, /area/maintenance/starboard/aft) "bho" = ( @@ -37465,6 +37471,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bhA" = ( @@ -37487,13 +37496,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/camera{ + c_tag = "Arrivals Bay 1 North" + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bhC" = ( @@ -37887,10 +37896,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/camera{ - c_tag = "Arrivals Bay 1 North"; - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -38258,10 +38263,6 @@ "biV" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/camera{ - c_tag = "Arrivals Hallway 3"; - dir = 8 - }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38781,6 +38782,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/camera{ + c_tag = "Arrivals Hallway"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bjV" = ( @@ -38937,6 +38942,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/camera{ + c_tag = "Arrivals Hallway 2"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bkX" = ( @@ -39121,9 +39130,23 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Security Checkpoint"; - dir = 1 +/turf/closed/wall/r_wall/rust, +/area/science/mixing) +"blv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) +"blx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) +"bly" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /obj/structure/cable/white{ icon_state = "4-8" @@ -39134,50 +39157,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/camera{ + c_tag = "Security Checkpoint"; + dir = 10 + }, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, /area/hallway/primary/aft) -"blv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Bay 1 North"; - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/hallway/secondary/entry) -"blx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/camera{ - c_tag = "Arrivals Hallway"; - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bly" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/camera{ - c_tag = "Arrivals Hallway 2"; - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "blA" = ( /obj/machinery/door/airlock/grunge{ name = "Mass Driver Room"; @@ -39916,10 +39903,10 @@ /turf/open/floor/circuit/green/telecomms, /area/tcommsat/server) "buN" = ( -/obj/machinery/announcement_system, /obj/machinery/status_display/ai{ pixel_x = 32 }, +/obj/machinery/ntnet_relay, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "buO" = ( @@ -39961,22 +39948,9 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "buS" = ( -/obj/machinery/ntnet_relay, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/telecomms, -/area/tcommsat/server) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "buW" = ( /turf/closed/wall/r_wall, /area/engineering/supermatter) @@ -40741,7 +40715,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "8;12" + req_one_access_txt = "7;12" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, @@ -40832,8 +40806,7 @@ /area/service/bar/atrium) "dSq" = ( /turf/open/floor/plasteel/yellowsiding{ - dir = 4; - icon_state = "yellowsiding" + dir = 4 }, /area/maintenance/starboard/aft) "dXv" = ( @@ -40872,6 +40845,9 @@ /area/engineering/atmos) "eew" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "2-4" + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -41066,13 +41042,13 @@ name = "Incinerator Exterior Airlock"; req_access_txt = "12" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "eZd" = ( @@ -41231,14 +41207,14 @@ /turf/open/space/basic, /area/space) "fsJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{ frequency = 1449; id = "incinerator_airlock_pump" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "fuR" = ( @@ -41547,18 +41523,11 @@ /area/command/gateway) "gSu" = ( /turf/open/floor/plasteel/yellowsiding{ - dir = 8; - icon_state = "yellowsiding" + dir = 8 }, /area/maintenance/starboard/aft) "gSv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -41569,8 +41538,15 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) +"gSB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/science/mixing) "gVX" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ dir = 8 @@ -41592,8 +41568,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/broken{ - dir = 1; - icon_state = "tube-broken" + dir = 1 }, /turf/open/floor/carpet/green/airless, /area/maintenance/starboard/aft) @@ -41717,8 +41692,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -41781,8 +41755,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/green/line{ - dir = 1; - icon_state = "trimline" + dir = 1 }, /turf/open/floor/plating{ icon_state = "panelscorched" @@ -41794,10 +41767,7 @@ name = "Robotics Lab"; req_access_txt = "29" }, -/obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab"; - req_access_txt = "29" - }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/science/robotics/lab) "hUG" = ( @@ -42001,6 +41971,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/button/door{ + id = "stationawaygate"; + name = "Gateway Access Shutter Control"; + pixel_x = -1; + pixel_y = -24; + req_access_txt = "31" + }, /turf/open/floor/plasteel, /area/command/gateway) "iUO" = ( @@ -42009,8 +41986,7 @@ /area/science/mixing) "iVs" = ( /obj/machinery/computer/gateway_control{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/effect/turf_decal/delivery, /obj/machinery/camera{ @@ -42104,8 +42080,7 @@ /area/science/xenobiology) "jeI" = ( /turf/open/floor/plasteel/yellowsiding{ - dir = 1; - icon_state = "yellowsiding" + dir = 1 }, /area/maintenance/starboard/aft) "jkc" = ( @@ -42172,11 +42147,12 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/starboard) "jrd" = ( -/obj/machinery/pool/drain, -/turf/open/pool, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "jsD" = ( -/obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, /turf/open/floor/engine, /area/science/mixing) @@ -42416,12 +42392,16 @@ /area/engineering/atmos) "kiw" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "koL" = ( @@ -42453,14 +42433,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/mixing) "krX" = ( /obj/machinery/light/floor, /turf/open/floor/plasteel/yellowsiding/corner{ - dir = 4; - icon_state = "yellowcornersiding" + dir = 4 }, /area/maintenance/starboard/aft) "kwF" = ( @@ -42916,13 +42894,13 @@ /obj/machinery/igniter{ id = "Incinerator" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/air_sensor/atmos/incinerator_tank{ pixel_x = -32; pixel_y = 32 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "mQi" = ( @@ -43029,12 +43007,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/airalarm{ + dir = 4; + name = "Inceinerator air alarm"; + pixel_x = 10 + }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "nio" = ( /obj/structure/pool/ladder{ dir = 1; - icon_state = "ladder"; pixel_y = -24 }, /turf/open/pool, @@ -43155,6 +43137,10 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) "oaV" = ( @@ -43196,11 +43182,11 @@ /turf/closed/wall, /area/asteroid/nearstation) "ooX" = ( -/obj/machinery/smartfridge/organ/preloaded{ - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 }, -/turf/closed/wall, -/area/medical/medbay/zone3) +/turf/closed/wall/r_wall, +/area/science/mixing) "oql" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel, @@ -43249,7 +43235,6 @@ /turf/open/floor/plasteel/dark, /area/engineering/atmos) "oxb" = ( -/obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /turf/open/floor/engine, /area/science/mixing) @@ -43259,13 +43244,13 @@ dir = 4; luminosity = 2 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) "oys" = ( @@ -43307,8 +43292,7 @@ "oIA" = ( /obj/machinery/light/floor, /turf/open/floor/plasteel/yellowsiding/corner{ - dir = 1; - icon_state = "yellowcornersiding" + dir = 1 }, /area/maintenance/starboard/aft) "oIG" = ( @@ -43511,7 +43495,7 @@ /obj/structure/sign/warning/vacuum{ pixel_y = -32 }, -/obj/structure/cable{ +/obj/structure/cable/yellow{ icon_state = "0-4" }, /turf/open/floor/engine/vacuum, @@ -43555,6 +43539,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/checker, /area/engineering/atmos) "pAN" = ( @@ -43604,7 +43591,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/mixing) "pLb" = ( @@ -43691,9 +43677,6 @@ name = "Toxins Launch Room Access"; req_access_txt = "7" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -43703,6 +43686,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "qdt" = ( @@ -43875,6 +43861,9 @@ dir = 1 }, /obj/machinery/meter, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "qRz" = ( @@ -44469,6 +44458,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/maintenance/starboard) "sFq" = ( @@ -46921,13 +46913,16 @@ "twy" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks{ - dir = 1; - icon_state = "soda_dispenser" + dir = 1 }, /turf/open/floor/wood{ icon_state = "wood-broken6" }, /area/maintenance/starboard/aft) +"tEk" = ( +/obj/machinery/pool/drain, +/turf/open/pool, +/area/maintenance/starboard/aft) "tFk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -46987,8 +46982,8 @@ /turf/open/floor/plating, /area/science/mixing) "ucu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, /turf/closed/wall, /area/science/mixing) @@ -47243,10 +47238,6 @@ /turf/open/floor/plasteel/dark, /area/command/gateway) "uMi" = ( -/obj/machinery/door/airlock/security{ - name = "Law Office"; - req_access_txt = "38" - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47255,6 +47246,10 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/door/airlock{ + name = "Law Office"; + req_access_txt = "38" + }, /turf/open/floor/plasteel, /area/service/lawoffice) "uSs" = ( @@ -47345,7 +47340,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/mixing) "vmq" = ( @@ -47509,6 +47503,12 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/science/mixing) +"vHT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "vJk" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -47542,6 +47542,10 @@ "vMb" = ( /turf/open/floor/engine/n2o, /area/engineering/atmos) +"vNP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/science/mixing) "vPZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -47793,6 +47797,10 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) +"wXH" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel, +/area/science/mixing) "xdr" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -48041,9 +48049,6 @@ name = "Incinerator Interior Airlock"; req_access_txt = "12" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -48059,6 +48064,9 @@ sanitize_external = 1; sensor_tag = "incinerator_airlock_sensor" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "yba" = ( @@ -48118,8 +48126,8 @@ /area/hallway/primary/port/aft) "ygB" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" + name = "Gateway Maintenance Hatch"; + req_access_txt = "62" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -76083,7 +76091,7 @@ aad aad aLC bae -aLC +buS aLC sdX sdX @@ -76599,8 +76607,8 @@ aMJ bak aLC aLC -aLC -aLC +buS +buS aaa pZU aaa @@ -76857,7 +76865,7 @@ bal aLC bbf bbo -aLC +buS aaa pZU aaa @@ -77108,13 +77116,13 @@ aTY aUP buL buP -buS +sKn aMJ bam bav bdC bgk -aLC +buS sdX sdX aaa @@ -80407,11 +80415,11 @@ aad aro ars ars -ars +asI ars ars arp -ars +asI ars asu asA @@ -86112,7 +86120,7 @@ aSh bcf bcW bfF -ooX +aSh hSE bfA bfX @@ -87926,14 +87934,14 @@ bjV bjC bjC bkl -blx bjC bjC bjC bjC bjC bjC -bly +bjC +bjC bkS bkX blc @@ -89703,7 +89711,7 @@ aUy aWQ tWh aYc -iey +bly sKB baI bby @@ -89960,7 +89968,7 @@ sNz aWR tWh aYd -bls +iey byq baJ bbz @@ -89973,7 +89981,7 @@ bfL aYc bgU bhI -blv +biw bgU aaa aaa @@ -93498,8 +93506,8 @@ aad aad aaa aaa -bbT -bbT +aaa +bcF bbT bbT bcF @@ -93754,8 +93762,8 @@ sMq aad aad aaa -adm -bbT +aaa +aaa bbX bbZ bcc @@ -94012,8 +94020,8 @@ aad aad aaa aad -bbU -bbT +aaa +bbX bca bbT bcH @@ -94786,7 +94794,7 @@ bbW bcQ adq aad -bbT +bbX bcK bdE adu @@ -95043,7 +95051,7 @@ aef aaa aaa aaa -bbT +bbX bcL bcR adu @@ -95300,8 +95308,8 @@ adq sdX sdX sdX -bbT -bbT +bbX +bbX bbU adu adu @@ -95618,7 +95626,7 @@ hXc abP jLF aAY -hVE +wXH bdA aRy aRy @@ -96141,8 +96149,8 @@ lMu aRy bhm bhX -jrd uCY +tEk nio jeI juY @@ -97931,12 +97939,12 @@ xiZ wvy bfz bfB -mvB -mvB +hVE +hVE kqH vlJ pHH -ucu +kPi aad aad aad @@ -98193,7 +98201,7 @@ eZs vPZ jde pmK -iio +kPi aad aad aad @@ -98445,12 +98453,12 @@ sVt sVt sVt qcP -sVt -meo -meo -sVt -sVt -sVt +gSB +vNP +vNP +gSB +gSB +vHT iio aad aad @@ -98696,7 +98704,7 @@ aJO aJO bdK bew -ajP +adm ajP sVt meo @@ -98953,7 +98961,7 @@ aaa aJO aJO aJO -ajP +adm dfK dfK sVt @@ -99210,7 +99218,7 @@ aaa aaa aad aad -meo +bls dfK qnA ucd @@ -99467,11 +99475,11 @@ aaa aaa aac aad -sVt +blv lmq nfS -sVt -iio +jrd +ucu upN iio iio @@ -99724,10 +99732,10 @@ aaa aaa aac aad -sVt -sVt -sVt -sVt +blx +gcw +gcw +ooX gLD lFm uTF From a2f16c916d860b5d1a8c94c65791c1a908606f43 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Feb 2022 17:42:54 -0500 Subject: [PATCH 02/12] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 2bfdeffae3..2719305223 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -23307,7 +23307,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, +/turf/open/space/basic, /area/maintenance/port/aft) "aKo" = ( /obj/structure/lattice, @@ -40741,6 +40741,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"doR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "dvB" = ( /obj/structure/sink/puddle, /turf/open/floor/plating/asteroid, @@ -40987,6 +40993,10 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) +"eIl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/science/mixing) "eOg" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -41026,6 +41036,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/mixing) +"eWG" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel, +/area/science/mixing) "eXV" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 @@ -41360,6 +41374,10 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/port) +"gfi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/science/mixing) "ggq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -41543,10 +41561,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) -"gSB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/science/mixing) "gVX" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ dir = 8 @@ -46919,10 +46933,6 @@ icon_state = "wood-broken6" }, /area/maintenance/starboard/aft) -"tEk" = ( -/obj/machinery/pool/drain, -/turf/open/pool, -/area/maintenance/starboard/aft) "tFk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -47069,6 +47079,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output, /turf/open/floor/engine/n2o, /area/engineering/atmos) +"ujF" = ( +/obj/machinery/pool/drain, +/turf/open/pool, +/area/maintenance/starboard/aft) "uok" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 8 @@ -47503,12 +47517,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/science/mixing) -"vHT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) "vJk" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -47542,10 +47550,6 @@ "vMb" = ( /turf/open/floor/engine/n2o, /area/engineering/atmos) -"vNP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall/rust, -/area/science/mixing) "vPZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -47797,10 +47801,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) -"wXH" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel, -/area/science/mixing) "xdr" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -95626,7 +95626,7 @@ hXc abP jLF aAY -wXH +eWG bdA aRy aRy @@ -96150,7 +96150,7 @@ aRy bhm bhX uCY -tEk +ujF nio jeI juY @@ -98453,12 +98453,12 @@ sVt sVt sVt qcP -gSB -vNP -vNP -gSB -gSB -vHT +eIl +gfi +gfi +eIl +eIl +doR iio aad aad From 6e429c2742ffd651dcb3d57791d0e984c07e74d6 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Feb 2022 17:49:56 -0500 Subject: [PATCH 03/12] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 234 ++++++++++-------- 1 file changed, 124 insertions(+), 110 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 2719305223..7392e3716a 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -2144,11 +2144,9 @@ /turf/open/floor/plasteel/white, /area/command/heads_quarters/hop) "adm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/command/heads_quarters/rd) +/obj/structure/girder, +/turf/open/floor/plating, +/area/engineering/storage/tech) "adn" = ( /turf/closed/wall, /area/cargo/storage) @@ -39127,44 +39125,21 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "bls" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall/rust, -/area/science/mixing) +/turf/closed/wall, +/area/engineering/storage/tech) "blv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) +/turf/closed/wall/rust, +/area/engineering/storage/tech) "blx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/engineering/storage/tech) "bly" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Security Checkpoint"; - dir = 10 - }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/hallway/primary/aft) +/turf/closed/wall/r_wall, +/area/command/heads_quarters/rd) "blA" = ( /obj/machinery/door/airlock/grunge{ name = "Mass Driver Room"; @@ -39390,6 +39365,10 @@ }, /turf/open/floor/plating, /area/science/mixing) +"boP" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel, +/area/science/mixing) "bpj" = ( /obj/machinery/camera{ c_tag = "Toxins Launch Room Access"; @@ -39948,9 +39927,11 @@ /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "buS" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/maintenance/solars/port/aft) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/science/mixing) "buW" = ( /turf/closed/wall/r_wall, /area/engineering/supermatter) @@ -40447,6 +40428,12 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/maintenance/port/aft) +"bWn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "bYE" = ( /obj/structure/sign/warning/fire, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -40741,12 +40728,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"doR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) "dvB" = ( /obj/structure/sink/puddle, /turf/open/floor/plating/asteroid, @@ -40993,10 +40974,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) -"eIl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/science/mixing) "eOg" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -41032,14 +41009,14 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"eVQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/science/mixing) "eWo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/mixing) -"eWG" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel, -/area/science/mixing) "eXV" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 @@ -41374,10 +41351,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/port) -"gfi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall/rust, -/area/science/mixing) "ggq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -41478,6 +41451,12 @@ }, /turf/open/floor/plasteel, /area/maintenance/port/aft) +"gKB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "gLD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -41629,6 +41608,10 @@ }, /turf/open/floor/plasteel, /area/service/bar/atrium) +"hpK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/science/mixing) "hqX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -42092,6 +42075,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/xenobiology) +"jen" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "jeI" = ( /turf/open/floor/plasteel/yellowsiding{ dir = 1 @@ -42162,7 +42151,7 @@ /area/hallway/primary/starboard) "jrd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 + dir = 4 }, /turf/closed/wall/r_wall, /area/science/mixing) @@ -42592,6 +42581,12 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/plating, /area/science/mixing) +"log" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/closed/wall, +/area/science/mixing) "low" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -42983,6 +42978,10 @@ }, /turf/open/floor/plasteel, /area/maintenance/starboard) +"ndd" = ( +/obj/machinery/pool/drain, +/turf/open/pool, +/area/maintenance/starboard/aft) "ndg" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, @@ -43052,6 +43051,10 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"nul" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "nvk" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -43197,7 +43200,7 @@ /area/asteroid/nearstation) "ooX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 + dir = 10 }, /turf/closed/wall/r_wall, /area/science/mixing) @@ -44417,7 +44420,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sEQ" = ( /obj/structure/rack, /obj/item/radio, @@ -44447,7 +44450,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFo" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -44459,7 +44462,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFp" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -44476,7 +44479,7 @@ dir = 1 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFq" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -44495,7 +44498,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFs" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -44541,7 +44544,7 @@ dir = 4 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFS" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -44551,7 +44554,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral, @@ -44562,7 +44565,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFU" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -44581,7 +44584,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sFX" = ( /obj/machinery/light/small{ dir = 8 @@ -44623,7 +44626,7 @@ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/maintenance/starboard) +/area/engineering/storage/tech) "sGA" = ( /obj/structure/cable/white{ icon_state = "2-4" @@ -46993,10 +46996,25 @@ /area/science/mixing) "ucu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 + dir = 4 }, -/turf/closed/wall, -/area/science/mixing) +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Security Checkpoint"; + dir = 10 + }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/hallway/primary/aft) "udT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/power/apc{ @@ -47079,10 +47097,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output, /turf/open/floor/engine/n2o, /area/engineering/atmos) -"ujF" = ( -/obj/machinery/pool/drain, -/turf/open/pool, -/area/maintenance/starboard/aft) "uok" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 8 @@ -76091,7 +76105,7 @@ aad aad aLC bae -buS +nul aLC sdX sdX @@ -76607,8 +76621,8 @@ aMJ bak aLC aLC -buS -buS +nul +nul aaa pZU aaa @@ -76865,7 +76879,7 @@ bal aLC bbf bbo -buS +nul aaa pZU aaa @@ -77122,7 +77136,7 @@ bam bav bdC bgk -buS +nul sdX sdX aaa @@ -89711,7 +89725,7 @@ aUy aWQ tWh aYc -bly +ucu sKB baI bby @@ -94825,10 +94839,10 @@ xpX pML oyD bfp -aSD -aRz -aRz -aRz +adm +bls +bls +bls saI aRz sIb @@ -95082,10 +95096,10 @@ oyD oyD oyD sGY -aRz +bls sFn sFR -sJN +blv sGY aRz bmb @@ -95342,7 +95356,7 @@ sEn sEN sFo sFS -aSH +blx sGY aRz sIc @@ -95596,7 +95610,7 @@ eOg sDq aRz bfp -aRz +bls sFp sFT sGy @@ -95626,7 +95640,7 @@ hXc abP jLF aAY -eWG +boP bdA aRy aRy @@ -95853,10 +95867,10 @@ xMZ bRf xMZ ygB -aRz +bls sFq sFU -aRz +bls sGY sJN blM @@ -96150,7 +96164,7 @@ aRy bhm bhX uCY -ujF +ndd nio jeI juY @@ -98453,12 +98467,12 @@ sVt sVt sVt qcP -eIl -gfi -gfi -eIl -eIl -doR +hpK +eVQ +eVQ +hpK +hpK +bWn iio aad aad @@ -98704,7 +98718,7 @@ aJO aJO bdK bew -adm +bly ajP sVt meo @@ -98961,7 +98975,7 @@ aaa aJO aJO aJO -adm +bly dfK dfK sVt @@ -99218,7 +99232,7 @@ aaa aaa aad aad -bls +buS dfK qnA ucd @@ -99475,11 +99489,11 @@ aaa aaa aac aad -blv +jrd lmq nfS -jrd -ucu +gKB +log upN iio iio @@ -99732,10 +99746,10 @@ aaa aaa aac aad -blx -gcw -gcw ooX +gcw +gcw +jen gLD lFm uTF From 7a0ebafe43649b42223c3b50349921272eed34ae Mon Sep 17 00:00:00 2001 From: TripleShades Date: Fri, 18 Feb 2022 17:51:34 -0500 Subject: [PATCH 04/12] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 7392e3716a..e9fec9bb24 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -39365,10 +39365,6 @@ }, /turf/open/floor/plating, /area/science/mixing) -"boP" = ( -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel, -/area/science/mixing) "bpj" = ( /obj/machinery/camera{ c_tag = "Toxins Launch Room Access"; @@ -40428,12 +40424,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/maintenance/port/aft) -"bWn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) "bYE" = ( /obj/structure/sign/warning/fire, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -40974,6 +40964,12 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) +"eDk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "eOg" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -41009,10 +41005,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"eVQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall/rust, -/area/science/mixing) "eWo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -41351,6 +41343,12 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/port) +"gfr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/closed/wall, +/area/science/mixing) "ggq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -41428,6 +41426,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"gBp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "gGq" = ( /obj/machinery/mass_driver{ dir = 4; @@ -41451,12 +41455,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/port/aft) -"gKB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) "gLD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -41608,10 +41606,6 @@ }, /turf/open/floor/plasteel, /area/service/bar/atrium) -"hpK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/science/mixing) "hqX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -41870,6 +41864,10 @@ /obj/machinery/air_sensor/atmos/carbon_tank, /turf/open/floor/engine/co2, /area/engineering/atmos) +"irp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall/rust, +/area/science/mixing) "isT" = ( /turf/open/floor/wood{ icon_state = "wood-broken2" @@ -42075,12 +42073,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/xenobiology) -"jen" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/science/mixing) "jeI" = ( /turf/open/floor/plasteel/yellowsiding{ dir = 1 @@ -42494,6 +42486,10 @@ /obj/machinery/meter/atmos, /turf/open/floor/plasteel, /area/engineering/atmos) +"kFf" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/plasteel, +/area/science/mixing) "kHA" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -42574,6 +42570,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/maintenance/starboard/aft) +"kYh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/science/mixing) "lcW" = ( /turf/open/floor/wood, /area/maintenance/starboard/aft) @@ -42581,12 +42583,6 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/plating, /area/science/mixing) -"log" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/closed/wall, -/area/science/mixing) "low" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -42978,10 +42974,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/starboard) -"ndd" = ( -/obj/machinery/pool/drain, -/turf/open/pool, -/area/maintenance/starboard/aft) "ndg" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, @@ -43051,10 +43043,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"nul" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/maintenance/solars/port/aft) "nvk" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -43131,6 +43119,10 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"nPS" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/solars/port/aft) "nTg" = ( /obj/item/assembly/timer{ pixel_x = 5; @@ -43160,6 +43152,10 @@ }, /turf/open/floor/plasteel/dark/corner, /area/engineering/atmos) +"nXb" = ( +/obj/machinery/pool/drain, +/turf/open/pool, +/area/maintenance/starboard/aft) "oaV" = ( /obj/structure/grille, /obj/machinery/meter, @@ -43438,6 +43434,10 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"pgH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/science/mixing) "pix" = ( /turf/open/floor/wood{ icon_state = "wood-broken7" @@ -76105,7 +76105,7 @@ aad aad aLC bae -nul +nPS aLC sdX sdX @@ -76621,8 +76621,8 @@ aMJ bak aLC aLC -nul -nul +nPS +nPS aaa pZU aaa @@ -76879,7 +76879,7 @@ bal aLC bbf bbo -nul +nPS aaa pZU aaa @@ -77136,7 +77136,7 @@ bam bav bdC bgk -nul +nPS sdX sdX aaa @@ -95640,7 +95640,7 @@ hXc abP jLF aAY -boP +kFf bdA aRy aRy @@ -96164,7 +96164,7 @@ aRy bhm bhX uCY -ndd +nXb nio jeI juY @@ -98467,12 +98467,12 @@ sVt sVt sVt qcP -hpK -eVQ -eVQ -hpK -hpK -bWn +pgH +irp +irp +pgH +pgH +kYh iio aad aad @@ -99492,8 +99492,8 @@ aad jrd lmq nfS -gKB -log +gBp +gfr upN iio iio @@ -99749,7 +99749,7 @@ aad ooX gcw gcw -jen +eDk gLD lFm uTF From 068650fc61b80be54cb9a6e8740a8aea90f09120 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 18 Feb 2022 21:35:16 -0500 Subject: [PATCH 05/12] Readds content-requiring-prior-approval section in contributing --- .github/CONTRIBUTING.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d10a2d79f6..4363adc913 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -11,7 +11,8 @@ 6. [Pull Request Process](#pull-request-process) 7. [Porting features/sprites/sounds/tools from other codebases](#porting-featuresspritessoundstools-from-other-codebases) 8. [Banned content](#banned-content) -9. [A word on Git](#a-word-on-git) +9. [Content requiring prior approval](#content-requiring-prior-approval) +10. [A word on Git](#a-word-on-git) ## Reporting Issues If you ever encounter a bug in-game, the best way to let a coder know about it is with our GitHub Issue Tracker. Please make sure you use the supplied issue template, and include the round ID for the server. @@ -678,6 +679,14 @@ Do not add any of the following in a Pull Request or risk getting the PR closed: Just because something isn't on this list doesn't mean that it's acceptable. Use common sense above all else. +## Content requiring prior approval +Certain types of changes may require prior approval from maintainers. This currently includes: + +* Code adding, removing, or updating the availability of alien races/species/human mutants. This includes pull requests attempting to add or remove features from said races/species/mutants. (Requires approval from at least one maintainer) +* Code adding, removing, or modifying the functionality of adult-oriented features (such as, but not limited to: vore, genitals, MKUltra, and more). This also includes pull requests attempting to add or remove these features outright. (Requires approval from at least half of the formal maintainer team) + +The above content requires approval from the specified amount of maintainers prior to PR creation. Seeking approval must be done via a @Maintainer ping in a relevant development/code or staff channel on the Discord, otherwise it will be considered insufficient. If a PR contains any of the above content, but the creator does not have sufficient approval prior to the PR's creation, then the PR may be closed by any maintainer, at any time, for any reason. + ## A word on Git This repository uses `LF` line endings for all code as specified in the **.gitattributes** and **.editorconfig** files. From 2da889118686176f912b74fa462a0f237ec52bba Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 18 Feb 2022 22:33:35 -0500 Subject: [PATCH 06/12] Tweaks the text lightly for additional clarity and less aggression --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4363adc913..d25839b92f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -685,7 +685,7 @@ Certain types of changes may require prior approval from maintainers. This curre * Code adding, removing, or updating the availability of alien races/species/human mutants. This includes pull requests attempting to add or remove features from said races/species/mutants. (Requires approval from at least one maintainer) * Code adding, removing, or modifying the functionality of adult-oriented features (such as, but not limited to: vore, genitals, MKUltra, and more). This also includes pull requests attempting to add or remove these features outright. (Requires approval from at least half of the formal maintainer team) -The above content requires approval from the specified amount of maintainers prior to PR creation. Seeking approval must be done via a @Maintainer ping in a relevant development/code or staff channel on the Discord, otherwise it will be considered insufficient. If a PR contains any of the above content, but the creator does not have sufficient approval prior to the PR's creation, then the PR may be closed by any maintainer, at any time, for any reason. +If a PR contains any of the above content, and it lacks prior approval, then it may closed at maintainer discretion. Prior approval requires an @Maintainer ping in a relevant development/code or staff channel on the Discord. This is primarily to limit the impact of PRs that're created in bad faith, or are otherwise counterproductive to the server's health. ## A word on Git This repository uses `LF` line endings for all code as specified in the **.gitattributes** and **.editorconfig** files. From 912d2e4eb87d7e30a816dbd77d99821a35c48ade Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 19 Feb 2022 12:28:16 -0800 Subject: [PATCH 07/12] fixes the linux auto-compile --- tools/tgs4_scripts/PreCompile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tgs4_scripts/PreCompile.sh b/tools/tgs4_scripts/PreCompile.sh index 6109c07989..6e45a1d820 100755 --- a/tools/tgs4_scripts/PreCompile.sh +++ b/tools/tgs4_scripts/PreCompile.sh @@ -84,7 +84,7 @@ fi echo "Deploying auxmos..." git checkout "$AUXMOS_VERSION" -env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features all_reaction_hooks,katmos -- -C target-cpu=native +env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks katmos" -- -C target-cpu=native mv -f target/i686-unknown-linux-gnu/release/libauxmos.so "$1/libauxmos.so" cd .. From 92124c706d14ccddae0e86ca9915deee49bf09d3 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 20 Feb 2022 00:38:24 +0000 Subject: [PATCH 08/12] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15506.yml | 4 ---- html/changelogs/archive/2022-02.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15506.yml diff --git a/html/changelogs/AutoChangeLog-pr-15506.yml b/html/changelogs/AutoChangeLog-pr-15506.yml deleted file mode 100644 index a761095b0f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15506.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "jupyterkat" -delete-after: True -changes: - - refactor: "switched equalization method to katmos" diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index d5cf250f9d..17000e958a 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -81,3 +81,6 @@ 2022-02-19: timothyteakettle: - rscadd: polychromic clown outfit and mask +2022-02-20: + jupyterkat: + - refactor: switched equalization method to katmos From e26452bd68638ce0eef702e6fc9136ca1bd0365e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 19 Feb 2022 19:08:30 -0600 Subject: [PATCH 09/12] Automatic changelog generation for PR #15513 [ci skip] --- html/changelogs/AutoChangeLog-pr-15513.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15513.yml diff --git a/html/changelogs/AutoChangeLog-pr-15513.yml b/html/changelogs/AutoChangeLog-pr-15513.yml new file mode 100644 index 0000000000..077fb57101 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15513.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Default features on linux auxmos compile now formatted correctly" From 51a6b35a3c60f109f0987d0191dc935d42be50b6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 19 Feb 2022 19:08:53 -0600 Subject: [PATCH 10/12] Automatic changelog generation for PR #15510 [ci skip] --- html/changelogs/AutoChangeLog-pr-15510.yml | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15510.yml diff --git a/html/changelogs/AutoChangeLog-pr-15510.yml b/html/changelogs/AutoChangeLog-pr-15510.yml new file mode 100644 index 0000000000..206bf8c13e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15510.yml @@ -0,0 +1,36 @@ +author: "TripleShades" +delete-after: True +changes: + - rscadd: "[Omega] Gateway shutter button" + - rscadd: "[Omega] Signs to the airlocks that lead to space that say SPACE" + - rscadd: "[Omega] Air Alarm for the Turbine itself" + - rscadd: "[Omega] SMES Unit for the Turbine itself" + - rscadd: "[Omega] Firelock to Robotics airlock" + - rscadd: "[Omega] Captain's Office now has a hand teleporter and medal box" + - rscadd: "[Omega] Screwdriver to Chemistry" + - rscadd: "[Omega] Space Cleaner bottle to Medbay" + - rscadd: "[Omega] Limb Grower and Spare Limb Crate to Surgery" + - rscadd: "[Omega] Kinkmate in Dorms" + - rscadd: "[Omega] Lightbulb fixture to Secure Tech Storage" + - rscadd: "[Omega] Armsky is now in the Armoury" + - rscdel: "[Omega] Extra automated announcement machine" + - rscdel: "[Omega] Wall inside of southwest Solar Array window" + - rscdel: "[Omega] Wall inside library maint airlock" + - rscdel: "[Omega] Duplicate Robotics airlock +tweak: [Omega] HoS gun now spawns in HoS locker instead of Captain's locker +tweak: [Omega] Both Solar Arrays now have more windows +tweak: [Omega] PACMAN moved out from behind a Command airlock in Engineering +tweak: [Omega] A few cameras so that they're not sitting improperly on windows +tweak: [Omega] Medbay Surgery now has a surgical duffel instead of strewn about tools +tweak: [Omega] Security Cell 1 is now properly named and has a bed instead of a chair +tweak: [Omega] Toxins scrubber piping now goes through a wall +tweak: [Omega] Robotics trash can is now moved to the small hallway between Robotics and Toxins +tweak: [Omega] Maint Pool drain moved down a tile so it's easier to retrieve lost items" + - bugfix: "[Omega] Lawyer Office access" + - bugfix: "[Omega] Both Solar Arrays are now wired up to power the station properly" + - bugfix: "[Omega] Wire leading to the single Supermatter Emitter should now be properly connected and not diagonal" + - bugfix: "[Omega] Gateway Maint airlock access" + - bugfix: "[Omega] Toxins Launch not being connected to the main air supply" + - bugfix: "[Omega] Toxins Mix Chamber no longer starts bolted" + - bugfix: "[Omega] Missing pipe above Security leading into Perma" + - bugfix: "[Omega] Secure Tech Storage now properly has an area" From a49b19a4f7da65789529d0c5e72b7470dda6f078 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 19 Feb 2022 19:14:48 -0800 Subject: [PATCH 11/12] makes reinforced plasma glass windows buildable --- code/game/objects/structures/window.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 5f84094477..4853d553dc 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -719,7 +719,6 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) icon = 'icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" dir = FULLTILE_WINDOW_DIR - state = PRWINDOW_SECURE max_integrity = 1000 fulltile = TRUE flags_1 = PREVENT_CLICK_UNDER_1 From b932828a7f60683ebf582f5bb306be51a59b906c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 19 Feb 2022 21:25:22 -0600 Subject: [PATCH 12/12] Automatic changelog generation for PR #15515 [ci skip] --- html/changelogs/AutoChangeLog-pr-15515.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15515.yml diff --git a/html/changelogs/AutoChangeLog-pr-15515.yml b/html/changelogs/AutoChangeLog-pr-15515.yml new file mode 100644 index 0000000000..dcd230897e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15515.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "reinforced plasma glass windows are buildable"