Royal Marines Commando

code/__DEFINES/job.dm

@@ -288,12 +288,16 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 //-------- TWE --------//
 #define JOB_TWE_REPRESENTATIVE "TWE Representative"
 
-#define JOB_TWE_YONTO "RMC Yonto"
-#define JOB_TWE_SANTO "RMC Santo"
-#define JOB_TWE_NITO "RMC Nito"
-#define JOB_TWE_ITTO "RMC Itto"
+//RMC
+#define JOB_TWE_RMC_RIFLEMAN "RMC Rifleman"
+#define JOB_TWE_RMC_MARKSMAN "RMC Marksman"
+#define JOB_TWE_RMC_SMARTGUNNER "RMC Smartgunner"
+#define JOB_TWE_RMC_BREACHER "RMC Breacher"
+#define JOB_TWE_RMC_TEAMLEADER "RMC Team Leader"
+#define JOB_TWE_RMC_LIEUTENANT "RMC Lieutenant"
+#define JOB_TWE_RMC_COMMANDER "RMC Commander"
 
-#define TWE_COMMANDO_JOB_LIST list(JOB_TWE_YONTO, JOB_TWE_SANTO, JOB_TWE_NITO, JOB_TWE_ITTO)
+#define TWE_COMMANDO_JOB_LIST list(JOB_TWE_RMC_RIFLEMAN, JOB_TWE_RMC_BREACHER, JOB_TWE_RMC_SMARTGUNNER,JOB_TWE_RMC_MARKSMAN ,JOB_TWE_RMC_TEAMLEADER, JOB_TWE_RMC_LIEUTENANT, JOB_TWE_RMC_COMMANDER)
 
 #define JOB_TWE_SEAMAN "TWE Seaman"
 #define JOB_TWE_LSEAMAN "TWE Leading Seaman"
@@ -326,7 +330,6 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_TIS_SA "UAAC-TIS Special Agent"
 
 #define TIS_JOB_LIST list(JOB_TIS_SA, JOB_TIS_IO)
-
 //-------- DUTCH'S DOZEN --------//
 #define JOB_DUTCH_ARNOLD "Dutch's Dozen - Dutch"
 #define JOB_DUTCH_RIFLEMAN "Dutch's Dozen - Rifleman"

code/__DEFINES/mode.dm

@@ -241,7 +241,7 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE)
 #define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE)
-#define FACTION_LIST_ERT list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL)
+#define FACTION_LIST_ERT list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)

code/__DEFINES/radio.dm

@@ -65,5 +65,7 @@
 #define RADIO_CHANNEL_DUTCH_DOZEN "DD"
 #define RADIO_CHANNEL_VAI "VAI"
 #define RADIO_CHANNEL_CMB "CMB"
+#define RADIO_CHANNEL_ROYAL_MARINE "Royal Marine"
 
 #define RADIO_CHANNEL_YAUTJA "Yautja"
+

code/__DEFINES/shuttles.dm

@@ -95,6 +95,7 @@
 #define MOBILE_SHUTTLE_ID_ERT1 "ert_response_shuttle"
 #define MOBILE_SHUTTLE_ID_ERT2 "ert_pmc_shuttle"
 #define MOBILE_SHUTTLE_ID_ERT3 "ert_upp_shuttle"
+#define MOBILE_SHUTTLE_ID_ERT4 "ert_twe_shuttle"
 #define MOBILE_SHUTTLE_ID_ERT_SMALL "ert_rescue_shuttle"
 #define MOBILE_SHUTTLE_ID_ERT_BIG "ert_boarding_shuttle"
 

code/controllers/subsystem/communications.dm

@@ -73,6 +73,7 @@ var/const/YAUT_FREQ = 1205
 var/const/DUT_FREQ = 1210
 var/const/CMB_FREQ = 1220
 var/const/VAI_FREQ = 1215
+var/const/RMC_FREQ = 1216
 
 //WY Channels (1230-1249)
 var/const/WY_FREQ = 1231
