Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Warbanner and Warcry #2614

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions code/game/objects/items/fixerskills/level4/team.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
human.physiology.pale_mod *= 0.6
affected+= human

addtimer(CALLBACK(src, PROC_REF(Recall),), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(Warcry),), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(Recall)), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(Warcry)), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
StartCooldown()

/datum/action/cooldown/warbanner/proc/Recall()
Expand All @@ -45,6 +45,7 @@
human.physiology.white_mod /= 0.6
human.physiology.black_mod /= 0.6
human.physiology.pale_mod /= 0.6
affected-=human

/datum/action/cooldown/warbanner/proc/Warcry()
for(var/mob/living/carbon/human/human in affected)
Expand Down Expand Up @@ -84,18 +85,19 @@
for(var/mob/living/carbon/human/human in view(range, get_turf(src)))
if (human == owner && !affect_self)
continue
human.add_movespeed_modifier(/datum/movespeed_modifier/retreat)
human.add_movespeed_modifier(/datum/movespeed_modifier/warcry)
addtimer(CALLBACK(human, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/warcry), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
affected+=human

addtimer(CALLBACK(src, PROC_REF(Warcry),), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
addtimer(CALLBACK(src, PROC_REF(Warcry)), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
StartCooldown()

/datum/action/cooldown/warcry/proc/Warcry()
for(var/mob/living/carbon/human/human in affected)
if(human == owner)
continue
human.say("YES SIR!")
affected-=human

/datum/movespeed_modifier/warcry
variable = TRUE
Expand Down
Loading