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

Merge pull request #10962 from Core0verload/weneedtogodeeper

Browse Source 
Removes some annoying inventory tetris with storages in storages
This commit is contained in:
Remie Richards
2015-08-03 17:15:11 +01:00
parent a374deb507 d70acbc7a8
commit db22dd672e
3 changed files with 13 additions and 12 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)