From 84a4c071ef3fbd06016f2918de40ad581cd34870 Mon Sep 17 00:00:00 2001 From: FlamingLily <80451102+FlamingLily@users.noreply.github.com> Date: Wed, 25 Aug 2021 02:35:36 +1000 Subject: [PATCH] Makes CI more clearly an IC indication of combat (#7712) * Update combat_indicator.dm * Update combat_indicator.dm * Update modular_skyrat/modules/indicators/code/combat_indicator.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/indicators/code/combat_indicator.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/indicators/code/combat_indicator.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/indicators/code/combat_indicator.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/indicators/code/combat_indicator.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update combat_indicator.dm * Update combat_indicator.dm * Update modular_skyrat/modules/indicators/code/combat_indicator.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../modules/indicators/code/combat_indicator.dm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/modular_skyrat/modules/indicators/code/combat_indicator.dm b/modular_skyrat/modules/indicators/code/combat_indicator.dm index f24f1e7f35c..df060ebce8d 100644 --- a/modular_skyrat/modules/indicators/code/combat_indicator.dm +++ b/modular_skyrat/modules/indicators/code/combat_indicator.dm @@ -31,7 +31,22 @@ GLOBAL_VAR_INIT(combat_indicator_overlay, GenerateCombatOverlay()) nextcombatpopup = world.time + COMBAT_NOTICE_COOLDOWN playsound(src, 'sound/machines/chime.ogg', 10, ignore_walls = FALSE) flick_emote_popup_on_mob("combat", 20) - visible_message("[src] gets ready for combat!") + var/ciweapon + if(get_active_held_item()) + ciweapon = get_active_held_item() + if(istype(ciweapon, /obj/item/gun)) + visible_message(span_boldwarning("[src] raises \the [ciweapon] with their finger on the trigger, ready for combat!")) + else + visible_message(span_boldwarning("[src] readies \the [ciweapon] with a tightened grip and offensive stance, ready for combat!")) + else + if(issilicon(src)) + visible_message(span_boldwarning("[src] shifts its armour plating into a defensive stance, ready for combat!")) + if(ishuman(src)) + visible_message(span_boldwarning("[src] raises [p_their()] fists in an offensive stance, ready for combat!")) + if(isalien(src)) + visible_message(span_boldwarning("[src] hisses in a terrifying stance, claws raised and ready for combat!")) + else + visible_message(span_boldwarning("[src] gets ready for combat!")) add_overlay(GLOB.combat_indicator_overlay) combat_indicator = TRUE src.apply_status_effect(STATUS_EFFECT_SURRENDER, src)