[MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884)
* Delete some duplicate macro definitions * sql changelog changes ping the host * Templates the caravan ambush ruin shuttles * Update CODEOWNERS * Update components.dm * Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile * Initial Placeholder * Update caravanambush.dmm
This commit is contained in:
committed by
kevinz000
parent
b24ff24696
commit
d62cb31e9b
@@ -38,17 +38,13 @@
|
||||
|
||||
/obj/item/storage/wallet/Exited(atom/movable/AM)
|
||||
. = ..()
|
||||
// The loc has not actually changed yet when this proc is called, so call
|
||||
// refreshID and have it ignore the outgoing atom.
|
||||
refreshID(AM)
|
||||
refreshID()
|
||||
|
||||
/obj/item/storage/wallet/proc/refreshID(atom/movable/removed)
|
||||
/obj/item/storage/wallet/proc/refreshID()
|
||||
LAZYCLEARLIST(combined_access)
|
||||
if(!(front_id in src) || front_id == removed)
|
||||
if(!(front_id in src))
|
||||
front_id = null
|
||||
for(var/obj/item/card/id/I in contents)
|
||||
if(I == removed)
|
||||
continue
|
||||
if(!front_id)
|
||||
front_id = I
|
||||
LAZYINITLIST(combined_access)
|
||||
|
||||
Reference in New Issue
Block a user