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

if baton would stun cyborgs, it would stun bots too (#21062)

Browse Source 
* if baton would stun cyborgs, it would stun bots too

* added visible message when stunning bots

* cleanup
This commit is contained in:
HMBGERDO
2023-06-02 18:41:56 +02:00
committed by GitHub
parent 214b6d39ee
commit feb480e39c
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/batons.dm
+14 -9
View File
@@ -54,10 +54,9 @@
return ..()
if(on_cooldown)
return
if(issilicon(target) && !affect_silicon)
if((issilicon(target) || isbot(target)) && !affect_silicon)
return ..()
else
baton_knockdown(target, user)
baton_knockdown(target, user)
/**
* Called when a target is about to be hit non-lethally.
@@ -71,15 +70,21 @@
user.visible_message("<span class='danger'>[user] pulses [target]'s sensors with [src]!</span>",\
"<span class='danger'>You pulse [target]'s sensors with [src]!</span>")
on_silicon_stun(target, user)
else
// Check for shield/countering
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
return FALSE
// Check for shield/countering
else if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
return FALSE
user.visible_message("<span class='danger'>[user] knocks down [target] with [src]!</span>",\
"<span class='danger'>You knock down [target] with [src]!</span>")
on_non_silicon_stun(target, user)
else if(isbot(target))
user.visible_message("<span class='danger'>[user] pulses [target]'s sensors with [src]!</span>",\
"<span class='danger'>You pulse [target]'s sensors with [src]!</span>")
var/mob/living/simple_animal/bot/H = target
H.disable(stun_time_silicon)
// Visuals and sound
user.do_attack_animation(target)
playsound(target, stun_sound, 75, TRUE, -1)