mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-02 05:22:40 +00:00
Bulwark punch knockback bugfix and attack message tweaks (#17093)
* Changes to be committed: modified: code/modules/mob/living/carbon/human/species/species_attack.dm * Add files via upload * Update code/modules/mob/living/carbon/human/species/species_attack.dm Co-authored-by: Cody Brittain <cbrittain10@yahoo.com> * Punctuation * Punctuation Co-authored-by: Cody Brittain <cbrittain10@yahoo.com> --------- Co-authored-by: Cody Brittain <cbrittain10@yahoo.com> Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
@@ -246,7 +246,7 @@
|
||||
target.apply_effect(1, INCINERATE, 0)
|
||||
|
||||
/datum/unarmed_attack/vaurca_bulwark
|
||||
attack_verb = list("punched", "pulverized", "hammered")
|
||||
attack_verb = list("smashed", "pulverized", "clobbered")
|
||||
attack_noun = list("fists")
|
||||
desc = "Smash into your opponents with the strength the Queens gave you. Not as sharp as other species' claws, but yours hit a hell of a lot harder."
|
||||
eye_attack_text = "claws"
|
||||
@@ -260,14 +260,15 @@
|
||||
crowbar_door = TRUE
|
||||
sparring_variant_type = /datum/unarmed_attack/pain_strike/heavy
|
||||
|
||||
/datum/unarmed_attack/vaurca_bulwark/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armor,var/attack_damage,var/zone)
|
||||
/datum/unarmed_attack/vaurca_bulwark/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armor,var/zone)
|
||||
..()
|
||||
if(prob(25))
|
||||
playsound(user, 'sound/weapons/push_connect.ogg', 50, 1, -1)
|
||||
user.visible_message(SPAN_DANGER("[user] shoves hard, sending [target] flying!"))
|
||||
var/turf/target_turf = get_ranged_target_turf(target, user.dir, 4)
|
||||
target.throw_at(target_turf, 4, 1, user)
|
||||
target.apply_effect(attack_damage * 0.4, WEAKEN, armor)
|
||||
if(target.species.mob_size < user.species.mob_size)
|
||||
if(prob(25))
|
||||
playsound(user, 'sound/weapons/push_connect.ogg', 50, 1, -1)
|
||||
user.visible_message(SPAN_DANGER("[user] sends \the [target] flying with the impact!"))
|
||||
var/turf/target_turf = get_ranged_target_turf(target, user.dir, 4)
|
||||
target.throw_at(target_turf, 4, 1, user)
|
||||
target.apply_effect(4, WEAKEN, armor)
|
||||
|
||||
/datum/unarmed_attack/bite/warrior
|
||||
attack_name = "warrior bite"
|
||||
|
||||
Reference in New Issue
Block a user