Skip to content

Commit

Permalink
Minimap/orbit icons resprite and remake (#6791)
Browse files Browse the repository at this point in the history
# About the pull request


Visually redoes how minimap and orbit icons look.

The ones that were redone look like this (old ones on the right, new
ones on the left)

<details>


![image](https://github.com/user-attachments/assets/e3b3e0d3-6f9c-4eee-8347-d8ef7c3747d4)

</details>


Adds support and new icons for all factions that have special huds, adds
yautja unique icons, all icons for jobs that lack it, so on.

All sprites by me.

# Explain why it's good for the game

Current icons are very hard to tell apart, especially orbit icons, some
colors are extremely off, orbit icons do not utilize backgrounds at all
(it's just plain color fill), also some things there aren't working
correctly at all, resulting in many icons being gray mess (shipside)

Here is an example of current icons:
<details>


![image](https://github.com/user-attachments/assets/0e7d6201-249b-494f-9fbb-62af9256c03d)


![image](https://github.com/user-attachments/assets/136ad322-0963-4ab4-a1fe-923af3520c1d)


![hTH7SC46jJ](https://github.com/user-attachments/assets/9155f6a2-c9ea-42a6-b5b2-2d152a717637)


![U3hYykHC7u](https://github.com/user-attachments/assets/b569c4fe-f11b-48f4-bb3d-bcfc228e7659)



</details>

I overhaul them to looks something like this

<details>


![chrome_4IcDecN80W](https://github.com/user-attachments/assets/7254271c-6a25-41f2-adb7-206c4e4ee2cc)


![image](https://github.com/user-attachments/assets/92bc8efc-aefa-47d5-8e89-6d46dcbf684f)


![image](https://github.com/user-attachments/assets/d37b7787-552e-4e3d-80a1-a2b506c59a08)


![PYlGchbRLX](https://github.com/user-attachments/assets/b8ac13cf-5f04-4520-86e7-1cab59e862bb)




</details>


# Testing Photographs and Procedure
<details>


![3SCyS7VqhF](https://github.com/user-attachments/assets/19a01ae6-2ea8-4150-ab68-42edf4749221)


![vNWh6gJtUV](https://github.com/user-attachments/assets/3a017ff8-db07-442d-95e1-9239bdac85d9)


![gXkkL9QxGG](https://github.com/user-attachments/assets/1dd2dd87-da26-4002-80af-e22d7a6d9487)


![dreammaker_2SkTzjlmAW](https://github.com/user-attachments/assets/35ec94c1-873d-4196-ae49-f6aa8c0a69de)


![dreammaker_zmQ9lWMm3B](https://github.com/user-attachments/assets/f4713d72-94c1-4e39-b4db-ff9d159d8286)


</details>


# Changelog
:cl:
add: minimap icons for all factions, roles, etc
code: tweaked how icons are assembled, added support for custom icon
background on equipment preset
imageadd: added a lot of new minimap icons
/:cl:

---------

Co-authored-by: harryob <[email protected]>
  • Loading branch information
Blundir and harryob authored Oct 27, 2024
1 parent a01ac49 commit 5d255af
Show file tree
Hide file tree
Showing 31 changed files with 334 additions and 85 deletions.
11 changes: 0 additions & 11 deletions code/__DEFINES/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 16 additions & 0 deletions code/game/jobs/job/marine/squads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -205,6 +216,7 @@
squad_type = "Team"
lead_icon = "soctl"
minimap_color = MINIMAP_SQUAD_SOF
background_icon = "background_sof"

active = FALSE
roundstart = FALSE
Expand All @@ -216,6 +228,7 @@
chat_color = "#553EB2"
radio_freq = CBRN_FREQ
minimap_color = "#3B2A7B"
background_icon = "background_cbrn"

active = FALSE
roundstart = FALSE
Expand All @@ -227,6 +240,7 @@
chat_color = "#32CD32"
radio_freq = FORECON_FREQ
minimap_color = "#32CD32"
background_icon = "background_forecon"

active = FALSE
roundstart = FALSE
Expand All @@ -238,6 +252,7 @@
chat_color = "#5a2c2c"
radio_freq = SOF_FREQ
minimap_color = "#5a2c2c"
background_icon = "background_civillian"

active = FALSE
roundstart = FALSE
Expand Down Expand Up @@ -277,6 +292,7 @@
chat_color = "#c47a50"
squad_type = "Team"
locked = TRUE

//###############################
/datum/squad/pmc
name = "Root"
Expand Down
8 changes: 5 additions & 3 deletions code/modules/cm_preds/yaut_bracers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@
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)
. = ..()
if(slot == WEAR_HANDS)
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)
Expand Down Expand Up @@ -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.
Expand Down
10 changes: 3 additions & 7 deletions code/modules/gear_presets/_select_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
17 changes: 17 additions & 0 deletions code/modules/gear_presets/clf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down
18 changes: 18 additions & 0 deletions code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
. = ..()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion code/modules/gear_presets/colonist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 5d255af

Please sign in to comment.