From b53a5486789032fd544b4b422ed9675a6fd75bac Mon Sep 17 00:00:00 2001 From: jughu Date: Tue, 28 Mar 2017 19:36:50 +0200 Subject: [PATCH 1/2] Update machine_processing.dm --- code/modules/mining/machine_processing.dm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index c824934ee8b..212e8488ac8 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -297,24 +297,6 @@ else on = 0 continue - //THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT. - //They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage - /*if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) - if(ore_uranium >= 2 && ore_diamond >= 1) - ore_uranium -= 2 - ore_diamond -= 1 - generate_mineral(/obj/item/stack/sheet/mineral/adamantine) - else - on = 0 - continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) - if(ore_silver >= 1 && ore_plasma >= 3) - ore_silver -= 1 - ore_plasma -= 3 - generate_mineral(/obj/item/stack/sheet/mineral/mythril) - else - on = 0 - continue*/ //if a non valid combination is selected @@ -424,4 +406,4 @@ /obj/machinery/mineral/processing_unit/proc/generate_mineral(var/P) var/O = new P(src) - unload_mineral(O) \ No newline at end of file + unload_mineral(O) From d464e19c43a5e85c3549727e2b2edd16116ec8c7 Mon Sep 17 00:00:00 2001 From: jughu Date: Wed, 29 Mar 2017 20:11:17 +0200 Subject: [PATCH 2/2] Update mint.dm --- code/modules/mining/mint.dm | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 95dc3a05f25..b460fc7d467 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -15,8 +15,6 @@ var/amt_uranium = 0 var/amt_clown = 0 var/amt_mime = 0 - var/amt_adamantine = 0 - var/amt_mythril = 0 var/newCoins = 0 //how many coins the machine made in it's last load var/processing = 0 var/chosen = "metal" //which material will be used to make coins @@ -53,7 +51,7 @@ qdel(O) -/obj/machinery/mineral/mint/attack_hand(user as mob) //TODO: Adamantine coins! -Durandan +/obj/machinery/mineral/mint/attack_hand(user as mob) var/dat = "Coin Press
" @@ -99,11 +97,6 @@ dat += text("chosen") else dat += text("Choose") - dat += text("
Adamantine inserted: [amt_adamantine] ")//I don't even know these color codes, so fuck it. - if(chosen == "adamantine") - dat += text("chosen") - else - dat += text("Choose") dat += text("

Will produce [coinsToProduce] [chosen] coins if enough materials are available.
") //dat += text("The dial which controls the number of conins to produce seems to be stuck. A technician has already been dispatched to fix this.") @@ -199,22 +192,6 @@ newCoins++ src.updateUsrDialog() sleep(5) - if("adamantine") - while(amt_adamantine > 0 && coinsToProduce > 0) - create_coins(/obj/item/weapon/coin/adamantine) - amt_adamantine -= 20 - coinsToProduce-- - newCoins++ - src.updateUsrDialog() - sleep(5) - if("mythril") - while(amt_adamantine > 0 && coinsToProduce > 0) - create_coins(/obj/item/weapon/coin/mythril) - amt_mythril -= 20 - coinsToProduce-- - newCoins++ - src.updateUsrDialog() - sleep(5) icon_state = "coinpress0" processing = 0 coinsToProduce = temp_coins @@ -229,4 +206,4 @@ if(!M) M = new /obj/item/weapon/moneybag(src) unload_mineral(M) - O.loc = M \ No newline at end of file + O.loc = M