From c4ccff357974f797907d0b25ad9855b27c894717 Mon Sep 17 00:00:00 2001 From: breadhunt <80229419+breadhunt@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:59:07 +0100 Subject: [PATCH] SL minimap icons + latejoining SLs no longer take over SL status (#16378) Co-authored-by: Changelogs --- code/datums/jobs/job/marines.dm | 5 +---- code/datums/jobs/squads.dm | 7 ++++++- code/game/data_huds.dm | 4 ++-- code/game/objects/items/radio/headset.dm | 5 +++++ icons/UI_Icons/map_blips.dmi | Bin 4091 -> 8890 bytes icons/mob/hud/job.dmi | Bin 1600 -> 3580 bytes 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/datums/jobs/job/marines.dm b/code/datums/jobs/job/marines.dm index 56545b62b54cf..8fdae2c7c6aea 100644 --- a/code/datums/jobs/job/marines.dm +++ b/code/datums/jobs/job/marines.dm @@ -376,12 +376,9 @@ You are also in charge of communicating with command and letting them know about return if(!new_human.assigned_squad) return - if(new_human.assigned_squad.squad_leader != new_human) - if(new_human.assigned_squad.squad_leader) - new_human.assigned_squad.demote_leader() + if(!ismarineleaderjob(new_human.assigned_squad?.squad_leader?.job)) //If there's no proper SL already in the squad, promote to leader new_human.assigned_squad.promote_leader(new_human) - /datum/job/terragov/squad/vatgrown title = SQUAD_MARINE paygrade = "VM" diff --git a/code/datums/jobs/squads.dm b/code/datums/jobs/squads.dm index 54bf41a65eaae..42698129189bc 100644 --- a/code/datums/jobs/squads.dm +++ b/code/datums/jobs/squads.dm @@ -303,7 +303,9 @@ H.hud_set_job(faction) H.update_inv_head() H.update_inv_wear_suit() - + if(istype(H.wear_ear, /obj/item/radio/headset/mainship/)) + var/obj/item/radio/headset/mainship/radio = H.wear_ear + radio.update_minimap_icon() /datum/squad/proc/promote_leader(mob/living/carbon/human/H) if(squad_leader) @@ -330,6 +332,9 @@ squad_leader.hud_set_job(faction) squad_leader.update_inv_head() squad_leader.update_inv_wear_suit() + if(istype(squad_leader.wear_ear, /obj/item/radio/headset/mainship/)) + var/obj/item/radio/headset/mainship/radio = squad_leader.wear_ear + radio.update_minimap_icon() to_chat(squad_leader, "You're now the Squad Leader for [src]!") diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 8a922aab22431..25789943dc10f 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -599,13 +599,13 @@ if(assigned_squad) var/squad_color = assigned_squad.color var/rank = job.comm_title - if(assigned_squad.squad_leader == src) - rank = JOB_COMM_TITLE_SQUAD_LEADER if(job.job_flags & JOB_FLAG_PROVIDES_SQUAD_HUD) var/image/IMG = image('icons/mob/hud/job.dmi', src, "") IMG.color = squad_color holder.overlays += IMG holder.overlays += image('icons/mob/hud/job.dmi', src, "[rank]") + if(assigned_squad?.squad_leader == src) + holder.overlays += image('icons/mob/hud/job.dmi', src, "leader_trim") var/fireteam = wear_id?.assigned_fireteam if(fireteam) var/image/IMG2 = image('icons/mob/hud/job.dmi', src, "fireteam_[fireteam]") diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm index ebfd5f9b88661..b00dc776cde4b 100644 --- a/code/game/objects/items/radio/headset.dm +++ b/code/game/objects/items/radio/headset.dm @@ -296,6 +296,11 @@ GLOBAL_LIST_INIT(channel_tokens, list( var/image/overlay = image('icons/UI_icons/map_blips.dmi', null, wearer.job.minimap_icon) overlay.color = wearer.assigned_squad.color underlay.overlays += overlay + + if(wearer.assigned_squad?.squad_leader == wearer) + var/image/leader_trim = image('icons/UI_icons/map_blips.dmi', null, "leader_trim") + underlay.overlays += leader_trim + SSminimaps.add_marker(wearer, marker_flags, underlay) return SSminimaps.add_marker(wearer, marker_flags, image('icons/UI_icons/map_blips.dmi', null, wearer.job.minimap_icon)) diff --git a/icons/UI_Icons/map_blips.dmi b/icons/UI_Icons/map_blips.dmi index aed7ee7d771a952562ef080f3b0bb53281055667..ed698a9c15152d9e22c0583b38668ede7320edf4 100644 GIT binary patch literal 8890 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 delta 1594 zcmV-A2F3aO8^8>Z8Gi!+003nIoHYOd0L)NKR7JqR!071c|NsBe($eee>%qan+}zw5 zV4DjjJ|cwF|JVTV@bDE;g7wY-8)v2F=H?e$lIz3(5kzexBO??P6aWAKM~buliWOUz zy!5R@L4Bf0jJ5N30P~+GIBktUe4x~70M&#G8ze^+V3JOCn}1WK$%)zbHgua%!|svm z|1*-n+3^3N+xKY2?(y>fOOwEH*Y^;d-oftwsqOz5LTy%uqZ59(i@VWlr^#-Kqx6bJ zzepg!z`*+FQHG17^{+nQghep0=A*sQ*=9IYp%5hi0004WQchCwL=>}8fdH-aV>&TGiV`(mj3%n zg>L1|b_Wl4N$yBM&uPvJng~vw$}IXZ(<43X_QZSX&W>vmN5mVI9!9$*i*2o1L*FM} zr_Hj4A@O?CPHKyPK(q!Lna>zC%Hn3KgC?B^e4r~Ny?-{!s&=}E?lf|zF{BwwDu~J( zBsC^Xrr6*oV*ccv2ZAjl>r(1wIaE z*f8;b)dQLq$@lB}0MyDy6ygaaBme*eH%UZ6RCt{2oo#d4Mihk=qJU74Dq#{EV-qY2 zvT#Cdhkw)!p0rN#|Nm3>u4X#Znci~^8eZC*N0z@F_U=7eBWBKuaS&*{s8RJ}=S9n- z8)yYB_X8@(a5RIZ2ZkKL*=++>11)0;OScVR`DN&NslFf#>r>T5ZK8Wni(!DqAHM-Z ze%1E8(qADmDA4}<*LJ#0fK@2l2HG+KbYM(j>3^mHIM_Mx7%w7(5JCtcgb+dqA%y&s zP9(?nx}DDNmZ;lpwYuGos>gz^AKXBvHlSYOj_bbLjlmMUe!Yvno=sH8>pfLZk~B>d zRX@0aUMl^k>J{!Kg02U_FP>fW_AH`I;`dBnfjrL~U=3X+w7_ zkV$}z^7$O)^HG*d1)v-Co$Ou!=9hF`uOIa53AWDX`&nk`xV|~w8$`FEhWY%VbwUUs zgb+dqA%qa}lk(Q1>sCI0>e*d=OMiQI7RP62>I_yse>xlvHJT{@{ExN|Mp&T+@9%5Ayqq%ge<5T&VTycwMib;QEnI@4@#6 z&PT5OL^se&@&3TYrRbMi8|c*r!2W_aps&C^}?AFC5s`TWH9e}6Sm>l+5F`u*AfxDAaxx^Ct36VLAIbANykLI@#* z5JCtcg#0TF^ZB9%=~JXn{qX75^_xE5?`r=#o9i<;rMw0Xrq$x+{f9-RIdCJF%O!GP zKfj+OiLMvL$5~aD$iVIO9Wr>oyuZ5!`px`$egh0dX%ffi`Tsgz*K~LNtAFy-O{q69 z{WO;)Q1$up{Re2E@Tb3UK8b~nA7=?%y`Ku&f1!|%mx0Sr7i1A6^uJ^zpNLL8vKad`*Gsp+e7UfoVtx&ha` zn9%xbn$MdCzI-YDsp!*cwSTAWx1K2qA`=dIC%Uj|K9iOdY?^gg5-Ahe*gn(*S+&_v`gSxU%3OUKp6h%c-mu6 z8&MQ;`M>D~o@xU}yaKnY;ycLSAKUHqy4`--V^165w@=V};Ky42!85_}-iFM(Q1JLe sjy<-tA