cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repaths some decals, makes copyTurf copy decals (#22528)

Browse Source 
* why do I do this to myself

* pass 2

* maps

* delete this

* PR number obtained

* Revert "maps"

This reverts commit 87926f4a0c.

* maps
This commit is contained in:
S34N
2023-10-30 19:15:14 +00:00
committed by GitHub
parent 0366df0641
commit 49b0071400
31 changed files with 6373 additions and 3283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/turfdecals/markings.dm
+59 -29
View File
@@ -1,3 +1,6 @@
/obj/effect/turf_decal/stripes
icon_state = "warn_full"
/obj/effect/turf_decal/stripes/line
icon_state = "warningline"
@@ -10,8 +13,8 @@
/obj/effect/turf_decal/stripes/box
icon_state = "warn_box"
/obj/effect/turf_decal/stripes/full
icon_state = "warn_full"
/obj/effect/turf_decal/stripes/asteroid
icon_state = "ast_warn_full"
/obj/effect/turf_decal/stripes/asteroid/line
icon_state = "ast_warn"
@@ -25,8 +28,8 @@
/obj/effect/turf_decal/stripes/asteroid/box
icon_state = "ast_warn_box"
/obj/effect/turf_decal/stripes/asteroid/full
icon_state = "ast_warn_full"
/obj/effect/turf_decal/stripes/white
icon_state = "warn_full_white"
/obj/effect/turf_decal/stripes/white/line
icon_state = "warningline_white"
@@ -40,8 +43,8 @@
/obj/effect/turf_decal/stripes/white/box
icon_state = "warn_box_white"
/obj/effect/turf_decal/stripes/white/full
icon_state = "warn_full_white"
/obj/effect/turf_decal/stripes/red
icon_state = "warn_full_red"
/obj/effect/turf_decal/stripes/red/line
icon_state = "warningline_red"
@@ -55,45 +58,69 @@
/obj/effect/turf_decal/stripes/red/box
icon_state = "warn_box_red"
/obj/effect/turf_decal/stripes/red/full
icon_state = "warn_full_red"
/obj/effect/turf_decal/delivery
icon_state = "delivery"
/obj/effect/turf_decal/delivery/partial
icon_state = "3"
/obj/effect/turf_decal/delivery/hollow
icon_state = "bot"
/obj/effect/turf_decal/delivery/hollow/right
icon_state = "bot_right"
/obj/effect/turf_decal/delivery/hollow/left
icon_state = "bot_left"
/obj/effect/turf_decal/delivery/white
icon_state = "delivery_white"
/obj/effect/turf_decal/delivery/white/partial
icon_state = "13"
/obj/effect/turf_decal/delivery/white/hollow
icon_state = "15"
/obj/effect/turf_decal/delivery/white/hollow/right
icon_state = "bot_right_white"
/obj/effect/turf_decal/delivery/white/hollow/left
icon_state = "bot_left_white"
/obj/effect/turf_decal/delivery/red
icon_state = "delivery_red"
/obj/effect/turf_decal/bot
icon_state = "bot"
/obj/effect/turf_decal/delivery/red/partial
icon_state = "7"
/obj/effect/turf_decal/bot/right
icon_state = "bot_right"
/obj/effect/turf_decal/bot/left
icon_state = "bot_left"
/obj/effect/turf_decal/bot_white
icon_state = "bot_white"
/obj/effect/turf_decal/bot_white/right
icon_state = "bot_right_white"
/obj/effect/turf_decal/bot_white/left
icon_state = "bot_left_white"
/obj/effect/turf_decal/bot_red
/obj/effect/turf_decal/delivery/red/hollow
icon_state = "bot_red"
/obj/effect/turf_decal/bot_red/right
/obj/effect/turf_decal/delivery/red/hollow/right
icon_state = "bot_right_red"
/obj/effect/turf_decal/bot_red/left
/obj/effect/turf_decal/delivery/red/hollow/left
icon_state = "bot_left_red"
/obj/effect/turf_decal/delivery/green
icon_state = "11"
/obj/effect/turf_decal/delivery/green/partial
icon_state = "10"
/obj/effect/turf_decal/delivery/green/hollow
icon_state = "12"
/obj/effect/turf_decal/delivery/blue
icon_state = "17"
/obj/effect/turf_decal/delivery/blue/partial
icon_state = "16"
/obj/effect/turf_decal/delivery/blue/hollow
icon_state = "18"
/obj/effect/turf_decal/loading_area
icon_state = "loadingarea"
@@ -130,6 +157,9 @@
/obj/effect/turf_decal/arrows/red
icon_state = "arrows_red"
/obj/effect/turf_decal/arrows/black
icon_state = "4"
/obj/effect/turf_decal/box
icon_state = "box"
code/game/objects/effects/decals/warning_stripes.dm
-111
View File
@@ -1,111 +0,0 @@
/obj/effect/decal/warning_stripes
icon = 'icons/effects/warning_stripes.dmi'
layer = TURF_LAYER
/obj/effect/decal/warning_stripes/north
icon_state = "N"
/obj/effect/decal/warning_stripes/south
icon_state = "S"
/obj/effect/decal/warning_stripes/east
icon_state = "E"
/obj/effect/decal/warning_stripes/west
icon_state = "W"
/obj/effect/decal/warning_stripes/southeast
icon_state = "NW-in"
/obj/effect/decal/warning_stripes/northwestcorner
icon_state = "NW-out"
/obj/effect/decal/warning_stripes/southwest
icon_state = "NE-in"
/obj/effect/decal/warning_stripes/northeastcorner
icon_state = "NE-out"
/obj/effect/decal/warning_stripes/northeast
icon_state = "SW-in"
/obj/effect/decal/warning_stripes/southwestcorner
icon_state = "SW-out"
/obj/effect/decal/warning_stripes/northwest
icon_state = "SE-in"
/obj/effect/decal/warning_stripes/southeastcorner
icon_state = "SE-out"
/obj/effect/decal/warning_stripes/eastsouthwest
icon_state = "U-N"
/obj/effect/decal/warning_stripes/eastnorthwest
icon_state = "U-S"
/obj/effect/decal/warning_stripes/northeastsouth
icon_state = "U-W"
/obj/effect/decal/warning_stripes/northwestsouth
icon_state = "U-E"
/obj/effect/decal/warning_stripes/Initialize()
. = ..()
var/image/I = image(icon, icon_state = icon_state, dir = dir)
loc.add_overlay(I)
qdel(src)
// Credit to Neinhaus for making these into individual decals.
/obj/effect/decal/warning_stripes/arrow
icon_state = "4"
/obj/effect/decal/warning_stripes/yellow
icon_state = "5"
/obj/effect/decal/warning_stripes/yellow/partial
icon_state = "3"
/obj/effect/decal/warning_stripes/yellow/hollow
icon_state = "6"
/obj/effect/decal/warning_stripes/red
icon_state = "8"
/obj/effect/decal/warning_stripes/red/partial
icon_state = "7"
/obj/effect/decal/warning_stripes/red/hollow
icon_state = "9"
/obj/effect/decal/warning_stripes/green
icon_state = "11"
/obj/effect/decal/warning_stripes/green/partial
icon_state = "10"
/obj/effect/decal/warning_stripes/green/hollow
icon_state = "12"
/obj/effect/decal/warning_stripes/white
icon_state = "14"
/obj/effect/decal/warning_stripes/white/partial
icon_state = "13"
/obj/effect/decal/warning_stripes/white/hollow
icon_state = "15"
/obj/effect/decal/warning_stripes/blue
icon_state = "17"
/obj/effect/decal/warning_stripes/blue/partial
icon_state = "16"
/obj/effect/decal/warning_stripes/blue/hollow
icon_state = "18"