cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-06-22 20:30:26 -04:00
committed by GitHub
parent c1bfb4b032
commit c80dcd3976
1 changed files with 0 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
-4
View File
@@ -114,11 +114,7 @@
build_type = /obj/item/stack/tile/wood
<<<<<<< HEAD
//CHOMPEDIT: Moving carpets to tile_types_ch to give them proper names, descriptions and material variables
=======
>>>>>>> 0f7ef0cce1... Merge pull request #12800 from VOREStation/upstream-merge-8556
/*
/obj/item/stack/tile/carpet
name = "carpet"