cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Beepsky does stamina damage instead of instant stun (#18691)" (#18763)

Browse Source 
This reverts commit eaac7432f2.
This commit is contained in:
Jamie D
2023-05-02 19:20:45 +01:00
committed by GitHub
parent 83d86b28fd
commit 231d993cbd
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/modules/mob/living/simple_animal/bot/secbot.dm
View File

@@ -5,8 +5,9 @@
icon_state = "secbot" icon_state = "secbot"
density = FALSE density = FALSE
anchored = FALSE anchored = FALSE
health = 75 health = 25
maxHealth = 75 maxHealth = 25
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
pass_flags = PASSMOB pass_flags = PASSMOB
radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security
@@ -222,7 +223,7 @@ Auto Patrol: []"},
return return
if(iscarbon(A)) if(iscarbon(A))
var/mob/living/carbon/C = A var/mob/living/carbon/C = A
if((C.getStaminaLoss() < C.maxHealth || arrest_type) && stuncount < 30) if((!C.IsParalyzed() || arrest_type) && stuncount < 30)
stun_attack(A) stun_attack(A)
if(lastStunned && lastStunned == A) if(lastStunned && lastStunned == A)
stuncount++ stuncount++
@@ -266,22 +267,21 @@ Auto Patrol: []"},
addtimer(CALLBACK(src, .proc/update_icon), 2) addtimer(CALLBACK(src, .proc/update_icon), 2)
var/threat = 5 var/threat = 5
if(ishuman(C)) if(ishuman(C))
C.stuttering = 5
C.Paralyze(100)
var/mob/living/carbon/human/H = C var/mob/living/carbon/human/H = C
threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
if(H.check_shields(src, 54, "[src]'s baton"))
return
else else
C.Paralyze(100)
C.stuttering = 5
threat = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) threat = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
C.stuttering = max(5, C.stuttering)
C.apply_damage(54, STAMINA, BODY_ZONE_CHEST, C.run_armor_check(BODY_ZONE_CHEST, ENERGY)) // baton runs off of the tiny bot's power instead of an actual cell, not enough to work at full capacity
log_combat(src,C,"stunned") log_combat(src,C,"stunned")
if(declare_arrests) if(declare_arrests)
var/area/location = get_area(src) var/area/location = get_area(src)
speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag <b>[C]</b> in [location].", radio_channel) speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag <b>[C]</b> in [location].", radio_channel)
C.visible_message( C.visible_message(span_danger("[src] has stunned [C]!"),\
span_danger("[src] has stunned [C]!"), span_userdanger("[src] has stunned you!"))
span_userdanger("[src] has stunned you!")
)
/mob/living/simple_animal/bot/secbot/handle_automated_action() /mob/living/simple_animal/bot/secbot/handle_automated_action()
if(!..()) if(!..())
@@ -326,7 +326,7 @@ Auto Patrol: []"},
if(BOT_PREP_ARREST) // preparing to arrest target if(BOT_PREP_ARREST) // preparing to arrest target
// see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again.
if( !Adjacent(target) || !isturf(target.loc) || target.getStaminaLoss() < target.maxHealth) if( !Adjacent(target) || !isturf(target.loc) || target.AmountParalyzed() < 40)
back_to_hunt() back_to_hunt()
return return
@@ -353,7 +353,7 @@ Auto Patrol: []"},
back_to_idle() back_to_idle()
return return
if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.getStaminaLoss() < target.maxHealth)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.AmountParalyzed() < 40)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
back_to_hunt() back_to_hunt()
return return
else //Try arresting again if the target escapes. else //Try arresting again if the target escapes.