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

Merge branch 'master' into upstream-merge-13114

Browse Source
This commit is contained in:
Nadyr
2022-06-22 21:47:19 -04:00
committed by GitHub
parent d4f8e75cd6 249bf75fd3
commit 5b75024c2f
189 changed files with 7084 additions and 6765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/materials.dm
+4 -9
View File
@@ -66,24 +66,19 @@
/obj/fiftyspawner/tealcarpet
)
/datum/supply_pack/materials/arcade_carpet
name = "Retro carpets"
/datum/supply_pack/materials/retrocarpet
name = "Retro carpet"
containertype = /obj/structure/closet/crate/grayson
containername = "Retro carpets crate"
containername = "Retro carpet 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
/datum/supply_pack/materials/linoleum
name = "Linoleum"
containertype = /obj/structure/closet/crate/grayson
containername = "Linoleum crate"