From 30d8f48ddd0c8e412d60a7137211ceb545a1495e Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Tue, 30 Jul 2024 20:12:07 +0100 Subject: [PATCH 1/4] Rank Change Experiment (#6295) # About the pull request Changes the backend of how paygrades are worked out on equipment presets so we no longer need to override it several times for different roles based on playtime. Added sub-10 hour ranks for most USCM roles (all enlisted that didn't already have them, and most officers above 2nd LT) Added 70+ hour ranks for most USCM enlisted and some officers. # Explain why it's good for the game The hope is that this will make things a little more dynamic, and also help address the clutter we have of certain paygrades (IE the Sergeant SL leading 9 lance corporals and a dozen or more PFCs) Whilst true, in regards to Squad Rifleman, there can now be MORE lance corporals, the hope is this will be more scattered and accounted for by senior NCOs being slightly more common. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: code: Changed back-end for working out equipment preset paygrades so as to remove the manual overrides on several roles based on playtime perks. add: Added lower ranks for all enlisted and some officer roles subject to having played for less than ten hours. This rank cannot be used after playing more than ten hours, and ignores preferences for playtime perks. add: Added a higher rank achievable to most enlisted and some officers, requiring 175+ hours. add: Changed base rank for SL, SG, Spec and FTL by one grade up. add: Changed low playtime rank for MP and Nurse from Lance Corporal to Corporal. /:cl: --- code/__DEFINES/job.dm | 1 + code/datums/datacore.dm | 2 + code/game/jobs/job/job.dm | 2 +- .../modules/gear_presets/_select_equipment.dm | 37 +++++++-- code/modules/gear_presets/agents.dm | 6 +- code/modules/gear_presets/cbrn.dm | 10 +-- code/modules/gear_presets/clf.dm | 8 +- code/modules/gear_presets/cmb.dm | 20 ++--- code/modules/gear_presets/contractor.dm | 24 +++--- code/modules/gear_presets/corpses.dm | 22 ++--- code/modules/gear_presets/dust_raider.dm | 12 +-- code/modules/gear_presets/dutch.dm | 10 +-- code/modules/gear_presets/fun.dm | 12 +-- code/modules/gear_presets/other.dm | 25 +++--- code/modules/gear_presets/pmc.dm | 50 ++++++------ code/modules/gear_presets/royal_marines.dm | 8 +- ...ot_in_progress_insert_fiorina_nightmare.dm | 8 +- .../survivors/lv_522/forcon_survivors.dm | 6 +- .../lv_624/corporate_dome_insert_lv624.dm | 2 +- code/modules/gear_presets/survivors/misc.dm | 4 +- .../panic_room_insert_shivas.dm | 2 +- .../crashlanding-offices_insert_bigred.dm | 8 +- .../survivors/solaris/preset_solaris.dm | 2 +- .../gear_presets/survivors/survivors.dm | 24 ++---- .../crashlanding_upp_bar_insert_trijent.dm | 20 ++--- code/modules/gear_presets/synths.dm | 6 +- code/modules/gear_presets/upp.dm | 52 ++++++------ code/modules/gear_presets/uscm.dm | 78 ++++++------------ code/modules/gear_presets/uscm_dress.dm | 38 ++++----- code/modules/gear_presets/uscm_event.dm | 34 ++++---- code/modules/gear_presets/uscm_forecon.dm | 4 +- code/modules/gear_presets/uscm_medical.dm | 15 +--- code/modules/gear_presets/uscm_police.dm | 15 ++-- code/modules/gear_presets/uscm_ship.dm | 80 ++++++------------- code/modules/gear_presets/whiteout.dm | 2 +- code/modules/gear_presets/wo.dm | 42 +++++----- code/modules/gear_presets/wy.dm | 22 ++--- code/modules/gear_presets/wy_goons.dm | 8 +- 38 files changed, 324 insertions(+), 397 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 79f40c89bb53..3fd552f5369f 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -360,6 +360,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define JOB_XENOMORPH_QUEEN "Queen" // For coloring the ranks in the statistics menu +#define JOB_PLAYTIME_TIER_0 (0 HOURS) #define JOB_PLAYTIME_TIER_1 (10 HOURS) #define JOB_PLAYTIME_TIER_2 (25 HOURS) #define JOB_PLAYTIME_TIER_3 (70 HOURS) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index ca4eca8a1a49..e10096059bda 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -6,6 +6,8 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) var/security[] = list() //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). var/locked[] = list() + var/leveled_riflemen = 0 + var/leveled_riflemen_max = 7 /datum/datacore/proc/get_manifest(monochrome, OOC, nonHTML) var/list/cic = GLOB.ROLES_CIC.Copy() diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 0af315fc3b9d..640866db8ca2 100644 --- 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].paygrades[1] 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 index 138e091ad5a4..09f20161e18c 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -15,7 +15,7 @@ var/list/access = list() var/assignment var/rank - var/paygrade + var/list/paygrades = list("???") var/role_comm_title var/minimum_age var/faction = FACTION_NEUTRAL @@ -95,8 +95,33 @@ if(minimum_age && new_human.age < minimum_age) new_human.age = minimum_age -/datum/equipment_preset/proc/load_rank(mob/living/carbon/human/new_human, client/mob_client) - return paygrade +/datum/equipment_preset/proc/load_rank(mob/living/carbon/human/new_human, client/mob_client)//Beagle-Code + if(paygrades.len == 1) + return paygrades[1] + var/playtime + if(!mob_client) + playtime = JOB_PLAYTIME_TIER_1 + else + playtime = get_job_playtime(mob_client, rank) + if((playtime >= JOB_PLAYTIME_TIER_1) && !mob_client.prefs.playtime_perks) + playtime = JOB_PLAYTIME_TIER_1 + var/final_paygrade + for(var/current_paygrade as anything in paygrades) + var/required_time = paygrades[current_paygrade] + if(required_time - playtime > 0) + break + final_paygrade = current_paygrade + if(rank == JOB_SQUAD_MARINE && final_paygrade == PAY_SHORT_ME3) + if(GLOB.data_core.leveled_riflemen > GLOB.data_core.leveled_riflemen_max) + return PAY_SHORT_ME2 + else + GLOB.data_core.leveled_riflemen_max++ + return final_paygrade + if(!final_paygrade) + . = "???" + CRASH("[key_name(new_human)] spawned with no valid paygrade.") + + return final_paygrade /datum/equipment_preset/proc/load_gear(mob/living/carbon/human/new_human, client/mob_client) return @@ -110,6 +135,8 @@ /datum/equipment_preset/proc/load_id(mob/living/carbon/human/new_human, client/mob_client) if(!idtype) return + if(!mob_client) + mob_client = new_human.client var/obj/item/card/id/ID = new idtype() ID.name = "[new_human.real_name]'s ID Card" if(assignment) @@ -123,7 +150,7 @@ ID.registered_ref = WEAKREF(new_human) ID.registered_gid = new_human.gid ID.blood_type = new_human.blood_type - ID.paygrade = load_rank(new_human) || ID.paygrade + ID.paygrade = load_rank(new_human, mob_client) || ID.paygrade ID.uniform_sets = uniform_sets new_human.equip_to_slot_or_del(ID, WEAR_ID) new_human.faction = faction @@ -188,7 +215,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 = paygrades[1] 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 index c7449883b87f..b7c098de6e23 100644 --- 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 = "???" + paygrades = list("???" = JOB_PLAYTIME_TIER_0) role_comm_title = "???" skills = /datum/skills/civilian/survivor @@ -69,7 +69,7 @@ ) assignment = JOB_UPP_REPRESENTATIVE rank = JOB_UPP_REPRESENTATIVE - paygrade = PAY_SHORT_CREP + paygrades = list(PAY_SHORT_CREP = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_CREP = JOB_PLAYTIME_TIER_0) 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 index e59f276fe486..4f6d526bf923 100644 --- 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 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_OPR = JOB_PLAYTIME_TIER_0) 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 index dbee0e435ba4..e9570bbbab9f 100644 --- 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 + paygrades = list(PAY_SHORT_REB = JOB_PLAYTIME_TIER_0) faction = FACTION_CLF origin_override = ORIGIN_CIVILIAN idtype = /obj/item/card/id/data @@ -283,7 +283,7 @@ assignment = JOB_CLF_MEDIC rank = JOB_CLF_MEDIC role_comm_title = "MED" - paygrade = PAY_SHORT_CDOC + paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) skills = /datum/skills/clf/combat_medic /datum/equipment_preset/clf/medic/load_gear(mob/living/carbon/human/new_human) @@ -715,7 +715,7 @@ skills = /datum/skills/colonial_synthetic assignment = JOB_CLF_SYNTH rank = JOB_CLF_SYNTH - paygrade = PAY_SHORT_SYN + paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) role_comm_title = "Syn" /datum/equipment_preset/clf/synth/New() @@ -959,7 +959,7 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_CLF_COMMANDER rank = JOB_CLF_COMMANDER - paygrade = PAY_SHORT_REBC + paygrades = list(PAY_SHORT_REBC = JOB_PLAYTIME_TIER_0) 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 index 45c06776a4a8..672afa99873b 100644 --- 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 + paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_CMBM = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_ICCL = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_IHRO = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-RFN" skills = /datum/skills/pfc/crafty faction = FACTION_MARSHAL @@ -462,7 +462,7 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE assignment = "Anchorpoint Station Marine Team Leader" rank = JOB_SQUAD_LEADER - paygrade = PAY_SHORT_ME6 + paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-TL" minimum_age = 25 skills = /datum/skills/SL @@ -504,7 +504,7 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE assignment = "Anchorpoint Station Marine Technical Specialist" rank = JOB_SQUAD_TEAM_LEADER - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-TS" skills = /datum/skills/tl @@ -546,7 +546,7 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE assignment = "Anchorpoint Station Hospital Corpsman" rank = JOB_SQUAD_MEDIC - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-HM" skills = /datum/skills/combat_medic @@ -604,7 +604,7 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE assignment = "Anchorpoint Station Marine Smartgunner" rank = JOB_SQUAD_SMARTGUN - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) 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 index f49b78609945..c18ccb4418c7 100644 --- 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 + paygrades = list(PAY_SHORT_VAI_S = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_G = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_E = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_M = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_L = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_SN = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_S = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_G = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_E = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_M = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_L = JOB_PLAYTIME_TIER_0) 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 + paygrades = list(PAY_SHORT_VAI_SN = JOB_PLAYTIME_TIER_0) role_comm_title = "Syn" flags = EQUIPMENT_PRESET_EXTRA diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 7bf9592a6209..9e688037860b 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -205,7 +205,7 @@ /datum/equipment_preset/corpse/security/cmb name = "Corpse - Colonial Marshal Deputy" rank = JOB_CMB - paygrade = PAY_SHORT_CMBD + paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/deputy xenovictim = TRUE access = list( @@ -240,7 +240,7 @@ assignment = JOB_EXECUTIVE rank = JOB_EXECUTIVE faction_group = FACTION_LIST_WY - paygrade = PAY_SHORT_WYC3 + paygrades = list(PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver/clearance_badge/cl xenovictim = TRUE access = list( @@ -316,7 +316,7 @@ assignment = "Colonial Division Manager" rank = JOB_DIVISION_MANAGER faction_group = FACTION_LIST_WY - paygrade = PAY_SHORT_WYC8 + paygrades = list(PAY_SHORT_WYC8 = JOB_PLAYTIME_TIER_0) access = list( ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, @@ -352,7 +352,7 @@ assignment = "Colonial Administrator" rank = JOB_DIRECTOR faction_group = FACTION_LIST_WY - paygrade = PAY_SHORT_WYC10 + paygrades = list(PAY_SHORT_WYC10 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver/cl access = list( ACCESS_CIVILIAN_PUBLIC, @@ -536,7 +536,7 @@ name = "Corpse - Corporate Supervisor" assignment = "Colony Supervisor" flags = EQUIPMENT_PRESET_EXTRA - paygrade = PAY_SHORT_WYC6 + paygrades = list(PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_0) rank = FACTION_WY idtype = /obj/item/card/id/silver/clearance_badge/manager faction_group = FACTION_LIST_WY @@ -617,7 +617,7 @@ name = "Corpse - Union of Progressive Peoples Soldier" assignment = JOB_UPP idtype = /obj/item/card/id/dogtag - paygrade = PAY_SHORT_UE2 + paygrades = list(PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_0) rank = JOB_UPP faction = FACTION_UPP @@ -654,7 +654,7 @@ faction = FACTION_PMC faction_group = FACTION_LIST_WY rank = JOB_PMC_STANDARD - paygrade = PAY_SHORT_PMC_OP + paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/pmc access = list( ACCESS_CIVILIAN_PUBLIC, @@ -698,7 +698,7 @@ languages = list(LANGUAGE_ENGLISH) assignment = JOB_WY_GOON rank = JOB_WY_GOON - paygrade = PAY_SHORT_CPO + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/corpse/pmc/goon/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -723,7 +723,7 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_WY_GOON_LEAD rank = JOB_WY_GOON_LEAD - paygrade = PAY_SHORT_CSPO + paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -749,7 +749,7 @@ /datum/equipment_preset/corpse/freelancer name = "Corpse - Freelancer" - paygrade = PAY_SHORT_FL_S + paygrades = list(PAY_SHORT_FL_S = JOB_PLAYTIME_TIER_0) rank = FACTION_FREELANCER idtype = /obj/item/card/id/data faction = FACTION_FREELANCER @@ -965,7 +965,7 @@ name = "Corpse - USCM Reconnaissance Spotter" assignment = "Reconnaissance Spotter" xenovictim = FALSE - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "FORECON" faction_group = list(FACTION_MARINE, FACTION_SURVIVOR) diff --git a/code/modules/gear_presets/dust_raider.dm b/code/modules/gear_presets/dust_raider.dm index c33d071a0b57..42f234d6399d 100644 --- a/code/modules/gear_presets/dust_raider.dm +++ b/code/modules/gear_presets/dust_raider.dm @@ -24,7 +24,7 @@ access = list(ACCESS_MARINE_PREP) assignment = JOB_SQUAD_MARINE rank = JOB_SQUAD_MARINE - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) role_comm_title = "RFN" skills = /datum/skills/pfc/crafty @@ -46,7 +46,7 @@ access = list(ACCESS_MARINE_PREP) assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" skills = /datum/skills/SL @@ -75,7 +75,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) assignment = JOB_SQUAD_SMARTGUN rank = JOB_SQUAD_SMARTGUN - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "SG" skills = /datum/skills/smartgunner @@ -100,7 +100,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) assignment = JOB_SQUAD_ENGI rank = JOB_SQUAD_ENGI - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "Eng" skills = /datum/skills/combat_engineer @@ -129,7 +129,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = JOB_SQUAD_MEDIC rank = JOB_SQUAD_MEDIC - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "HM" skills = /datum/skills/combat_medic @@ -164,7 +164,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) assignment = JOB_SQUAD_SPECIALIST rank = JOB_SQUAD_SPECIALIST - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "Spc" skills = /datum/skills/specialist diff --git a/code/modules/gear_presets/dutch.dm b/code/modules/gear_presets/dutch.dm index 66a7254494b2..8a51fb9d59e2 100644 --- a/code/modules/gear_presets/dutch.dm +++ b/code/modules/gear_presets/dutch.dm @@ -2,7 +2,7 @@ /datum/equipment_preset/dutch name = JOB_DUTCH_RIFLEMAN - paygrade = PAY_SHORT_DTC + paygrades = list(PAY_SHORT_DTC = JOB_PLAYTIME_TIER_0) assignment = JOB_DUTCH_RIFLEMAN flags = EQUIPMENT_PRESET_EXTRA faction = FACTION_DUTCH @@ -83,7 +83,7 @@ /datum/equipment_preset/dutch/minigun name = JOB_DUTCH_MINIGUNNER - paygrade = PAY_SHORT_DTCMG + paygrades = list(PAY_SHORT_DTCMG = JOB_PLAYTIME_TIER_0) assignment = JOB_DUTCH_MINIGUNNER flags = EQUIPMENT_PRESET_EXTRA @@ -116,7 +116,7 @@ /datum/equipment_preset/dutch/flamer name = JOB_DUTCH_FLAMETHROWER - paygrade = PAY_SHORT_DTCF + paygrades = list(PAY_SHORT_DTCF = JOB_PLAYTIME_TIER_0) assignment = JOB_DUTCH_FLAMETHROWER flags = EQUIPMENT_PRESET_EXTRA @@ -150,7 +150,7 @@ /datum/equipment_preset/dutch/medic name = JOB_DUTCH_MEDIC - paygrade = PAY_SHORT_DTCM + paygrades = list(PAY_SHORT_DTCM = JOB_PLAYTIME_TIER_0) assignment = JOB_DUTCH_MEDIC flags = EQUIPMENT_PRESET_EXTRA @@ -193,7 +193,7 @@ /datum/equipment_preset/dutch/arnie name = "Dutch's Dozen - Arnold" - paygrade = PAY_SHORT_DTCA + paygrades = list(PAY_SHORT_DTCA = JOB_PLAYTIME_TIER_0) assignment = JOB_DUTCH_ARNOLD flags = EQUIPMENT_PRESET_EXTRA diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index f24f7f9a2029..f9b6970015c8 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -82,7 +82,7 @@ idtype = /obj/item/card/id/gold assignment = "Shrapnelsworn" rank = "Brother of the Order" - paygrade = "Ser" + paygrades = list("Ser" = JOB_PLAYTIME_TIER_0) role_comm_title = "OHEFA" skills = /datum/skills/specialist @@ -240,7 +240,7 @@ /datum/equipment_preset/fun/santa name = "Fun - Santa" - paygrade = PAY_SHORT_CDNM + paygrades = list(PAY_SHORT_CDNM = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/everything faction = FACTION_MARINE @@ -289,7 +289,7 @@ /datum/equipment_preset/upp/ivan name = "Fun - Ivan" flags = EQUIPMENT_PRESET_EXTRA - paygrade = PAY_SHORT_UE6 + paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/everything assignment = "UPP Armsmaster" rank = "UPP Armsmaster" @@ -339,7 +339,7 @@ /datum/equipment_preset/fun/van_bandolier name = "Fun - Big Game Hunter" - paygrade = PAY_SHORT_CCMO + paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) uses_special_name = TRUE flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/everything @@ -441,7 +441,7 @@ assignment = "Monkey Marine" rank = "Monkey Marine" - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/fun/monkey/marine/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -458,7 +458,7 @@ assignment = "Monkey Soldier" rank = "Monkey Soldier" - paygrade = PAY_SHORT_UE1 + paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/fun/monkey/soldier/get_random_name(mob/living/carbon/human/new_human) return new_human.gender == MALE ? pick(GLOB.first_names_male_upp) : pick(GLOB.first_names_female_upp) diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 4d7ef9bda559..063263748e02 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -60,7 +60,7 @@ /datum/equipment_preset/other/freelancer/standard name = "Freelancer (Standard)" - paygrade = PAY_SHORT_FL_S + paygrades = list(PAY_SHORT_FL_S = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/freelancer @@ -132,7 +132,7 @@ /datum/equipment_preset/other/freelancer/medic name = "Freelancer (Medic)" - paygrade = PAY_SHORT_FL_M + paygrades = list(PAY_SHORT_FL_M = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA assignment = "Freelancer Medic" skills = /datum/skills/freelancer/combat_medic @@ -203,7 +203,7 @@ /datum/equipment_preset/other/freelancer/leader name = "Freelancer (Leader)" - paygrade = PAY_SHORT_FL_WL + paygrades = list(PAY_SHORT_FL_WL = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA assignment = "Freelancer Warlord" languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN, LANGUAGE_CHINESE, LANGUAGE_JAPANESE) @@ -269,7 +269,7 @@ /datum/equipment_preset/other/elite_merc/standard name = "Elite Mercenary (Standard Miner)" - paygrade = PAY_SHORT_EFL_S + paygrades = list(PAY_SHORT_EFL_S = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA idtype = /obj/item/card/id/centcom @@ -306,7 +306,7 @@ /datum/equipment_preset/other/elite_merc/heavy name = "Elite Mercenary (Heavy)" - paygrade = PAY_SHORT_EFL_H + paygrades = list(PAY_SHORT_EFL_H = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA idtype = /obj/item/card/id/centcom @@ -346,7 +346,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/other/elite_merc/engineer name = "Elite Mercenary (Engineer)" - paygrade = PAY_SHORT_EFL_E + paygrades = list(PAY_SHORT_EFL_E = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA idtype = /obj/item/card/id/data @@ -400,7 +400,7 @@ /datum/equipment_preset/other/elite_merc/medic name = "Elite Mercenary (Medic)" - paygrade = PAY_SHORT_EFL_M + paygrades = list(PAY_SHORT_EFL_M = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA idtype = /obj/item/card/id/centcom @@ -446,7 +446,7 @@ /datum/equipment_preset/other/elite_merc/leader name = "Elite Mercenary (Leader)" - paygrade = PAY_SHORT_EFL_TL + paygrades = list(PAY_SHORT_EFL_TL = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_EXTRA idtype = /obj/item/card/id/centcom @@ -827,12 +827,13 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "DUMMY" rank = "DUMMY" + paygrades = list(PAY_SHORT_CCMO) idtype = /obj/item/card/id/dogtag uses_special_name = TRUE /datum/equipment_preset/other/professor_dummy/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) - new_human.real_name = "Professor DUMMY the Medical Mannequin" + new_human.real_name = "Alex the Medical Mannequin" new_human.name = new_human.real_name new_human.age = rand(1,5) var/datum/preferences/A = new @@ -860,7 +861,7 @@ idtype = /obj/item/card/id/dogtag assignment = JOB_TANK_CREW rank = JOB_TANK_CREW - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "CRMN" minimum_age = 30 skills = /datum/skills/tank_crew @@ -900,7 +901,7 @@ idtype = /obj/item/card/id/dogtag assignment = "Crewman Trainee" rank = "Crewman Trainee" - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "CRTR" minimum_age = 25 skills = /datum/skills/tank_crew @@ -954,7 +955,7 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_SQUAD_MARINE rank = JOB_SQUAD_MARINE - paygrade = "ME2" + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0) role_comm_title = "RFN" skills = /datum/skills/pfc/crafty minimap_icon = "private" diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index dcce31397ea9..3aa02f026f29 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -61,7 +61,7 @@ assignment = JOB_PMC_STANDARD rank = JOB_PMC_STANDARD - paygrade = PAY_SHORT_PMC_OP + paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc /datum/equipment_preset/pmc/pmc_standard/load_gear(mob/living/carbon/human/new_human) @@ -203,7 +203,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_DETAINER rank = JOB_PMC_DETAINER - paygrade = PAY_SHORT_PMC_EN + paygrades = list(PAY_SHORT_PMC_EN = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc /datum/equipment_preset/pmc/pmc_detainer/load_gear(mob/living/carbon/human/new_human) @@ -332,7 +332,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_MEDIC rank = JOB_PMC_MEDIC - paygrade = PAY_SHORT_PMC_MS + paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/medic headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -507,7 +507,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_INVESTIGATOR rank = JOB_PMC_INVESTIGATOR - paygrade = PAY_SHORT_PMC_MS //Fixed from PMC2 to PMC-MS to display properly. + paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/medic/chem headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -686,7 +686,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_LEADER rank = JOB_PMC_LEADER - paygrade = PAY_SHORT_PMC_TL + paygrades = list(PAY_SHORT_PMC_TL = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" skills = /datum/skills/pmc/SL headset_type = /obj/item/device/radio/headset/distress/pmc/command @@ -842,7 +842,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_LEAD_INVEST rank = JOB_PMC_LEAD_INVEST - paygrade = PAY_SHORT_PMC_TL + paygrades = list(PAY_SHORT_PMC_TL = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" skills = /datum/skills/pmc/SL/chem headset_type = /obj/item/device/radio/headset/distress/pmc/command @@ -985,7 +985,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_GUNNER rank = JOB_PMC_GUNNER - paygrade = PAY_SHORT_PMC_SS + paygrades = list(PAY_SHORT_PMC_SS = JOB_PLAYTIME_TIER_0) role_comm_title = "SG" skills = /datum/skills/pmc/smartgunner @@ -1090,7 +1090,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_SNIPER rank = JOB_PMC_SNIPER - paygrade = PAY_SHORT_PMC_WS + paygrades = list(PAY_SHORT_PMC_WS = JOB_PLAYTIME_TIER_0) role_comm_title = "Spc" skills = /datum/skills/pmc/specialist headset_type = /obj/item/device/radio/headset/distress/pmc/cct @@ -1212,7 +1212,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_CREWMAN rank = JOB_PMC_CREWMAN - paygrade = PAY_SHORT_PMC_VS + paygrades = list(PAY_SHORT_PMC_VS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/tank_crew headset_type = /obj/item/device/radio/headset/distress/pmc/cct @@ -1340,7 +1340,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_XENO_HANDLER rank = JOB_PMC_XENO_HANDLER - paygrade = PAY_SHORT_PMC_XS + paygrades = list(PAY_SHORT_PMC_XS = JOB_PLAYTIME_TIER_0) role_comm_title = "XH" skills = /datum/skills/pmc/xeno_handler languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_XENOMORPH) @@ -1486,7 +1486,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_DOCTOR rank = JOB_PMC_DOCTOR - paygrade = PAY_SHORT_PMC_DOC + paygrades = list(PAY_SHORT_PMC_DOC = JOB_PLAYTIME_TIER_0) role_comm_title = "SGN" skills = /datum/skills/pmc/doctor headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -1660,7 +1660,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_ENGINEER rank = JOB_PMC_ENGINEER - paygrade = PAY_SHORT_PMC_TEC + paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0) role_comm_title = "TEC" skills = /datum/skills/pmc/engineer headset_type = /obj/item/device/radio/headset/distress/pmc/cct @@ -1809,7 +1809,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_DIRECTOR rank = JOB_PMC_DIRECTOR - paygrade = PAY_SHORT_PMC_DIR + paygrades = list(PAY_SHORT_PMC_DIR = JOB_PLAYTIME_TIER_0) role_comm_title = "DIR" skills = /datum/skills/pmc/director headset_type = /obj/item/device/radio/headset/distress/pmc/command/director @@ -1839,18 +1839,18 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), //*****************************************************************************************************/ /datum/equipment_preset/pmc/synth - name = "Weyland-Yutani PMC (Support Synthetic)" - flags = EQUIPMENT_PRESET_EXTRA - - languages = ALL_SYNTH_LANGUAGES - - skills = /datum/skills/synthetic - idtype = /obj/item/card/id/pmc - assignment = JOB_PMC_SYNTH - rank = JOB_PMC_SYNTH - paygrade = PAY_SHORT_SYN - role_comm_title = "WY Syn" - headset_type = /obj/item/device/radio/headset/distress/pmc/command + name = "Weyland-Yutani PMC (Support Synthetic)" + flags = EQUIPMENT_PRESET_EXTRA + + languages = ALL_SYNTH_LANGUAGES + + skills = /datum/skills/synthetic + idtype = /obj/item/card/id/pmc + assignment = JOB_PMC_SYNTH + rank = JOB_PMC_SYNTH + paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) + role_comm_title = "WY Syn" + headset_type = /obj/item/device/radio/headset/distress/pmc/command /datum/equipment_preset/pmc/synth/load_name(mob/living/carbon/human/new_human, randomise) diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index aa33eac97733..2e218e5292a6 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -59,7 +59,7 @@ /datum/equipment_preset/twe/royal_marine/standard name = "TWE Royal Marine Commando (Rifleman)" - paygrade = PAY_SHORT_RMC1 + paygrades = list(PAY_SHORT_RMC1 = JOB_PLAYTIME_TIER_0) role_comm_title = "RMC" flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Rifleman" @@ -110,7 +110,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/twe/royal_marine/spec - paygrade = PAY_SHORT_RMC2 + paygrades = list(PAY_SHORT_RMC2 = JOB_PLAYTIME_TIER_0) role_comm_title = "RMC SPC" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/rmc/specialist @@ -243,7 +243,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/twe/royal_marine/team_leader name = "TWE Royal Marine Commando (Teamleader)" - paygrade = PAY_SHORT_RMC4 + paygrades = list(PAY_SHORT_RMC4 = JOB_PLAYTIME_TIER_0) role_comm_title = "RMC TL" flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Team Leader" @@ -292,7 +292,7 @@ /datum/equipment_preset/twe/royal_marine/lieuteant //they better say it Lef-tenant or they should be banned for LRP. More importantly this guy doesn't spawn in the ERT name = "TWE Royal Marine Commando (Officer)" - paygrade = PAY_SHORT_RNO1 + paygrades = list(PAY_SHORT_RNO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "RMC LT" flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Team Commander" diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm index c09e6eee9385..27d39348e7d0 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm @@ -14,7 +14,7 @@ /datum/equipment_preset/survivor/cmb/standard name = "Survivor - Colonial Marshal Deputy(Riot Response)" - paygrade = PAY_SHORT_CMBD + paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) role_comm_title = "CMB DEP" flags = EQUIPMENT_PRESET_EXTRA assignment = "CMB Deputy" @@ -89,7 +89,7 @@ /datum/equipment_preset/synth/survivor/cmb/synth name = "Survivor - Synthetic - CMB Investigative Synthetic(Riot Response)" - paygrade = PAY_SHORT_CMBS + paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/deputy role_comm_title = "CMB Syn" flags = EQUIPMENT_PRESET_EXTRA @@ -150,7 +150,7 @@ /datum/equipment_preset/survivor/cmb/ua name = "Survivor - United Americas Riot Officer(Riot Response)" - paygrade = PAY_SHORT_CPO + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) role_comm_title = "UA RCP" flags = EQUIPMENT_PRESET_EXTRA assignment = "United Americas Police Officer" @@ -229,7 +229,7 @@ // ua synth /datum/equipment_preset/synth/survivor/cmb/ua_synth name = "Survivor - Synthetic - UA Police Synthetic(Riot Response)" - paygrade = PAY_SHORT_CMBS + paygrades = list(PAY_SHORT_CMBS = JOB_PLAYTIME_TIER_0) role_comm_title = "UA Syn" flags = EQUIPMENT_PRESET_EXTRA assignment = "UA Police Synthetic" diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm index 4e9ab770fb2f..c27fa213592f 100644 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm @@ -1,7 +1,7 @@ ///*****************************LV-522 Force Recon Survivors*******************************************************/ //Nanu told me to put them here so they dont clutter up survivors.dm /datum/equipment_preset/survivor/forecon - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "FORECON" rank = JOB_SURVIVOR @@ -214,7 +214,7 @@ name = "Survivor - USCM Reconnaissance Squad Leader" assignment = JOB_FORECON_SL skills = /datum/skills/military/survivor/forecon_squad_leader - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -244,7 +244,7 @@ name = "Survivor - USCM Reconnaissance Major" assignment = JOB_FORECON_CO skills = /datum/skills/commander - paygrade = PAY_SHORT_MO4 + paygrades = list(PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/gold role_comm_title = "FORECON CO" diff --git a/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm index 2c8ec04594ad..395d51f6e77d 100644 --- a/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm +++ b/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm @@ -4,7 +4,7 @@ /datum/equipment_preset/survivor/wy/executive name = "Survivor - LV-624 Paranoid Corporate Liaison" flags = EQUIPMENT_PRESET_START_OF_ROUND - paygrade = PAY_SHORT_WYC5 + paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/manager assignment = "LV-624 Corporate Liaison" idtype = /obj/item/card/id/silver/clearance_badge/cl diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 329bac97a89f..f0cf368d4936 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -171,7 +171,7 @@ Everything below isn't used or out of place. name = "Survivor - Corporate Security Goon" flags = EQUIPMENT_PRESET_START_OF_ROUND assignment = JOB_WY_GOON - paygrade = PAY_SHORT_CPO + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver/cl skills = /datum/skills/civilian/survivor/goon languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) @@ -250,7 +250,7 @@ Everything below isn't used or out of place. name = "Survivor - USASF Commander" assignment = "USASF Commander" skills = /datum/skills/commander - paygrade = PAY_SHORT_NO5 + paygrades = list(PAY_SHORT_NO5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/gold role_comm_title = "USASF CDR" flags = EQUIPMENT_PRESET_START_OF_ROUND diff --git a/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm b/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm index 9f1e2c705efb..16092ad51130 100644 --- a/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm +++ b/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm @@ -4,7 +4,7 @@ /datum/equipment_preset/survivor/wy/asstmanager name = "Survivor - Corporate Assistant Manager" flags = EQUIPMENT_PRESET_EXTRA - paygrade = PAY_SHORT_WYC7 + paygrades = list(PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/manager assignment = "Assistant Operations Manager" idtype = /obj/item/card/id/silver/clearance_badge/manager diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm index 124bf2772be5..de117b9a5a56 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -7,7 +7,7 @@ assignment = "Weyland-Yutani PMC" faction = FACTION_SURVIVOR faction_group = list(FACTION_WY, FACTION_SURVIVOR) - paygrade = PAY_SHORT_PMC_OP + paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/pmc skills = /datum/skills/civilian/survivor/pmc languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) @@ -45,7 +45,7 @@ /datum/equipment_preset/survivor/pmc/medic name = "Survivor - PMC Medic" assignment = JOB_PMC_MEDIC - paygrade = PAY_SHORT_PMC_MS + paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/pmc/medic /datum/equipment_preset/survivor/pmc/medic/load_gear(mob/living/carbon/human/new_human) @@ -64,7 +64,7 @@ /datum/equipment_preset/survivor/pmc/engineer name = "Survivor - PMC Engineer" assignment = JOB_PMC_ENGINEER - paygrade = PAY_SHORT_PMC_TEC + paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/pmc/engineer /datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human) @@ -80,7 +80,7 @@ /datum/equipment_preset/survivor/wy/manager name = "Survivor - Corporate Supervisor" flags = EQUIPMENT_PRESET_EXTRA - paygrade = PAY_SHORT_WYC6 + paygrades = list(PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/manager assignment = "Colony Supervisor" role_comm_title = "Supervisor" diff --git a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm index 35e52731fc9d..65cf3e7f0132 100644 --- a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm +++ b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm @@ -81,7 +81,7 @@ /datum/equipment_preset/survivor/uscm/solaris name = "Survivor - Solaris United States Colonial Marine Corps Recruiter" assignment = "USCM Recruiter" - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/survivor/uscm/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index 71a2aaa94b7f..65e5a8f4c123 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -5,7 +5,7 @@ skills = /datum/skills/civilian/survivor languages = list(LANGUAGE_ENGLISH) - paygrade = PAY_SHORT_CIV + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/lanyard faction = FACTION_SURVIVOR faction_group = list(FACTION_SURVIVOR) @@ -187,7 +187,7 @@ Standart Survivors : /datum/equipment_preset/survivor/scientist, /datum/equipment_preset/survivor/colonial_marshal name = "Survivor - Colonial Marshal Deputy" assignment = "CMB Deputy" - paygrade = PAY_SHORT_CMBD + paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/marshal flags = EQUIPMENT_PRESET_START_OF_ROUND idtype = /obj/item/card/id/deputy @@ -288,7 +288,7 @@ Everything bellow is a parent used as a base for one or multiple maps. assignment = "Corporate Liaison" skills = /datum/skills/civilian/survivor flags = EQUIPMENT_PRESET_START_OF_ROUND - paygrade = PAY_SHORT_WYC2 + paygrades = list(PAY_SHORT_WYC2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_2, PAY_SHORT_WYC4 = JOB_PLAYTIME_TIER_3, PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_4) faction_group = FACTION_LIST_SURVIVOR_WY idtype = /obj/item/card/id/silver/clearance_badge/cl access = list( @@ -314,20 +314,6 @@ Everything bellow is a parent used as a base for one or multiple maps. add_ice_colony_survivor_equipment(new_human) ..() -/datum/equipment_preset/survivor/corporate/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - var/playtime = get_job_playtime(new_human.client, JOB_CORPORATE_LIAISON) - if(new_human.client.prefs.playtime_perks) - if(playtime > JOB_PLAYTIME_TIER_4) - return PAY_SHORT_WYC5 - else if(playtime > JOB_PLAYTIME_TIER_3) - return PAY_SHORT_WYC4 - else if(playtime > JOB_PLAYTIME_TIER_2) - return PAY_SHORT_WYC3 - else - return paygrade - return paygrade - // ---- Trucker Survivor // Used in Kutjevo Refinery, LV-624, New Varadero, Solaris Ridge and Trijent Dam. @@ -408,7 +394,7 @@ Everything bellow is a parent used as a base for one or multiple maps. assignment = "Interstellar Commerce Commission Corporate Liaison" skills = /datum/skills/civilian/survivor flags = EQUIPMENT_PRESET_START_OF_ROUND - paygrade = PAY_SHORT_ICCL + paygrades = list(PAY_SHORT_ICCL = JOB_PLAYTIME_TIER_0) faction_group = FACTION_LIST_SURVIVOR_WY idtype = /obj/item/card/id/silver/cl role_comm_title = "ICC Rep." @@ -442,7 +428,7 @@ Everything bellow is a parent used as a base for one or multiple maps. assignment = "USCM Survivor" skills = /datum/skills/civilian/survivor/marshal idtype = /obj/item/card/id/dogtag - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) diff --git a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm index cfb3dee1dc47..25136c172b6d 100644 --- a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm +++ b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm @@ -2,7 +2,7 @@ //crashlanding-upp-bar.dmm map. /datum/equipment_preset/survivor/upp name = "Survivor - UPP" - paygrade = PAY_SHORT_UE1 + paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0) origin_override = ORIGIN_UPP rank = JOB_SURVIVOR skills = /datum/skills/military/survivor/upp_private @@ -40,7 +40,7 @@ //crashlanding-upp-bar.dmm /datum/equipment_preset/survivor/upp/soldier name = "Survivor - UPP Soldier" - paygrade = PAY_SHORT_UE2 + paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_1) assignment = JOB_UPP rank = JOB_UPP skills = /datum/skills/military/survivor/upp_private @@ -62,17 +62,11 @@ ..() -/datum/equipment_preset/survivor/upp/soldier/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_UE1 - return paygrade - // /obj/effect/landmark/survivor_spawner/upp_sapper //crashlanding-upp-bar.dmm /datum/equipment_preset/survivor/upp/sapper name = "Survivor - UPP Sapper" - paygrade = PAY_SHORT_UE3 + paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) assignment = JOB_UPP_ENGI rank = JOB_UPP_ENGI skills = /datum/skills/military/survivor/upp_sapper @@ -100,7 +94,7 @@ //crashlanding-upp-bar.dmm /datum/equipment_preset/survivor/upp/medic name = "Survivor - UPP Medic" - paygrade = PAY_SHORT_UE3 + paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) assignment = JOB_UPP_MEDIC rank = JOB_UPP_MEDIC skills = /datum/skills/military/survivor/upp_medic @@ -132,7 +126,7 @@ name = "Survivor - UPP Specialist" assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST - paygrade = PAY_SHORT_UE4 + paygrades = list(PAY_SHORT_UE4 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/military/survivor/upp_spec /datum/equipment_preset/survivor/upp/specialist/load_gear(mob/living/carbon/human/new_human) @@ -151,7 +145,7 @@ // /obj/effect/landmark/survivor_spawner/squad_leader /datum/equipment_preset/survivor/upp/squad_leader name = "Survivor - UPP Squad Leader" - paygrade = PAY_SHORT_UE5 + paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) assignment = JOB_UPP_LEADER rank = JOB_UPP_LEADER languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_GERMAN, LANGUAGE_CHINESE) @@ -179,7 +173,7 @@ faction = FACTION_UPP faction_group = list(FACTION_UPP, FACTION_SURVIVOR) skills = /datum/skills/colonial_synthetic - paygrade = PAY_SHORT_SYN + paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "173/RECON Syn" diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 2fde67e931b9..d7c531332c9a 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -3,7 +3,7 @@ uses_special_name = TRUE languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/synthetic - paygrade = PAY_SHORT_SYN + paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) minimap_icon = "synth" @@ -41,7 +41,6 @@ idtype = /obj/item/card/id/gold assignment = JOB_SYNTH rank = "Synthetic" - paygrade = PAY_SHORT_SYN role_comm_title = "Syn" /datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human) @@ -65,7 +64,6 @@ idtype = /obj/item/card/id/gold assignment = JOB_SYNTH rank = "Synthetic" - paygrade = PAY_SHORT_SYN role_comm_title = "Syn" /datum/equipment_preset/synth/uscm/councillor/load_gear(mob/living/carbon/human/new_human) @@ -760,7 +758,7 @@ rank = JOB_COLONIST skills = /datum/skills/infiltrator_synthetic idtype = /obj/item/card/id/lanyard - paygrade = PAY_SHORT_CIV + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/synth/infiltrator/New() . = ..() diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 417a893ffdee..ad7b1523d279 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -64,7 +64,7 @@ assignment = JOB_UPP rank = JOB_UPP role_comm_title = "Sol" - paygrade = PAY_SHORT_UE2 + paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_1) /datum/equipment_preset/upp/soldier/load_gear(mob/living/carbon/human/new_human) //face @@ -87,12 +87,6 @@ load_upp_soldier(new_human, UPP) -/datum/equipment_preset/upp/soldier/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_UE1 - return paygrade - /datum/equipment_preset/upp/soldier/proc/load_upp_soldier(mob/living/carbon/human/new_human, obj/item/clothing/under/marine/veteran/UPP/UPP) var/percentage = rand(1, 100) switch(percentage) @@ -237,7 +231,7 @@ assignment = JOB_UPP_MEDIC rank = JOB_UPP_MEDIC role_comm_title = "Med" - paygrade = PAY_SHORT_UE3 + paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/medic/load_gear(mob/living/carbon/human/new_human) //back @@ -408,7 +402,7 @@ assignment = JOB_UPP_ENGI rank = JOB_UPP_ENGI role_comm_title = "Sap" - paygrade = PAY_SHORT_UE3 + paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/sapper/load_gear(mob/living/carbon/human/new_human) //Sappers should have lots of gear and whatnot that helps them attack or siege marines @@ -544,7 +538,7 @@ assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST role_comm_title = "Spc" - paygrade = PAY_SHORT_UE5 + paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/specialist/load_gear(mob/living/carbon/human/new_human) //back @@ -673,7 +667,7 @@ assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST role_comm_title = "Spc" - paygrade = PAY_SHORT_UE5 + paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/machinegunner/load_gear(mob/living/carbon/human/new_human) //back @@ -800,7 +794,7 @@ assignment = JOB_UPP_LEADER rank = JOB_UPP_LEADER role_comm_title = "SL" - paygrade = PAY_SHORT_UE6 + paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/new_human) var/UPPleadsidearm = rand(1,4) @@ -970,7 +964,7 @@ assignment = JOB_UPP_POLICE rank = JOB_UPP_POLICE role_comm_title = "MP" - paygrade = PAY_SHORT_UE6 + paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/military_police/load_gear(mob/living/carbon/human/new_human) //back @@ -1124,7 +1118,7 @@ assignment = JOB_UPP_LT_OFFICER rank = JOB_UPP_LT_OFFICER role_comm_title = "Lt." - paygrade = PAY_SHORT_UO1 + paygrades = list(PAY_SHORT_UO1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/officer/load_gear(mob/living/carbon/human/new_human) //back @@ -1283,7 +1277,7 @@ assignment = JOB_UPP_SRLT_OFFICER rank = JOB_UPP_SRLT_OFFICER role_comm_title = "Sr-Lt." - paygrade = PAY_SHORT_UO2 + paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/officer/senior/load_gear(mob/living/carbon/human/new_human) //back @@ -1442,7 +1436,7 @@ assignment = JOB_UPP_KPT_OFFICER rank = JOB_UPP_KPT_OFFICER role_comm_title = "May." - paygrade = PAY_SHORT_UO3 + paygrades = list(PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/kapitan /datum/equipment_preset/upp/officer/kapitan/load_gear(mob/living/carbon/human/new_human) @@ -1602,7 +1596,7 @@ assignment = JOB_UPP_MAY_OFFICER rank = JOB_UPP_MAY_OFFICER role_comm_title = "May." - paygrade = PAY_SHORT_UO4 + paygrades = list(PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander /datum/equipment_preset/upp/officer/major/load_gear(mob/living/carbon/human/new_human) @@ -1762,7 +1756,7 @@ assignment = JOB_UPP_LTKOL_OFFICER rank = JOB_UPP_LTKOL_OFFICER role_comm_title = "Lt. Kol." - paygrade = PAY_SHORT_UO5 + paygrades = list(PAY_SHORT_UO5 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander /datum/equipment_preset/upp/officer/lt_kolonel/load_gear(mob/living/carbon/human/new_human) @@ -1922,7 +1916,7 @@ assignment = JOB_UPP_KOL_OFFICER rank = JOB_UPP_KOL_OFFICER role_comm_title = "Kol." - paygrade = PAY_SHORT_UO6 + paygrades = list(PAY_SHORT_UO6 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander /datum/equipment_preset/upp/officer/kolonel/load_gear(mob/living/carbon/human/new_human) @@ -2082,7 +2076,7 @@ assignment = JOB_UPP_KOL_OFFICER rank = JOB_UPP_KOL_OFFICER role_comm_title = "May. Gen." - paygrade = PAY_SHORT_UO7 + paygrades = list(PAY_SHORT_UO7 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander /datum/equipment_preset/upp/officer/may_gen/load_gear(mob/living/carbon/human/new_human) @@ -2242,7 +2236,7 @@ assignment = JOB_UPP_KOL_OFFICER rank = JOB_UPP_KOL_OFFICER role_comm_title = "Lt. Gen." - paygrade = PAY_SHORT_UO8 + paygrades = list(PAY_SHORT_UO8 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander /datum/equipment_preset/upp/officer/ley_gen/load_gear(mob/living/carbon/human/new_human) @@ -2402,7 +2396,7 @@ assignment = JOB_UPP_KOL_OFFICER rank = JOB_UPP_KOL_OFFICER role_comm_title = "Gen." - paygrade = PAY_SHORT_UO9 + paygrades = list(PAY_SHORT_UO9 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander /datum/equipment_preset/upp/officer/gen/load_gear(mob/living/carbon/human/new_human) @@ -2602,7 +2596,7 @@ skills = /datum/skills/synthetic assignment = JOB_UPP_SUPPORT_SYNTH rank = JOB_UPP_SUPPORT_SYNTH - paygrade = PAY_SHORT_SYN + paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag /datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/new_human, randomise) @@ -2873,7 +2867,7 @@ assignment = JOB_UPP_CONSCRIPT rank = JOB_UPP_CONSCRIPT role_comm_title = "Cons" - paygrade = PAY_SHORT_UE1 + paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/conscript/load_gear(mob/living/carbon/human/new_human) //back @@ -2982,7 +2976,7 @@ assignment = JOB_UPP_COMMANDO rank = JOB_UPP_COMMANDO role_comm_title = "JKdo" - paygrade = PAY_SHORT_UC1 + paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/data languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_TSL, LANGUAGE_SPANISH, LANGUAGE_CHINESE) @@ -3109,7 +3103,7 @@ assignment = JOB_UPP_COMMANDO_MEDIC rank = JOB_UPP_COMMANDO_MEDIC role_comm_title = "2ndKdo" - paygrade = PAY_SHORT_UC2 + paygrades = list(PAY_SHORT_UC2 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/commando/medic/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo/medic, WEAR_L_EAR) @@ -3276,7 +3270,7 @@ assignment = JOB_UPP_COMMANDO_LEADER rank = JOB_UPP_COMMANDO_LEADER role_comm_title = "1stKdo" - paygrade = PAY_SHORT_UC3 + paygrades = list(PAY_SHORT_UC3 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver /datum/equipment_preset/upp/commando/leader/load_gear(mob/living/carbon/human/new_human) @@ -3530,7 +3524,7 @@ assignment = JOB_UPP_CREWMAN rank = JOB_UPP_CREWMAN - paygrade = PAY_SHORT_UE5 + paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) role_comm_title = "TANK" minimum_age = 30 skills = /datum/skills/tank_crew @@ -3650,7 +3644,7 @@ assignment = JOB_UPP_LT_DOKTOR rank = JOB_UPP_LT_DOKTOR role_comm_title = "Lt. Med." - paygrade = PAY_SHORT_UO1 + paygrades = list(PAY_SHORT_UO1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/doctor/load_gear(mob/living/carbon/human/new_human) //back diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 4b018eea1d50..0450e74353ef 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -67,7 +67,7 @@ access = list(ACCESS_MARINE_PREP) assignment = JOB_SQUAD_MARINE rank = JOB_SQUAD_MARINE - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) role_comm_title = "RFN" skills = /datum/skills/pfc @@ -82,12 +82,6 @@ new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) -/datum/equipment_preset/uscm/pfc/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_ME1 - return paygrade - /datum/equipment_preset/uscm/pfc/cryo name = "USCM Cryo Squad Rifleman" auto_squad_name = SQUAD_MARINE_CRYO @@ -105,7 +99,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) assignment = JOB_SQUAD_SMARTGUN rank = JOB_SQUAD_SMARTGUN - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_3) role_comm_title = "SG" skills = /datum/skills/smartgunner @@ -163,7 +157,7 @@ ) assignment = JOB_TANK_CREW rank = JOB_TANK_CREW - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "CRMN" minimum_age = 30 skills = /datum/skills/tank_crew @@ -224,7 +218,7 @@ ) assignment = JOB_INTEL rank = JOB_INTEL - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "IO" skills = /datum/skills/intel @@ -281,7 +275,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) assignment = JOB_SQUAD_SPECIALIST rank = JOB_SQUAD_SPECIALIST - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_3) role_comm_title = "Spc" skills = /datum/skills/specialist @@ -340,7 +334,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = JOB_SQUAD_MEDIC rank = JOB_SQUAD_MEDIC - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_3) role_comm_title = "HM" skills = /datum/skills/combat_medic @@ -374,7 +368,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) assignment = JOB_SQUAD_TEAM_LEADER rank = JOB_SQUAD_TEAM_LEADER - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_3) role_comm_title = "FTL" skills = /datum/skills/tl @@ -404,7 +398,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) assignment = JOB_SQUAD_ENGI rank = JOB_SQUAD_ENGI - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_3) role_comm_title = "ComTech" skills = /datum/skills/combat_engineer @@ -438,7 +432,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) role_comm_title = "SL" minimum_age = 27 skills = /datum/skills/SL @@ -471,7 +465,7 @@ access = list(ACCESS_MARINE_PREP) assignment = JOB_SQUAD_MARINE rank = JOB_SQUAD_MARINE - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) role_comm_title = "RFN" skills = /datum/skills/pfc/crafty @@ -482,12 +476,6 @@ /datum/equipment_preset/uscm/private_equipped/load_status(mob/living/carbon/human/new_human) new_human.nutrition = NUTRITION_NORMAL -/datum/equipment_preset/uscm/private_equipped/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_ME1 - return paygrade - /datum/equipment_preset/uscm/private_equipped/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) @@ -521,7 +509,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) role_comm_title = "SL" minimum_age = 27 skills = /datum/skills/SL @@ -563,7 +551,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) assignment = JOB_SQUAD_SMARTGUN rank = JOB_SQUAD_SMARTGUN - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_3) role_comm_title = "SG" skills = /datum/skills/smartgunner @@ -602,7 +590,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) assignment = JOB_SQUAD_ENGI rank = JOB_SQUAD_ENGI - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_3) role_comm_title = "ComTech" skills = /datum/skills/combat_engineer @@ -650,7 +638,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = JOB_SQUAD_MEDIC rank = JOB_SQUAD_MEDIC - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_3) role_comm_title = "HM" skills = /datum/skills/combat_medic @@ -706,7 +694,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) assignment = JOB_SQUAD_SPECIALIST rank = JOB_SQUAD_SPECIALIST - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_3) role_comm_title = "Spc" skills = /datum/skills/specialist @@ -778,7 +766,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) assignment = JOB_SQUAD_TEAM_LEADER rank = JOB_SQUAD_TEAM_LEADER - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_3) role_comm_title = "TL" skills = /datum/skills/tl @@ -819,7 +807,7 @@ skills = /datum/skills/commando/deathsquad auto_squad_name = SQUAD_SOF ert_squad = TRUE - paygrade = PAY_SHORT_ME6 + paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) minimap_icon = "private" @@ -869,12 +857,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/socmed/full, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/full, WEAR_R_STORE) -/datum/equipment_preset/uscm/marsoc/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_2) - return PAY_SHORT_ME7 - return paygrade - //Covert Raiders /datum/equipment_preset/uscm/marsoc/covert name = "Marine Raider (!DEATHSQUAD! Covert)" @@ -883,6 +865,7 @@ new_human.gender = MALE new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") new_human.age = rand(20,30) + /datum/equipment_preset/uscm/marsoc/covert/load_rank(mob/living/carbon/human/new_human) return PAY_SHORT_CDNM @@ -892,7 +875,7 @@ assignment = JOB_MARINE_RAIDER_SL rank = JOB_MARINE_RAIDER_SL role_comm_title = "TL." - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/commando/deathsquad/leader minimap_icon = "leader" @@ -900,11 +883,6 @@ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) -/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_2) - return PAY_SHORT_MO2 - return paygrade //Codenamed Team Leader /datum/equipment_preset/uscm/marsoc/sl/covert @@ -914,26 +892,22 @@ new_human.gender = MALE new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") new_human.age = rand(20,30) + /datum/equipment_preset/uscm/marsoc/sl/covert/load_rank(mob/living/carbon/human/new_human) return PAY_SHORT_CDNM + //Officer /datum/equipment_preset/uscm/marsoc/cmd name = "Marine Raider Officer (!DEATHSQUAD!)" assignment = JOB_MARINE_RAIDER_CMD rank = JOB_MARINE_RAIDER_CMD role_comm_title = "CMD." - paygrade = PAY_SHORT_MO3 + paygrades = list(PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/commando/deathsquad/officer dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) -/datum/equipment_preset/uscm/marsoc/cmd/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_3) - return PAY_SHORT_MO4 - return paygrade - /datum/equipment_preset/uscm/marsoc/low_threat name = "Marine Raider" @@ -981,16 +955,10 @@ assignment = JOB_MARINE_RAIDER_SL rank = JOB_MARINE_RAIDER_SL role_comm_title = "TL." - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/commando/deathsquad/leader minimap_icon = "leader" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) - -/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_2) - return PAY_SHORT_MO2 - return paygrade diff --git a/code/modules/gear_presets/uscm_dress.dm b/code/modules/gear_presets/uscm_dress.dm index 080ed18d7c40..0185b11816e5 100644 --- a/code/modules/gear_presets/uscm_dress.dm +++ b/code/modules/gear_presets/uscm_dress.dm @@ -5,7 +5,7 @@ rank = JOB_MARINE access = list(ACCESS_MARINE_PREP) minimum_age = 18 - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) role_comm_title = "Mar" skills = /datum/skills/pfc @@ -25,13 +25,13 @@ /datum/equipment_preset/uscm_event/dress/lcpl name = "Dress Blues - (E-3) Lance Corporal" - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) //NCOs/SNCOs// /datum/equipment_preset/uscm_event/dress/nco name = "Dress Blues - (E-4) Corporal" - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/SL dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) @@ -44,11 +44,11 @@ /datum/equipment_preset/uscm_event/dress/nco/sgt name = "Dress Blues - (E-5) Sergeant" - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/dress/nco/snco name = "Dress Blues - (E-6) Staff Sergeant" - paygrade = PAY_SHORT_ME6 + paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/SEA access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP) @@ -58,29 +58,29 @@ /datum/equipment_preset/uscm_event/dress/nco/snco/gysgt name = "Dress Blues - (E-7) Gunnery Sergeant" - paygrade = PAY_SHORT_ME7 + paygrades = list(PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/dress/nco/snco/msgt name = "Dress Blues - (E-8) Master Sergeant" - paygrade = PAY_SHORT_ME8 + paygrades = list(PAY_SHORT_ME8 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/dress/nco/snco/firstsgt name = "Dress Blues - (E-8E) First Sergeant" - paygrade = PAY_SHORT_ME8E + paygrades = list(PAY_SHORT_ME8E = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/dress/nco/snco/mgysgt name = "Dress Blues - (E-9) Master Gunnery Sergeant" - paygrade = PAY_SHORT_ME9 + paygrades = list(PAY_SHORT_ME9 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/dress/nco/snco/sgtmaj name = "Dress Blues - (E-9E) Sergeant Major" - paygrade = PAY_SHORT_ME9E + paygrades = list(PAY_SHORT_ME9E = JOB_PLAYTIME_TIER_0) //FIELD OFFICERS// /datum/equipment_preset/uscm_event/dress/officer name = "Dress Blues - (O-1) 2nd Lieutenant" - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver skills = /datum/skills/SO access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY) @@ -100,11 +100,11 @@ /datum/equipment_preset/uscm_event/dress/officer/firstlt name = "Dress Blues - (O-2) 1st Lieutenant" - paygrade = PAY_SHORT_MO2 + paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/dress/officer/capt name = "Dress Blues - (O-3) Captain" - paygrade = PAY_SHORT_MO3 + paygrades = list(PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/gold skills = /datum/skills/XO @@ -115,7 +115,7 @@ /datum/equipment_preset/uscm_event/dress/officer/co name = "Dress Blues - (O-4) Major" - paygrade = PAY_SHORT_MO4 + paygrades = list(PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/gold skills = /datum/skills/commander @@ -125,19 +125,19 @@ /datum/equipment_preset/uscm_event/dress/officer/co/ltcol name = "Dress Blues - (O-5) Lieutenant Colonel" - paygrade = PAY_SHORT_MO5 + paygrades = list(PAY_SHORT_MO5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/gold/council /datum/equipment_preset/uscm_event/dress/officer/co/col name = "Dress Blues - (O-6) Colonel" - paygrade = PAY_SHORT_MO6 + paygrades = list(PAY_SHORT_MO6 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/general //GENERAL OFFICERS// /datum/equipment_preset/uscm_event/dress/officer/general name = "Dress Blues - (O-8) Major General" - paygrade = PAY_SHORT_MO8 + paygrades = list(PAY_SHORT_MO8 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/general skills = /datum/skills/general @@ -155,8 +155,8 @@ /datum/equipment_preset/uscm_event/dress/officer/general/ltgen name = "Dress Blues - (O-9) Lieutenant General" - paygrade = PAY_SHORT_MO9 + paygrades = list(PAY_SHORT_MO9 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/dress/officer/general/gen name = "Dress Blues - (O-10) General" - paygrade = PAY_SHORT_MO10 + paygrades = list(PAY_SHORT_MO10 = JOB_PLAYTIME_TIER_0) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 1a03dc3f6b22..dbd8149c7866 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -16,7 +16,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_COLONEL rank = JOB_COLONEL - paygrade = PAY_SHORT_MO6 + paygrades = list(PAY_SHORT_MO6 = JOB_PLAYTIME_TIER_0) role_comm_title = "COL" minimum_age = 40 skills = /datum/skills/general @@ -61,7 +61,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_GENERAL rank = JOB_GENERAL - paygrade = PAY_SHORT_MO7 + paygrades = list(PAY_SHORT_MO7 = JOB_PLAYTIME_TIER_0) role_comm_title = "GEN" minimum_age = 50 skills = /datum/skills/general @@ -106,26 +106,26 @@ /datum/equipment_preset/uscm_event/general/o8 name = "USCM O-8 - Major General (High Command)" - paygrade = PAY_SHORT_MO8 + paygrades = list(PAY_SHORT_MO8 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/general/o9 name = "USCM O-9 - Lieutenant General (High Command)" - paygrade = PAY_SHORT_MO9 + paygrades = list(PAY_SHORT_MO9 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/general/o10 name = "USCM O-10 - General (High Command)" - paygrade = PAY_SHORT_MO10 + paygrades = list(PAY_SHORT_MO10 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/uscm_event/general/o10c name = "USCM O-10C - Assistant Commandant of the Marine Corps (High Command)" - paygrade = PAY_SHORT_MO10C + paygrades = list(PAY_SHORT_MO10C = JOB_PLAYTIME_TIER_0) assignment = JOB_ACMC rank = JOB_ACMC role_comm_title = "ACMC" /datum/equipment_preset/uscm_event/general/o10s name = "USCM O-10S - Commandant of the Marine Corps (High Command)" - paygrade = PAY_SHORT_MO10S + paygrades = list(PAY_SHORT_MO10S = JOB_PLAYTIME_TIER_0) assignment = JOB_CMC rank = JOB_CMC role_comm_title = "CMC" @@ -145,7 +145,7 @@ ) assignment = JOB_ORDNANCE_TECH rank = "UPP" - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) role_comm_title = "OT" skills = /datum/skills/spy @@ -200,7 +200,7 @@ assignment = JOB_PROVOST_ENFORCER rank = "Provost Enforcer" - paygrade = PAY_SHORT_CPO + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) role_comm_title = "PvE" flags = EQUIPMENT_PRESET_EXTRA @@ -246,7 +246,7 @@ assignment = JOB_PROVOST_TML rank = "Provost Team Leader" - paygrade = PAY_SHORT_CSPO + paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) role_comm_title = "PvTML" flags = EQUIPMENT_PRESET_EXTRA @@ -292,7 +292,7 @@ assignment = JOB_PROVOST_INSPECTOR rank = "Provost Inspector" - paygrade = PAY_SHORT_PVI + paygrades = list(PAY_SHORT_PVI = JOB_PLAYTIME_TIER_0) role_comm_title = "PvI" flags = EQUIPMENT_PRESET_EXTRA @@ -332,7 +332,7 @@ assignment = JOB_PROVOST_ADVISOR rank = "Provost Advisor" - paygrade = PAY_SHORT_CSPO + paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) role_comm_title = "PvA" flags = EQUIPMENT_PRESET_EXTRA @@ -343,7 +343,7 @@ assignment = JOB_PROVOST_MARSHAL rank = "Provost Marshal" - paygrade = PAY_SHORT_PVM + paygrades = list(PAY_SHORT_PVM = JOB_PLAYTIME_TIER_0) role_comm_title = PAY_SHORT_PVM flags = EQUIPMENT_PRESET_EXTRA @@ -379,7 +379,7 @@ assignment = JOB_PROVOST_SMARSHAL rank = "Provost Sector Marshal" - paygrade = PAY_SHORT_PVSM + paygrades = list(PAY_SHORT_PVSM = JOB_PLAYTIME_TIER_0) role_comm_title = PAY_SHORT_PVSM /datum/equipment_preset/uscm_event/provost/marshal/chief @@ -388,7 +388,7 @@ assignment = JOB_PROVOST_CMARSHAL rank = "Provost Chief Marshal" - paygrade = PAY_SHORT_PVCM + paygrades = list(PAY_SHORT_PVCM = JOB_PLAYTIME_TIER_0) role_comm_title = PAY_SHORT_PVCM /*****************************************************************************************************/ @@ -410,7 +410,7 @@ assignment = JOB_TIS_IO rank = "UAAC-TIS Intelligence Officer" - paygrade = PAY_SHORT_NO2 + paygrades = list(PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_0) role_comm_title = "TIS-IO" flags = EQUIPMENT_PRESET_EXTRA @@ -437,7 +437,7 @@ assignment = JOB_TIS_SA rank = "UAAC-TIS Special Agent" - paygrade = PAY_SHORT_NO5 + paygrades = list(PAY_SHORT_NO5 = JOB_PLAYTIME_TIER_0) role_comm_title = "TIS-SA" flags = EQUIPMENT_PRESET_EXTRA diff --git a/code/modules/gear_presets/uscm_forecon.dm b/code/modules/gear_presets/uscm_forecon.dm index dfe4e7dd8d5c..65328e8513f5 100644 --- a/code/modules/gear_presets/uscm_forecon.dm +++ b/code/modules/gear_presets/uscm_forecon.dm @@ -1,7 +1,7 @@ /datum/equipment_preset/uscm/forecon assignment = JOB_SQUAD_MARINE rank = JOB_SQUAD_MARINE - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "FORECON" rank = JOB_MARINE @@ -227,7 +227,7 @@ rank = JOB_SQUAD_LEADER role_comm_title = "SL" skills = /datum/skills/military/survivor/forecon_squad_leader - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm index 75152268326c..6e727381b6ff 100644 --- a/code/modules/gear_presets/uscm_medical.dm +++ b/code/modules/gear_presets/uscm_medical.dm @@ -36,7 +36,7 @@ ) assignment = JOB_CMO rank = JOB_CMO - paygrade = PAY_SHORT_MO2 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_1) role_comm_title = "CMO" skills = /datum/skills/CMO @@ -66,7 +66,7 @@ assignment = JOB_DOCTOR rank = JOB_DOCTOR - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "Doc" skills = /datum/skills/doctor @@ -104,7 +104,7 @@ assignment = JOB_NURSE rank = JOB_NURSE - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_1) role_comm_title = "Nurse" skills = /datum/skills/nurse @@ -126,13 +126,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/armband/nurse(new_human), WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - -/datum/equipment_preset/uscm_ship/uscm_medical/nurse/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_ME3 - return paygrade - //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_medical/researcher name = "USCM Researcher" @@ -140,7 +133,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_RESEARCHER rank = JOB_RESEARCHER - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "Rsr" skills = /datum/skills/researcher diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 76df4d6de2be..dcb926e804d7 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -27,7 +27,7 @@ ) assignment = JOB_POLICE rank = JOB_POLICE - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_3) role_comm_title = "MP" skills = /datum/skills/MP @@ -59,11 +59,6 @@ new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) -/datum/equipment_preset/uscm_ship/uscm_police/mp/load_rank(mob/living/carbon/human/human) - if(human.client && get_job_playtime(human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_ME3 - return paygrade - //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/warden @@ -90,7 +85,7 @@ ) assignment = JOB_WARDEN rank = JOB_WARDEN - paygrade = PAY_SHORT_ME6 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) role_comm_title = "MW" skills = /datum/skills/MW @@ -151,7 +146,7 @@ ) assignment = JOB_CHIEF_POLICE rank = JOB_CHIEF_POLICE - paygrade = PAY_SHORT_MO2 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_1) role_comm_title = "CMP" skills = /datum/skills/CMP @@ -195,7 +190,7 @@ access = list() assignment = JOB_RIOT rank = JOB_RIOT - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) role_comm_title = "RMP" skills = /datum/skills/CMP @@ -243,6 +238,6 @@ assignment = JOB_RIOT_CHIEF rank = JOB_RIOT_CHIEF - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "CRMP" skills = /datum/skills/CMP diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 9c00599ec9cd..76b0ea2c9341 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -46,7 +46,7 @@ ) assignment = JOB_CORPORATE_LIAISON rank = JOB_CORPORATE_LIAISON - paygrade = PAY_SHORT_WYC2 + paygrades = list(PAY_SHORT_WYC2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_2, PAY_SHORT_WYC4 = JOB_PLAYTIME_TIER_3, PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_4) role_comm_title = "CL" skills = /datum/skills/civilian @@ -85,20 +85,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) -/datum/equipment_preset/uscm_ship/liaison/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - var/playtime = get_job_playtime(new_human.client, rank) - if(new_human.client.prefs.playtime_perks) - if(playtime > JOB_PLAYTIME_TIER_4) - return PAY_SHORT_WYC5 - else if(playtime > JOB_PLAYTIME_TIER_3) - return PAY_SHORT_WYC4 - else if(playtime > JOB_PLAYTIME_TIER_2) - return PAY_SHORT_WYC3 - else - return paygrade - return paygrade - //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/reporter @@ -120,7 +106,7 @@ ) assignment = JOB_COMBAT_REPORTER rank = JOB_COMBAT_REPORTER - paygrade = PAY_SHORT_CIV + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) role_comm_title = "PRESS" skills = /datum/skills/civilian idtype = /obj/item/card/id/silver/cl @@ -155,7 +141,7 @@ ) assignment = JOB_COMBAT_REPORTER rank = JOB_COMBAT_REPORTER - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "CC" skills = /datum/skills/pfc idtype = /obj/item/card/id/dogtag @@ -206,7 +192,7 @@ ) assignment = JOB_CHIEF_ENGINEER rank = JOB_CHIEF_ENGINEER - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_3) role_comm_title = "CE" minimum_age = 27 skills = /datum/skills/CE @@ -242,7 +228,7 @@ ) assignment = JOB_MAINT_TECH rank = JOB_MAINT_TECH - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) role_comm_title = "MT" skills = /datum/skills/MT @@ -262,12 +248,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) -/datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_ME1 - return paygrade - //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/ordn @@ -283,7 +263,7 @@ ) assignment = JOB_ORDNANCE_TECH rank = JOB_ORDNANCE_TECH - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) role_comm_title = "OT" skills = /datum/skills/OT @@ -327,7 +307,7 @@ ) assignment = JOB_CHIEF_REQUISITION rank = JOB_CHIEF_REQUISITION - paygrade = PAY_SHORT_ME7 + paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME8 = JOB_PLAYTIME_TIER_3) role_comm_title = "QM" minimum_age = 27 skills = /datum/skills/RO @@ -362,7 +342,7 @@ access = list(ACCESS_MARINE_CARGO) assignment = JOB_CARGO_TECH rank = JOB_CARGO_TECH - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) role_comm_title = "CT" skills = /datum/skills/CT @@ -387,12 +367,6 @@ new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) -/datum/equipment_preset/uscm_ship/cargo/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_ME1 - return paygrade - //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/commander @@ -402,7 +376,7 @@ idtype = /obj/item/card/id/gold assignment = JOB_CO rank = JOB_CO - paygrade = PAY_SHORT_MO4 + paygrades = list(PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_0) role_comm_title = "CO" minimum_age = 30 skills = /datum/skills/commander @@ -485,7 +459,7 @@ idtype = /obj/item/card/id/gold/council rank = JOB_CO - paygrade = PAY_SHORT_MO5 + paygrades = list(PAY_SHORT_MO5 = JOB_PLAYTIME_TIER_0) role_comm_title = "CO" minimum_age = 35 @@ -501,7 +475,7 @@ /datum/equipment_preset/uscm_ship/commander/council/plus name = "USCM Commanding Officer (CO++)" idtype = /obj/item/card/id/general - paygrade = PAY_SHORT_MO6 + paygrades = list(PAY_SHORT_MO6 = JOB_PLAYTIME_TIER_0) dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior, /obj/item/clothing/under/marine/dress/blues/general) /datum/equipment_preset/uscm_ship/commander/council/plus/load_gear(mob/living/carbon/human/new_human) @@ -517,7 +491,7 @@ idtype = /obj/item/card/id/silver assignment = JOB_XO rank = JOB_XO - paygrade = PAY_SHORT_MO3 + paygrades = list(PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_0) role_comm_title = "XO" minimum_age = 35 skills = /datum/skills/XO @@ -556,7 +530,7 @@ access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY) assignment = JOB_SO rank = JOB_SO - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "SO" minimum_age = 25 skills = /datum/skills/SO @@ -588,7 +562,7 @@ idtype = /obj/item/card/id/silver assignment = JOB_SEA rank = JOB_SEA - paygrade = PAY_SHORT_ME7 + paygrades = list(PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_0) role_comm_title = "SEA" minimum_age = 40 skills = /datum/skills/SEA @@ -619,11 +593,11 @@ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/device/whistle(new_human), WEAR_R_HAND) -/datum/equipment_preset/uscm_ship/sea/load_rank(mob/living/carbon/human/rankee) +/datum/equipment_preset/uscm_ship/sea/load_rank(mob/living/carbon/human/rankee, client/mob_client) if(rankee?.client?.prefs?.pref_special_job_options[rank]) - paygrade = get_paygrade_id_by_name(rankee.client.prefs.pref_special_job_options[rank]) - - return paygrade + var/paygrade_choice = get_paygrade_id_by_name(rankee.client.prefs.pref_special_job_options[rank]) + return paygrade_choice + ..() //*****************************************************************************************************/ @@ -634,7 +608,7 @@ idtype = /obj/item/card/id/silver assignment = JOB_AUXILIARY_OFFICER rank = JOB_AUXILIARY_OFFICER - paygrade = PAY_SHORT_MO2 + paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_3) role_comm_title = "ASO" minimum_age = 27 skills = /datum/skills/auxiliary_officer @@ -693,7 +667,7 @@ access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT) assignment = JOB_CAS_PILOT rank = JOB_CAS_PILOT - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "GP" skills = /datum/skills/pilot @@ -743,7 +717,7 @@ access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT) assignment = JOB_DROPSHIP_PILOT rank = JOB_DROPSHIP_PILOT - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "DP" skills = /datum/skills/pilot @@ -793,7 +767,7 @@ access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT) assignment = JOB_DROPSHIP_CREW_CHIEF rank = JOB_DROPSHIP_CREW_CHIEF - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_3) role_comm_title = "DCC" skills = /datum/skills/crew_chief @@ -846,7 +820,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = "USCM Officer" rank = "USCM Officer" - paygrade = PAY_SHORT_MO3 + paygrades = list(PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_0) role_comm_title = "Cpt" minimum_age = 40 skills = /datum/skills/commander @@ -884,7 +858,7 @@ access = list(ACCESS_MARINE_KITCHEN) assignment = JOB_MESS_SERGEANT rank = JOB_MESS_SERGEANT - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) role_comm_title = "MST" skills = /datum/skills/mess_technician @@ -909,9 +883,3 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) - -/datum/equipment_preset/uscm_ship/chef/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) - return PAY_SHORT_ME1 - return paygrade diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 75e8e013c03f..0a77ab7dcb41 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -9,7 +9,7 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all. skills = /datum/skills/everything //They are Synths, programmed for Everything. idtype = /obj/item/card/id/pmc/ds - paygrade = PAY_SHORT_CDNM + paygrades = list(PAY_SHORT_CDNM = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/pmc/w_y_whiteout/New() . = ..() diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index bf002b292df9..17138b208a58 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -17,7 +17,7 @@ assignment = JOB_WO_CO rank = JOB_WO_CO - paygrade = PAY_SHORT_MO2 + paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0) role_comm_title = "CDR" skills = /datum/skills/commander idtype = /obj/item/card/id/gold @@ -96,7 +96,7 @@ assignment = JOB_WO_XO rank = JOB_WO_XO - paygrade = PAY_SHORT_MO1 + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "LCDR" skills = /datum/skills/XO idtype = /obj/item/card/id/silver @@ -140,7 +140,7 @@ access = list(ACCESS_MARINE_BRIG, ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_PREP, ACCESS_MARINE_CMP, ACCESS_MARINE_MEDBAY) assignment = JOB_WO_CHIEF_POLICE rank = JOB_WO_CHIEF_POLICE - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) role_comm_title = "HGSL" skills = /datum/skills/honor_guard/lead idtype = /obj/item/card/id/silver @@ -176,7 +176,7 @@ access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_BRIG, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE) assignment = JOB_WO_SO rank = JOB_WO_SO - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "VHG" skills = /datum/skills/honor_guard/vet idtype = /obj/item/card/id/silver @@ -218,7 +218,7 @@ access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE) assignment = JOB_WO_CREWMAN rank = JOB_WO_CREWMAN - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "HGS" skills = /datum/skills/honor_guard/spec idtype = /obj/item/card/id/gold @@ -258,7 +258,7 @@ access = list(ACCESS_MARINE_BRIG, ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_PREP, ACCESS_MARINE_MEDBAY) assignment = JOB_WO_POLICE rank = JOB_WO_POLICE - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) role_comm_title = "HG" skills = /datum/skills/honor_guard @@ -292,7 +292,7 @@ access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT) assignment = JOB_WO_PILOT rank = JOB_WO_PILOT - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "MC" skills = /datum/skills/mortar_crew @@ -327,7 +327,7 @@ access = list(ACCESS_MARINE_CARGO, ACCESS_MARINE_RO, ACCESS_MARINE_COMMAND) assignment = JOB_WO_CHIEF_REQUISITION rank = JOB_WO_CHIEF_REQUISITION - paygrade = PAY_SHORT_ME8 + paygrades = list(PAY_SHORT_ME8 = JOB_PLAYTIME_TIER_0) role_comm_title = "QM" skills = /datum/skills/RO idtype = /obj/item/card/id/silver @@ -357,7 +357,7 @@ access = list(ACCESS_MARINE_ENGINEERING, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_CARGO) assignment = JOB_WO_REQUISITION rank = JOB_WO_REQUISITION - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "BCL" skills = /datum/skills/CE idtype = /obj/item/card/id @@ -389,7 +389,7 @@ access = list(ACCESS_MARINE_CMO, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_COMMAND, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_WO_CMO rank = JOB_WO_CMO - paygrade = PAY_SHORT_CCMO + paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) role_comm_title = "HS" skills = /datum/skills/CMO idtype = /obj/item/card/id/silver @@ -432,7 +432,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_WO_DOCTOR rank = JOB_WO_DOCTOR - paygrade = PAY_SHORT_CDOC + paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) role_comm_title = "Doc" skills = /datum/skills/doctor idtype = /obj/item/card/id @@ -472,7 +472,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_WO_RESEARCHER rank = JOB_WO_RESEARCHER - paygrade = PAY_SHORT_CDOC + paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) role_comm_title = "Chem" skills = /datum/skills/researcher idtype = /obj/item/card/id @@ -512,7 +512,7 @@ access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_COMMAND, ACCESS_CIVILIAN_ENGINEERING, ACCESS_MARINE_DATABASE) assignment = JOB_WO_CHIEF_ENGINEER rank = JOB_WO_CHIEF_ENGINEER - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) role_comm_title = "BCM" skills = /datum/skills/CE idtype = /obj/item/card/id/silver @@ -546,7 +546,7 @@ access = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_COMMAND, ACCESS_CIVILIAN_ENGINEERING) assignment = JOB_WO_ORDNANCE_TECH rank = JOB_WO_ORDNANCE_TECH - paygrade = PAY_SHORT_ME4 + paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "BC" skills = /datum/skills/OT idtype = /obj/item/card/id @@ -579,7 +579,7 @@ assignment = JOB_WO_CORPORATE_LIAISON rank = JOB_WO_CORPORATE_LIAISON - paygrade = PAY_SHORT_WYC2 + paygrades = list(PAY_SHORT_WYC2 = JOB_PLAYTIME_TIER_0) role_comm_title = "PRESS" skills = /datum/skills/civilian idtype = /obj/item/card/id/silver/cl @@ -623,7 +623,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = JOB_SQUAD_LEADER rank = JOB_SQUAD_LEADER - paygrade = PAY_SHORT_ME5 + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" skills = /datum/skills/SL @@ -658,7 +658,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) assignment = JOB_SQUAD_SPECIALIST rank = JOB_SQUAD_SPECIALIST - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "Spc" skills = /datum/skills/specialist @@ -693,7 +693,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) assignment = JOB_SQUAD_SMARTGUN rank = JOB_SQUAD_SMARTGUN - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "SG" skills = /datum/skills/smartgunner @@ -717,7 +717,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) assignment = JOB_SQUAD_ENGI rank = JOB_SQUAD_ENGI - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "ComTech" skills = /datum/skills/combat_engineer @@ -751,7 +751,7 @@ access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = JOB_SQUAD_MEDIC rank = JOB_SQUAD_MEDIC - paygrade = PAY_SHORT_ME3 + paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "HM" skills = /datum/skills/combat_medic @@ -789,7 +789,7 @@ access = list(ACCESS_MARINE_PREP) assignment = JOB_SQUAD_MARINE rank = JOB_SQUAD_MARINE - paygrade = PAY_SHORT_ME2 + paygrades = list(PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_0) role_comm_title = "RFN" skills = /datum/skills/pfc diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index d492f9573b57..75349115b47c 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -1,6 +1,6 @@ /datum/equipment_preset/wy name = "WY" - paygrade = PAY_SHORT_WYC1 + paygrades = list(PAY_SHORT_WYC1 = JOB_PLAYTIME_TIER_0) faction = FACTION_WY rank = FACTION_WY @@ -29,7 +29,7 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_TRAINEE rank = JOB_TRAINEE - paygrade = PAY_SHORT_WYC1 + paygrades = list(PAY_SHORT_WYC1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/trainee/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/trainee(new_human), WEAR_BODY) @@ -40,28 +40,28 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_JUNIOR_EXECUTIVE rank = JOB_JUNIOR_EXECUTIVE - paygrade = PAY_SHORT_WYC2 + paygrades = list(PAY_SHORT_WYC2 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/exec name = "Corporate - C - Executive" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_EXECUTIVE rank = JOB_EXECUTIVE - paygrade = PAY_SHORT_WYC3 + paygrades = list(PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/senior_exec name = "Corporate - D - Senior Executive" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_SENIOR_EXECUTIVE rank = JOB_SENIOR_EXECUTIVE - paygrade = PAY_SHORT_WYC4 + paygrades = list(PAY_SHORT_WYC4 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/exec_spec name = "Corporate - E - Executive Specialist" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_EXECUTIVE_SPECIALIST rank = JOB_EXECUTIVE_SPECIALIST - paygrade = PAY_SHORT_WYC5 + paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/exec_spec/lawyer name = "Corporate - E - Lawyer" @@ -82,7 +82,7 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_EXECUTIVE_SUPERVISOR rank = JOB_EXECUTIVE_SUPERVISOR - paygrade = PAY_SHORT_WYC6 + paygrades = list(PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/exec_supervisor/lawyer name = "Corporate - F - Lawyer" @@ -120,21 +120,21 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_ASSISTANT_MANAGER rank = JOB_ASSISTANT_MANAGER - paygrade = PAY_SHORT_WYC7 + paygrades = list(PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/manager/division_manager name = "Corporate - H - Division Manager" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_DIVISION_MANAGER rank = JOB_DIVISION_MANAGER - paygrade = PAY_SHORT_WYC8 + paygrades = list(PAY_SHORT_WYC8 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/manager/chief_executive name = "Corporate - I - Chief Executive" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_CHIEF_EXECUTIVE rank = JOB_CHIEF_EXECUTIVE - paygrade = PAY_SHORT_WYC9 + paygrades = list(PAY_SHORT_WYC9 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/wy/manager/chief_executive/New() . = ..() @@ -145,7 +145,7 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_DIRECTOR rank = JOB_DIRECTOR - paygrade = PAY_SHORT_WYC10 + paygrades = list(PAY_SHORT_WYC10 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/manager/director headset_type = /obj/item/device/radio/headset/distress/pmc/command/director diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index 9207b9d55a2d..c67f82176c93 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -61,7 +61,7 @@ assignment = JOB_WY_GOON rank = JOB_WY_GOON - paygrade = PAY_SHORT_CPO + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon /datum/equipment_preset/goon/standard/load_gear(mob/living/carbon/human/new_human) @@ -94,7 +94,7 @@ assignment = JOB_WY_GOON_TECH rank = JOB_WY_GOON_TECH - paygrade = PAY_SHORT_CPO + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_tech /datum/equipment_preset/goon/engineer/load_gear(mob/living/carbon/human/new_human) @@ -128,7 +128,7 @@ assignment = JOB_WY_GOON_LEAD rank = JOB_WY_GOON_LEAD - paygrade = PAY_SHORT_CSPO + paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_lead /datum/equipment_preset/goon/lead/New() @@ -164,7 +164,7 @@ assignment = JOB_WY_GOON_RESEARCHER rank = JOB_WY_GOON_RESEARCHER - paygrade = PAY_SHORT_CCMO + paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/researcher /datum/equipment_preset/goon/researcher/load_gear(mob/living/carbon/human/new_human) From f22c1ad79b8f13e62e63f1be2a49dd0b297105a3 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 30 Jul 2024 20:17:38 +0100 Subject: [PATCH 2/4] Automatic changelog for PR #6295 [ci skip] --- html/changelogs/AutoChangeLog-pr-6295.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6295.yml diff --git a/html/changelogs/AutoChangeLog-pr-6295.yml b/html/changelogs/AutoChangeLog-pr-6295.yml new file mode 100644 index 000000000000..080f557d31bc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6295.yml @@ -0,0 +1,8 @@ +author: "realforest2001" +delete-after: True +changes: + - code_imp: "Changed back-end for working out equipment preset paygrades so as to remove the manual overrides on several roles based on playtime perks." + - rscadd: "Added lower ranks for all enlisted and some officer roles subject to having played for less than ten hours. This rank cannot be used after playing more than ten hours, and ignores preferences for playtime perks." + - rscadd: "Added a higher rank achievable to most enlisted and some officers, requiring 175+ hours." + - rscadd: "Changed base rank for SL, SG, Spec and FTL by one grade up." + - rscadd: "Changed low playtime rank for MP and Nurse from Lance Corporal to Corporal." \ No newline at end of file From 4ccbc2406b64906b7e3cf0b750c28d9b38da7964 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:31:08 -0700 Subject: [PATCH 3/4] Remove electric chair (#6817) # About the pull request I was made aware this exists; it should not. # Explain why it's good for the game Admin only; and I don't want any admins using this. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog No player facing changes. --- code/game/objects/structures/electricchair.dm | 47 ------------------- colonialmarines.dme | 1 - 2 files changed, 48 deletions(-) delete mode 100644 code/game/objects/structures/electricchair.dm diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm deleted file mode 100644 index 239df3c05973..000000000000 --- a/code/game/objects/structures/electricchair.dm +++ /dev/null @@ -1,47 +0,0 @@ -/obj/structure/bed/chair/e_chair - name = "electric chair" - desc = "Looks absolutely SHOCKING!" - icon_state = "echair1" - var/last_time = 1 - -/obj/structure/bed/chair/e_chair/New() - ..() - overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir) - - -/obj/structure/bed/chair/e_chair/rotate() - ..() - overlays.Cut() - overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete - return - -/obj/structure/bed/chair/e_chair/proc/shock() - if(last_time + 50 > world.time) - return - last_time = world.time - - // special power handling - var/area/A = get_area(src) - if(!isarea(A)) - return - if(!A.powered(POWER_CHANNEL_EQUIP)) - return - A.use_power(5000) - var/light = A.power_light - A.updateicon() - - flick("echair1", src) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(12, 1, src) - s.start() - if(buckled_mob) - buckled_mob.burn_skin(85) - to_chat(buckled_mob, SPAN_DANGER("You feel a deep shock course through your body!")) - sleep(1) - buckled_mob.burn_skin(85) - buckled_mob.apply_effect(600, STUN) - visible_message(SPAN_DANGER("The electric chair went off!"), SPAN_DANGER("You hear a deep sharp shock!")) - - A.power_light = light - A.updateicon() - return diff --git a/colonialmarines.dme b/colonialmarines.dme index e1fb24e505ad..6c234b764d0b 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1282,7 +1282,6 @@ #include "code\game\objects\structures\curtains.dm" #include "code\game\objects\structures\desertdam.dm" #include "code\game\objects\structures\displaycase.dm" -#include "code\game\objects\structures\electricchair.dm" #include "code\game\objects\structures\extinguisher.dm" #include "code\game\objects\structures\fence.dm" #include "code\game\objects\structures\flora.dm" From b4c4ad391ba88e2a2e54ec6a37ac7dbd4e21a9ab Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:34:41 +0200 Subject: [PATCH 4/4] Drone devices removal (#6724) # About the pull request removes unused shit # Explain why it's good for the game cleaner code # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: del:/obj/item/device/gripper and /obj/item/device/matter_decompiler removed /:cl: --------- Co-authored-by: vincibrv --- .../objects/items/devices/drone_devices.dm | 241 ------------------ code/game/objects/prop.dm | 12 + colonialmarines.dme | 1 - maps/map_files/CORSAT/Corsat.dmm | 2 +- .../FOP_v2_Cellblocks/Prison_Station_FOP.dmm | 2 +- .../Sorokyne_Strata/Sorokyne_Strata.dmm | 2 +- 6 files changed, 15 insertions(+), 245 deletions(-) delete mode 100644 code/game/objects/items/devices/drone_devices.dm diff --git a/code/game/objects/items/devices/drone_devices.dm b/code/game/objects/items/devices/drone_devices.dm deleted file mode 100644 index 0e22b64bf67f..000000000000 --- a/code/game/objects/items/devices/drone_devices.dm +++ /dev/null @@ -1,241 +0,0 @@ - - -//Simple borg hand. -//Limited use. -/obj/item/device/gripper - name = "magnetic gripper" - desc = "A simple grasping tool for synthetic assets." - icon_state = "gripper" - - //Has a list of items that it can hold. - var/list/can_hold = list( - /obj/item/cell, - /obj/item/circuitboard, - /obj/item/stock_parts, - /obj/item/frame, - /obj/item/tank, - /obj/item/stock_parts/smes_coil - ) - - //Item currently being held. - var/obj/item/wrapped = null - -/obj/item/device/gripper/paperwork - name = "paperwork gripper" - desc = "A simple grasping tool for clerical work." - - can_hold = list( - /obj/item/clipboard, - /obj/item/paper, - /obj/item/paper_bundle, - /obj/item/card/id, - ) - -/obj/item/device/gripper/attack_self(mob/user as mob) - ..() - - if(wrapped) - wrapped.attack_self(user) - -/obj/item/device/gripper/verb/drop_item() - - set name = "Drop Item" - set desc = "Release an item from your magnetic gripper." - set category = "Drone" - set src in usr - if(!wrapped) - //There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z - for(var/obj/item/thing in src.contents) - thing.forceMove(get_turf(src)) - return - - if(wrapped.loc != src) - wrapped = null - return - - to_chat(src.loc, SPAN_WARNING("You drop \the [wrapped].")) - wrapped.forceMove(get_turf(src)) - wrapped = null - //update_icon() - -/obj/item/device/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - return - -/obj/item/device/gripper/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) - - if(!target || !proximity) //Target is invalid or we are not adjacent. - return - - //There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z - if(!wrapped) - for(var/obj/item/thing in src.contents) - wrapped = thing - break - - if(wrapped) //Already have an item. - - //Temporary put wrapped into user so target's attackby() checks pass. - wrapped.forceMove(user) - - //Pass the attack on to the target. This might delete/relocate wrapped. - target.attackby(wrapped,user) - - //If wrapped was neither deleted nor put into target, put it back into the gripper. - if(wrapped && user && (wrapped.loc == user)) - wrapped.forceMove(src) - else - wrapped = null - return - - else if(istype(target,/obj/item)) //Check that we're not pocketing a mob. - - //...and that the item is not in a container. - if(!isturf(target.loc)) - return - - var/obj/item/I = target - - //Check if the item is blacklisted. - var/grab = 0 - for(var/typepath in can_hold) - if(istype(I,typepath)) - grab = 1 - break - - //We can grab the item, finally. - if(grab) - to_chat(user, "You collect \the [I].") - I.forceMove(src) - wrapped = I - return - else - to_chat(user, SPAN_DANGER("Your gripper cannot hold \the [target].")) - - else if(istype(target,/obj/structure/machinery/power/apc)) - var/obj/structure/machinery/power/apc/A = target - if(A.opened) - if(A.cell) - - wrapped = A.cell - - A.cell.add_fingerprint(user) - A.cell.update_icon() - A.cell.forceMove(src) - A.cell = null - - A.charging = 0 - A.update_icon() - - user.visible_message(SPAN_DANGER("[user] removes the power cell from [A]!"), "You remove the power cell.") - - - - - - - -//TODO: Matter decompiler. -/obj/item/device/matter_decompiler - name = "matter decompiler" - desc = "Eating trash, bits of glass, or other debris will replenish your stores." - icon_state = "decompiler" - - //Metal, glass, wood, plastic. - var/list/stored_comms = list( - "metal" = 0, - "glass" = 0, - "wood" = 0, - "plastic" = 0 - ) - -/obj/item/device/matter_decompiler/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - return - -/obj/item/device/matter_decompiler/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) - - if(!proximity) return //Not adjacent. - - //We only want to deal with using this on turfs. Specific items aren't important. - var/turf/T = get_turf(target) - if(!istype(T)) - return - - //Used to give the right message. - var/grabbed_something = 0 - - for(var/mob/M in T) - if(istype(M,/mob/living/simple_animal/lizard) || istype(M,/mob/living/simple_animal/mouse)) - src.loc.visible_message(SPAN_DANGER("[src.loc] sucks [M] into its decompiler. There's a horrible crunching noise."),SPAN_DANGER("It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.")) - new/obj/effect/decal/cleanable/blood/splatter(get_turf(src)) - qdel(M) - stored_comms["wood"]++ - stored_comms["wood"]++ - stored_comms["plastic"]++ - stored_comms["plastic"]++ - return - else - continue - - for(var/obj/W in T) - //Different classes of items give different commodities. - if (istype(W,/obj/item/trash/cigbutt)) - stored_comms["plastic"]++ - else if(istype(W,/obj/effect/spider/spiderling)) - stored_comms["wood"]++ - stored_comms["wood"]++ - stored_comms["plastic"]++ - stored_comms["plastic"]++ - else if(istype(W,/obj/item/light_bulb)) - var/obj/item/light_bulb/L = W - if(L.status >= 2) //In before someone changes the inexplicably local defines. ~ Z - stored_comms["metal"]++ - stored_comms["glass"]++ - else - continue - else if(istype(W,/obj/effect/decal/remains/robot)) - stored_comms["metal"]++ - stored_comms["metal"]++ - stored_comms["plastic"]++ - stored_comms["plastic"]++ - stored_comms["glass"]++ - else if(istype(W,/obj/item/trash)) - stored_comms["metal"]++ - stored_comms["plastic"]++ - stored_comms["plastic"]++ - stored_comms["plastic"]++ - else if(istype(W,/obj/effect/decal/cleanable/blood/gibs/robot)) - stored_comms["metal"]++ - stored_comms["metal"]++ - stored_comms["glass"]++ - stored_comms["glass"]++ - else if(istype(W,/obj/item/ammo_casing)) - stored_comms["metal"]++ - else if(istype(W,/obj/item/shard/shrapnel)) - stored_comms["metal"]++ - stored_comms["metal"]++ - stored_comms["metal"]++ - else if(istype(W,/obj/item/shard)) - stored_comms["glass"]++ - stored_comms["glass"]++ - stored_comms["glass"]++ - else if(istype(W,/obj/item/reagent_container/food/snacks/grown)) - stored_comms["wood"]++ - stored_comms["wood"]++ - stored_comms["wood"]++ - stored_comms["wood"]++ - else if(istype(W,/obj/item/ammo_magazine)) - var/obj/item/ammo_magazine/AM = W - if(AM.current_rounds) - continue - stored_comms["metal"]++ - else - continue - - qdel(W) - grabbed_something = 1 - - if(grabbed_something) - to_chat(user, SPAN_NOTICE(" You deploy your decompiler and clear out the contents of \the [T].")) - else - to_chat(user, SPAN_DANGER("Nothing on \the [T] is useful to you.")) - return diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index cc941b19ed97..9e256236e7d6 100644 --- a/code/game/objects/prop.dm +++ b/code/game/objects/prop.dm @@ -169,6 +169,18 @@ icon_state = "game_kit" icon = 'icons/obj/items/items.dmi' +/obj/item/prop/gripper + name = "magnetic gripper" + desc = "A simple grasping tool for synthetic assets." + icon_state = "gripper" + icon = 'icons/obj/items/devices.dmi' + +/obj/item/prop/matter_decompiler + name = "matter decompiler" + desc = "Eating trash, bits of glass, or other debris will replenish your stores." + icon_state = "decompiler" + icon = 'icons/obj/items/devices.dmi' + /// Xeno-specific props /obj/item/prop/alien/hugger diff --git a/colonialmarines.dme b/colonialmarines.dme index 6c234b764d0b..d4c8bf6ce6e3 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1121,7 +1121,6 @@ #include "code\game\objects\items\devices\debugger.dm" #include "code\game\objects\items\devices\defibrillator.dm" #include "code\game\objects\items\devices\device.dm" -#include "code\game\objects\items\devices\drone_devices.dm" #include "code\game\objects\items\devices\dummy_tablet.dm" #include "code\game\objects\items\devices\flash.dm" #include "code\game\objects\items\devices\flashlight.dm" diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index f335e4c41e8b..5730f8e64032 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -24929,7 +24929,7 @@ /area/corsat/gamma/biodome/complex) "bTQ" = ( /obj/structure/surface/table/reinforced, -/obj/item/device/gripper, +/obj/item/prop/gripper, /turf/open/floor/corsat/retrosquareslight, /area/corsat/sigma/south/complex) "bTU" = ( diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 5cccceb54389..60bb9c8aa42f 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -18901,7 +18901,7 @@ /area/prison/security/monitoring/highsec) "btD" = ( /obj/structure/surface/table/reinforced, -/obj/item/device/matter_decompiler, +/obj/item/prop/matter_decompiler, /turf/open/floor/prison/redfull, /area/prison/hallway/central/west) "btE" = ( diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 2baad841c255..ad54d9e129ae 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -2795,7 +2795,7 @@ }, /obj/structure/surface/table/reinforced/prison, /obj/item/device/mass_spectrometer, -/obj/item/device/matter_decompiler, +/obj/item/prop/matter_decompiler, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/canteen/personal_storage) "ake" = (