Skip to content

Commit

Permalink
Revert "Macro Helper For Re-Used Turf_Decal Patterns"
Browse files Browse the repository at this point in the history 
This reverts commit f939c1e.
  • Loading branch information
@san7890
san7890 committed Mar 22, 2023
1 parent f939c1e commit be8c617
Show file tree
Hide file tree
Showing 2 changed files with 1,214 additions and 195 deletions.
206 changes: 140 additions & 66 deletions code/game/objects/effects/decals/turfdecal/markings.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,197 +225,273 @@
/obj/effect/turf_decal/mining/survival
icon_state = "survival"

#define SIDING_SUBTYPE_HELPER(path)\
##path/corner{\
icon_state = "siding_corner"
}\
##path/end{\
icon_state = "siding_end"
}

/obj/effect/turf_decal/siding
name = "siding"
icon_state = "siding_line"

/obj/effect/turf_decal/siding/white
name = "white siding"
color = "#BCBCBC"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/white)
/obj/effect/turf_decal/siding/white/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/white/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/red
name = "red siding"
color = "#DE3A3A"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/red)
/obj/effect/turf_decal/siding/red/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/red/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/dark_red
name = "dark red siding"
color = "#B11111"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark_red)
/obj/effect/turf_decal/siding/dark_red/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark_red/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/green
name = "green siding"
color = "#9FED58"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/green)
/obj/effect/turf_decal/siding/green/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/green/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/dark_green
name = "dark green siding"
color = "#439C1E"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark_green)
/obj/effect/turf_decal/siding/dark_green/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark_green/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/blue
name = "blue siding"
color = "#52B4E9"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/blue)
/obj/effect/turf_decal/siding/blue/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/blue/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/dark_blue
name = "dark blue siding"
color = "#486091"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark_blue)
/obj/effect/turf_decal/siding/dark_blue/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark_blue/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/yellow
name = "yellow siding"
color = "#EFB341"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/yellow)
/obj/effect/turf_decal/siding/yellow/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/yellow/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/purple
name = "purple siding"
color = "#D381C9"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/purple)
/obj/effect/turf_decal/siding/purple/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/purple/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/brown
name = "brown siding"
color = "#A46106"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/brown)
/obj/effect/turf_decal/siding/brown/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/brown/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/dark
name = "dark siding"
color = "#474747"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark)
/obj/effect/turf_decal/siding/dark/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark/end
icon_state = "siding_end"

/obj/effect/turf_decal/siding/wood
name = "wood siding"
icon_state = "siding_wood_line"
color = "#5d341f"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wood)
/obj/effect/turf_decal/siding/wood/corner
icon_state = "siding_wood_corner"

/obj/effect/turf_decal/siding/wood/end
icon_state = "siding_wood_end"

/obj/effect/turf_decal/siding/thinplating
name = "thin plating"
icon_state = "siding_thinplating_line"
color = "#aaaaaa"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating)
/obj/effect/turf_decal/siding/thinplating/corner
icon_state = "siding_thinplating_corner"

/obj/effect/turf_decal/siding/thinplating/end
icon_state = "siding_thinplating_end"

/obj/effect/turf_decal/siding/thinplating/light
name = "light thin plating"
color = "#FFFFFF"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating/light)
/obj/effect/turf_decal/siding/thinplating/light/corner
icon_state = "siding_thinplating_corner"

/obj/effect/turf_decal/siding/thinplating/light/end
icon_state = "siding_thinplating_end"

/obj/effect/turf_decal/siding/thinplating/dark
icon_state = "siding_thinplating_line"
color = "#474747"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating/dark)
/obj/effect/turf_decal/siding/thinplating/dark/corner
icon_state = "siding_thinplating_corner"

/obj/effect/turf_decal/siding/thinplating/dark/end
icon_state = "siding_thinplating_end"

/obj/effect/turf_decal/siding/thinplating/terracotta
name = "thin terracotta plating"
icon_state = "siding_thinplating_line"
color = "#b84221"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating/terracotta)
/obj/effect/turf_decal/siding/thinplating/terracotta/corner
icon_state = "siding_thinplating_corner"

/obj/effect/turf_decal/siding/thinplating/terracotta/end
icon_state = "siding_thinplating_end"

/obj/effect/turf_decal/siding/wideplating
name = "wide plating"
icon_state = "siding_wideplating_line"
color = "#aaaaaa"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating)
/obj/effect/turf_decal/siding/wideplating/corner
icon_state = "siding_wideplating_corner"

/obj/effect/turf_decal/siding/wideplating/end
icon_state = "siding_wideplating_end"

