From 15c2c1fd094a5cbfec4a1839e80934ee8f11846f Mon Sep 17 00:00:00 2001 From: Krashly Date: Thu, 19 Oct 2023 19:16:08 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D0=A2=D1=80=D1=83=D0=B1=D1=8B=20+=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0=D1=83=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/MetaStation/MetaStation.dmm | 682 ++++++++++++------ .../krashly/code/game/objects/items/item.dm | 8 + 2 files changed, 467 insertions(+), 223 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ec13dcf0d4de..fa8b87e314ad 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5358,6 +5358,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"asN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/engineering/atmos) "asP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -14238,6 +14242,9 @@ /area/hallway/primary/starboard) "bhL" = ( /obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bhM" = ( @@ -14649,6 +14656,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/service/kitchen/coldroom) "bjx" = ( @@ -16120,7 +16128,6 @@ /area/hallway/primary/starboard) "bpi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16702,9 +16709,6 @@ /turf/open/floor/carpet, /area/service/theater) "brv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -18013,9 +18017,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/window/reinforced{ dir = 1 }, @@ -18333,7 +18334,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "byP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/beacon, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -18512,7 +18512,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced{ dir = 1 }, @@ -18795,7 +18794,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -19163,7 +19161,6 @@ /obj/machinery/airalarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -19238,7 +19235,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced{ dir = 1 }, @@ -19721,11 +19717,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/turf_decal/tile/dark_green, /obj/structure/railing{ pixel_y = -10 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/command) "bFe" = ( @@ -19808,6 +19806,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bFB" = ( @@ -19836,7 +19837,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/red{ dir = 8 @@ -20026,7 +20026,6 @@ /obj/item/crowbar, /obj/item/wrench, /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -20194,6 +20193,9 @@ "bIs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bIv" = ( @@ -20226,9 +20228,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/item/kirbyplants/random, /turf/open/floor/plasteel, /area/hallway/primary/starboard) @@ -20243,9 +20242,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bIH" = ( @@ -20262,9 +20258,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bJa" = ( @@ -21185,6 +21178,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bSf" = ( @@ -21378,11 +21374,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/spawner/lootdrop/syndicate_present, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -21606,7 +21601,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bTO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21960,7 +21954,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/plaque{ icon_state = "L1" }, @@ -22039,6 +22032,7 @@ /obj/effect/turf_decal/plaque{ icon_state = "L13" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) "bVl" = ( @@ -22089,6 +22083,9 @@ codes_txt = "patrol;next_patrol=8-Central-to-Aft"; location = "7.5-Starboard-Aft-Corner" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bVp" = ( @@ -22397,10 +22394,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/plaque{ icon_state = "L2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bWs" = ( @@ -22453,12 +22452,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/plaque{ icon_state = "L14" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) "bWy" = ( @@ -24944,6 +24941,7 @@ pixel_x = -24; pixel_y = 28 }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/white, /area/command/gateway) "cdR" = ( @@ -25502,10 +25500,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/landmark/start/stowaway, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ceZ" = ( @@ -26134,7 +26132,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -26588,7 +26585,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ name = "Gateway Atrium"; req_access_txt = "62" @@ -27134,7 +27130,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -27672,7 +27667,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -28259,6 +28253,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/command/gateway) "clK" = ( @@ -28267,13 +28264,13 @@ "clL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/command/gateway) "clN" = ( @@ -28684,7 +28681,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ name = "Gateway Atrium"; req_access_txt = "62" @@ -29275,7 +29271,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -29873,13 +29868,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/white, /area/science/research) "cpp" = ( @@ -29901,8 +29894,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/research) "cpr" = ( @@ -30474,14 +30469,19 @@ /turf/open/floor/plasteel, /area/science/lab) "cqA" = ( -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/plasteel/white, /area/science/lab) "cqB" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/plasteel/white, /area/science/lab) "cqC" = ( /obj/item/storage/belt/utility, @@ -30524,6 +30524,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqH" = ( @@ -30537,6 +30538,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqI" = ( @@ -30547,6 +30549,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqJ" = ( @@ -30554,6 +30557,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqK" = ( @@ -30565,11 +30569,13 @@ dir = 1; network = list("ss13","rd") }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqL" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqM" = ( @@ -30580,6 +30586,7 @@ dir = 1; pixel_y = -24 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqN" = ( @@ -30972,6 +30979,7 @@ "crM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "crR" = ( @@ -31437,6 +31445,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csS" = ( @@ -31449,6 +31463,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csT" = ( @@ -31472,6 +31492,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csV" = ( @@ -31484,6 +31507,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csW" = ( @@ -31504,6 +31530,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "ctf" = ( @@ -31688,6 +31715,9 @@ }, /obj/structure/table/glass, /obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/command/gateway) "ctF" = ( @@ -31745,6 +31775,9 @@ "ctN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white/side{ dir = 6 }, @@ -31759,6 +31792,7 @@ /area/science/research) "ctP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "ctW" = ( @@ -33470,6 +33504,7 @@ pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cxK" = ( @@ -33854,6 +33889,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "cyw" = ( @@ -33869,6 +33907,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cyy" = ( @@ -35746,11 +35785,15 @@ "cCr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cCs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cCt" = ( @@ -36147,6 +36190,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cDk" = ( @@ -37146,6 +37192,9 @@ dir = 4; network = list("ss13","rd") }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cFl" = ( @@ -37601,6 +37650,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cGh" = ( @@ -39441,6 +39493,11 @@ name = "Research and Development Lab"; req_one_access_txt = "7;29" }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/science/lab) "cJn" = ( @@ -40636,6 +40693,7 @@ dir = 1; pixel_y = -22 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cLC" = ( @@ -43737,6 +43795,14 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"cYY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/dark_green, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) "cZa" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46100,9 +46166,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/table/glass, /obj/item/restraints/handcuffs/cable/pink, @@ -46448,6 +46511,13 @@ icon_state = "panelscorched" }, /area/maintenance/starboard/fore) +"dpw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "dpy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47856,9 +47926,6 @@ /turf/open/floor/plasteel/cafeteria, /area/command/heads_quarters/cmo) "dFX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, @@ -48176,8 +48243,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/closed/wall, -/area/maintenance/starboard) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) "dPj" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -48212,14 +48283,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard) "dRb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -49016,9 +49084,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, /obj/structure/table/wood/bar, /obj/machinery/chem_dispenser/drinks{ dir = 4 @@ -51344,6 +51409,12 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"fva" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/heads_quarters/captain/private) "fvm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -51365,6 +51436,10 @@ "fwb" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/wood, /area/service/theater) "fwd" = ( @@ -51604,6 +51679,7 @@ "fDs" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "fDD" = ( @@ -51759,9 +51835,6 @@ /turf/open/floor/plasteel, /area/engineering/main) "fHh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -51983,6 +52056,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "fNh" = ( @@ -52064,13 +52138,10 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "fOS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/service/coffeehouse) "fPJ" = ( @@ -52990,10 +53061,12 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "goF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "gpb" = ( @@ -53151,6 +53224,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "gsp" = ( @@ -54090,9 +54166,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/table, /obj/machinery/recharger{ pixel_y = 4 @@ -54210,6 +54283,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/disposalpipe/junction/flip{ + dir = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "gUw" = ( @@ -54405,21 +54481,26 @@ pixel_x = -3; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/item/clothing/mask/breath{ pixel_x = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "hbh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, -/area/engineering/break_room) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hbq" = ( /obj/machinery/light/small{ dir = 8 @@ -55455,6 +55536,9 @@ /obj/effect/landmark/start/bartender, /obj/structure/cable, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, /turf/open/floor/plasteel, /area/service/bar) "hAM" = ( @@ -56578,7 +56662,6 @@ /turf/open/floor/plasteel, /area/security/prison/upper) "hZe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56957,6 +57040,24 @@ }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) +"ika" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "ikj" = ( /obj/machinery/light/small{ dir = 4; @@ -57280,9 +57381,6 @@ /turf/open/floor/wood, /area/service/library) "iui" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/button/door{ id = "coffee_counter"; name = "Shutters Control"; @@ -57290,6 +57388,7 @@ specialfunctions = 4; pixel_y = -25 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/service/coffeehouse) "iun" = ( @@ -58575,6 +58674,7 @@ "jdL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/command/gateway) "jdV" = ( @@ -58616,11 +58716,9 @@ /turf/open/floor/plasteel, /area/cargo/storage) "jfD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/closet/wardrobe/pink, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/service/barbershop) "jfL" = ( @@ -58686,9 +58784,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/table, /obj/item/book/manual/splurt_space_law, /obj/item/paper_bin{ @@ -58873,6 +58968,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/break_room) "jlc" = ( @@ -58956,6 +59054,9 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/break_room) "jom" = ( @@ -59070,16 +59171,11 @@ /turf/open/floor/engine, /area/science/xenobiology) "jra" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/service/barbershop) "jrm" = ( @@ -59698,6 +59794,10 @@ "jGg" = ( /turf/open/floor/plasteel, /area/commons/fitness/pool) +"jGl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "jGw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -59993,9 +60093,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/closed/wall/r_wall, /area/engineering/break_room) "jNs" = ( @@ -61008,6 +61105,9 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "kmQ" = ( @@ -61944,11 +62044,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/storage/tcomms) "kJM" = ( @@ -62383,15 +62483,11 @@ /turf/open/floor/plating, /area/commons/fitness/pool) "kUw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/turf/closed/wall/r_wall, +/area/engineering/storage/tcomms) "kUx" = ( /obj/machinery/camera{ c_tag = "Council Chamber" @@ -62507,6 +62603,7 @@ dir = 8 }, /obj/structure/closet/crate, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "kXd" = ( @@ -62768,7 +62865,6 @@ dir = 4; pixel_x = -23 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/vending/coffee, /turf/open/floor/wood, /area/service/coffeehouse) @@ -63183,13 +63279,13 @@ /turf/open/floor/plasteel, /area/engineering/main) "lpm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "lpD" = ( @@ -64070,6 +64166,15 @@ /obj/structure/bedsheetbin/towel, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) +"lOq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters"; + req_access_txt = "20" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/command/heads_quarters/captain/private) "lOr" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -64271,9 +64376,6 @@ /turf/open/space, /area/space) "lTr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64351,6 +64453,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "lUv" = ( @@ -65571,7 +65676,6 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "mxh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/bed/pod{ name = "massage bed" @@ -65932,6 +66036,15 @@ }, /turf/closed/wall/r_wall, /area/engineering/break_room) +"mGK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain{ + color = "#560319" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/service/barbershop) "mGL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -66267,6 +66380,11 @@ "mPv" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 6; + pixel_y = 2 + }, /turf/open/floor/plasteel, /area/service/bar) "mPQ" = ( @@ -66349,7 +66467,6 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "mSB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -66525,6 +66642,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "mXi" = ( @@ -66604,7 +66722,6 @@ /turf/open/floor/plasteel, /area/command/bridge) "mZD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -67432,6 +67549,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel, /area/maintenance/starboard) "nyA" = ( @@ -67730,6 +67848,10 @@ /obj/effect/landmark/start/chaplain, /turf/open/floor/plasteel/dark, /area/service/chapel/office) +"nIb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/service/coffeehouse) "nIQ" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -68036,6 +68158,12 @@ }, /turf/open/floor/plasteel, /area/cargo/miningoffice) +"nPV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "nQo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -68603,6 +68731,7 @@ dir = 4 }, /obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "oaA" = ( @@ -69482,6 +69611,16 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) +"ouq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "our" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -70174,9 +70313,6 @@ /turf/open/floor/carpet, /area/medical/psychology) "oOQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/closed/wall, /area/security/checkpoint/engineering) @@ -70350,10 +70486,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 + dir = 9 }, -/obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/plasteel/dark, /area/engineering/storage/tcomms) "oTb" = ( @@ -70539,7 +70675,6 @@ /turf/open/floor/plasteel, /area/commons/dorms) "oWF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" @@ -71214,9 +71349,6 @@ /area/ai_monitored/aisat/exterior) "plN" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/item/stock_parts/subspace/amplifier, /obj/item/stock_parts/subspace/amplifier, /obj/structure/table, @@ -71224,6 +71356,7 @@ /obj/item/stock_parts/subspace/transmitter, /obj/item/stock_parts/subspace/transmitter, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/engineering/storage/tcomms) "plV" = ( @@ -71553,6 +71686,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/commons/fitness/recreation) +"pti" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "ptX" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -72027,6 +72173,12 @@ }, /turf/open/floor/plasteel, /area/security/office) +"pEP" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "pGf" = ( /obj/structure/chair{ dir = 4 @@ -73733,6 +73885,10 @@ /obj/item/storage/box/drinkingglasses, /obj/item/storage/box/marshmallow, /obj/item/storage/box/marshmallow, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, /turf/open/floor/wood, /area/service/coffeehouse) "qva" = ( @@ -74787,6 +74943,13 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"qVs" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/service/bar) "qVE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -74844,6 +75007,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/wood, /area/service/theater) "qWR" = ( @@ -75311,6 +75477,9 @@ }, /obj/structure/bed/dogbed/renault, /mob/living/simple_animal/pet/fox/Renault, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "rhK" = ( @@ -75564,8 +75733,8 @@ "rms" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -75913,6 +76082,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, /area/service/barbershop) "ryl" = ( @@ -76415,6 +76585,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison/upper) +"rMq" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "rMx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ @@ -76476,7 +76656,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/satellite) "rNT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/service/glass{ name = "Coffee House" @@ -77094,6 +77273,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 6; + pixel_y = 2 + }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) "sbY" = ( @@ -77292,6 +77476,18 @@ }, /turf/open/floor/plasteel, /area/commons/locker) +"sgJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "shf" = ( /obj/item/hand_labeler, /obj/item/stack/packageWrap, @@ -78016,7 +78212,6 @@ /obj/machinery/door/airlock/service/glass{ name = "Barbershop" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -78209,6 +78404,12 @@ dir = 5 }, /area/command/heads_quarters/rd) +"sEg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/carpet, +/area/command/heads_quarters/captain/private) "sEp" = ( /obj/machinery/computer/communications{ dir = 8 @@ -79621,7 +79822,6 @@ /obj/item/folder/blue{ pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/pen, /obj/machinery/computer/security/telescreen/minisat{ dir = 1; @@ -79727,6 +79927,7 @@ name = "Atmospherics Blast Door" }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/break_room) "tsn" = ( @@ -79855,12 +80056,10 @@ /turf/open/floor/plasteel, /area/commons/dorms/second) "txb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/break_room) "txh" = ( @@ -80123,7 +80322,6 @@ }, /area/engineering/atmos) "tFH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -80821,9 +81019,6 @@ c_tag = "Telecomms - Storage"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/power/apc{ areastring = "/area/engineering/storage/tcomms"; dir = 8; @@ -80866,6 +81061,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/storage) +"tUV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "tUY" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -81765,6 +81969,7 @@ /obj/effect/landmark/navigate_destination/bar, /obj/structure/table, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "upX" = ( @@ -82186,14 +82391,10 @@ /turf/open/floor/plasteel/cafeteria, /area/commons/dorms/second) "uAs" = ( -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria, -/area/service/kitchen) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/engineering/atmos) "uAG" = ( /obj/structure/closet/secure_closet/lethalshots, /obj/item/ammo_box/magazine/wt550m9, @@ -82563,6 +82764,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/turf_decal/bot_white, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "uLv" = ( @@ -82660,6 +82862,16 @@ /obj/structure/lattice, /turf/open/space/basic, /area/security/execution/education) +"uPv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "uPA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -82946,7 +83158,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/plasteel, /area/engineering/storage/tcomms) @@ -84444,9 +84655,12 @@ /turf/open/floor/plasteel, /area/hallway/secondary/service) "vNi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, -/area/command/heads_quarters/captain/private) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/research) "vNm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ @@ -85044,8 +85258,8 @@ /obj/structure/chair/stool/directional/south{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/wood, /area/service/bar) @@ -85632,11 +85846,13 @@ /turf/open/space, /area/solars/starboard/aft) "wpo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/closed/wall/r_wall, -/area/engineering/storage/tcomms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/chapel_floor, +/area/service/bar) "wpz" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -85800,7 +86016,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/engineering{ name = "Telecomms Storage"; req_access_txt = "61" @@ -86614,6 +86829,7 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "wMU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, /area/service/coffeehouse) "wNF" = ( @@ -86697,6 +86913,9 @@ dir = 4; pixel_x = -26 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "wOY" = ( @@ -87385,9 +87604,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -87417,8 +87633,8 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/break_room) @@ -87498,7 +87714,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -87752,6 +87968,15 @@ }, /turf/open/floor/carpet, /area/commons/dorms) +"xpC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "xpD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -88312,10 +88537,10 @@ /turf/open/floor/plasteel, /area/commons/storage/art) "xCC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, /area/service/coffeehouse) "xCI" = ( @@ -88613,6 +88838,9 @@ name = "Station Intercom (General)"; pixel_y = -26 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "xIJ" = ( @@ -89117,11 +89345,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) +"xTc" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel/white, +/area/command/gateway) "xTt" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -89167,6 +89399,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "xUf" = ( @@ -89479,6 +89714,7 @@ /area/commons/dorms) "ybV" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/research) "ycy" = ( @@ -116280,10 +116516,10 @@ tMe seC wMU iui -nDn -kxk -aYX -aXR +nIb +ouq +bqy +bWo bXQ bZb cao @@ -118079,8 +118315,8 @@ qlY qyF hxo jfD -vCw -bUa +mGK +pti bVk bWx bXV @@ -118338,8 +118574,8 @@ rye jra szz bpi -kUw -bWo +aZb +aXR bXW bZk cau @@ -119608,7 +119844,7 @@ sKl sKl gLV geY -wIw +pok lpm sKl bDj @@ -119623,8 +119859,8 @@ cqD bSS rma bTS -dCE -bWA +rMq +xpC nft bZk caz @@ -119865,11 +120101,11 @@ wMG huJ cVF pok -vNi klX -rio -bDj -bEZ +sEg +lOq +dOR +cYY mMY bGX ivZ @@ -119880,7 +120116,7 @@ fzQ bSS uFF bTS -aYX +hbh bWB bXZ bZj @@ -119897,8 +120133,8 @@ dbH cnY cpj cIQ -ccd -csU +pEP +ika ctL cuH cuG @@ -120123,7 +120359,7 @@ jyl eCc qVZ jPX -wIw +fva sKl bDu bEZ @@ -120137,7 +120373,7 @@ pBL bSS bSS bTY -aZa +uPv bWC bSS bZn @@ -120394,7 +120630,7 @@ uqE cgl bSS cIk -aYX +hbh bWD iAc lJx @@ -120417,14 +120653,14 @@ ctN cuI cvM cwM -caw +dpw cyv czo cAt cBn cCr cDj -caw +coi cFk cGg cHa @@ -120651,7 +120887,7 @@ bFa lVE oOi bTS -aYX +hbh bWD bYa kiP @@ -120895,7 +121131,7 @@ stk qmj pqa goF -iNf +sKl bDw bFd lWC @@ -120908,7 +121144,7 @@ bSS bSS bSS fvm -aYX +hbh bWD bYa fWR @@ -121165,7 +121401,7 @@ bSS eDd cmL bUa -aYX +hbh bWD bYa bSK @@ -121422,7 +121658,7 @@ bSS crI sQb bUa -aYX +hbh bWE aUv lJx @@ -121433,7 +121669,7 @@ lJx lJx lJx nrB -ckj +xTc ctE lJx cod @@ -121679,7 +121915,7 @@ bSS wOi bzv bUa -aYX +hbh bWF bYb cmZ @@ -121936,7 +122172,7 @@ bQz bRO bQz bUb -bVb +sgJ bWG bSS bSS @@ -121952,7 +122188,7 @@ diH lJx cIQ cpr -cci +vNi nSv eXu hgy @@ -122189,10 +122425,10 @@ bwI aWf aWf btk -aWf +tUV gUj -aWf -aWf +baG +baG bVo bWH bYc @@ -122466,7 +122702,7 @@ clW lJx cck cpr -cci +vNi nSv gcz opM @@ -122723,7 +122959,7 @@ lJx lJx ccd cpr -cci +vNi nSv fVX gEL @@ -123720,12 +123956,12 @@ rYI gFi nwA wbZ -hCA +wpo mWS fDs uLo upO -iuF +qVs lwN wep wlF @@ -125012,7 +125248,7 @@ fyW gin ocV reC -uAs +reC reC les kGY @@ -128602,7 +128838,6 @@ alq alq alq buY -dOR alq alq alq @@ -128611,7 +128846,8 @@ alq alq alq alq -dgN +alq +cfl alq alq dgN @@ -128869,7 +129105,7 @@ bHm bIF alq bhL -apc +nPV apc apc bSd @@ -129126,7 +129362,7 @@ bHn bIG qtO qtO -qtO +kUw qtO bNO bPn @@ -129639,7 +129875,7 @@ lUn dlF ify qxd -wpo +qtO tuB qtO qtO @@ -130152,7 +130388,7 @@ jAn tyC nFG rms -qxd +jGl plN lvb bii @@ -131686,11 +131922,11 @@ xov ltg txb trn -sKv +asN oay fNf kWW -uKL +uAs grX hop ldI @@ -131949,7 +132185,7 @@ mSB dRb oWF tFH -tfk +mMn sfM kBk mMn @@ -133997,7 +134233,7 @@ iYP sCD haK tpe -hbh +iYP dFX qxd hFa diff --git a/modular_bluemoon/krashly/code/game/objects/items/item.dm b/modular_bluemoon/krashly/code/game/objects/items/item.dm index 5f037c0c635a..b062de3caf64 100644 --- a/modular_bluemoon/krashly/code/game/objects/items/item.dm +++ b/modular_bluemoon/krashly/code/game/objects/items/item.dm @@ -279,6 +279,7 @@ path = /obj/item/paper/book_alch ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/cat_alch name = "Alchemist's Neko Wallet" @@ -286,6 +287,7 @@ path = /obj/item/storage/wallet/cat_alch ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/vape name = "Vape" @@ -293,6 +295,7 @@ path = /obj/item/clothing/mask/vape ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/electropack name = "Electropack" @@ -300,6 +303,7 @@ path = /obj/item/electropack ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/straight_jacket name = "Straight Jacket" @@ -307,6 +311,7 @@ path = /obj/item/clothing/suit/straight_jacket ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/boxing name = "Boxing Gloves" @@ -314,6 +319,7 @@ path = /obj/item/clothing/gloves/boxing ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/coconut_bong name = "Coconut Bong" @@ -321,6 +327,7 @@ path = /obj/item/bong/coconut ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/armyknife name = "Army Knife" @@ -328,3 +335,4 @@ path = /obj/item/armyknife ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION From ac0ee37adf56229308c8ca824ee9aada70c12212 Mon Sep 17 00:00:00 2001 From: Krashly Date: Thu, 19 Oct 2023 19:16:43 +0300 Subject: [PATCH 2/9] =?UTF-8?q?Revert=20"=D0=A2=D1=80=D1=83=D0=B1=D1=8B=20?= =?UTF-8?q?+=20=D0=BB=D0=BE=D0=B4=D0=B0=D1=83=D1=82."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 15c2c1fd094a5cbfec4a1839e80934ee8f11846f. --- _maps/map_files/MetaStation/MetaStation.dmm | 682 ++++++------------ .../krashly/code/game/objects/items/item.dm | 8 - 2 files changed, 223 insertions(+), 467 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index fa8b87e314ad..ec13dcf0d4de 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5358,10 +5358,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"asN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/engineering/atmos) "asP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -14242,9 +14238,6 @@ /area/hallway/primary/starboard) "bhL" = ( /obj/machinery/light/small/directional/north, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /turf/open/floor/plating, /area/maintenance/starboard) "bhM" = ( @@ -14656,7 +14649,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/service/kitchen/coldroom) "bjx" = ( @@ -16128,6 +16120,7 @@ /area/hallway/primary/starboard) "bpi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16709,6 +16702,9 @@ /turf/open/floor/carpet, /area/service/theater) "brv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -18017,6 +18013,9 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /obj/structure/window/reinforced{ dir = 1 }, @@ -18334,6 +18333,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "byP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/beacon, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -18512,6 +18512,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced{ dir = 1 }, @@ -18794,6 +18795,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -19161,6 +19163,7 @@ /obj/machinery/airalarm{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -19235,6 +19238,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced{ dir = 1 }, @@ -19717,13 +19721,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/turf_decal/tile/dark_green, /obj/structure/railing{ pixel_y = -10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/secondary/command) "bFe" = ( @@ -19806,9 +19808,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/starboard) "bFB" = ( @@ -19837,6 +19836,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/red{ dir = 8 @@ -20026,6 +20026,7 @@ /obj/item/crowbar, /obj/item/wrench, /obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -20193,9 +20194,6 @@ "bIs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bIv" = ( @@ -20228,6 +20226,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /obj/item/kirbyplants/random, /turf/open/floor/plasteel, /area/hallway/primary/starboard) @@ -20242,6 +20243,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bIH" = ( @@ -20258,6 +20262,9 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bJa" = ( @@ -21178,9 +21185,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bSf" = ( @@ -21374,10 +21378,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/spawner/lootdrop/syndicate_present, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -21601,6 +21606,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bTO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21954,6 +21960,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/plaque{ icon_state = "L1" }, @@ -22032,7 +22039,6 @@ /obj/effect/turf_decal/plaque{ icon_state = "L13" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) "bVl" = ( @@ -22083,9 +22089,6 @@ codes_txt = "patrol;next_patrol=8-Central-to-Aft"; location = "7.5-Starboard-Aft-Corner" }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bVp" = ( @@ -22394,12 +22397,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWr" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/plaque{ icon_state = "L2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bWs" = ( @@ -22452,10 +22453,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/effect/turf_decal/plaque{ icon_state = "L14" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) "bWy" = ( @@ -24941,7 +24944,6 @@ pixel_x = -24; pixel_y = 28 }, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/white, /area/command/gateway) "cdR" = ( @@ -25500,10 +25502,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/effect/landmark/start/stowaway, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, +/obj/effect/landmark/start/stowaway, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ceZ" = ( @@ -26132,6 +26134,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -26585,6 +26588,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ name = "Gateway Atrium"; req_access_txt = "62" @@ -27130,6 +27134,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -27667,6 +27672,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -28253,9 +28259,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, /turf/open/floor/plasteel/white, /area/command/gateway) "clK" = ( @@ -28264,13 +28267,13 @@ "clL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/command/gateway) "clN" = ( @@ -28681,6 +28684,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ name = "Gateway Atrium"; req_access_txt = "62" @@ -29271,6 +29275,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -29868,11 +29873,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/white, /area/science/research) "cpp" = ( @@ -29894,10 +29901,8 @@ /obj/structure/disposalpipe/junction/flip{ dir = 2 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/science/research) "cpr" = ( @@ -30469,19 +30474,14 @@ /turf/open/floor/plasteel, /area/science/lab) "cqA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/lab) "cqB" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/lab) "cqC" = ( /obj/item/storage/belt/utility, @@ -30524,7 +30524,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqH" = ( @@ -30538,7 +30537,6 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqI" = ( @@ -30549,7 +30547,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqJ" = ( @@ -30557,7 +30554,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqK" = ( @@ -30569,13 +30565,11 @@ dir = 1; network = list("ss13","rd") }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqL" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqM" = ( @@ -30586,7 +30580,6 @@ dir = 1; pixel_y = -24 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqN" = ( @@ -30979,7 +30972,6 @@ "crM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "crR" = ( @@ -31445,12 +31437,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/research) "csS" = ( @@ -31463,12 +31449,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/research) "csT" = ( @@ -31492,9 +31472,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/research) "csV" = ( @@ -31507,9 +31484,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/research) "csW" = ( @@ -31530,7 +31504,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "ctf" = ( @@ -31715,9 +31688,6 @@ }, /obj/structure/table/glass, /obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/command/gateway) "ctF" = ( @@ -31775,9 +31745,6 @@ "ctN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white/side{ dir = 6 }, @@ -31792,7 +31759,6 @@ /area/science/research) "ctP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "ctW" = ( @@ -33504,7 +33470,6 @@ pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cxK" = ( @@ -33889,9 +33854,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/research) "cyw" = ( @@ -33907,7 +33869,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cyy" = ( @@ -35785,15 +35746,11 @@ "cCr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/science/research) "cCs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cCt" = ( @@ -36190,9 +36147,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/science/research) "cDk" = ( @@ -37192,9 +37146,6 @@ dir = 4; network = list("ss13","rd") }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/science/research) "cFl" = ( @@ -37650,9 +37601,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/science/research) "cGh" = ( @@ -39493,11 +39441,6 @@ name = "Research and Development Lab"; req_one_access_txt = "7;29" }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/science/lab) "cJn" = ( @@ -40693,7 +40636,6 @@ dir = 1; pixel_y = -22 }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cLC" = ( @@ -43795,14 +43737,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"cYY" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/dark_green, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/secondary/command) "cZa" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46166,6 +46100,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/table/glass, /obj/item/restraints/handcuffs/cable/pink, @@ -46511,13 +46448,6 @@ icon_state = "panelscorched" }, /area/maintenance/starboard/fore) -"dpw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "dpy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47926,6 +47856,9 @@ /turf/open/floor/plasteel/cafeteria, /area/command/heads_quarters/cmo) "dFX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, @@ -48243,12 +48176,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/secondary/command) +/turf/closed/wall, +/area/maintenance/starboard) "dPj" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -48283,11 +48212,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard) "dRb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -49084,6 +49016,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /obj/structure/table/wood/bar, /obj/machinery/chem_dispenser/drinks{ dir = 4 @@ -51409,12 +51344,6 @@ }, /turf/open/floor/plasteel, /area/engineering/main) -"fva" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/command/heads_quarters/captain/private) "fvm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -51436,10 +51365,6 @@ "fwb" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/wood, /area/service/theater) "fwd" = ( @@ -51679,7 +51604,6 @@ "fDs" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "fDD" = ( @@ -51835,6 +51759,9 @@ /turf/open/floor/plasteel, /area/engineering/main) "fHh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -52056,7 +51983,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "fNh" = ( @@ -52138,10 +52064,13 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "fOS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/service/coffeehouse) "fPJ" = ( @@ -53061,12 +52990,10 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "goF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "gpb" = ( @@ -53224,9 +53151,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /turf/open/floor/plasteel, /area/engineering/atmos) "gsp" = ( @@ -54166,6 +54090,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/table, /obj/machinery/recharger{ pixel_y = 4 @@ -54283,9 +54210,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/junction/flip{ - dir = 2 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "gUw" = ( @@ -54481,26 +54405,21 @@ pixel_x = -3; pixel_y = 3 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/item/clothing/mask/breath{ pixel_x = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "hbh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall/r_wall, +/area/engineering/break_room) "hbq" = ( /obj/machinery/light/small{ dir = 8 @@ -55536,9 +55455,6 @@ /obj/effect/landmark/start/bartender, /obj/structure/cable, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /turf/open/floor/plasteel, /area/service/bar) "hAM" = ( @@ -56662,6 +56578,7 @@ /turf/open/floor/plasteel, /area/security/prison/upper) "hZe" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -57040,24 +56957,6 @@ }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) -"ika" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "ikj" = ( /obj/machinery/light/small{ dir = 4; @@ -57381,6 +57280,9 @@ /turf/open/floor/wood, /area/service/library) "iui" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /obj/machinery/button/door{ id = "coffee_counter"; name = "Shutters Control"; @@ -57388,7 +57290,6 @@ specialfunctions = 4; pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/service/coffeehouse) "iun" = ( @@ -58674,7 +58575,6 @@ "jdL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/command/gateway) "jdV" = ( @@ -58716,9 +58616,11 @@ /turf/open/floor/plasteel, /area/cargo/storage) "jfD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/closet/wardrobe/pink, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/service/barbershop) "jfL" = ( @@ -58784,6 +58686,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/table, /obj/item/book/manual/splurt_space_law, /obj/item/paper_bin{ @@ -58968,9 +58873,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/break_room) "jlc" = ( @@ -59054,9 +58956,6 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/break_room) "jom" = ( @@ -59171,11 +59070,16 @@ /turf/open/floor/engine, /area/science/xenobiology) "jra" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/service/barbershop) "jrm" = ( @@ -59794,10 +59698,6 @@ "jGg" = ( /turf/open/floor/plasteel, /area/commons/fitness/pool) -"jGl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/engineering/atmos) "jGw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -60093,6 +59993,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/closed/wall/r_wall, /area/engineering/break_room) "jNs" = ( @@ -61105,9 +61008,6 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "kmQ" = ( @@ -62044,11 +61944,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + dir = 5 }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/small, /turf/open/floor/plasteel, /area/engineering/storage/tcomms) "kJM" = ( @@ -62483,11 +62383,15 @@ /turf/open/floor/plating, /area/commons/fitness/pool) "kUw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/closed/wall/r_wall, -/area/engineering/storage/tcomms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "kUx" = ( /obj/machinery/camera{ c_tag = "Council Chamber" @@ -62603,7 +62507,6 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "kXd" = ( @@ -62865,6 +62768,7 @@ dir = 4; pixel_x = -23 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/vending/coffee, /turf/open/floor/wood, /area/service/coffeehouse) @@ -63279,13 +63183,13 @@ /turf/open/floor/plasteel, /area/engineering/main) "lpm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "lpD" = ( @@ -64166,15 +64070,6 @@ /obj/structure/bedsheetbin/towel, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) -"lOq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access_txt = "20" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, -/area/command/heads_quarters/captain/private) "lOr" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -64376,6 +64271,9 @@ /turf/open/space, /area/space) "lTr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64453,9 +64351,6 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "lUv" = ( @@ -65676,6 +65571,7 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "mxh" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/bed/pod{ name = "massage bed" @@ -66036,15 +65932,6 @@ }, /turf/closed/wall/r_wall, /area/engineering/break_room) -"mGK" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain{ - color = "#560319" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/service/barbershop) "mGL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -66380,11 +66267,6 @@ "mPv" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk{ - pixel_x = 6; - pixel_y = 2 - }, /turf/open/floor/plasteel, /area/service/bar) "mPQ" = ( @@ -66467,6 +66349,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "mSB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -66642,7 +66525,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "mXi" = ( @@ -66722,6 +66604,7 @@ /turf/open/floor/plasteel, /area/command/bridge) "mZD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -67549,7 +67432,6 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel, /area/maintenance/starboard) "nyA" = ( @@ -67848,10 +67730,6 @@ /obj/effect/landmark/start/chaplain, /turf/open/floor/plasteel/dark, /area/service/chapel/office) -"nIb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/service/coffeehouse) "nIQ" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -68158,12 +68036,6 @@ }, /turf/open/floor/plasteel, /area/cargo/miningoffice) -"nPV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard) "nQo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -68731,7 +68603,6 @@ dir = 4 }, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "oaA" = ( @@ -69611,16 +69482,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) -"ouq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_green{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "our" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -70313,6 +70174,9 @@ /turf/open/floor/carpet, /area/medical/psychology) "oOQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/closed/wall, /area/security/checkpoint/engineering) @@ -70486,10 +70350,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 + dir = 5 }, +/obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/plasteel/dark, /area/engineering/storage/tcomms) "oTb" = ( @@ -70675,6 +70539,7 @@ /turf/open/floor/plasteel, /area/commons/dorms) "oWF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" @@ -71349,6 +71214,9 @@ /area/ai_monitored/aisat/exterior) "plN" = ( /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /obj/item/stock_parts/subspace/amplifier, /obj/item/stock_parts/subspace/amplifier, /obj/structure/table, @@ -71356,7 +71224,6 @@ /obj/item/stock_parts/subspace/transmitter, /obj/item/stock_parts/subspace/transmitter, /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/engineering/storage/tcomms) "plV" = ( @@ -71686,19 +71553,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/commons/fitness/recreation) -"pti" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_green{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "ptX" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -72173,12 +72027,6 @@ }, /turf/open/floor/plasteel, /area/security/office) -"pEP" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "pGf" = ( /obj/structure/chair{ dir = 4 @@ -73885,10 +73733,6 @@ /obj/item/storage/box/drinkingglasses, /obj/item/storage/box/marshmallow, /obj/item/storage/box/marshmallow, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, /turf/open/floor/wood, /area/service/coffeehouse) "qva" = ( @@ -74943,13 +74787,6 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) -"qVs" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/service/bar) "qVE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -75007,9 +74844,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, /turf/open/floor/wood, /area/service/theater) "qWR" = ( @@ -75477,9 +75311,6 @@ }, /obj/structure/bed/dogbed/renault, /mob/living/simple_animal/pet/fox/Renault, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "rhK" = ( @@ -75733,8 +75564,8 @@ "rms" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -76082,7 +75913,6 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, /area/service/barbershop) "ryl" = ( @@ -76585,16 +76415,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison/upper) -"rMq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/landmark/event_spawn, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "rMx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ @@ -76656,6 +76476,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/satellite) "rNT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/service/glass{ name = "Coffee House" @@ -77273,11 +77094,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk{ - pixel_x = 6; - pixel_y = 2 - }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) "sbY" = ( @@ -77476,18 +77292,6 @@ }, /turf/open/floor/plasteel, /area/commons/locker) -"sgJ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "shf" = ( /obj/item/hand_labeler, /obj/item/stack/packageWrap, @@ -78212,6 +78016,7 @@ /obj/machinery/door/airlock/service/glass{ name = "Barbershop" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -78404,12 +78209,6 @@ dir = 5 }, /area/command/heads_quarters/rd) -"sEg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/open/floor/carpet, -/area/command/heads_quarters/captain/private) "sEp" = ( /obj/machinery/computer/communications{ dir = 8 @@ -79822,6 +79621,7 @@ /obj/item/folder/blue{ pixel_y = 3 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/pen, /obj/machinery/computer/security/telescreen/minisat{ dir = 1; @@ -79927,7 +79727,6 @@ name = "Atmospherics Blast Door" }, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/break_room) "tsn" = ( @@ -80056,10 +79855,12 @@ /turf/open/floor/plasteel, /area/commons/dorms/second) "txb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/break_room) "txh" = ( @@ -80322,6 +80123,7 @@ }, /area/engineering/atmos) "tFH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -81019,6 +80821,9 @@ c_tag = "Telecomms - Storage"; dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /obj/machinery/power/apc{ areastring = "/area/engineering/storage/tcomms"; dir = 8; @@ -81061,15 +80866,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/storage) -"tUV" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "tUY" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -81969,7 +81765,6 @@ /obj/effect/landmark/navigate_destination/bar, /obj/structure/table, /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "upX" = ( @@ -82391,10 +82186,14 @@ /turf/open/floor/plasteel/cafeteria, /area/commons/dorms/second) "uAs" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/cafeteria, +/area/service/kitchen) "uAG" = ( /obj/structure/closet/secure_closet/lethalshots, /obj/item/ammo_box/magazine/wt550m9, @@ -82764,7 +82563,6 @@ /obj/machinery/holopad, /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "uLv" = ( @@ -82862,16 +82660,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/security/execution/education) -"uPv" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "uPA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -83158,6 +82946,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/plasteel, /area/engineering/storage/tcomms) @@ -84655,12 +84444,9 @@ /turf/open/floor/plasteel, /area/hallway/secondary/service) "vNi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel/white, -/area/science/research) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet, +/area/command/heads_quarters/captain/private) "vNm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ @@ -85258,8 +85044,8 @@ /obj/structure/chair/stool/directional/south{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, /turf/open/floor/wood, /area/service/bar) @@ -85846,13 +85632,11 @@ /turf/open/space, /area/solars/starboard/aft) "wpo" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/chapel_floor, -/area/service/bar) +/turf/closed/wall/r_wall, +/area/engineering/storage/tcomms) "wpz" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -86016,6 +85800,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/engineering{ name = "Telecomms Storage"; req_access_txt = "61" @@ -86829,7 +86614,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "wMU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, /area/service/coffeehouse) "wNF" = ( @@ -86913,9 +86697,6 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "wOY" = ( @@ -87604,6 +87385,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -87633,8 +87417,8 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 }, /turf/open/floor/plasteel, /area/engineering/break_room) @@ -87714,7 +87498,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -87968,15 +87752,6 @@ }, /turf/open/floor/carpet, /area/commons/dorms) -"xpC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "xpD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -88537,10 +88312,10 @@ /turf/open/floor/plasteel, /area/commons/storage/art) "xCC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, /area/service/coffeehouse) "xCI" = ( @@ -88838,9 +88613,6 @@ name = "Station Intercom (General)"; pixel_y = -26 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "xIJ" = ( @@ -89345,15 +89117,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) -"xTc" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/white, -/area/command/gateway) "xTt" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -89399,9 +89167,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "xUf" = ( @@ -89714,7 +89479,6 @@ /area/commons/dorms) "ybV" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/research) "ycy" = ( @@ -116516,10 +116280,10 @@ tMe seC wMU iui -nIb -ouq -bqy -bWo +nDn +kxk +aYX +aXR bXQ bZb cao @@ -118315,8 +118079,8 @@ qlY qyF hxo jfD -mGK -pti +vCw +bUa bVk bWx bXV @@ -118574,8 +118338,8 @@ rye jra szz bpi -aZb -aXR +kUw +bWo bXW bZk cau @@ -119844,7 +119608,7 @@ sKl sKl gLV geY -pok +wIw lpm sKl bDj @@ -119859,8 +119623,8 @@ cqD bSS rma bTS -rMq -xpC +dCE +bWA nft bZk caz @@ -120101,11 +119865,11 @@ wMG huJ cVF pok +vNi klX -sEg -lOq -dOR -cYY +rio +bDj +bEZ mMY bGX ivZ @@ -120116,7 +119880,7 @@ fzQ bSS uFF bTS -hbh +aYX bWB bXZ bZj @@ -120133,8 +119897,8 @@ dbH cnY cpj cIQ -pEP -ika +ccd +csU ctL cuH cuG @@ -120359,7 +120123,7 @@ jyl eCc qVZ jPX -fva +wIw sKl bDu bEZ @@ -120373,7 +120137,7 @@ pBL bSS bSS bTY -uPv +aZa bWC bSS bZn @@ -120630,7 +120394,7 @@ uqE cgl bSS cIk -hbh +aYX bWD iAc lJx @@ -120653,14 +120417,14 @@ ctN cuI cvM cwM -dpw +caw cyv czo cAt cBn cCr cDj -coi +caw cFk cGg cHa @@ -120887,7 +120651,7 @@ bFa lVE oOi bTS -hbh +aYX bWD bYa kiP @@ -121131,7 +120895,7 @@ stk qmj pqa goF -sKl +iNf bDw bFd lWC @@ -121144,7 +120908,7 @@ bSS bSS bSS fvm -hbh +aYX bWD bYa fWR @@ -121401,7 +121165,7 @@ bSS eDd cmL bUa -hbh +aYX bWD bYa bSK @@ -121658,7 +121422,7 @@ bSS crI sQb bUa -hbh +aYX bWE aUv lJx @@ -121669,7 +121433,7 @@ lJx lJx lJx nrB -xTc +ckj ctE lJx cod @@ -121915,7 +121679,7 @@ bSS wOi bzv bUa -hbh +aYX bWF bYb cmZ @@ -122172,7 +121936,7 @@ bQz bRO bQz bUb -sgJ +bVb bWG bSS bSS @@ -122188,7 +121952,7 @@ diH lJx cIQ cpr -vNi +cci nSv eXu hgy @@ -122425,10 +122189,10 @@ bwI aWf aWf btk -tUV +aWf gUj -baG -baG +aWf +aWf bVo bWH bYc @@ -122702,7 +122466,7 @@ clW lJx cck cpr -vNi +cci nSv gcz opM @@ -122959,7 +122723,7 @@ lJx lJx ccd cpr -vNi +cci nSv fVX gEL @@ -123956,12 +123720,12 @@ rYI gFi nwA wbZ -wpo +hCA mWS fDs uLo upO -qVs +iuF lwN wep wlF @@ -125248,7 +125012,7 @@ fyW gin ocV reC -reC +uAs reC les kGY @@ -128838,6 +128602,7 @@ alq alq alq buY +dOR alq alq alq @@ -128846,8 +128611,7 @@ alq alq alq alq -alq -cfl +dgN alq alq dgN @@ -129105,7 +128869,7 @@ bHm bIF alq bhL -nPV +apc apc apc bSd @@ -129362,7 +129126,7 @@ bHn bIG qtO qtO -kUw +qtO qtO bNO bPn @@ -129875,7 +129639,7 @@ lUn dlF ify qxd -qtO +wpo tuB qtO qtO @@ -130388,7 +130152,7 @@ jAn tyC nFG rms -jGl +qxd plN lvb bii @@ -131922,11 +131686,11 @@ xov ltg txb trn -asN +sKv oay fNf kWW -uAs +uKL grX hop ldI @@ -132185,7 +131949,7 @@ mSB dRb oWF tFH -mMn +tfk sfM kBk mMn @@ -134233,7 +133997,7 @@ iYP sCD haK tpe -iYP +hbh dFX qxd hFa diff --git a/modular_bluemoon/krashly/code/game/objects/items/item.dm b/modular_bluemoon/krashly/code/game/objects/items/item.dm index b062de3caf64..5f037c0c635a 100644 --- a/modular_bluemoon/krashly/code/game/objects/items/item.dm +++ b/modular_bluemoon/krashly/code/game/objects/items/item.dm @@ -279,7 +279,6 @@ path = /obj/item/paper/book_alch ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/cat_alch name = "Alchemist's Neko Wallet" @@ -287,7 +286,6 @@ path = /obj/item/storage/wallet/cat_alch ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/vape name = "Vape" @@ -295,7 +293,6 @@ path = /obj/item/clothing/mask/vape ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/electropack name = "Electropack" @@ -303,7 +300,6 @@ path = /obj/item/electropack ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/straight_jacket name = "Straight Jacket" @@ -311,7 +307,6 @@ path = /obj/item/clothing/suit/straight_jacket ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/boxing name = "Boxing Gloves" @@ -319,7 +314,6 @@ path = /obj/item/clothing/gloves/boxing ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/coconut_bong name = "Coconut Bong" @@ -327,7 +321,6 @@ path = /obj/item/bong/coconut ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/armyknife name = "Army Knife" @@ -335,4 +328,3 @@ path = /obj/item/armyknife ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 - loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION From 083c0e1dd1e7edccf2016e4a03dbf1dc082350cf Mon Sep 17 00:00:00 2001 From: Krashly Date: Thu, 19 Oct 2023 19:17:02 +0300 Subject: [PATCH 3/9] =?UTF-8?q?Revert=20"Revert=20"=D0=A2=D1=80=D1=83?= =?UTF-8?q?=D0=B1=D1=8B=20+=20=D0=BB=D0=BE=D0=B4=D0=B0=D1=83=D1=82.""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ac0ee37adf56229308c8ca824ee9aada70c12212. --- _maps/map_files/MetaStation/MetaStation.dmm | 682 ++++++++++++------ .../krashly/code/game/objects/items/item.dm | 8 + 2 files changed, 467 insertions(+), 223 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ec13dcf0d4de..fa8b87e314ad 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5358,6 +5358,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"asN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/engineering/atmos) "asP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -14238,6 +14242,9 @@ /area/hallway/primary/starboard) "bhL" = ( /obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bhM" = ( @@ -14649,6 +14656,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/service/kitchen/coldroom) "bjx" = ( @@ -16120,7 +16128,6 @@ /area/hallway/primary/starboard) "bpi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -16702,9 +16709,6 @@ /turf/open/floor/carpet, /area/service/theater) "brv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -18013,9 +18017,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/window/reinforced{ dir = 1 }, @@ -18333,7 +18334,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "byP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/beacon, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -18512,7 +18512,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced{ dir = 1 }, @@ -18795,7 +18794,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -19163,7 +19161,6 @@ /obj/machinery/airalarm{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -19238,7 +19235,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced{ dir = 1 }, @@ -19721,11 +19717,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/turf_decal/tile/dark_green, /obj/structure/railing{ pixel_y = -10 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/command) "bFe" = ( @@ -19808,6 +19806,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bFB" = ( @@ -19836,7 +19837,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/red{ dir = 8 @@ -20026,7 +20026,6 @@ /obj/item/crowbar, /obj/item/wrench, /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -20194,6 +20193,9 @@ "bIs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bIv" = ( @@ -20226,9 +20228,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/item/kirbyplants/random, /turf/open/floor/plasteel, /area/hallway/primary/starboard) @@ -20243,9 +20242,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bIH" = ( @@ -20262,9 +20258,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bJa" = ( @@ -21185,6 +21178,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bSf" = ( @@ -21378,11 +21374,10 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/spawner/lootdrop/syndicate_present, /obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -21606,7 +21601,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bTO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21960,7 +21954,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/plaque{ icon_state = "L1" }, @@ -22039,6 +22032,7 @@ /obj/effect/turf_decal/plaque{ icon_state = "L13" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) "bVl" = ( @@ -22089,6 +22083,9 @@ codes_txt = "patrol;next_patrol=8-Central-to-Aft"; location = "7.5-Starboard-Aft-Corner" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bVp" = ( @@ -22397,10 +22394,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/plaque{ icon_state = "L2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bWs" = ( @@ -22453,12 +22452,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/plaque{ icon_state = "L14" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) "bWy" = ( @@ -24944,6 +24941,7 @@ pixel_x = -24; pixel_y = 28 }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/white, /area/command/gateway) "cdR" = ( @@ -25502,10 +25500,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/landmark/start/stowaway, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ceZ" = ( @@ -26134,7 +26132,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -26588,7 +26585,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ name = "Gateway Atrium"; req_access_txt = "62" @@ -27134,7 +27130,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -27672,7 +27667,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -28259,6 +28253,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/command/gateway) "clK" = ( @@ -28267,13 +28264,13 @@ "clL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/command/gateway) "clN" = ( @@ -28684,7 +28681,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command{ name = "Gateway Atrium"; req_access_txt = "62" @@ -29275,7 +29271,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -29873,13 +29868,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "2-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/white, /area/science/research) "cpp" = ( @@ -29901,8 +29894,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 2 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/research) "cpr" = ( @@ -30474,14 +30469,19 @@ /turf/open/floor/plasteel, /area/science/lab) "cqA" = ( -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/plasteel/white, /area/science/lab) "cqB" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/plasteel/white, /area/science/lab) "cqC" = ( /obj/item/storage/belt/utility, @@ -30524,6 +30524,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqH" = ( @@ -30537,6 +30538,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqI" = ( @@ -30547,6 +30549,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqJ" = ( @@ -30554,6 +30557,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqK" = ( @@ -30565,11 +30569,13 @@ dir = 1; network = list("ss13","rd") }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqL" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqM" = ( @@ -30580,6 +30586,7 @@ dir = 1; pixel_y = -24 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cqN" = ( @@ -30972,6 +30979,7 @@ "crM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "crR" = ( @@ -31437,6 +31445,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csS" = ( @@ -31449,6 +31463,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csT" = ( @@ -31472,6 +31492,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csV" = ( @@ -31484,6 +31507,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "csW" = ( @@ -31504,6 +31530,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "ctf" = ( @@ -31688,6 +31715,9 @@ }, /obj/structure/table/glass, /obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/command/gateway) "ctF" = ( @@ -31745,6 +31775,9 @@ "ctN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white/side{ dir = 6 }, @@ -31759,6 +31792,7 @@ /area/science/research) "ctP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "ctW" = ( @@ -33470,6 +33504,7 @@ pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cxK" = ( @@ -33854,6 +33889,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/science/research) "cyw" = ( @@ -33869,6 +33907,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cyy" = ( @@ -35746,11 +35785,15 @@ "cCr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cCs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cCt" = ( @@ -36147,6 +36190,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cDk" = ( @@ -37146,6 +37192,9 @@ dir = 4; network = list("ss13","rd") }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cFl" = ( @@ -37601,6 +37650,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/research) "cGh" = ( @@ -39441,6 +39493,11 @@ name = "Research and Development Lab"; req_one_access_txt = "7;29" }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/science/lab) "cJn" = ( @@ -40636,6 +40693,7 @@ dir = 1; pixel_y = -22 }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cLC" = ( @@ -43737,6 +43795,14 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"cYY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/dark_green, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) "cZa" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46100,9 +46166,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/table/glass, /obj/item/restraints/handcuffs/cable/pink, @@ -46448,6 +46511,13 @@ icon_state = "panelscorched" }, /area/maintenance/starboard/fore) +"dpw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "dpy" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47856,9 +47926,6 @@ /turf/open/floor/plasteel/cafeteria, /area/command/heads_quarters/cmo) "dFX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, @@ -48176,8 +48243,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/closed/wall, -/area/maintenance/starboard) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/command) "dPj" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -48212,14 +48283,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard) "dRb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -49016,9 +49084,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, /obj/structure/table/wood/bar, /obj/machinery/chem_dispenser/drinks{ dir = 4 @@ -51344,6 +51409,12 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"fva" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/command/heads_quarters/captain/private) "fvm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -51365,6 +51436,10 @@ "fwb" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/wood, /area/service/theater) "fwd" = ( @@ -51604,6 +51679,7 @@ "fDs" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "fDD" = ( @@ -51759,9 +51835,6 @@ /turf/open/floor/plasteel, /area/engineering/main) "fHh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -51983,6 +52056,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "fNh" = ( @@ -52064,13 +52138,10 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "fOS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/service/coffeehouse) "fPJ" = ( @@ -52990,10 +53061,12 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "goF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "gpb" = ( @@ -53151,6 +53224,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "gsp" = ( @@ -54090,9 +54166,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/table, /obj/machinery/recharger{ pixel_y = 4 @@ -54210,6 +54283,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/disposalpipe/junction/flip{ + dir = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "gUw" = ( @@ -54405,21 +54481,26 @@ pixel_x = -3; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/item/clothing/mask/breath{ pixel_x = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "hbh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, -/area/engineering/break_room) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hbq" = ( /obj/machinery/light/small{ dir = 8 @@ -55455,6 +55536,9 @@ /obj/effect/landmark/start/bartender, /obj/structure/cable, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, /turf/open/floor/plasteel, /area/service/bar) "hAM" = ( @@ -56578,7 +56662,6 @@ /turf/open/floor/plasteel, /area/security/prison/upper) "hZe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -56957,6 +57040,24 @@ }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) +"ika" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "ikj" = ( /obj/machinery/light/small{ dir = 4; @@ -57280,9 +57381,6 @@ /turf/open/floor/wood, /area/service/library) "iui" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/button/door{ id = "coffee_counter"; name = "Shutters Control"; @@ -57290,6 +57388,7 @@ specialfunctions = 4; pixel_y = -25 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/service/coffeehouse) "iun" = ( @@ -58575,6 +58674,7 @@ "jdL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/command/gateway) "jdV" = ( @@ -58616,11 +58716,9 @@ /turf/open/floor/plasteel, /area/cargo/storage) "jfD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/closet/wardrobe/pink, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/service/barbershop) "jfL" = ( @@ -58686,9 +58784,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/table, /obj/item/book/manual/splurt_space_law, /obj/item/paper_bin{ @@ -58873,6 +58968,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/break_room) "jlc" = ( @@ -58956,6 +59054,9 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/break_room) "jom" = ( @@ -59070,16 +59171,11 @@ /turf/open/floor/engine, /area/science/xenobiology) "jra" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/service/barbershop) "jrm" = ( @@ -59698,6 +59794,10 @@ "jGg" = ( /turf/open/floor/plasteel, /area/commons/fitness/pool) +"jGl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "jGw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -59993,9 +60093,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/closed/wall/r_wall, /area/engineering/break_room) "jNs" = ( @@ -61008,6 +61105,9 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "kmQ" = ( @@ -61944,11 +62044,11 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/storage/tcomms) "kJM" = ( @@ -62383,15 +62483,11 @@ /turf/open/floor/plating, /area/commons/fitness/pool) "kUw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/turf/closed/wall/r_wall, +/area/engineering/storage/tcomms) "kUx" = ( /obj/machinery/camera{ c_tag = "Council Chamber" @@ -62507,6 +62603,7 @@ dir = 8 }, /obj/structure/closet/crate, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "kXd" = ( @@ -62768,7 +62865,6 @@ dir = 4; pixel_x = -23 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/vending/coffee, /turf/open/floor/wood, /area/service/coffeehouse) @@ -63183,13 +63279,13 @@ /turf/open/floor/plasteel, /area/engineering/main) "lpm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "lpD" = ( @@ -64070,6 +64166,15 @@ /obj/structure/bedsheetbin/towel, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) +"lOq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters"; + req_access_txt = "20" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/command/heads_quarters/captain/private) "lOr" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -64271,9 +64376,6 @@ /turf/open/space, /area/space) "lTr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -64351,6 +64453,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "lUv" = ( @@ -65571,7 +65676,6 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "mxh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/structure/bed/pod{ name = "massage bed" @@ -65932,6 +66036,15 @@ }, /turf/closed/wall/r_wall, /area/engineering/break_room) +"mGK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain{ + color = "#560319" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/service/barbershop) "mGL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -66267,6 +66380,11 @@ "mPv" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 6; + pixel_y = 2 + }, /turf/open/floor/plasteel, /area/service/bar) "mPQ" = ( @@ -66349,7 +66467,6 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "mSB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -66525,6 +66642,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "mXi" = ( @@ -66604,7 +66722,6 @@ /turf/open/floor/plasteel, /area/command/bridge) "mZD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -67432,6 +67549,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel, /area/maintenance/starboard) "nyA" = ( @@ -67730,6 +67848,10 @@ /obj/effect/landmark/start/chaplain, /turf/open/floor/plasteel/dark, /area/service/chapel/office) +"nIb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/service/coffeehouse) "nIQ" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -68036,6 +68158,12 @@ }, /turf/open/floor/plasteel, /area/cargo/miningoffice) +"nPV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "nQo" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -68603,6 +68731,7 @@ dir = 4 }, /obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/atmos) "oaA" = ( @@ -69482,6 +69611,16 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) +"ouq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "our" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -70174,9 +70313,6 @@ /turf/open/floor/carpet, /area/medical/psychology) "oOQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/closed/wall, /area/security/checkpoint/engineering) @@ -70350,10 +70486,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 + dir = 9 }, -/obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/plasteel/dark, /area/engineering/storage/tcomms) "oTb" = ( @@ -70539,7 +70675,6 @@ /turf/open/floor/plasteel, /area/commons/dorms) "oWF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Monitoring"; req_access_txt = "24" @@ -71214,9 +71349,6 @@ /area/ai_monitored/aisat/exterior) "plN" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/item/stock_parts/subspace/amplifier, /obj/item/stock_parts/subspace/amplifier, /obj/structure/table, @@ -71224,6 +71356,7 @@ /obj/item/stock_parts/subspace/transmitter, /obj/item/stock_parts/subspace/transmitter, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/engineering/storage/tcomms) "plV" = ( @@ -71553,6 +71686,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/commons/fitness/recreation) +"pti" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "ptX" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -72027,6 +72173,12 @@ }, /turf/open/floor/plasteel, /area/security/office) +"pEP" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "pGf" = ( /obj/structure/chair{ dir = 4 @@ -73733,6 +73885,10 @@ /obj/item/storage/box/drinkingglasses, /obj/item/storage/box/marshmallow, /obj/item/storage/box/marshmallow, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, /turf/open/floor/wood, /area/service/coffeehouse) "qva" = ( @@ -74787,6 +74943,13 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"qVs" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/service/bar) "qVE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -74844,6 +75007,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/wood, /area/service/theater) "qWR" = ( @@ -75311,6 +75477,9 @@ }, /obj/structure/bed/dogbed/renault, /mob/living/simple_animal/pet/fox/Renault, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "rhK" = ( @@ -75564,8 +75733,8 @@ "rms" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -75913,6 +76082,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, /area/service/barbershop) "ryl" = ( @@ -76415,6 +76585,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison/upper) +"rMq" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "rMx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ @@ -76476,7 +76656,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/satellite) "rNT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/service/glass{ name = "Coffee House" @@ -77094,6 +77273,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 6; + pixel_y = 2 + }, /turf/open/floor/plasteel, /area/service/hydroponics/garden) "sbY" = ( @@ -77292,6 +77476,18 @@ }, /turf/open/floor/plasteel, /area/commons/locker) +"sgJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "shf" = ( /obj/item/hand_labeler, /obj/item/stack/packageWrap, @@ -78016,7 +78212,6 @@ /obj/machinery/door/airlock/service/glass{ name = "Barbershop" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -78209,6 +78404,12 @@ dir = 5 }, /area/command/heads_quarters/rd) +"sEg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/carpet, +/area/command/heads_quarters/captain/private) "sEp" = ( /obj/machinery/computer/communications{ dir = 8 @@ -79621,7 +79822,6 @@ /obj/item/folder/blue{ pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/pen, /obj/machinery/computer/security/telescreen/minisat{ dir = 1; @@ -79727,6 +79927,7 @@ name = "Atmospherics Blast Door" }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/break_room) "tsn" = ( @@ -79855,12 +80056,10 @@ /turf/open/floor/plasteel, /area/commons/dorms/second) "txb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engineering/break_room) "txh" = ( @@ -80123,7 +80322,6 @@ }, /area/engineering/atmos) "tFH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -80821,9 +81019,6 @@ c_tag = "Telecomms - Storage"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/power/apc{ areastring = "/area/engineering/storage/tcomms"; dir = 8; @@ -80866,6 +81061,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/cargo/storage) +"tUV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "tUY" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -81765,6 +81969,7 @@ /obj/effect/landmark/navigate_destination/bar, /obj/structure/table, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "upX" = ( @@ -82186,14 +82391,10 @@ /turf/open/floor/plasteel/cafeteria, /area/commons/dorms/second) "uAs" = ( -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria, -/area/service/kitchen) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/engineering/atmos) "uAG" = ( /obj/structure/closet/secure_closet/lethalshots, /obj/item/ammo_box/magazine/wt550m9, @@ -82563,6 +82764,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/turf_decal/bot_white, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/service/bar) "uLv" = ( @@ -82660,6 +82862,16 @@ /obj/structure/lattice, /turf/open/space/basic, /area/security/execution/education) +"uPv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "uPA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -82946,7 +83158,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/plasteel, /area/engineering/storage/tcomms) @@ -84444,9 +84655,12 @@ /turf/open/floor/plasteel, /area/hallway/secondary/service) "vNi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, -/area/command/heads_quarters/captain/private) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel/white, +/area/science/research) "vNm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock{ @@ -85044,8 +85258,8 @@ /obj/structure/chair/stool/directional/south{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/wood, /area/service/bar) @@ -85632,11 +85846,13 @@ /turf/open/space, /area/solars/starboard/aft) "wpo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/closed/wall/r_wall, -/area/engineering/storage/tcomms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/chapel_floor, +/area/service/bar) "wpz" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -85800,7 +86016,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/engineering{ name = "Telecomms Storage"; req_access_txt = "61" @@ -86614,6 +86829,7 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "wMU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, /area/service/coffeehouse) "wNF" = ( @@ -86697,6 +86913,9 @@ dir = 4; pixel_x = -26 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "wOY" = ( @@ -87385,9 +87604,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -87417,8 +87633,8 @@ icon_state = "2-8" }, /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/break_room) @@ -87498,7 +87714,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -87752,6 +87968,15 @@ }, /turf/open/floor/carpet, /area/commons/dorms) +"xpC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "xpD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -88312,10 +88537,10 @@ /turf/open/floor/plasteel, /area/commons/storage/art) "xCC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, /area/service/coffeehouse) "xCI" = ( @@ -88613,6 +88838,9 @@ name = "Station Intercom (General)"; pixel_y = -26 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) "xIJ" = ( @@ -89117,11 +89345,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) +"xTc" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel/white, +/area/command/gateway) "xTt" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -89167,6 +89399,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/engineering/break_room) "xUf" = ( @@ -89479,6 +89714,7 @@ /area/commons/dorms) "ybV" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/research) "ycy" = ( @@ -116280,10 +116516,10 @@ tMe seC wMU iui -nDn -kxk -aYX -aXR +nIb +ouq +bqy +bWo bXQ bZb cao @@ -118079,8 +118315,8 @@ qlY qyF hxo jfD -vCw -bUa +mGK +pti bVk bWx bXV @@ -118338,8 +118574,8 @@ rye jra szz bpi -kUw -bWo +aZb +aXR bXW bZk cau @@ -119608,7 +119844,7 @@ sKl sKl gLV geY -wIw +pok lpm sKl bDj @@ -119623,8 +119859,8 @@ cqD bSS rma bTS -dCE -bWA +rMq +xpC nft bZk caz @@ -119865,11 +120101,11 @@ wMG huJ cVF pok -vNi klX -rio -bDj -bEZ +sEg +lOq +dOR +cYY mMY bGX ivZ @@ -119880,7 +120116,7 @@ fzQ bSS uFF bTS -aYX +hbh bWB bXZ bZj @@ -119897,8 +120133,8 @@ dbH cnY cpj cIQ -ccd -csU +pEP +ika ctL cuH cuG @@ -120123,7 +120359,7 @@ jyl eCc qVZ jPX -wIw +fva sKl bDu bEZ @@ -120137,7 +120373,7 @@ pBL bSS bSS bTY -aZa +uPv bWC bSS bZn @@ -120394,7 +120630,7 @@ uqE cgl bSS cIk -aYX +hbh bWD iAc lJx @@ -120417,14 +120653,14 @@ ctN cuI cvM cwM -caw +dpw cyv czo cAt cBn cCr cDj -caw +coi cFk cGg cHa @@ -120651,7 +120887,7 @@ bFa lVE oOi bTS -aYX +hbh bWD bYa kiP @@ -120895,7 +121131,7 @@ stk qmj pqa goF -iNf +sKl bDw bFd lWC @@ -120908,7 +121144,7 @@ bSS bSS bSS fvm -aYX +hbh bWD bYa fWR @@ -121165,7 +121401,7 @@ bSS eDd cmL bUa -aYX +hbh bWD bYa bSK @@ -121422,7 +121658,7 @@ bSS crI sQb bUa -aYX +hbh bWE aUv lJx @@ -121433,7 +121669,7 @@ lJx lJx lJx nrB -ckj +xTc ctE lJx cod @@ -121679,7 +121915,7 @@ bSS wOi bzv bUa -aYX +hbh bWF bYb cmZ @@ -121936,7 +122172,7 @@ bQz bRO bQz bUb -bVb +sgJ bWG bSS bSS @@ -121952,7 +122188,7 @@ diH lJx cIQ cpr -cci +vNi nSv eXu hgy @@ -122189,10 +122425,10 @@ bwI aWf aWf btk -aWf +tUV gUj -aWf -aWf +baG +baG bVo bWH bYc @@ -122466,7 +122702,7 @@ clW lJx cck cpr -cci +vNi nSv gcz opM @@ -122723,7 +122959,7 @@ lJx lJx ccd cpr -cci +vNi nSv fVX gEL @@ -123720,12 +123956,12 @@ rYI gFi nwA wbZ -hCA +wpo mWS fDs uLo upO -iuF +qVs lwN wep wlF @@ -125012,7 +125248,7 @@ fyW gin ocV reC -uAs +reC reC les kGY @@ -128602,7 +128838,6 @@ alq alq alq buY -dOR alq alq alq @@ -128611,7 +128846,8 @@ alq alq alq alq -dgN +alq +cfl alq alq dgN @@ -128869,7 +129105,7 @@ bHm bIF alq bhL -apc +nPV apc apc bSd @@ -129126,7 +129362,7 @@ bHn bIG qtO qtO -qtO +kUw qtO bNO bPn @@ -129639,7 +129875,7 @@ lUn dlF ify qxd -wpo +qtO tuB qtO qtO @@ -130152,7 +130388,7 @@ jAn tyC nFG rms -qxd +jGl plN lvb bii @@ -131686,11 +131922,11 @@ xov ltg txb trn -sKv +asN oay fNf kWW -uKL +uAs grX hop ldI @@ -131949,7 +132185,7 @@ mSB dRb oWF tFH -tfk +mMn sfM kBk mMn @@ -133997,7 +134233,7 @@ iYP sCD haK tpe -hbh +iYP dFX qxd hFa diff --git a/modular_bluemoon/krashly/code/game/objects/items/item.dm b/modular_bluemoon/krashly/code/game/objects/items/item.dm index 5f037c0c635a..b062de3caf64 100644 --- a/modular_bluemoon/krashly/code/game/objects/items/item.dm +++ b/modular_bluemoon/krashly/code/game/objects/items/item.dm @@ -279,6 +279,7 @@ path = /obj/item/paper/book_alch ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/cat_alch name = "Alchemist's Neko Wallet" @@ -286,6 +287,7 @@ path = /obj/item/storage/wallet/cat_alch ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/vape name = "Vape" @@ -293,6 +295,7 @@ path = /obj/item/clothing/mask/vape ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/electropack name = "Electropack" @@ -300,6 +303,7 @@ path = /obj/item/electropack ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/straight_jacket name = "Straight Jacket" @@ -307,6 +311,7 @@ path = /obj/item/clothing/suit/straight_jacket ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/boxing name = "Boxing Gloves" @@ -314,6 +319,7 @@ path = /obj/item/clothing/gloves/boxing ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/coconut_bong name = "Coconut Bong" @@ -321,6 +327,7 @@ path = /obj/item/bong/coconut ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION /datum/gear/donator/bm/armyknife name = "Army Knife" @@ -328,3 +335,4 @@ path = /obj/item/armyknife ckeywhitelist = list("trollandrew") subcategory = LOADOUT_SUBCATEGORIES_DON18 + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION From c8bcc36386296e9191a09bb83b2143e9a677ca47 Mon Sep 17 00:00:00 2001 From: Krashly Date: Thu, 9 Nov 2023 22:14:55 +0300 Subject: [PATCH 4/9] Create readme.txt --- modular_bluemoon/krashly/readme.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 modular_bluemoon/krashly/readme.txt diff --git a/modular_bluemoon/krashly/readme.txt b/modular_bluemoon/krashly/readme.txt new file mode 100644 index 000000000000..349dc5eac9fe --- /dev/null +++ b/modular_bluemoon/krashly/readme.txt @@ -0,0 +1,5 @@ +Copyright (C) 2023 Krashly + +Данная папка и все файлы находящиеся в ней принадлежат и были разработаны одноименным пользователем с ником Krashly, связаться с коим можно в Discord под таким же никнеймом. +В данный момент владелец папки занимается разработкой иного проекта, который можно посетить по данной ссылке: https://discord.gg/9YhzaWNtBN +Автор сожалеет что потратил столько времени и сил впустую и ему жаль что разработки попали не в те руки. From b39595a1467831ab7ba27447aebcc57590a84f1e Mon Sep 17 00:00:00 2001 From: Krashly Date: Sat, 20 Jul 2024 05:08:23 +0300 Subject: [PATCH 5/9] New Trait --- _maps/_basemap.dm | 2 +- code/__DEFINES/traits.dm | 3 +- code/datums/components/mood.dm | 2 + code/modules/arousal/arousal.dm | 6 + code/modules/arousal/genitals.dm | 2 +- code/modules/mob/living/carbon/examine.dm | 10 + .../SmiLeY/code/serverside/pronouns_ru.dm | 14 ++ .../code/modules/sexfluids_limits/_limits.dm | 12 ++ .../sexfluids_limits/icons/overlay.dmi | Bin 0 -> 921 bytes .../code/modules/sexfluids_limits/moods.dm | 182 ++++++++++++++++++ .../code/modules/sexfluids_limits/quirk.dm | 11 ++ .../interaction_datums/lewd/nipsuck.dm | 6 + .../interaction_datums/lewd/self/breasts.dm | 6 + .../code/datums/interactions/lewd/_lewd.dm | 3 + .../code/modules/arousal/arousal.dm | 1 + tgstation.dme | 3 + 16 files changed, 260 insertions(+), 3 deletions(-) create mode 100644 modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm create mode 100644 modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/overlay.dmi create mode 100644 modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm create mode 100644 modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index 392e2f1d82e7..1a58e2943527 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -1,4 +1,4 @@ -//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it. +#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it. #include "map_files\generic\CentCom.dmm" diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 7dbc8d279fc7..3ec08c473aa9 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -290,7 +290,8 @@ //used because it's more reliable than checking for the component #define TRAIT_DULLAHAN "dullahan" -#define TRAIT_AKIMBO "akimbo" +#define TRAIT_AKIMBO "akimbo" // BLUEMOON ADDITION +#define TRAIT_FLUID "fluid" // BLUEMOON ADDITION // mobility flag traits diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 00e59a70e34d..009fa2df4b6a 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -172,6 +172,8 @@ HandleNutrition(owner) HandleThirst(owner) + HandleFluid(owner) // BLUEMOON ADDITION + /datum/component/mood/proc/setSanity(amount, minimum=SANITY_INSANE, maximum=SANITY_NEUTRAL)//I'm sure bunging this in here will have no negative repercussions. var/mob/living/master = parent diff --git a/code/modules/arousal/arousal.dm b/code/modules/arousal/arousal.dm index d62c6554c774..f695465dc88f 100644 --- a/code/modules/arousal/arousal.dm +++ b/code/modules/arousal/arousal.dm @@ -91,6 +91,7 @@ if(condomning) to_chat(src, "Ты чувствуешь, как презерватив наполняется изнутри твоей спермой!") R.trans_to(condomning, R.total_volume) + sender.fluid_volume = 0 else if(spill && R.total_volume > 0) var/turf/location = get_turf(target) @@ -99,12 +100,14 @@ if(istype(sender, /obj/item/organ/genital/penis)) if(S) if(R.trans_to(S, R.total_volume)) + sender.fluid_volume = 0 S.blood_DNA |= get_blood_dna_list() S.update_icon() return else var/obj/effect/decal/cleanable/semendrip/drip = (locate(/obj/effect/decal/cleanable/semendrip) in location) || new(location) if(R.trans_to(drip, R.total_volume)) + sender.fluid_volume = 0 drip.blood_DNA |= get_blood_dna_list() drip.update_icon() if(drip.reagents.total_volume >= 10) @@ -117,12 +120,14 @@ if(istype(sender, /obj/item/organ/genital/vagina)) if(F) if(R.trans_to(F, R.total_volume)) + sender.fluid_volume = 0 F.blood_DNA |= get_blood_dna_list() F.update_icon() return else F = new(location) if(R.trans_to(F, R.total_volume)) + sender.fluid_volume = 0 F.blood_DNA |= get_blood_dna_list() F.update_icon() return @@ -139,6 +144,7 @@ if(copy.total_volume > 0) cummed_on.apply_status_effect(STATUS_EFFECT_DRIPPING_CUM, copy, get_blood_dna_list(), receiver) R.trans_to(target, amount_to_transfer, log = TRUE) + sender.fluid_volume = 0 // sender.last_orgasmed = world.time R.clear_reagents() diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index eda8b37ee4dc..03098271b486 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -12,7 +12,7 @@ var/fluid_transfer_factor = 0 //How much would a partner get in them if they climax using this? var/size = 2 //can vary between num or text, just used in icon_state strings var/datum/reagent/fluid_id = null - var/fluid_max_volume = 50 + var/fluid_max_volume = 100 // BLUEMOON EDIT || 50 to 100 var/fluid_efficiency = 1 var/fluid_rate = CUM_RATE var/fluid_mult = 1 diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index dcb5565e8cae..8c81e4df5a05 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -138,6 +138,16 @@ . += trait_exam var/datum/component/mood/mood = src.GetComponent(/datum/component/mood) + + if(/datum/mood_event/fluid_overcharged in mood.mood_events) + . += "[t_He] выглядит довольно мокренькой в интимных местах!" + + if(/datum/mood_event/fluid_imeetsya in mood.mood_events) + . += "[t_He] выглядит слегка мокренькой в интимных местах." + + if(/datum/mood_event/fluid_spustil in mood.mood_events) + . += "[t_He] выглядит облегченно." + if(mood) switch(mood.shown_mood) if(-INFINITY to MOOD_LEVEL_SAD4) diff --git a/modular_bluemoon/SmiLeY/code/serverside/pronouns_ru.dm b/modular_bluemoon/SmiLeY/code/serverside/pronouns_ru.dm index 040fcd47181d..f39fc277281f 100644 --- a/modular_bluemoon/SmiLeY/code/serverside/pronouns_ru.dm +++ b/modular_bluemoon/SmiLeY/code/serverside/pronouns_ru.dm @@ -42,6 +42,8 @@ /datum/proc/ru_aya_oy(temp_gender) . = "ой" +/datum/proc/ru_oy_im(temp_gender) + . = "ым" //like clients, which do have gender. /client/ru_who(capitalized, temp_gender) @@ -128,6 +130,18 @@ if(capitalized) . = capitalize(.) +/atom/ru_oy_im(capitalized, temp_gender) // Я чувствую себя свободн(ым/ой) + if(!temp_gender) + temp_gender = gender + . = "ым" + switch(temp_gender) + if(FEMALE) + . = "ой" + if(MALE) + . = "ым" + if(capitalized) + . = capitalize(.) + //mobs(and atoms but atoms don't really matter write your own proc overrides) also have gender! /atom/ru_who(capitalized, temp_gender) if(!temp_gender) diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm new file mode 100644 index 000000000000..2f8fc06eeea5 --- /dev/null +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm @@ -0,0 +1,12 @@ +#define MAX_FLUID 300 +#define OCHEN_BLIZKO_FLUID 280 +#define BLIZKO_TO_MAX_FLUID 200 +#define SREDNE_FLUID 150 +#define MIN_FLUID 0 + +#define MIN_FLUID_SPAWN 100 +#define MAX_FLUID_SPAWN 200 + +#define NETU 1 +#define CHUTKA 2 +#define OVERDOHUYA 3 diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/overlay.dmi b/modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/overlay.dmi new file mode 100644 index 0000000000000000000000000000000000000000..725a1ab4ecad0591d5d70fbda50a22620bc5d635 GIT binary patch literal 921 zcmeAS@N?(olHy`uVBq!ia0vp^2Y`412OE%#(nyX4Qb(#nB1&9Ri<65o3raHc^B5Q^ z=1e_*kgLf-pyA=?cfmYW{W|NbIaO_5Xdh`?t#?yu_w2oHcbOD7yb$}Q_1Qy~$0}sO z@y7S^X)zHkr!^WC`Z9F4Oq|NZ_AkZjq~o$}3~ZkzRa+-iCjLGck;iIKa4o7J`RuAy zt>;ed^^x@oTFGnhLGz@^eJ*C6J@1odtgF-$mEZVJmglhb!Y4CsSKEI$KWX(@_sadE zb{h}!`QJ!r*Nxk7R5|WrWBHzkKjYsy&0rBYB3R3K@l`+nB#eR*e zumAhMCjb0&o62)PD|= 2) + if(owner.get_item_by_slot(ITEM_SLOT_OCLOTHING)) + if(!owner.is_chest_exposed()) + var/obj/item/organ/genital/breasts/titki = src + titki.icon_state_organ = "blank" + protechka.update_appearance() + if(!owner.is_groin_exposed()) + var/obj/item/organ/genital/testicles/penis = src + var/obj/item/organ/genital/womb/pilotka = src + penis.icon_state_organ = "blank" + pilotka.icon_state_organ = "blank" + protechka.update_appearance() + else + protechka.icon_state = icon_state_organ + protechka.color = fluid_color + protechka.update_appearance() + else + vis_contents -= protechka + qdel(protechka) + imeetsya = FALSE + +/datum/component/mood/proc/HandleFluid(mob/living/carbon/L) + if(!HAS_TRAIT(L, TRAIT_FLUID)) + return + for(var/obj/item/organ/genital/O in L.internal_organs) + O.fluid_add() + overlay_fluid(L, O) + switch(O.fluid_volume) + if(OCHEN_BLIZKO_FLUID to INFINITY) + add_event(null, "fluid", /datum/mood_event/fluid_overcharged) + if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) + add_event(null, "fluid", /datum/mood_event/fluid_imeetsya) + if(SREDNE_FLUID to BLIZKO_TO_MAX_FLUID) + clear_event(null, "fluid") + if(MIN_FLUID to SREDNE_FLUID) + add_event(null, "fluid", /datum/mood_event/fluid_spustil) diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm new file mode 100644 index 000000000000..f17496a9febc --- /dev/null +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm @@ -0,0 +1,11 @@ +/datum/quirk/fluid_leak + name = "Протечка!" + desc = "Ваши органы не знают предела в выработке телесных жидкостей, от того ваше грудное молоко или другие жидкости могут протекать!" + value = 0 + mob_trait = TRAIT_FLUID + +/datum/quirk/fluid_leak/add() + . = ..() + +/datum/quirk/fluid_leak/remove() + . = ..() diff --git a/modular_sand/code/datums/interactions/interaction_datums/lewd/nipsuck.dm b/modular_sand/code/datums/interactions/interaction_datums/lewd/nipsuck.dm index 739e2aed1300..a63051ab4521 100644 --- a/modular_sand/code/datums/interactions/interaction_datums/lewd/nipsuck.dm +++ b/modular_sand/code/datums/interactions/interaction_datums/lewd/nipsuck.dm @@ -33,6 +33,12 @@ var/obj/item/organ/genital/breasts/B = target.getorganslot(ORGAN_SLOT_BREASTS) var/modifier = B?.get_lactation_amount_modifier() || 1 if(B?.fluid_id) + if(HAS_TRAIT(target, TRAIT_FLUID)) // BLUEMOON ADDITION START + if(B.fluid_volume >= 2) + B.fluid_volume -= 2 + else + user_message += ", ничего не вытягивая!" + return // BLUEMOON ADDITION END var/milktype = B?.fluid_id var/datum/reagent/milk = find_reagent_object_from_type(milktype) var/milktext = milk.name //So you know what are you drinking. - Gardelin0 diff --git a/modular_sand/code/datums/interactions/interaction_datums/lewd/self/breasts.dm b/modular_sand/code/datums/interactions/interaction_datums/lewd/self/breasts.dm index 7dfa71599e9b..09905f9b027a 100644 --- a/modular_sand/code/datums/interactions/interaction_datums/lewd/self/breasts.dm +++ b/modular_sand/code/datums/interactions/interaction_datums/lewd/self/breasts.dm @@ -63,6 +63,9 @@ if(milkers && milktype) liquid_container.reagents.add_reagent(milktype, rand(1,3 * milkers.get_lactation_amount_modifier())) playlewdinteractionsound(get_turf(user), 'modular_sand/sound/interactions/squelch1.ogg', 50, 1, -1) + if(HAS_TRAIT(user, TRAIT_FLUID)) // BLUEMOON ADDITION START + if(milkers.fluid_volume >= 2) + milkers.fluid_volume -= 2 else message += ", но дойка не дает результатов..." @@ -96,6 +99,9 @@ if(milkers && milktype) user.reagents.add_reagent(milktype, rand(1,3 * milkers.get_lactation_amount_modifier()) * user.get_fluid_mod(milkers)) + if(HAS_TRAIT(user, TRAIT_FLUID)) // BLUEMOON ADDITION START + if(milkers.fluid_volume >= 2) + milkers.fluid_volume -= 2 // BLUEMOON ADDITION END lines = list( "подносит соски своих собственных ёмкостей для молока ко рту и начинает их посасывать.", "делает большой глоток свежего '[lowertext(milktext)]' и громко выдыхает после такого.", diff --git a/modular_splurt/code/datums/interactions/lewd/_lewd.dm b/modular_splurt/code/datums/interactions/lewd/_lewd.dm index a13291f978c7..f86347faf418 100644 --- a/modular_splurt/code/datums/interactions/lewd/_lewd.dm +++ b/modular_splurt/code/datums/interactions/lewd/_lewd.dm @@ -224,6 +224,9 @@ H.mob_climax(TRUE, "sex", partner, !cumin, target_gen) set_lust(0) + if(HAS_TRAIT(src, TRAIT_FLUID)) // BLUEMOON ADDITION + last_genital.fluid_volume = 0 // BLUEMOON ADDITION + SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner, cumin, last_genital) return TRUE diff --git a/modular_splurt/code/modules/arousal/arousal.dm b/modular_splurt/code/modules/arousal/arousal.dm index 466df8ba0d86..41e18aa68949 100644 --- a/modular_splurt/code/modules/arousal/arousal.dm +++ b/modular_splurt/code/modules/arousal/arousal.dm @@ -73,6 +73,7 @@ if(locate(/obj/item/genital_equipment/sounding) in bepis.contents) spill = TRUE to_chat(src, "Ты чувствуешь, как стержень выталкивается из твоей уретры вместе со струей оргазменной жидкости!") + bepis.fluid_volume = 0 var/obj/item/genital_equipment/sounding/rod = locate(/obj/item/genital_equipment/sounding) in bepis.contents rod.forceMove(get_turf(src)) diff --git a/tgstation.dme b/tgstation.dme index 57d858e297ec..e5ec28e236cf 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4382,6 +4382,9 @@ #include "modular_bluemoon\krashly\code\modules\mecha\mecha.dm" #include "modular_bluemoon\krashly\code\modules\mobs\carbon\nucleation\code\nucleation.dm" #include "modular_bluemoon\krashly\code\modules\mobs\simple\brown_carp.dm" +#include "modular_bluemoon\krashly\code\modules\sexfluids_limits\_limits.dm" +#include "modular_bluemoon\krashly\code\modules\sexfluids_limits\moods.dm" +#include "modular_bluemoon\krashly\code\modules\sexfluids_limits\quirk.dm" #include "modular_bluemoon\krashly\code\uplink\uplink.dm" #include "modular_bluemoon\krashly\code\uplink\uplink_items.dm" #include "modular_bluemoon\krashly\modulars\clownfart\code.dm" From 48e097856ff98de71bea4bf6ec46f94fb3100e5c Mon Sep 17 00:00:00 2001 From: Krashly Date: Sat, 20 Jul 2024 19:45:40 +0300 Subject: [PATCH 6/9] pizda --- _maps/_basemap.dm | 2 +- code/__DEFINES/traits.dm | 7 +- code/modules/mob/living/carbon/examine.dm | 10 -- .../mob/living/carbon/human/examine.dm | 11 ++ .../code/modules/sexfluids_limits/effects.dm | 101 +++++++++++++++ .../modules/sexfluids_limits/icons/drips.dmi | Bin 0 -> 789 bytes .../code/modules/sexfluids_limits/moods.dm | 117 +++++++++++++----- .../code/modules/sexfluids_limits/quirk.dm | 43 +++++-- .../datums/interactions/lewd_definitions.dm | 9 ++ .../code/datums/interactions/lewd/_lewd.dm | 6 +- tgstation.dme | 1 + 11 files changed, 256 insertions(+), 51 deletions(-) create mode 100644 modular_bluemoon/krashly/code/modules/sexfluids_limits/effects.dm create mode 100644 modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/drips.dmi diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index 1a58e2943527..392e2f1d82e7 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -1,4 +1,4 @@ -#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it. +//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it. #include "map_files\generic\CentCom.dmm" diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 3ec08c473aa9..5f3fd5ff2f01 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -290,8 +290,11 @@ //used because it's more reliable than checking for the component #define TRAIT_DULLAHAN "dullahan" -#define TRAIT_AKIMBO "akimbo" // BLUEMOON ADDITION -#define TRAIT_FLUID "fluid" // BLUEMOON ADDITION +#define TRAIT_AKIMBO "akimbo" // BLUEMOON ADDITION +#define TRAIT_FLUID "fluid" // BLUEMOON ADDITION +#define TRAIT_FLUID_TITS "fluid_tits" // BLUEMOON ADDITION +#define TRAIT_FLUID_WOMB "fluid_womb" // BLUEMOON ADDITION +#define TRAIT_FLUID_PENIS "fluid_penis" // BLUEMOON ADDITION // mobility flag traits diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 8c81e4df5a05..dcb5565e8cae 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -138,16 +138,6 @@ . += trait_exam var/datum/component/mood/mood = src.GetComponent(/datum/component/mood) - - if(/datum/mood_event/fluid_overcharged in mood.mood_events) - . += "[t_He] выглядит довольно мокренькой в интимных местах!" - - if(/datum/mood_event/fluid_imeetsya in mood.mood_events) - . += "[t_He] выглядит слегка мокренькой в интимных местах." - - if(/datum/mood_event/fluid_spustil in mood.mood_events) - . += "[t_He] выглядит облегченно." - if(mood) switch(mood.shown_mood) if(-INFINITY to MOOD_LEVEL_SAD4) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 2d84ebc82f98..3ba6d90a0e13 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -523,6 +523,17 @@ if (!isnull(trait_exam)) msg += trait_exam + if(HAS_TRAIT(user, TRAIT_FLUID)) + if(HAS_TRAIT(user, TRAIT_FLUID_TITS)) + if(breasts_protechka_examine != null) + . += breasts_protechka_examine + if(HAS_TRAIT(user, TRAIT_FLUID_PENIS)) + if(penis_protechka_examine != null) + . += penis_protechka_examine + if(HAS_TRAIT(user, TRAIT_FLUID_WOMB)) + if(womb_protechka_examine != null) + . += womb_protechka_examine + var/scar_severity = 0 for(var/i in all_scars) var/datum/scar/S = i diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/effects.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/effects.dm new file mode 100644 index 000000000000..6150b1d3b05f --- /dev/null +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/effects.dm @@ -0,0 +1,101 @@ +/obj/effect/decal/cleanable/fluidrip + name = "fluid" + density = 0 + layer = ABOVE_NORMAL_TURF_LAYER + icon = 'modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/drips.dmi' + icon_state = "drip1" + random_icon_states = list("drip1", "drip2", "drip3", "drip4", "drip5") + +/obj/effect/decal/cleanable/fluidrip/replace_decal(obj/effect/decal/cleanable/fluidrip/C) + . = ..() + if(!. || QDELETED(src)) + return FALSE + var/obj/effect/decal/cleanable/fluid/S = (locate(/obj/effect/decal/cleanable/fluid) in C.loc) + if(S) // Merge ourselves into this puddle. + reagents.trans_to(S, reagents.total_volume) + S.transfer_blood_dna(blood_DNA) + update_icon() + return TRUE + reagents.trans_to(C, reagents.total_volume) + C.transfer_blood_dna(blood_DNA) + if(C.reagents.total_volume >= 10) // Turn the drip into a puddle. + S = new(C.loc) + C.reagents.trans_to(S, C.reagents.total_volume) + C.transfer_blood_dna(S.blood_DNA) + S.update_icon() + qdel(C) + update_icon() + +/obj/effect/decal/cleanable/fluidrip/update_icon() + . = ..() + add_atom_colour(mix_color_from_reagents(reagents.reagent_list), FIXED_COLOUR_PRIORITY) + +/// + +/obj/effect/decal/cleanable/fluid + name = "fluid" + desc = null + gender = PLURAL + density = 0 + layer = ABOVE_NORMAL_TURF_LAYER + icon = 'modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/drips.dmi' + icon_state = "pool" + +/obj/effect/decal/cleanable/fluid/Initialize(mapload) + . = ..() + dir = GLOB.cardinals + if(mapload) + reagents.add_reagent(/datum/reagent/consumable/fluid, 10) + add_blood_DNA(list("Non-human DNA" = "A+")) + update_icon() + +/obj/effect/decal/cleanable/fluid/replace_decal(obj/effect/decal/cleanable/fluid/S) + if(reagents.total_volume > 0) + reagents.trans_to(S.reagents, reagents.total_volume) + if(blood_DNA) + S.blood_DNA |= blood_DNA + S.update_icon() + return ..() + +/obj/effect/decal/cleanable/fluid/update_icon() + . = ..() + if(QDELETED(src) || !reagents) + return + add_atom_colour(mix_color_from_reagents(reagents.reagent_list), FIXED_COLOUR_PRIORITY) + +/// + +/datum/reagent/consumable/fluid + name = "Fluid" + description = "Fluid from some animal. Useless for anything but insemination, really." + taste_description = "something salty" + taste_mult = 2 //Not very overpowering flavor + data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null) + reagent_state = LIQUID + color = "#FFFFFF" // rgb: 255, 255, 255 + can_synth = FALSE + // you know i wouldn't + // boiling_point = T0C + 100 + nutriment_factor = 0.5 * REAGENTS_METABOLISM + var/decal_path = /obj/effect/decal/cleanable/fluid + +/datum/reagent/consumable/fluid/reaction_turf(turf/location, reac_volume) + ..() + if(!istype(location)) + return + + var/obj/effect/decal/cleanable/fluid/S = locate(/obj/effect/decal/cleanable/fluid) in location + if(S) + if(S.reagents.add_reagent(type, volume, data)) + S.update_icon() + return + + var/obj/effect/decal/cleanable/fluidrip/drip = (locate(/obj/effect/decal/cleanable/fluidrip) in location) || new(location) + if(drip.reagents.add_reagent(type, volume, data)) + drip.update_icon() + if(drip.reagents.total_volume >= 10) + S = new(location) + drip.reagents.trans_to(S, drip.reagents.total_volume) + S.update_icon() + qdel(drip) + return diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/drips.dmi b/modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/drips.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c4ce75e33d74ac168c5a5eaaa692d909d3ad3705 GIT binary patch literal 789 zcmeAS@N?(olHy`uVBq!ia0vp^2|(gKZ2NX=_1r(-DV&!3hqlBr$Z zQ#UoOp5NWnyizFDMP_vD(H zrGoR8Zm!aO7WC`e#ferLGmV&X+b6c1cE4{tQBi^KBj5ewzkEL1IDhzYDDJ>sWyTbh zh8~s)6B&$z9Nd^rcrZwED!>GP-ulI!R>t;0`am#8;;lN*@2-;>j89MZ!yy(1Er@|<``HkatqoO53SGe_mn5))taNcO=|E@e$!RQn= zM`613%m$`Q!Zmk414AI=$$_}t4|CHtPhYOwwo5rJ?fJs_J+E86pB|0=!065tm9=Z; z**LktlFQ6uyMHt6sb^DfF{tFM>g<-Az$ER>Ilbxa(w}LUxtn!3O}G_%IA86)`+g&T#o30emnSQ3{&jdRxk1J@IN|Z97`}>s zZ!&pGr!ty*`LGmx*z&vaoH4_WS*#m{-t0L3&V2LcnSXC7uile#;I>7SpT*D5M$X&L zG+h(di;Dc}y(8idH$#g+-MYBIr}a}9_0NkQ)Tm!_bndYWv2kZ(qnrF*{$O}e`m{V$ zlX+%yoV5Gt(^sPV7FX||wfkGtg=8zakMYNz-Pv`fCUN`mQ#<_yohsNq?78}V>Y8_q vsekXLxR$qdtJxUc?O(VU7Q?{6tY?(HEyk(2FTe?y&KW#i{an^LB{Ts5YXemz literal 0 HcmV?d00001 diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm index d967bd0315c8..07f7d0a5ff7e 100644 --- a/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm @@ -84,6 +84,11 @@ var/spawned = FALSE // pohuy, kostil var/imeetsya = FALSE +/mob/living/carbon + var/breasts_protechka_examine = null + var/penis_protechka_examine = null + var/womb_protechka_examine = null + /obj/item/organ/genital/proc/fluid_add() if(!owner) return @@ -108,35 +113,89 @@ return NETU /proc/overlay_fluid(mob/living/carbon/owner, obj/item/organ/genital/organ) - if(istype(organ, /obj/item/organ/genital/breasts)) - var/obj/item/organ/genital/breasts/siski = organ - switch(siski.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) - siski.icon_state_organ = "breasts_overfluid" - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - siski.icon_state_organ = "breasts_fluid" - else - siski.icon_state_organ = "blank" - - else if(istype(organ, /obj/item/organ/genital/testicles)) - var/obj/item/organ/genital/testicles/yayca = organ - switch(yayca.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) - yayca.icon_state_organ = "penis_overfluid" - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - yayca.icon_state_organ = "penis_fluid" - else - yayca.icon_state_organ = "blank" - - else if(istype(organ, /obj/item/organ/genital/womb)) - var/obj/item/organ/genital/womb/pizda = organ - switch(pizda.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) - pizda.icon_state_organ = "vagina_overfluid" - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - pizda.icon_state_organ = "vagina_fluid" - else - pizda.icon_state_organ = "blank" + if(HAS_TRAIT(owner, TRAIT_FLUID_TITS)) + if(istype(organ, /obj/item/organ/genital/breasts)) + var/obj/item/organ/genital/breasts/siski = organ + switch(siski.fluid_volume) + if(OCHEN_BLIZKO_FLUID to INFINITY) + siski.icon_state_organ = "breasts_overfluid" + if(owner.is_chest_exposed()) + owner.breasts_protechka_examine = "Грудь [owner] выглядит крайне мокрой!" + if(prob(20)) + var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) + drip.color = siski.fluid_color + drip.reagents.add_reagent(siski.fluid_id, 1) + else + owner.breasts_protechka_examine = "Одежда [owner] в районе груди выглядит крайне мокрой!" + if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) + siski.icon_state_organ = "breasts_fluid" + if(owner.is_chest_exposed()) + owner.breasts_protechka_examine = "Грудь [owner] выглядит чутка мокрой." + if(prob(5)) + var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) + drip.color = siski.fluid_color + drip.reagents.add_reagent(siski.fluid_id, 1) + else + owner.breasts_protechka_examine = "Одежда [owner] в районе груди выглядит чутка мокрой." + else + siski.icon_state_organ = "blank" + owner.breasts_protechka_examine = null + + else if(HAS_TRAIT(owner, TRAIT_FLUID_PENIS)) + if(istype(organ, /obj/item/organ/genital/testicles)) + var/obj/item/organ/genital/testicles/yayca = organ + switch(yayca.fluid_volume) + if(OCHEN_BLIZKO_FLUID to INFINITY) + yayca.icon_state_organ = "penis_overfluid" + if(owner.is_groin_exposed()) + owner.penis_protechka_examine = "Пенис [owner] выглядит крайне мокрым!" + if(prob(20)) + var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) + drip.color = yayca.fluid_color + drip.reagents.add_reagent(yayca.fluid_id, 1) + else + owner.penis_protechka_examine = "Одежда [owner] в районе паха выглядит крайне мокрой!" + if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) + yayca.icon_state_organ = "penis_fluid" + if(owner.is_chest_exposed()) + owner.penis_protechka_examine = "Пенис [owner] выглядит чутка мокрым." + if(prob(5)) + var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) + drip.color = yayca.fluid_color + drip.reagents.add_reagent(yayca.fluid_id, 1) + else + owner.penis_protechka_examine = "Одежда [owner] в районе паха выглядит чутка мокрой." + else + yayca.icon_state_organ = "blank" + owner.penis_protechka_examine = null + + else if(HAS_TRAIT(owner, TRAIT_FLUID_WOMB)) + if(istype(organ, /obj/item/organ/genital/womb)) + var/obj/item/organ/genital/womb/pizda = organ + switch(pizda.fluid_volume) + if(OCHEN_BLIZKO_FLUID to INFINITY) + pizda.icon_state_organ = "vagina_overfluid" + if(owner.is_groin_exposed()) + owner.womb_protechka_examine = "Киска [owner] выглядит крайне мокрой!" + if(prob(20)) + var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) + drip.color = pizda.fluid_color + drip.reagents.add_reagent(pizda.fluid_id, 1) + else + owner.womb_protechka_examine = "Одежда [owner] в районе паха выглядит крайне мокрой!" + if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) + pizda.icon_state_organ = "vagina_fluid" + if(owner.is_chest_exposed()) + owner.womb_protechka_examine = "Киска [owner] выглядит чутка мокрой." + if(prob(5)) + var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) + drip.color = pizda.fluid_color + drip.reagents.add_reagent(pizda.fluid_id, 1) + else + owner.womb_protechka_examine = "Одежда [owner] в районе паха выглядит чутка мокрой." + else + pizda.icon_state_organ = "blank" + owner.womb_protechka_examine = null organ.update_icon_blyat() /obj/item/organ/genital/proc/update_icon_blyat() diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm index f17496a9febc..d4f5539ccae6 100644 --- a/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm @@ -1,11 +1,40 @@ -/datum/quirk/fluid_leak - name = "Протечка!" +/datum/quirk/fluid_leak_tits + name = "Протечка! (Грудь)" desc = "Ваши органы не знают предела в выработке телесных жидкостей, от того ваше грудное молоко или другие жидкости могут протекать!" value = 0 - mob_trait = TRAIT_FLUID + mob_trait = TRAIT_FLUID_TITS -/datum/quirk/fluid_leak/add() - . = ..() +/datum/quirk/fluid_leak_tits/add() + if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID)) + ADD_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) -/datum/quirk/fluid_leak/remove() - . = ..() +/datum/quirk/fluid_leak_tits/remove() + if(HAS_TRAIT(quirk_holder, TRAIT_FLUID)) + REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) + +/datum/quirk/fluid_leak_pizda + name = "Протечка! (Матка)" + desc = "Ваши органы не знают предела в выработке телесных жидкостей, от того ваше грудное молоко или другие жидкости могут протекать!" + value = 0 + mob_trait = TRAIT_FLUID_WOMB + +/datum/quirk/fluid_leak_pizda/add() + if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID)) + ADD_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) + +/datum/quirk/fluid_leak_pizda/remove() + if(HAS_TRAIT(quirk_holder, TRAIT_FLUID)) + REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) + +/datum/quirk/fluid_leak_penis + name = "Протечка! (Яйца(Пенис))" + desc = "Ваши органы не знают предела в выработке телесных жидкостей, от того ваше грудное молоко или другие жидкости могут протекать!" + value = 0 + mob_trait = TRAIT_FLUID_PENIS + +/datum/quirk/fluid_leak_penis/add() + if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID)) + ADD_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) +/datum/quirk/fluid_leak_penis/remove() + if(HAS_TRAIT(quirk_holder, TRAIT_FLUID)) + REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) diff --git a/modular_sand/code/datums/interactions/lewd_definitions.dm b/modular_sand/code/datums/interactions/lewd_definitions.dm index 3e3bb7c5fe47..ddb6f1ff08c0 100644 --- a/modular_sand/code/datums/interactions/lewd_definitions.dm +++ b/modular_sand/code/datums/interactions/lewd_definitions.dm @@ -735,6 +735,15 @@ else H.mob_climax(TRUE, "sex", partner, !cumin, target_gen, anonymous) set_lust(0) + if(istype(last_genital, /obj/item/organ/genital)) + var/obj/item/organ/genital/P = last_genital + if(HAS_TRAIT(src, TRAIT_FLUID)) // BLUEMOON ADDITION + if(istype(P, /obj/item/organ/genital/vagina)) + var/mob/living/carbon/O = src + var/obj/item/organ/genital/womb/J = locate() in O.internal_organs + J.fluid_volume = 0 + else + P.fluid_volume = 0 // BLUEMOON ADDITION SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner, cumin, last_genital) diff --git a/modular_splurt/code/datums/interactions/lewd/_lewd.dm b/modular_splurt/code/datums/interactions/lewd/_lewd.dm index f86347faf418..7483550a69ab 100644 --- a/modular_splurt/code/datums/interactions/lewd/_lewd.dm +++ b/modular_splurt/code/datums/interactions/lewd/_lewd.dm @@ -224,8 +224,10 @@ H.mob_climax(TRUE, "sex", partner, !cumin, target_gen) set_lust(0) - if(HAS_TRAIT(src, TRAIT_FLUID)) // BLUEMOON ADDITION - last_genital.fluid_volume = 0 // BLUEMOON ADDITION + if(istype(last_genital, /obj/item/organ/genital)) + var/obj/item/organ/genital/P = last_genital + if(HAS_TRAIT(src, TRAIT_FLUID)) // BLUEMOON ADDITION + P.fluid_volume = 0 // BLUEMOON ADDITION SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner, cumin, last_genital) diff --git a/tgstation.dme b/tgstation.dme index e5ec28e236cf..94b920ea9d8a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4383,6 +4383,7 @@ #include "modular_bluemoon\krashly\code\modules\mobs\carbon\nucleation\code\nucleation.dm" #include "modular_bluemoon\krashly\code\modules\mobs\simple\brown_carp.dm" #include "modular_bluemoon\krashly\code\modules\sexfluids_limits\_limits.dm" +#include "modular_bluemoon\krashly\code\modules\sexfluids_limits\effects.dm" #include "modular_bluemoon\krashly\code\modules\sexfluids_limits\moods.dm" #include "modular_bluemoon\krashly\code\modules\sexfluids_limits\quirk.dm" #include "modular_bluemoon\krashly\code\uplink\uplink.dm" From 62fe74c8ea97ff41e5077262af67333815a33515 Mon Sep 17 00:00:00 2001 From: Krashly <104254674+Krashly@users.noreply.github.com> Date: Sat, 20 Jul 2024 19:49:14 +0300 Subject: [PATCH 7/9] Delete modular_bluemoon/krashly/readme.txt --- modular_bluemoon/krashly/readme.txt | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 modular_bluemoon/krashly/readme.txt diff --git a/modular_bluemoon/krashly/readme.txt b/modular_bluemoon/krashly/readme.txt deleted file mode 100644 index 349dc5eac9fe..000000000000 --- a/modular_bluemoon/krashly/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (C) 2023 Krashly - -Данная папка и все файлы находящиеся в ней принадлежат и были разработаны одноименным пользователем с ником Krashly, связаться с коим можно в Discord под таким же никнеймом. -В данный момент владелец папки занимается разработкой иного проекта, который можно посетить по данной ссылке: https://discord.gg/9YhzaWNtBN -Автор сожалеет что потратил столько времени и сил впустую и ему жаль что разработки попали не в те руки. From 2eefda995f935123f60de4667c09c001f54dec29 Mon Sep 17 00:00:00 2001 From: Krashly Date: Tue, 27 Aug 2024 01:19:02 +0300 Subject: [PATCH 8/9] Fixes and Renaming --- .../mob/living/carbon/human/examine.dm | 12 +- .../code/modules/sexfluids_limits/_limits.dm | 12 +- .../code/modules/sexfluids_limits/moods.dm | 197 +++++++++--------- .../code/modules/sexfluids_limits/quirk.dm | 16 +- .../datums/interactions/lewd_definitions.dm | 20 +- 5 files changed, 134 insertions(+), 123 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 3ba6d90a0e13..15a5ffa2b7ea 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -525,14 +525,14 @@ if(HAS_TRAIT(user, TRAIT_FLUID)) if(HAS_TRAIT(user, TRAIT_FLUID_TITS)) - if(breasts_protechka_examine != null) - . += breasts_protechka_examine + if(breasts_fluid_leak_examine != null) + . += breasts_fluid_leak_examine if(HAS_TRAIT(user, TRAIT_FLUID_PENIS)) - if(penis_protechka_examine != null) - . += penis_protechka_examine + if(penis_fluid_leak_examine != null) + . += penis_fluid_leak_examine if(HAS_TRAIT(user, TRAIT_FLUID_WOMB)) - if(womb_protechka_examine != null) - . += womb_protechka_examine + if(womb_fluid_leak_examine != null) + . += womb_fluid_leak_examine var/scar_severity = 0 for(var/i in all_scars) diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm index 2f8fc06eeea5..bc05f30a3dd3 100644 --- a/modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/_limits.dm @@ -1,12 +1,12 @@ #define MAX_FLUID 300 -#define OCHEN_BLIZKO_FLUID 280 -#define BLIZKO_TO_MAX_FLUID 200 -#define SREDNE_FLUID 150 +#define VERY_CLOSE_FLUID 280 +#define CLOSE_FLUID 200 +#define MEDIUM_FLUID 150 #define MIN_FLUID 0 #define MIN_FLUID_SPAWN 100 #define MAX_FLUID_SPAWN 200 -#define NETU 1 -#define CHUTKA 2 -#define OVERDOHUYA 3 +#define HAS_NO_FLUID_COUNT 1 +#define MEDIUM_FLUID_COUNT 2 +#define OVERCHARGED_FLUID_COUNT 3 diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm index 07f7d0a5ff7e..e06a6f971029 100644 --- a/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/moods.dm @@ -47,6 +47,7 @@ // ░▐▌░░░░░░░▀▄▄▀░░░░░░░░░░▐█▄▄░░░░░░░░░▀▄▄▀░░░░░▐▌ // ░█░░░░░░░░░░░░░░░░░░░░░░░░░▀█░░░░░░░░░░░░░░░░░░█ +/// Муд Ивенты. /datum/mood_event/fluid_spustil // АХАХХАХАХА, СПУСТИЛ!!!!!!!!!!!!!!!!!!!!!!!!!!!!! mood_change = 3 @@ -55,7 +56,7 @@ var/mob/living/carbon/human/owner_mob = owner_mob() description = "Я чувствую себя свободн[owner_mob.ru_oy_im()] от жидкостей в моем организме.\n" -/datum/mood_event/fluid_imeetsya +/datum/mood_event/fluid_charged description = "Я начинаю чувствовать тяжесть.\n" mood_change = -5 @@ -63,7 +64,8 @@ description = "Я теку!\n" mood_change = -8 -/atom/movable/protechka +/// Оверлей протекших органов. +/atom/movable/fluid_leak name = "" vis_flags = VIS_INHERIT_ID|VIS_INHERIT_DIR layer = ABOVE_MOB_LAYER @@ -71,158 +73,161 @@ icon = 'modular_bluemoon/krashly/code/modules/sexfluids_limits/icons/overlay.dmi' icon_state = "blank" +/// Переменные. /obj/item/organ/genital /// Текущее количество жидкости в гениталии. var/fluid_volume = 0 /// Цвет жидкости fluid_id.color var/fluid_color = "#000000" - - var/atom/movable/protechka/protechka - + /// Обозначаем тут оверлей протекших органов. + var/atom/movable/fluid_leak/fluid_leak + /// Изначально его "нет". var/icon_state_organ = "blank" + /// Т.к. инициализация не работает, придумал такой костыль. Спавнит начальное кол-во жидкости в персонаже. + var/is_character_spawned = FALSE + /// Имеется ли на одежде оверлей протекших органов? + var/has_clothing_liquid_trail = FALSE - var/spawned = FALSE // pohuy, kostil - var/imeetsya = FALSE - +/// Описание на кукле, если протекло. /mob/living/carbon - var/breasts_protechka_examine = null - var/penis_protechka_examine = null - var/womb_protechka_examine = null + var/breasts_fluid_leak_examine = null + var/penis_fluid_leak_examine = null + var/womb_fluid_leak_examine = null -/obj/item/organ/genital/proc/fluid_add() +/obj/item/organ/genital/proc/fluid_add() // Прибавление Жидкостей в органе. if(!owner) return if(owner.stat == DEAD) return if(HAS_TRAIT(owner, TRAIT_FLUID)) - if(!spawned) + if(!is_character_spawned) fluid_volume = rand(MIN_FLUID_SPAWN, MAX_FLUID_SPAWN) - fluid_color = fluid_id.color - spawned = TRUE + fluid_color = fluid_id?.color + is_character_spawned = TRUE if(fluid_id != null) if(fluid_volume < MAX_FLUID) fluid_volume += (fluid_rate*0.05) -/obj/item/organ/genital/proc/get_fluid_number(obj/item/organ/genital/O) +/obj/item/organ/genital/proc/get_fluid_number(obj/item/organ/genital/O) // Получаем число от 1 до 3. switch(O.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) - return OVERDOHUYA - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - return CHUTKA + if(VERY_CLOSE_FLUID to INFINITY) + return OVERCHARGED_FLUID_COUNT + if(CLOSE_FLUID to VERY_CLOSE_FLUID) + return MEDIUM_FLUID_COUNT else - return NETU + return HAS_NO_FLUID_COUNT -/proc/overlay_fluid(mob/living/carbon/owner, obj/item/organ/genital/organ) +/proc/overlay_fluid(mob/living/carbon/owner, obj/item/organ/genital/organ) // Создаём оверлей протечки на одежде и описание персонажа. if(HAS_TRAIT(owner, TRAIT_FLUID_TITS)) if(istype(organ, /obj/item/organ/genital/breasts)) - var/obj/item/organ/genital/breasts/siski = organ - switch(siski.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) - siski.icon_state_organ = "breasts_overfluid" + var/obj/item/organ/genital/breasts/breasts = organ + switch(breasts.fluid_volume) + if(VERY_CLOSE_FLUID to INFINITY) + breasts.icon_state_organ = "breasts_overfluid" if(owner.is_chest_exposed()) - owner.breasts_protechka_examine = "Грудь [owner] выглядит крайне мокрой!" + owner.breasts_fluid_leak_examine = "Грудь [owner] выглядит крайне мокрой!" if(prob(20)) var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) - drip.color = siski.fluid_color - drip.reagents.add_reagent(siski.fluid_id, 1) + drip?.color = breasts.fluid_color + drip?.reagents.add_reagent(breasts.fluid_id, 1) else - owner.breasts_protechka_examine = "Одежда [owner] в районе груди выглядит крайне мокрой!" - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - siski.icon_state_organ = "breasts_fluid" + owner.breasts_fluid_leak_examine = "Одежда [owner] в районе груди выглядит крайне мокрой!" + if(CLOSE_FLUID to VERY_CLOSE_FLUID) + breasts.icon_state_organ = "breasts_fluid" if(owner.is_chest_exposed()) - owner.breasts_protechka_examine = "Грудь [owner] выглядит чутка мокрой." + owner.breasts_fluid_leak_examine = "Грудь [owner] выглядит чутка мокрой." if(prob(5)) var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) - drip.color = siski.fluid_color - drip.reagents.add_reagent(siski.fluid_id, 1) + drip?.color = breasts.fluid_color + drip?.reagents.add_reagent(breasts.fluid_id, 1) else - owner.breasts_protechka_examine = "Одежда [owner] в районе груди выглядит чутка мокрой." + owner.breasts_fluid_leak_examine = "Одежда [owner] в районе груди выглядит чутка мокрой." else - siski.icon_state_organ = "blank" - owner.breasts_protechka_examine = null + breasts.icon_state_organ = "blank" + owner.breasts_fluid_leak_examine = null else if(HAS_TRAIT(owner, TRAIT_FLUID_PENIS)) if(istype(organ, /obj/item/organ/genital/testicles)) - var/obj/item/organ/genital/testicles/yayca = organ - switch(yayca.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) - yayca.icon_state_organ = "penis_overfluid" + var/obj/item/organ/genital/testicles/testicles = organ + switch(testicles.fluid_volume) + if(VERY_CLOSE_FLUID to INFINITY) + testicles.icon_state_organ = "penis_overfluid" if(owner.is_groin_exposed()) - owner.penis_protechka_examine = "Пенис [owner] выглядит крайне мокрым!" + owner.penis_fluid_leak_examine = "Пенис [owner] выглядит крайне мокрым!" if(prob(20)) var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) - drip.color = yayca.fluid_color - drip.reagents.add_reagent(yayca.fluid_id, 1) + drip?.color = testicles.fluid_color + drip?.reagents.add_reagent(testicles.fluid_id, 1) else - owner.penis_protechka_examine = "Одежда [owner] в районе паха выглядит крайне мокрой!" - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - yayca.icon_state_organ = "penis_fluid" + owner.penis_fluid_leak_examine = "Одежда [owner] в районе паха выглядит крайне мокрой!" + if(CLOSE_FLUID to VERY_CLOSE_FLUID) + testicles.icon_state_organ = "penis_fluid" if(owner.is_chest_exposed()) - owner.penis_protechka_examine = "Пенис [owner] выглядит чутка мокрым." + owner.penis_fluid_leak_examine = "Пенис [owner] выглядит чутка мокрым." if(prob(5)) var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) - drip.color = yayca.fluid_color - drip.reagents.add_reagent(yayca.fluid_id, 1) + drip?.color = testicles.fluid_color + drip?.reagents.add_reagent(testicles.fluid_id, 1) else - owner.penis_protechka_examine = "Одежда [owner] в районе паха выглядит чутка мокрой." + owner.penis_fluid_leak_examine = "Одежда [owner] в районе паха выглядит чутка мокрой." else - yayca.icon_state_organ = "blank" - owner.penis_protechka_examine = null + testicles.icon_state_organ = "blank" + owner.penis_fluid_leak_examine = null else if(HAS_TRAIT(owner, TRAIT_FLUID_WOMB)) if(istype(organ, /obj/item/organ/genital/womb)) - var/obj/item/organ/genital/womb/pizda = organ - switch(pizda.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) - pizda.icon_state_organ = "vagina_overfluid" + var/obj/item/organ/genital/womb/vagina = organ + switch(vagina.fluid_volume) + if(VERY_CLOSE_FLUID to INFINITY) + vagina.icon_state_organ = "vagina_overfluid" if(owner.is_groin_exposed()) - owner.womb_protechka_examine = "Киска [owner] выглядит крайне мокрой!" + owner.womb_fluid_leak_examine = "Киска [owner] выглядит крайне мокрой!" if(prob(20)) var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) - drip.color = pizda.fluid_color - drip.reagents.add_reagent(pizda.fluid_id, 1) + drip?.color = vagina.fluid_color + drip?.reagents.add_reagent(vagina.fluid_id, 1) else - owner.womb_protechka_examine = "Одежда [owner] в районе паха выглядит крайне мокрой!" - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - pizda.icon_state_organ = "vagina_fluid" + owner.womb_fluid_leak_examine = "Одежда [owner] в районе паха выглядит крайне мокрой!" + if(CLOSE_FLUID to VERY_CLOSE_FLUID) + vagina.icon_state_organ = "vagina_fluid" if(owner.is_chest_exposed()) - owner.womb_protechka_examine = "Киска [owner] выглядит чутка мокрой." + owner.womb_fluid_leak_examine = "Киска [owner] выглядит чутка мокрой." if(prob(5)) var/obj/effect/decal/cleanable/fluidrip/drip = new(owner.loc) - drip.color = pizda.fluid_color - drip.reagents.add_reagent(pizda.fluid_id, 1) + drip?.color = vagina.fluid_color + drip?.reagents.add_reagent(vagina.fluid_id, 1) else - owner.womb_protechka_examine = "Одежда [owner] в районе паха выглядит чутка мокрой." + owner.womb_fluid_leak_examine = "Одежда [owner] в районе паха выглядит чутка мокрой." else - pizda.icon_state_organ = "blank" - owner.womb_protechka_examine = null - organ.update_icon_blyat() - -/obj/item/organ/genital/proc/update_icon_blyat() - if(imeetsya == FALSE) - protechka = new(src) - owner.vis_contents += protechka - imeetsya = TRUE + vagina.icon_state_organ = "blank" + owner.womb_fluid_leak_examine = null + organ.update_icon_fluid() + +/obj/item/organ/genital/proc/update_icon_fluid() // Апдейтим иконку оверлея протечки. + if(has_clothing_liquid_trail == FALSE) + fluid_leak = new(src) + owner.vis_contents += fluid_leak + has_clothing_liquid_trail = TRUE if(get_fluid_number(src) >= 2) if(owner.get_item_by_slot(ITEM_SLOT_OCLOTHING)) if(!owner.is_chest_exposed()) - var/obj/item/organ/genital/breasts/titki = src - titki.icon_state_organ = "blank" - protechka.update_appearance() + var/obj/item/organ/genital/breasts/breasts = src + breasts.icon_state_organ = "blank" + fluid_leak.update_appearance() if(!owner.is_groin_exposed()) - var/obj/item/organ/genital/testicles/penis = src - var/obj/item/organ/genital/womb/pilotka = src - penis.icon_state_organ = "blank" - pilotka.icon_state_organ = "blank" - protechka.update_appearance() + var/obj/item/organ/genital/testicles/testicles = src + var/obj/item/organ/genital/womb/vagina = src + testicles.icon_state_organ = "blank" + vagina.icon_state_organ = "blank" + fluid_leak.update_appearance() else - protechka.icon_state = icon_state_organ - protechka.color = fluid_color - protechka.update_appearance() + fluid_leak.icon_state = icon_state_organ + fluid_leak.color = fluid_color + fluid_leak.update_appearance() else - vis_contents -= protechka - qdel(protechka) - imeetsya = FALSE + vis_contents -= fluid_leak + qdel(fluid_leak) + has_clothing_liquid_trail = FALSE /datum/component/mood/proc/HandleFluid(mob/living/carbon/L) if(!HAS_TRAIT(L, TRAIT_FLUID)) @@ -231,11 +236,11 @@ O.fluid_add() overlay_fluid(L, O) switch(O.fluid_volume) - if(OCHEN_BLIZKO_FLUID to INFINITY) + if(VERY_CLOSE_FLUID to INFINITY) add_event(null, "fluid", /datum/mood_event/fluid_overcharged) - if(BLIZKO_TO_MAX_FLUID to OCHEN_BLIZKO_FLUID) - add_event(null, "fluid", /datum/mood_event/fluid_imeetsya) - if(SREDNE_FLUID to BLIZKO_TO_MAX_FLUID) + if(CLOSE_FLUID to VERY_CLOSE_FLUID) + add_event(null, "fluid", /datum/mood_event/fluid_charged) + if(MEDIUM_FLUID to CLOSE_FLUID) clear_event(null, "fluid") - if(MIN_FLUID to SREDNE_FLUID) + if(MIN_FLUID to MEDIUM_FLUID) add_event(null, "fluid", /datum/mood_event/fluid_spustil) diff --git a/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm b/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm index d4f5539ccae6..47079573fe29 100644 --- a/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm +++ b/modular_bluemoon/krashly/code/modules/sexfluids_limits/quirk.dm @@ -10,21 +10,23 @@ /datum/quirk/fluid_leak_tits/remove() if(HAS_TRAIT(quirk_holder, TRAIT_FLUID)) - REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) + if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID_WOMB || TRAIT_FLUID_PENIS)) + REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) -/datum/quirk/fluid_leak_pizda +/datum/quirk/fluid_leak_vagina name = "Протечка! (Матка)" desc = "Ваши органы не знают предела в выработке телесных жидкостей, от того ваше грудное молоко или другие жидкости могут протекать!" value = 0 mob_trait = TRAIT_FLUID_WOMB -/datum/quirk/fluid_leak_pizda/add() +/datum/quirk/fluid_leak_vagina/add() if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID)) ADD_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) -/datum/quirk/fluid_leak_pizda/remove() +/datum/quirk/fluid_leak_vagina/remove() if(HAS_TRAIT(quirk_holder, TRAIT_FLUID)) - REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) + if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID_TITS || TRAIT_FLUID_PENIS)) + REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) /datum/quirk/fluid_leak_penis name = "Протечка! (Яйца(Пенис))" @@ -35,6 +37,8 @@ /datum/quirk/fluid_leak_penis/add() if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID)) ADD_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) + /datum/quirk/fluid_leak_penis/remove() if(HAS_TRAIT(quirk_holder, TRAIT_FLUID)) - REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) + if(!HAS_TRAIT(quirk_holder, TRAIT_FLUID_TITS || TRAIT_FLUID_WOMB)) + REMOVE_TRAIT(quirk_holder, TRAIT_FLUID, ROUNDSTART_TRAIT) diff --git a/modular_sand/code/datums/interactions/lewd_definitions.dm b/modular_sand/code/datums/interactions/lewd_definitions.dm index ddb6f1ff08c0..1b843ec09d74 100644 --- a/modular_sand/code/datums/interactions/lewd_definitions.dm +++ b/modular_sand/code/datums/interactions/lewd_definitions.dm @@ -722,6 +722,17 @@ if(!message) message = pick("оргазмирует!", "трясётся в оргазме.", "дрожит от оргазма!", "кончает на себя!") visible_message(message = span_userlove("\The [src] [message]"), ignored_mobs = get_unconsenting(ignored_mobs = obscure_to)) +// BM ADDITION START - Krashly New Fluid Trait + if(istype(last_genital, /obj/item/organ/genital)) + var/obj/item/organ/genital/P = last_genital + if(HAS_TRAIT(src, TRAIT_FLUID)) + if(istype(P, /obj/item/organ/genital/vagina)) + var/mob/living/carbon/O = src + var/obj/item/organ/genital/womb/J = locate() in O.internal_organs + J.fluid_volume = 0 + else + P.fluid_volume = 0 +// BM ADDITION END multiorgasms += 1 COOLDOWN_START(src, refractory_period, (rand(300, 900) - get_sexual_potency()))//sex cooldown @@ -735,15 +746,6 @@ else H.mob_climax(TRUE, "sex", partner, !cumin, target_gen, anonymous) set_lust(0) - if(istype(last_genital, /obj/item/organ/genital)) - var/obj/item/organ/genital/P = last_genital - if(HAS_TRAIT(src, TRAIT_FLUID)) // BLUEMOON ADDITION - if(istype(P, /obj/item/organ/genital/vagina)) - var/mob/living/carbon/O = src - var/obj/item/organ/genital/womb/J = locate() in O.internal_organs - J.fluid_volume = 0 - else - P.fluid_volume = 0 // BLUEMOON ADDITION SEND_SIGNAL(src, COMSIG_MOB_POST_CAME, target_orifice, partner, cumin, last_genital) From 71ab3b587628783fe2e4b621650b4d52112c6165 Mon Sep 17 00:00:00 2001 From: Krashly Date: Tue, 27 Aug 2024 01:27:27 +0300 Subject: [PATCH 9/9] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/components/mood.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 009fa2df4b6a..d8040c332c58 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -172,7 +172,8 @@ HandleNutrition(owner) HandleThirst(owner) - HandleFluid(owner) // BLUEMOON ADDITION + if(HAS_TRAIT(owner, TRAIT_FLUID)) + HandleFluid(owner) // BLUEMOON ADDITION /datum/component/mood/proc/setSanity(amount, minimum=SANITY_INSANE, maximum=SANITY_NEUTRAL)//I'm sure bunging this in here will have no negative repercussions. var/mob/living/master = parent