Fixes, gives breaches his shield, big breacher buff, gets some more o…

…f their kit in, gets gives them grenades, their storge might be a bit much but the backpacks look really big so :\

code/controllers/subsystem/communications.dm

@@ -251,6 +251,7 @@ SUBSYSTEM_DEF(radio)
 		"[INTEL_FREQ]" = "intelradio",
 		"[WY_FREQ]" = "wyradio",
 		"[VAI_FREQ]" = "vairadio",
+		"[RMC_FREQ]" = "rmcradio",
 		"[CMB_FREQ]" = "cmbradio",
 		"[CLF_FREQ]" = "clfradio",
 		"[ALPHA_FREQ]" = "alpharadio",

code/game/objects/items/explosives/grenades/marines.dm

@@ -689,3 +689,23 @@
 	burn_level = BURN_LEVEL_TIER_3
 	radius = 2
 	fire_type = FIRE_VARIANT_DEFAULT
+
+//Royal marine grenades
+
+/obj/item/explosive/grenade/high_explosive/rmc
+	name = "\improper R2175/A HEDP grenade"
+	desc = "High-Explosive Dual-Purpose. A small, but deceptively strong blast grenade that has recently been added to the arsenal of the RMC."
+	icon_state = "rmc_grenade"
+	item_state = "grenade_hedp"
+	explosion_power = 130
+	explosion_falloff = 30
+
+/obj/item/explosive/grenade/incendiary/rmc
+	name = "\improper R2175/B HIDP grenade"
+	desc = "The R2175/B HIDP is a small, but deceptively strong incendiary grenade designed to rapidly clear areas with fast-acting potent fire. It is set to detonate in 4 seconds."
+	icon_state = "rmc_grenade_fire"
+	item_state = "grenade_fire"
+	flame_level = BURN_TIME_TIER_1
+	burn_level = BURN_LEVEL_TIER_8
+	radius = 3
+	fire_type = FIRE_VARIANT_DEFAULT

code/game/objects/items/storage/backpack.dm

@@ -1115,7 +1115,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	item_state = "backpack_large"
 	max_storage_space = 26
 
-/obj/item/storage/backpack/rmc/heavy/black
+/obj/item/storage/backpack/rmc/heavy/black //alt backpack, unused
 	icon_state = "black_backpack_large"
 	item_state = "black_backpack_large"
 
@@ -1125,9 +1125,9 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	icon_state = "backpack_medium"
 	item_state = "backpack_medium"
 	worn_accessible = TRUE
-	max_storage_space = 20
+	max_storage_space = 25
 
-/obj/item/storage/backpack/rmc/medium/black
+/obj/item/storage/backpack/rmc/medium/black //alt backpack, unused
 	icon_state = "black_backpack_medium"
 	item_state = "black_backpack_medium"
 
@@ -1137,25 +1137,25 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	icon_state = "backpack_small"
 	item_state = "backpack_small"
 	worn_accessible = TRUE
-	max_storage_space = 15
+	max_storage_space = 23
 
-/obj/item/storage/backpack/rmc/light/black
+/obj/item/storage/backpack/rmc/light/black //alt backpack, unused
 	icon_state = "black_backpack_small"
 	item_state = "black_backpack_small"
 
-/obj/item/storage/backpack/rmc/frame
+/obj/item/storage/backpack/rmc/frame //One sorry sod should have to lug this about spawns in their shuttle currently
 	name = "\improper RMC carry-frame"
-	desc = "A backpack specifically designed to hold RMC weapons and shields."
+	desc = "A backpack specifically designed to hold equipment for commandos."
 	icon_state = "backpack_frame"
 	item_state = "backpack_frame"
 	max_w_class = SIZE_HUGE
-	storage_slots = 4
-	can_hold = list(/obj/item/ammo_box/magazine/misc/mre)
+	storage_slots = 7
+	can_hold = list(/obj/item/ammo_box/magazine/misc/mre,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/adv,/obj/item/storage/firstaid/surgical,/obj/item/device/defibrillator/compact,/obj/item/tool/surgery/surgical_line,/obj/item/tool/surgery/synthgraft,/obj/item/storage/box/packet/rmc/he,/obj/item/storage/box/packet/rmc/incin)
 
