cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3767 from Tastyfish/silence

Browse Source 
Tranquillité, Prospérité & Mimeré
This commit is contained in:
TheDZD
2016-03-08 19:32:29 -05:00
parent fe128c4f7b ee32984535
commit 4e47626af7
41 changed files with 837 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/material_container.dm
+10 -1
View File
@@ -38,6 +38,8 @@
materials[MAT_PLASMA] = new /datum/material/plasma()
if(mat_list[MAT_BANANIUM])
materials[MAT_BANANIUM] = new /datum/material/bananium()
if(mat_list[MAT_TRANQUILLITE])
materials[MAT_TRANQUILLITE] = new /datum/material/tranquillite()
/datum/material_container/Destroy()
owner = null
@@ -262,4 +264,11 @@
/datum/material/bananium/New()
..()
material_type = MAT_BANANIUM
sheet_type = /obj/item/stack/sheet/mineral/bananium
sheet_type = /obj/item/stack/sheet/mineral/bananium
/datum/material/tranquillite
/datum/material/tranquillite/New()
..()
material_type = MAT_TRANQUILLITE
sheet_type = /obj/item/stack/sheet/mineral/tranquillite