Skip to content

Fix: Adds missing faction HUDs to Anchorpoint marines, miscellaneous CMB fixes #11673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MistChristmas merged 4 commits into from
Feb 10, 2026
Merged

Fix: Adds missing faction HUDs to Anchorpoint marines, miscellaneous CMB fixes #11673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba51c4e
Adds HUDs to Anchorpoint
Puckaboo2 Feb 4, 2026
349e41a
Miscellaneous fixes
Puckaboo2 Feb 5, 2026
82b724a
Swaps minimap icon states
Puckaboo2 Feb 5, 2026
8bd7183
In hindsight, I should have looked further into the code. Love you, M…
Puckaboo2 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions code/datums/factions/cmb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
var/hud_icon_state
var/obj/item/card/id/ID = H.get_idcard()
var/_role
var/anchorpoint_marine
if(H.mind)
_role = H.job
else if(ID)
Expand All @@ -33,5 +34,30 @@
hud_icon_state = "mar"
if(JOB_CMB_SWAT)
hud_icon_state = "spec"

//Anchorpoint Marines
if(JOB_SQUAD_MARINE)
hud_icon_state = "grunt"
anchorpoint_marine = TRUE
if(JOB_SQUAD_ENGI)
hud_icon_state = "engi"
anchorpoint_marine = TRUE
if(JOB_SQUAD_TEAM_LEADER)
hud_icon_state = "tl"
anchorpoint_marine = TRUE
if(JOB_SQUAD_MEDIC)
hud_icon_state = "med"
anchorpoint_marine = TRUE
if(JOB_SQUAD_SMARTGUN)
hud_icon_state = "gun"
anchorpoint_marine = TRUE

if(anchorpoint_marine)
var/image/IMG = image('icons/mob/hud/factions/marine.dmi', H, "hudsquad")
IMG.color = "#194877"
holder.overlays += IMG
holder.overlays += image('icons/mob/hud/factions/marine.dmi', H, "hudsquad_[hud_icon_state]")
return

if(hud_icon_state)
holder.overlays += image(override_icon_file ? override_icon_file : base_icon_file, H, "cmb_[hud_icon_state]")
8 changes: 5 additions & 3 deletions code/modules/gear_presets/cmb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@

/datum/equipment_preset/cmb/leader/riot
name = "CMB - The Colonial Marshal Riot Control"
role_comm_title = "CMB MAR RC"
assignment = "CMB Riot Control Marshal"

/datum/equipment_preset/cmb/leader/riot/load_gear(mob/living/carbon/human/new_human)
//clothes
Expand Down Expand Up @@ -522,7 +524,7 @@
name = "CMB - Colonial Marshal Investigative Synthetic"
paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0)
idtype = /obj/item/card/id/deputy
role_comm_title = "CMB Syn"
role_comm_title = "CMB Inv. Syn"
flags = EQUIPMENT_PRESET_EXTRA

minimap_icon = "cmb_syn"
Expand Down Expand Up @@ -624,8 +626,8 @@
/datum/equipment_preset/cmb/synth/riot
name = "CMB - Colonial Marshal Riot Control Synthetic"
paygrades = list(PAY_SHORT_CMBRS = JOB_PLAYTIME_TIER_0)

minimap_icon = "pmc_syn"
role_comm_title = "CMB RC Syn"
minimap_icon = "pmc_syn" //actually not PMC, it just has the same color palette as CMB

assignment = "CMB Riot Control Synthetic"
job_title = JOB_CMB_RSYN
Expand Down
7 changes: 4 additions & 3 deletions ...ules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
idtype = /obj/item/card/id/deputy/riot
job_title = JOB_CMB_RIOT
skills = /datum/skills/cmb
minimap_icon = "deputy"
minimap_icon = "mp"
minimap_background = "background_cmb"

/datum/equipment_preset/survivor/cmb/riot/load_gear(mob/living/carbon/human/new_human)

Expand Down Expand Up @@ -90,7 +91,7 @@
/datum/equipment_preset/synth/survivor/cmb/riotsynth
name = "Survivor - Synthetic - CMB Riot Control Synthetic"
paygrades = list(PAY_SHORT_CMBRS = JOB_PLAYTIME_TIER_0)
role_comm_title = "CMB Syn"
role_comm_title = "CMB RC Syn"
faction = FACTION_MARSHAL
faction_group = list(FACTION_MARSHAL, FACTION_MARINE, FACTION_SURVIVOR)
flags = EQUIPMENT_PRESET_EXTRA
Expand All @@ -99,7 +100,7 @@
languages = ALL_SYNTH_LANGUAGES
idtype = /obj/item/card/id/deputy/riot
skills = /datum/skills/synthetic/cmb
minimap_icon = "cmb_syn"
minimap_icon = "pmc_syn"
minimap_background = "background_cmb"

/datum/equipment_preset/synth/survivor/cmb/riotsynth/load_race(mob/living/carbon/human/new_human)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
assignment = JOB_CMB_SYN
job_title = JOB_CMB_SYN
minimap_background = "background_cmb"
minimap_icon = "cmb_syn"
minimap_icon = "pmc_syn"

paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0)
faction = FACTION_MARSHAL
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/synths.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
/datum/equipment_preset/synth/survivor/cmb_synth
name = "Survivor - Synthetic - CMB Investigative Synthetic"
idtype = /obj/item/card/id/deputy
role_comm_title = "CMB Syn"
role_comm_title = "CMB Inv. Syn"
assignment = JOB_CMB_SYN
job_title = JOB_CMB_SYN
paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0)
Expand Down