Skip to content

Commit

Permalink
We faction group now
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Jul 20, 2023
1 parent bdc43ba commit ff8adc5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/equipment_preset/cmb
name = "Colonial Marshal"
faction = FACTION_MARSHAL
faction_group = list(FACTION_MARSHAL, FACTION_MARINE)
rank = JOB_CMB
idtype = /obj/item/card/id/deputy
languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
Expand Down Expand Up @@ -410,7 +411,8 @@
paygrade = "ME2"
role_comm_title = "A-RFN"
skills = /datum/skills/pfc/crafty
faction = FACTION_MARINE
faction = FACTION_MARSHAL
faction_group = list(FACTION_MARSHAL, FACTION_MARINE)

/datum/equipment_preset/uscm/cmb/load_status(mob/living/carbon/human/new_human)
. = ..()
Expand Down

0 comments on commit ff8adc5

Please sign in to comment.