Royal Marine Commando Changes Part 1

code/__DEFINES/origins.dm

@@ -19,3 +19,4 @@
 
 // UPP
 #define ORIGIN_UPP "Union of Progressive Peoples"
+#define ORIGIN_TWE "Three World Empire"

code/__DEFINES/paygrade_defs/twe.dm

@@ -13,6 +13,9 @@
 /// RMC4, Itto-Sergeant
 #define PAY_SHORT_RMC4 "RMC4"
 
+/// RMC4, Itto-Sergeant
+#define PAY_SHORT_RMC5 "RMC5"
+
 /// RNOW, Warrant Officer
 #define PAY_SHORT_RNOW "RNOW"
 

code/datums/emergency_calls/inspection.dm

@@ -154,13 +154,13 @@
 
 	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_SQUAD_LEADER), time_required_for_job))
 		leader = H
-		arm_equipment(H, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/pmc/leader, TRUE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are a Weyland Yutani PMC Inspector!"))
 		to_chat(H, SPAN_ROLE_BODY("While officially your outfit does mundane security work for Weyland-Yutani, in practice you serve as both official and unofficial investigators into conduct of Company personnel. You are being dispatched to the [MAIN_SHIP_NAME] to make sure that the local Liaison has not forgotten their priorities or worse, thought to bite the hand that feeds them."))
 		to_chat(H, SPAN_ROLE_BODY("Remember the USCM personnel on the ship may not appreciate your presence there. Should the Liaison be in jail, you are not to act as legal counsel in any way unless instructed to do so by Dispatch. Your basic duty is to make a detailed report of anything involving the Liaison and any other WY personnel on board the ship."))
 		to_chat(H, SPAN_WARNING("Unless ordered otherwise by Dispatch, you are to avoid open conflict with the Marines. Retreat and make a report if they are outright hostile. Ahelp if you have any more questions or wish to release this character for other players."))
 	else
-		arm_equipment(H, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/pmc/standard, TRUE, TRUE)
 		to_chat(H, SPAN_ROLE_HEADER("You are part of a Weyland-Yutani PMC Investigation Team!"))
 		to_chat(H, SPAN_ROLE_BODY("While officially your outfit does mundane security work for Weyland-Yutani, in practice you serve as both official and unofficial investigators into conduct of Company personnel. The Lead Investigator is in charge, your duty is to provide backup, counsel and any other form of assistance you can render to make sure their mission is a success."))
 		to_chat(H, SPAN_ROLE_BODY("Remember that the USCM, or at least some parts of it, may be hostile towards your presence on the ship. Unless ordered otherwise by Dispatch, you and your Team Leader are to avoid open conflict with the Marines. Your main priority is making sure that your Lead survives to write the report they are due."))

code/datums/emergency_calls/pmc.dm

@@ -34,26 +34,26 @@
 	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 a Weyland-Yutani PMC Squad Leader!"))
-		arm_equipment(mob, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/pmc/leader, 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 Weyland-Yutani PMC Support Synthetic!"))
 		arm_equipment(mob, /datum/equipment_preset/pmc/synth, 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 Weyland-Yutani PMC Medic!"))
-		arm_equipment(mob, /datum/equipment_preset/pmc/pmc_medic, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/pmc/medic, TRUE, TRUE)
 	else if(smartgunners < max_smartgunners && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN))
 		smartgunners++
 		to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Heavy Gunner!"))
-		arm_equipment(mob, /datum/equipment_preset/pmc/pmc_gunner, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/pmc/gunner, TRUE, TRUE)
 	else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
 		heavies++
 		to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Sniper!"))
-		arm_equipment(mob, /datum/equipment_preset/pmc/pmc_sniper, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/pmc/sniper, TRUE, TRUE)
 	else
 		to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Operator!"))
-		arm_equipment(mob, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/pmc/standard, TRUE, TRUE)
 
 	print_backstory(mob)
 
@@ -126,18 +126,18 @@
 	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job))    //First one spawned is always the leader.
 		leader = H
 		to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Squad Leader!"))