@@ -140,6 +141,7 @@ var/list/radiochannels = list(
 	RADIO_CHANNEL_VAI = VAI_FREQ,
 	RADIO_CHANNEL_CMB = CMB_FREQ,
 	RADIO_CHANNEL_DUTCH_DOZEN = DUT_FREQ,
+	RADIO_CHANNEL_ROYAL_MARINE = RMC_FREQ,
 
 	RADIO_CHANNEL_HIGHCOM = HC_FREQ,
 	RADIO_CHANNEL_PROVOST = PVST_FREQ,
@@ -190,7 +192,7 @@ var/list/radiochannels = list(
 )
 
 // Response Teams
-#define ERT_FREQS list(VAI_FREQ, DUT_FREQ, YAUT_FREQ, CMB_FREQ)
+#define ERT_FREQS list(VAI_FREQ, DUT_FREQ, YAUT_FREQ, CMB_FREQ, RMC_FREQ)
 
 // UPP Frequencies
 #define UPP_FREQS list(UPP_FREQ, UPP_CMD_FREQ, UPP_ENGI_FREQ, UPP_MED_FREQ, UPP_CCT_FREQ, UPP_KDO_FREQ)
@@ -251,6 +253,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/datums/emergency_calls/royal_marines.dm

@@ -0,0 +1,75 @@
+/datum/emergency_call/royal_marines
+	name = "Royal Marines Commando (Squad) (Friendly)"
+	mob_max = 7
+	probability = 0
+	name_of_spawn = /obj/effect/landmark/ert_spawns/distress_twe
+	item_spawn = /obj/effect/landmark/ert_spawns/distress_twe/item
+	max_engineers =  0
+	max_medics = 0
+	max_heavies = 3
+
+/datum/emergency_call/royal_marines/New()
+	..()
+	arrival_message = "[MAIN_SHIP_NAME], this is [pick_weight(list("HMS Patna"= 50, "HMS Thunderchild" = 50))]; we are responding to your distress call and boarding in accordance with the Military Aid Act of 2177, Authentication code Lima-18153. "
+	objectives = "Ensure the survival of the [MAIN_SHIP_NAME], eliminate any hostiles, and assist the crew in any way possible."
+
+
+/datum/emergency_call/royal_marines/create_member(datum/mind/spawning_mind, 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)
+	spawning_mind.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 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)
+	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)
+			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)
+			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)
+		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)
+
+	print_backstory(mob)
+
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
+
+
+/datum/emergency_call/royal_marines/print_backstory(mob/living/carbon/human/spawning_mob)
+	to_chat(spawning_mob, SPAN_BOLD("You were born in the Three World Empire to a [pick_weight(list("average" = 75, "poor" = 15, "well-established" = 10))] family."))
+	to_chat(spawning_mob, SPAN_BOLD("Joining the Royal Marines gave you a lot of combat experience and useful skills."))
+	to_chat(spawning_mob, SPAN_BOLD("You are [pick_weight(list("unaware" = 75, "faintly aware" = 15, "knoledgeable" = 10))] of the xenomorph threat."))
+	to_chat(spawning_mob, SPAN_BOLD("You are a citizen of the three world empire and joined the Royal Marines Commando"))
+	to_chat(spawning_mob, SPAN_BOLD("You are apart of a jointed UA/TWE taskforce onboard the HMS Patna and Thunderchild."))
+	to_chat(spawning_mob, SPAN_BOLD("Under the directive of the RMC high command, you have been assisting USCM forces with maintaining peace in the area."))
+	to_chat(spawning_mob, SPAN_BOLD("Assist the USCMC Force of the [MAIN_SHIP_NAME] however you can."))
+
+/datum/emergency_call/royal_marines/platoon
+	name = "Royal Marines Commando (Platoon) (Friendly)"
+	mob_min = 7
+	mob_max = 28
+	probability = 0
+	max_medics = 0
+	max_heavies = 6
+	max_engineers = 0
+
+/obj/effect/landmark/ert_spawns/distress_twe
+	name = "Distress_TWE"
+
+/obj/effect/landmark/ert_spawns/distress_twe/item
+	name = "Distress_TWEItem"
+

code/datums/factions/royalmarinescommando.dm

