experiment

cmss13-devs · May 16, 2024 · 16bd88b · 16bd88b
1 parent 5da327a
commit 16bd88b
Show file tree

Hide file tree

Showing 35 changed files with 357 additions and 379 deletions.
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
@@ -155,7 +155,7 @@
 	if(!gear_preset)
 		return ""
 	if(GLOB.gear_path_presets_list[gear_preset])
-		return GLOB.gear_path_presets_list[gear_preset].paygrade
+		return GLOB.gear_path_presets_list[gear_preset].paygrade_base
 	return ""
 
 /datum/job/proc/get_comm_title()

diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm
@@ -15,7 +15,14 @@
 	var/list/access = list()
 	var/assignment
 	var/rank
-	var/paygrade
+	/// Default Paygrade
+	var/paygrade_base
+	/// Paygrade for having less than 10 hours in a role. Ignores playtime perk prefs.
+	var/paygrade_low
+	/// Paygrade for hitting 70 hours in a role. As of May 2024 only used for Corporate Liaison & Marine Raiders.
+	var/paygrade_mid
+	/// Paygrade for hitting 175 hours in a role.
+	var/paygrade_high
 	var/role_comm_title
 	var/minimum_age
 	var/faction = FACTION_NEUTRAL
@@ -96,7 +103,18 @@
 		new_human.age = minimum_age
 
 /datum/equipment_preset/proc/load_rank(mob/living/carbon/human/new_human, client/mob_client)
-	return paygrade
+	if(mob_client)
+		var/playtime = get_job_playtime(mob_client, rank)
+		if(paygrade_low && playtime < JOB_PLAYTIME_TIER_1)
+			return paygrade_low
+		if(new_human.client.prefs.playtime_perks)
+			if(paygrade_high && playtime > JOB_PLAYTIME_TIER_4)
+				return paygrade_high
+			if(paygrade_mid && playtime < JOB_PLAYTIME_TIER_3)
+				return paygrade_mid
+			else
+				return paygrade_base
+	return paygrade_base
 
 /datum/equipment_preset/proc/load_gear(mob/living/carbon/human/new_human, client/mob_client)
 	return
@@ -185,7 +203,7 @@
 				new_human.equip_to_slot_or_del(equipping_gear, WEAR_IN_BACK)
 
 	//Gives ranks to the ranked
-	var/current_rank = paygrade
+	var/current_rank = paygrade_base
 	var/obj/item/card/id/I = new_human.get_idcard()
 	if(I)
 		current_rank = I.paygrade

diff --git a/code/modules/gear_presets/agents.dm b/code/modules/gear_presets/agents.dm
@@ -17,7 +17,7 @@
 	)
 	assignment = JOB_STOWAWAY
 	rank = JOB_STOWAWAY
-	paygrade = "???"
+	paygrade_base = "???"
 	role_comm_title = "???"
 	skills = /datum/skills/civilian/survivor
 
@@ -69,7 +69,7 @@
 	)
 	assignment = JOB_UPP_REPRESENTATIVE
 	rank = JOB_UPP_REPRESENTATIVE
-	paygrade = PAY_SHORT_CREP
+	paygrade_base = PAY_SHORT_CREP
 	role_comm_title = "UPP Rep."
 	skills = /datum/skills/civilian/survivor
 
@@ -105,7 +105,7 @@
 	)
 	assignment = JOB_TWE_REPRESENTATIVE
 	rank = JOB_TWE_REPRESENTATIVE
-	paygrade = PAY_SHORT_CREP
+	paygrade_base = PAY_SHORT_CREP
 	role_comm_title = "TWE Rep."
 	skills = /datum/skills/civilian/survivor
 

diff --git a/code/modules/gear_presets/cbrn.dm b/code/modules/gear_presets/cbrn.dm
@@ -2,7 +2,7 @@
 	name = "Generic CBRN" //Parent type for easier gear
 	assignment = JOB_SQUAD_MARINE
 	rank = JOB_SQUAD_MARINE
-	paygrade = PAY_SHORT_ME3
+	paygrade_base = PAY_SHORT_ME3
 	role_comm_title = "CBRN"
 	flags = EQUIPMENT_PRESET_EXTRA
 	auto_squad_name = SQUAD_CBRN
@@ -67,7 +67,7 @@
 
 /datum/equipment_preset/uscm/cbrn/engineer
 	name = "CBRN Combat Technician"
-	paygrade = PAY_SHORT_ME4
+	paygrade_base = PAY_SHORT_ME4
 	assignment = JOB_SQUAD_ENGI
 	rank = JOB_SQUAD_ENGI
 	role_comm_title = "ComTech"
@@ -111,7 +111,7 @@
 
 /datum/equipment_preset/uscm/cbrn/medic
 	name = "CBRN Hospital Corpsman"
-	paygrade = PAY_SHORT_ME4
+	paygrade_base = PAY_SHORT_ME4
 	assignment = JOB_SQUAD_MEDIC
 	rank = JOB_SQUAD_MEDIC
 	role_comm_title = "HM"
