diff --git a/_maps/splurt_maps/templates/hilbertshotel.dmm b/_maps/splurt_maps/templates/hilbertshotel.dmm index b39bc8c146..dbf63764b1 100644 --- a/_maps/splurt_maps/templates/hilbertshotel.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel.dmm @@ -6,25 +6,10 @@ /obj/structure/window/reinforced/tinted, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"br" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "bx" = ( /obj/structure/mineral_door/wood, /turf/open/indestructible/hotelwood, /area/hilbertshotel) -"bP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/indestructible/hotelwood, -/area/hilbertshotel) "dl" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/bottle/champagne, @@ -40,11 +25,6 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) "dN" = ( @@ -55,41 +35,6 @@ }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"eN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/hotelwall, -/area/hilbertshotel) -"fv" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3, -/turf/open/space/bluespace, -/area/hilbertshotel) -"fF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/hotelwall, -/area/hilbertshotel) -"hk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "hn" = ( /obj/item/toy/plush/beeplushie, /obj/structure/table/wood/fancy, @@ -97,15 +42,6 @@ /area/hilbertshotel) "hz" = ( /obj/structure/mineral_door/paperframe, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/indestructible/hotelwood, /area/hilbertshotel) "hK" = ( @@ -117,17 +53,6 @@ /obj/effect/spawner/lootdrop/three_course_meal, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"iH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "jS" = ( /obj/structure/mirror{ pixel_x = -32 @@ -153,38 +78,6 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"nD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/lattice, -/turf/closed/indestructible/hotelwall, -/area/hilbertshotel) -"nK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/indestructible/hotelwood, -/area/hilbertshotel) -"ot" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/lattice, -/turf/closed/indestructible/hotelwall, -/area/hilbertshotel) "qH" = ( /turf/open/floor/plasteel/stairs/left, /area/hilbertshotel) @@ -232,14 +125,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) "xG" = ( @@ -263,12 +148,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"zr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, -/turf/open/indestructible/hotelwood, -/area/hilbertshotel) "zD" = ( /obj/machinery/jukebox{ req_one_access = null @@ -281,18 +160,6 @@ }, /turf/open/indestructible/hotelwood, /area/hilbertshotel) -"Ba" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "Bt" = ( /obj/structure/window/reinforced/tinted{ dir = 8 @@ -314,13 +181,6 @@ "CN" = ( /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"CO" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "FR" = ( /obj/item/bikehorn/rubberducky, /obj/machinery/light/small{ @@ -331,14 +191,6 @@ "GW" = ( /turf/open/space/bluespace, /area/hilbertshotel) -"HD" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/space/bluespace, -/area/hilbertshotel) "Ii" = ( /obj/machinery/vending/kink, /turf/open/indestructible/hotelwood, @@ -361,27 +213,11 @@ /obj/structure/fireplace{ pixel_y = -6 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/indestructible/hotelwood, /area/hilbertshotel) "KD" = ( /obj/machinery/light/small, /obj/effect/landmark/xmastree/hilbert, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/indestructible/hotelwood, /area/hilbertshotel) "Ld" = ( @@ -395,15 +231,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/indestructible/hotelwood, /area/hilbertshotel) "LX" = ( @@ -412,19 +239,6 @@ }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"Ml" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/lattice, -/turf/closed/indestructible/hotelwall, -/area/hilbertshotel) "Mt" = ( /obj/structure/table/reinforced, /turf/open/indestructible/hotelwood, @@ -458,25 +272,12 @@ }, /turf/open/indestructible/hotelwood, /area/hilbertshotel) -"RP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 1 - }, -/turf/open/indestructible/hoteltile, -/area/hilbertshotel) "Si" = ( /turf/closed/indestructible/hotelwall, /area/hilbertshotel) "Tt" = ( /turf/open/floor/plasteel/stairs/right, /area/hilbertshotel) -"TB" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "Uc" = ( /obj/item/kirbyplants/random, /turf/open/indestructible/hotelwood, @@ -507,17 +308,6 @@ /obj/structure/curtain, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"Yl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/indestructible/hoteltile, -/area/hilbertshotel) "YD" = ( /obj/machinery/light/small, /turf/open/indestructible/hoteltile, @@ -594,7 +384,7 @@ qH MZ YR AZ -zr +MZ hK kX CN @@ -612,7 +402,7 @@ Ce MZ Um AZ -bP +MZ hK iq CN @@ -630,7 +420,7 @@ Tt MZ MA AZ -nK +MZ hK re CN @@ -666,7 +456,7 @@ Si bx Si Si -eN +Si Si Si Si @@ -677,8 +467,8 @@ GW "} (9,1,1) = {" GW -fv -nD +GW +wC Uc yh MZ @@ -695,14 +485,14 @@ GW "} (10,1,1) = {" GW -TB -ot +GW +wC BG Zx -br +Zx Zx MZ -eN +Si wf wf wf @@ -713,29 +503,29 @@ GW "} (11,1,1) = {" GW -HD -Ml +GW +wC JK -iH -Ba -iH +Zx +Zx +Zx KD -fF +Si wT -Yl +wf dH -RP +wf YD Si GW "} (12,1,1) = {" GW -CO +GW wC BG Zx -hk +Zx Zx MZ Si diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment.dmm index d69584ad9e..286f4e1e14 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment.dmm @@ -21,18 +21,6 @@ }, /turf/open/floor/carpet, /area/hilbertshotel) -"aW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) "bw" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -41,18 +29,6 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) -"bx" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) "bz" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/table/wood, @@ -83,15 +59,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "dw" = ( @@ -109,26 +76,16 @@ /obj/item/reagent_containers/food/drinks/beer, /obj/item/reagent_containers/food/drinks/beer, /obj/item/kitchen/knife, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 8 - }, /turf/open/floor/plasteel/kitchen_coldroom, /area/hilbertshotel) "dT" = ( /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"eJ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3, -/turf/open/floor/plating/airless, -/area/hilbertshotel) "eO" = ( /obj/structure/bookcase/random, /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "fa" = ( @@ -148,25 +105,9 @@ }, /turf/open/floor/carpet, /area/hilbertshotel) -"hk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plasteel/kitchen_coldroom, -/area/hilbertshotel) "ho" = ( /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"hN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet/purple, -/area/hilbertshotel) "ik" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -175,18 +116,6 @@ /area/hilbertshotel) "iL" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/jukebox{ - req_one_access = null; - area_limited = 1 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "jr" = ( @@ -226,9 +155,6 @@ "kS" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 4 - }, /turf/open/floor/carpet, /area/hilbertshotel) "kW" = ( @@ -239,30 +165,10 @@ /obj/structure/flora/junglebush, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"lK" = ( -/obj/structure/sign/poster/contraband/random, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "lO" = ( /obj/item/choice_beacon/box/plushie, /turf/open/floor/carpet, /area/hilbertshotel) -"lS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/plating/airless, -/area/hilbertshotel) "lU" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -270,15 +176,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "md" = ( @@ -292,20 +189,9 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"ns" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) "oZ" = ( /obj/machinery/telecomms/relay/preset/auto, -/turf/open/floor/plating/airless, +/turf/open/floor/catwalk_floor, /area/hilbertshotel) "pm" = ( /obj/structure/table/wood, @@ -377,13 +263,6 @@ }, /turf/closed/indestructible/wood, /area/hilbertshotel) -"wx" = ( -/obj/structure/sign/poster/contraband/random, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "wS" = ( /obj/structure/closet/cabinet, /obj/effect/turf_decal/siding/wood{ @@ -392,20 +271,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"xM" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) "xT" = ( /turf/closed/indestructible/wall, /area/hilbertshotel) @@ -418,19 +285,6 @@ }, /turf/open/floor/plasteel/kitchen_coldroom, /area/hilbertshotel) -"zm" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "zA" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -447,18 +301,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/wood_large, /area/hilbertshotel) -"Aa" = ( -/obj/machinery/door/morgue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel/kitchen_coldroom, -/area/hilbertshotel) "Ae" = ( /obj/machinery/door/morgue, /turf/open/indestructible/hoteltile, @@ -472,15 +314,6 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"AS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "AY" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -488,36 +321,12 @@ /obj/structure/chair/stool/bar, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"BI" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "BR" = ( /obj/structure/chair/comfy/brown{ dir = 4 }, /turf/open/floor/carpet, /area/hilbertshotel) -"Cw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) -"Cz" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) "DR" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -531,9 +340,6 @@ /obj/machinery/computer{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 4 - }, /turf/open/floor/carpet/purple, /area/hilbertshotel) "Ea" = ( @@ -548,15 +354,6 @@ }, /turf/open/floor/carpet, /area/hilbertshotel) -"EI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "EX" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/three_course_meal, @@ -569,18 +366,6 @@ /obj/structure/chair/sofa/corp, /turf/open/floor/carpet, /area/hilbertshotel) -"GC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "Hw" = ( /obj/structure/chair/stool/bar, /turf/open/floor/wood/wood_tiled, @@ -619,29 +404,6 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"KJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"Ls" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "Mj" = ( /turf/open/floor/carpet/purple, /area/hilbertshotel) @@ -663,35 +425,12 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /turf/open/floor/plasteel/kitchen_coldroom, /area/hilbertshotel) "Nb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 8 - }, /obj/structure/sink/kitchen, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"Nt" = ( -/obj/machinery/door/morgue, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "Oh" = ( /obj/machinery/vending/wallmed/directional/west{ shut_up = 1 @@ -710,45 +449,11 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) -"PD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "PK" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/three_course_meal, /turf/open/floor/plasteel/kitchen_coldroom, /area/hilbertshotel) -"PU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel/kitchen_coldroom, -/area/hilbertshotel) -"Qe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "QJ" = ( /obj/structure/table/wood/poker, /obj/structure/noticeboard{ @@ -758,17 +463,6 @@ }, /turf/open/floor/carpet, /area/hilbertshotel) -"QK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/carpet/purple, -/area/hilbertshotel) "QN" = ( /obj/structure/sign/poster/contraband/random, /turf/closed/indestructible/wall, @@ -824,27 +518,13 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) "Ul" = ( /obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) "UQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, /obj/structure/chair/sofa/corp/right, /turf/open/floor/carpet, /area/hilbertshotel) @@ -854,26 +534,12 @@ }, /obj/machinery/light_switch/directional/west, /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "Vo" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "WI" = ( @@ -881,19 +547,10 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/floor/plasteel/kitchen_coldroom, /area/hilbertshotel) "WN" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -903,20 +560,6 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"WP" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "WX" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -1010,15 +653,15 @@ FN FN xT wS -hN -QK -Nt -ns -bx -Aa -PU +Mj +Mj +wu +Tl +Tl +st +wl MO -hk +wl WI xT FN @@ -1031,7 +674,7 @@ Mj jr xT Tl -aW +Tl st wl wl @@ -1065,7 +708,7 @@ xT xT xT wu -Qe +xT QN xT xT @@ -1092,8 +735,8 @@ xT FN "} (10,1,1) = {" -eJ -AS +FN +xT AY QJ kS @@ -1109,27 +752,27 @@ xT FN "} (11,1,1) = {" -Cz -EI +FN +xT Vo -BI -zm -KJ +Hw +Hw +dT iL -lK -WP -Ls -PD +QN +aS +kh +xT Ul -GC +xT xT FN "} (12,1,1) = {" -lS -wx +FN +QN UQ -Cw +Ib WN Ib Ib @@ -1143,7 +786,7 @@ xT FN "} (13,1,1) = {" -xM +FN xT Gv Ib diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm index 3abf00b83a..d95e29e0e1 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm @@ -2,35 +2,12 @@ "ab" = ( /turf/open/space/bluespace, /area/hilbertshotel) -"ad" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"ae" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"af" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"ag" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) "ah" = ( /turf/closed/indestructible/wall, /area/hilbertshotel) "ai" = ( /obj/machinery/telecomms/relay/preset/auto, -/turf/open/floor/plating/airless, +/turf/open/floor/catwalk_floor, /area/hilbertshotel) "ao" = ( /obj/machinery/vending/kink{ @@ -42,55 +19,10 @@ /obj/machinery/door/morgue, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"ar" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, -/turf/open/floor/carpet/purple, -/area/hilbertshotel) -"au" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) -"av" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) -"aw" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "ax" = ( /obj/structure/lattice, /turf/closed/indestructible/wall, /area/hilbertshotel) -"aC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet/purple, -/area/hilbertshotel) "aD" = ( /turf/open/floor/carpet, /area/hilbertshotel) @@ -110,17 +42,6 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"aG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "aH" = ( /obj/machinery/light{ dir = 1 @@ -150,24 +71,6 @@ /obj/item/toy/plush/beeplushie, /turf/open/floor/carpet/purple, /area/hilbertshotel) -"aT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) -"aU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "aV" = ( /obj/machinery/vending/snack/orange{ shut_up = 1 @@ -192,12 +95,6 @@ /obj/item/bedsheet/random/double, /turf/open/floor/carpet/purple, /area/hilbertshotel) -"aY" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/hilbertshotel) "ba" = ( /turf/open/indestructible/hoteltile, /area/hilbertshotel) @@ -223,18 +120,6 @@ }, /turf/open/floor/carpet, /area/hilbertshotel) -"bf" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "bg" = ( /obj/structure/table/wood, /obj/item/pizzabox/margherita{ @@ -272,11 +157,6 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/floor/carpet/purple, /area/hilbertshotel) "bl" = ( @@ -297,14 +177,6 @@ "bs" = ( /obj/structure/table/wood, /obj/item/candle/infinite, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, /obj/item/toy/cards/deck, /turf/open/floor/carpet, /area/hilbertshotel) @@ -319,10 +191,6 @@ }, /turf/open/floor/carpet, /area/hilbertshotel) -"bv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel, -/turf/open/floor/carpet/purple, -/area/hilbertshotel) "bA" = ( /obj/structure/chair/sofa/right/maroon{ dir = 4 @@ -331,115 +199,25 @@ /area/hilbertshotel) "bB" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) -"bC" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet, /area/hilbertshotel) "bD" = ( /obj/structure/chair/sofa/left/maroon{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/open/floor/carpet, /area/hilbertshotel) -"bE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"bF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/stairs/medium{ - dir = 4 - }, -/area/hilbertshotel) "bG" = ( /obj/structure/mineral_door/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "bH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"bI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "bJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -453,30 +231,8 @@ dir = 4; pixel_x = -24 }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/hilbertshotel) -"bN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) -"bO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel/stairs/medium{ - dir = 1 - }, -/area/hilbertshotel) "bP" = ( /turf/open/floor/plasteel/stairs/medium{ dir = 1 @@ -552,17 +308,6 @@ dir = 1 }, /area/hilbertshotel) -"ck" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "cl" = ( /obj/structure/table/reinforced, /obj/machinery/microwave, @@ -586,14 +331,6 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) "cu" = ( @@ -640,30 +377,6 @@ }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"cC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 4 - }, -/turf/open/indestructible/hoteltile, -/area/hilbertshotel) -"cD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/indestructible/hoteltile, -/area/hilbertshotel) -"cE" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 8 - }, -/turf/open/indestructible/hoteltile, -/area/hilbertshotel) "cF" = ( /turf/closed/indestructible/hoteldoor{ icon_state = "door_closed"; @@ -680,16 +393,7 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"gQ" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/hilbertshotel) "ll" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, /turf/open/floor/plasteel/dark, /area/hilbertshotel) "lG" = ( @@ -708,14 +412,6 @@ /turf/open/floor/grass/grass0, /area/hilbertshotel) "no" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, /obj/structure/window, /obj/structure/window, /obj/structure/flora/junglebush/large, @@ -735,10 +431,6 @@ /obj/item/reagent_containers/rag/towel/syndicate, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"CL" = ( -/obj/effect/turf_decal/siding/dark/corner, -/turf/open/floor/plasteel/dark, -/area/hilbertshotel) "CV" = ( /obj/structure/pool/ladder, /obj/structure/railing/corner{ @@ -765,9 +457,6 @@ /turf/open/floor/carpet/purple, /area/hilbertshotel) "Kv" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, /obj/machinery/light_switch/directional/east, /turf/open/floor/plasteel/dark, /area/hilbertshotel) @@ -788,15 +477,6 @@ /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "TU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, @@ -874,8 +554,8 @@ ab "} (3,1,1) = {" ab -ad -au +ab +ax dk VG bd @@ -892,10 +572,10 @@ ab "} (4,1,1) = {" ab -ae -av +ab +ax Ge -aT +aD be br bA @@ -910,11 +590,11 @@ ab "} (5,1,1) = {" ab -af -aw +ab +ax no -aU -bf +aD +bB bs bB aD @@ -928,13 +608,13 @@ ab "} (6,1,1) = {" ab -ag +ab ax aH aD bg bt -bC +bB aD cc ah @@ -953,12 +633,12 @@ aD bh bu bD -bN +aD aF cj -gQ +ll bK -aY +ll cF ab "} @@ -970,11 +650,11 @@ ep Xu Xu Xu -bE +Xu Xu Os bP -CL +ll Kv ll ah @@ -1006,7 +686,7 @@ ah ah ah ah -bF +cr ah ao ah @@ -1030,7 +710,7 @@ ap ah cs ba -cC +ba ah ab "} @@ -1039,16 +719,16 @@ ab ab ah IT -ar +IT bk -aC +IT bH -bO -aG -ck +bP +Fk +ah ct ct -cD +ba ah ab "} @@ -1060,13 +740,13 @@ lG IT IT IT -bI +bH bP cd ah cu CV -cE +ba ah ab "} @@ -1077,7 +757,7 @@ ah aK aX bl -bv +IT bJ bQ Fk diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm index e88ae4b3fe..c1ae2348bd 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm @@ -4,30 +4,7 @@ /area/hilbertshotel) "ab" = ( /obj/machinery/telecomms/relay/preset/auto, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"ac" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"ad" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"ae" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"af" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/floor/plating/airless, +/turf/open/floor/catwalk_floor, /area/hilbertshotel) "ag" = ( /obj/effect/turf_decal/siding/wood{ @@ -35,35 +12,8 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"ah" = ( -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"ai" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) "aj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"ak" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plating/airless, +/turf/open/floor/catwalk_floor, /area/hilbertshotel) "am" = ( /obj/machinery/vending/kink{ @@ -75,10 +25,6 @@ /obj/machinery/door/morgue, /turf/open/indestructible/hotelwood, /area/hilbertshotel) -"ap" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, -/turf/open/floor/carpet, -/area/hilbertshotel) "aq" = ( /obj/structure/dresser, /turf/open/floor/carpet, @@ -93,28 +39,11 @@ /turf/open/floor/carpet, /area/hilbertshotel) "at" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /turf/closed/indestructible/hoteldoor{ icon_state = "door_closed"; icon = 'icons/obj/doors/puzzledoor/default.dmi' }, /area/hilbertshotel) -"aw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "ax" = ( /turf/open/floor/carpet, /area/hilbertshotel) @@ -176,14 +105,6 @@ /turf/open/indestructible/hotelwood, /area/hilbertshotel) "aO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, @@ -199,40 +120,13 @@ /obj/item/toy/plush/beeplushie, /turf/open/indestructible/hotelwood, /area/hilbertshotel) -"aS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel/stairs/medium, -/area/hilbertshotel) "aT" = ( /turf/open/floor/plasteel/stairs/right, /area/hilbertshotel) "aU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, /turf/open/floor/plasteel/stairs/left, /area/hilbertshotel) "aV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) "aW" = ( @@ -247,92 +141,22 @@ /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "aZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/mineral/plastitanium, -/area/hilbertshotel) -"ba" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "bc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/stairs/left{ dir = 8 }, /area/hilbertshotel) -"be" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "bg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/chair/sofa/middle/maroon, /turf/open/floor/carpet, /area/hilbertshotel) "bh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/structure/chair/sofa/left/maroon, /turf/open/floor/carpet, /area/hilbertshotel) -"bi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/hilbertshotel) "bk" = ( /obj/structure/chair/sofa/left/maroon{ dir = 4 @@ -464,12 +288,6 @@ /turf/open/floor/grass/grass0, /area/hilbertshotel) "gc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -485,9 +303,6 @@ /area/hilbertshotel) "kt" = ( /obj/structure/table/wood, -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 1 - }, /obj/item/storage/fancy/candle_box{ pixel_x = 4 }, @@ -513,9 +328,6 @@ /area/hilbertshotel) "lm" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 4 - }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -526,9 +338,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 1 - }, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, @@ -546,27 +355,10 @@ }, /turf/open/indestructible/hotelwood, /area/hilbertshotel) -"ob" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/turf/open/indestructible/hotelwood, -/area/hilbertshotel) "oY" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 1 - }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "qh" = ( @@ -580,12 +372,6 @@ /obj/structure/flora/junglebush, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"sT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "wX" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck, @@ -704,15 +490,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) -"VJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "Xr" = ( /obj/structure/sign/poster/contraband/random, /turf/closed/indestructible/wall, @@ -722,7 +499,6 @@ /area/hilbertshotel) "XQ" = ( /obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /obj/effect/turf_decal/siding/wood{ dir = 5 }, @@ -741,43 +517,17 @@ /turf/open/indestructible/hotelwood, /area/hilbertshotel) "Yw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/chair/sofa/right/maroon, /obj/item/choice_beacon/box/plushie, /turf/open/floor/carpet, /area/hilbertshotel) "YE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "YK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, @@ -812,7 +562,7 @@ aa (2,1,1) = {" aa ab -ah +aj XP XP Xr @@ -829,9 +579,9 @@ aa "} (3,1,1) = {" aa -ac -ai -VJ +aj +aj +XP oY Vu Vu @@ -847,13 +597,13 @@ aa "} (4,1,1) = {" aa -ad +aj aj at aV aV aV -aS +TK aV aZ XP @@ -865,15 +615,15 @@ aa "} (5,1,1) = {" aa -ae -ak -sT +aj +aj +XP mf KM PJ TK az -ba +aZ XP bq bx @@ -883,8 +633,8 @@ aa "} (6,1,1) = {" aa -af -ah +aj +aj XP XP XP @@ -927,7 +677,7 @@ aJ xS XP Ka -be +ax bk bu ax @@ -974,10 +724,10 @@ aa (11,1,1) = {" aa XP -ap -aw -aw -ob +ax +ax +ax +aL aO aU YE @@ -999,7 +749,7 @@ aL aP aT aX -bi +ax bn bv ax diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm index 6fce651362..8d4ec234f8 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm @@ -11,16 +11,6 @@ dir = 4 }, /obj/structure/chair/pew, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"aV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "aY" = ( @@ -35,20 +25,15 @@ /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) "bi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/door/window/southright{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "bt" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "bI" = ( @@ -90,55 +75,20 @@ pixel_y = 6; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "dQ" = ( /obj/machinery/telecomms/relay/preset/auto, /turf/open/floor/catwalk_floor, /area/hilbertshotel) -"ee" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) -"eg" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "eH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/mineral_door/transparent, /turf/open/floor/pod/dark, /area/hilbertshotel) -"eN" = ( -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, -/turf/open/floor/festive/alleyway/safe, -/area/hilbertshotel) -"eO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "fq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/red, /area/hilbertshotel) "fr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/fans/tiny/invisible, /turf/open/floor/wood/mushroom, /area/hilbertshotel) @@ -158,55 +108,22 @@ /obj/structure/mineral_door/wood, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"hy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/festive/white_alleyway{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, -/area/hilbertshotel) "id" = ( /obj/structure/table, /turf/open/floor/pod/light, /area/hilbertshotel) -"in" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "ix" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "jC" = ( /obj/structure/falsewall{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"kd" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3{ - dir = 1 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "kg" = ( /obj/structure/closet/crate/bin, /turf/open/floor/carpet/red, @@ -215,7 +132,6 @@ /obj/structure/fireplace{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "kz" = ( @@ -237,19 +153,6 @@ /obj/effect/decal/cleanable/ash, /turf/open/floor/festive/alleyway/safe, /area/hilbertshotel) -"mk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/effect/turf_decal/siding{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"mH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "nA" = ( /obj/structure/window/reinforced/tinted/frosted, /obj/structure/reagent_dispensers/watertank, @@ -259,15 +162,9 @@ /turf/open/floor/festive/alleyway/safe, /area/hilbertshotel) "nH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "oa" = ( @@ -275,26 +172,6 @@ light_color = "#f27d0c"; color = "FFB43A" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"oK" = ( -/obj/structure/table, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 1 - }, -/turf/open/floor/pod/light, -/area/hilbertshotel) -"pp" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "pu" = ( @@ -309,12 +186,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/siding{ dir = 4 }, @@ -330,60 +201,14 @@ /obj/structure/closet/cabinet{ pixel_x = -6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"rz" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_x = 29 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/festive/alleyway/safe, -/area/hilbertshotel) -"rN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/indestructible/wall, -/area/hilbertshotel) -"sm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, -/turf/open/floor/wood/mushroom, -/area/hilbertshotel) "sp" = ( /obj/machinery/door/window/eastleft{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"sr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) -"su" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/festive/white_alleyway{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, -/area/hilbertshotel) "sU" = ( /obj/machinery/light_switch/directional/south, /turf/open/floor/wood/mushroom, @@ -405,8 +230,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "tQ" = ( @@ -428,14 +251,7 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"wk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "ww" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/chair/pew/left, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) @@ -454,8 +270,6 @@ /area/hilbertshotel) "xt" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/machinery/meter, /turf/open/space/bluespace, /area/hilbertshotel) "yc" = ( @@ -463,14 +277,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "yJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, /obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, @@ -480,12 +289,6 @@ /obj/structure/window/reinforced/tinted/frosted, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"zb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/carpet/royalblack, -/area/hilbertshotel) "Am" = ( /obj/machinery/button{ pixel_y = 26; @@ -508,43 +311,18 @@ /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) "AI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/festive/white_alleyway{ initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" }, /area/hilbertshotel) -"AZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/wood/mushroom, -/area/hilbertshotel) "Cf" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"Cp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "CD" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /turf/open/floor/pod/light, /area/hilbertshotel) "Dd" = ( @@ -558,24 +336,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"DY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) -"En" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "Ex" = ( /turf/closed/indestructible/hoteldoor{ icon_state = "door_closed"; @@ -586,7 +346,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /obj/structure/closet/crate/wooden, /obj/item/stack/sheet/mineral/wood/fifty, /turf/open/floor/wood/wood_tiled, @@ -602,10 +361,6 @@ "Fi" = ( /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"Fp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "Ft" = ( /obj/structure/toilet{ dir = 4 @@ -628,12 +383,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "Gm" = ( @@ -674,49 +423,14 @@ /obj/machinery/vending/coffee{ shut_up = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /turf/open/floor/festive/alleyway/safe, /area/hilbertshotel) -"Jl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/turf/open/floor/carpet/royalblack, -/area/hilbertshotel) "Jy" = ( /obj/structure/bed/double, /obj/item/bedsheet/black/double, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"JT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, -/turf/open/floor/festive/white_alleyway{ - initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15" - }, -/area/hilbertshotel) -"Kv" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) -"Lh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "Lp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/item/newspaper{ pixel_x = 4 }, @@ -735,7 +449,6 @@ pixel_x = -5; pixel_y = 14 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/pod/light, /area/hilbertshotel) "MR" = ( @@ -744,30 +457,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"MY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"Nr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, -/obj/effect/turf_decal/siding{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"Nx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/pod/dark, -/area/hilbertshotel) "Oc" = ( /obj/machinery/vending/kink{ onstation = 0; @@ -802,12 +491,6 @@ }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"OP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/hilbertshotel) "OY" = ( /obj/machinery/jukebox{ req_one_access = null; @@ -833,9 +516,6 @@ pixel_y = -35; id = "elevator" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, /turf/open/floor/pod/dark, /area/hilbertshotel) "Ql" = ( @@ -846,24 +526,9 @@ /area/hilbertshotel) "Qt" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"QA" = ( -/obj/effect/decal/cleanable/blood/tracks{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/pod/light, -/area/hilbertshotel) "Rb" = ( -/obj/structure/table, /obj/item/pizzabox/margherita{ pixel_y = 11 }, @@ -871,18 +536,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"Rz" = ( -/obj/structure/mineral_door/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "RP" = ( /obj/machinery/vending/cigarette{ shut_up = 1 @@ -891,7 +546,6 @@ /area/hilbertshotel) "Si" = ( /obj/structure/dresser, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "Sx" = ( @@ -911,12 +565,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/festive/alleyway/safe, /area/hilbertshotel) -"SW" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "SZ" = ( /obj/structure/closet/crate/bin{ pixel_x = 9 @@ -1009,18 +657,6 @@ /obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/sandal, /obj/structure/closet/crate/wooden, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - external_pressure_bound = 140; - name = "killroom vent"; - pressure_checks = 0 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"VH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "VY" = ( @@ -1052,24 +688,6 @@ }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"WX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) -"Xi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "XI" = ( /obj/structure/rack, /obj/machinery/light_switch/directional/north, @@ -1080,17 +698,8 @@ dir = 4; pixel_x = -3 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"YU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "Zg" = ( /turf/closed/indestructible/wall, /area/hilbertshotel) @@ -1098,8 +707,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) @@ -1136,43 +743,43 @@ md RP Jk Wp -eN +SH Zg "} (3,1,1) = {" Zg MJ CD -oK +id Zg OE kz -Nx +kz eH -su -su -su -hy AI -JT +AI +AI +AI +AI +AI Zg "} (4,1,1) = {" Zg id -QA +CD VY Zg kz kz -OP +kz Zg Am bI SZ Lp nF -rz +bI Zg "} (5,1,1) = {" @@ -1188,9 +795,9 @@ Zg Zg Zg Zg -Rz +gj +Zg Zg -ee Zg "} (6,1,1) = {" @@ -1208,15 +815,15 @@ Zg XI fq kg -ee +Zg dQ "} (7,1,1) = {" Zg dx -Jl +Fi Qt -rN +Zg ZG tA yc @@ -1224,15 +831,15 @@ Gk rk Zg Vi -pp bt -SW -kd +bt +Zg +xt "} (8,1,1) = {" Zg Si -zb +Fi Fi gj bU @@ -1242,10 +849,10 @@ Rb lR Zg EV -VH +bU bU Zg -Kv +xt "} (9,1,1) = {" Zg @@ -1260,9 +867,9 @@ Cf bU Zg IJ -Xi +bU tQ -mH +Zg xt "} (10,1,1) = {" @@ -1281,7 +888,7 @@ Zg Uv Zg Zg -eg +xt "} (11,1,1) = {" Zg @@ -1292,11 +899,11 @@ Zg Zg vv ki -VH -MY +bU +bU Ti TE -WX +bU bU Zg Zg @@ -1310,11 +917,11 @@ cV Zg Zg Zg -aV -wk -Fp -Fp -En +bU +bU +bU +bU +bU bU IJ Zg @@ -1329,10 +936,10 @@ Zg Ft Zg rj -mk -mk -mk -Nr +Ul +Ul +Ul +Ul Ul Tw Zg @@ -1359,13 +966,13 @@ Zg Zg Gi fr -AZ -sm +Dd +Dd tR bU -MY +bU nH -YU +bU aY Au fB @@ -1376,14 +983,14 @@ Zg (16,1,1) = {" Zg Zg -eO -in -Lh -rN -rN -sr -DY -Cp +Zg +Zg +Zg +Zg +Zg +Zg +Zg +Zg Zg Zg Zg diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_bar.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_bar.dmm index 74202784bc..09514f3323 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_bar.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_bar.dmm @@ -19,15 +19,6 @@ "ee" = ( /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"eG" = ( -/obj/structure/table/wood/poker, -/obj/structure/table/wood/poker, -/obj/item/toy/cards/deck, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/carpet/royalblack, -/area/hilbertshotel) "fo" = ( /obj/machinery/vending/boozeomat{ shut_up = 1 @@ -35,29 +26,32 @@ /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "hi" = ( -/obj/structure/table/wood/poker, -/turf/open/floor/carpet/royalblack, -/area/hilbertshotel) -"jj" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"kr" = ( /obj/structure/chair/stool/bar{ dir = 1 }, +/turf/open/floor/carpet/royalblack, +/area/hilbertshotel) +"jj" = ( +/obj/structure/mirror, +/turf/closed/indestructible/wall, +/area/hilbertshotel) +"kp" = ( +/obj/structure/table/wood, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet/royalblack, +/area/hilbertshotel) +"kr" = ( /obj/effect/turf_decal/siding/wood, +/obj/structure/chair/stool/bar{ + dir = 1 + }, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "kB" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/structure/table/wood/poker/shadow, +/obj/item/toy/cards/deck, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "kC" = ( @@ -92,13 +86,6 @@ /obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"ln" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/plating/airless, -/area/hilbertshotel) "lS" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/fullupgrade{ @@ -111,15 +98,8 @@ /turf/open/indestructible/hoteltile, /area/hilbertshotel) "nj" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/structure/table/wood/poker/shadow, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "oH" = ( @@ -133,12 +113,6 @@ /obj/structure/chair/stool/bar, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"pv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "qn" = ( /obj/machinery/light{ dir = 1 @@ -146,21 +120,11 @@ /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "qQ" = ( -/obj/structure/table/wood/poker, -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +/obj/structure/table/wood/poker/shadow, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) -"sk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, +"rY" = ( +/obj/structure/sign/poster/random, /turf/closed/indestructible/wall, /area/hilbertshotel) "sm" = ( @@ -185,10 +149,8 @@ /turf/open/indestructible/hoteltile, /area/hilbertshotel) "tx" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 +/obj/machinery/door/window/survival_pod{ + dir = 4 }, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) @@ -207,17 +169,14 @@ /area/hilbertshotel) "vU" = ( /obj/machinery/telecomms/relay/preset/auto, -/turf/open/floor/plating/airless, +/turf/open/floor/catwalk_floor, /area/hilbertshotel) "vW" = ( /obj/structure/table/wood, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "wB" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, +/obj/machinery/computer/slot_machine, /turf/open/floor/carpet/royalblack, /area/hilbertshotel) "xI" = ( @@ -233,22 +192,12 @@ "yz" = ( /turf/open/floor/glass/reinforced, /area/hilbertshotel) -"Ae" = ( -/obj/structure/urinal, -/turf/closed/indestructible/wall, -/area/hilbertshotel) "BL" = ( /obj/machinery/light{ dir = 8 }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"Ce" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/hilbertshotel) "DV" = ( /obj/machinery/light{ dir = 1 @@ -327,26 +276,6 @@ }, /turf/open/floor/carpet/black, /area/hilbertshotel) -"Jy" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3, -/turf/open/floor/plating/airless, -/area/hilbertshotel) -"LE" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/carpet/royalblack, -/area/hilbertshotel) -"Mk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/open/floor/carpet/royalblack, -/area/hilbertshotel) "Mr" = ( /obj/machinery/light{ dir = 1 @@ -399,10 +328,8 @@ /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "RL" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/turf/open/floor/plating/airless, +/obj/structure/lattice, +/turf/open/space/bluespace, /area/hilbertshotel) "SW" = ( /obj/structure/sign/poster/contraband/random, @@ -441,9 +368,6 @@ /obj/machinery/vending/snack/orange{ shut_up = 1 }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, /turf/open/floor/carpet/black, /area/hilbertshotel) "Wg" = ( @@ -456,12 +380,6 @@ /obj/structure/table, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"Xq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/hilbertshotel) "Xr" = ( /turf/open/space/bluespace, /area/hilbertshotel) @@ -502,29 +420,29 @@ Xr Xr ZE ZE -ZE +SW ZE ZE ZE kQ ZE ZE +rY ZE -ZE -ZE +SW ZE Xr "} (3,1,1) = {" Xr vU -ZE +rY ee ee -ee -sm +pr +nj Wg -cK +yz cK dR TA @@ -535,13 +453,13 @@ Xr "} (4,1,1) = {" Xr -Jy -sk +RL +ZE tx kB qQ nj -Ce +cK yz cK dR @@ -556,7 +474,7 @@ Xr RL SW qn -pr +hi hi kr cK @@ -566,18 +484,18 @@ dR dy af oH -ZE +rY Xr "} (6,1,1) = {" Xr -ln -pv -Mk -wB -eG -LE -Xq +RL +ZE +ee +ee +ee +sm +cK yz cK dR @@ -589,10 +507,10 @@ Xr "} (7,1,1) = {" Xr -jj -ZE -ee -ee +RL +rY +wB +hi ee sm cK @@ -609,7 +527,7 @@ Xr Xr Xr ZE -Ae +ZE ZE ZE ZE @@ -620,13 +538,13 @@ EI UR UR QE -ZE +rY Xr "} (9,1,1) = {" Xr Xr -ZE +jj sU BL GV @@ -644,7 +562,7 @@ Xr (10,1,1) = {" Xr Xr -ZE +jj sU lT GV @@ -655,7 +573,7 @@ yz yz yz yz -cK +yz ZE Xr "} @@ -663,8 +581,8 @@ Xr Xr Xr ZE -Ae ZE +SW GV ZE We @@ -685,14 +603,14 @@ DV te GV ZE -ZE +rY ut sY Hs FA sY Zn -ZE +SW Xr "} (13,1,1) = {" @@ -721,14 +639,14 @@ DV te GV WO -ZE +SW Fz -kC +kp Hy Mz kC OA -ZE +rY Xr "} (15,1,1) = {" @@ -737,11 +655,11 @@ Xr ZE ZE ZE +rY ZE ZE ZE -ZE -ZE +rY ZE ZE ZE diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm index 348bc92bcc..8cef0a32bc 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm @@ -21,28 +21,15 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"eg" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/biolumi/flower, -/turf/open/floor/grass/grass0, -/area/hilbertshotel) "fz" = ( /obj/machinery/telecomms/relay/preset/auto, /turf/open/floor/catwalk_floor, /area/hilbertshotel) "gj" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/space/bluespace, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/biolumi/flower, +/turf/open/floor/grass/grass0, /area/hilbertshotel) "gm" = ( /obj/structure/lattice, @@ -61,7 +48,6 @@ /turf/open/floor/grass/grass0, /area/hilbertshotel) "hY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/chair/pew/left{ dir = 1 }, @@ -119,15 +105,6 @@ /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"mO" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/biolumi, -/turf/open/floor/grass/grass0, -/area/hilbertshotel) "mQ" = ( /obj/structure/chair/pew/left, /turf/open/floor/wood/wood_tiled, @@ -139,11 +116,6 @@ /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"om" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/candle/infinite, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "oy" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ppflowers, @@ -183,8 +155,7 @@ "th" = ( /obj/structure/flora/tree/jungle{ pixel_x = -31; - pixel_y = 0; - light_range = 1 + pixel_y = 0 }, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ppflowers, @@ -208,21 +179,11 @@ /turf/open/floor/grass/grass0, /area/hilbertshotel) "uD" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/biolumi/mine, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"uP" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/space/bluespace, -/area/hilbertshotel) "uV" = ( /obj/structure/spacevine, /obj/structure/flora/ausbushes/brflowers, @@ -250,15 +211,11 @@ /area/hilbertshotel) "wc" = ( /obj/structure/flora/rock, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass/grass0, /area/hilbertshotel) "wF" = ( /obj/structure/flora/ausbushes/ywflowers, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/grass/grass0, /area/hilbertshotel) "wK" = ( @@ -267,8 +224,11 @@ /turf/open/floor/grass/grass0, /area/hilbertshotel) "zi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood/wood_tiled, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/biolumi/flower, +/turf/open/floor/grass/grass0, /area/hilbertshotel) "zn" = ( /obj/structure/spacevine, @@ -284,6 +244,7 @@ "Aq" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/biolumi/flower, /turf/open/floor/grass/grass0, /area/hilbertshotel) "AB" = ( @@ -317,15 +278,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"CI" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass/grass0, -/area/hilbertshotel) "Dd" = ( /obj/structure/spacevine, /obj/structure/flora/ausbushes/ywflowers, @@ -352,13 +304,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/closed/indestructible/wood, /area/hilbertshotel) -"FO" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3{ - dir = 1 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "FZ" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/biolumi/flower, @@ -380,7 +325,6 @@ /area/hilbertshotel) "Kc" = ( /obj/structure/flora/rock, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/grass0, @@ -394,17 +338,6 @@ /obj/structure/flora/biolumi/mine, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"Ll" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, -/obj/structure/spacevine, -/obj/structure/flora/ausbushes/ppflowers, -/turf/closed/indestructible/wood, -/area/hilbertshotel) "Lm" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -413,13 +346,6 @@ /obj/structure/flora/biolumi/flower, /turf/open/floor/grass/grass0, /area/hilbertshotel) -"LD" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "Mo" = ( /obj/structure/spacevine, /turf/closed/indestructible/wood, @@ -439,7 +365,6 @@ /area/hilbertshotel) "Ox" = ( /obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/brflowers, @@ -531,9 +456,6 @@ /area/hilbertshotel) "WY" = ( /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/biolumi, @@ -679,15 +601,15 @@ oy mQ GQ tY -Qc +qX Cm Qc Kc -zi -om +tY +GQ hY Ox -CI +Ve uV "} (8,1,1) = {" @@ -698,14 +620,14 @@ Gj Kj tY Qc -qq +gj th -vA +zi tY Kj dn RE -uD +Qc Dd "} (9,1,1) = {" @@ -715,7 +637,7 @@ Qc Gj Kj tY -Qc +DQ qq Ve Xj @@ -735,13 +657,13 @@ GQ tY Aq Qc -wK +uD Qc tY GQ zX qq -mO +Hx bg "} (11,1,1) = {" @@ -777,7 +699,7 @@ tY tY aA kq -uD +Qc bg "} (13,1,1) = {" @@ -795,7 +717,7 @@ tY mR kq wc -eg +qX zn "} (14,1,1) = {" @@ -813,8 +735,8 @@ Qc Ve up vA -Ll -FO +bg +gm "} (15,1,1) = {" gm @@ -831,7 +753,7 @@ OU DH vA bg -LD +gm fz "} (16,1,1) = {" @@ -848,7 +770,7 @@ Ep zn Dd Ep -gj -uP -gj +gm +gm +gm "} diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm index 0ac99a1359..6a80b5b493 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm @@ -1,7 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aN" = ( /obj/structure/dresser, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /obj/machinery/light_switch/directional/east, /turf/open/floor/carpet/red, /area/hilbertshotel) @@ -12,55 +11,14 @@ /obj/structure/sign/painting/library{ pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"bA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/open/floor/plasteel/white, -/area/hilbertshotel) -"bG" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) -"cm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/carpet/red, -/area/hilbertshotel) -"cO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/white, -/area/hilbertshotel) "dm" = ( /obj/effect/turf_decal/trimline/white/filled/end{ dir = 4 }, /turf/open/pool, /area/hilbertshotel) -"eb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/hilbertshotel) -"ed" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) "fb" = ( /obj/structure/table/wood, /obj/item/pizzabox/margherita{ @@ -79,16 +37,12 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 1 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "fy" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "fG" = ( @@ -101,9 +55,6 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "fW" = ( @@ -113,7 +64,6 @@ "gP" = ( /obj/structure/table/glass, /obj/structure/bedsheetbin/towel, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /turf/open/floor/plasteel/white, /area/hilbertshotel) "gS" = ( @@ -123,7 +73,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "gV" = ( @@ -133,27 +82,9 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"gZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/white, -/area/hilbertshotel) -"hr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/closed/indestructible/wood, -/area/hilbertshotel) "hw" = ( /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"hG" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) "hJ" = ( /turf/open/floor/wood, /area/hilbertshotel) @@ -165,7 +96,6 @@ dir = 8; light_color = "#e8eaff" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "iJ" = ( @@ -179,9 +109,6 @@ /obj/structure/sign/poster/contraband/random{ pixel_x = -31 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /turf/open/floor/wood, /area/hilbertshotel) "jP" = ( @@ -198,25 +125,14 @@ name = "Changing Room"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/hilbertshotel) "kd" = ( /obj/structure/pool/Rboard, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /turf/open/floor/plasteel/white, /area/hilbertshotel) "ki" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/machinery/meter, /turf/open/space/bluespace, /area/hilbertshotel) "ly" = ( @@ -225,15 +141,6 @@ /obj/item/lighter/gold, /turf/open/floor/carpet/red, /area/hilbertshotel) -"lz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/wood, -/area/hilbertshotel) "mc" = ( /obj/machinery/pool/controller, /obj/structure/railing{ @@ -257,15 +164,6 @@ }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) -"nK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/white, -/area/hilbertshotel) "oz" = ( /obj/structure/railing{ dir = 8 @@ -281,7 +179,6 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /turf/open/floor/wood, /area/hilbertshotel) "pw" = ( @@ -289,12 +186,6 @@ name = "Changing Room"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood, /area/hilbertshotel) "pE" = ( @@ -304,7 +195,6 @@ /obj/structure/sign/painting/library{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "qi" = ( @@ -333,12 +223,6 @@ name = "Changing Room"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/hilbertshotel) "tB" = ( @@ -353,7 +237,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "tS" = ( @@ -389,7 +272,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/light_switch/directional/east, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) @@ -397,9 +279,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /turf/open/floor/wood, /area/hilbertshotel) "vL" = ( @@ -418,13 +297,6 @@ }, /turf/open/pool, /area/hilbertshotel) -"vT" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3{ - dir = 1 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "wy" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -432,7 +304,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "wD" = ( @@ -452,12 +323,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "xD" = ( @@ -471,20 +336,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light_switch/directional/west, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"zr" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) "zw" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -495,15 +349,6 @@ "zJ" = ( /turf/open/floor/plasteel/white, /area/hilbertshotel) -"zR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/hilbertshotel) "Aq" = ( /obj/structure/chair/pew/left{ dir = 4 @@ -516,20 +361,10 @@ }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"Bo" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "BQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/vending/kink{ onstation = 0; shut_up = 1 @@ -568,9 +403,6 @@ /obj/structure/chair/pew{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "DO" = ( @@ -579,16 +411,8 @@ dir = 4; light_color = "#c1caff" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /turf/open/floor/plasteel/white, /area/hilbertshotel) -"EJ" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) "EW" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 1 @@ -634,24 +458,6 @@ }, /turf/open/floor/plasteel/white, /area/hilbertshotel) -"Kc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/hilbertshotel) -"Kg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/hilbertshotel) "Kq" = ( /obj/effect/turf_decal/trimline/white/filled/line, /obj/effect/turf_decal/trimline/white/filled/corner{ @@ -661,19 +467,6 @@ /area/hilbertshotel) "Kt" = ( /obj/structure/falsewall/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet/royalblue, -/area/hilbertshotel) -"Kx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "Kz" = ( @@ -683,12 +476,6 @@ /obj/item/toy/poolnoodle/blue, /turf/open/floor/wood, /area/hilbertshotel) -"KG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "KL" = ( /obj/structure/closet/secure_closet/personal, /obj/structure/window/reinforced/tinted/frosted{ @@ -699,10 +486,6 @@ }, /turf/open/floor/wood, /area/hilbertshotel) -"LC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/indestructible/wood, -/area/hilbertshotel) "LP" = ( /obj/machinery/vending/cigarette{ shut_up = 1 @@ -712,30 +495,14 @@ }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) -"LU" = ( -/obj/structure/window/reinforced/tinted/frosted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "Ml" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 29 }, /obj/structure/bed/double, /obj/item/bedsheet/random/double, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, /turf/open/floor/carpet/red, /area/hilbertshotel) -"MS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "MT" = ( /obj/machinery/jukebox{ req_one_access = null; @@ -755,14 +522,12 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "NG" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "Op" = ( @@ -813,24 +578,13 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "PD" = ( /turf/open/floor/carpet/red, /area/hilbertshotel) -"Qh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/white, -/area/hilbertshotel) "QM" = ( /obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "QS" = ( @@ -839,12 +593,10 @@ }, /obj/structure/table, /obj/structure/bedsheetbin/towel, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/hilbertshotel) "Rt" = ( /obj/structure/bookcase/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, /area/hilbertshotel) "Rz" = ( @@ -857,13 +609,6 @@ }, /turf/open/floor/plasteel/white, /area/hilbertshotel) -"RZ" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/turf/open/space/bluespace, -/area/hilbertshotel) "Si" = ( /obj/machinery/telecomms/relay/preset/auto, /turf/open/floor/catwalk_floor, @@ -874,11 +619,6 @@ }, /turf/open/pool, /area/hilbertshotel) -"Tn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/table/bronze, -/turf/open/floor/wood/wood_tiled, -/area/hilbertshotel) "Tp" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/white, @@ -888,12 +628,6 @@ name = "Changing Room"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/wood, /area/hilbertshotel) "Ur" = ( @@ -901,7 +635,6 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, /area/hilbertshotel) "UJ" = ( @@ -911,9 +644,6 @@ pixel_y = 7 }, /obj/structure/closet/crate/wooden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, /turf/open/floor/plasteel/white, /area/hilbertshotel) "UR" = ( @@ -924,7 +654,6 @@ /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "Vk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/bronze, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) @@ -932,30 +661,15 @@ /obj/structure/chair/pew{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /turf/open/floor/wood/wood_tiled, /area/hilbertshotel) "WQ" = ( /obj/machinery/pool/drain, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/white, /area/hilbertshotel) "XH" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "Ym" = ( @@ -1008,7 +722,7 @@ OE (3,1,1) = {" OE tS -eb +hJ hJ OE gV @@ -1026,7 +740,7 @@ OE (4,1,1) = {" OE KL -eb +hJ tB OE vL @@ -1044,7 +758,7 @@ OE (5,1,1) = {" OE KL -eb +hJ hJ OE vL @@ -1062,14 +776,14 @@ OE (6,1,1) = {" OE oR -zR +hJ CY OE vL Zm OE DO -Kc +zJ fW HN fW @@ -1099,16 +813,16 @@ OE OE zw xC -ed +xC ix ND fH -ed +xC xU -bG -ed +xC +xC bd -ed +xC Kt BQ OE @@ -1116,18 +830,18 @@ OE (9,1,1) = {" OE OW -Kx +Pn pE Pn fy QM wy ut -zr +Pn Pn wy Pn -hr +OE fo OE "} @@ -1138,7 +852,7 @@ TH OE OE UR -hG +Zm OE OE jX @@ -1152,14 +866,14 @@ OE (11,1,1) = {" OE Rt -lz +hJ qm OE Op -hG +Zm OE -gZ -cO +zJ +zJ zJ jP Dt @@ -1174,21 +888,21 @@ uG fb OE LP -hG +Zm OE Gm -Kg -bA -LU -KG -Tn -hr -vT +zJ +zJ +NG +hw +Vk +OE +ki "} (13,1,1) = {" OE CZ -cm +PD ly OE gS @@ -1201,24 +915,24 @@ nJ qi hw OE -RZ +ki "} (14,1,1) = {" OE PD -cm +PD MT OE tF -EJ +Zm OE Gm -nK -Qh +zJ +zJ NG -MS +hw Vk -LC +OE ki "} (15,1,1) = {" @@ -1237,7 +951,7 @@ EW Wj qv OE -Bo +ki "} (16,1,1) = {" OE diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm index 74c041dce7..d515121031 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm @@ -21,13 +21,6 @@ dir = 9 }, /obj/machinery/door/morgue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) "bV" = ( @@ -42,7 +35,6 @@ /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) "ch" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /obj/structure/sink/kitchen, /turf/open/indestructible/hoteltile, /area/hilbertshotel) @@ -50,7 +42,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) "cC" = ( @@ -68,13 +59,6 @@ dir = 1 }, /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /obj/item/dildo/flared/gigantic, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) @@ -103,31 +87,16 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "fE" = ( /turf/open/floor/carpet/red, /area/hilbertshotel) -"fR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/carpet/red, -/area/hilbertshotel) "gd" = ( /obj/structure/window/reinforced/tinted{ dir = 1 }, /obj/structure/table, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, /obj/item/restraints/handcuffs/fake, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) @@ -147,12 +116,6 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) -"ht" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/hilbertshotel) "hx" = ( /obj/structure/chair{ dir = 8 @@ -179,15 +142,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"hZ" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/hilbertshotel) "jf" = ( /obj/structure/closet/cabinet, /obj/machinery/light{ @@ -199,26 +153,8 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) -"jy" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/obj/structure/lattice, -/turf/open/space/basic, -/area/hilbertshotel) -"jB" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/hilbertshotel) "lN" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -226,12 +162,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "mf" = ( @@ -251,9 +181,6 @@ dir = 4; layer = 2.2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /turf/open/floor/plating/smooth/grass/lavaland_jungle, /area/hilbertshotel) "mN" = ( @@ -274,9 +201,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -288,7 +212,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "oi" = ( @@ -297,12 +220,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) -"op" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/indestructible/hoteltile, -/area/hilbertshotel) "oU" = ( /obj/structure/sink/kitchen{ pixel_y = 28 @@ -317,10 +234,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "pH" = ( @@ -340,30 +253,14 @@ }, /turf/open/floor/carpet/red, /area/hilbertshotel) -"ry" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/hilbertshotel) "rz" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "rE" = ( /obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) "rF" = ( @@ -399,15 +296,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4; - piping_layer = 3; - pixel_x = 5; - pixel_y = 5 - }, /obj/machinery/light{ dir = 4 }, @@ -415,10 +303,6 @@ /area/hilbertshotel) "tZ" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/item/electropack/vibrator/small, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) @@ -428,29 +312,9 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) -"uy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/cafeteria, -/area/hilbertshotel) -"uB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/hilbertshotel) "uN" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3, /obj/structure/lattice, -/turf/open/space/basic, -/area/hilbertshotel) -"vs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/carpet/red, +/turf/open/space/bluespace, /area/hilbertshotel) "wg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -471,13 +335,6 @@ dir = 1 }, /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /obj/item/electropack/vibrator, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) @@ -504,16 +361,9 @@ /turf/open/floor/grass/grass0, /area/hilbertshotel) "xP" = ( -/obj/structure/sign/poster/random, +/obj/structure/sign/poster/contraband/random, /turf/closed/indestructible/syndicate, /area/hilbertshotel) -"xT" = ( -/obj/machinery/door/morgue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium/red, -/area/hilbertshotel) "zd" = ( /turf/open/space/bluespace, /area/hilbertshotel) @@ -533,11 +383,6 @@ }, /turf/open/floor/plating/smooth/grass/lavaland_jungle, /area/hilbertshotel) -"Ax" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/sign/poster/random, -/turf/closed/indestructible/syndicate, -/area/hilbertshotel) "AT" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4; @@ -562,63 +407,26 @@ /obj/structure/toilet{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"Cw" = ( -/obj/machinery/door/morgue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/mineral/plastitanium/red, -/area/hilbertshotel) "Cz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 8 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) "CS" = ( /obj/structure/sign/poster/contraband/syndicate_recruitment, /turf/closed/indestructible/syndicate, /area/hilbertshotel) -"DB" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/hilbertshotel) "Et" = ( /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) -"Fp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/carpet/red, -/area/hilbertshotel) "Fs" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) "GT" = ( @@ -626,30 +434,12 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "Ir" = ( /obj/machinery/door/morgue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) -"IF" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/hilbertshotel) "IN" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -659,38 +449,17 @@ /area/hilbertshotel) "IX" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, /obj/item/restraints/handcuffs/fake/kinky, /turf/open/floor/mineral/titanium/tiled/white, /area/hilbertshotel) -"JH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/mineral/plastitanium/red, -/area/hilbertshotel) "Kn" = ( /obj/structure/table/wood, /turf/open/floor/carpet/red, /area/hilbertshotel) "Kx" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) -"KA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/closed/indestructible/syndicate, -/area/hilbertshotel) "Mf" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -698,10 +467,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/light{ dir = 4 }, @@ -709,10 +474,6 @@ /area/hilbertshotel) "Nt" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, /obj/structure/showcase/machinery/tv, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) @@ -721,13 +482,6 @@ /turf/open/floor/catwalk_floor, /area/hilbertshotel) "Nz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4; - piping_layer = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /turf/open/indestructible/hoteltile, /area/hilbertshotel) "NN" = ( @@ -743,27 +497,9 @@ /obj/machinery/door/morgue, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) -"Qn" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4; - layer = 2.2 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - layer = 2.2 - }, -/turf/open/floor/plating/smooth/grass/lavaland_jungle, -/area/hilbertshotel) "QM" = ( /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) -"RM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/turf/closed/indestructible/syndicate, -/area/hilbertshotel) "So" = ( /turf/closed/indestructible/hoteldoor{ icon_state = "door_closed"; @@ -820,23 +556,12 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "XB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/table/reinforced, /turf/open/floor/mineral/plastitanium/red, /area/hilbertshotel) -"XF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/closed/indestructible/syndicate, -/area/hilbertshotel) "Yn" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -845,9 +570,6 @@ dir = 1 }, /obj/machinery/light_switch/directional/north, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 4 - }, /turf/open/floor/mineral/plastitanium, /area/hilbertshotel) "YA" = ( @@ -865,12 +587,6 @@ dir = 4; layer = 2.2 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, /obj/effect/turf_decal/siding/wood{ dir = 8; layer = 2.2 @@ -929,14 +645,14 @@ zd "} (3,1,1) = {" zd -TL +xP hB oi bk TL fE as -xP +TL rF wC xo @@ -967,7 +683,7 @@ zd zd TL bV -uy +bk pH TL fE @@ -976,23 +692,23 @@ TL YA qJ Ti -fR +fE fE xP zd "} (6,1,1) = {" zd -TL +xP ah XB -JH -Cw -Fp +ah +Op +fE fE Op mN -Qn +mN YS my AT @@ -1006,7 +722,7 @@ ub ub ah TL -vs +fE fE TL TL @@ -1022,13 +738,13 @@ zd TL Bj eK -ry +ah Al -vs +fE pn CS gY -op +Nz Nz TL Ao @@ -1037,12 +753,12 @@ zd "} (9,1,1) = {" zd -TL +xP hx hx -ht +ah TL -vs +fE fE TL ch @@ -1058,9 +774,9 @@ zd TL TL TL -KA TL -xT +TL +Op Op TL TL @@ -1080,11 +796,11 @@ Yn mR rz qA -uB +ah ah bK zs -hZ +zs eT TL zd @@ -1093,12 +809,12 @@ zd zd zd uN -Ax +xP GT Kx jp Zk -ht +ah ah dx cm @@ -1110,8 +826,8 @@ zd (13,1,1) = {" zd zd -DB -XF +uN +TL nk Nt jp @@ -1128,11 +844,11 @@ zd (14,1,1) = {" zd zd -jy -RM +uN +TL lN Mf -IF +ps ps sX Un @@ -1146,7 +862,7 @@ zd (15,1,1) = {" zd zd -jB +uN TL xP TL diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 811b420c9e..9f2936523b 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -118,18 +118,6 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) return sendToNewRoom(chosenRoomNumber, user, chosen_room) -/obj/item/hilbertshotel/proc/get_room_type(chosen_room) //Currently unused - switch(chosen_room) - if("Apartment") return "Apartment" - if("Apartment-1") return "Apartment-1" - if("Apartment-2") return "Apartment-2" - if("Apartment-3") return "Apartment-3" - if("Apartment-Bar") return "Apartment-Bar" - if("Apartment-Garden") return "Apartment-Garden" - if("Apartment-Syndicate") return "Apartment-Syndicate" - if("Apartment-Sauna") return "Apartment-Sauna" - return "Hotel Room" - /area/hilbertshotel/proc/storeRoom() var/roomSize = (reservation.top_right_coords[1]-reservation.bottom_left_coords[1]+1)*(reservation.top_right_coords[2]-reservation.bottom_left_coords[2]+1) var/storage[roomSize] @@ -162,8 +150,8 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) else return FALSE -// v SPLURT EDIT: Unused until a way to copy turfs is found, as copied over movable atoms would look like a mess v /obj/item/hilbertshotel/proc/tryStoredRoom(var/roomNumber, var/mob/user) +// SPLURT EDIT START: Load the correct stored room by loading an empty template and adding stored atoms on top of it. if(storedRooms["[roomNumber]"]) // Find the storage object for the stored room var/obj/item/abstracthotelstorage/storageObj @@ -198,8 +186,15 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) for(var/obj/item/abstracthotelstorage/S in storageTurf) if((S.roomNumber == roomNumber) && (S.parentSphere == src)) qdel(S) + + // Re-Set the room type + var/area/hilbertshotel/currentArea = get_area(locate(roomReservation.bottom_left_coords[1], roomReservation.bottom_left_coords[2], roomReservation.bottom_left_coords[3])) + if(storageObj) + currentArea.roomType = storageObj.roomType // Set the room type for the area + storedRooms -= "[roomNumber]" activeRooms["[roomNumber]"] = roomReservation + // SPLURT EDIT END linkTurfs(roomReservation, roomNumber) do_sparks(3, FALSE, get_turf(user)) user.forceMove(locate(roomReservation.bottom_left_coords[1] + hotelRoomTemp.landingZoneRelativeX, roomReservation.bottom_left_coords[2] + hotelRoomTemp.landingZoneRelativeY, roomReservation.bottom_left_coords[3])) diff --git a/modular_splurt/code/game/objects/effects/decals/turfdecal/markings.dm b/modular_splurt/code/game/objects/effects/decals/turfdecal/markings.dm index ea13099fd8..7480a9d37e 100644 --- a/modular_splurt/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/modular_splurt/code/game/objects/effects/decals/turfdecal/markings.dm @@ -1,6 +1,7 @@ /obj/effect/turf_decal/siding icon = 'modular_splurt/icons/turf/decals.dmi' icon_state = "siding_line" + layer = 2.5 /obj/effect/turf_decal/siding/white color = "#BCBCBC" diff --git a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 54eb593572..9fac7013a4 100644 --- a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -1,3 +1,4 @@ +//Currently unused as their qdeletion in tryStoredRoom causes runtimes (along with normal pipes). /obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel /obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel/Initialize() diff --git a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 4c97c0c149..c779660408 100644 --- a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -1,3 +1,4 @@ +//Currently unused as their qdeletion in tryStoredRoom causes runtimes (along with normal pipes). /obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel /obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/Initialize()