Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122

[MIRROR] Fixes interaction AI stuff
2018-04-14 07:44:50 -05:00
parent fbaa2d5ae8 c26d4dc240
commit 86ca6b424d
7 changed files with 148 additions and 162 deletions
@@ -234,10 +234,7 @@
 	anchored = TRUE
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT

-/obj/machinery/shower/attack_hand(mob/M)
-	. = ..()
-	if(.)
-		return
+/obj/machinery/shower/interact(mob/M)
 	on = !on
 	update_icon()
 	add_fingerprint(M)