cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert /material to /datum/material

Browse Source
This commit is contained in:
ShadowLarkens
2020-09-27 16:16:44 -07:00
parent 6ffd4e86c3
commit 3d7b051f2b
41 changed files with 185 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/broken.dm
+1 -1
View File
@@ -37,7 +37,7 @@
var/res_name = ""
if(ispath(res,/obj/item/stack/material))
var/obj/item/stack/material/mat_stack = res
var/material/mat = get_material_by_name("[initial(mat_stack.default_type)]")
var/datum/material/mat = get_material_by_name("[initial(mat_stack.default_type)]")
if(material_needs[resource]>1)
res_name = "[mat.use_name] [mat.sheet_plural_name]"
else
code/modules/projectiles/guns/magnetic/magnetic_construction.dm
+1 -1
View File
@@ -11,7 +11,7 @@
if(istype(thing, /obj/item/stack/material) && construction_stage == 1)
var/obj/item/stack/material/reinforcing = thing
var/material/reinforcing_with = reinforcing.get_material()
var/datum/material/reinforcing_with = reinforcing.get_material()
if(reinforcing_with.name == DEFAULT_WALL_MATERIAL) // Steel
if(reinforcing.get_amount() < 5)
to_chat(user, "<span class='warning'>You need at least 5 [reinforcing.singular_name]\s for this task.</span>")