diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 8f8f1deeab5..d25e35b54c9 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -19,47 +19,59 @@
density = 0
..()
-/obj/structure/statue/attackby(obj/item/weapon/W, mob/user)
+/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user as mob)
+ user.do_attack_animation(src)
add_fingerprint(user)
+ user.changeNext_move(CLICK_CD_MELEE)
if(istype(W, /obj/item/weapon/wrench))
if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "Now loosening the [name]'s bolts..."
+ user.visible_message("[user] is loosening the [name]'s bolts...", \
+ "You are loosening the [name]'s bolts...")
if(do_after(user,40))
if(!src) return
- user << "You loosened the [name]'s bolts!"
+ user.visible_message("[user] loosened the [name]'s bolts!", \
+ "You loosened the [name]'s bolts!")
anchored = 0
else if(!anchored)
if (!istype(src.loc, /turf/simulated/floor))
- usr << "A floor must be present to secure the [name]!"
+ user.visible_message("A floor must be present to secure the [name]!")
return
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "Now securing the [name]'s bolts..."
+ user.visible_message("[user] is securing the [name]'s bolts...", \
+ "You are securing the [name]'s bolts...")
if(do_after(user, 40))
if(!src) return
- user << "You secured the [name]'s bolts!"
+ user.visible_message("[user] has secured the [name]'s bolts!", \
+ "You have secured the [name]'s bolts!")
anchored = 1
else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
- user << "Now slicing apart the [name]..."
+ user.visible_message("[user] is slicing apart the [name]...", \
+ "You are slicing apart the [name]...")
if(do_after(user,30))
if(!src) return
- user << "You slice apart the [name]!"
+ user.visible_message("[user] slices apart the [name]!", \
+ "You slice apart the [name]!")
Dismantle(1)
else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill))
- user << "You begin to drill apart the [name]!"
+ user.visible_message("[name] begins to drill apart the [name]!", \
+ "You begin to drill apart the [name]!")
if(do_after(user,5))
if(!src) return
- user << "You destroy the [name]!"
+ user.visible_message("[name] destroys the [name]!", \
+ "You destroy the [name]!")
qdel(src)
else if(istype(W, /obj/item/weapon/weldingtool))
if(!anchored)
- user << "Now slicing apart the [name]..."
+ user.visible_message("[name] is slicing apart the [name]...", \
+ "You are slicing apart the [name]...")
if(do_after(user, 40))
if(!src) return
- user << "You slice apart the [name]!"
+ user.visible_message("[name] slices apart the [name]!", \
+ "You slice apart the [name]!")
Dismantle(1)
else
@@ -67,10 +79,12 @@
user << "You hit the [name] with your [W.name]!"
CheckHardness()
-/obj/structure/statue/attack_hand(mob/user)
+/obj/structure/statue/attack_hand(mob/living/user as mob)
+ user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
- visible_message("[user] rubs some dust off from the [name]'s surface.")
+ user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
+ "You rub some dust off from the [name]'s surface.")
/obj/structure/statue/CanAtmosPass()
return !density