cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15381 from neersighted/runtime_meet_proc

Browse Source 
Fix a number of runtimes
This commit is contained in:
duncathan salt
2016-02-10 23:50:38 -06:00
parent 49b4251736 4089d850cc
commit c04acddef9
15 changed files with 177 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/storage.dm
+5 -7
View File
@@ -95,18 +95,17 @@
/obj/item/weapon/storage/proc/show_to(mob/user)
if(!user.client)
return
if(user.s_active != src && (user.stat == CONSCIOUS))
for(var/obj/item/I in src)
if(I.on_found(user))
return
if(user.s_active)
user.s_active.hide_from(user)
user.client.screen -= boxes
user.client.screen -= closer
user.client.screen -= contents
user.client.screen += boxes
user.client.screen += closer
user.client.screen += contents
user.client.screen |= boxes
user.client.screen |= closer
user.client.screen |= contents
user.s_active = src
is_seeing |= user
@@ -115,7 +114,6 @@
close_all()
return ..()
/obj/item/weapon/storage/proc/hide_from(mob/user)
if(!user.client)
return