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

Adds Happy carpet

Browse Source
This commit is contained in:
Casey
2022-06-19 03:59:10 +00:00
committed by CHOMPStation2
parent 1740fb34de
commit d4f8e75cd6
5 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+11
View File
@@ -36,6 +36,17 @@
name = "stack of retro carpet"
type_to_spawn = /obj/item/stack/tile/carpet/retro
<<<<<<< HEAD
=======
/obj/fiftyspawner/retrocarpet_red
name = "stack of red retro carpet"
type_to_spawn = /obj/item/stack/tile/carpet/retro_red
/obj/fiftyspawner/happycarpet
name = "stack of happy carpet"
type_to_spawn = /obj/item/stack/tile/carpet/happy
>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
/obj/fiftyspawner/floor
name = "stack of floor tiles"
type_to_spawn = /obj/item/stack/tile/floor
code/game/objects/items/stacks/tiles/tile_types.dm
+13
View File
@@ -119,6 +119,19 @@
/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw //CHOMP Comment: Yawn commented out this block, but CHOMP already commented out this stuff so I just removed theirs.
<<<<<<< HEAD
=======
/obj/item/stack/tile/carpet/retro_red
icon_state = "tile-carpet-retro-red"
desc = "A piece of carpet with red-ical space patterns. It is the same size as a normal floor tile!"
/obj/item/stack/tile/carpet/happy
icon_state = "tile-carpet-happy"
desc = "A piece of carpet with happy patterns. It is the same size as a normal floor tile!"
// TODO - Add descriptions to these
/obj/item/stack/tile/carpet/bcarpet
>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/blucarpet
icon_state = "tile-carpet"