cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Floor decals are no longer rainbow-colored every round during pride week (#96557)

Browse Source
This commit is contained in:
Ghom
2026-06-21 22:13:13 +00:00
committed by GitHub
parent 5abe096b5b
commit e700e5c8b1
7 changed files with 89 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/decal.dm
+1 -1
View File
@@ -70,7 +70,7 @@
// If the tile uses holiday colors, apply them here
if(use_holiday_colors)
var/custom_color = request_station_colors(src, pattern) || request_holiday_colors(src, pattern)
var/custom_color = request_decoration_colors(src, pattern)
if(custom_color)
color = custom_color
alpha = DECAL_ALPHA
code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+3 -3
View File
@@ -143,7 +143,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark)
color = COLOR_RED
/obj/effect/turf_decal/tile/holiday/Initialize(mapload)
color = request_holiday_colors(src, pattern)
color = request_decoration_colors(src, pattern, skip_station_trait = TRUE)
alpha = DECAL_ALPHA
return ..()
@@ -176,7 +176,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/holiday/random)
/obj/effect/turf_decal/trimline/tram/filled/corner/Initialize(mapload)
if(use_holiday_colors)
var/current_holiday_color = request_holiday_colors(src, pattern)
var/current_holiday_color = request_decoration_colors(src, pattern)
if(current_holiday_color)
color = current_holiday_color
alpha = DECAL_ALPHA
@@ -186,7 +186,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/holiday/random)
/obj/effect/turf_decal/trimline/tram/filled/line/Initialize(mapload)
if(use_holiday_colors)
var/current_holiday_color = request_holiday_colors(src, pattern)
var/current_holiday_color = request_decoration_colors(src, pattern)
if(current_holiday_color)
color = current_holiday_color
alpha = DECAL_ALPHA