-		arm_equipment(H, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/pmc/leader, TRUE, TRUE)
 	else if(medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job))
 		medics++
 		to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Medical Investigator!"))
-		arm_equipment(H, /datum/equipment_preset/pmc/pmc_medic, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/pmc/medic, TRUE, TRUE)
 	else if(heavies < max_heavies && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
 		heavies++
 		to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Heavy Gunner!"))
-		arm_equipment(H, /datum/equipment_preset/pmc/pmc_gunner, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/pmc/gunner, TRUE, TRUE)
 	else
 		to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Detainer!"))
-		arm_equipment(H, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/pmc/standard, TRUE, TRUE)
 
 	print_backstory(H)
 

code/datums/emergency_calls/royal_marines.dm

@@ -28,23 +28,23 @@
 	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 an Officer in the Royal Marines Commando. Born in the Three World Empire."))
-		arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/team_leader, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/royal_marine/team_leader, TRUE, TRUE)
 	else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
 		var/specialist_kit = pick("Sniper", "Smartgun", "Breach")
 		switch(specialist_kit)
 			if("Sniper")
 				to_chat(mob, SPAN_ROLE_HEADER("You are a skilled marksman in the Royal Marines Commando. Born in the Three World Empire."))
-				arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/marksman, TRUE, TRUE)
+				arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE)
 			if("Smartgun")
 				to_chat(mob, SPAN_ROLE_HEADER("You are a Smartgunner in the Royal Marines Commando. Born in the Three World Empire."))
-				arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/machinegun, TRUE, TRUE)
+				arm_equipment(mob, /datum/equipment_preset/royal_marine/machinegun, TRUE, TRUE)
 			if("Breach")
 				to_chat(mob, SPAN_ROLE_HEADER("You are a CQB Specialist in the Royal Marines Commando. Born in the Three World Empire."))
-				arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/breacher, TRUE, TRUE)
+				arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE)
 		heavies++
 	else
 		to_chat(mob, SPAN_ROLE_HEADER("You are a member of the Royal Marines Commando. Born in the three world empire."))
-		arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/standard, TRUE, TRUE)
+		arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE)
 
 	print_backstory(mob)
 

code/datums/factions/pmc.dm

