From 19b195cd27e55d50bcf6f569191b544bad2129d2 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 9 Sep 2015 21:12:24 -0400 Subject: [PATCH 1/2] Revert "Reverts #10649, fixes #10621" This reverts commit cb5df3963af51a968a084df7d08e5cee8e4ee556. --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index fdbac0339e2..0d04d8ad99b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -563,6 +563,7 @@ adj_drowsy = -3 adj_sleepy = -2 adj_temp = 25 + overdose = 45 glass_icon_state = "hot_coffee" glass_name = "cup of coffee" @@ -574,8 +575,11 @@ return if(adj_temp > 0) holder.remove_reagent("frostoil", 10 * removed) - if(dose > 45) - M.make_jittery(5) + +/datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien) + if(alien == IS_DIONA) + return + M.make_jittery(5) /datum/reagent/drink/coffee/icecoffee name = "Iced Coffee" From 7e4191d212ac7fd9c9a77a20706d5541e557791e Mon Sep 17 00:00:00 2001 From: SomeoneElse Date: Tue, 8 Sep 2015 01:26:57 +0600 Subject: [PATCH 2/2] [minor] Fix ATM transfer code, remove badly placed 'break'. code/modules/economy/Accounts.dm: remove break from charge_to_account() --- code/modules/economy/Accounts.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm index ab5a5e60341..712c591741f 100644 --- a/code/modules/economy/Accounts.dm +++ b/code/modules/economy/Accounts.dm @@ -80,7 +80,7 @@ for(var/datum/money_account/D in all_money_accounts) if(D.account_number == attempt_account_number && !D.suspended) D.money += amount - + //create a transaction log entry var/datum/transaction/T = new() T.target_name = source_name @@ -93,10 +93,9 @@ T.time = worldtime2text() T.source_terminal = terminal_id D.transaction_log.Add(T) - + return 1 - break - + return 0 //this returns the first account datum that matches the supplied accnum/pin combination, it returns null if the combination did not match any account