manual sync with upstream

This commit is contained in:
deathride58
2018-05-31 01:45:40 -04:00
parent 327d80d856
commit 3cf4f70f3d
395 changed files with 332843 additions and 19237 deletions
+1 -1
View File
@@ -177,7 +177,7 @@
return 1
/obj/structure/attack_generic(var/mob/user, var/damage, var/attack_verb, var/wallbreaker)
if(!breakable || !damage || !wallbreaker)
if(!breakable || damage < 10 || !wallbreaker)
return 0
visible_message("<span class='danger'>[user] [attack_verb] the [src] apart!</span>")
user.do_attack_animation(src)