cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-07-13 19:02:22 -04:00
committed by GitHub
parent f7898cb32b
commit f6ad66e76f
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/tile_types.dm
+1 -4
View File
@@ -167,9 +167,6 @@
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/oracarpet
icon_state = "tile-carpet"
<<<<<<< HEAD
*/
=======
/obj/item/stack/tile/carpet/brncarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/blucarpet2
@@ -178,7 +175,7 @@
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/purplecarpet
icon_state = "tile-carpet"
>>>>>>> 4f394a9221... Merge pull request #12911 from Youtubeboy139/Monch
*/
/obj/item/stack/tile/floor
name = "floor tile"