cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrates /obj/item/melee/baton to the new Attack Chain, Adds Universal Poking (#28241)

Browse Source 
* Update stunbaton.dm

* Update stunbaton.dm

* update

* Update stunbaton.dm

* Update code/game/objects/items/weapons/stunbaton.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* update based on review

* Create test_attack_chain_stunbaton.dm

* update

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
CRUNCH
2025-02-18 11:11:13 +00:00
committed by GitHub
parent e395809388
commit d05cc7c5cb
6 changed files with 127 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+1 -1
View File
@@ -560,7 +560,7 @@
var/threat = C.assess_threat(src)
var/prev_intent = a_intent
a_intent = INTENT_HELP
baton.attack__legacy__attackchain(C, src)
baton.pre_attack(C, src)
a_intent = prev_intent
baton_delayed = TRUE
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)
code/modules/mob/living/simple_animal/bot/secbot.dm
+1 -1
View File
@@ -267,7 +267,7 @@
var/threat = C.assess_threat(src)
var/prev_intent = a_intent
a_intent = harmbaton ? INTENT_HARM : INTENT_HELP
baton.attack__legacy__attackchain(C, src)
baton.pre_attack(C, src)
a_intent = prev_intent
baton_delayed = TRUE
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)