shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6686 from Citadel-Station-13/upstream-merge-37719

Browse Source 
[MIRROR] [s] Fix wallets acting as though they still contain removed IDs
This commit is contained in:
deathride58
2018-05-17 18:13:28 +00:00
committed by GitHub
parent 146f953966 4d3ead744a
commit 986ea603e9
1 changed files with 95 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/wallets.dm
+9 -5
View File
@@ -38,16 +38,20 @@
/obj/item/storage/wallet/Exited(atom/movable/AM) /obj/item/storage/wallet/Exited(atom/movable/AM)
. = ..() . = ..()
refreshID() // The loc has not actually changed yet when this proc is called, so call
// refreshID and have it ignore the outgoing atom.
refreshID(AM)
/obj/item/storage/wallet/proc/refreshID() /obj/item/storage/wallet/proc/refreshID(atom/movable/removed)
if(!(front_id in src)) LAZYCLEARLIST(combined_access)
if(!(front_id in src) || front_id == removed)
front_id = null front_id = null
for(var/obj/item/card/id/I in contents) for(var/obj/item/card/id/I in contents)
LAZYINITLIST(combined_access) if(I == removed)
LAZYCLEARLIST(combined_access) continue
if(!front_id) if(!front_id)
front_id = I front_id = I
LAZYINITLIST(combined_access)
combined_access |= I.access combined_access |= I.access
update_icon() update_icon()