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

Merge branch 'master' into TGUI-3.0

Browse Source
This commit is contained in:
Arturlang
2020-07-14 16:17:23 +03:00
committed by GitHub
parent d0f1a805e4 b9f86e770e
commit 75eb276c98
8 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mining/mint.dm
View File

@@ -13,6 +13,9 @@
var/produced_coins = 0 // how many coins the machine has made in it's last cycle
var/processing = FALSE
var/chosen = /datum/material/iron //which material will be used to make coins
var/coinsToProduce = 10
speed_process = TRUE
var/obj/item/storage/bag/money/bag_to_use
/obj/machinery/mineral/mint/Initialize()
@@ -123,9 +126,8 @@
temp_list[chosen] = 400
if(T)
var/obj/item/O = new /obj/item/coin(src)
var/obj/item/storage/bag/money/B = locate(/obj/item/storage/bag/money, T)
O.set_custom_materials(temp_list)
if(!B)
B = new /obj/item/storage/bag/money(src)
unload_mineral(B)
O.forceMove(B)
if(QDELETED(bag_to_use) || (bag_to_use.loc != T) || !SEND_SIGNAL(bag_to_use, COMSIG_TRY_STORAGE_INSERT, O, null, TRUE)) //important to send the signal so we don't overfill the bag.
bag_to_use = new(src) //make a new bag if we can't find or use the old one.
unload_mineral(bag_to_use) //just forcemove memes.
O.forceMove(bag_to_use) //don't bother sending the signal, the new bag is empty and all that.