cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG: Fix for dragging HUD elements into lockers.

Browse Source 
Revision: r3635
Author: 	 petethegoat
This commit is contained in:
Erthilo
2012-05-21 20:42:15 +01:00
parent 552fe3040e
commit 03dc270006
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/closets.dm
View File

@@ -168,6 +168,10 @@
return return
/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) /obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
if(istype(O, /obj/screen) || istype(O, /obj/hud)) //fix for HUD elements making their way into the world -Pete
return
if(O.loc == user)
return
if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis) if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis)
return return
if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src))) if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
@@ -182,7 +186,7 @@
return return
step_towards(O, src.loc) step_towards(O, src.loc)
if(user != O) if(user != O)
user.show_viewers(text("\red [] stuffs [] into []!", user, O, src)) user.show_viewers("\red [user] stuffs [O] into [src]!")
src.add_fingerprint(user) src.add_fingerprint(user)
return return