Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092)

* makes use of 512's filters, adds combat mode toggle component signals, and more

* Update phantomthief.dm

* Update living.dm
This commit is contained in:
deathride58
2018-05-27 17:18:40 -07:00
committed by kevinz000
parent dae3945580
commit 6ac830a123
8 changed files with 82 additions and 1 deletions
@@ -27,6 +27,7 @@
if(hud_used && hud_used.static_inventory)
for(var/obj/screen/combattoggle/selector in hud_used.static_inventory)
selector.rebasetointerbay(src)
SendSignal(COMSIG_COMBAT_TOGGLED, src, combatmode)
return TRUE
/mob/living/carbon/Move(atom/newloc, direct = 0)
@@ -111,9 +111,11 @@
if(combatmode)
toggle_combat_mode()
recoveringstam = TRUE
filters += CIT_FILTER_STAMINACRIT
update_canmove()
if(recoveringstam && total_health >= STAMINA_SOFTCRIT_TRADITIONAL)
to_chat(src, "<span class='notice'>You don't feel nearly as exhausted anymore.</span>")
recoveringstam = FALSE
filters -= CIT_FILTER_STAMINACRIT
update_canmove()
update_health_hud()