CMB Riot Control Unit

code/__DEFINES/job.dm

@@ -245,8 +245,14 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_CMB_SYN "CMB Investigative Synthetic"
 #define JOB_CMB_ICC "Interstellar Commerce Commission Corporate Liaison"
 #define JOB_CMB_OBS "Interstellar Human Rights Observer"
+#define JOB_CMB_RIOT "CMB Riot Control Officer"
+#define JOB_CMB_MED "CMB Medical Technician"
+#define JOB_CMB_ENG "CMB Breaching Technician"
+#define JOB_CMB_SWAT "CMB SWAT Specialist"
+#define JOB_CMB_RSYN "CMB Riot Control Synthetic"
 
 #define CMB_GRUNT_LIST list(JOB_CMB, JOB_CMB_TL)
+#define CMB_RIOT_LIST list(JOB_CMB_TL, JOB_CMB_RIOT, JOB_CMB_MED, JOB_CMB_ENG, JOB_CMB_SWAT)
 
 //-------- FORECON --------//
 
@@ -402,4 +408,4 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 ///For denying certain traits being applied to people. ie. bad leg
 ///'Grunt' lists are for people who wouldn't logically get the bad leg trait, ie. UPP marine counterparts.
-#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, ROLES_WY_GOONS, ROLES_WY_PMC_ALL)
+#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, ROLES_WY_GOONS, ROLES_WY_PMC_ALL, CMB_RIOT_LIST)

code/__DEFINES/mob_hud.dm

@@ -44,9 +44,10 @@
 #define MOB_HUD_FACTION_TWE 13
 #define MOB_HUD_FACTION_CLF 14
 #define MOB_HUD_FACTION_PMC 15
-#define MOB_HUD_HUNTER 16
-#define MOB_HUD_HUNTER_CLAN 17
-#define MOB_HUD_EXECUTE 18
+#define MOB_HUD_FACTION_CMB 16
+#define MOB_HUD_HUNTER 17
+#define MOB_HUD_HUNTER_CLAN 18
+#define MOB_HUD_EXECUTE 19
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

code/__DEFINES/paygrade_defs/cmb.dm

@@ -16,5 +16,20 @@
 /// CMBD, CMB Deputy
 #define PAY_SHORT_CMBD "CMBD"
 
+/// CMBR, CMB Riot Control Officer
+#define PAY_SHORT_CMBR "CMBR"
+
+/// CMBMT, CMB Medical Technician
+#define PAY_SHORT_CMBMT "CMBMT"
+
+/// CMBBT, CMB Breaching Technician
+#define PAY_SHORT_CMBBT "CMBBT"
+
+/// CMBBT, CMB SWAT Specialist
+#define PAY_SHORT_CMBSWS "CMBSWS"
+
+/// CMBRS, CMB Riot Control Synthetic
+#define PAY_SHORT_CMBRS "CMBRS"
+
 /// CMBS, CMB Synthetic
 #define PAY_SHORT_CMBS "CMBS"

code/datums/ammo/bullet/revolver.dm

@@ -117,6 +117,9 @@
 
 	penetration = ARMOR_PENETRATION_TIER_3
 
+/datum/ammo/bullet/revolver/small/cmb
+	damage = 60
+
 /datum/ammo/bullet/revolver/small/hollowpoint
 	name = "small hollowpoint revolver bullet"
 	headshot_state = HEADSHOT_OVERLAY_MEDIUM

code/datums/ammo/bullet/shotgun.dm

@@ -337,6 +337,30 @@
 	scatter = SCATTER_AMOUNT_TIER_3
 	damage = 10
 
