Update closets.dm

2017-09-11 18:56:10 -05:00
parent 5e3e525036
commit ce518ee45e
1 changed files with 0 additions and 4 deletions
@@ -388,11 +388,7 @@

 /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)