Skip to content

Commit

Permalink
rank updates
Browse files Browse the repository at this point in the history
  • Loading branch information
AndroBetel committed Feb 16, 2024
1 parent f8d72bc commit 6659be9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
10 changes: 8 additions & 2 deletions code/datums/paygrades/factions/upp/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
pay_multiplier = 0.2

/datum/paygrade/upp/ue3
paygrade = "UE3"
paygrade = "UE4"
name = "Korporal"
prefix = "Kpl."
pay_multiplier = 0.3

/datum/paygrade/upp/ue4
paygrade = "UE4"
paygrade = "UE5"
name = "Junior Serzhant"
prefix = "JrSzh."
pay_multiplier = 0.5
Expand All @@ -45,6 +45,12 @@
prefix = "MSzh."
pay_multiplier = 0.9

/datum/paygrade/upp/ue7
paygrade = "UE7"
name = "Starshina"
prefix = "Strsh."
pay_multiplier = 1 //here comes the moneyyy

//UPP Commandos
/datum/paygrade/upp/uc1
paygrade = "UC1"
Expand Down
18 changes: 9 additions & 9 deletions code/modules/gear_presets/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@

/datum/equipment_preset/uscm/pfc/upp
name = "UPP Squad Rifleman"
paygrade = "UE1"
paygrade = "UE2"
access = list(ACCESS_UPP_GENERAL)
assignment = JOB_SQUAD_MARINE_UPP
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
Expand All @@ -111,7 +111,7 @@
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/pfc/upp/lesser_rank
paygrade = "UE0"
paygrade = "UE1"

//*****************************************************************************************************/

Expand Down Expand Up @@ -150,7 +150,7 @@
name = "UPP Squad Machinegunner"
access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MACHINEGUN)
assignment = JOB_SQUAD_SMARTGUN_UPP
paygrade = "UE3"
paygrade = "UE4"
role_comm_title = "MG"
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
faction_group = list(FACTION_UPP)
Expand All @@ -164,7 +164,7 @@
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/sg/upp/lesser_rank
paygrade = "UE2"
paygrade = "UE3"

//*****************************************************************************************************/

Expand Down Expand Up @@ -336,7 +336,7 @@

/datum/equipment_preset/uscm/medic/upp
name = "UPP Sanitar"
paygrade = "UE3"
paygrade = "UE4"
access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MEDPREP, ACCESS_UPP_MEDICAL)
assignment = JOB_SQUAD_MEDIC_UPP
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
Expand All @@ -351,7 +351,7 @@
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/medic/upp/lesser_rank
paygrade = "UE2"
paygrade = "UE3"

//*****************************************************************************************************/

Expand Down Expand Up @@ -384,7 +384,7 @@

/datum/equipment_preset/uscm/tl/upp
name = "UPP Squad Sergeant"
paygrade = "UE4"
paygrade = "UE5"
access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_TLPREP)
assignment = JOB_SQUAD_TEAM_LEADER_UPP
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
Expand Down Expand Up @@ -468,7 +468,7 @@
assignment = JOB_SQUAD_LEADER_UPP
access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_LEADERSHIP, ACCESS_UPP_FLIGHT)
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE)
paygrade = "UE6"
paygrade = "UE7"
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

Expand All @@ -480,7 +480,7 @@
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

/datum/equipment_preset/uscm/leader/upp/lesser_rank
paygrade = "UE5"
paygrade = "UE6"

//*****************************************************************************************************/
// ERT members that spawn with full gear from DEFCON
Expand Down

0 comments on commit 6659be9

Please sign in to comment.