Skip to content

Commit

Permalink
Fixes duplicate paygrade
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Aug 19, 2024
1 parent d6ac4d4 commit 8623987
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
14 changes: 7 additions & 7 deletions code/datums/paygrades/factions/upp/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@
pay_multiplier = 1 //here comes the moneyyy

//UPP Commandos
/datum/paygrade/upp/uc1
paygrade = "UC1"
/datum/paygrade/upp/uk1
paygrade = "UK1"
name = "Junior Kommando"
prefix = "JKdo."
pay_multiplier = 1.5

/datum/paygrade/upp/uc2
paygrade = "UC2"
/datum/paygrade/upp/uk2
paygrade = "UK2"
name = "2nd Kommando"
prefix = "2ndKdo."
pay_multiplier = 2

/datum/paygrade/upp/uc3
paygrade = "UC3"
/datum/paygrade/upp/uk3
paygrade = "UK3"
name = "1st Kommando"
prefix = "1stKdo."
pay_multiplier = 2.5
Expand Down Expand Up @@ -124,7 +124,7 @@
//UPP Colonists

/datum/paygrade/upp/constable
paygrade = "UC1"
paygrade = "UK1"
name = "Constable"
prefix = "Const."
pay_multiplier = 0.3
13 changes: 6 additions & 7 deletions code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/canteen, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/hatchet, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigar/matchbook/brown, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigar/matchbook/brown, WEAR_IN_BACK)

new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/flare, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/flare, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
//head
Expand All @@ -94,7 +95,6 @@
if(maybejacket)
new_human.equip_to_slot_or_del(new maybejacket, WEAR_JACKET)


new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
Expand All @@ -110,7 +110,6 @@
new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/bug_spray, WEAR_IN_R_STORE)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown, WEAR_HANDS)

var/random_gear = rand(1,5)
switch(random_gear)
Expand Down Expand Up @@ -542,7 +541,7 @@
assignment = JOB_UPP_COMMANDO
rank = JOB_UPP_COMMANDO
role_comm_title = "JKDO"
paygrade = "UC1"
paygrade = "UK1"
idtype = /obj/item/card/id/data
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_TSL, LANGUAGE_SPANISH, LANGUAGE_CHINESE)

Expand Down Expand Up @@ -588,7 +587,7 @@
assignment = JOB_UPP_COMMANDO_LEADER
rank = JOB_UPP_COMMANDO_LEADER
role_comm_title = "KDOTL"
paygrade = "UC3"
paygrade = "UK3"
idtype = /obj/item/card/id/silver

/datum/equipment_preset/upp/commando/leader/load_gear(mob/living/carbon/human/new_human)
Expand Down Expand Up @@ -708,7 +707,7 @@
assignment = "People's Police Constable"
rank = JOB_UPP_POLICE
role_comm_title = "CONST"
paygrade = "UC1"
paygrade = "UK1"
idtype = /obj/item/card/id/data

/datum/equipment_preset/upp/security/load_gear(mob/living/carbon/human/new_human)
Expand Down

0 comments on commit 8623987

Please sign in to comment.