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

Second level storages are not closing on mob movement

Browse Source
This commit is contained in:
c0
2015-08-01 02:59:06 +03:00
parent f9071e0aae
commit d70acbc7a8
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/storage.dm
+8 -8
View File
@@ -1,8 +1,8 @@
// To clarify:
// For use_to_pickup and allow_quick_gather functionality,
// see item/attackby() (/game/objects/items.dm)
// Do not remove this functionality without good reason, cough reagent_containers cough.
// -Sayu
// External storage-related logic:
// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
// /item/attackby() in /game/objects/items.dm - use_to_pickup and allow_quick_gather functionality
// -- c0
/obj/item/weapon/storage
@@ -42,11 +42,11 @@
show_to(M)
return
if(!( M.restrained() ) && !( M.stat ))
if(!( istype(over_object, /obj/screen) ))
if(!M.restrained() && !M.stat)
if(!istype(over_object, /obj/screen))
return content_can_dump(over_object, M)
if(!(loc == usr) || (loc && loc.loc == usr))
if(loc != usr || (loc && loc.loc == usr))
return
playsound(loc, "rustle", 50, 1, -5)
code/modules/mob/living/living.dm
+2 -1
View File
@@ -570,7 +570,8 @@ Sorry Giacom. Please don't be mad :(
else
stop_pulling()
. = ..()
if ((s_active && !( s_active in contents ) ))
if (s_active && !(s_active in contents) && !(s_active.loc in contents))
// It's ugly. But everything related to inventory/storage is. -- c0
s_active.close(src)
for(var/mob/living/simple_animal/slime/M in oview(1,src))