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
2023-03-17 02:20:31 -04:00
committed by GitHub
parent a0747e4d47
commit 8a693c6c71
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/flooring/flooring.dm
-9
View File
@@ -286,13 +286,8 @@ var/list/flooring_types
icon_base = "snowyplayingdrift"
/decl/flooring/carpet
<<<<<<< HEAD
name = "red carpet" //CHOMPEDIT renamed to red carpet
desc = "Imported and comfy."
=======
name = "carpet"
desc = "Lush synthetic carpeting, perfectly engineered for easy cleaning."
>>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962
icon = 'icons/turf/flooring/carpet.dmi'
icon_base = "carpet"
build_type = /obj/item/stack/tile/carpet
@@ -316,11 +311,7 @@ var/list/flooring_types
build_type = /obj/item/stack/tile/carpet/blucarpet
/decl/flooring/carpet/turcarpet
<<<<<<< HEAD
name = "turquoise carpet" //CHOMPstation edit: changing name to turquoise
=======
name = "turquoise carpet"
>>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962
icon_base = "turcarpet"
build_type = /obj/item/stack/tile/carpet/turcarpet