shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties

Browse Source
This commit is contained in:
Kraseo
2020-03-06 11:58:11 +01:00
parent edfe50579e 0a68143a3e
commit ad20fb1a0e
460 changed files with 212409 additions and 207837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports/materials.dm
+2 -2
View File
@@ -15,10 +15,10 @@
if(!isitem(O))
return 0
var/obj/item/I = O
if(!(getmaterialref(material_id) in I.custom_materials))
if(!(SSmaterials.GetMaterialRef(material_id) in I.custom_materials))
return 0
var/amount = I.custom_materials[getmaterialref(material_id)]
var/amount = I.custom_materials[SSmaterials.GetMaterialRef(material_id)]
if(istype(I, /obj/item/stack/ore))
amount *= 0.8 // Station's ore redemption equipment is really goddamn good.