diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 78528cec365..626e32351bd 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2124,6 +2124,7 @@ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); name = "funny slipper :)" }, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/right) "afX" = ( @@ -4251,8 +4252,8 @@ /obj/effect/mapping_helpers/mail_sorting/service/theater, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "awc" = ( @@ -5511,10 +5512,10 @@ dir = 8; pixel_y = 22 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /turf/open/floor/iron, @@ -5529,10 +5530,10 @@ /area/station/hallway/primary/tram/center) "aGP" = ( /obj/machinery/holopad, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/machinery/button/tram/directional/north{ @@ -5556,10 +5557,10 @@ dir = 4; pixel_y = 22 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /turf/open/floor/iron, @@ -8596,10 +8597,10 @@ /area/station/cargo/miningdock) "bBM" = ( /obj/structure/railing, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 4 }, /turf/open/floor/iron, @@ -9415,10 +9416,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 8 }, /turf/open/floor/iron, @@ -12102,16 +12103,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"cMD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/center) "cNc" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -12284,6 +12275,7 @@ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); name = "funny slipper :)" }, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/left) "cPx" = ( @@ -13411,10 +13403,10 @@ "djU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13909,18 +13901,6 @@ "dtA" = ( /turf/open/openspace, /area/station/security/courtroom/holding) -"dtE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/right) "dtT" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/white/full, @@ -15307,8 +15287,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "dUH" = ( @@ -15530,7 +15510,7 @@ c_tag = "Hallway - Central Tram Platform South"; pixel_y = -23 }, -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/center) "dZu" = ( /obj/machinery/mecha_part_fabricator, @@ -16177,14 +16157,13 @@ /turf/open/floor/iron/white, /area/station/science/lower) "emr" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "ems" = ( @@ -16729,8 +16708,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /obj/machinery/button/tram/directional/south{ id = 3 }, @@ -16854,10 +16833,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 1 }, /turf/open/floor/iron, @@ -18558,10 +18537,10 @@ /area/station/maintenance/disposal) "fiH" = ( /obj/structure/railing, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 8 }, /obj/machinery/vending/cigarette{ @@ -18678,15 +18657,12 @@ /turf/open/floor/iron/dark, /area/station/service/bar) "fkZ" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 1 - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19619,6 +19595,7 @@ "fBK" = ( /obj/structure/industrial_lift/tram/white, /obj/effect/landmark/tram/tramstation/central, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "fCB" = ( @@ -19954,8 +19931,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "fJe" = ( @@ -19994,10 +19971,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 8 }, /turf/open/floor/iron, @@ -20173,6 +20150,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate/energized{ outbound = 2; inbound = 1 @@ -20915,10 +20893,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/machinery/button/tram/directional/north, @@ -21255,10 +21233,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 4 }, /obj/machinery/vending/coffee{ @@ -21837,15 +21815,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "gxk" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 4 - }, /obj/effect/landmark/start/hangover, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, /turf/open/floor/iron, @@ -22817,6 +22792,7 @@ icon_state = "tram_window-3" }, /obj/machinery/computer/tram_controls/directional/west, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "gOF" = ( @@ -24883,10 +24859,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 8 }, /turf/open/floor/iron, @@ -25565,8 +25541,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner, -/obj/effect/turf_decal/trimline/neutral/corner, +/obj/effect/turf_decal/trimline/tram/filled/corner, +/obj/effect/turf_decal/trimline/tram/corner, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "hWL" = ( @@ -26051,8 +26027,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) "ifg" = ( @@ -26162,6 +26138,7 @@ }, /area/station/service/theater) "igF" = ( +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate/energized{ outbound = 3; inbound = 2 @@ -26191,6 +26168,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "ihf" = ( +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate/energized{ outbound = 2; inbound = 1 @@ -27287,10 +27265,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 4 }, /obj/effect/spawner/random/vending/snackvend{ @@ -27652,10 +27630,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /turf/open/floor/iron, @@ -28233,10 +28211,10 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 4 }, /turf/open/floor/iron, @@ -29041,8 +29019,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "jjy" = ( @@ -29458,8 +29436,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "jqs" = ( @@ -30434,7 +30412,7 @@ /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) "jJV" = ( -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/center) "jJX" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -31059,8 +31037,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "jXc" = ( @@ -31365,15 +31343,15 @@ /area/station/command/heads_quarters/captain) "kbN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/tram/filled/line{ + dir = 1 + }, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "kcA" = ( @@ -31648,7 +31626,7 @@ /obj/machinery/camera/directional/west{ c_tag = "Hallway - Central Tram Platform North" }, -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/center) "khV" = ( /obj/structure/table, @@ -32050,6 +32028,7 @@ /area/station/hallway/secondary/exit) "kpb" = ( /obj/structure/industrial_lift/tram/white, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "kpd" = ( @@ -32330,6 +32309,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate/energized{ outbound = 3; inbound = 2 @@ -33936,6 +33916,7 @@ icon_state = "tram_window-3" }, /obj/machinery/computer/tram_controls/directional/east, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "kWH" = ( @@ -34557,10 +34538,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 8 }, /turf/open/floor/iron, @@ -34755,6 +34736,7 @@ /area/station/security/prison/workout) "lkr" = ( /obj/effect/landmark/tram/tramstation/west, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/left) "lku" = ( @@ -35397,10 +35379,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 8 }, /turf/open/floor/iron, @@ -35479,10 +35461,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 4 }, /obj/effect/spawner/random/vending/colavend{ @@ -36443,8 +36425,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "lPO" = ( @@ -36453,10 +36435,10 @@ /area/station/maintenance/disposal/incinerator) "lPP" = ( /obj/structure/railing, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 4 }, /turf/open/floor/iron, @@ -37510,7 +37492,7 @@ c_tag = "Hallway - Starboard Tram Platform South"; pixel_y = -23 }, -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/right) "mhz" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -38267,10 +38249,10 @@ /turf/open/floor/engine/o2, /area/station/engineering/atmos) "mwu" = ( -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 1 }, /turf/open/floor/iron, @@ -39014,10 +38996,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 1 }, /turf/open/floor/iron, @@ -39354,10 +39336,10 @@ }, /area/station/service/chapel) "mTM" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /turf/open/floor/iron, @@ -41157,6 +41139,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate/energized{ outbound = 2; inbound = 1 @@ -41164,10 +41147,10 @@ /area/station/hallway/primary/tram/center) "nAF" = ( /obj/structure/railing, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 8 }, /obj/effect/spawner/random/vending/snackvend{ @@ -41395,10 +41378,10 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41456,8 +41439,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "nFL" = ( @@ -41567,6 +41550,7 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "nJq" = ( +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/left) "nJr" = ( @@ -41907,8 +41891,8 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /obj/machinery/button/tram/directional/south{ id = 2 }, @@ -42110,6 +42094,7 @@ /obj/structure/holosign/barrier/atmos/tram, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "nRO" = ( @@ -43231,6 +43216,7 @@ /turf/closed/wall, /area/station/maintenance/department/security) "omp" = ( +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "omu" = ( @@ -43816,6 +43802,7 @@ /turf/open/floor/iron/dark, /area/station/commons/lounge) "ozQ" = ( +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/right) "ozW" = ( @@ -44205,8 +44192,8 @@ /obj/effect/mapping_helpers/mail_sorting/security/hos_office, /obj/effect/mapping_helpers/mail_sorting/security/detectives_office, /obj/effect/mapping_helpers/mail_sorting/security/general, -/obj/effect/turf_decal/trimline/yellow/filled/corner, -/obj/effect/turf_decal/trimline/neutral/corner, +/obj/effect/turf_decal/trimline/tram/filled/corner, +/obj/effect/turf_decal/trimline/tram/corner, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) "oIz" = ( @@ -44284,13 +44271,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -44354,8 +44338,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /obj/machinery/button/tram/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) @@ -45142,7 +45126,7 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet) "pdw" = ( -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/left) "pdy" = ( /obj/structure/lattice, @@ -46159,7 +46143,7 @@ /obj/machinery/camera/directional/west{ c_tag = "Hallway - Starboard Tram Platform North" }, -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/right) "pvm" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -46175,6 +46159,19 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"pvq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/tram/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/tram/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/right) "pvC" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -46909,8 +46906,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) @@ -48491,8 +48488,8 @@ /obj/effect/mapping_helpers/mail_sorting/supply/qm_office, /obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "qmd" = ( @@ -48532,8 +48529,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/corner, -/obj/effect/turf_decal/trimline/neutral/corner, +/obj/effect/turf_decal/trimline/tram/filled/corner, +/obj/effect/turf_decal/trimline/tram/corner, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "qmN" = ( @@ -48779,10 +48776,10 @@ pixel_y = 22 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -48879,7 +48876,7 @@ /obj/machinery/camera/directional/west{ c_tag = "Hallway - Port Tram Platform North" }, -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/left) "qti" = ( /obj/effect/turf_decal/siding/wood{ @@ -49010,6 +49007,7 @@ "qvZ" = ( /obj/structure/industrial_lift/tram/white, /obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "qwq" = ( @@ -49110,6 +49108,7 @@ /area/station/security/courtroom) "qyI" = ( /obj/effect/landmark/tram/tramstation/east, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/right) "qyK" = ( @@ -49611,6 +49610,7 @@ "qHk" = ( /obj/structure/industrial_lift/tram, /obj/structure/sign/plaques/tram, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "qHo" = ( @@ -50019,8 +50019,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "qOi" = ( @@ -51351,10 +51351,10 @@ /area/station/command/heads_quarters/hos) "rmD" = ( /obj/structure/railing, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 8 }, /obj/effect/spawner/random/vending/colavend{ @@ -51791,6 +51791,7 @@ /area/station/hallway/secondary/construction/engineering) "rwa" = ( /obj/structure/holosign/barrier/atmos/tram, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/left) "rwb" = ( @@ -54899,6 +54900,7 @@ "sCG" = ( /obj/structure/holosign/barrier/atmos/tram, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "sCO" = ( @@ -55122,15 +55124,15 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/machinery/button/tram/directional/north{ id = 3 }, +/obj/effect/turf_decal/trimline/tram/filled/line{ + dir = 1 + }, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "sHh" = ( @@ -55350,15 +55352,12 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) "sKx" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 8 - }, /obj/effect/landmark/start/hangover, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) "sKA" = ( @@ -55657,7 +55656,7 @@ c_tag = "Hallway - Port Tram Platform South"; pixel_y = -23 }, -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/left) "sPo" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -55856,6 +55855,7 @@ "sTn" = ( /obj/structure/industrial_lift/tram/white, /obj/effect/landmark/lift_id, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/center) "sTo" = ( @@ -55863,6 +55863,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate/energized{ outbound = 3; inbound = 2 @@ -56592,15 +56593,15 @@ /area/station/medical/medbay/central) "tfc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/turf_decal/trimline/tram/filled/line{ + dir = 1 + }, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "tfk" = ( @@ -57106,6 +57107,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/right) "toY" = ( @@ -57192,10 +57194,10 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 8 }, /turf/open/floor/iron, @@ -58166,10 +58168,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /turf/open/floor/iron, @@ -58758,8 +58760,8 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "tTJ" = ( @@ -59401,10 +59403,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 1 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 1 }, /turf/open/floor/iron, @@ -59969,8 +59971,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) "unS" = ( @@ -62586,8 +62588,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "vin" = ( @@ -65385,8 +65387,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "wfQ" = ( @@ -65866,8 +65868,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/warning, +/obj/effect/turf_decal/trimline/tram/filled/line, +/obj/effect/turf_decal/trimline/tram/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) "wqk" = ( @@ -68941,10 +68943,10 @@ /turf/open/misc/asteroid/snow/coldroom, /area/station/service/kitchen/coldroom) "xDn" = ( -/obj/effect/turf_decal/trimline/yellow/filled/corner{ +/obj/effect/turf_decal/trimline/tram/filled/corner{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/corner{ +/obj/effect/turf_decal/trimline/tram/corner{ dir = 4 }, /turf/open/floor/iron, @@ -69795,10 +69797,10 @@ /area/station/service/library) "xWa" = ( /obj/structure/railing, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/tram/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/tram/filled/warning{ dir = 4 }, /turf/open/floor/iron, @@ -69862,6 +69864,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate/energized{ inbound = 1; outbound = 2 @@ -69923,7 +69926,7 @@ /turf/open/floor/iron, /area/station/ai_monitored/security/armory) "xYV" = ( -/turf/open/floor/noslip, +/turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/right) "xYZ" = ( /obj/effect/turf_decal/stripes/line{ @@ -168481,7 +168484,7 @@ mHc beW aEk rOu -cMD +emr jJV gxA hio @@ -181082,7 +181085,7 @@ ozQ vPi brm xYV -kbN +pvq aHq lfQ iBx @@ -182367,7 +182370,7 @@ ozQ vPi brm xYV -dtE +fkZ pIT uTN nBM @@ -182881,7 +182884,7 @@ ozQ vPi brm mht -dtE +fkZ stt wpK lfQ diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index c1b8eea39ae..659e1e8b646 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -94,3 +94,14 @@ #define TURF_PATHING_PASS_PROC 1 /// Turf is never passable #define TURF_PATHING_PASS_NO 2 + +/// Define the alpha for holiday/colored tile decals +#define DECAL_ALPHA 60 +/// Generate horizontal striped color turf decals +#define PATTERN_DEFAULT "default" +/// Generate vertical striped color turf decals +#define PATTERN_VERTICAL_STRIPE "vertical" +/// Generate random color turf decals +#define PATTERN_RANDOM "random" +/// Generate rainbow color turf decals +#define PATTERN_RAINBOW "rainbow" diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 6b0678ab068..0b67aa4788e 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -45,6 +45,10 @@ plane = FLOOR_PLANE layer = TURF_DECAL_LAYER anchored = TRUE + /// Does this decal change colors on holidays + var/use_holiday_colors = FALSE + /// The pattern used when recoloring the decal + var/pattern = PATTERN_DEFAULT // This is with the intent of optimizing mapload // See spawners for more details since we use the same pattern @@ -55,6 +59,13 @@ stack_trace("Warning: [src]([type]) initialized multiple times!") flags_1 |= INITIALIZED_1 + // If the tile uses holiday colors, apply them here + if(use_holiday_colors) + var/current_holiday_color = request_holiday_colors(src, pattern) + if(current_holiday_color) + color = current_holiday_color + alpha = DECAL_ALPHA + var/turf/T = loc if(!istype(T)) //you know this will happen somehow CRASH("Turf decal initialized in an object/nullspace") diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index 6d21f206f15..ec307a87d98 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -3,22 +3,10 @@ icon_state = "tile_corner" layer = TURF_PLATING_DECAL_LAYER alpha = 110 + use_holiday_colors = TRUE -#define PRIDE_ALPHA 60 - -/obj/effect/turf_decal/tile/Initialize(mapload) - if (check_holidays(APRIL_FOOLS)) - color = "#[random_short_color()]" - else if (check_holidays(PRIDE_WEEK)) - var/datum/holiday/pride_week/pride_week = GLOB.holidays[PRIDE_WEEK] - color = pride_week.get_floor_tile_color(src) - - // It looks garish at different alphas, and it's not possible to get a - // consistent color palette without this. - alpha = PRIDE_ALPHA - return ..() - -#undef PRIDE_ALPHA +/obj/effect/turf_decal/tile/neutral/tram + pattern = PATTERN_VERTICAL_STRIPE /// Automatically generates all subtypes for a decal with the given path. #define TILE_DECAL_SUBTYPE_HELPER(path)\ @@ -48,18 +36,21 @@ }\ ##path/diagonal_edge {\ icon_state = "diagonal_edge";\ +}\ +##path/tram {\ + icon_state = "tile_tram";\ } /// Blue tiles /obj/effect/turf_decal/tile/blue - name = "blue corner" + name = "blue tile decal" color = "#52B4E9" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/blue) /// Dark blue tiles /obj/effect/turf_decal/tile/dark_blue - name = "dark blue corner" + name = "dark blue tile decal" color = "#486091" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_blue) @@ -67,7 +58,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_blue) /// Green tiles /obj/effect/turf_decal/tile/green - name = "green corner" + name = "green tile decal" color = "#9FED58" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/green) @@ -75,7 +66,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/green) /// Dark green tiles /obj/effect/turf_decal/tile/dark_green - name = "dark green corner" + name = "dark green tile decal" color = "#439C1E" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_green) @@ -83,7 +74,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_green) /// Yellow tiles /obj/effect/turf_decal/tile/yellow - name = "yellow corner" + name = "yellow tile decal" color = "#EFB341" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow) @@ -91,15 +82,15 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow) /// Red tiles /obj/effect/turf_decal/tile/red - name = "red corner" - color = "#486091" //SKYRAT EDIT CHANGE + name = "red tile decal" + color = "#486091" // SKYRAT EDIT CHANGE TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red) /// Dark red tiles /obj/effect/turf_decal/tile/dark_red - name = "dark red corner" + name = "dark red tile decal" color = "#B11111" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_red) @@ -107,7 +98,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_red) /// Bar tiles /obj/effect/turf_decal/tile/bar - name = "bar corner" + name = "bar tile decal" color = "#791500" alpha = 130 @@ -116,7 +107,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/bar) /// Purple tiles /obj/effect/turf_decal/tile/purple - name = "purple corner" + name = "purple tile decal" color = "#D381C9" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/purple) @@ -124,7 +115,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/purple) /// Brown tiles /obj/effect/turf_decal/tile/brown - name = "brown corner" + name = "brown tile decal" color = "#A46106" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/brown) @@ -132,7 +123,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/brown) /// Neutral tiles /obj/effect/turf_decal/tile/neutral - name = "neutral corner" + name = "neutral tile decal" color = "#D4D4D4" alpha = 50 @@ -141,23 +132,36 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/neutral) /// Dark tiles /obj/effect/turf_decal/tile/dark - name = "dark corner" + name = "dark tile decal" color = "#0e0f0f" TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark) -/// Random tiles +/// Date-specific tiles +/obj/effect/turf_decal/tile/holiday + name = "ERROR tile decal" + color = "#FF0000" -/obj/effect/turf_decal/tile/random // so many colors - name = "colorful corner" - color = "#E300FF" //bright pink as default for mapping - -TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/random) - -/obj/effect/turf_decal/tile/random/Initialize(mapload) - color = "#[random_short_color()]" +/obj/effect/turf_decal/tile/holiday/Initialize(mapload) + color = request_holiday_colors(src, pattern) + alpha = DECAL_ALPHA return ..() +/// Pattern tiles +/obj/effect/turf_decal/tile/holiday/rainbow + name = "rainbow tile decal" + color = "#75C9EB" //bright blue as default for mapping + pattern = PATTERN_RAINBOW + +TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/holiday/rainbow) + +/obj/effect/turf_decal/tile/holiday/random // so many colors + name = "colorful tile decal" + color = "#E300FF" //bright pink as default for mapping + pattern = PATTERN_RANDOM + +TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/holiday/random) + #undef TILE_DECAL_SUBTYPE_HELPER /// Trimlines @@ -165,10 +169,29 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/random) layer = TURF_PLATING_DECAL_LAYER alpha = 110 icon_state = "trimline_box" + use_holiday_colors = TRUE -/obj/effect/turf_decal/trimline/Initialize(mapload) - if(check_holidays(APRIL_FOOLS)) - color = "#[random_short_color()]" +/obj/effect/turf_decal/trimline/tram + pattern = PATTERN_VERTICAL_STRIPE + +/obj/effect/turf_decal/trimline/tram/filled/corner/Initialize(mapload) + if(use_holiday_colors) + var/current_holiday_color = request_holiday_colors(src, pattern) + if(current_holiday_color) + color = current_holiday_color + alpha = DECAL_ALPHA + else + color = "#ffc875" + return ..() + +/obj/effect/turf_decal/trimline/tram/filled/line/Initialize(mapload) + if(use_holiday_colors) + var/current_holiday_color = request_holiday_colors(src, pattern) + if(current_holiday_color) + color = current_holiday_color + alpha = DECAL_ALPHA + else + color = "#ffc875" return ..() /// Automatically generates all trimlines for a decal with the given path. @@ -296,6 +319,13 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/brown) TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/neutral) +/// Tram trimlines +/obj/effect/turf_decal/trimline/tram + color = "#D4D4D4" + alpha = 50 + +TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/tram) + /// Dark trimlines /obj/effect/turf_decal/trimline/dark color = "#0e0f0f" @@ -303,3 +333,4 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/neutral) TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark) #undef TRIMLINE_SUBTYPE_HELPER +#undef DECAL_ALPHA diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 7c5dbcdc602..cdf1f81f879 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1021,6 +1021,33 @@ /obj/item/stack/tile/noslip/thirty amount = 30 +/obj/item/stack/tile/noslip/tram + name = "high-traction platform tile" + singular_name = "high-traction platform tile" + desc = "A titanium-aluminium induction plate that powers the tram." + icon_state = "tile_noslip" + inhand_icon_state = "tile-noslip" + turf_type = /turf/open/floor/noslip/tram + merge_type = /obj/item/stack/tile/noslip/tram + +/obj/item/stack/tile/noslip/tram_platform + name = "tram platform tiles" + singular_name = "tram platform" + desc = "A tile used for tram platforms." + icon_state = "darkiron_catwalk" + inhand_icon_state = "tile-neon" + turf_type = /turf/open/floor/noslip/tram_platform + merge_type = /obj/item/stack/tile/noslip/tram_platform + +/obj/item/stack/tile/noslip/tram_plate + name = "high-traction platform tile" + singular_name = "high-traction platform tile" + desc = "A high-traction tile used for tram platforms." + icon_state = "darkiron_plate" + inhand_icon_state = "tile-neon" + turf_type = /turf/open/floor/noslip/tram_plate + merge_type = /obj/item/stack/tile/noslip/tram_plate + //Circuit /obj/item/stack/tile/circuit name = "blue circuit tile" diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index ac3801045b5..ce34f760a67 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -154,6 +154,14 @@ /turf/open/floor/noslip/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return +/turf/open/floor/noslip/tram/Initialize(mapload) + . = ..() + var/current_holiday_color = request_holiday_colors(src, PATTERN_VERTICAL_STRIPE) + if(current_holiday_color) + color = current_holiday_color + else + color = "#EFB341" + /turf/open/floor/oldshuttle icon = 'icons/turf/shuttleold.dmi' icon_state = "floor" diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 03703099b6a..0a16977c5c1 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -25,6 +25,8 @@ var/poster_name = "generic celebration poster" var/poster_desc = "A poster for celebrating some holiday. Unfortunately, its unfinished, so you can't see what the holiday is." var/poster_icon = "holiday_unfinished" + /// Color scheme for this holiday + var/list/holiday_colors // This proc gets run before the game starts when the holiday is activated. Do festive shit here. /datum/holiday/proc/celebrate() @@ -75,6 +77,29 @@ return FALSE +/// Procs to return holiday themed colors for recoloring atoms +/datum/holiday/proc/get_holiday_colors(atom/thing_to_color, pattern = PATTERN_DEFAULT) + if(!holiday_colors) + return + switch(pattern) + if(PATTERN_DEFAULT) + return holiday_colors[(thing_to_color.y % holiday_colors.len) + 1] + if(PATTERN_VERTICAL_STRIPE) + return holiday_colors[(thing_to_color.x % holiday_colors.len) + 1] + +/proc/request_holiday_colors(atom/thing_to_color, pattern = PATTERN_DEFAULT) + switch(pattern) + if(PATTERN_RANDOM) + return "#[random_short_color()]" + if(PATTERN_RAINBOW) + var/datum/holiday/pride_week/rainbow_datum = new() + return rainbow_datum.get_holiday_colors(thing_to_color, PATTERN_DEFAULT) + if(!length(GLOB.holidays)) + return + for(var/holiday_key in GLOB.holidays) + var/datum/holiday/holiday_real = GLOB.holidays[holiday_key] + return holiday_real.get_holiday_colors(thing_to_color, pattern) + // The actual holidays // JANUARY @@ -220,6 +245,9 @@ if(P.client) P.client.playtitlemusic() +/datum/holiday/april_fools/get_holiday_colors(atom/thing_to_color) + return "#[random_short_color()]" + /datum/holiday/spess name = "Cosmonautics Day" begin_day = 12 @@ -327,27 +355,22 @@ name = "Summer Solstice" begin_day = 21 begin_month = JUNE + /datum/holiday/pride_week name = PRIDE_WEEK begin_month = JUNE // Stonewall was June 28th, this captures its week. begin_day = 23 end_day = 29 - - var/static/list/rainbow_colors = list( - COLOR_PRIDE_PURPLE, - COLOR_PRIDE_BLUE, - COLOR_PRIDE_GREEN, - COLOR_PRIDE_YELLOW, - COLOR_PRIDE_ORANGE, - COLOR_PRIDE_RED, + holiday_colors = list( + COLOR_PRIDE_PURPLE, + COLOR_PRIDE_BLUE, + COLOR_PRIDE_GREEN, + COLOR_PRIDE_YELLOW, + COLOR_PRIDE_ORANGE, + COLOR_PRIDE_RED, ) -/// Given an atom, will return what color it should be to match the pride flag. -/datum/holiday/pride_week/proc/get_floor_tile_color(atom/atom) - var/turf/turf = get_turf(atom) - return rainbow_colors[(turf.y % rainbow_colors.len) + 1] - // JULY /datum/holiday/doctor @@ -740,7 +763,6 @@ /datum/holiday/hebrew/passover/getStationPrefix() return pick("Matzah", "Moses", "Red Sea") - // HOLIDAY ADDONS /datum/holiday/xmas/celebrate() diff --git a/code/modules/industrial_lift/tram/tram_floors.dm b/code/modules/industrial_lift/tram/tram_floors.dm index 83f82e2d131..3d4cff43ccb 100644 --- a/code/modules/industrial_lift/tram/tram_floors.dm +++ b/code/modules/industrial_lift/tram/tram_floors.dm @@ -1,8 +1,15 @@ +/turf/open/floor/noslip/tram + name = "high-traction platform" + icon_state = "noslip_tram" + base_icon_state = "noslip_tram" + floor_tile = /obj/item/stack/tile/noslip/tram + /turf/open/floor/noslip/tram_plate name = "linear induction plate" desc = "The linear induction plate that powers the tram." icon_state = "tram_plate" base_icon_state = "tram_plate" + floor_tile = /obj/item/stack/tile/noslip/tram_plate slowdown = 0 flags_1 = NONE @@ -15,9 +22,9 @@ /turf/open/floor/noslip/tram_platform name = "tram platform" - desc = "A sturdy looking tram platform." icon_state = "tram_platform" base_icon_state = "tram_platform" + floor_tile = /obj/item/stack/tile/noslip/tram_platform slowdown = 0 /turf/open/floor/noslip/tram_plate/broken_states() diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 4ba733b29dc..fdddb793362 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index c36999a00e2..c8a228c9a6b 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index b6a4f8347c5..8a1575fcec6 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi b/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi index fc6c9731728..f919288a0f7 100644 Binary files a/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi and b/modular_skyrat/modules/aesthetics/floors/icons/floors.dmi differ