@@ -38,8 +38,7 @@
 		list("M41A extended magazine (10x24mm)", 5, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR),
 		list("M39 AP magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR),
 		list("M39 HV extended magazine (10x20mm)", 5, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR),
-		list("NSG 23 armor-piercing magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR),
-		list("NSG 23 extended magazine (10x24mm)", 5, /obj/item/ammo_magazine/rifle/nsg23/extended, null, VENDOR_ITEM_REGULAR),
+		list("NSG L23A1 armor-piercing magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARMS", 0, null, null, null),
 		list("VP78 pistol", 20, /obj/item/weapon/gun/pistol/vp78, null, VENDOR_ITEM_REGULAR),
@@ -78,8 +77,7 @@
 		list("M41A extended magazine (10x24mm)", 50, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR),
 		list("M39 AP magazine (10x20mm)", 30, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR),
 		list("M39 HV extended magazine (10x20mm)", 50, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR),
-		list("NSG 23 armor-piercing magazine (10x24mm)", 30, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR),
-		list("NSG 23 extended magazine (10x24mm)", 50, /obj/item/ammo_magazine/rifle/nsg23/extended, null, VENDOR_ITEM_REGULAR),
+		list("NSG L23A1 armor-piercing magazine (10x24mm)", 30, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARMS", 0, null, null, null),
 		list("VP78 pistol", 20, /obj/item/weapon/gun/pistol/vp78, null, VENDOR_ITEM_REGULAR),

code/datums/origin/twe.dm

@@ -0,0 +1,3 @@
+/datum/origin/twe
+	name = ORIGIN_TWE
+	desc = "You were born in the Three World Empire."

code/datums/paygrades/factions/twe/twe.dm

@@ -6,27 +6,33 @@
 //RMC Emlisted
 /datum/paygrade/twe/e1
 	paygrade = PAY_SHORT_RMC1
-	name = "Heitai-Marine"
-	prefix = "Hti-Mne."
+	name = "Marine"
+	prefix = "Mne."
 
 /datum/paygrade/twe/e2
 	paygrade = PAY_SHORT_RMC2
-	name = "Santo-Lance Corporal"
-	prefix = "St-LCpl."
+	name = "Lance Corporal"
+	prefix = "LCpl."
 	pay_multiplier = 2.1
 
 /datum/paygrade/twe/e3
 	paygrade = PAY_SHORT_RMC3
-	name = "Nito-Corporal"
-	prefix = "Nt-Cpl."
+	name = "Corporal"
+	prefix = "Cpl."
 	pay_multiplier = 2.2
 
 /datum/paygrade/twe/e4
 	paygrade = PAY_SHORT_RMC4
-	name = "Itto-Sergeant"
+	name = "Sergeant"
 	prefix = "Sgt."
 	pay_multiplier = 2.3
 
+/datum/paygrade/twe/e5
+	paygrade = PAY_SHORT_RMC5
+	name = "Colour Sergeant"
+	prefix = "Clr-Sgt."
+	pay_multiplier = 2.4
+
 //TWE Warrent Officer
 /datum/paygrade/twe/wo1
 	paygrade = PAY_SHORT_RNOW

code/game/jobs/job/special/weyland_yutani.dm

@@ -55,43 +55,43 @@
 
 /datum/job/special/wey_yu/pmc/standard
 	title = JOB_PMC_STANDARD
-	gear_preset = /datum/equipment_preset/pmc/pmc_standard
+	gear_preset = /datum/equipment_preset/pmc/standard
 
 /datum/job/special/wey_yu/pmc/medic
 	title = JOB_PMC_MEDIC
-	gear_preset = /datum/equipment_preset/pmc/pmc_medic
+	gear_preset = /datum/equipment_preset/pmc/medic
 
 /datum/job/special/wey_yu/pmc/engineer
 	title = JOB_PMC_ENGINEER
 	gear_preset = /datum/equipment_preset/pmc/technician
 
 /datum/job/special/wey_yu/pmc/gunner
 	title = JOB_PMC_GUNNER
-	gear_preset = /datum/equipment_preset/pmc/pmc_gunner
+	gear_preset = /datum/equipment_preset/pmc/gunner
 
 /datum/job/special/wey_yu/pmc/sniper
 	title = JOB_PMC_SNIPER
-	gear_preset = /datum/equipment_preset/pmc/pmc_sniper
+	gear_preset = /datum/equipment_preset/pmc/sniper
 
 /datum/job/special/wey_yu/pmc/leader
 	title = JOB_PMC_LEADER
-	gear_preset = /datum/equipment_preset/pmc/pmc_leader
+	gear_preset = /datum/equipment_preset/pmc/leader
 
 /datum/job/special/wey_yu/pmc/investigator
 	title = JOB_PMC_INVESTIGATOR
-	gear_preset = /datum/equipment_preset/pmc/pmc_leader
+	gear_preset = /datum/equipment_preset/pmc/leader
 
 /datum/job/special/wey_yu/pmc/lead_invest
 	title = JOB_PMC_LEAD_INVEST
-	gear_preset = /datum/equipment_preset/pmc/pmc_leader
+	gear_preset = /datum/equipment_preset/pmc/leader
 
 /datum/job/special/wey_yu/pmc/detainer
 	title = JOB_PMC_DETAINER
-	gear_preset = /datum/equipment_preset/pmc/pmc_standard
+	gear_preset = /datum/equipment_preset/pmc/standard
 
 /datum/job/special/wey_yu/pmc/crewman
 	title = JOB_PMC_CREWMAN
-	gear_preset = /datum/equipment_preset/pmc/pmc_crewman
+	gear_preset = /datum/equipment_preset/pmc/crewman
 
 /datum/job/special/wey_yu/pmc/doctor
 	title = JOB_PMC_DOCTOR

code/game/objects/effects/landmarks/survivor_spawner.dm

@@ -120,7 +120,7 @@
 	spawn_priority = SPAWN_PRIORITY_HIGH
 
 /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic
-	equipment = /datum/equipment_preset/pmc/pmc_medic
+	equipment = /datum/equipment_preset/pmc/medic
 	synth_equipment = /datum/equipment_preset/synth/survivor/pmc
 	intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
 	"You are NOT aware of the xenomorph threat.",\
@@ -133,7 +133,7 @@
 	spawn_priority = SPAWN_PRIORITY_VERY_HIGH
 
 /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer
-	equipment = /datum/equipment_preset/pmc/pmc_standard
+	equipment = /datum/equipment_preset/pmc/standard
 	synth_equipment = /datum/equipment_preset/synth/survivor/pmc
 	intro_text = list("<h2>You are a survivor of a crash landing!</h2>",\
 	"You are NOT aware of the xenomorph threat.",\

code/game/objects/effects/spawners/faction_spawners.dm

@@ -112,7 +112,7 @@
 		/obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/ap,
 		/obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/extended,
 		/obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/ap,
-		/obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/extended
+		/obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23
 	)
 
 /obj/effect/spawner/random/gun/pmc_primary/lowchance

code/game/objects/effects/spawners/random.dm

@@ -434,7 +434,6 @@
 		/obj/item/weapon/gun/rifle/mar40 = /obj/item/ammo_magazine/rifle/mar40,
 		/obj/item/weapon/gun/rifle/ar10 = /obj/item/ammo_magazine/rifle/ar10,
 		/obj/item/weapon/gun/rifle/l42a/abr40 = /obj/item/ammo_magazine/rifle/l42a/abr40,
-		/obj/item/weapon/gun/rifle/nsg23/no_lock/stripped = /obj/item/ammo_magazine/rifle/nsg23
 		)
 
 /obj/effect/spawner/random/gun/rifle/lowchance

code/game/objects/items/devices/radio/headset.dm

@@ -685,14 +685,23 @@
 /obj/item/device/radio/headset/almayer/marine/solardevils/upp/medic
 	name = "UPP-MED headset"
 	desc = "A special headset used by UPP military. Channels are as follows: #m - medical."
-	frequency = UPP_GRD_FREQ
+	frequency = UPP_FREQ
 	initial_keys = list(/obj/item/device/encryptionkey/upp/medic)
 
 /obj/item/device/radio/headset/almayer/marine/solardevils/upp/command
 	name = "UPP-CMD headset"
 	desc = "A special headset used by UPP military. Channels are as follows: :o - colony, #j - combat controller, #n - engineering, #m - medical, #v - command, #u - UPP general."
 	initial_keys = list(/obj/item/device/encryptionkey/upp/command)
 
+/obj/item/device/radio/headset/almayer/marine/solardevils/rmc
+	name = "TWE Royal Marine Commando headset"
+	desc = "A special headset used by the TWE's elite Royal Marine Commandos."
+	icon_state = "upp_headset"
+	item_state = "upp_headset"
+	frequency = RMC_FREQ
+	initial_keys = null
+	has_hud = FALSE
+
 //############################## ALPHA ###############################
 /obj/item/device/radio/headset/almayer/marine/alpha
 	name = "marine alpha radio headset"

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -360,9 +360,8 @@ GLOBAL_LIST_INIT_TYPED(cardboard_recipes, /datum/stack_recipe, list ( \
 		null, \
 		new/datum/stack_recipe("empty magazine box (S&W .38)", /obj/item/ammo_box/magazine/snw/empty), \
 		null, \
-		new/datum/stack_recipe("empty magazine box (NSG 23)", /obj/item/ammo_box/magazine/nsg23/empty), \
-		new/datum/stack_recipe("empty magazine box (NSG 23 AP)", /obj/item/ammo_box/magazine/nsg23/ap/empty), \
-		new/datum/stack_recipe("empty magazine box (NSG 23 EX)", /obj/item/ammo_box/magazine/nsg23/ex/empty), \
+		new/datum/stack_recipe("empty magazine box (NSG L23A1)", /obj/item/ammo_box/magazine/nsg23/empty), \
+		new/datum/stack_recipe("empty magazine box (NSG L23A1 AP)", /obj/item/ammo_box/magazine/nsg23/ap/empty), \
 		null, \
 		new/datum/stack_recipe("empty magazine box (Type71)", /obj/item/ammo_box/magazine/type71/empty), \
 		new/datum/stack_recipe("empty magazine box (Type71 AP)", /obj/item/ammo_box/magazine/type71/ap/empty), \

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

@@ -1120,23 +1120,23 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	desc = "The heavy-carry pack of the RMC forces. Designed to lug the most amount of gear into the battlefield."
 	icon_state = "backpack_large"
 	item_state = "backpack_large"
-	max_storage_space = 27
+	max_storage_space = 21
 
 /obj/item/storage/backpack/rmc/medium
 	name = "standard RMC backpack"
 	desc = "A TWE military standard-carry RMC combat pack MK3."
 	icon_state = "backpack_medium"
 	item_state = "backpack_medium"
 	worn_accessible = TRUE
-	max_storage_space = 24
+	max_storage_space = 18
 
 /obj/item/storage/backpack/rmc/light
 	name = "lightweight RMC backpack"
 	desc = "A TWE military light-carry RMC combat pack MK3."
 	icon_state = "backpack_small"
 	item_state = "backpack_small"
 	worn_accessible = TRUE
-	max_storage_space = 21
+	max_storage_space = 15
 
 /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"
@@ -1163,7 +1163,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
 	icon_state = "rmc_general"
 	item_state = "rmc_general"
 	has_gamemode_skin = FALSE
-	max_storage_space = 15
+	max_storage_space = 10
 
 //----------USASF & ARMY SECTION----------
 

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

@@ -2162,13 +2162,9 @@
 	flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
 	has_gamemode_skin = FALSE
 
-/obj/item/storage/belt/marine/rmc/rmc_f90_ammo/fill_preset_inventory()
+/obj/item/storage/belt/marine/rmc/rmc_nsg_ammo/fill_preset_inventory()
 	for(var/i in 1 to storage_slots)
-		new /obj/item/ammo_magazine/rifle/rmc_f90(src)
-
-/obj/item/storage/belt/marine/rmc/rmc_f90_ammo/marksman/fill_preset_inventory()
-	for(var/i in 1 to storage_slots)
-		new /obj/item/ammo_magazine/rifle/rmc_f90/marksman(src)
+		new /obj/item/ammo_magazine/rifle/nsg23(src)
 
 /obj/item/storage/belt/medical/rmc
 	name = "\improper L75 pattern medical storage rig"

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

@@ -494,7 +494,7 @@
 
 /obj/item/storage/pouch/magazine/large/nsg_ext/fill_preset_inventory()
 	for(var/i = 1 to storage_slots)
-		new /obj/item/ammo_magazine/rifle/nsg23/extended(src)
+		new /obj/item/ammo_magazine/rifle/nsg23(src)
 
 /obj/item/storage/pouch/magazine/large/nsg_heap/fill_preset_inventory()
 	for(var/i = 1 to storage_slots)

code/modules/clothing/head/head.dm

@@ -835,15 +835,11 @@
 
 /obj/item/clothing/head/beret/royal_marine
 	name = "royal marine beret"
-	desc = "A green beret belonging to the royal marines commando. This beret symbolizes a royal marines ability to fight in any environment, desert, sea, artic or space a royal marine will always be ready."
+	desc = "A green beret worn by the TWE's Royal Marine Commandos. Wear it with pride."
 	icon_state = "rmc_beret"
 	item_state = "rmc_beret"
 	icon = 'icons/obj/items/clothing/cm_hats.dmi'
 	flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
 	item_icons = list(
 		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
 	)
-
-/obj/item/clothing/head/beret/royal_marine/team_leader
-	icon_state = "rmc_beret_tl"
-	item_state = "rmc_beret_tl"