mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 16:38:22 +01:00
Ports TG attack animations. (#22319)
https://github.com/user-attachments/assets/0af58b65-552e-48c2-ab97-56ebf0794127 To-do: - [x] Simple mobs - [ ] Icon angles for most icons - [x] Attack effects for kicking/biting/etc --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -334,7 +334,7 @@
|
||||
|
||||
/obj/structure/machinery/shield/attackby(obj/item/attacking_item, mob/user)
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
user.do_attack_animation(src, attacking_item)
|
||||
user.do_attack_animation(src, used_item = attacking_item)
|
||||
//Calculate damage
|
||||
var/aforce = attacking_item.force
|
||||
if(attacking_item.damtype == DAMAGE_BRUTE || attacking_item.damtype == DAMAGE_BURN)
|
||||
|
||||
@@ -43,8 +43,8 @@
|
||||
energy_field.remove_individual_field(src)
|
||||
|
||||
/obj/effect/energy_field/attackby(obj/item/attacking_item, mob/user)
|
||||
user.do_attack_animation(src, used_item = attacking_item)
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
user.do_attack_animation(src, attacking_item)
|
||||
if(attacking_item.force < 10)
|
||||
user.visible_message(SPAN_WARNING("[user] harmlessly attacks \the [src] with \the [attacking_item]."),
|
||||
SPAN_WARNING("You attack \the [src] with \the [attacking_item], but it bounces off without doing any damage."))
|
||||
@@ -57,7 +57,7 @@
|
||||
if(istype(H))
|
||||
if(H.species.can_shred(H))
|
||||
H.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
H.do_attack_animation(src, FIST_ATTACK_ANIMATION)
|
||||
H.do_attack_animation(src)
|
||||
H.visible_message(SPAN_WARNING("[H] shreds \the [src]!"), SPAN_WARNING("You shred \the [src]!"))
|
||||
damage_field(1)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user