From efe042100b00dae463bd796df69073f9430aa379 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 1 Aug 2023 16:25:47 -0700 Subject: [PATCH] thief changes --- code/modules/cm_preds/yaut_bracers.dm | 33 +++++++++++++++++++++++--- icons/ui_icons/map_blips.dmi | Bin 2849 -> 2845 bytes 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index dd68dd74cd21..6c2f7cf13feb 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -110,12 +110,25 @@ /// Called to update the minimap icon of the predator /obj/item/clothing/gloves/yautja/proc/update_minimap_icon() + if(!ishuman(owner)) + return + + var/mob/living/carbon/human/human_owner = owner var/turf/wearer_turf = get_turf(owner) SSminimaps.remove_marker(owner) - if(owner?.stat >= DEAD) - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless + if(!isyautja(owner)) + if(owner.stat >= DEAD) + if(human_owner.undefibbable) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("defibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi') else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') + if(owner?.stat >= DEAD) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') /* *This is the main proc for checking AND draining the bracer energy. It must have human passed as an argument. *It can take a negative value in amount to restore energy. @@ -210,6 +223,20 @@ minimap_icon = "thrall" +/obj/item/clothing/gloves/yautja/thrall/update_minimap_icon() + if(!ishuman(owner)) + return + + var/mob/living/carbon/human/human_owner = owner + var/turf/wearer_turf = get_turf(owner) + if(owner.stat >= DEAD) + if(human_owner.undefibbable) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("defibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') + /obj/item/clothing/gloves/yautja/hunter name = "clan bracers" desc = "An extremely complex, yet simple-to-operate set of armored bracers worn by the Yautja. It has many functions, activate them to use some." diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 24bc26e8201f6a67a8da34ccf53602cb3959d43b..180e5d05f52eb5a3a7f5b03f43ea68d38f47c039 100644 GIT binary patch delta 2669 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 bk^=t)nyrb+G&9BK00000NkvXXu0mjf5&IVi delta 2673 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