cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +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/items/tools/engineering/painter/paintable_decals.dm
-2
View File
@@ -181,7 +181,6 @@
"Engi Yellow" = /obj/effect/turf_decal/tile/yellow::color,
"Med Blue" = /obj/effect/turf_decal/tile/blue::color,
"R&D Purple" = /obj/effect/turf_decal/tile/purple::color,
"Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/tile/red::color,
"Service Green" = /obj/effect/turf_decal/tile/green::color,
"Custom" = "custom",
@@ -236,7 +235,6 @@
"Engi Yellow" = /obj/effect/turf_decal/siding/yellow::color,
"Med Blue" = /obj/effect/turf_decal/siding/blue::color,
"R&D Purple" = /obj/effect/turf_decal/siding/purple::color,
"Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/siding/red::color,
"Service Green" = /obj/effect/turf_decal/siding/green::color,
"Custom" = "custom",