From 6b0a15909fd73e8c51d78aeb95338f7a2fb15161 Mon Sep 17 00:00:00 2001 From: Dimach Date: Wed, 2 Aug 2023 05:35:59 +0000 Subject: [PATCH] Tweak: combat mode toggles combat indicator automatically --- code/modules/mob/living/living_defense.dm | 10 +++++----- .../modules/combat_indicator/combat_indicator.dm | 2 ++ tgstation.dme | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 modular_ss220/modules/combat_indicator/combat_indicator.dm diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 17c6d7faa9c7dc9..d20ee493c157702 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -128,11 +128,11 @@ if(hud_used?.action_intent) hud_used.action_intent.update_appearance() //SKYRAT EDIT ADDITION BEGIN - if(!ishuman(src) && !ckey) - if(combat_mode) - set_combat_indicator(TRUE) - else - set_combat_indicator(FALSE) + //if(!ishuman(src) && !ckey) + if(combat_mode) + set_combat_indicator(TRUE) + else + set_combat_indicator(FALSE) face_mouse = (client?.prefs?.read_preference(/datum/preference/toggle/face_cursor_combat_mode) && combat_mode) ? TRUE : FALSE //SKYRAT EDIT ADDITION END diff --git a/modular_ss220/modules/combat_indicator/combat_indicator.dm b/modular_ss220/modules/combat_indicator/combat_indicator.dm new file mode 100644 index 000000000000000..b46bec580082a68 --- /dev/null +++ b/modular_ss220/modules/combat_indicator/combat_indicator.dm @@ -0,0 +1,2 @@ +/mob/living/user_toggle_combat_indicator() + set_combat_mode(!combat_mode, FALSE) //Change combat mode instead diff --git a/tgstation.dme b/tgstation.dme index 3ba61f500ea08d6..97c678a8de2c0b1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5542,13 +5542,13 @@ #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm" +#include "interface\skin.dmf" #include "interface\fonts\fonts_datum.dm" #include "interface\fonts\grand_9k.dm" #include "interface\fonts\pixellari.dm" #include "interface\fonts\spess_font.dm" #include "interface\fonts\tiny_unicode.dm" #include "interface\fonts\vcr_osd_mono.dm" -#include "interface\skin.dmf" #include "modular_skyrat\master_files\code\_globalvars\configuration.dm" #include "modular_skyrat\master_files\code\_globalvars\religion.dm" #include "modular_skyrat\master_files\code\_globalvars\lists\ambience.dm" @@ -7279,6 +7279,7 @@ #include "modular_ss220\master_files_skyrat\code\modules\client\preferences\emote_panel.dm" #include "modular_ss220\modules\auto_cryo\autocryo.dm" #include "modular_ss220\modules\auto_cryo\autocryo_config.dm" +#include "modular_ss220\modules\combat_indicator\combat_indicator.dm" #include "modular_ss220\modules\cyrillic_key_fixes\code\client_procs.dm" #include "modular_ss220\modules\cyrillic_key_fixes\code\communication.dm" #include "modular_ss220\modules\cyrillic_key_fixes\code\keybindings.dm"