Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
This commit is contained in:
PsiOmega
2015-09-12 13:10:29 +02:00
+3 -4
View File
@@ -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