Merge branch 'master' of https://github.com/VOREStation/VOREStation into tgui-input-conversions

This commit is contained in:
ItsSelis
2022-06-19 03:05:08 +02:00
22 changed files with 223 additions and 77 deletions
+7 -6
View File
@@ -66,17 +66,18 @@
/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(
/obj/fiftyspawner/decocarpet,
/obj/fiftyspawner/retrocarpet
/obj/fiftyspawner/geocarpet,
/obj/fiftyspawner/retrocarpet,
/obj/fiftyspawner/retrocarpet_red
)
/datum/supply_pack/misc/linoleum
/datum/supply_pack/materials/linoleum
name = "Linoleum"
containertype = /obj/structure/closet/crate/grayson
containername = "Linoleum crate"