YES..

cmss13-devs · Aug 23, 2024 · 92a87df · 92a87df
1 parent 8ba0a40
commit 92a87df
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -385,7 +385,7 @@ SUBSYSTEM_DEF(ticker)
 			if(player.job == JOB_CO)
 				captainless = FALSE
 			if(player.job)
-				RoleAuthority.equip_role(player, RoleAuthority.roles_by_name[player.job], late_join = FALSE)
+				RoleAuthority.equip_role(player, RoleAuthority.roles_by_name[player.job], _late_join = FALSE)
 				EquipCustomItems(player)
 			if(player.client)
 				var/client/C = player.client

diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
@@ -286,12 +286,12 @@
 		human.job = title //TODO Why is this a mob variable at all?
 
 		if(gear_preset_whitelist[job_whitelist])
-			arm_equipment(human, gear_preset_whitelist[job_whitelist], FALSE, TRUE)
+			arm_equipment(human, gear_preset_whitelist[job_whitelist], FALSE, TRUE, late_join = FALSE)
 			var/generated_account = generate_money_account(human)
 			announce_entry_message(human, generated_account, whitelist_status) //Tell them their spawn info.
 			generate_entry_conditions(human, whitelist_status) //Do any other thing that relates to their spawn.
 		else
-			arm_equipment(human, gear_preset, FALSE, TRUE) //After we move them, we want to equip anything else they should have.
+			arm_equipment(human, gear_preset, FALSE, TRUE, FALSE) //After we move them, we want to equip anything else they should have.
 			var/generated_account = generate_money_account(human)
 			announce_entry_message(human, generated_account) //Tell them their spawn info.
 			generate_entry_conditions(human) //Do any other thing that relates to their spawn.

diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
@@ -454,7 +454,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 		M.job = null
 
 
-/datum/authority/branch/role/proc/equip_role(mob/living/new_mob, datum/job/new_job, turf/late_join)
+/datum/authority/branch/role/proc/equip_role(mob/living/new_mob, datum/job/new_job, _late_join)
 	if(!istype(new_mob) || !istype(new_job))
 		return
 
@@ -477,12 +477,12 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 	new_human.job = new_job.title //TODO Why is this a mob variable at all?
 
 	if(new_job.gear_preset_whitelist[job_whitelist])
-		arm_equipment(new_human, new_job.gear_preset_whitelist[job_whitelist], FALSE, TRUE, late_join)
+		arm_equipment(new_human, new_job.gear_preset_whitelist[job_whitelist], FALSE, TRUE, late_join = _late_join)
 		var/generated_account = new_job.generate_money_account(new_human)
 		new_job.announce_entry_message(new_human, generated_account, whitelist_status) //Tell them their spawn info.
 		new_job.generate_entry_conditions(new_human, whitelist_status) //Do any other thing that relates to their spawn.
 	else
-		arm_equipment(new_human, new_job.gear_preset, FALSE, TRUE, late_join) //After we move them, we want to equip anything else they should have.
+		arm_equipment(new_human, new_job.gear_preset, FALSE, TRUE, late_join = _late_join) //After we move them, we want to equip anything else they should have.
 		var/generated_account = new_job.generate_money_account(new_human)
 		new_job.announce_entry_message(new_human, generated_account) //Tell them their spawn info.
 		new_job.generate_entry_conditions(new_human) //Do any other thing that relates to their spawn.
@@ -500,9 +500,9 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 		if(human.assigned_squad)
 			assigned_squad = human.assigned_squad.name
 
-	if(isturf(late_join))
-		new_human.forceMove(late_join)
-	else if(late_join)
+	if(isturf(_late_join))
+		new_human.forceMove(_late_join)
+	else if(_late_join)
 		var/turf/late_join_turf
 		if(GLOB.latejoin_by_squad[assigned_squad])
 			late_join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))

diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
@@ -595,11 +595,13 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND)
 
 /datum/equipment_preset/uscm_ship/so/handle_late_join(mob/living/carbon/human/new_human, late_join)
-	if(!late_join)
-		add_verb(new_human.client, /client/proc/commander_rename_platoon)
+	if(late_join)
+		return
+
+	add_verb(new_human.client, /client/proc/commander_rename_platoon)
 
-		do_rename_platoon(new_human.client.prefs.platoon_name)
-		change_dropship_camo(new_human.client.prefs.dropship_camo)
+	do_rename_platoon(new_human.client.prefs.platoon_name)
+	change_dropship_camo(new_human.client.prefs.dropship_camo)
 
 /datum/equipment_preset/uscm_ship/so/lesser_rank
 	paygrade = "MO1"

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
@@ -245,7 +245,7 @@
 	close_spawn_windows()
 
 	var/mob/living/carbon/human/character = create_character(TRUE) //creates the human and transfers vars and mind
-	RoleAuthority.equip_role(character, player_rank, late_join = TRUE)
+	RoleAuthority.equip_role(character, player_rank, _late_join = TRUE)
 	EquipCustomItems(character)
 
 	if((security_level > SEC_LEVEL_BLUE || SShijack.hijack_status) && player_rank.gets_emergency_kit)