WIP Massive Large Overhaul [skip ci]

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 --------//
@@ -220,11 +189,11 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_DIRECTOR "W-Y Director"
 
 //-------- WY Goons --------//
-#define JOB_WY_GOON "WY Corporate Security"
-#define JOB_WY_GOON_LEAD "WY Corporate Security Lead"
-#define JOB_WY_GOON_RESEARCHER "WY Research Consultant"
+#define JOB_WY_SEC "W-Y Corporate Security"
+#define JOB_WY_SEC_LEAD "W-Y Corporate Security Lead"
+#define JOB_WY_SEC_RESEARCHER "W-Y Research Consultant"
 
-#define JOB_WY_GOON_LIST list(JOB_WY_GOON, JOB_WY_GOON_LEAD)
+#define JOB_WY_SEC_LIST list(JOB_WY_SEC, JOB_WY_SEC_LEAD)
 
 //---- Contractors ----//
 #define JOB_CONTRACTOR "VAIPO Mercenary"
@@ -267,8 +236,8 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 //-------- UPP --------//
 #define JOB_UPP "UPP Private"
 #define JOB_UPP_CONSCRIPT "UPP Conscript"
-#define JOB_UPP_ENGI "UPP Korporal Sapper"
-#define JOB_UPP_MEDIC "UPP Korporal Medic"
+#define JOB_UPP_ENGI "UPP Sapper"
+#define JOB_UPP_MEDIC "UPP Sanitar"
 #define JOB_UPP_SPECIALIST "UPP Serzhant"
 #define JOB_UPP_LEADER "UPP Master Serzhant"
 #define JOB_UPP_POLICE "UPP Politsiya"
@@ -301,6 +270,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 //-------- CLF --------//
 #define JOB_CLF "CLF Guerilla"
+#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"
@@ -398,4 +368,4 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 ///For denying certain traits being applied to people. ie. bad leg
 ///'Grunt' lists are for people who wouldn't logically get the bad leg trait, ie. UPP marine counterparts.
-#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, JOB_WY_GOON_LIST, JOB_PMC_GRUNT_LIST)
+#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, JOB_WY_SEC_LIST, JOB_PMC_GRUNT_LIST)

code/__DEFINES/mobs.dm

@@ -385,9 +385,9 @@ var/list/default_onmob_icons = list(
 		WEAR_R_EAR = 'icons/mob/humans/onmob/ears.dmi',
 		WEAR_EYES = 'icons/mob/humans/onmob/eyes.dmi',
 		WEAR_ID = 'icons/mob/mob.dmi',
-		WEAR_BODY = 'icons/mob/humans/onmob/uniform_0.dmi',
-		WEAR_JACKET = 'icons/mob/humans/onmob/suit_0.dmi',
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi',
+		WEAR_BODY = 'icons/mob/humans/onmob/uniform-layer/uniform_0.dmi',
+		WEAR_JACKET = 'icons/mob/humans/onmob/suit-layer/suit_0.dmi',
+		WEAR_HEAD = 'icons/mob/humans/onmob/head-layer/head_0.dmi',
 		WEAR_FEET = 'icons/mob/humans/onmob/feet.dmi',
 		WEAR_FACE = 'icons/mob/humans/onmob/mask.dmi',
 		WEAR_HANDCUFFED = 'icons/mob/mob.dmi',

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
 
 //=================================================
@@ -228,7 +226,7 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
 #define FACTION_WY "Wey-Yu"
 #define FACTION_CLF "CLF"
 #define FACTION_PMC "PMC"
-#define FACTION_CONTRACTOR "VAI"
+#define FACTION_CONTRACTOR "Mercenary"
 #define FACTION_MARSHAL "Colonial Marshal"
 #define FACTION_WY_DEATHSQUAD "WY Death Squad"
 #define FACTION_MERCENARY "Mercenary"

code/controllers/subsystem/ticker.dm

@@ -376,9 +376,6 @@ SUBSYSTEM_DEF(ticker)
 
 /datum/controller/subsystem/ticker/proc/equip_characters()
 	var/captainless=1
-	if(mode && istype(mode,/datum/game_mode/huntergames)) // || istype(mode,/datum/game_mode/whiskey_outpost)
-		return
-
 	for(var/mob/living/carbon/human/player in GLOB.human_mob_list)
 		if(player.mind)
 			if(player.job == JOB_CO)

code/datums/datacore.dm

@@ -414,7 +414,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 		eyes_s.Blend(facial_s, ICON_OVERLAY)
 
 	var/icon/clothes_s = null
-	clothes_s = new /icon('icons/mob/humans/onmob/uniform_0.dmi', "marine_underpants_s")
+	clothes_s = new /icon('icons/mob/humans/onmob/uniform-layer/uniform_0.dmi', "marine_underpants_s")
 	clothes_s.Blend(new /icon('icons/mob/humans/onmob/feet.dmi', "black"), ICON_UNDERLAY)
 	preview_icon.Blend(eyes_s, ICON_OVERLAY)
 	if(clothes_s)