@@ -0,0 +1,94 @@
+/datum/faction/royal_marines_commando
+	name = "Royal Marines Commando"
+	faction_tag = FACTION_TWE
+
+/datum/faction/royal_marines_commando/modify_hud_holder(image/holder, mob/living/carbon/human/H)
+	var/hud_icon_state
+	var/obj/item/card/id/dogtag/ID = H.get_idcard()
+	var/_role
+	if(H.mind)
+		_role = H.job
+	else if(ID)
+		_role = ID.rank
+	switch(_role)
+		if(JOB_TWE_RMC_LIEUTENANT)
+			hud_icon_state = "lieutenant"
+		if(JOB_TWE_RMC_TEAMLEADER)
+			hud_icon_state = "teamleader"
+		if(JOB_TWE_RMC_MARKSMAN)
+			hud_icon_state = "marksman"
+		if(JOB_TWE_RMC_RIFLEMAN)
+			hud_icon_state = "rifleman"
+		if(JOB_TWE_RMC_SMARTGUNNER)
+			hud_icon_state = "smartgunner"
+		if(JOB_TWE_RMC_BREACHER)
+			hud_icon_state = "breacher"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "rmc_[hud_icon_state]")
+
+/datum/faction/royal_marines_commando/get_antag_guns_snowflake_equipment()
+	return list(
+		list("PRIMARY FIREARMS", 0, null, null, null),
+		list("F903A1 Rifle", 20, /obj/item/weapon/gun/rifle/rmc_f90, null, VENDOR_ITEM_REGULAR),
+		list("F903A2 Rifle", 30, /obj/item/weapon/gun/rifle/rmc_f90/a_grip, null, VENDOR_ITEM_REGULAR),
+		list("F903A1 Marksman Rifle", 30, /obj/item/weapon/gun/rifle/rmc_f90/scope, null, VENDOR_ITEM_REGULAR),
+		list("F903A1/B 'Breacher' Rifle", 30, /obj/item/weapon/gun/rifle/rmc_f90/shotgun, null, VENDOR_ITEM_REGULAR),
+
+		list("PRIMARY AMMUNITION", 0, null, null, null),
+		list("F903 Magazine (10x24mm)", 5, /obj/item/ammo_magazine/rifle/rmc_f90, null, VENDOR_ITEM_REGULAR),
+		list("F903A1 Marksman Magazine (10x24mm)", 15, /obj/item/ammo_magazine/rifle/rmc_f90/marksman, null, VENDOR_ITEM_REGULAR),
+
+		list("SIDEARMS", 0, null, null, null),
+		list("VP78 Pistol", 20, /obj/item/weapon/gun/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+		list("88 Mod 4 Combat Pistol", 15, /obj/item/weapon/gun/pistol/mod88, null, VENDOR_ITEM_REGULAR),
+
+		list("SIDEARM AMMUNITION", 0, null, null, null),
+		list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+		list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
+
+		list("ATTACHMENTS", 0, null, null, null),
+		list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR),
+		list("Burst Fire Assembly", 15, /obj/item/attachable/burstfire_assembly, null, VENDOR_ITEM_REGULAR),
+		list("Extended Barrel", 15, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR),
+		list("Laser Sight", 15, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR),
+		list("Rail Flashlight", 5, /obj/item/attachable/flashlight, null, VENDOR_ITEM_REGULAR),
+		list("Red-Dot Sight", 15, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR),
+		list("Reflex Sight", 15, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR),
+		list("Suppressor", 15, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR),
+		list("Vertical Grip", 15, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR),
+
+		list("UTILITIES", 0, null, null, null),
+		list("M94 Marking Flare Pack", 3, /obj/item/storage/box/m94, null, VENDOR_ITEM_RECOMMENDED),
+		list("Smoke Grenade", 7, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),
+		list("R2175/B HIDP grenade packet", 7, /obj/item/storage/box/packet/rmc/incin, null, VENDOR_ITEM_REGULAR),
+		list("R2175/A HEDP grenade packet", 7, /obj/item/storage/box/packet/rmc/he, null, VENDOR_ITEM_REGULAR),
+		list("L5 bayonet", 3, /obj/item/attachable/bayonet/rmc, null, VENDOR_ITEM_REGULAR),
+	)
+
+/datum/faction/royal_marines_commando/get_antag_guns_sorted_equipment()
+	return list(
+		list("PRIMARY FIREARMS", -1, null, null),
+		list("F903A1 Rifle", 20, /obj/item/weapon/gun/rifle/rmc_f90, null, VENDOR_ITEM_REGULAR),
+		list("F903A2 Rifle", 30, /obj/item/weapon/gun/rifle/rmc_f90/a_grip, null, VENDOR_ITEM_REGULAR),
+		list("F903A1 Marksman Rifle", 30, /obj/item/weapon/gun/rifle/rmc_f90/scope, null, VENDOR_ITEM_REGULAR),
+		list("F903A1/B 'Breacher' Rifle", 30, /obj/item/weapon/gun/rifle/rmc_f90/shotgun, null, VENDOR_ITEM_REGULAR),
+
+		list("PRIMARY AMMUNITION", -1, null, null),
+		list("F903 Magazine (10x24mm)", 5, /obj/item/ammo_magazine/rifle/rmc_f90, null, VENDOR_ITEM_REGULAR),
+		list("F903A1 Marksman Magazine (10x24mm)", 15, /obj/item/ammo_magazine/rifle/rmc_f90/marksman, null, VENDOR_ITEM_REGULAR),
+
+		list("SIDEARMS", -1, null, null),
+		list("VP78 Pistol", 20, /obj/item/weapon/gun/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+		list("88 Mod 4 Combat Pistol", 15, /obj/item/weapon/gun/pistol/mod88, null, VENDOR_ITEM_REGULAR),
+
+		list("SIDEARM AMMUNITION", -1, null, null),
+		list("VP78 magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+		list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
+
+		list("UTILITIES", -1, null, null),
+		list("M94 Marking Flare Pack", 3, /obj/item/storage/box/m94, null, VENDOR_ITEM_RECOMMENDED),
+		list("Smoke Grenade", 7, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),
+		list("R2175/B HIDP grenade packet", 7, /obj/item/storage/box/packet/rmc/incin, null, VENDOR_ITEM_REGULAR),
+		list("R2175/A HEDP grenade packet", 7, /obj/item/storage/box/packet/rmc/he, null, VENDOR_ITEM_REGULAR),
+		list("L5 bayonet", 3, /obj/item/attachable/bayonet/rmc, null, VENDOR_ITEM_REGULAR),
+	)

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

@@ -2,42 +2,56 @@
 	name = "TWE Paygrade"
 	pay_multiplier = 2 // less people = more to pay them
 
-//TWE RMC
-/datum/paygrade/twe/rc1
-	paygrade = "TC1"
-	name = "Yonto"
-	prefix = "Yt."
+//RMC Emlisted
+/datum/paygrade/twe/e1
+	paygrade = "RMC E1"
+	name = "Heitai-Marine"
+	prefix = "Hti-Mne."
 
-/datum/paygrade/twe/rc2
-	paygrade = "TC2"
-	name = "Santo"
-	prefix = "St."
+/datum/paygrade/twe/e2
+	paygrade = "RMC E2"
+	name = "Santo-Lance Corporal"
+	prefix = "St-LCpl."
 	pay_multiplier = 2.1
 
-/datum/paygrade/twe/rc3
-	paygrade = "TC3"
-	name = "Nito"
-	prefix = "Nt."
+/datum/paygrade/twe/e3
+	paygrade = "RMC E3"
+	name = "Nito-Corporal"
+	prefix = "Nt-Cpl."
 	pay_multiplier = 2.2
 
-/datum/paygrade/twe/rc4
-	paygrade = "TC4"
-	name = "Itto"
-	prefix = "It."
+/datum/paygrade/twe/e4
+	paygrade = "RMC E4"
+	name = "Itto-Sergeant"
+	prefix = "Sgt."
 	pay_multiplier = 2.3
 
+//RMC Officer
+
+/datum/paygrade/twe/o1/rmc
+	paygrade = "RMC O1"
+	name = "Second Lieutenant"
+	prefix = "2nd LT."
+	pay_multiplier = 3
+
+//TWE Warrent Officer
+/datum/paygrade/twe/wo1
+	paygrade = "TWE WO."
+	name = "Warrant Officer"
+	prefix = "WO."
+	pay_multiplier = 3.5
 
 //TWE Naval Officers
 /datum/paygrade/twe/o1
-	paygrade = "TO1"
-	name = "Seaman"
-	prefix = "SN."
+	paygrade = "TWE O1"
+	name = "Second Lieutenant"
+	prefix = "2nd LT"
 	pay_multiplier = 3
 
 /datum/paygrade/twe/o2
-	paygrade = "TO2"
-	name = "Leading Seaman"
-	prefix = "LR."
+	paygrade = "RMC O2"
+	name = "First Lieutenant"
+	prefix = "1st LT"
 	pay_multiplier = 3.25
 
 /datum/paygrade/twe/o3
@@ -46,12 +60,6 @@
 	prefix = "SO."
 	pay_multiplier = 3.5
 
-/datum/paygrade/twe/o3e
-	paygrade = "TO3E"
-	name = "Warrant Officer"
-	prefix = "WO."
-	pay_multiplier = 3.5
-
 /datum/paygrade/twe/o4
 	paygrade = "TO4"
 	name = "Captain"