mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-28 06:26:29 +01:00
Merge branch 'virgoMaster' into virgoPull
This commit is contained in:
@@ -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)
|
||||
..()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user