cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-16 18:36:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'origin/HEAD'

Browse Source
This commit is contained in:
DynaJ0ule
2023-02-06 12:31:43 -05:00
parent 8da38160f3
commit 5209413204
106 changed files with 4743 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/material_container.dm
+6
View File
@@ -381,6 +381,12 @@
sheet_type = /obj/item/stack/sheet/mineral/bananium
coin_type = /obj/item/coin/bananium
/datum/material/calorite //GS13
name = "calorite"
id = MAT_CALORITE
sheet_type = /obj/item/stack/sheet/mineral/calorite
// coin_type = /obj/item/coin/calorite
/datum/material/titanium
name = "Titanium"
id = MAT_TITANIUM
code/datums/components/remote_materials.dm
+1 -1
View File
@@ -54,7 +54,7 @@ handles linking back and forth.
/datum/component/remote_materials/proc/_MakeLocal()
silo = null
mat_container = parent.AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
local_size,
FALSE,
/obj/item/stack)