mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2026-08-30 16:16:47 +01:00
Fix runtime from putting credit holochips into IDs
This commit is contained in:
@@ -84,13 +84,18 @@
|
||||
var/obj/item/card/id/ID = I
|
||||
if(!ID.registered_account)
|
||||
to_chat(user, "<span class='warning'>[ID] doesn't have a linked account to deposit into!</span>")
|
||||
return
|
||||
for(var/obj/item/holochip/money in src.loc.contents)
|
||||
return STOP_ATTACK_PROC_CHAIN
|
||||
var/atom/old_loc = loc // The following code can qdel src, which nulls its loc.
|
||||
if(!old_loc)
|
||||
ID.attackby(src, user)
|
||||
return STOP_ATTACK_PROC_CHAIN
|
||||
for(var/obj/item/holochip/money in old_loc.contents)
|
||||
ID.attackby(money, user)
|
||||
for(var/obj/item/stack/spacecash/money in src.loc.contents)
|
||||
for(var/obj/item/stack/spacecash/money in old_loc.contents)
|
||||
ID.attackby(money, user)
|
||||
for(var/obj/item/coin/money in src.loc.contents)
|
||||
for(var/obj/item/coin/money in old_loc.contents)
|
||||
ID.attackby(money, user)
|
||||
return STOP_ATTACK_PROC_CHAIN
|
||||
|
||||
/obj/item/holochip/AltClick(mob/user)
|
||||
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
|
||||
|
||||
Reference in New Issue
Block a user