cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #788 from Aranclanos/miningqdel

Browse Source 
Mining qdel
This commit is contained in:
Rob Nelson
2014-05-23 12:28:00 -07:00
parent 6b7e9c83f6 641d6b34ff
commit 703bc40731
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mining/equipment_locker.dm
View File

@@ -49,7 +49,7 @@
var/datum/material/mat = materials.getMaterial(O.material) var/datum/material/mat = materials.getMaterial(O.material)
mat.stored += processed_sheet.amount //Stack the sheets mat.stored += processed_sheet.amount //Stack the sheets
credits += mat.value * processed_sheet.amount // Gimme my fucking credits credits += mat.value * processed_sheet.amount // Gimme my fucking credits
qdel(O) qdel(O)
/obj/machinery/mineral/ore_redemption/process() /obj/machinery/mineral/ore_redemption/process()
var/turf/T = get_turf(input) var/turf/T = get_turf(input)
@@ -77,7 +77,6 @@
var/obj/item/stack/sheet/M = new mat.sheettype(src) var/obj/item/stack/sheet/M = new mat.sheettype(src)
//credits += mat.value // Old behavior //credits += mat.value // Old behavior
return M return M
del(O)//No refined type? Purge it.
return return
/obj/machinery/mineral/ore_redemption/attack_hand(user as mob) /obj/machinery/mineral/ore_redemption/attack_hand(user as mob)

4
code/modules/mining/machine_stacking.dm
View File

@@ -112,10 +112,10 @@
stack=stacks["[O.type]"] stack=stacks["[O.type]"]
stack.amount += O:amount stack.amount += O:amount
stacks["[O.type]"]=stack stacks["[O.type]"]=stack
del(O) qdel(O)
continue continue
if (istype(O,/obj/item/weapon/ore/slag)) if (istype(O,/obj/item/weapon/ore/slag))
del(O) qdel(O)
continue continue
O.loc = src.output.loc O.loc = src.output.loc
for(var/typepath in stacks) for(var/typepath in stacks)