cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2015-05-11 11:47:24 +09:30
parent 79e3acc95e 928b0a8be5
commit bc50ba5166
777 changed files with 22019 additions and 21336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mint.dm
+6 -6
View File
@@ -42,22 +42,22 @@
if(O)
if (istype(O,/obj/item/stack/sheet/mineral/gold))
amt_gold += 100 * O.get_amount()
del(O)
qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/silver))
amt_silver += 100 * O.get_amount()
del(O)
qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/diamond))
amt_diamond += 100 * O.get_amount()
del(O)
qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/phoron))
amt_phoron += 100 * O.get_amount()
del(O)
qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/uranium))
amt_uranium += 100 * O.get_amount()
del(O)
qdel(O)
if (istype(O,/obj/item/stack/sheet/metal))
amt_iron += 100 * O.get_amount()
del(O)
qdel(O)
/obj/machinery/mineral/mint/attack_hand(user as mob)