diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 4366fa7e5af..713f25af41d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7070,13 +7070,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aCP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aCQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -7085,7 +7085,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aCR" = ( /turf/closed/wall, @@ -7400,17 +7400,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aEj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aEk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aEl" = ( /obj/effect/landmark/event_spawn, @@ -7731,7 +7731,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aFz" = ( -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aFA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -7743,11 +7743,11 @@ name = "Mass Driver Controller"; pixel_x = 24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aFB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aFD" = ( /obj/structure/lattice/catwalk, @@ -8184,7 +8184,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aHl" = ( /obj/structure/closet/crate/coffin, @@ -8198,14 +8198,14 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aHn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aHo" = ( /obj/structure/table/glass, @@ -9333,7 +9333,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aLt" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -9711,13 +9711,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aMM" = ( /obj/machinery/camera{ c_tag = "Chapel North" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aMN" = ( /obj/machinery/chem_master/condimaster, @@ -10538,7 +10538,7 @@ /area/chapel/main) "aQw" = ( /obj/structure/table/wood, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aQx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -11153,7 +11153,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aTf" = ( /obj/structure/chair/stool, @@ -11182,7 +11182,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aTk" = ( /turf/open/floor/plasteel/white/corner{ @@ -11550,7 +11550,7 @@ dir = 4; pixel_x = -24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aUH" = ( /obj/structure/chair/stool, @@ -11819,7 +11819,7 @@ c_tag = "Chapel South"; dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aVW" = ( /obj/item/radio/intercom{ @@ -12687,13 +12687,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "baB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "baF" = ( /obj/structure/closet/emcloset, @@ -25798,7 +25798,7 @@ "csT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/spawner/xmastree, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "cte" = ( /obj/machinery/power/apc{ @@ -39744,7 +39744,7 @@ "lqJ" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "lrg" = ( /obj/effect/landmark/start/chemist, @@ -44878,7 +44878,7 @@ }, /obj/structure/table/glass, /obj/item/storage/fancy/candle_box, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "oAa" = ( /obj/structure/disposalpipe/segment{ @@ -48079,7 +48079,7 @@ dir = 8; pixel_x = -26 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "qEU" = ( /obj/effect/spawner/structure/window/reinforced/shutters, diff --git a/_maps/map_files/MidwayStation/MidwayStation.dmm b/_maps/map_files/MidwayStation/MidwayStation.dmm index 0617e87a585..345c01f93ea 100644 --- a/_maps/map_files/MidwayStation/MidwayStation.dmm +++ b/_maps/map_files/MidwayStation/MidwayStation.dmm @@ -687,7 +687,7 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "afd" = ( /obj/effect/spawner/structure/window/reinforced, @@ -6461,7 +6461,7 @@ pixel_y = -24 }, /obj/structure/cable, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "aGG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/layer1{ @@ -10369,7 +10369,7 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bIW" = ( -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "bJh" = ( /obj/structure/rack, @@ -16574,7 +16574,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "gcy" = ( /obj/structure/closet/emcloset, @@ -17844,7 +17844,7 @@ /obj/item/radio/intercom{ pixel_x = 28 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "gWh" = ( /obj/machinery/power/terminal{ @@ -21440,7 +21440,7 @@ /area/solar/starboard/fore) "jqp" = ( /obj/item/kirbyplants/random, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "jrs" = ( /obj/effect/decal/cleanable/dirt, @@ -21618,7 +21618,7 @@ name = "Coffin Storage"; req_access_txt = "22" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "jxl" = ( /obj/structure/disposalpipe/segment{ @@ -22529,7 +22529,7 @@ /obj/item/radio/intercom{ pixel_y = -26 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "kbB" = ( /obj/machinery/camera/autoname{ @@ -23414,7 +23414,7 @@ dir = 1 }, /obj/machinery/light, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "kRX" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -24569,7 +24569,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "lCe" = ( /obj/machinery/door/window{ @@ -24794,7 +24794,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "lLj" = ( /obj/structure/table/reinforced, @@ -25127,7 +25127,7 @@ dir = 1; pixel_y = 30 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "lVq" = ( /obj/effect/turf_decal/tile/blue{ @@ -25599,7 +25599,7 @@ /area/quartermaster/storage) "moX" = ( /obj/machinery/vending/snack/random, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "mpb" = ( /obj/structure/disposalpipe/segment{ @@ -28583,7 +28583,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "nZK" = ( /obj/structure/window/reinforced{ @@ -31059,7 +31059,7 @@ /area/science/xenobiology) "pGw" = ( /obj/item/beacon, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "pGH" = ( /obj/machinery/power/apc/auto_name/south{ @@ -31355,7 +31355,7 @@ /obj/machinery/airalarm/directional/west{ pixel_x = -24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "pQj" = ( /obj/effect/turf_decal/tile/red{ @@ -32749,7 +32749,7 @@ /obj/machinery/camera/autoname{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "qQQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -33702,7 +33702,7 @@ /obj/machinery/firealarm{ pixel_y = -26 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "rxE" = ( /obj/machinery/door/poddoor/preopen{ @@ -36939,7 +36939,7 @@ /area/maintenance/disposal) "tHY" = ( /obj/machinery/light, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "tKc" = ( /obj/structure/cable{ @@ -40586,7 +40586,7 @@ layer = 2.9 }, /obj/structure/closet/crate/coffin, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "wgv" = ( /obj/machinery/camera/autoname{ @@ -41621,7 +41621,7 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main) "wOj" = ( /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index c51fd5c3be5..1c9e92c6480 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -378,6 +378,9 @@ }, /turf/open/floor/plasteel/white, /area/ai_monitored/turret_protected/ai) +"acz" = ( +/turf/open/floor/plasteel/chapel/tile, +/area/chapel/office) "acC" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -3022,6 +3025,13 @@ "amg" = ( /turf/closed/wall/r_wall, /area/security/warden) +"amj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/chapel/tile, +/area/chapel/main/monastery) "amn" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -22065,15 +22075,15 @@ /area/space/nearstation) "bKe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/dock) "bKf" = ( /obj/structure/chair, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/dock) "bKg" = ( /obj/structure/closet/emcloset, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/dock) "bKh" = ( /obj/machinery/door/window/eastright{ @@ -22713,7 +22723,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/dock) "bMx" = ( /obj/effect/turf_decal/stripes/line, @@ -22723,7 +22733,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/dock) "bMy" = ( /obj/structure/window/reinforced{ @@ -26591,7 +26601,7 @@ /obj/structure/chair/wood{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cbM" = ( /turf/open/floor/plasteel/chapel{ @@ -26708,7 +26718,7 @@ /obj/machinery/airalarm{ pixel_y = 24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ccL" = ( /obj/item/flashlight/lantern{ @@ -26780,7 +26790,7 @@ /area/chapel/main/monastery) "cdr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cds" = ( /obj/machinery/light/small{ @@ -26790,7 +26800,7 @@ c_tag = "Chapel Port Access"; network = list("ss13","monastery") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cdu" = ( /turf/open/floor/plasteel/chapel{ @@ -26815,11 +26825,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cdC" = ( /obj/structure/chair/wood, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cdD" = ( /obj/structure/table, @@ -26931,7 +26941,7 @@ "cen" = ( /obj/structure/table/wood, /obj/item/storage/photo_album, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ceo" = ( /obj/structure/chair{ @@ -26961,7 +26971,7 @@ c_tag = "Chapel Crematorium"; network = list("ss13","monastery") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "ceE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -26985,7 +26995,7 @@ /obj/item/kirbyplants{ icon_state = "plant-08" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ceL" = ( /obj/structure/table/wood/fancy, @@ -26994,7 +27004,7 @@ pixel_y = 8 }, /obj/machinery/light/small, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ceM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -27017,7 +27027,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ceT" = ( /obj/effect/turf_decal/stripes/line, @@ -27640,7 +27650,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ciE" = ( /obj/structure/flora/ausbushes/genericbush, @@ -27663,7 +27673,7 @@ /area/chapel/main/monastery) "ciN" = ( /obj/structure/closet/crate/bin, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ciO" = ( /obj/structure/table/wood, @@ -27676,7 +27686,7 @@ pixel_x = 5; pixel_y = 6 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ciS" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -27732,7 +27742,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cjm" = ( /turf/closed/wall, @@ -27866,7 +27876,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ckd" = ( /obj/machinery/light/small{ @@ -29389,7 +29399,7 @@ /area/space/nearstation) "crg" = ( /obj/structure/chair/wood, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "crh" = ( /obj/machinery/button/crematorium{ @@ -29399,19 +29409,19 @@ /obj/structure/bodycontainer/crematorium{ id = "foo" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "crj" = ( /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "crk" = ( /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "crl" = ( /obj/structure/sign/warning/vacuum/external, @@ -29427,12 +29437,12 @@ /obj/structure/table/wood/fancy, /obj/item/folder, /obj/item/pen, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "cru" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "crv" = ( /turf/open/floor/plasteel/dark, @@ -29445,23 +29455,23 @@ "crD" = ( /obj/structure/table/wood/fancy, /obj/item/storage/box/bodybags, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "crE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "crF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "crG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "crH" = ( /obj/structure/table/wood, @@ -29477,7 +29487,7 @@ dir = 4; network = list("ss13","monastery") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "crL" = ( /obj/structure/chair/wood, @@ -29502,7 +29512,7 @@ dir = 8; network = list("ss13","monastery") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "crO" = ( /obj/structure/window/reinforced{ @@ -29526,7 +29536,7 @@ /area/engine/atmos) "crX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "crY" = ( /obj/structure/table/wood, @@ -29620,7 +29630,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "csy" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -29681,7 +29691,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "csT" = ( /obj/machinery/light/small{ @@ -29692,7 +29702,7 @@ network = list("ss13","monastery") }, /obj/structure/chair/wood, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cta" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -29734,13 +29744,13 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cth" = ( /obj/structure/table/wood/fancy, /obj/item/storage/fancy/candle_box, /obj/machinery/light/small, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ctr" = ( /obj/effect/turf_decal/tile/yellow{ @@ -29974,7 +29984,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cuw" = ( /obj/structure/table/wood, @@ -29983,7 +29993,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cux" = ( /obj/structure/table/wood, @@ -29991,7 +30001,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cuy" = ( /obj/structure/chair/wood{ @@ -30000,7 +30010,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cuA" = ( /obj/structure/flora/ausbushes/ywflowers, @@ -30044,7 +30054,7 @@ dir = 8; network = list("ss13","monastery") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cuO" = ( /obj/machinery/hydroponics/soil, @@ -30112,13 +30122,13 @@ /obj/structure/chair/wood{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cve" = ( /obj/structure/chair/wood{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvf" = ( /obj/machinery/recycler, @@ -30188,7 +30198,7 @@ name = "Coffin Storage"; req_one_access_txt = "22" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvs" = ( /obj/structure/window/reinforced{ @@ -30197,7 +30207,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -30210,7 +30220,7 @@ name = "Coffin Storage"; req_one_access_txt = "22" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvw" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -30260,14 +30270,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvC" = ( /obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvM" = ( /obj/item/kirbyplants{ @@ -30313,12 +30323,12 @@ dir = 4; network = list("ss13","monastery") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvS" = ( /obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cvT" = ( /obj/structure/chair/wood, @@ -30327,7 +30337,7 @@ "cvV" = ( /obj/structure/chair/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cwa" = ( /turf/closed/wall/mineral/iron, @@ -30420,14 +30430,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cwF" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cwG" = ( /obj/machinery/light/small{ @@ -30437,7 +30447,7 @@ id = "chapelgun"; pixel_x = 28 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cwK" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -30454,7 +30464,7 @@ /area/space/nearstation) "cwO" = ( /obj/item/flashlight/lantern, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cwQ" = ( /obj/structure/particle_accelerator/particle_emitter/left, @@ -30634,7 +30644,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "cyy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -34270,6 +34280,12 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"ewl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/chapel/tile, +/area/chapel/main/monastery) "ewM" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/effect/spawner/structure/window/reinforced/shutters, @@ -39173,7 +39189,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "hsW" = ( /obj/effect/turf_decal/tile/blue{ @@ -40282,7 +40298,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/dock) "ida" = ( /obj/structure/bed, @@ -43004,7 +43020,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "jVa" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/dock) "jVn" = ( /obj/effect/spawner/structure/window/reinforced, @@ -43145,7 +43161,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "kar" = ( /obj/effect/turf_decal/tile/red, @@ -48366,7 +48382,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "nvZ" = ( /obj/machinery/door/poddoor/preopen{ @@ -49767,7 +49783,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "ory" = ( /obj/machinery/light{ @@ -52425,6 +52441,9 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/crew_quarters/lounge) +"qfA" = ( +/turf/open/floor/plasteel/chapel/tile, +/area/chapel/main/monastery) "qfP" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -52471,7 +52490,7 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/office) "qgt" = ( /obj/structure/lattice/catwalk, @@ -53904,7 +53923,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "rnE" = ( /obj/structure/disposalpipe/segment{ @@ -53997,6 +54016,12 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/dock) +"rpl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel/chapel/tile, +/area/chapel/main/monastery) "rpr" = ( /obj/effect/spawner/structure/window/reinforced/shutters, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -54178,7 +54203,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "rxa" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -54685,7 +54710,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "rNP" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -56002,7 +56027,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "sEj" = ( /obj/effect/spawner/structure/window/reinforced, @@ -58217,7 +58242,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "udt" = ( /obj/structure/table/reinforced, @@ -59187,7 +59212,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "uzs" = ( /obj/structure/disposalpipe/sorting/mail{ @@ -60789,7 +60814,7 @@ name = "Confessional Intercom"; pixel_x = 26 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "vGg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -61252,6 +61277,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"vVs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/chapel/tile, +/area/chapel/main/monastery) "vVE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 8 @@ -61825,7 +61854,7 @@ name = "Confessional Intercom"; pixel_x = -26 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/chapel/tile, /area/chapel/main/monastery) "whK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -64660,6 +64689,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/maintenance/disposal/incinerator) +"xVe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/chapel/tile, +/area/chapel/main/monastery) "xVl" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -77920,7 +77953,7 @@ aaa cfN bZY ceC -crv +acz crF qgd ceE @@ -78177,7 +78210,7 @@ cfN cfN bZY crh -crv +acz crG bZY xMW @@ -78198,10 +78231,10 @@ chX bWV ciz cvr -ceP +ewl cvR -bXJ -bXJ +qfA +qfA crj cwO hZl @@ -78457,10 +78490,10 @@ ciz cvs cvB cvS -cdw +xVe cjj -bXJ -bXJ +qfA +qfA hZl hZl cxg @@ -79219,8 +79252,8 @@ cfN bWV cdr cuv -bXJ -ceP +qfA +ewl crj ciN bWV @@ -79230,8 +79263,8 @@ cvC cvV ceQ ciA -bXJ -bXJ +qfA +qfA hZl hZl cxg @@ -79483,10 +79516,10 @@ cvd bWV ciz cvt -ceP +ewl crk -bXJ -bXJ +qfA +qfA cwG cwO hZl @@ -79734,7 +79767,7 @@ bWV cdC cux cbK -ceP +ewl cdC ciO bWV @@ -79988,11 +80021,11 @@ cfN cfN cfN bWV -bXJ +qfA cuy cuK -ceP -bXJ +ewl +qfA cve bWV bXJ @@ -80493,7 +80526,7 @@ bOw bWV bWV bWV -bXJ +qfA nvY cdr rwO @@ -81261,11 +81294,11 @@ bOw bOw bWV crj -bXJ -bXJ +qfA +qfA crK cdr -cdw +xVe csv rwO bWV @@ -81517,7 +81550,7 @@ bOw bQd bWV bWV -bXJ +qfA bZl bYA bZl @@ -81773,8 +81806,8 @@ bOw bOw bQe bWV -bXJ -bXJ +qfA +qfA bZm bYB crL @@ -82039,7 +82072,7 @@ xRu xRu eqc tVT -cdw +xVe mqi ceM cfo @@ -82287,7 +82320,7 @@ bQg bQg bQg niE -bXJ +qfA bZo bZo bZo @@ -82296,7 +82329,7 @@ bZo bZo cbO ccF -cdx +vVs eZd ceN cfn @@ -82544,15 +82577,15 @@ bOw bOw bQe bWV -bXJ -bXJ +qfA +qfA bZl bYA crM caW cbP cdu -ceP +ewl cth cfm ctN @@ -82802,14 +82835,14 @@ bOw bWi bWV bWV -bXJ +qfA bZm bYB bZm bYB cbM ccH -ceP +ewl ceK cfm cfG @@ -83060,12 +83093,12 @@ bOw bOw bWV crk -bXJ -bXJ +qfA +qfA crN crX -cdx -cgn +vVs +amj csS bWV cfm @@ -83581,7 +83614,7 @@ bWV bWV bWV ccJ -cdw +xVe hsS ceM cua @@ -83837,8 +83870,8 @@ bUC bOw bQg wOo -bXJ -cdA +qfA +rpl ctx ctP cdx @@ -84094,7 +84127,7 @@ bOw bOw bQg wOo -bXJ +qfA cdB cfm cfm diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index d52b9c79d94..15a4f07e0e9 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -4,7 +4,7 @@ desc = "A broken tile. This should not exist." lefthand_file = 'icons/mob/inhands/misc/tiles_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/tiles_righthand.dmi' - icon = 'icons/obj/tiles.dmi' + icon = 'whitesands/icons/obj/tiles.dmi' //WS Edit - Tile Resprite w_class = WEIGHT_CLASS_NORMAL force = 1 throwforce = 1 diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index d876206c887..bef475c9850 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -3,7 +3,7 @@ //- you should use istype() if you want to find out whether a floor has a certain type //- floor_tile is now a path, and not a tile obj name = "floor" - icon = 'icons/turf/floors.dmi' + icon = 'whitesands/icons/turf/floors/whitesands/ws_floors.dmi' //WS Edit - Floor Resprite baseturfs = /turf/open/floor/plating footstep = FOOTSTEP_FLOOR diff --git a/whitesands/code/game/turf/open/floor/whitesands.dm b/whitesands/code/game/turf/open/floor/whitesands.dm index 03fda400c48..b03c418d03e 100644 --- a/whitesands/code/game/turf/open/floor/whitesands.dm +++ b/whitesands/code/game/turf/open/floor/whitesands.dm @@ -1,7 +1,7 @@ /turf/open/floor/plating/asteroid/whitesands name = "salted sand" baseturfs = /turf/open/floor/plating/asteroid/whitesands - icon = 'whitesands/icons/turf/floors/whitesands/ws_floors.dmi' + icon = 'whitesands/icons/turf/floors/whitesands/ws_planet.dmi' icon_state = "sand" icon_plating = "sand" planetary_atmos = TRUE diff --git a/whitesands/code/game/turfs/open/floor/hull.dm b/whitesands/code/game/turfs/open/floor/hull.dm index d7f644187f2..17b26d1719c 100644 --- a/whitesands/code/game/turfs/open/floor/hull.dm +++ b/whitesands/code/game/turfs/open/floor/hull.dm @@ -7,3 +7,7 @@ name = "interior reinforced hull plating" initial_gas_mix = OPENTURF_DEFAULT_ATMOS temperature = T20C + +/turf/open/floor/plasteel/chapel/tile + icon_state = "darkest" + diff --git a/whitesands/icons/obj/tiles.dmi b/whitesands/icons/obj/tiles.dmi new file mode 100644 index 00000000000..b4ba46500a2 Binary files /dev/null and b/whitesands/icons/obj/tiles.dmi differ diff --git a/whitesands/icons/turf/floors/whitesands/ws_floors.dmi b/whitesands/icons/turf/floors/whitesands/ws_floors.dmi index 459a4875d90..c1a0e90ac46 100644 Binary files a/whitesands/icons/turf/floors/whitesands/ws_floors.dmi and b/whitesands/icons/turf/floors/whitesands/ws_floors.dmi differ diff --git a/whitesands/icons/turf/floors/whitesands/ws_planet.dmi b/whitesands/icons/turf/floors/whitesands/ws_planet.dmi new file mode 100644 index 00000000000..459a4875d90 Binary files /dev/null and b/whitesands/icons/turf/floors/whitesands/ws_planet.dmi differ