upd

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/game/objects/effects/landmarks/survivor_spawner.dm

@@ -203,10 +203,10 @@
 /obj/effect/landmark/survivor_spawner/fiorina_armory_cmb
 	equipment = /datum/equipment_preset/survivor/cmb/riot
 	synth_equipment = /datum/equipment_preset/synth/survivor/cmb/riotsynth
-	intro_text = list("<h2>You are a CMB Deputy!</h2>",\
+	intro_text = list("<h2>You are a CMB Riot Control Officer!</h2>",\
 	"<span class='notice'>You are aware of the 'alien' threat.</span>",\
 	"<span class='danger'>Your primary objective is to survive the infestation.</span>")
-	story_text = "You are a Deputy of the Office of the Colonial Marshals. Your dispatcher received a distress signal from the infamous Fiorina Maximum Penitentiary. You figured it was just another typical case of the prison dealing with a riot their understaffed security force couldn't handle, with more and more of its personnel getting dispatched elsewhere in the galaxy. This wasn't the first time OCM officers were called in to assist, but unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."
+	story_text = "You are a Riot Control Officer of the Office of the Colonial Marshals. Your dispatcher received a distress signal from the infamous Fiorina Maximum Penitentiary. You figured it was just another typical case of the prison dealing with a riot their understaffed security force couldn't handle, with more and more of its personnel getting dispatched elsewhere in the galaxy. This wasn't the first time OCM officers were called in to assist, but unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."
 
 	spawn_priority = SPAWN_PRIORITY_VERY_HIGH
 
@@ -216,7 +216,7 @@
 	intro_text = list("<h2>You are a United Americas Riot Control Officer!</h2>",\
 	"<span class='notice'>You are aware of the 'alien' threat.</span>",\
 	"<span class='danger'>Your primary objective is to survive the infestation.</span>")
-	story_text = "You are a United Americas Riot Control Officer. Your dispatcher received a request from the local OCM Outpost, requesting some men to intervene assist a Deputy with handling a riot at Fiorina. The prison was an understaffed mess so you weren't too surprised they had sent out a distress signal, calling you in to do their jobs yet again. Unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."
+	story_text = "You are a United Americas Riot Control Officer. Your dispatcher received a request from the local OCM Outpost, requesting some men to intervene assist a OCM Officer with handling a riot at Fiorina. The prison was an understaffed mess so you weren't too surprised they had sent out a distress signal, calling you in to do their jobs yet again. Unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."
 
 	spawn_priority = SPAWN_PRIORITY_HIGH
 

code/modules/gear_presets/cmb.dm

@@ -440,12 +440,12 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/xm51/black/cmb, WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm51/cmb, WEAR_IN_BELT)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm51/cmb, WEAR_IN_BELT)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm51/cmb, WEAR_IN_BELT)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm51/cmb/rubber, WEAR_IN_BELT)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching, WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching/rubber, WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/light/breaching/rubber, WEAR_IN_BELT)
 	//pouches
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m16, WEAR_R_STORE)

code/modules/projectiles/guns/rifles.dm

@@ -2022,7 +2022,7 @@
 
 /obj/item/weapon/gun/rifle/xm51/cmb
 	name = "\improper Model 1771 Cobra Max Tactical"
-	desc = "Вesigned by Armat Battlefield Systems for the Office of the Colonial Marshals as a breaching and crowd control weapon, the Model 1771 is a mag-fed, pump-action shotgun. It utilizes special 16-gauge breaching rounds which are effective at breaching walls and doors. Users are advised not to employ the weapon against soft or armored targets due to low performance of the shells."
+	desc = "Designed on the M51 platform by Armat Battlefield Systems for the Office of the Colonial Marshals as a breaching and crowd control weapon, the Model 1771 is a mag-fed, pump-action shotgun. It utilizes special 16-gauge breaching rounds which are effective at breaching walls and doors, additionally designed to shoot rubber buckshot."
 	icon_state = "m51b"
 	item_state = "m51b"
 	current_mag = /obj/item/ammo_magazine/rifle/xm51/cmb

code/modules/projectiles/magazines/rifles.dm

@@ -531,4 +531,11 @@
 	transfer_handful_amount = 6
 
 /obj/item/ammo_magazine/rifle/xm51/cmb
-	name = "\improper Model 1771 magazine (16g)"
+	name = "\improper Model 1771 magazine (16g breaching)"
+	icon_state = "m51b"
+
+/obj/item/ammo_magazine/rifle/xm51/cmb/rubber
+	name = "\improper Model 1771 magazine (16g rubber buckshot)"
+	desc = "A 16 gauge pump-action rubber shotgun magazine."
+	icon_state = "m51b_rubber"
+	default_ammo = /datum/ammo/bullet/shotgun/light/rubber

code/modules/projectiles/magazines/shotguns.dm

@@ -299,6 +299,12 @@ GLOBAL_LIST_INIT(shotgun_handfuls_12g, list(
 	caliber = "16g"
 	gun_type = /obj/item/weapon/gun/rifle/xm51
 
+/obj/item/ammo_magazine/handful/shotgun/light/breaching/rubber
+	name = "handful of rubber buckshot shells (16g)"
+	icon_state = "rubbershot_shell_6"
+	handful_state = "rubbershot_shell"
+	default_ammo = /datum/ammo/bullet/shotgun/light/rubber
+
 /obj/item/ammo_magazine/handful/shotgun/twobore
 	name = "handful of shotgun slugs (2 bore)"
 	icon_state = "twobore_3"