Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements

This commit is contained in:
Purpose
2018-10-13 21:34:04 +01:00
756 changed files with 13384 additions and 9584 deletions
-1
View File
@@ -147,7 +147,6 @@
H.adjustBruteLoss(damage)
H.UpdateDamageIcon()
H.updatehealth()
return
/obj/structure/proc/can_touch(var/mob/user)