Skip to content

Commit

Permalink
Macro Helper For Re-Used Turf_Decal Patterns (#74171)
Browse files Browse the repository at this point in the history
![image](https://user-images.githubusercontent.com/34697715/226807239-92f9f2b9-d5ec-4ce9-a023-2e13219aee62.png)

oh that's sexy

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Hey there, blast from the past PR format. Can you spot the issue here?


![image](https://user-images.githubusercontent.com/34697715/226803527-6554007a-07ce-4f68-aabd-a5baacd33c50.png)

Well, I did while working on #74169, and it pissed me off. This is a
really simple pattern, and the only reason why it's just copypasted (and
prone to such errors) is because no one took the time to do it properly
like this. So, I just decided to do it while I had time today. Very
nice.

I also removed all the names because there was no point in them: in all
contexts you would be operating off the typepath, the name would never
come up. like so:


![image](https://user-images.githubusercontent.com/34697715/226807007-c5531f18-64ee-4ca7-b9d8-8f1ac24f3a24.png)

memory save? it's just un-needed anyways

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Silly error proofing is nice! Way easier to add new colors! No need to
ctrl+c/ctrl+v everything to death anymore! whoopie

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

Nothing that players should fret about.

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
san7890 committed Mar 24, 2023
1 parent a4cca4f commit cfa9d94
Show file tree
Hide file tree
Showing 2 changed files with 157 additions and 1,214 deletions.
179 changes: 39 additions & 140 deletions code/game/objects/effects/decals/turfdecal/markings.dm
Original file line number Diff line number Diff line change
Expand Up @@ -225,273 +225,170 @@
/obj/effect/turf_decal/mining/survival
icon_state = "survival"

/// Automatically generates all subtypes for a siding with the given path.
#define SIDING_SUBTYPE_HELPER(path)\
##path/corner{\
icon_state = "siding_corner";\
}\
##path/end{\
icon_state = "siding_end";\
}

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

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

/obj/effect/turf_decal/siding/white/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/white/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/white)

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

/obj/effect/turf_decal/siding/red/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/red/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/red)

/obj/effect/turf_decal/siding/dark_red
color = "#B11111"

/obj/effect/turf_decal/siding/dark_red/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark_red/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark_red)

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

/obj/effect/turf_decal/siding/green/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/green/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/green)

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

/obj/effect/turf_decal/siding/dark_green/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark_green/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark_green)

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

/obj/effect/turf_decal/siding/blue/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/blue/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/blue)

/obj/effect/turf_decal/siding/dark_blue
color = "#486091"

/obj/effect/turf_decal/siding/dark_blue/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark_blue/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark_blue)

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

/obj/effect/turf_decal/siding/yellow/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/yellow/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/yellow)

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

/obj/effect/turf_decal/siding/purple/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/purple/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/purple)

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

/obj/effect/turf_decal/siding/brown/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/brown/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/brown)

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

/obj/effect/turf_decal/siding/dark/corner
icon_state = "siding_corner"

/obj/effect/turf_decal/siding/dark/end
icon_state = "siding_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/dark)

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

/obj/effect/turf_decal/siding/wood/corner
icon_state = "siding_wood_corner"

/obj/effect/turf_decal/siding/wood/end
icon_state = "siding_wood_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wood)

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

/obj/effect/turf_decal/siding/thinplating/corner
icon_state = "siding_thinplating_corner"

/obj/effect/turf_decal/siding/thinplating/end
icon_state = "siding_thinplating_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating)

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

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating/light)

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

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating/dark)

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

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating/terracotta)

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

/obj/effect/turf_decal/siding/wideplating/corner
icon_state = "siding_wideplating_corner"

/obj/effect/turf_decal/siding/wideplating/end
icon_state = "siding_wideplating_end"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating)

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

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating/light)

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

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating/dark)

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

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating/terracotta)

/obj/effect/turf_decal/siding/thinplating_new
icon_state = "siding_thinplating_new_line"
color = "#949494"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new)

/obj/effect/turf_decal/siding/thinplating_new/light
color = "#e2e2e2"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new/light)

/obj/effect/turf_decal/siding/thinplating_new/dark
icon_state = "siding_thinplating_new_line"
color = "#36373a"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new/dark)

/obj/effect/turf_decal/siding/thinplating_new/terracotta
icon_state = "siding_thinplating_new_line"
color = "#b84221"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/thinplating_new/terracotta)

/obj/effect/turf_decal/siding/wideplating_new
icon_state = "siding_wideplating_new_line"
color = "#949494"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new)

/obj/effect/turf_decal/siding/wideplating_new/light
color = "#e2e2e2"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new/light)

/obj/effect/turf_decal/siding/wideplating_new/dark
icon_state = "siding_wideplating_new_line"
color = "#36373a"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new/dark)

/obj/effect/turf_decal/siding/wideplating_new/terracotta
icon_state = "siding_wideplating_new_line"
color = "#b84221"

/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"
SIDING_SUBTYPE_HELPER(/obj/effect/turf_decal/siding/wideplating_new/terracotta)

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

Expand Down Expand Up @@ -542,3 +439,5 @@

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

#undef SIDING_SUBTYPE_HELPER

0 comments on commit cfa9d94

Please sign in to comment.