Fixes lockers alt-click

2017-09-10 23:07:03 +02:00
parent be3881bbf4
commit 5e3e525036
1 changed files with 4 additions and 0 deletions
@@ -388,7 +388,11 @@

 /obj/structure/closet/AltClick(mob/user)
 	..()
+<<<<<<< HEAD
 	if(!user.canUseTopic(src, be_close=TRUE))
+=======
+	if(!user.canUseTopic(src, be_close=TRUE) || !isturf(loc))
+>>>>>>> 847e426... Fixes lockers alt-click (#30544)
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
 	if(opened || !secure)