[MDB IGNORE] [IDB IGNORE] The Floorening (#30568)

* New floors and decalized floor tiles.

* satisfy linter

* Add command decals, remove old "blue tile" decal

* update script number

* have ATMs put their decals on last

* add engineering decals

* update spritesheets

* lots of tile coloring fixes

* more engi tile fixes

* more tile fixes

* linters

* fixes conflict?

* fix layering issue

* fix merge conflicts

* merge conflict fix?

* box bridge fix

* holodeck fix, layering fix, chemistry is no longer yellow

chemistry is intended to be a 'light orange' to be placed atop white tiles, just as medical decals are to command decals

* rebuild tgui

* merge master into floorening

* Update 30511_turfdecalsfix.txt

* merge master into floorening

* rebuild tgui

* holodeck fix, null plating fix

* Delete 30511_turfdecalsfix.txt

* updatepaths

* rebuild tgui

* null icon fix

* Update meatpackers.dmm

---------

Co-authored-by: Alexios <skillpointHD@Gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
Ahzpy
2025-10-19 19:05:58 +00:00
committed by GitHub
co-authored by Alexios warriorstar-orion
parent 5db33d455c
commit 428d34980e
84 changed files with 62161 additions and 84556 deletions
@@ -37,14 +37,14 @@
var/selected_category = DECAL_PAINTER_CATEGORY_STANDARD
/// When removal_mode is TRUE the decal painter will remove decals instead
var/removal_mode = FALSE
var/max_decals = 3
var/max_decals = 4
var/static/list/decal_blacklist = typecacheof(
list(
/obj/effect/turf_decal/raven,
/obj/effect/turf_decal/weather,
/obj/effect/turf_decal/stripes/asteroid,
/obj/effect/turf_decal/tile,
/obj/effect/turf_decal/sand
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/plaque,
)
)
/// List of typepaths of turf decals exposed by the painter.
@@ -112,6 +112,7 @@
DECAL_PAINTER_CATEGORY_THICK,
DECAL_PAINTER_CATEGORY_SQUARE,
DECAL_PAINTER_CATEGORY_ALPHANUM,
DECAL_PAINTER_CATEGORY_TILES,
)
data["icon"] = decal_icon
var/list/availableStyles = list()
@@ -9,18 +9,35 @@
var/floor_dir = SOUTH
var/wide_mode = FALSE
var/static/list/allowed_states = list("arrival", "arrivalcorner", "bar", "barber", "bcircuit", "black", "blackcorner", "blue", "bluecorner",
"bluefull", "bluered", "blueyellow", "blueyellowfull", "bot", "brown", "browncorner", "browncornerold", "brownfull", "cafeteria", "caution",
"cautioncorner", "cautionfull", "chapel", "cmo", "dark", "delivery", "escape", "escapecorner", "floor", "floorgrime", "freezerfloor", "gcircuit",
"green", "greenblue", "greenbluefull", "greencorner", "greenfull", "greenyellow", "greenyellowfull", "grimy", "hydrofloor", "loadingarea", "neutral",
"neutralcorner", "neutralfull", "orange", "orangecorner", "orangefull", "purple", "purplecorner", "purplefull", "rcircuit", "rampbottom", "ramptop", "red",
"redblue", "redbluefull", "darkredblue", "darkredbluefull", "redcorner", "redfull", "redgreen", "redgreenfull", "darkredgreen", "darkredgreenfull",
"redyellow", "redyellowfull", "darkredyellow", "darkredyellowfull", "warning", "warningcorner", "warnwhite", "warnwhitecorner", "white",
"whiteblue", "whitebluecorner", "whitebluefull", "whitebot", "whitecorner", "whitedelivery", "whitegreen", "whitegreencorner", "whitegreenfull", "whitehall",
"whitepurple", "whitepurplecorner", "whitepurplefull", "whitered", "whiteredcorner", "whiteredfull", "whiteyellow", "whiteyellowcorner", "whiteyellowfull",
"yellow", "yellowcorner", "yellowcornersiding", "yellowsiding", "darkpurple", "darkpurplecorners", "darkpurplefull",
"darkred", "darkredcorners", "darkredfull", "darkblue", "darkbluecorners", "darkbluefull", "darkgreen", "darkgreencorners",
"darkgreenfull", "darkyellow", "darkyellowcorners", "darkyellowfull", "darkbrown", "darkbrowncorners", "darkbrownfull")
var/static/list/allowed_states = list(
"gcircuit",
"bcircuit",
"rcircuit",
"floorgrime",
"freezerfloor",
"grimy",
"loadingarea",
"rampbottom",
"ramptop",
"tile_standard",
"tile_edge",
"tile_half",
"tile_full",
"tile_corner",
"tile_grid",
"tile_dark_standard",
"tile_dark_edge",
"tile_dark_half",
"tile_dark_full",
"tile_dark_corner",
"tile_dark_grid",
"tile_white_standard",
"tile_white_edge",
"tile_white_half",
"tile_white_full",
"tile_white_corner",
"tile_white_grid",
)
/datum/painter/floor/paint_atom(atom/target, mob/user)
if(!istype(target, /turf/simulated/floor/plasteel))