Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed May 18, 2024
1 parent 6454ad0 commit 0a35ec5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion code/modules/gear_presets/_select_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,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)
Expand All @@ -139,7 +141,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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm_ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@
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])
var/paygrade_choice = get_paygrade_id_by_name(rankee.client.prefs.pref_special_job_options[rank])
return paygrade_choice
Expand Down

0 comments on commit 0a35ec5

Please sign in to comment.