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

Merge branch 'master' into upstream-feb12-2026

Browse Source
This commit is contained in:
Alexis
2026-03-02 07:42:16 -05:00
parent 4dc38c0ad6 b721351dd4
commit 5c5a636485
385 changed files with 227785 additions and 5757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/turfdecal/markings.dm
+1 -1
View File
@@ -253,7 +253,7 @@
icon_state = "siding_plain_end"
/obj/effect/turf_decal/siding/red
color = "#486091" //SKYRAT EDIT CHANGE
color = "#DE3A3A"
/obj/effect/turf_decal/siding/red/corner
icon_state = "siding_plain_corner"
code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+2 -2
View File
@@ -83,7 +83,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow)
/obj/effect/turf_decal/tile/red
name = "red tile decal"
color = "#486091" // SKYRAT EDIT CHANGE
color = "#DE3A3A"
TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red)
@@ -275,7 +275,7 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/white)
/// Red trimlines
/obj/effect/turf_decal/trimline/red
color = "#486091" //SKYRAT EDIT CHANGE
color = "#DE3A3A"
TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/red)