+/datum/ammo/bullet/shotgun/light/rubber
+	name = "rubber buckshot shell"
+	icon_state = "buckshot"
+	handful_state = "rubbershot_shell"
+	multiple_handful_name = TRUE
+	bonus_projectiles_type = /datum/ammo/bullet/shotgun/light/rubber/spread
+	sound_override = 'sound/weapons/gun_shotgun_riot.ogg'
+	headshot_state = HEADSHOT_OVERLAY_LIGHT  //It's not meant to kill people... but if you put it in your mouth, it will.
+	accuracy = HIT_ACCURACY_TIER_3
+	shell_speed = AMMO_SPEED_TIER_2
+	max_range = 5
+	shrapnel_chance = 0
+	damage = 0
+	stamina_damage = 35
+	bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_3
+	penetration = ARMOR_PENETRATION_TIER_1
+
+/datum/ammo/bullet/shotgun/light/rubber/spread
+	name = "additional rubber buckshot"
+	bonus_projectiles_amount = 0
+	scatter = SCATTER_AMOUNT_TIER_3
+	stamina_damage = 10
+
+
 //Enormous shell for Van Bandolier's superheavy double-barreled hunting gun.
 /datum/ammo/bullet/shotgun/twobore
 	name = "two bore bullet"

code/datums/emergency_calls/cmb.dm

@@ -97,7 +97,7 @@
 		to_chat(M, SPAN_BOLD("Following the lead of your Marshal, you have become renown for your steadfast commitment to justice, fighting against crime and corruption alike."))
 		to_chat(M, SPAN_BOLD("While enroute to an investigation you were diverted by your command at Anchorpoint Station to the [MAIN_SHIP_NAME] because of a distress beacon."))
 		to_chat(M, SPAN_BOLD("You have been stationed at Anchorpoint Station for [pick(80;"several months", 10;"only a week", 10;"years")] investigating henious crimes among the frontier."))
-		to_chat(M, SPAN_BOLD("The laws of arth stretch beyond the Sol. Where others fall to corruption, you stay steadfast in your morals."))
+		to_chat(M, SPAN_BOLD("The laws of Earth stretch beyond the Sol. Where others fall to corruption, you stay steadfast in your morals."))
 		to_chat(M, SPAN_BOLD("Corporate Officers chase after paychecks and promotions, but you are motivated to do your sworn duty and care for the population, no matter how far or isolated a colony may be."))
 		to_chat(M, SPAN_BOLD("Despite being stretched thin, the stalwart oath of the Marshals has continued to keep communities safe, with the CMB well respected by many. You are a representation of that oath, serve with distinction."))
 
@@ -209,3 +209,94 @@
 		to_chat(M, SPAN_BOLD("You were activated as a part of a Quick Reaction Force to reinforce Colonial Marshals in distress."))
 		to_chat(M, SPAN_BOLD("You weren't sure if it was a false alarm or not. Turns out it isn't..."))
 		to_chat(M, SPAN_BOLD("Now it looks like the time to be the cavalry is once more upon you."))
