From 57246b5c4f0bf7be4d2c8caa033850295baf9902 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Fri, 7 Jun 2019 19:36:09 +0200 Subject: [PATCH 1/3] No combat mode message if user is on help intent. --- modular_citadel/code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mob/living/carbon/carbon.dm b/modular_citadel/code/modules/mob/living/carbon/carbon.dm index cd24bfc8a2..3e1c55bbf8 100644 --- a/modular_citadel/code/modules/mob/living/carbon/carbon.dm +++ b/modular_citadel/code/modules/mob/living/carbon/carbon.dm @@ -33,7 +33,7 @@ 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) + if(a_intent != INTENT_HELP && world.time >= combatmessagecooldown && combatmode) visible_message("[src] [resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].") 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) From fc536dcfe44ea27f160bf7a1e0f158aef083f23b Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 8 Jun 2019 14:44:40 +0200 Subject: [PATCH 2/3] Urist McSpaceman goes vigilant! Urist McSpaceman seems attentive! Urist McSpaceman looks alert! --- modular_citadel/code/modules/mob/living/carbon/carbon.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/mob/living/carbon/carbon.dm b/modular_citadel/code/modules/mob/living/carbon/carbon.dm index 3e1c55bbf8..b9c600603c 100644 --- a/modular_citadel/code/modules/mob/living/carbon/carbon.dm +++ b/modular_citadel/code/modules/mob/living/carbon/carbon.dm @@ -33,8 +33,11 @@ if(hud_used && hud_used.static_inventory) for(var/obj/screen/combattoggle/selector in hud_used.static_inventory) selector.rebasetointerbay(src) - if(a_intent != INTENT_HELP && world.time >= combatmessagecooldown && combatmode) - visible_message("[src] [resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].") + if(world.time >= combatmessagecooldown && combatmode) + if(a_intent != INTENT_HELP) + visible_message("[src] [resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].") + else + visible_message("[src] [pick("looks","seems","goes")] [pick("alert","attentive","vigilant","careful")]!") 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 From 53d5ad582056bba4255d6178314e80d03b159c4e Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 8 Jun 2019 14:45:26 +0200 Subject: [PATCH 3/3] no exclamation point. --- modular_citadel/code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mob/living/carbon/carbon.dm b/modular_citadel/code/modules/mob/living/carbon/carbon.dm index b9c600603c..43931db689 100644 --- a/modular_citadel/code/modules/mob/living/carbon/carbon.dm +++ b/modular_citadel/code/modules/mob/living/carbon/carbon.dm @@ -37,7 +37,7 @@ if(a_intent != INTENT_HELP) visible_message("[src] [resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].") else - visible_message("[src] [pick("looks","seems","goes")] [pick("alert","attentive","vigilant","careful")]!") + visible_message("[src] [pick("looks","seems","goes")] [pick("alert","attentive","vigilant")].") 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