gives combat mode examine text and a message on activation (#7995)
This commit is contained in:
@@ -88,6 +88,9 @@
|
|||||||
|
|
||||||
if(digitalcamo)
|
if(digitalcamo)
|
||||||
msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly unsimian manner.\n"
|
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)
|
GET_COMPONENT_FROM(mood, /datum/component/mood, src)
|
||||||
if(mood)
|
if(mood)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
var/lastmousedir
|
var/lastmousedir
|
||||||
var/wrongdirmovedelay
|
var/wrongdirmovedelay
|
||||||
var/lastdirchange
|
var/lastdirchange
|
||||||
|
var/combatmessagecooldown
|
||||||
|
|
||||||
/mob/living/carbon/CanPass(atom/movable/mover, turf/target)
|
/mob/living/carbon/CanPass(atom/movable/mover, turf/target)
|
||||||
. = ..()
|
. = ..()
|
||||||
@@ -27,6 +28,9 @@
|
|||||||
if(hud_used && hud_used.static_inventory)
|
if(hud_used && hud_used.static_inventory)
|
||||||
for(var/obj/screen/combattoggle/selector in hud_used.static_inventory)
|
for(var/obj/screen/combattoggle/selector in hud_used.static_inventory)
|
||||||
selector.rebasetointerbay(src)
|
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)
|
SEND_SIGNAL(src, COMSIG_COMBAT_TOGGLED, src, combatmode)
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user