WIP

cmss13-devs · Jul 28, 2024 · 32156f2 · 32156f2
1 parent 74ae9c1
commit 32156f2
Show file tree

Hide file tree

Showing 67 changed files with 559 additions and 2,294 deletions.
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -8,9 +8,9 @@
 #define SQUAD_MARINE_3 "Charlie"
 #define SQUAD_MARINE_4 "Delta"
 #define SQUAD_MARINE_5 "Echo"
-#define SQUAD_MARINE_CRYO "Foxtrot"
+#define SQUAD_MARINE_CRYO "Duskmen"
 #define SQUAD_MARINE_INTEL "Intel"
-#define SQUAD_SOF "SOF"
+#define SQUAD_SOF "Raiders"
 #define SQUAD_CBRN "CBRN"
 #define SQUAD_UPP "Red Dawn"
 #define SQUAD_LRRP "Snake Eaters"
@@ -26,19 +26,19 @@
 #define JOB_SQUAD_ROLES /datum/timelock/squad
 #define JOB_SQUAD_ROLES_LIST list(JOB_SQUAD_MARINE, JOB_SQUAD_LEADER, JOB_SQUAD_ENGI, JOB_SQUAD_MEDIC, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_TEAM_LEADER)
 
-#define JOB_SQUAD_MARINE_UPP "UPP Rifleman"
-#define JOB_SQUAD_LEADER_UPP "UPP Platoon Sergeant"
-#define JOB_SQUAD_MEDIC_UPP "UPP Sanitar"
-#define JOB_SQUAD_TEAM_LEADER_UPP "UPP Squad Sergeant"
-#define JOB_SQUAD_SMARTGUN_UPP "UPP Machinegunner"
-#define JOB_SO_UPP "UPP Platoon Commander"
+#define JOB_SQUAD_MARINE_UPP "Rifleman"
+#define JOB_SQUAD_LEADER_UPP "Platoon Sergeant"
+#define JOB_SQUAD_MEDIC_UPP "Sanitar"
+#define JOB_SQUAD_TEAM_LEADER_UPP "Squad Sergeant"
+#define JOB_SQUAD_SMARTGUN_UPP "Machinegunner"
+#define JOB_SO_UPP "Platoon Commander"
 
-#define JOB_SQUAD_TEAM_LEADER_FORECON "FORECON Assistant Squad Leader"
-#define JOB_SQUAD_LEADER_FORECON  "FORECON Squad Leader"
-#define JOB_SQUAD_MEDIC_FORECON "FORECON Squad Corpsman"
+#define JOB_SQUAD_TEAM_LEADER_FORECON "Assistant Squad Leader"
+#define JOB_SQUAD_LEADER_FORECON  "Squad Leader"
+#define JOB_SQUAD_MEDIC_FORECON "Squad Corpsman"
 #define JOB_SQUAD_RTO "Radio Telephone Operator"
-#define JOB_SQUAD_MARINE_FORECON "FORECON Rifleman"
-#define JOB_SQUAD_SMARTGUN_FORECON "FORECON Smartgunner"
+#define JOB_SQUAD_MARINE_FORECON "Rifleman"
+#define JOB_SQUAD_SMARTGUN_FORECON "Smartgunner"
 
 var/global/list/job_squad_roles = JOB_SQUAD_ROLES_LIST
 
@@ -152,37 +152,6 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 	. = ..(L);\
 }
 
-//-------------WO roles---------------
-
-#define JOB_WO_CO "Ground Commander"
-#define JOB_WO_XO "Lieutenant Commander"
-#define JOB_WO_CHIEF_POLICE "Honor Guard Squad Leader"
-#define JOB_WO_SO "Veteran Honor Guard"
-#define JOB_WO_CREWMAN "Honor Guard Weapons Specialist"
-#define JOB_WO_POLICE "Honor Guard"
-
-#define JOB_WO_PILOT "Mortar Crew"
-
-#define JOB_WO_CHIEF_ENGINEER "Bunker Crew Master"
-#define JOB_WO_ORDNANCE_TECH "Bunker Crew"
-
-#define JOB_WO_CHIEF_REQUISITION "Bunker Quartermaster"
-#define JOB_WO_REQUISITION "Bunker Crew Logistics"
-
-#define JOB_WO_CMO "Head Surgeon"
-#define JOB_WO_DOCTOR "Field Doctor"
-#define JOB_WO_RESEARCHER "Chemist"
-
-#define JOB_WO_CORPORATE_LIAISON "Combat Reporter"
-#define JOB_WO_SYNTH "Support Synthetic"
-
-#define JOB_WO_SQUAD_MARINE "Dust Raider Squad Rifleman"
-#define JOB_WO_SQUAD_MEDIC "Dust Raider Squad Hospital Corpsman"
-#define JOB_WO_SQUAD_ENGINEER "Dust Raider Squad Combat Technician"
-#define JOB_WO_SQUAD_SMARTGUNNER "Dust Raider Squad Smartgunner"
-#define JOB_WO_SQUAD_SPECIALIST "Dust Raider Squad Weapons Specialist"
-#define JOB_WO_SQUAD_LEADER "Dust Raider Squad Leader"
-
 //------------------------------------
 
 //-------- PMC --------//