+
+/datum/emergency_call/cmb/riot_control
+	name = "CMB - Colonial Marshals Riot Control Unit (Friendly)"
+	mob_max = 8
+	mob_min = 3
+	probability = 20
+	home_base = /datum/lazy_template/ert/weyland_station
+	max_heavies = 1
+	max_medics = 2
+	max_synths = 1
+	max_engineers = 1
+
+/datum/emergency_call/cmb/riot_control/New()
+	..()
+	arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], this is Anchorpoint Station with the Colonial Marshal Bureau. We are receiving your distress signal and are dispatching a nearby riot control team to board with you now. Standby."
+
+/datum/emergency_call/cmb/riot_control/create_member(datum/mind/M, turf/override_spawn_loc)
+	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
+
+	if(!istype(spawn_loc))
+		return //Didn't find a useable spawn point.
+
+	var/mob/living/carbon/human/mob = new(spawn_loc)
+	M.transfer_to(mob, TRUE)
+
+	if(!leader && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
+		leader = mob
+		to_chat(mob, SPAN_ROLE_HEADER("You are the Colonial Marshal!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/leader/riot, TRUE, TRUE)
+	else if(medics < max_medics && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(mob.client, JOB_SQUAD_MEDIC, time_required_for_job))
+		medics++
+		to_chat(mob, SPAN_ROLE_HEADER("You are a CMB Medical Technician!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/med, TRUE, TRUE)
+	else if(engineers < max_engineers && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(mob.client, JOB_SQUAD_ENGI, time_required_for_job))
+		engineers++
+		to_chat(mob, SPAN_ROLE_HEADER("You are a CMB Breaching Technician!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/eng, TRUE, TRUE)
+	else if(heavies < max_heavies && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
+		heavies++
+		to_chat(mob, SPAN_ROLE_HEADER("You are a CMB SWAT Specialist!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/spec, TRUE, TRUE)
+	else if(synths < max_synths && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_SYNTH) && mob.client.check_whitelist_status(WHITELIST_SYNTHETIC))
+		synths++
+		to_chat(mob, SPAN_ROLE_HEADER("You are a CMB Riot Control Synthetic!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/synth/riot, TRUE, TRUE)
+	else
+		to_chat(mob, SPAN_ROLE_HEADER("You are a Riot Control Officer!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/riot, TRUE, TRUE)
+
+	print_backstory(mob)
+
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
+
+/datum/emergency_call/cmb/riot_control/print_backstory(mob/living/carbon/human/M)
+	if(M == leader)
+		to_chat(M, SPAN_BOLD("You are the Colonial Marshal, originally from [pick(70;"The United Americas", 20;"Sol", 10;"a colony on the frontier")]."))
+		to_chat(M, SPAN_BOLD("You started in the Marshals through [pick(50; "pursuing a career during college", 40;"working for law enforcement", 10;"being recruited for your skills")]."))
+		to_chat(M, SPAN_BOLD("Rising through positions across the galaxy, you have become renown for your steadfast commitment to justice, fighting against crime and corruption alike."))
+		to_chat(M, SPAN_BOLD("Enroute to a [pick(20; "homicide", 20;"corporate corruption investigation", 10; "hostage situation", 10;"terrorist attack", 10;"prisoner transfer", 10;"drug raid", 10;"barricaded fugitive situation", 5;"suspected smuggling incident", 5;"human trafficking situation" )] you were diverted by your command at Anchorpoint Station to the [MAIN_SHIP_NAME] because of a distress beacon."))
+		to_chat(M, SPAN_BOLD("The laws of Earth stretch beyond the Sol. Where others are tempted and fall to corruption, you stay steadfast in your morals."))
+		to_chat(M, SPAN_BOLD("Corporate Officers chase after paychecks and promotions, but you are motivated to do your sworn duty and care for the population, no matter how far or isolated a colony may be."))
+		to_chat(M, SPAN_BOLD("You've seen a lot during your time in the Neroid Sector, but you're here because you're the best, doing the right thing to make the frontier a better place."))
+		to_chat(M, SPAN_BOLD("Despite being stretched thin, the stalwart oath of the Marshals has continued to keep communities safe, with the CMB well respected by many. You are the representation of that oath, serve with distinction."))
+	else if(issynth(M))
+		to_chat(M, SPAN_BOLD("Despite being an older model, you are well regarded among your peers for your keen senses and alertness."))
+		to_chat(M, SPAN_BOLD("You do not enforce or comply with Marine Law, however you have an understanding of it."))
+		to_chat(M, SPAN_BOLD("After receiving a software and law update in Sol, you were stationed at Anchorpoint Station to assist with CMB units on the frontier."))
+		to_chat(M, SPAN_BOLD("While enroute to your mission you were diverted by your command to the [MAIN_SHIP_NAME] because of a distress beacon."))
+		to_chat(M, SPAN_BOLD("Despite being stretched thin, the stalwart oath of the Marshals has continued to keep communities safe, with the CMB well respected by many. You are a representation of that oath, serve with distinction."))
+	else
+		to_chat(M, SPAN_BOLD("You are a CMB Riot Control Officer, originally from [pick(70;"The United Americas", 20;"Sol", 10;"a colony on the frontier")]."))
+		to_chat(M, SPAN_BOLD("You joined the Marshals through [pick(50; "pursuing a career during college", 40;"working for law enforcement", 10;"being recruited for your skills")]."))
+		to_chat(M, SPAN_BOLD("Following the lead of your Marshal, you have become renown for your steadfast commitment to justice, fighting against crime and corruption alike."))
+		to_chat(M, SPAN_BOLD("While enroute to your mission you were diverted by your command at Anchorpoint Station to the [MAIN_SHIP_NAME] because of a distress beacon."))
+		to_chat(M, SPAN_BOLD("You have been stationed at Anchorpoint Station for [pick(80;"several months", 10;"only a week", 10;"years")] keeping orden on the frontier."))
+		to_chat(M, SPAN_BOLD("The laws of Earth stretch beyond the Sol. Where others fall to corruption, you stay steadfast in your morals."))
+		to_chat(M, SPAN_BOLD("Corporate Officers chase after paychecks and promotions, but you are motivated to do your sworn duty and care for the population, no matter how far or isolated a colony may be."))
+		to_chat(M, SPAN_BOLD("Despite being stretched thin, the stalwart oath of the Marshals has continued to keep communities safe, with the CMB well respected by many. You are a representation of that oath, serve with distinction."))
+
+// A Nearby Colonial Marshal riot control team responding to Marshals in Distress.
+/datum/emergency_call/cmb/riot_control/alt
+	name = "CMB - Riot Control Unit - Marshals in Distress (Friendly)"
+	mob_max = 5
+	mob_min = 1
+	max_medics = 1
+	probability = 0
+
+/datum/emergency_call/cmb/riot_control/New()
+	..()
+	arrival_message = "CMB Team, this is Anchorpoint Station. We have confirmed you are in distress. Routing nearby units to assist!"
+	objectives = "Patrol Unit 5807, we have nearby Marshals in Distress! Locate and assist them immediately."

code/datums/factions/cmb.dm

@@ -1,3 +1,35 @@
 /datum/faction/cmb
 	name = "Colonial Marshal Bureau"
-	faction_tag = FACTION_MARINE
+	faction_tag = FACTION_MARSHAL
+
+/datum/faction/cmb/modify_hud_holder(image/holder, mob/living/carbon/human/H)
+	var/hud_icon_state
+	var/obj/item/card/id/ID = H.get_idcard()
+	var/_role
+	if(H.mind)
+		_role = H.job
+	else if(ID)
+		_role = ID.rank
+	switch(_role)
+		if(JOB_CMB)
+			hud_icon_state = "dep"
+		if(JOB_CMB_ENG)
+			hud_icon_state = "brch"
+		if(JOB_CMB_ICC)
+			hud_icon_state = "icc"
+		if(JOB_CMB_MED)
+			hud_icon_state = "medt"
+		if(JOB_CMB_RSYN)
+			hud_icon_state = "rsyn"
+		if(JOB_CMB_OBS)
+			hud_icon_state = "obs"
+		if(JOB_CMB_RIOT)
+			hud_icon_state = "rco"
+		if(JOB_CMB_SYN)
+			hud_icon_state = "syn"
+		if(JOB_CMB_TL)
+			hud_icon_state = "mar"
+		if(JOB_CMB_SWAT)
+			hud_icon_state = "spec"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "cmb_[hud_icon_state]")

code/datums/factions/uscm.dm

@@ -197,22 +197,6 @@
 				marine_rk = "wo_ro"
 			if(JOB_WO_PILOT)
 				marine_rk = "wo_mcrew"
-			// Colonial Marshals
-			if(JOB_CMB_TL)
-				marine_rk = "mar"
-				icon_prefix = "cmb_"
-			if(JOB_CMB)
-				marine_rk = "dep"
-				icon_prefix = "cmb_"
-			if(JOB_CMB_SYN)
-				marine_rk = "syn"
-				icon_prefix = "cmb_"
-			if(JOB_CMB_ICC)
-				marine_rk = "icc"
-				icon_prefix = "cmb_"
-			if(JOB_CMB_OBS)
-				marine_rk = "obs"
-				icon_prefix = "cmb_"
 			// Check squad marines here too, for the unique ones
 			if(JOB_SQUAD_ENGI)
 				marine_rk = "engi"

code/datums/mob_hud.dm

@@ -17,6 +17,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	MOB_HUD_FACTION_TWE = new /datum/mob_hud/faction/twe(),
 	MOB_HUD_FACTION_CLF = new /datum/mob_hud/faction/clf(),
 	MOB_HUD_FACTION_PMC = new /datum/mob_hud/faction/pmc(),
+	MOB_HUD_FACTION_CMB = new /datum/mob_hud/faction/cmb(),
 	MOB_HUD_HUNTER = new /datum/mob_hud/hunter_hud(),
 	MOB_HUD_HUNTER_CLAN = new /datum/mob_hud/hunter_clan(),
 	MOB_HUD_EXECUTE = new /datum/mob_hud/execute_hud(),
@@ -212,6 +213,9 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 /datum/mob_hud/faction/pmc
 	faction_to_check = FACTION_PMC
 
+/datum/mob_hud/faction/cmb
+	faction_to_check = FACTION_MARSHAL
+
 /datum/mob_hud/faction/observer
 	hud_icons = list(FACTION_HUD, ORDER_HUD, HUNTER_CLAN, HOLOCARD_HUD)
 

code/datums/paygrades/factions/other/cmb.dm

@@ -16,6 +16,32 @@
 /datum/paygrade/cmb/syn
 	paygrade = PAY_SHORT_CMBS
 	name = "CMB Investigative Synthetic"
+	prefix = "Syn."
+
+/datum/paygrade/cmb/syn/riot
+	paygrade = PAY_SHORT_CMBRS
+	name = "CMB Riot Control Synthetic"
+	prefix = "Syn."
+
+/datum/paygrade/cmb/riot
+	paygrade = PAY_SHORT_CMBR
+	name = "CMB Riot Control Officer"
+	prefix = "Off."
+
+/datum/paygrade/cmb/med
+	paygrade = PAY_SHORT_CMBMT
+	name = "CMB Medical Technician"
+	prefix = "Med."
+
+/datum/paygrade/cmb/eng
+	paygrade = PAY_SHORT_CMBBT
+	name = "CMB Breaching Technician"
+	prefix = "Brech."
+
+/datum/paygrade/cmb/spec
+	paygrade = PAY_SHORT_CMBSWS
+	name = "CMB SWAT Specialist"
+	prefix = "Spec."
 
 /datum/paygrade/cmb/icc
 	paygrade = PAY_SHORT_ICCA

code/datums/skills/cmb.dm

@@ -17,6 +17,50 @@ COLONIAL MARSHALS
 		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 	)
 
+/datum/skills/cmb/medic
+	name = "CMB Medical Technician"
+	skills = list(
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_CQC = SKILL_CQC_EXPERT,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
+		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
+		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_JTAC = SKILL_JTAC_BEGINNER,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
+	)
+
+/datum/skills/cmb/engi
+	name = "CMB Breaching Technician"
+	skills = list(
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_CQC = SKILL_CQC_EXPERT,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+		SKILL_JTAC = SKILL_JTAC_BEGINNER,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
+	)
+
+/datum/skills/cmb/spec
+	name = "CMB SWAT Specialist"
+	skills = list(
+		SKILL_POLICE = SKILL_POLICE_SKILLED,
+		SKILL_CQC = SKILL_CQC_MASTER,
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_FIREMAN = SKILL_FIREMAN_EXPERT,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+		SKILL_JTAC = SKILL_JTAC_BEGINNER,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
+	)
+
 /datum/skills/cmb/leader
 	name = "CMB Marshal"
 	skills = list(
@@ -31,7 +75,7 @@ COLONIAL MARSHALS
 		SKILL_FIREARMS = SKILL_FIREARMS_MAX,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
-		SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 	)