Merge branch 'virgoMaster' into virgoPull

This commit is contained in:
Reddeyfish
2018-04-15 11:06:40 -07:00
66 changed files with 1480 additions and 587 deletions
@@ -54,6 +54,7 @@
/mob/living/simple_animal/hostile/bear/brown;0.5,
/mob/living/simple_animal/hostile/carp,
/mob/living/simple_animal/hostile/mimic,
/mob/living/simple_animal/hostile/rous,
/mob/living/simple_animal/otie;0.5)
..()
+1 -1
View File
@@ -311,7 +311,7 @@
qdel(src)
else if(istype(W,/obj/item/frame) && anchored)
var/obj/item/frame/F = W
F.try_build(src)
F.try_build(src, user)
else
user.setClickCooldown(user.get_attack_speed(W))
if(W.damtype == BRUTE || W.damtype == BURN)