cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-13 11:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2013-07-31 19:21:58 -07:00
parent 8008a27ec4 e860191c5b
commit b4e8c60472
9 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
View File

@@ -70,7 +70,7 @@
D.name = "small parcel - 'EFTPOS access code'"
/obj/item/device/eftpos/proc/reconnect_database()
for(var/obj/machinery/account_database/DB in machines)
for(var/obj/machinery/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines'
if(DB.z == src.z)
linked_db = DB
break

2
code/WorkInProgress/Mini/ATM.dm
View File

@@ -70,7 +70,7 @@ log transactions
break
/obj/machinery/atm/proc/reconnect_database()
for(var/obj/machinery/account_database/DB in machines)
for(var/obj/machinery/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines'
if( DB.z == src.z && !(DB.stat & NOPOWER) && DB.activated )
linked_db = DB
break