cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NO GBP] correctly uses pronoun helpers in counterattack text (#95126)

Browse Source 
## About The Pull Request

Calls pronoun helpers in counterattack text from the relevant mob,
rather than passing them as arguments.

## Why It's Good For The Game

More specific pronouns

## Changelog
🆑

spellcheck: Pronouns in counterattack text are more correct

/🆑
This commit is contained in:
Leland Kemble
2026-02-10 17:56:23 -05:00
committed by GitHub
parent f46f6d0b17
commit e114ce52f5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/belt.dm
+6 -6
View File
@@ -690,7 +690,7 @@
RegisterSignal(swordsman, COMSIG_LIVING_CHECK_BLOCK, PROC_REF(counter_attack))
swordsman.Immobilize(1 SECONDS)
eyed_fool = WEAKREF(cast_on)
swordsman.visible_message(span_danger("[swordsman] widens [p_their(swordsman)] stance, [p_their(swordsman)] hand hovering over \the [used_sheath]!"), span_notice("You prepare to counterattack [cast_on]!"))
swordsman.visible_message(span_danger("[swordsman] widens [swordsman.p_their()] stance, [swordsman.p_their()] hand hovering over \the [used_sheath]!"), span_notice("You prepare to counterattack [cast_on]!"))
addtimer(CALLBACK(src, PROC_REF(relax), swordsman, used_sheath), 1 SECONDS)
COOLDOWN_START(used_sheath, full_ability_cooldown, 60 SECONDS)
unset_ranged_ability(swordsman)
@@ -715,7 +715,7 @@
/datum/action/innate/blade_counter/proc/do_strike(mob/living/fool, mob/living/forward_thinker, obj/item/justicetool)
var/obj/item/bodypart/offending_hand = fool.get_active_hand()
forward_thinker.visible_message(span_danger("[forward_thinker] swiftly draws \the [justicetool] and strikes [fool] during [p_their(fool)] attack!"), span_notice("You swiftly draw \the [justicetool] and counter-attack [fool]!"))
forward_thinker.visible_message(span_danger("[forward_thinker] swiftly draws \the [justicetool] and strikes [fool] during [fool.p_their()] attack!"), span_notice("You swiftly draw \the [justicetool] and counter-attack [fool]!"))
fool.apply_damage(
damage = justicetool.force * COUNTERMULTIPLIER,
damagetype = justicetool.damtype,
@@ -751,7 +751,7 @@
var/obj/item/bodypart/offending_hand = fool.get_active_hand()
var/obj/item/bodypart/risked_hand = forward_thinker.get_active_hand()
if(iscarbon(fool) && offending_hand.dismember(BRUTE, FALSE, WOUND_SLASH))
forward_thinker.visible_message(span_danger("[forward_thinker] swiftly draws \the [justicetool] and strikes [fool] during [p_their(fool)] attack, sending [p_their(fool)] arm flying!"),
forward_thinker.visible_message(span_danger("[forward_thinker] swiftly draws \the [justicetool] and strikes [fool] during [fool.p_their()] attack, sending [fool.p_their()] arm flying!"),
span_notice("You swiftly draw \the [justicetool] and cut off [fool]'s arm!"))
else
fool.apply_damage(
@@ -765,7 +765,7 @@
attack_direction = get_dir(forward_thinker, fool),
attacking_item = justicetool,
)
forward_thinker.visible_message(span_danger("[forward_thinker] swiftly draws \the [justicetool] and strikes [fool] during [p_their(fool)] attack!"),
forward_thinker.visible_message(span_danger("[forward_thinker] swiftly draws \the [justicetool] and strikes [fool] during [fool.p_their()] attack!"),
span_notice("You swiftly draw \the [justicetool] and strike them mid-attack!"))
if(!IS_ROBOTIC_LIMB(risked_hand))
forward_thinker.visible_message(span_danger("[forward_thinker]'s arm is unable to withstand the force of the attack!"),
@@ -799,7 +799,7 @@
return
if(IS_ROBOTIC_LIMB(worthless_hand) || !worthless_hand.dismember(BRUTE, FALSE, WOUND_BLUNT))
holder.visible_message(span_danger("[holder]'s arm is mutilated as they misfire [p_their(holder)] sheathed blade!"),
holder.visible_message(span_danger("[holder]'s arm is mutilated as they misfire [holder.p_their()] sheathed blade!"),
span_danger("Your arm is mutilated as you fail to safely fire your blade!"))
holder.apply_damage(
damage = 50,
@@ -810,7 +810,7 @@
)
return
holder.visible_message(span_danger("[holder]'s arm is violently torn off as they misfire [p_their(holder)] sheathed blade!"),
holder.visible_message(span_danger("[holder]'s arm is violently torn off as they misfire [holder.p_their()] sheathed blade!"),
span_danger("Your arm is torn off as you fail to safely fire your blade!"))
#undef COUNTERMULTIPLIER