@@ -301,7 +270,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 //-------- CLF --------//
 #define JOB_CLF "CLF Guerilla"
-#define JOB_CLF "CLF Rifleman"
+#define JOB_CLF_SOLDIER "CLF Rifleman"
 #define JOB_CLF_ENGI "CLF Field Technician"
 #define JOB_CLF_MEDIC "CLF Field Medic"
 #define JOB_CLF_SPECIALIST "CLF Field Specialist"

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -115,13 +115,13 @@ var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFIC
 
 //Marine roles
 #define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
-var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO)
-var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT)
-var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)
+var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO)
+var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF)
+var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT)
 var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
-var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH)
-var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)
-var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
+var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH)
+var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH)
+var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE)
 var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE, JOB_SQUAD_RTO)
 var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP, SQUAD_LRRP)
 
@@ -130,7 +130,7 @@ var/global/list/ROLES_XENO = list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH)
 var/global/list/ROLES_WHITELISTED = list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR)
 var/global/list/ROLES_SPECIAL = list(JOB_SURVIVOR)
 
-var/global/list/ROLES_USCM = ROLES_CIC + ROLES_POLICE + ROLES_AUXIL_SUPPORT + ROLES_MISC + ROLES_ENGINEERING + ROLES_REQUISITION + ROLES_MEDICAL + ROLES_MARINES - ROLES_WO
+var/global/list/ROLES_USCM = ROLES_CIC + ROLES_POLICE + ROLES_AUXIL_SUPPORT + ROLES_MISC + ROLES_ENGINEERING + ROLES_REQUISITION + ROLES_MEDICAL + ROLES_MARINES
 var/global/list/ROLES_GROUND = ROLES_XENO + ROLES_SPECIAL + ROLES_WHITELISTED
 
 var/global/list/ROLES_DISTRESS_SIGNAL = ROLES_USCM + ROLES_GROUND
@@ -141,15 +141,13 @@ var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
 var/global/list/ROLES_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
-var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
-#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
-						JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
+#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_SEA, JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
 #define BLURB_USCM_FLIGHT JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF
 #define BLURB_USCM_MP JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE
-#define BLURB_USCM_ENGI JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_PILOT
-#define BLURB_USCM_MEDICAL JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR
-#define BLURB_USCM_REQ JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION
+#define BLURB_USCM_ENGI JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH
+#define BLURB_USCM_MEDICAL JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE
+#define BLURB_USCM_REQ JOB_CHIEF_REQUISITION, JOB_CARGO_TECH
 #define BLURB_USCM_WY JOB_CORPORATE_LIAISON
 
 //=================================================

diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm
@@ -152,29 +152,6 @@
 				marine_rk = "rmp"
 			if(JOB_RIOT_CHIEF)
 				marine_rk = "crmp"
-			// Whiskey Outpost
-			if(JOB_WO_CO)
-				marine_rk = "wo_co"
-			if(JOB_WO_XO)
-				marine_rk = "wo_xo"
-			if(JOB_WO_CHIEF_POLICE)
-				marine_rk = "hgsl"
-			if(JOB_WO_SO)
-				marine_rk = "vhg"
-			if(JOB_WO_CREWMAN)
-				marine_rk = "hgspec"
-			if(JOB_WO_POLICE)
-				marine_rk = "hg"
-			if(JOB_WO_CMO)
-				marine_rk = "wo_cmo"
-			if(JOB_WO_DOCTOR)
-				marine_rk = "wo_doctor"
-			if(JOB_WO_RESEARCHER)
-				marine_rk = "wo_chemist"
-			if(JOB_WO_CHIEF_REQUISITION)
-				marine_rk = "wo_ro"
-			if(JOB_WO_PILOT)
-				marine_rk = "wo_mcrew"
 			// Colonial Marshals
 			if(JOB_CMB_TL)
 				marine_rk = "mar"

diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm
@@ -663,12 +663,6 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted
 	contains = list(/obj/item/storage/box/guncase/nsg23_marine)
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/surplus/m3717
-	name = "surplus M37-17 pump shotgun case"
-	dollar_cost = 80
-	contains = list(/obj/item/storage/box/guncase/m3717)
-	containertype = /obj/structure/largecrate/black_market
-
 /datum/supply_packs/contraband/surplus/m1911
 	name = "surplus M1911 service pistol case"
 	dollar_cost = 10
