Merge branch 'master' into economy-update-junk

This commit is contained in:
Dahlular
2022-07-06 16:28:45 -06:00
committed by GitHub
196 changed files with 865 additions and 721 deletions
@@ -82,21 +82,21 @@
item_state = "tile-fairygrass"
turf_type = /turf/open/floor/grass/fairy
resistance_flags = FLAMMABLE
color = "#33CCFF"
color = COLOR_BLUE_LIGHT
/obj/item/stack/tile/fairygrass/white
name = "white fairygrass tile"
singular_name = "white fairygrass floor tile"
desc = "A patch of odd, glowing white grass."
turf_type = /turf/open/floor/grass/fairy/white
color = "#FFFFFF"
color = COLOR_WHITE
/obj/item/stack/tile/fairygrass/red
name = "red fairygrass tile"
singular_name = "red fairygrass floor tile"
desc = "A patch of odd, glowing red grass."
turf_type = /turf/open/floor/grass/fairy/red
color = "#FF3333"
color = COLOR_RED_LIGHT
/obj/item/stack/tile/fairygrass/yellow
name = "yellow fairygrass tile"