diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm index 0d05b7be6e1b..b1e775bb8e49 100644 --- a/code/__DEFINES/minimap.dm +++ b/code/__DEFINES/minimap.dm @@ -68,17 +68,6 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) #define MINIMAP_SQUAD_SOF "#400000" #define MINIMAP_SQUAD_INTEL "#053818" -#define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820" -#define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f" -#define MINIMAP_ICON_BACKGROUND_USCM "#888888" -#define MINIMAP_ICON_BACKGROUND_XENO "#3a064d" - -#define MINIMAP_ICON_COLOR_COMMANDER "#c6fcfc" -#define MINIMAP_ICON_COLOR_HEAD "#F0C542" -#define MINIMAP_ICON_COLOR_BRONZE "#eb9545" - -#define MINIMAP_ICON_COLOR_DOCTOR "#b83737" - //Prison #define MINIMAP_AREA_CELL_MAX "#570101ee" diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 40fc6e872c07..8552ea658fea 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -108,10 +108,14 @@ var/minimap_color = MINIMAP_SQUAD_UNKNOWN + ///Icon for the background of minimap icon + var/background_icon = "background" + ///Should we add the name of our squad in front of their name? Ex: Alpha Hospital Corpsman var/prepend_squad_name_to_assignment = TRUE + /datum/squad/marine name = "Root" usable = TRUE @@ -126,6 +130,7 @@ access = list(ACCESS_MARINE_ALPHA) radio_freq = ALPHA_FREQ minimap_color = MINIMAP_SQUAD_ALPHA + background_icon = "background_alpha" /datum/squad/marine/bravo name = SQUAD_MARINE_2 @@ -134,6 +139,7 @@ access = list(ACCESS_MARINE_BRAVO) radio_freq = BRAVO_FREQ minimap_color = MINIMAP_SQUAD_BRAVO + background_icon = "background_bravo" /datum/squad/marine/charlie name = SQUAD_MARINE_3 @@ -142,6 +148,7 @@ access = list(ACCESS_MARINE_CHARLIE) radio_freq = CHARLIE_FREQ minimap_color = MINIMAP_SQUAD_CHARLIE + background_icon = "background_charlie" /datum/squad/marine/delta name = SQUAD_MARINE_4 @@ -150,6 +157,7 @@ access = list(ACCESS_MARINE_DELTA) radio_freq = DELTA_FREQ minimap_color = MINIMAP_SQUAD_DELTA + background_icon = "background_delta" /datum/squad/marine/echo name = SQUAD_MARINE_5 @@ -159,6 +167,7 @@ radio_freq = ECHO_FREQ omni_squad_vendor = TRUE minimap_color = MINIMAP_SQUAD_ECHO + background_icon = "background_echo" active = FALSE roundstart = FALSE @@ -170,6 +179,7 @@ chat_color = "#c47a50" access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) minimap_color = MINIMAP_SQUAD_FOXTROT + background_icon = "background_foxtrot" omni_squad_vendor = TRUE radio_freq = CRYO_FREQ @@ -184,6 +194,7 @@ equipment_color = "#053818" minimap_color = MINIMAP_SQUAD_INTEL radio_freq = INTEL_FREQ + background_icon = "background_intel" roundstart = FALSE prepend_squad_name_to_assignment = FALSE @@ -205,6 +216,7 @@ squad_type = "Team" lead_icon = "soctl" minimap_color = MINIMAP_SQUAD_SOF + background_icon = "background_sof" active = FALSE roundstart = FALSE @@ -216,6 +228,7 @@ chat_color = "#553EB2" radio_freq = CBRN_FREQ minimap_color = "#3B2A7B" + background_icon = "background_cbrn" active = FALSE roundstart = FALSE @@ -227,6 +240,7 @@ chat_color = "#32CD32" radio_freq = FORECON_FREQ minimap_color = "#32CD32" + background_icon = "background_forecon" active = FALSE roundstart = FALSE @@ -238,6 +252,7 @@ chat_color = "#5a2c2c" radio_freq = SOF_FREQ minimap_color = "#5a2c2c" + background_icon = "background_civillian" active = FALSE roundstart = FALSE @@ -277,6 +292,7 @@ chat_color = "#c47a50" squad_type = "Team" locked = TRUE + //############################### /datum/squad/pmc name = "Root" diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 300c91801167..4d034b344521 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -46,7 +46,7 @@ var/obj/item/clothing/gloves/yautja/linked_bracer //Bracer linked to this one (thrall or mentor). COOLDOWN_DECLARE(bracer_recharge) /// What minimap icon this bracer should have - var/minimap_icon = "predator" + var/minimap_icon /obj/item/clothing/gloves/yautja/equipped(mob/user, slot) . = ..() @@ -54,6 +54,8 @@ START_PROCESSING(SSobj, src) if(!owner) owner = user + if(isyautja(owner)) + minimap_icon = owner.assigned_equipment_preset?.minimap_icon toggle_lock_internal(user, TRUE) RegisterSignal(user, list(COMSIG_MOB_STAT_SET_ALIVE, COMSIG_MOB_DEATH), PROC_REF(update_minimap_icon)) INVOKE_NEXT_TICK(src, PROC_REF(update_minimap_icon), user) @@ -130,9 +132,9 @@ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi') else 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 + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, human_owner.assigned_equipment_preset.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') + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, human_owner.assigned_equipment_preset.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. diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index def3fd4ade06..d5b688a37804 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -23,7 +23,7 @@ var/origin_override var/minimap_icon = "private" - var/minimap_background = MINIMAP_ICON_BACKGROUND_USCM + var/minimap_background = "background" var/always_minimap_visible = TRUE //Uniform data @@ -286,13 +286,9 @@ character_trait.apply_trait(new_human, src) /datum/equipment_preset/proc/get_minimap_icon(mob/living/carbon/human/user) - var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', "background") + var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', minimap_background) if(user.assigned_squad) - background.color = user.assigned_squad.minimap_color - else if(minimap_background) - background.color = minimap_background - else - background.color = MINIMAP_ICON_BACKGROUND_CIVILIAN + minimap_background = user.assigned_squad.background_icon if(islist(minimap_icon)) for(var/icons in minimap_icon) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index e9570bbbab9f..e8d1e0cb746a 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -6,6 +6,7 @@ paygrades = list(PAY_SHORT_REB = JOB_PLAYTIME_TIER_0) faction = FACTION_CLF origin_override = ORIGIN_CIVILIAN + minimap_background = "background_clf" idtype = /obj/item/card/id/data /datum/equipment_preset/clf/New() @@ -54,6 +55,8 @@ rank = JOB_CLF role_comm_title = "GRL" + minimap_icon = "clf_mil" + skills = /datum/skills/clf /datum/equipment_preset/clf/soldier/load_gear(mob/living/carbon/human/new_human) @@ -159,6 +162,8 @@ rank = JOB_CLF_ENGI role_comm_title = "TECH" + minimap_icon = "clf_engi" + skills = /datum/skills/clf/combat_engineer /datum/equipment_preset/clf/engineer/load_gear(mob/living/carbon/human/new_human) @@ -283,6 +288,7 @@ assignment = JOB_CLF_MEDIC rank = JOB_CLF_MEDIC role_comm_title = "MED" + minimap_icon = "clf_med" paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) skills = /datum/skills/clf/combat_medic @@ -441,6 +447,9 @@ assignment = JOB_CLF_SPECIALIST rank = JOB_CLF_SPECIALIST role_comm_title = "SPC" + + minimap_icon = "clf_spec" + skills = /datum/skills/clf/specialist /datum/equipment_preset/clf/specialist/New() @@ -565,6 +574,9 @@ assignment = JOB_CLF_LEADER rank = JOB_CLF_LEADER role_comm_title = "LDR" + + minimap_icon = "clf_sl" + skills = /datum/skills/clf/leader /datum/equipment_preset/clf/leader/New() @@ -718,6 +730,8 @@ paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) role_comm_title = "Syn" + minimap_icon = "clf_synth" + /datum/equipment_preset/clf/synth/New() . = ..() access = get_access(ACCESS_LIST_CLF_ALL) @@ -961,6 +975,9 @@ rank = JOB_CLF_COMMANDER paygrades = list(PAY_SHORT_REBC = JOB_PLAYTIME_TIER_0) role_comm_title = "CMDR" + + minimap_icon = "deputy" + skills = /datum/skills/clf/commander /datum/equipment_preset/clf/commander/New() diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index c5ae3998a0aa..cd1c4f5f0a80 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -5,6 +5,7 @@ rank = JOB_CMB idtype = /obj/item/card/id/deputy languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_cmb" var/human_versus_human = FALSE var/headset_type = /obj/item/device/radio/headset/distress/CMB @@ -62,6 +63,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "CMB Deputy" rank = JOB_CMB + + minimap_icon = "deputy" + skills = /datum/skills/cmb /datum/equipment_preset/cmb/standard/load_gear(mob/living/carbon/human/new_human) @@ -145,6 +149,8 @@ role_comm_title = "CMB MAR" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "xo" + assignment = "CMB Marshal" rank = JOB_CMB_TL skills = /datum/skills/cmb/leader @@ -199,6 +205,8 @@ role_comm_title = "CMB Syn" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "cmb_syn" + assignment = "CMB Investigative Synthetic" rank = JOB_CMB_SYN languages = ALL_SYNTH_LANGUAGES @@ -301,6 +309,8 @@ role_comm_title = "ICC Rep." flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "icc" + assignment = "Interstellar Commerce Commission Corporate Liaison" rank = JOB_CMB_ICC skills = /datum/skills/civilian/survivor @@ -360,6 +370,8 @@ role_comm_title = "OBS" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "obs" + assignment = "Interstellar Human Rights Observer" rank = JOB_CMB_OBS skills = /datum/skills/civilian/survivor/doctor @@ -415,6 +427,8 @@ skills = /datum/skills/pfc/crafty faction = FACTION_MARSHAL faction_group = list(FACTION_MARSHAL, FACTION_MARINE) + minimap_icon = "private" + minimap_background = "background_cmb" /datum/equipment_preset/uscm/cmb/New() . = ..() @@ -465,6 +479,7 @@ role_comm_title = "A-TL" minimum_age = 25 skills = /datum/skills/SL + minimap_icon = "leader" /datum/equipment_preset/uscm/cmb/leader/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) @@ -506,6 +521,7 @@ paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-TS" skills = /datum/skills/tl + minimap_icon = "tl" /datum/equipment_preset/uscm/cmb/rto/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/rto, WEAR_BODY) @@ -548,6 +564,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-HM" skills = /datum/skills/combat_medic + minimap_icon = "medic" utility_under = list(/obj/item/clothing/under/marine/medic) @@ -606,6 +623,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-SG" skills = /datum/skills/smartgunner + minimap_icon = "smartgunner" /datum/equipment_preset/uscm/cmb/smartgunner/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index 59b508f078af..5e42cb9aee5d 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -11,7 +11,6 @@ idtype = /obj/item/card/id/lanyard minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN /datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index e280060cae34..5de19c84a707 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -7,6 +7,7 @@ faction = FACTION_PMC faction_group = FACTION_LIST_WY languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_pmc" var/human_versus_human = FALSE var/headset_type = /obj/item/device/radio/headset/distress/pmc @@ -331,6 +332,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_MEDIC rank = JOB_PMC_MEDIC + minimap_icon = "pmc_md" paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/medic headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -507,6 +509,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_INVESTIGATOR rank = JOB_PMC_INVESTIGATOR + minimap_icon = "pmc_td" paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/medic/chem headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -689,6 +692,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_LEADER paygrades = list(PAY_SHORT_PMC_TL = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" + + minimap_icon = "pmc_ld" + skills = /datum/skills/pmc/SL headset_type = /obj/item/device/radio/headset/distress/pmc/command @@ -988,6 +994,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_GUNNER paygrades = list(PAY_SHORT_PMC_SS = JOB_PLAYTIME_TIER_0) role_comm_title = "SG" + + minimap_icon = "pmc_sg" + skills = /datum/skills/pmc/smartgunner /datum/equipment_preset/pmc/pmc_gunner/load_gear(mob/living/carbon/human/new_human) @@ -1489,6 +1498,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_DOCTOR paygrades = list(PAY_SHORT_PMC_DOC = JOB_PLAYTIME_TIER_0) role_comm_title = "SGN" + + minimap_icon = "pmc_ld" + skills = /datum/skills/pmc/doctor headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -1664,6 +1676,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_ENGINEER paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0) role_comm_title = "TEC" + + minimap_icon = "engi" + skills = /datum/skills/pmc/engineer headset_type = /obj/item/device/radio/headset/distress/pmc/cct @@ -1814,6 +1829,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), paygrades = list(PAY_SHORT_PMC_DIR = JOB_PLAYTIME_TIER_0) role_comm_title = "DIR" skills = /datum/skills/pmc/director + + minimap_icon = "pmc_sd" + headset_type = /obj/item/device/radio/headset/distress/pmc/command/director /datum/equipment_preset/pmc/director/load_gear(mob/living/carbon/human/new_human) @@ -1850,6 +1868,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), idtype = /obj/item/card/id/pmc assignment = JOB_PMC_SYNTH rank = JOB_PMC_SYNTH + minimap_icon = "pmc_syn" paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) role_comm_title = "WY Syn" headset_type = /obj/item/device/radio/headset/distress/pmc/command diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index f59ade2eb75b..b648e0fb31b8 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -3,6 +3,7 @@ faction = FACTION_TWE faction_group = list(FACTION_TWE, FACTION_MARINE) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_twe" /datum/equipment_preset/twe/royal_marine/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick_weight(list(MALE = 80, FEMALE = 20,)) @@ -63,6 +64,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Rifleman" rank = JOB_TWE_RMC_RIFLEMAN + + minimap_icon = "rmc_rifleman" + skills = /datum/skills/rmc /datum/equipment_preset/twe/royal_marine/standard/load_gear(mob/living/carbon/human/new_human) @@ -118,6 +122,7 @@ name = "TWE Royal Marine Commando (Marksman)" assignment = "Royal Marines Marksman" rank = JOB_TWE_RMC_MARKSMAN + minimap_icon = "rmc_marksman" /datum/equipment_preset/twe/royal_marine/spec/marksman/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) @@ -159,6 +164,7 @@ name = "TWE Royal Marine Commando (Breacher)" assignment = "Royal Marines Breacher" rank = JOB_TWE_RMC_BREACHER + minimap_icon = "rmc_breacher" /datum/equipment_preset/twe/royal_marine/spec/breacher/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) @@ -203,6 +209,9 @@ role_comm_title = "RMC SG" assignment = "Royal Marines Smartgunner" rank = JOB_TWE_RMC_SMARTGUNNER + + minimap_icon = "rmc_sg" + skills = /datum/skills/rmc/smartgun /datum/equipment_preset/twe/royal_marine/spec/machinegun/load_gear(mob/living/carbon/human/new_human) @@ -247,6 +256,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Team Leader" rank = JOB_TWE_RMC_TEAMLEADER + + minimap_icon = "rmc_teamleader" + skills = /datum/skills/rmc/leader /datum/equipment_preset/twe/royal_marine/team_leader/load_gear(mob/living/carbon/human/new_human) @@ -296,6 +308,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Team Commander" rank = JOB_TWE_RMC_LIEUTENANT + + minimap_icon = "rmc_lieutenant" + skills = /datum/skills/rmc/leader /datum/equipment_preset/twe/royal_marine/lieuteant/load_gear(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm index c27fa213592f..4b2ce9cd38f7 100644 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm @@ -4,6 +4,7 @@ paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "FORECON" + minimap_background = "background_forecon" rank = JOB_SURVIVOR faction_group = list(FACTION_MARINE, FACTION_SURVIVOR) flags = EQUIPMENT_PRESET_START_OF_ROUND @@ -110,6 +111,7 @@ name = "Survivor - USCM Reconnaissance Marine" assignment = JOB_FORECON_RIFLEMAN skills = /datum/skills/military/survivor/forecon_standard + minimap_icon = "private" /datum/equipment_preset/survivor/forecon/standard/load_gear(mob/living/carbon/human/new_human) ..() @@ -124,6 +126,7 @@ name = "Survivor - USCM Reconnaissance Support Technician" assignment = JOB_FORECON_SUPPORT skills = /datum/skills/military/survivor/forecon_techician + minimap_icon = "engi" /datum/equipment_preset/survivor/forecon/tech/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/big(new_human), WEAR_BACK) @@ -146,6 +149,7 @@ name = "Survivor - USCM Reconnaissance Designated Marksman" assignment = JOB_FORECON_MARKSMAN skills = /datum/skills/military/survivor/forecon_marksman + minimap_icon = "spec" /datum/equipment_preset/survivor/forecon/marksman/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m4ra_custom(new_human), WEAR_L_HAND) @@ -162,6 +166,7 @@ name = "Survivor - USCM Reconnaissance Smartgunner" assignment = JOB_FORECON_SMARTGUNNER skills = /datum/skills/military/survivor/forecon_smartgunner + minimap_icon = "smartgunner" /datum/equipment_preset/survivor/forecon/smartgunner/load_gear(mob/living/carbon/human/new_human) ..() @@ -180,6 +185,7 @@ name = "Survivor - USCM Reconnaissance Sniper" assignment = JOB_FORECON_SNIPER skills = /datum/skills/military/survivor/forecon_sniper + minimap_icon = "spec" /datum/equipment_preset/survivor/forecon/sniper/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/reconnaissance/uniform = new() @@ -215,6 +221,7 @@ assignment = JOB_FORECON_SL skills = /datum/skills/military/survivor/forecon_squad_leader paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) + minimap_icon = "leader" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -247,6 +254,8 @@ paygrades = list(PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/gold role_comm_title = "FORECON CO" + minimap_icon = "co" + minimap_background = "background_command" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) diff --git a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm index 1bfeaaad9c43..d199e19e452b 100644 --- a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm +++ b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm @@ -7,6 +7,8 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) faction = FACTION_CLF faction_group = list(FACTION_CLF, FACTION_SURVIVOR) + minimap_background = "background_clf" + minimap_icon = "clf_mil" access = list(ACCESS_CIVILIAN_PUBLIC) survivor_variant = HOSTILE_SURVIVOR diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 1a24ca5d58b9..4485624a4c27 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -181,6 +181,8 @@ Everything below isn't used or out of place. skills = /datum/skills/civilian/survivor/goon languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG, ACCESS_WY_COLONIAL) + minimap_icon = "goon_standard" + minimap_background = "background_goon" survivor_variant = SECURITY_SURVIVOR diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index bdfd47dd20ca..8446ca1b37ef 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -14,7 +14,7 @@ access = list(ACCESS_CIVILIAN_PUBLIC) minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN + minimap_background = "background_civillian" var/survivor_variant = CIVILIAN_SURVIVOR diff --git a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm index 25136c172b6d..d098f242ed82 100644 --- a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm +++ b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm @@ -9,6 +9,8 @@ languages = list(LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_CHINESE) faction = FACTION_UPP faction_group = list(FACTION_UPP, FACTION_SURVIVOR) + minimap_icon = "upp_pvt" + minimap_background = "background_upp" role_comm_title = "173/RECON" idtype = /obj/item/card/id/dogtag flags = EQUIPMENT_PRESET_EXTRA @@ -69,6 +71,9 @@ paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) assignment = JOB_UPP_ENGI rank = JOB_UPP_ENGI + + minimap_icon = "upp_sapper" + skills = /datum/skills/military/survivor/upp_sapper /datum/equipment_preset/survivor/upp/sapper/load_gear(mob/living/carbon/human/new_human) @@ -97,6 +102,9 @@ paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) assignment = JOB_UPP_MEDIC rank = JOB_UPP_MEDIC + + minimap_icon = "upp_med" + skills = /datum/skills/military/survivor/upp_medic /datum/equipment_preset/survivor/upp/medic/load_gear(mob/living/carbon/human/new_human) @@ -126,6 +134,7 @@ name = "Survivor - UPP Specialist" assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST + minimap_icon = "upp_spec" paygrades = list(PAY_SHORT_UE4 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/military/survivor/upp_spec @@ -150,6 +159,9 @@ rank = JOB_UPP_LEADER languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_GERMAN, LANGUAGE_CHINESE) role_comm_title = "173/RECON SL" + + minimap_icon = "upp_sl" + skills = /datum/skills/military/survivor/upp_sl /datum/equipment_preset/survivor/upp/squad_leader/load_gear(mob/living/carbon/human/new_human) @@ -176,6 +188,8 @@ paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "173/RECON Syn" + minimap_background = "background_upp" + minimap_icon = "upp_synth" /datum/equipment_preset/synth/survivor/upp/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/veteran/UPP/medic/uniform = new() diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index e28ef2e81f49..d7536e436aa6 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -43,6 +43,8 @@ rank = "Synthetic" role_comm_title = "Syn" + minimap_icon = "synth" + /datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) @@ -434,6 +436,7 @@ name = "Survivor - Synthetic - CMB Synth" idtype = /obj/item/card/id/deputy role_comm_title = "CMB Syn" + minimap_background = "background_cmb" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/CMB, WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/limited, @@ -458,6 +461,7 @@ name = "Survivor - Synthetic - Corporate Security Synth" idtype = /obj/item/card/id/silver/cl role_comm_title = "WY Syn" + minimap_background = "background_pmc" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/soft/sec/corp, WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY, @@ -482,6 +486,7 @@ name = "Survivor - Synthetic - Corporate Protection Synth" idtype = /obj/item/card/id/pmc role_comm_title = "WY Syn" + minimap_background = "background_pmc" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_L_EAR = /obj/item/device/radio/headset/distress/pmc/hvh, @@ -528,6 +533,7 @@ name = "Survivor - Synthetic - Interstellar Commerce Commission Synthetic" idtype = /obj/item/card/id/silver/cl role_comm_title = "ICC Syn" + minimap_background = "background_cmb" equipment_to_spawn = list( WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/limited, WEAR_R_EAR = /obj/item/tool/pen/clicky, @@ -573,6 +579,9 @@ faction_group = list(FACTION_MARINE) assignment = JOB_WORKING_JOE rank = JOB_WORKING_JOE + + minimap_icon = "joe" + skills = /datum/skills/working_joe languages = list(LANGUAGE_ENGLISH, LANGUAGE_APOLLO, LANGUAGE_RUSSIAN, LANGUAGE_JAPANESE, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_CHINESE) /// Used to set species when loading race diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index ea32b0e5de72..7c630176b309 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -3,6 +3,7 @@ languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE) faction = FACTION_UPP idtype = /obj/item/card/id/dogtag + minimap_background = "background_upp" origin_override = ORIGIN_UPP /datum/equipment_preset/upp/New() @@ -68,6 +69,7 @@ assignment = JOB_UPP rank = JOB_UPP role_comm_title = "Sol" + minimap_icon = "upp_pvt" paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_1) /datum/equipment_preset/upp/soldier/load_gear(mob/living/carbon/human/new_human) @@ -235,6 +237,7 @@ assignment = JOB_UPP_MEDIC rank = JOB_UPP_MEDIC role_comm_title = "Med" + minimap_icon = "upp_med" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/medic/load_gear(mob/living/carbon/human/new_human) @@ -406,6 +409,7 @@ assignment = JOB_UPP_ENGI rank = JOB_UPP_ENGI role_comm_title = "Sap" + minimap_icon = "upp_sapper" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/sapper/load_gear(mob/living/carbon/human/new_human) @@ -542,6 +546,7 @@ assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST role_comm_title = "Spc" + minimap_icon = "upp_spec" paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/specialist/load_gear(mob/living/carbon/human/new_human) @@ -671,6 +676,7 @@ assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST role_comm_title = "Spc" + minimap_icon = "upp_spec" paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/machinegunner/load_gear(mob/living/carbon/human/new_human) @@ -798,6 +804,7 @@ assignment = JOB_UPP_LEADER rank = JOB_UPP_LEADER role_comm_title = "SL" + minimap_icon = "upp_sl" paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/new_human) @@ -972,6 +979,7 @@ assignment = JOB_UPP_POLICE rank = JOB_UPP_POLICE role_comm_title = "MP" + minimap_icon = "upp_mp" paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/military_police/load_gear(mob/living/carbon/human/new_human) @@ -1271,6 +1279,7 @@ assignment = JOB_UPP_SUPPLY rank = JOB_UPP_SUPPLY role_comm_title = "Log." + minimap_icon = "upp_cargo" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/supply/load_gear(mob/living/carbon/human/new_human) @@ -1354,6 +1363,7 @@ assignment = JOB_UPP_LT_OFFICER rank = JOB_UPP_LT_OFFICER role_comm_title = "Lt." + minimap_icon = "upp_lt" paygrades = list(PAY_SHORT_UO1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/officer/load_gear(mob/living/carbon/human/new_human) @@ -1513,6 +1523,7 @@ assignment = JOB_UPP_SRLT_OFFICER rank = JOB_UPP_SRLT_OFFICER role_comm_title = "Sr-Lt." + minimap_icon = "upp_slt" paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/officer/senior/load_gear(mob/living/carbon/human/new_human) @@ -1672,6 +1683,7 @@ assignment = JOB_UPP_KPT_OFFICER rank = JOB_UPP_KPT_OFFICER role_comm_title = "May." + minimap_icon = "upp_xo" paygrades = list(PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/kapitan @@ -1832,6 +1844,7 @@ assignment = JOB_UPP_MAY_OFFICER rank = JOB_UPP_MAY_OFFICER role_comm_title = "May." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander @@ -1994,6 +2007,7 @@ assignment = JOB_UPP_LTKOL_OFFICER rank = JOB_UPP_LTKOL_OFFICER role_comm_title = "Lt. Kol." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO5 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander @@ -2155,6 +2169,7 @@ assignment = JOB_UPP_BRIG_GENERAL rank = JOB_UPP_BRIG_GENERAL role_comm_title = "Kol." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO7 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander @@ -2320,6 +2335,7 @@ assignment = JOB_UPP_MAY_GENERAL rank = JOB_UPP_MAY_GENERAL role_comm_title = "May. Gen." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO7 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander @@ -2481,6 +2497,7 @@ assignment = JOB_UPP_LT_GENERAL rank = JOB_UPP_LT_GENERAL role_comm_title = "Lt. Gen." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO8 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander @@ -2642,6 +2659,7 @@ assignment = JOB_UPP_GENERAL rank = JOB_UPP_GENERAL role_comm_title = "Gen." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO9 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander @@ -2848,6 +2866,7 @@ skills = /datum/skills/synthetic assignment = JOB_UPP_SUPPORT_SYNTH rank = JOB_UPP_SUPPORT_SYNTH + minimap_icon = "upp_synth" paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag @@ -3124,6 +3143,9 @@ role_comm_title = "JKdo" paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/data + + minimap_icon = "upp_com" + languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_TSL, LANGUAGE_SPANISH, LANGUAGE_CHINESE) /datum/equipment_preset/upp/commando/New() @@ -3249,6 +3271,7 @@ assignment = JOB_UPP_COMMANDO_MEDIC rank = JOB_UPP_COMMANDO_MEDIC role_comm_title = "2ndKdo" + minimap_icon = "upp_commed" paygrades = list(PAY_SHORT_UC2 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/commando/medic/load_gear(mob/living/carbon/human/new_human) @@ -3416,6 +3439,7 @@ assignment = JOB_UPP_COMMANDO_LEADER rank = JOB_UPP_COMMANDO_LEADER role_comm_title = "1stKdo" + minimap_icon = "upp_comsl" paygrades = list(PAY_SHORT_UC3 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver @@ -3676,6 +3700,9 @@ rank = JOB_UPP_CREWMAN paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) role_comm_title = "TANK" + + minimap_icon = "upp_vc" + minimum_age = 30 skills = /datum/skills/tank_crew @@ -3795,6 +3822,7 @@ assignment = JOB_UPP_CONSCRIPT rank = JOB_UPP_CONSCRIPT role_comm_title = "Cons" + minimap_icon = "upp_pvt" paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/conscript/load_gear(mob/living/carbon/human/new_human) @@ -3903,6 +3931,7 @@ rank = JOB_UPP_COMMISSAR paygrades = list(PAY_SHORT_UO4P = JOB_PLAYTIME_TIER_0) role_comm_title = "Commissar" + minimap_icon = "upp_plt" minimum_age = 30 skills = /datum/skills/upp/commissar diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 855ed07f7976..8511fdc246eb 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -163,6 +163,7 @@ skills = /datum/skills/tank_crew minimap_icon = "vc" + minimap_background = "background_intel" /datum/equipment_preset/uscm/tank/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -223,6 +224,8 @@ paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "IO" skills = /datum/skills/intel + minimap_icon = "io" + minimap_background = "background_intel" utility_under = list(/obj/item/clothing/under/marine/officer/intel) @@ -811,7 +814,7 @@ ert_squad = TRUE paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) - minimap_icon = "private" + minimap_icon = "sof_sg" /datum/equipment_preset/uscm/marsoc/load_status(mob/living/carbon/human/new_human) new_human.nutrition = NUTRITION_NORMAL @@ -863,6 +866,7 @@ /datum/equipment_preset/uscm/marsoc/covert name = "Marine Raider (!DEATHSQUAD! Covert)" uses_special_name = TRUE + /datum/equipment_preset/uscm/marsoc/covert/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") @@ -880,7 +884,7 @@ paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/commando/deathsquad/leader - minimap_icon = "leader" + minimap_icon = "sof_sl" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) @@ -890,6 +894,7 @@ /datum/equipment_preset/uscm/marsoc/sl/covert name = "Marine Raider Team Leader (!DEATHSQUAD! Covert)" uses_special_name = TRUE + /datum/equipment_preset/uscm/marsoc/sl/covert/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") @@ -904,6 +909,7 @@ assignment = JOB_MARINE_RAIDER_CMD rank = JOB_MARINE_RAIDER_CMD role_comm_title = "CMD." + minimap_icon = "sof_officer" paygrades = list(PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/commando/deathsquad/officer dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 94f03f0d7e7f..b5fc3ebf1f4d 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -64,6 +64,8 @@ paygrades = list(PAY_SHORT_MO7 = JOB_PLAYTIME_TIER_0) role_comm_title = "GEN" minimum_age = 50 + minimap_icon = "deputy" + minimap_background = "background_command" skills = /datum/skills/general languages = ALL_HUMAN_LANGUAGES //Know your enemy. @@ -190,6 +192,7 @@ idtype = /obj/item/card/id/provost skills = /datum/skills/provost + minimap_background = "background_mp" /datum/equipment_preset/uscm_event/provost/New() . = ..() @@ -202,6 +205,7 @@ paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) role_comm_title = "PvE" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve" dress_under = list(/obj/item/clothing/under/marine/dress/blues) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) @@ -247,6 +251,7 @@ paygrades = list(PAY_SHORT_ME8 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME9 = JOB_PLAYTIME_TIER_3) role_comm_title = "PvTML" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_leader" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -292,6 +297,7 @@ paygrades = list(PAY_SHORT_PVI = JOB_PLAYTIME_TIER_0) role_comm_title = "PvI" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_inspector" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -332,6 +338,7 @@ paygrades = list(PAY_SHORT_PVCI = JOB_PLAYTIME_TIER_0) role_comm_title = "PvCI" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_chief_inspector" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -371,6 +378,7 @@ paygrades = list(PAY_SHORT_ME8E = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME9E = JOB_PLAYTIME_TIER_3) role_comm_title = "PvA" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_advisor" /datum/equipment_preset/uscm_event/provost/marshal/deputy name = "Provost Deputy Marshal (MO6)" @@ -382,6 +390,7 @@ paygrades = list(PAY_SHORT_PVDM = JOB_PLAYTIME_TIER_0) role_comm_title = PAY_SHORT_PVDM flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "deputy" /datum/equipment_preset/uscm_event/provost/marshal name = "Provost Marshal (MO7)" @@ -393,6 +402,7 @@ paygrades = list(PAY_SHORT_PVM = JOB_PLAYTIME_TIER_0) role_comm_title = PAY_SHORT_PVM flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "deputy" dress_under = list(/obj/item/clothing/under/marine/dress/blues/general) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm index 6e727381b6ff..ad72cb3a1178 100644 --- a/code/modules/gear_presets/uscm_medical.dm +++ b/code/modules/gear_presets/uscm_medical.dm @@ -40,8 +40,8 @@ role_comm_title = "CMO" skills = /datum/skills/CMO - minimap_icon = list("medic" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = list("doctor") + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/rank/chief_medical_officer) utility_hat = list() @@ -70,7 +70,8 @@ role_comm_title = "Doc" skills = /datum/skills/doctor - minimap_icon = list("medic" = MINIMAP_ICON_COLOR_DOCTOR) + minimap_icon = list("doctor") + minimap_background = "background_medical" /datum/equipment_preset/uscm_ship/uscm_medical/doctor/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -108,7 +109,8 @@ role_comm_title = "Nurse" skills = /datum/skills/nurse - minimap_icon = list("medic") + minimap_icon = list("nurse") + minimap_background = "background_shipside" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -138,6 +140,7 @@ skills = /datum/skills/researcher minimap_icon = "researcher" + minimap_background = "background_medical" utility_under = list(/obj/item/clothing/under/marine/officer/researcher) utility_hat = list() diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index dcb926e804d7..8322b4e808c0 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -1,6 +1,7 @@ /datum/equipment_preset/uscm_ship/uscm_police name = "USCM (police roles)" faction = FACTION_MARINE + minimap_background = "background_mp" minimum_age = 27 //*****************************************************************************************************/ @@ -150,8 +151,7 @@ role_comm_title = "CMP" skills = /datum/skills/CMP - minimap_icon = list("mp" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = list("cmp") utility_under = list(/obj/item/clothing/under/marine/officer/warrant) utility_hat = list(/obj/item/clothing/head/beret/marine/mp/cmp) @@ -194,6 +194,8 @@ role_comm_title = "RMP" skills = /datum/skills/CMP + minimap_icon = list("rmp") + utility_under = list(/obj/item/clothing/under/marine/officer/warrant) utility_hat = list(/obj/item/clothing/head/beret/marine/mp/cmp) utility_extra = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/cm/tan) @@ -236,6 +238,8 @@ name = "USCM Riot Chief MP (RCMP)" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = list("crmp") + assignment = JOB_RIOT_CHIEF rank = JOB_RIOT_CHIEF paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 6832900e752b..fe94e7707434 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -51,7 +51,7 @@ skills = /datum/skills/civilian minimap_icon = "cl" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN + minimap_background = "background_civillian" dress_under = list( /obj/item/clothing/under/liaison_suit/black, @@ -167,8 +167,7 @@ idtype = /obj/item/card/id/silver/cl minimap_icon = "correspondent" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN - + minimap_background = "background_civillian" dress_under = list() dress_over = list() dress_hat = list() @@ -202,7 +201,7 @@ idtype = /obj/item/card/id/dogtag minimap_icon = "correspondent" - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_background = "background_civillian" dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) dress_hat = list(/obj/item/clothing/head/marine/dress_cover) @@ -252,8 +251,8 @@ minimum_age = 27 skills = /datum/skills/CE - minimap_icon = list("engi" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "ce" + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/marine/officer/ce) @@ -287,7 +286,8 @@ role_comm_title = "MT" skills = /datum/skills/MT - minimap_icon = "engi" + minimap_icon = "mt" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/marine/officer/engi) dress_under = list(/obj/item/clothing/under/marine/dress/blues) @@ -323,6 +323,7 @@ skills = /datum/skills/OT minimap_icon = "ot" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/marine/officer/engi) dress_under = list(/obj/item/clothing/under/marine/dress/blues) @@ -367,8 +368,8 @@ minimum_age = 27 skills = /datum/skills/RO - minimap_background = MINIMAP_ICON_BACKGROUND_CIC - minimap_icon = list("ct" = MINIMAP_ICON_COLOR_HEAD) + minimap_icon = "cargo" + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/rank/qm_suit) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -401,7 +402,8 @@ role_comm_title = "CT" skills = /datum/skills/CT - minimap_icon = "ct" + minimap_icon = "cargo" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/rank/cargotech) dress_under = list(/obj/item/clothing/under/marine/dress/blues) @@ -436,8 +438,9 @@ minimum_age = 30 skills = /datum/skills/commander - minimap_icon = list("cic" = MINIMAP_ICON_COLOR_COMMANDER) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "co" + minimap_background = "background_command" + utility_under = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/marine/officer/command, /obj/item/clothing/under/marine/officer/boiler) utility_hat = list(/obj/item/clothing/head/cmcap,/obj/item/clothing/head/beret/cm/tan) @@ -551,8 +554,8 @@ minimum_age = 35 skills = /datum/skills/XO - minimap_icon = list("cic" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "xo" + minimap_background = "background_command" dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full) @@ -590,8 +593,8 @@ minimum_age = 25 skills = /datum/skills/SO - minimap_icon = list("cic" = MINIMAP_ICON_COLOR_BRONZE) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "so" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -622,6 +625,7 @@ skills = /datum/skills/SEA minimap_icon = "sea" + minimap_background = "background_command" service_hat = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/drillhat) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -668,8 +672,8 @@ minimum_age = 27 skills = /datum/skills/auxiliary_officer - minimap_icon = list("cic" = COLOR_SILVER) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "aso" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/auxiliary_officer/New() . = ..() @@ -726,7 +730,8 @@ role_comm_title = "GP" skills = /datum/skills/pilot - minimap_icon = "pilot" + minimap_icon = "gp" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/gp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -777,6 +782,7 @@ skills = /datum/skills/pilot minimap_icon = "pilot" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/dp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -827,6 +833,7 @@ skills = /datum/skills/crew_chief minimap_icon = "dcc" + minimap_background = "background_shipside" dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) dress_hat = list(/obj/item/clothing/head/marine/dress_cover) @@ -918,6 +925,7 @@ skills = /datum/skills/mess_technician minimap_icon = "mst" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/marine/chef) dress_under = list(/obj/item/clothing/under/marine/dress/blues) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 17138b208a58..f77341ed5549 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -22,7 +22,8 @@ skills = /datum/skills/commander idtype = /obj/item/card/id/gold - minimap_icon = "co" + minimap_icon = "co_wo" + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/marine,/obj/item/clothing/under/marine/officer/command) utility_hat = list(/obj/item/clothing/head/cmcap,/obj/item/clothing/head/beret/cm/tan) @@ -101,7 +102,8 @@ skills = /datum/skills/XO idtype = /obj/item/card/id/silver - minimap_icon = "xo" + minimap_icon = "xo_wo" + minimap_background = "background_command" dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full) @@ -145,7 +147,8 @@ skills = /datum/skills/honor_guard/lead idtype = /obj/item/card/id/silver - minimap_icon = "cmp" + minimap_icon = "hgsl" + minimap_background = "background_mp" /datum/equipment_preset/wo/cmp/load_gear(mob/living/carbon/human/new_human) @@ -181,7 +184,8 @@ skills = /datum/skills/honor_guard/vet idtype = /obj/item/card/id/silver - minimap_icon = "so" + minimap_icon = "vhg" + minimap_background = "background_mp" /datum/equipment_preset/wo/vhg/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec @@ -223,7 +227,8 @@ skills = /datum/skills/honor_guard/spec idtype = /obj/item/card/id/gold - minimap_icon = "spec" + minimap_icon = "hgspec" + minimap_background = "background_mp" /datum/equipment_preset/wo/hgs/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec @@ -262,7 +267,8 @@ role_comm_title = "HG" skills = /datum/skills/honor_guard - minimap_icon = "mp" + minimap_icon = "hg" + minimap_background = "background_mp" /datum/equipment_preset/wo/hg/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec @@ -296,7 +302,8 @@ role_comm_title = "MC" skills = /datum/skills/mortar_crew - minimap_icon = "vc" + minimap_icon = "wo_mcrew" + minimap_background = "background_shipside" /datum/equipment_preset/wo/mortar_crew/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -332,7 +339,8 @@ skills = /datum/skills/RO idtype = /obj/item/card/id/silver - minimap_icon = "ro" + minimap_icon = "cargo" + minimap_background = "background_medical" /datum/equipment_preset/wo/quartermaster/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -362,6 +370,9 @@ skills = /datum/skills/CE idtype = /obj/item/card/id + minimap_icon = "cargo" + minimap_background = "background_shipside" + /datum/equipment_preset/wo/cargo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) @@ -394,7 +405,8 @@ skills = /datum/skills/CMO idtype = /obj/item/card/id/silver - minimap_icon = "cmo" + minimap_icon = "cmo_wo" + minimap_background = "background_medical_WO" /datum/equipment_preset/wo/head_surgeon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic @@ -437,7 +449,8 @@ skills = /datum/skills/doctor idtype = /obj/item/card/id - minimap_icon = "doctor" + minimap_icon = "medic" + minimap_background = "background_medical_WO" /datum/equipment_preset/wo/doctor/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic @@ -477,7 +490,8 @@ skills = /datum/skills/researcher idtype = /obj/item/card/id - minimap_icon = "researcher" + minimap_icon = "chemist_wo" + minimap_background = "background_medical_WO" /datum/equipment_preset/wo/chemist/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic @@ -518,6 +532,7 @@ idtype = /obj/item/card/id/silver minimap_icon = "ce" + minimap_background = "background_medical" /datum/equipment_preset/wo/bcm/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -552,6 +567,7 @@ idtype = /obj/item/card/id minimap_icon = "mt" + minimap_background = "background_shipside" /datum/equipment_preset/wo/bc/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -584,8 +600,8 @@ skills = /datum/skills/civilian idtype = /obj/item/card/id/silver/cl - minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN + minimap_icon = "correspondent" + minimap_background = "background_civillian" /datum/equipment_preset/wo/reporter/New() . = ..() @@ -613,6 +629,7 @@ /datum/equipment_preset/wo/marine name = "WO Dust Raider" //Stub other Marine equipment stems from flags = EQUIPMENT_PRESET_STUB + minimap_background = "background_intel" //*****************************************************************************************************/ @@ -626,6 +643,7 @@ paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" skills = /datum/skills/SL + minimap_icon = "leader" /datum/equipment_preset/wo/marine/sl/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -661,6 +679,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "Spc" skills = /datum/skills/specialist + minimap_icon = "spec" /datum/equipment_preset/wo/marine/spec/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -696,6 +715,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "SG" skills = /datum/skills/smartgunner + minimap_icon = "smartgunner" /datum/equipment_preset/wo/marine/sg/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -720,6 +740,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "ComTech" skills = /datum/skills/combat_engineer + minimap_icon = "engi" /datum/equipment_preset/wo/marine/engineer/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -754,6 +775,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "HM" skills = /datum/skills/combat_medic + minimap_icon = "medic" /datum/equipment_preset/wo/marine/medic/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index eb91be64c91e..0d5717dfcf73 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -6,6 +6,7 @@ faction = FACTION_WY faction_group = list(FACTION_WY) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_goon" /datum/equipment_preset/goon/New() . = ..() @@ -62,6 +63,7 @@ rank = JOB_WY_GOON paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon + minimap_icon = "goon_standard" /datum/equipment_preset/goon/standard/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -95,6 +97,7 @@ rank = JOB_WY_GOON_TECH paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_tech + minimap_icon = "goon_engi" /datum/equipment_preset/goon/engineer/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -129,6 +132,7 @@ rank = JOB_WY_GOON_LEAD paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_lead + minimap_icon = "goon_leader" /datum/equipment_preset/goon/lead/New() . = ..() @@ -165,6 +169,7 @@ rank = JOB_WY_GOON_RESEARCHER paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/researcher + minimap_icon = "goon_sci" dress_under = list( /obj/item/clothing/under/liaison_suit/black, diff --git a/code/modules/gear_presets/yautja.dm b/code/modules/gear_presets/yautja.dm index 9b8e64948c62..d408d6b4178b 100644 --- a/code/modules/gear_presets/yautja.dm +++ b/code/modules/gear_presets/yautja.dm @@ -8,6 +8,8 @@ uses_special_name = TRUE skills = /datum/skills/yautja/warrior + minimap_icon = "predator" + var/default_cape_type = "None" var/clan_rank @@ -93,6 +95,7 @@ // YOUNG BLOOD /datum/equipment_preset/yautja/youngblood name = "Yautja Young" + minimap_icon = "predator_young" flags = EQUIPMENT_PRESET_START_OF_ROUND clan_rank = CLAN_RANK_UNBLOODED_INT @@ -111,6 +114,7 @@ // ELITE /datum/equipment_preset/yautja/elite name = "Yautja Elite" + minimap_icon = "predator_elite" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_HALF_CAPE clan_rank = CLAN_RANK_ELITE_INT @@ -123,6 +127,7 @@ // ELDER /datum/equipment_preset/yautja/elder name = "Yautja Elder" + minimap_icon = "predator_elder" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_THIRD_CAPE clan_rank = CLAN_RANK_ELDER_INT @@ -139,6 +144,7 @@ // CLAN LEADER /datum/equipment_preset/yautja/leader name = "Yautja Leader" + minimap_icon = "predator_leader" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_CAPE clan_rank = CLAN_RANK_LEADER_INT @@ -155,6 +161,7 @@ // ANCIENT /datum/equipment_preset/yautja/ancient name = "Yautja Ancient" + minimap_icon = "predator_ancient" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_PONCHO clan_rank = CLAN_RANK_ADMIN_INT diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 871bae54b8fd..28b043d5f796 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -119,6 +119,7 @@ var/datum/caste_datum/caste = xeno.caste serialized["caste"] = caste.caste_type serialized["icon"] = caste.minimap_icon + serialized["background_icon"] = caste.minimap_background serialized["hivenumber"] = xeno.hivenumber serialized["area_name"] = get_area_name(xeno) xenos += list(serialized) @@ -142,9 +143,9 @@ serialized["icon"] = icon ? icon : "private" if(human.assigned_squad) - serialized["background_color"] = human.assigned_squad.equipment_color ? human.assigned_squad.equipment_color : human.assigned_squad.minimap_color + serialized["background_icon"] = human.assigned_squad.background_icon else - serialized["background_color"] = human.assigned_equipment_preset?.minimap_background + serialized["background_icon"] = human.assigned_equipment_preset?.minimap_background if(istype(get_area(human), /area/tdome)) in_thunderdome += list(serialized) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 254ed91e4391..556b221f21ab 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -47,6 +47,8 @@ minimap_icon = "xenoqueen" + minimap_background = "xeno_ruler" + royal_caste = TRUE /proc/update_living_queens() // needed to update when you change a queen to a different hive diff --git a/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm b/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm index feee2edecb67..995f4985487a 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm @@ -132,6 +132,7 @@ var/minimum_evolve_time = 1 MINUTES /// Iconstate for the xeno on the minimap var/minimap_icon = "xeno" + var/minimap_background = "background_xeno" ///The iconstate for leadered xenos on the minimap, added as overlay var/minimap_leadered_overlay = "xenoleader" @@ -175,8 +176,7 @@ return minimum_xeno_playtime - client.get_total_xeno_playtime() /datum/caste_datum/proc/get_minimap_icon() - var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', "background") - background.color = MINIMAP_ICON_BACKGROUND_XENO + var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', minimap_background) var/iconstate = minimap_icon ? minimap_icon : "unknown" var/mutable_appearance/icon = image('icons/ui_icons/map_blips.dmi', icon_state = iconstate) diff --git a/icons/mob/hud/marine_hud.dmi b/icons/mob/hud/marine_hud.dmi index 8aff95b8b33d..d1ad4eedb312 100644 Binary files a/icons/mob/hud/marine_hud.dmi and b/icons/mob/hud/marine_hud.dmi differ diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 41449556044c..5f3a96184ca6 100644 Binary files a/icons/ui_icons/map_blips.dmi and b/icons/ui_icons/map_blips.dmi differ diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx index 49cbb8d95737..75625f02ed98 100644 --- a/tgui/packages/tgui/interfaces/Orbit/index.tsx +++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx @@ -445,8 +445,16 @@ const ObservableItem = (props: { }) => { const { act } = useBackend(); const { color, item } = props; - const { health, icon, full_name, nickname, orbiters, ref, background_color } = - item; + const { + health, + icon, + full_name, + nickname, + orbiters, + ref, + background_color, + background_icon, + } = item; const displayHealth = typeof health === 'number'; @@ -465,7 +473,11 @@ const ObservableItem = (props: { > {displayHealth && } {!!icon && ( - + )} {capitalizeFirst(getDisplayName(full_name, nickname))} {!!orbiters && ( @@ -482,7 +494,15 @@ const ObservableItem = (props: { /** Displays some info on the mob as a tooltip. */ const ObservableTooltip = (props: { readonly item: Observable }) => { const { - item: { caste, health, job, full_name, icon, background_color }, + item: { + caste, + health, + job, + full_name, + icon, + background_color, + background_icon, + }, } = props; const displayHealth = typeof health === 'number'; @@ -496,7 +516,11 @@ const ObservableTooltip = (props: { readonly item: Observable }) => { {!!caste && ( {!!icon && ( - + )} {caste} @@ -504,7 +528,11 @@ const ObservableTooltip = (props: { readonly item: Observable }) => { {!!job && ( {!!icon && ( - + )} {job} @@ -520,24 +548,40 @@ const ObservableTooltip = (props: { readonly item: Observable }) => { const ObservableIcon = (props: { readonly icon: Observable['icon']; readonly background_color: Observable['background_color']; + readonly background_icon: Observable['background_icon']; }) => { const { data } = useBackend(); const { icons = [] } = data; - const { icon, background_color } = props; - if (!icon || !icons[icon]) { + const { icon, background_color, background_icon } = props; + if (!icon || !icons[icon] || !background_icon || !icons[background_icon]) { return null; } return ( - + <> + + + ); }; diff --git a/tgui/packages/tgui/interfaces/Orbit/types.ts b/tgui/packages/tgui/interfaces/Orbit/types.ts index d1a360de0d72..3ef1268762ee 100644 --- a/tgui/packages/tgui/interfaces/Orbit/types.ts +++ b/tgui/packages/tgui/interfaces/Orbit/types.ts @@ -35,6 +35,7 @@ export type Observable = { icon?: string; job?: string; background_color?: string; + background_icon?: string; full_name: string; nickname?: string; orbiters?: number;