@@ -987,15 +981,15 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
 		// Elite recovered gear.
 			var/list/armor_to_pick = list(
 				// Y8 Miner (default)
-				/obj/item/clothing/under/marine/veteran/mercenary/miner,
+				/obj/item/clothing/under/marine/opfor/mercenary/miner,
 				/obj/item/clothing/suit/storage/marine/veteran/mercenary/miner,
 				/obj/item/clothing/head/helmet/marine/veteran/mercenary/miner,
 				// K12 Ceramic (Heavy-ish)
-				/obj/item/clothing/under/marine/veteran/mercenary,
+				/obj/item/clothing/under/marine/opfor/mercenary,
 				/obj/item/clothing/suit/storage/marine/veteran/mercenary,
 				/obj/item/clothing/head/helmet/marine/veteran/mercenary,
 				// Z7 Support (Support)
-				/obj/item/clothing/under/marine/veteran/mercenary,
+				/obj/item/clothing/under/marine/opfor/mercenary,
 				/obj/item/clothing/suit/storage/marine/veteran/mercenary/support,
 				/obj/item/clothing/head/helmet/marine/veteran/mercenary/support/engineer
 				// You get three random pieces. If you want to complete the set you need to keep rolling the dice!

diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
@@ -250,7 +250,6 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 	var/list/deleteall = list(/obj/item/clothing/mask/cigarette, \
 	/obj/item/clothing/glasses/sunglasses, \
 	/obj/item/clothing/glasses/mgoggles, \
-	/obj/item/clothing/head/beret/marine/mp, \
 	/obj/item/clothing/gloves/black, \
 	/obj/item/weapon/baton, \
 	/obj/item/weapon/gun/energy/taser, \

diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
@@ -241,11 +241,8 @@
 		/obj/item/reagent_container/food/snacks/donut/normal = 12,
 		/obj/item/storage/box/evidence = 6,
 		/obj/item/clothing/head/helmet/marine/MP = 6,
-		/obj/item/clothing/head/beret/marine/mp/mppeaked = 6,
-		/obj/item/clothing/head/beret/marine/mp/mpcap = 6,
 		/obj/item/clothing/under/marine = 2,
 		/obj/item/storage/belt/security/MP = 6,
-		/obj/item/clothing/head/beret/marine/mp = 6,
 		/obj/item/clothing/glasses/sunglasses/sechud = 3,
 		/obj/item/device/radio/headset = 6,
 		/obj/item/tape/regulation = 5,

diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -110,7 +110,7 @@
 	listed_products = list(
 		list("STANDARD EQUIPMENT", -1, null, null, null),
 		list("Military Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/upp, VENDOR_ITEM_REGULAR),
-		list("UPP Uniform", round(scale * 15), /obj/item/clothing/under/marine/veteran/UPP, VENDOR_ITEM_REGULAR),
+		list("UPP Uniform", round(scale * 15), /obj/item/clothing/under/marine/opfor/UPP, VENDOR_ITEM_REGULAR),
 		list("Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
 		list("UM4 Pattern Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/UPP, VENDOR_ITEM_REGULAR),
 		list("Radio Headset", round(scale * 15), /obj/item/device/radio/headset/distress/UPP, VENDOR_ITEM_REGULAR),

diff --git a/code/game/objects/effects/spawners/random.dm b/code/game/objects/effects/spawners/random.dm
@@ -465,7 +465,6 @@
 		/obj/item/weapon/gun/lever_action/r4t = /obj/item/ammo_magazine/lever_action,
 		/obj/item/weapon/gun/lever_action/r4t = /obj/item/ammo_magazine/lever_action,
 		/obj/item/weapon/gun/shotgun/merc = null,
-		/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717 = null,
 	) //no ammotypes needed as it spawns random 12g boxes. Apart from the r4t. why is the r4t in the shotgun pool? fuck you, that's why.
 
 /obj/effect/spawner/random/gun/shotgun/lowchance

diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
@@ -384,7 +384,7 @@
 
 /obj/item/card/id/dogtag
 	name = "dog tag"
-	desc = "A marine dog tag."
+	desc = "A dog tag."
 	icon_state = "dogtag"
 	item_state = "dogtag"
 	pinned_on_uniform = FALSE

diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
@@ -624,32 +624,7 @@
 	name = "\improper XX-121 therapy plush"
 	desc = "Don't be sad! Be glad (that you're alive)!"
 	icon_state = "runner"
-	/// If the runner is wearing a beret
-	var/beret = FALSE
 
-/obj/item/toy/plush/runner/Initialize(mapload, ...)
-	. = ..()
-	if(beret)
-		update_icon()
-
-/obj/item/toy/plush/runner/attackby(obj/item/attacking_object, mob/user)
-	. = ..()
-	if(beret)
-		return
-	if(!istypestrict(attacking_object, /obj/item/clothing/head/beret/marine/mp))
-		return
-	var/beret_attack = attacking_object
-	to_chat(user, SPAN_NOTICE("You put [beret_attack] on [src]."))
-	qdel(beret_attack)
-	beret = TRUE
-	update_icon()
-
-/obj/item/toy/plush/runner/update_icon()
-	. = ..()
-	if(beret)
-		icon_state = "runner_beret"
-		return
-	icon_state = "runner"
 
 /obj/item/toy/plush/shark/alt
 	icon_state = "shark_alt"