shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891

Browse Source
This commit is contained in:
LetterJay
2017-06-08 03:36:39 -05:00
parent 3563459d15 06d5f29d9d
commit 9b840ae323
16 changed files with 195 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/tile_types.dm
+5
View File
@@ -107,6 +107,11 @@
turf_type = /turf/open/floor/carpet
resistance_flags = FLAMMABLE
/obj/item/stack/tile/carpet/black
name = "black carpet"
icon_state = "tile-carpet-black"
turf_type = /turf/open/floor/carpet/black
/obj/item/stack/tile/fakespace
name = "astral carpet"