Merge pull request #5004 from CHOMPStation2/upstream-merge-13467

[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
This commit is contained in:
Razgriz
2022-09-22 22:10:59 -07:00
committed by GitHub
47 changed files with 10736 additions and 2342 deletions
+8 -1
View File
@@ -83,4 +83,11 @@
containertype = /obj/structure/closet/crate/grayson
containername = "Linoleum crate"
cost = 15
contains = list(/obj/fiftyspawner/linoleum)
contains = list(/obj/fiftyspawner/linoleum)
/datum/supply_pack/materials/concrete
name = "Concrete"
cost = 10
containertype = /obj/structure/closet/crate/grayson
contains = list(/obj/fiftyspawner/concrete)
containername = "Concrete bricks crate"