-/obj/item/storage/backpack/general_belt/rmc
+/obj/item/storage/backpack/general_belt/rmc //the breachers belt
 	name = "\improper RMC general utility belt"
 	desc = "A small, lightweight pouch that can be clipped onto armor to provide additional storage. This new RMC model, while uncomfortable, can also be clipped around the waist."
 	icon_state = "rmc_general"
 	item_state = "rmc_general"
 	has_gamemode_skin = FALSE
-	max_storage_space = 16
+	max_storage_space = 23

code/game/objects/items/weapons/shields.dm

@@ -114,13 +114,19 @@
 	var/active = 0
 
 /obj/item/weapon/shield/riot/metal
+	name = "metal shield"
+	name = "A metal riot shield effective, but heavy."
 	icon_state = "riotmetal"
 	item_state = "riotmetal"
+	base_icon_state = "riotmetal"
 	passive_block = 40
 	readied_block = 60
 
-/obj/item/weapon/shield/riot/ballistic
+/obj/item/weapon/shield/riot/ballistic //FOR THE ROYAL MARINE SPEC DO NOT TOUCH SMELLY MAN
+	name = "Ballistic shield"
+	desc = "Ballistic shield used by the royal marines commando. This shield is commonly used during boarding actions due to its lightweight but durible design."
 	icon_state = "ballisticshield"
 	item_state = "ballisticshield"
+	base_icon_state = "ballisticshield"
 	passive_block = 60
 	readied_block = 90

code/modules/clothing/shoes/marine_shoes.dm

@@ -199,7 +199,7 @@
 
 //=ROYAL MARINES=\\
 
-/obj/item/clothing/shoes/veteran/royal_marine
+/obj/item/clothing/shoes/royal_marine
 	name = "\improper L10 pattern combat boots"
 	desc = "Standard issue combat boots for combat scenarios or combat situations. Used by the three world empires royal marines commando units."
 	icon_state = "rmc_boots"
@@ -220,14 +220,14 @@
 	items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol)
 	flags_atom = NO_NAME_OVERRIDE
 
-/obj/item/clothing/shoes/veteran/royal_marine/snow
+/obj/item/clothing/shoes/royal_marine/snow
 	icon_state = "s_rmc_boots"
 
-/obj/item/clothing/shoes/veteran/royal_marine/knife
-/obj/item/clothing/shoes/veteran/royal_marine/knife/Initialize(mapload, ...)
+/obj/item/clothing/shoes/royal_marine/knife
+/obj/item/clothing/shoes/royal_marine/knife/Initialize(mapload, ...)
 	. = ..()
 	stored_item = new /obj/item/attachable/bayonet/rmc(src)
 	update_icon()
 
-/obj/item/clothing/shoes/veteran/royal_marine/knife/snow
+/obj/item/clothing/shoes/royal_marine/knife/snow
 	icon_state = "s_rmc_boots"

code/modules/gear_presets/royal_marines.dm

@@ -74,7 +74,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo, WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/heavy, WEAR_BACK)
@@ -86,6 +86,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90, WEAR_J_STORE)
 	//
@@ -117,7 +119,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo/marksman, WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK)
@@ -129,6 +131,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/scope, WEAR_J_STORE)
 	//
@@ -159,7 +163,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/general_belt/rmc, WEAR_WAIST)
@@ -172,6 +176,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BELT)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BELT)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/ballistic, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BELT)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/shotgun, WEAR_J_STORE)
 	//
@@ -206,7 +212,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK)
@@ -218,6 +224,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/rmc, WEAR_J_STORE)
 	//
@@ -251,7 +259,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK)
@@ -267,6 +275,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/a_grip, WEAR_J_STORE)
 	//
@@ -298,7 +308,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/royal_marine/knife, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK)
@@ -314,6 +324,8 @@
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK)
 	//
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/a_grip, WEAR_J_STORE)
 	//

code/modules/projectiles/ammo_boxes/grenade_packets.dm

