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

Fixes a bunch of unarmed attack verbs' incorrect forms (#92058)

Browse Source 
## About The Pull Request

Introduces perfect tense attack verbs for all of our limbs, as just
adding ``ed`` to the end doesn't work in about half the cases.
- Closes #90573
This commit is contained in:
SmArtKar
2025-07-16 00:02:54 +00:00
committed by GitHub
parent 111a94060f
commit c9b8cb7fcf
9 changed files with 59 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/golem_food/golem_status_effects.dm
+16 -1
View File
@@ -286,6 +286,10 @@
var/moving_alpha = 200
/// List of arms we have updated
var/list/modified_arms
/// Arm -> original attack verbs assoc list
var/list/initial_unarmed_verbs = list()
/// Arm -> original past attack verbs assocl ist
var/list/initial_unarmed_verbs_past = list()
/datum/status_effect/golem/diamond/on_apply()
. = ..()
@@ -310,8 +314,12 @@
/// Make our arm do slashing effects
/datum/status_effect/golem/diamond/proc/set_arm_fluff(obj/item/bodypart/arm/arm)
initial_unarmed_verbs[arm] = arm.unarmed_attack_verbs
initial_unarmed_verbs_past[arm] = arm.unarmed_attack_verbs_continuous
arm.unarmed_attack_verbs = list("slash")
arm.unarmed_attack_verbs_continuous = list("slashes")
arm.grappled_attack_verb = "lacerate"
arm.grappled_attack_verb_continuous = "lacerates"
arm.unarmed_attack_effect = ATTACK_EFFECT_CLAW
arm.unarmed_attack_sound = 'sound/items/weapons/slash.ogg'
arm.unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg'
@@ -325,13 +333,18 @@
for (var/obj/item/bodypart/arm/arm as anything in modified_arms)
reset_arm_fluff(arm)
LAZYCLEARLIST(modified_arms)
initial_unarmed_verbs.Cut()
initial_unarmed_verbs_past.Cut()
return ..()
/// Make our arm do whatever it originally did
/datum/status_effect/golem/diamond/proc/reset_arm_fluff(obj/item/bodypart/arm/arm)
if (!arm)
return
arm.unarmed_attack_verbs = initial(arm.unarmed_attack_verbs)
arm.unarmed_attack_verbs = initial_unarmed_verbs[arm]
arm.unarmed_attack_verbs_continuous = initial_unarmed_verbs_past[arm]
arm.grappled_attack_verb = initial(arm.grappled_attack_verb)
arm.grappled_attack_verb_continuous = initial(arm.grappled_attack_verb_continuous)
arm.unarmed_attack_effect = initial(arm.unarmed_attack_effect)
arm.unarmed_attack_sound = initial(arm.unarmed_attack_sound)
arm.unarmed_miss_sound = initial(arm.unarmed_miss_sound)
@@ -341,6 +354,8 @@
/datum/status_effect/golem/diamond/proc/on_arm_destroyed(obj/item/bodypart/arm/arm)
SIGNAL_HANDLER
modified_arms -= arm
initial_unarmed_verbs -= arm
initial_unarmed_verbs_past -= arm
/// Makes you tougher
/datum/status_effect/golem/titanium