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

Fixes merge conflict

Browse Source
This commit is contained in:
ArcaneMusic
2020-04-21 21:09:56 -04:00
parent b20683b1e0
commit 9d1ecb188d
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mint.dm
+2 -20
View File
@@ -111,27 +111,10 @@
. = ..()
if(.)
return
<<<<<<< HEAD
switch(action)
if ("startpress")
if (!processing)
if(produced_coins > 0)
log_econ("[produced_coins] coins were created by [src] in the last cycle.")
produced_coins = 0
processing = TRUE
begin_processing()
if ("stoppress")
processing = FALSE
end_processing()
if ("changematerial")
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
for(var/datum/material/mat in materials.materials)
if (params["material_name"] == mat.name)
chosen = mat
=======
if(action == "startpress")
if (!processing)
if(produced_coins > 0)
log_econ("[produced_coins] coins were created by [src] in the last cycle.")
produced_coins = 0
processing = TRUE
begin_processing()
@@ -146,7 +129,6 @@
if (params["material_name"] == mat.name)
chosen = mat
return TRUE
>>>>>>> upstream/master
/obj/machinery/mineral/mint/proc/create_coins()
var/turf/T = get_step(src,output_dir)