cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds Happy carpet

Browse Source
This commit is contained in:
Casey
2022-06-18 23:58:23 -04: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

7
code/datums/supplypacks/materials.dm
View File

@@ -72,8 +72,15 @@
containername = "Retro carpets crate"
cost = 15
contains = list(
<<<<<<< HEAD
/obj/fiftyspawner/decocarpet,
/obj/fiftyspawner/retrocarpet
=======
/obj/fiftyspawner/geocarpet,
/obj/fiftyspawner/retrocarpet,
/obj/fiftyspawner/retrocarpet_red,
/obj/fiftyspawner/happycarpet
>>>>>>> e0ef010384... Merge pull request #13114 from Heroman3003/happycarpet
)
/datum/supply_pack/misc/linoleum