Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into DarkTheme

This commit is contained in:
Jon
2018-12-22 14:46:19 +00:00
24 changed files with 168 additions and 91 deletions
@@ -102,6 +102,8 @@
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/oracarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/rainbowcarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/floor
name = "floor tile"