@@ -154,7 +154,7 @@
 
 /datum/equipment_preset/uscm/cbrn/leader
 	name = "CBRN Fireteam Leader"
-	paygrade = PAY_SHORT_ME5
+	paygrade_base = PAY_SHORT_ME5
 	assignment = JOB_SQUAD_TEAM_LEADER
 	rank = JOB_SQUAD_TEAM_LEADER
 	role_comm_title = "TL"
@@ -189,7 +189,7 @@
 
 /datum/equipment_preset/uscm/cbrn/specialist
 	name = "CBRN Specialist"
-	paygrade = PAY_SHORT_OPR
+	paygrade_base = PAY_SHORT_OPR
 	assignment = JOB_SQUAD_SPECIALIST
 	rank = JOB_SQUAD_SPECIALIST
 	role_comm_title = "Spc"

diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm
@@ -3,7 +3,7 @@
 	languages = list(LANGUAGE_JAPANESE, LANGUAGE_ENGLISH)
 	assignment = JOB_CLF
 	rank = FACTION_CLF
-	paygrade = PAY_SHORT_REB
+	paygrade_base = PAY_SHORT_REB
 	faction = FACTION_CLF
 	origin_override = ORIGIN_CIVILIAN
 	idtype = /obj/item/card/id/data
@@ -284,7 +284,7 @@
 	assignment = JOB_CLF_MEDIC
 	rank = JOB_CLF_MEDIC
 	role_comm_title = "MED"
-	paygrade = PAY_SHORT_CDOC
+	paygrade_base = PAY_SHORT_CDOC
 	skills = /datum/skills/clf/combat_medic
 
 /datum/equipment_preset/clf/medic/load_gear(mob/living/carbon/human/new_human)
@@ -716,7 +716,7 @@
 	skills = /datum/skills/colonial_synthetic
 	assignment = JOB_CLF_SYNTH
 	rank = JOB_CLF_SYNTH
-	paygrade = PAY_SHORT_SYN
+	paygrade_base = PAY_SHORT_SYN
 	role_comm_title = "Syn"
 
 /datum/equipment_preset/clf/synth/New()
@@ -960,7 +960,7 @@
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = JOB_CLF_COMMANDER
 	rank = JOB_CLF_COMMANDER
-	paygrade = PAY_SHORT_REBC
+	paygrade_base = PAY_SHORT_REBC
 	role_comm_title = "CMDR"
 	skills = /datum/skills/clf/commander
 

diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm
@@ -58,7 +58,7 @@
 
 /datum/equipment_preset/cmb/standard
 	name = "CMB - Colonial Marshal Deputy"
-	paygrade = PAY_SHORT_CMBD
+	paygrade_base = PAY_SHORT_CMBD
 	role_comm_title = "CMB DEP"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "CMB Deputy"
@@ -141,7 +141,7 @@
 
 /datum/equipment_preset/cmb/leader
 	name = "CMB - The Colonial Marshal"
-	paygrade = PAY_SHORT_CMBM
+	paygrade_base = PAY_SHORT_CMBM
 	idtype = /obj/item/card/id/marshal
 	role_comm_title = "CMB MAR"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -195,7 +195,7 @@
 //*****************************************************************************************************/
 /datum/equipment_preset/cmb/synth
 	name = "CMB - Colonial Marshal Investigative Synthetic"
-	paygrade = PAY_SHORT_CMBS
+	paygrade_base = PAY_SHORT_CMBS
 	idtype = /obj/item/card/id/deputy
 	role_comm_title = "CMB Syn"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -297,7 +297,7 @@
 
 /datum/equipment_preset/cmb/liaison
 	name = "CMB - ICC Liaison"
-	paygrade = PAY_SHORT_ICCL
+	paygrade_base = PAY_SHORT_ICCL
 	idtype = /obj/item/card/id/silver/cl
 	role_comm_title = "ICC Rep."
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -356,7 +356,7 @@
 
 /datum/equipment_preset/cmb/observer
 	name = "CMB - Interstellar Human Rights Observer"
-	paygrade = PAY_SHORT_IHRO
+	paygrade_base = PAY_SHORT_IHRO
 	idtype = /obj/item/card/id/lanyard
 	role_comm_title = "OBS"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -415,7 +415,7 @@
 
 	assignment = "Anchorpoint Station Marine Rifleman"
 	rank = JOB_SQUAD_MARINE
-	paygrade = PAY_SHORT_ME2
+	paygrade_base = PAY_SHORT_ME2
 	role_comm_title = "A-RFN"
 	skills = /datum/skills/pfc/crafty
 	faction = FACTION_MARSHAL
@@ -465,7 +465,7 @@
 
 	assignment = "Anchorpoint Station Marine Team Leader"
 	rank = JOB_SQUAD_LEADER
-	paygrade = PAY_SHORT_ME6
+	paygrade_base = PAY_SHORT_ME6
 	role_comm_title = "A-TL"
 	minimum_age = 25
 	skills = /datum/skills/SL
