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

Merge pull request #45454 from Qustinnus/fixmats

Browse Source 
fixes some minor material bugs
This commit is contained in:
oranges
2019-07-25 21:12:04 +12:00
committed by GitHub
parent 081bc8d69d fcd855ea70
commit 886cbc41aa
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/material_container.dm
+1 -1
View File
@@ -341,7 +341,7 @@
if(!istype(I))
return FALSE
var/material_amount = 0
for(var/MAT in I.materials)
for(var/MAT in materials)
material_amount += I.materials[MAT]
return material_amount
code/game/mecha/mech_fabricator.dm
+5 -6
View File
@@ -104,7 +104,8 @@
var/i = 0
var/output
for(var/c in D.materials)
output += "[i?" | ":null][get_resource_cost_w_coeff(D, c)] [material2name(c)]"
var/datum/material/M = c
output += "[i?" | ":null][get_resource_cost_w_coeff(D, M)] [M.name]"
i++
return output
@@ -399,9 +400,9 @@
..()
/obj/machinery/mecha_part_fabricator/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted)
var/stack_name = material2name(id_inserted)
add_overlay("fab-load-[stack_name]")
addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[stack_name]"), 10)
var/datum/material/M = id_inserted
add_overlay("fab-load-[M.name]")
addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[M.name]"), 10)
updateUsrDialog()
/obj/machinery/mecha_part_fabricator/attackby(obj/item/W, mob/user, params)
@@ -413,8 +414,6 @@
return ..()
/obj/machinery/mecha_part_fabricator/proc/material2name(ID)
return copytext(ID,2)
/obj/machinery/mecha_part_fabricator/proc/is_insertion_ready(mob/user)
if(panel_open)