Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
This commit is contained in:
@@ -18,9 +18,13 @@
|
||||
return FALSE
|
||||
return .
|
||||
|
||||
/mob/living/carbon/proc/toggle_combat_mode()
|
||||
/mob/living/carbon/proc/toggle_combat_mode(forced)
|
||||
if(recoveringstam)
|
||||
return TRUE
|
||||
if(!forced)
|
||||
for(var/datum/status_effect/S in status_effects)
|
||||
if(S.blocks_combatmode)
|
||||
return TRUE
|
||||
combatmode = !combatmode
|
||||
if(voremode)
|
||||
toggle_vore_mode()
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
|
||||
resting = TRUE
|
||||
if(combatmode)
|
||||
toggle_combat_mode()
|
||||
toggle_combat_mode(TRUE)
|
||||
recoveringstam = TRUE
|
||||
filters += CIT_FILTER_STAMINACRIT
|
||||
update_canmove()
|
||||
|
||||
Reference in New Issue
Block a user