-
-
Notifications
You must be signed in to change notification settings - Fork 538
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- 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    Adds some greeble SUNS content, such as bedsheets, flags for your desk and wall, an emblem, two logos that took a considerable amount of my life to implement, folders, tiles, and whatnot. <!-- 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 flavorful i think and also imaginos asked me to <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: SUNS 3x6 logo decal, SUNS tiles, SUNS emblem floor decal, Desk and Wall flag, folders, PDA, cards, locker, bedsheets, and headsets. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: 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
1 parent
63b2ff9
commit 58a7ef0
Showing
29 changed files
with
379 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /obj/item/stack/tile/suns | ||
| name = "white marble tile" | ||
| singular_name = "white marble floor tile" | ||
| icon_state = "tile_suns_light" | ||
| turf_type = /turf/open/floor/suns | ||
| tile_reskin_types = list( | ||
| /obj/item/stack/tile/suns/plain, | ||
| /obj/item/stack/tile/suns/pattern, | ||
| /obj/item/stack/tile/suns/hatch, | ||
| /obj/item/stack/tile/suns/diagonal, | ||
| /obj/item/stack/tile/suns/grid, | ||
| /obj/item/stack/tile/suns/dark, | ||
| /obj/item/stack/tile/suns/dark/plain, | ||
| /obj/item/stack/tile/suns/dark/pattern) | ||
|
|
||
| /obj/item/stack/tile/suns/plain | ||
| name = "white plain marble tile" | ||
| singular_name = "white plain marble floor tile" | ||
| icon_state = "tile_suns_lightplain" | ||
| turf_type = /turf/open/floor/suns/plain | ||
|
|
||
| /obj/item/stack/tile/suns/pattern | ||
| name = "patterned white marble tile" | ||
| singular_name = "patterned white marble floor tile" | ||
| icon_state = "tile_suns_lightpattern" | ||
| turf_type = /turf/open/floor/suns/pattern | ||
|
|
||
| /obj/item/stack/tile/suns/hatch | ||
| name = "hatched white marble tile" | ||
| singular_name = "hatched white marble floor tile" | ||
| icon_state = "tile_suns_lighthatched" | ||
| turf_type = /turf/open/floor/suns/hatch | ||
|
|
||
| /obj/item/stack/tile/suns/diagonal | ||
| name = "diagonal white marble tile" | ||
| singular_name = "diagonal white marble floor tile" | ||
| icon_state = "tile_suns_lightdiag" | ||
| turf_type = /turf/open/floor/suns/diagonal | ||
|
|
||
| /obj/item/stack/tile/suns/grid | ||
| name = "dark grid tile" | ||
| singular_name = "dark grid floor floor tile" | ||
| icon_state = "tile_suns_darkchunky" | ||
| turf_type = /turf/open/floor/suns/grid | ||
|
|
||
| /obj/item/stack/tile/suns/dark | ||
| name = "black marble tile" | ||
| singular_name = "black marble floor tile" | ||
| icon_state = "tile_suns_dark" | ||
| turf_type = /turf/open/floor/suns/dark | ||
|
|
||
| /obj/item/stack/tile/suns/dark/plain | ||
| name = "black plain marble tile" | ||
| singular_name = "black plain marble floor tile" | ||
| icon_state = "tile_suns_darkplain" | ||
| turf_type = /turf/open/floor/suns/dark/plain | ||
|
|
||
| /obj/item/stack/tile/suns/dark/pattern | ||
| name = "patterned black marble tile" | ||
| singular_name = "patterned black marble floor tile" | ||
| icon_state = "tile_suns_darkpattern" | ||
| turf_type = /turf/open/floor/suns/dark/pattern | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.