cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[FEATURE] Decal painter (#27036)

Browse Source 
* Add_Decal_Painter

* Seperate TGUI file

* Decal painter DmIcon

* Fix some merge errors

* I don't know why this merge is so incredibly fucked

* Update TGUI bundle

* I swear to god

* Fixes DmIcon

* TGUI bundle build

* Remove implicit var

* Final cleanup

* Add decal_painter sprite

* Update code/game/objects/items/devices/painter/decal_painter.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Add helper proc for deleting all components of a type from a datum

* Added comments to cycle_style

* Elementized decal fixes

* Use the new decal system

* TGUI bundle

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Chap
2024-11-29 14:30:48 +00:00
committed by GitHub
co-authored by Luc Adrer Burzah
parent 3cc903c0e7
commit f0ac13b80b
13 changed files with 311 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/turf_decal.dm
+2 -2
View File
@@ -3,11 +3,11 @@
icon_state = "warningline"
layer = TURF_DECAL_LAYER
/obj/effect/turf_decal/Initialize(mapload)
/obj/effect/turf_decal/Initialize(mapload, _dir)
..()
. = INITIALIZE_HINT_QDEL
var/turf/T = loc
if(!istype(T)) //you know this will happen somehow
CRASH("Turf decal initialized in an object/nullspace")
T.AddElement(/datum/element/decal, icon, icon_state, dir, layer, alpha, color, FALSE, null)
T.AddElement(/datum/element/decal, icon, icon_state, _dir || dir, layer, alpha, color, FALSE, null)
code/game/objects/effects/decals/turfdecals/markings.dm
-3
View File
@@ -199,9 +199,6 @@
/obj/effect/turf_decal/siding/box
icon_state = "siding_box"
/obj/effect/turf_decal/raven_ship_sign
icon_state = "RAVEN2"
/obj/effect/turf_decal/raven/one
icon_state = "RAVEN1"
code/game/objects/effects/decals/turfdecals/weather_decals.dm
+5
View File
@@ -2,6 +2,11 @@
name = "sandy floor"
icon_state = "sandyfloor"
/obj/effect/turf_decal/weather/snow
name = "snowy floor"
icon = 'icons/turf/snow.dmi'
icon_state = "snow"
/obj/effect/turf_decal/weather/snow/corner
name = "snow corner piece"
icon = 'icons/turf/snow.dmi'