cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixy

Browse Source
This commit is contained in:
VerySoft
2022-06-18 20:31:11 -04:00
parent 4cbe9a028e
commit f7f9d4f5f0
13 changed files with 83 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/materials.dm
-11
View File
@@ -66,16 +66,6 @@
/obj/fiftyspawner/tealcarpet
)
<<<<<<< HEAD
/datum/supply_pack/materials/arcade_carpet
name = "Retro carpets"
containertype = /obj/structure/closet/crate/grayson
containername = "Retro carpets crate"
cost = 15
contains = list(
/obj/fiftyspawner/decocarpet,
/obj/fiftyspawner/retrocarpet
=======
/datum/supply_pack/materials/retrocarpet
name = "Retro carpet"
containertype = /obj/structure/closet/crate/grayson
@@ -85,7 +75,6 @@
/obj/fiftyspawner/geocarpet,
/obj/fiftyspawner/retrocarpet,
/obj/fiftyspawner/retrocarpet_red
>>>>>>> f7cc15b0988... Merge pull request #8556 from Cerebulon/arcadecarpets
)
/datum/supply_pack/materials/linoleum