/obj/effect/turf_decal/siding/wideplating/light
name = "light wide plating"
color = "#FFFFFF"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating/light)
/obj/effect/turf_decal/siding/wideplating/light/corner
icon_state = "siding_wideplating_corner"

/obj/effect/turf_decal/siding/wideplating/light/end
icon_state = "siding_wideplating_end"

/obj/effect/turf_decal/siding/wideplating/dark
name = "dark wide plating"
icon_state = "siding_wideplating_line"
color = "#474747"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating/dark)
/obj/effect/turf_decal/siding/wideplating/dark/corner
icon_state = "siding_wideplating_corner"

/obj/effect/turf_decal/siding/wideplating/dark/end
icon_state = "siding_wideplating_end"

/obj/effect/turf_decal/siding/wideplating/terracotta
name = "wide terracotta plating"
icon_state = "siding_wideplating_line"
color = "#b84221"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating/terracotta)
/obj/effect/turf_decal/siding/wideplating/terracotta/corner
icon_state = "siding_wideplating_corner"

/obj/effect/turf_decal/siding/wideplating/terracotta/end
icon_state = "siding_wideplating_end"

/obj/effect/turf_decal/siding/thinplating_new
name = "new thin plating"
icon_state = "siding_thinplating_new_line"
color = "#949494"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new)
/obj/effect/turf_decal/siding/thinplating_new/corner
icon_state = "siding_thinplating_new_corner"

/obj/effect/turf_decal/siding/thinplating_new/end
icon_state = "siding_thinplating_new_end"

/obj/effect/turf_decal/siding/thinplating_new/light
name = "light new thin plating"
color = "#e2e2e2"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new/light)
/obj/effect/turf_decal/siding/thinplating_new/light/corner
icon_state = "siding_thinplating_new_corner"

/obj/effect/turf_decal/siding/thinplating_new/light/end
icon_state = "siding_thinplating_new_end"

/obj/effect/turf_decal/siding/thinplating_new/dark
name = "dark new thin plating"
icon_state = "siding_thinplating_new_line"
color = "#36373a"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new/dark)
/obj/effect/turf_decal/siding/thinplating_new/dark/corner
icon_state = "siding_thinplating_new_corner"

/obj/effect/turf_decal/siding/thinplating_new/dark/end
icon_state = "siding_thinplating_new_end"

/obj/effect/turf_decal/siding/thinplating_new/terracotta
name = "new thin terracotta plating"
icon_state = "siding_thinplating_new_line"
color = "#b84221"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new/terracotta)
/obj/effect/turf_decal/siding/thinplating_new/terracotta/corner
icon_state = "siding_thinplating_new_corner"

/obj/effect/turf_decal/siding/thinplating_new/terracotta/end
icon_state = "siding_thinplating_new_end"

/obj/effect/turf_decal/siding/wideplating_new
name = "new wide plating"
icon_state = "siding_wideplating_new_line"
color = "#949494"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new)
/obj/effect/turf_decal/siding/wideplating_new/corner
icon_state = "siding_wideplating_new_corner"

/obj/effect/turf_decal/siding/wideplating_new/end
icon_state = "siding_wideplating_new_end"

/obj/effect/turf_decal/siding/wideplating_new/light
name = "light new wide plating"
color = "#e2e2e2"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new/light)
/obj/effect/turf_decal/siding/wideplating_new/light/corner
icon_state = "siding_wideplating_new_corner"

/obj/effect/turf_decal/siding/wideplating_new/light/end
icon_state = "siding_wideplating_new_end"

/obj/effect/turf_decal/siding/wideplating_new/dark
name = "dark new wide plating"
icon_state = "siding_wideplating_new_line"
color = "#36373a"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new/dark)
/obj/effect/turf_decal/siding/wideplating_new/dark/corner
icon_state = "siding_wideplating_new_corner"

/obj/effect/turf_decal/siding/wideplating_new/dark/end
icon_state = "siding_wideplating_new_end"

/obj/effect/turf_decal/siding/wideplating_new/terracotta
name = "new wide terracotta plating"
icon_state = "siding_wideplating_new_line"
color = "#b84221"

SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new/terracotta)
/obj/effect/turf_decal/siding/wideplating_new/terracotta/corner
icon_state = "siding_wideplating_new_corner"

/obj/effect/turf_decal/siding/wideplating_new/terracotta/end
icon_state = "siding_wideplating_new_end"

/// ALPHANUMERIC DECALS (SO FAR ONLY FOR CHESS ALGEBRAIC NOTATION) ///

Expand Down Expand Up @@ -466,5 +542,3 @@ SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new/terracotta)

/obj/effect/turf_decal/board_letter/h
icon_state = "board_h"

#undef SIDING_SUBTYPE_HELPER

0 comments on commit be8c617

Please sign in to comment.