From 22c2cbe15ba14f816356c14c966e55abddf92e83 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Sat, 9 Sep 2023 16:42:35 +0300 Subject: [PATCH] test --- code/__DEFINES/minimap.dm | 1 + code/game/jobs/job/marine/squads.dm | 13 ++++++++++++- .../modules/mob/living/carbon/human/update_icons.dm | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm index c9f21484f622..71d0ed8e7445 100644 --- a/code/__DEFINES/minimap.dm +++ b/code/__DEFINES/minimap.dm @@ -52,6 +52,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) #define MINIMAP_SQUAD_ECHO "#00b043" #define MINIMAP_SQUAD_FOXTROT "#fe7b2e" #define MINIMAP_SQUAD_SOF "#400000" +#define MINIMAP_SQUAD_INTEL "#053818" #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820" #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f" diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index fe5e3be38a90..56e2af668191 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -31,6 +31,8 @@ var/tracking_id = null //Used for the tracking subsystem /// Maximum number allowed in a squad. Defaults to infinite var/max_positions = -1 + /// If uses the overlay + var/use_stripe_overlay = TRUE /// Color for the squad marines gear overlays var/equipment_color = "#FFFFFF" /// The alpha for the armor overlay used by equipment color @@ -180,12 +182,21 @@ /datum/squad/marine/intel name = SQUAD_MARINE_INTEL - minimap_color = MINIMAP_SQUAD_ECHO + use_stripe_overlay = FALSE + equipment_color = "#053818" + minimap_color = MINIMAP_SQUAD_INTEL radio_freq = null roundstart = FALSE prepend_squad_name_to_assignment = FALSE + max_engineers = 0 + max_medics = 0 + max_specialists = 0 + max_tl = 0 + max_smartgun = 0 + max_leaders = 0 + /datum/squad/marine/sof name = SQUAD_SOF equipment_color = "#400000" diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 88887126b1c1..bbb9c7fd0352 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -457,7 +457,7 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(istype(head, /obj/item/clothing/head/helmet/marine)) var/obj/item/clothing/head/helmet/marine/marine_helmet = head if(assigned_squad && marine_helmet.flags_marine_helmet & HELMET_SQUAD_OVERLAY) - if(assigned_squad && assigned_squad.equipment_color) + if(assigned_squad && assigned_squad.equipment_color && assigned_squad.use_stripe_overlay) var/leader = assigned_squad.squad_leader var/image/helmet_overlay = image(marine_helmet.helmet_overlay_icon, icon_state = "std-helmet") if(leader == src) @@ -519,7 +519,7 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(istype(wear_suit, /obj/item/clothing/suit/storage/marine)) var/obj/item/clothing/suit/storage/marine/marine_armor = wear_suit if(marine_armor.flags_marine_armor & ARMOR_SQUAD_OVERLAY) - if(assigned_squad && assigned_squad.equipment_color) + if(assigned_squad && assigned_squad.equipment_color && assigned_squad.use_stripe_overlay) var/leader = assigned_squad.squad_leader var/image/squad_overlay = image(marine_armor.squad_overlay_icon, icon_state = "std-armor") if(leader == src)