cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-14206

Browse Source
This commit is contained in:
Razgriz
2022-12-15 15:24:53 -07:00
committed by GitHub
parent ce917585ea ec97a3d32f
commit ba4b775d6c
8 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/datums/components/material_container.dm
View File

@@ -140,7 +140,12 @@
return
// Cache this since S may go away after use()
var/list/sheet_matter = S.matter
var/list/sheet_matter
if(istype(S, /obj/item/stack/material))
var/obj/item/stack/material/MS = S
sheet_matter = list(MS.material.name = 2000)
else
sheet_matter = S.matter
// Calculate total amount of material for one sheet
var/matter_per_sheet = 0