diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm index ab5a5e6034..712c591741 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 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 04d940dc0f..b548353c60 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"