@@ -510,7 +510,7 @@
 
 	assignment = "Anchorpoint Station Marine Technical Specialist"
 	rank = JOB_SQUAD_TEAM_LEADER
-	paygrade = PAY_SHORT_ME4
+	paygrade_base = PAY_SHORT_ME4
 	role_comm_title = "A-TS"
 	skills = /datum/skills/tl
 
@@ -555,7 +555,7 @@
 
 	assignment = "Anchorpoint Station Hospital Corpsman"
 	rank = JOB_SQUAD_MEDIC
-	paygrade = PAY_SHORT_ME3
+	paygrade_base = PAY_SHORT_ME3
 	role_comm_title = "A-HM"
 	skills = /datum/skills/combat_medic
 
@@ -616,7 +616,7 @@
 
 	assignment = "Anchorpoint Station Marine Smartgunner"
 	rank = JOB_SQUAD_SMARTGUN
-	paygrade = PAY_SHORT_ME3
+	paygrade_base = PAY_SHORT_ME3
 	role_comm_title = "A-SG"
 	skills = /datum/skills/smartgunner
 

diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm
@@ -61,7 +61,7 @@
 
 /datum/equipment_preset/contractor/duty/standard
 	name = "Military Contractor (Standard)"
-	paygrade = PAY_SHORT_VAI_S
+	paygrade_base = PAY_SHORT_VAI_S
 	role_comm_title = "Merc"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "VAIPO Mercenary"
@@ -160,7 +160,7 @@
 
 /datum/equipment_preset/contractor/duty/heavy
 	name = "Military Contractor (Machinegunner)"
-	paygrade = PAY_SHORT_VAI_G
+	paygrade_base = PAY_SHORT_VAI_G
 	role_comm_title = "MG"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -205,7 +205,7 @@
 //*****************************************************************************************************/
 /datum/equipment_preset/contractor/duty/engi
 	name = "Military Contractor (Engineer)"
-	paygrade = PAY_SHORT_VAI_E
+	paygrade_base = PAY_SHORT_VAI_E
 
 	role_comm_title = "Eng"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -252,7 +252,7 @@
 
 /datum/equipment_preset/contractor/duty/medic
 	name = "Military Contractor (Medic)"
-	paygrade = PAY_SHORT_VAI_M
+	paygrade_base = PAY_SHORT_VAI_M
 	role_comm_title = "Med"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -298,7 +298,7 @@
 
 /datum/equipment_preset/contractor/duty/leader
 	name = "Military Contractor (Leader)"
-	paygrade = PAY_SHORT_VAI_L
+	paygrade_base = PAY_SHORT_VAI_L
 	role_comm_title = "TL"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -348,7 +348,7 @@
 //*****************************************************************************************************/
 /datum/equipment_preset/contractor/duty/synth
 	name = "Military Contractor (Synthetic)"
-	paygrade = PAY_SHORT_VAI_SN
+	paygrade_base = PAY_SHORT_VAI_SN
 	role_comm_title = "Syn"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -438,7 +438,7 @@
 
 /datum/equipment_preset/contractor/covert/standard
 	name = "Military Contractor (Covert Standard)"
-	paygrade = PAY_SHORT_VAI_S
+	paygrade_base = PAY_SHORT_VAI_S
 	role_comm_title = "Merc"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -539,7 +539,7 @@
 
 /datum/equipment_preset/contractor/covert/heavy
 	name = "Military Contractor (Covert Machinegunner)"
-	paygrade = PAY_SHORT_VAI_G
+	paygrade_base = PAY_SHORT_VAI_G
 	role_comm_title = "MG"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -586,7 +586,7 @@
 //*****************************************************************************************************/
 /datum/equipment_preset/contractor/covert/engi
 	name = "Military Contractor (Covert Engineer)"
-	paygrade = PAY_SHORT_VAI_E
+	paygrade_base = PAY_SHORT_VAI_E
 
 	role_comm_title = "Eng"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -634,7 +634,7 @@
 
 /datum/equipment_preset/contractor/covert/medic
 	name = "Military Contractor (Covert Medic)"
-	paygrade = PAY_SHORT_VAI_M
+	paygrade_base = PAY_SHORT_VAI_M
 	role_comm_title = "Med"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -681,7 +681,7 @@
 
 /datum/equipment_preset/contractor/covert/leader
 	name = "Military Contractor (Covert Leader)"
-	paygrade = PAY_SHORT_VAI_L
+	paygrade_base = PAY_SHORT_VAI_L
 	role_comm_title = "TL"
 	flags = EQUIPMENT_PRESET_EXTRA
 
@@ -732,7 +732,7 @@
 //*****************************************************************************************************/
 /datum/equipment_preset/contractor/covert/synth
 	name = "Military Contractor (Covert Synthetic)"
-	paygrade = PAY_SHORT_VAI_SN
+	paygrade_base = PAY_SHORT_VAI_SN
 	role_comm_title = "Syn"
 	flags = EQUIPMENT_PRESET_EXTRA