@@ -126,3 +126,15 @@ var/list/grenade_packets = list(
 	desc = "It contains three M74 airburst smoke grenades. This end towards the enemy."
 	icon_state = "agms_packet"
 	content_type = /obj/item/explosive/grenade/smokebomb/airburst
+
+/obj/item/storage/box/packet/rmc/he
+	name = "\improper R2175/A HEDP grenade packet"
+	desc = "It contains three R2175/A HEDP grenades. Handle with care."
+	icon_state = "hedp_packet"
+	content_type = /obj/item/explosive/grenade/high_explosive/rmc
+
+/obj/item/storage/box/packet/rmc/incin
+	name = "\improper R2175/B HIDP grenade packet"
+	desc = "It contains three R2175/B HIDP grenades. Handle with care."
+	icon_state = "hidp_packet"
+	content_type = /obj/item/explosive/grenade/incendiary/rmc

code/modules/projectiles/guns/rifles.dm

@@ -1702,6 +1702,7 @@
 	reload_sound = 'sound/weapons/handling/m41_reload.ogg'
 	unload_sound = 'sound/weapons/handling/m41_unload.ogg'
 	current_mag = /obj/item/ammo_magazine/rifle/rmc_f90
+	flags_equip_slot = NO_FLAGS
 	attachable_allowed = list(
 		/obj/item/attachable/suppressor,
 		/obj/item/attachable/bayonet,
@@ -1757,7 +1758,7 @@
 
 /obj/item/weapon/gun/rifle/rmc_f90/scope
 	name = "\improper F903A1 Marksman Rifle"
-	desc = "A variation of the F903 rifle used by the royal marines commando. This weapon only accepts the smaller 15 round magazines of 10x24mm HVAP."
+	desc = "A variation of the F903 rifle used by the royal marines commando. This weapon only accepts the smaller 15 round magazines of 10x24mm."
 	icon_state = "aug_dmr"
 	item_state = "aug_dmr"
 	attachable_allowed = null
@@ -1794,14 +1795,28 @@
 	update_attachable(f90_dmr_barrel.slot)
 
 /obj/item/weapon/gun/rifle/rmc_f90/shotgun
-	name = "\improper F903A1 Breacher Rifle"
+	name = "\improper F903A1/B 'Breacher' Rifle"
+	desc = "A variation of the F903 rifle used by the royal marines commando. Modified to be used in one hand with a shield. Uses 10x24mm caseless ammunition."
 	icon_state = "aug_mkey"
 	item_state = "aug_mkey"
 	attachable_allowed = list(
 		/obj/item/attachable/reddot,
 		/obj/item/attachable/reflex,
 	)
 
+/obj/item/weapon/gun/rifle/rmc_f90/shotgun/set_gun_config_values()
+	..()
+	fire_delay = FIRE_DELAY_TIER_8
+	burst_amount = BURST_AMOUNT_TIER_3
+	burst_delay = FIRE_DELAY_TIER_8
+	accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_4 + 2*HIT_ACCURACY_MULT_TIER_1
+	accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_2
+	scatter = SCATTER_AMOUNT_TIER_8
+	burst_scatter_mult = SCATTER_AMOUNT_TIER_10
+	scatter_unwielded = SCATTER_AMOUNT_TIER_2
+	damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_2
+	recoil_unwielded = RECOIL_OFF
+
 /obj/item/weapon/gun/rifle/rmc_f90/shotgun/handle_starting_attachment()
 	..()
 	var/obj/item/attachable/attached_gun/shotgun/f90_shotgun = new(src)

maps/shuttles/ert_twe_shuttle.dmm

@@ -20,6 +20,14 @@
 	icon_state = "rasputin3"
 	},
 /area/shuttle/ert)
+"g" = (
+/obj/structure/surface/rack,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/storage/toolbox/syndicate,
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
+	},
+/area/shuttle/ert)
 "h" = (
 /turf/open/shuttle/dropship{
 	icon_state = "floor8"
@@ -212,7 +220,8 @@
 /area/shuttle/ert)
 "Y" = (
 /obj/structure/surface/rack,
-/obj/item/storage/toolbox/syndicate,
+/obj/item/storage/backpack/rmc/frame,
+/obj/item/ammo_box/magazine/misc/mre,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -296,7 +305,7 @@ M
 (6,1,1) = {"
 O
 A
-Y
+g
 a
 H
 H