cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes CI more clearly an IC indication of combat (#7712)

Browse Source 
* 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>
This commit is contained in:
FlamingLily
2021-08-24 12:35:36 -04:00
committed by GitHub
co-authored by Tom GoldenAlpharex
parent 8d7e263f3b
commit 84a4c071ef
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/indicators/code/combat_indicator.dm
+16 -1
View File
@@ -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("<span class='warning'><b>[src] gets ready for combat!</b></span>")
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("<b>[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)