gives combat mode examine text and a message on activation (#7995)

This commit is contained in:
deathride58
2019-02-14 00:01:12 -05:00
committed by kevinz000
parent 9b510d9454
commit 40d9dee654
2 changed files with 7 additions and 0 deletions

View File

@@ -88,6 +88,9 @@
if(digitalcamo)
msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly unsimian manner.\n"
if(combatmode)
msg += "[t_He] [t_is] visibly tense[resting ? "." : ", and [t_is] standing in combative stance."]\n"
GET_COMPONENT_FROM(mood, /datum/component/mood, src)
if(mood)

View File

@@ -3,6 +3,7 @@
var/lastmousedir
var/wrongdirmovedelay
var/lastdirchange
var/combatmessagecooldown
/mob/living/carbon/CanPass(atom/movable/mover, turf/target)
. = ..()
@@ -27,6 +28,9 @@
if(hud_used && hud_used.static_inventory)
for(var/obj/screen/combattoggle/selector in hud_used.static_inventory)
selector.rebasetointerbay(src)
if(world.time >= combatmessagecooldown && combatmode)
visible_message("<span class='warning'>[src] [resting ? "tenses up" : "drops into a combative stance"].</span>")
combatmessagecooldown = 10 SECONDS + world.time //This is set 100% of the time to make sure squeezing regen out of process cycles doesn't result in the combat mode message getting spammed
SEND_SIGNAL(src, COMSIG_COMBAT_TOGGLED, src, combatmode)
return TRUE