Merge branch 'master' into wound-port

This commit is contained in:
Timothy Teakettle
2020-07-18 23:06:49 +01:00
committed by GitHub
203 changed files with 364 additions and 307 deletions
+1 -1
View File
@@ -72,7 +72,7 @@
QDEL_NULL(noz)
return ..()
/obj/item/watertank/attack_hand(mob/user)
/obj/item/watertank/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if (user.get_item_by_slot(user.getBackSlot()) == src)
toggle_mister(user)
else