diff --git a/code/modules/jobs/job_types/adventurer/types/combat/cleric.dm b/code/modules/jobs/job_types/adventurer/types/combat/cleric.dm
index d4a7e8cc29d..2681a24a632 100644
--- a/code/modules/jobs/job_types/adventurer/types/combat/cleric.dm
+++ b/code/modules/jobs/job_types/adventurer/types/combat/cleric.dm
@@ -96,7 +96,7 @@
 		"Great axe" = /obj/item/weapon/polearm/halberd/bardiche/woodcutter,
 	)
 
-	var/weaponchoice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Specialisation", title = "Warrior of the ten!")
+	var/weaponchoice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Specialisation", title = "Warrior of the ten!")
 	if(!weaponchoice)
 		return
 
diff --git a/code/modules/jobs/job_types/adventurer/types/pilgrim/noble.dm b/code/modules/jobs/job_types/adventurer/types/pilgrim/noble.dm
index 47309e13565..1c5d55fc39e 100644
--- a/code/modules/jobs/job_types/adventurer/types/pilgrim/noble.dm
+++ b/code/modules/jobs/job_types/adventurer/types/pilgrim/noble.dm
@@ -49,7 +49,7 @@
 		"Rapier" = /obj/item/weapon/sword/rapier/dec, \
 		"Cane Blade" = /obj/item/weapon/sword/rapier/caneblade, \
 		)
-	var/choice = spawned.select_equippable(spawned, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
+	var/choice = spawned.select_equippable(player_client, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
 	if(!choice)
 		return
 	switch(choice)
diff --git a/code/modules/jobs/job_types/adventurer/types/wretch/berserker.dm b/code/modules/jobs/job_types/adventurer/types/wretch/berserker.dm
index c077249ff25..c7b5ef3d65a 100644
--- a/code/modules/jobs/job_types/adventurer/types/wretch/berserker.dm
+++ b/code/modules/jobs/job_types/adventurer/types/wretch/berserker.dm
@@ -51,7 +51,7 @@
 		"Sword" = /obj/item/weapon/sword/arming
 	)
 
-	var/choice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Specialisation", title = "BERSERKER")
+	var/choice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Specialisation", title = "BERSERKER")
 	if(!choice)
 		return
 
diff --git a/code/modules/jobs/job_types/adventurer/types/wretch/deserter.dm b/code/modules/jobs/job_types/adventurer/types/wretch/deserter.dm
index 9d9e3f30057..d2df0e0efee 100644
--- a/code/modules/jobs/job_types/adventurer/types/wretch/deserter.dm
+++ b/code/modules/jobs/job_types/adventurer/types/wretch/deserter.dm
@@ -70,7 +70,7 @@
 		"Mace" = /obj/item/weapon/mace/goden/steel,
 	)
 
-	var/weaponchoice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Specialisation", title = "DISGRACED KNIGHT")
+	var/weaponchoice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Specialisation", title = "DISGRACED KNIGHT")
 	if(!weaponchoice)
 		return
 
@@ -113,7 +113,7 @@
 		"None" = /obj/item/clothing/head/roguehood/colored/uncolored,
 	)
 
-	var/helmetchoice = spawned.select_equippable(spawned, selectablehelmets, message = "Choose Your Helmet", title = "DISGRACED KNIGHT")
+	var/helmetchoice = spawned.select_equippable(player_client, selectablehelmets, message = "Choose Your Helmet", title = "DISGRACED KNIGHT")
 	if(!helmetchoice)
 		return
 
diff --git a/code/modules/jobs/job_types/adventurer/types/wretch/pyromaniac.dm b/code/modules/jobs/job_types/adventurer/types/wretch/pyromaniac.dm
index 5b53ea86890..eed9024c19d 100644
--- a/code/modules/jobs/job_types/adventurer/types/wretch/pyromaniac.dm
+++ b/code/modules/jobs/job_types/adventurer/types/wretch/pyromaniac.dm
@@ -41,7 +41,7 @@
 		"Bow" = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/short,
 		"Crossbow" = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
 	)
-	var/weaponschoice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Weapon of choice", title = "PYROMANIAC")
+	var/weaponschoice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Weapon of choice", title = "PYROMANIAC")
 	if(!weaponschoice)
 		return
 
@@ -79,4 +79,4 @@
 		/obj/item/rope/chain = 1,
 		/obj/item/flint = 1,
 		/obj/item/reagent_containers/glass/bottle/stronghealthpot = 1,
-	)
\ No newline at end of file
+	)
diff --git a/code/modules/jobs/job_types/church/templar.dm b/code/modules/jobs/job_types/church/templar.dm
index 3dfb16e2c06..2ded2ae2c75 100644
--- a/code/modules/jobs/job_types/church/templar.dm
+++ b/code/modules/jobs/job_types/church/templar.dm
@@ -84,7 +84,7 @@
 				"Heartstring (Rapier)" = /obj/item/weapon/sword/rapier/eora,
 				"Close Caress (Knuckles)" = /obj/item/weapon/knuckles/eora,
 			)
-			var/choice = spawned.select_equippable(spawned, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
+			var/choice = spawned.select_equippable(player_client, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
 			if(!choice)
 				return
 			switch(choice)
@@ -105,7 +105,7 @@
 				"DepthSeeker (Spear)" = /obj/item/weapon/polearm/spear/abyssor,
 				"Barotrauma (Katars)" = /obj/item/weapon/katar/abyssor,
 			)
-			var/choice = spawned.select_equippable(spawned, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
+			var/choice = spawned.select_equippable(player_client, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
 			if(!choice)
 				return
 			switch(choice)
diff --git a/code/modules/jobs/job_types/garrison/veteran.dm b/code/modules/jobs/job_types/garrison/veteran.dm
index c8526c88cf0..fdd38995556 100644
--- a/code/modules/jobs/job_types/garrison/veteran.dm
+++ b/code/modules/jobs/job_types/garrison/veteran.dm
@@ -324,7 +324,7 @@
 		"Zweihander" = /obj/item/weapon/sword/long/greatsword/zwei, \
 		"Halberd" = /obj/item/weapon/polearm/halberd \
 	)
-	var/weapon_choice = spawned.select_equippable(spawned, weapons, message = "CHOOSE YOUR WEAPON.", title  = "TAKE UP ARMS")
+	var/weapon_choice = spawned.select_equippable(player_client, weapons, message = "CHOOSE YOUR WEAPON.", title  = "TAKE UP ARMS")
 	switch(weapon_choice)
 		if("Zweihander")
 			spawned.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
@@ -404,7 +404,7 @@
 		spawned.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE)
 		spawned.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE)
 
-	spawned.select_equippable(spawned, list( \
+	spawned.select_equippable(player_client, list( \
 		"Knuckles" = /obj/item/weapon/knuckles, \
 		"Katar" = /obj/item/weapon/katar, \
 		),
diff --git a/code/modules/jobs/job_types/garrison/watchlieutenant.dm b/code/modules/jobs/job_types/garrison/watchlieutenant.dm
index 38cd1532b9a..9c03830cafa 100644
--- a/code/modules/jobs/job_types/garrison/watchlieutenant.dm
+++ b/code/modules/jobs/job_types/garrison/watchlieutenant.dm
@@ -65,7 +65,7 @@
 		"Spear" = /obj/item/weapon/polearm/spear, \
 		"Sword" = /obj/item/weapon/sword/iron, \
 	)
-	var/choice = spawned.select_equippable(spawned, selectable, message = "CHOOSE YOUR SECONDARY WEAPON", title = "LIEUTENANT")
+	var/choice = spawned.select_equippable(player_client, selectable, message = "CHOOSE YOUR SECONDARY WEAPON", title = "LIEUTENANT")
 	if(!choice)
 		return
 	switch(choice)
diff --git a/code/modules/jobs/job_types/nobility/minor_noble.dm b/code/modules/jobs/job_types/nobility/minor_noble.dm
index 242e305ff54..0a4738074f7 100644
--- a/code/modules/jobs/job_types/nobility/minor_noble.dm
+++ b/code/modules/jobs/job_types/nobility/minor_noble.dm
@@ -62,7 +62,7 @@
 		"Rapier" = /obj/item/weapon/sword/rapier/dec, \
 		"Cane Blade" = /obj/item/weapon/sword/rapier/caneblade, \
 		)
-	var/choice = spawned.select_equippable(spawned, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
+	var/choice = spawned.select_equippable(player_client, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
 	if(!choice)
 		return
 	switch(choice)
diff --git a/code/modules/jobs/job_types/other/folkheroes/lakkariancleric.dm b/code/modules/jobs/job_types/other/folkheroes/lakkariancleric.dm
index 813515fb05a..1ff9387deb2 100644
--- a/code/modules/jobs/job_types/other/folkheroes/lakkariancleric.dm
+++ b/code/modules/jobs/job_types/other/folkheroes/lakkariancleric.dm
@@ -46,7 +46,7 @@
 		"Silver Rungu" = /obj/item/weapon/mace/silver/rungu, \
 		"Silver Sengese" = /obj/item/weapon/sword/scimitar/sengese/silver \
 	)
-	var/choice = spawned.select_equippable(spawned, selectable, message = "What is your weapon of choice?")
+	var/choice = spawned.select_equippable(player_client, selectable, message = "What is your weapon of choice?")
 	if(!choice)
 		return
 
diff --git a/code/modules/jobs/job_types/other/merc_classes/blackoak.dm b/code/modules/jobs/job_types/other/merc_classes/blackoak.dm
index 0d615112447..6dcd9977adc 100644
--- a/code/modules/jobs/job_types/other/merc_classes/blackoak.dm
+++ b/code/modules/jobs/job_types/other/merc_classes/blackoak.dm
@@ -41,7 +41,7 @@
 		"Spear" = /obj/item/weapon/polearm/spear, \
 		"Regal Elven Club" = /obj/item/weapon/mace/elvenclub/steel \
 		)
-	var/choice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Weapon", title = "Black Oak's Guardian")
+	var/choice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Weapon", title = "Black Oak's Guardian")
 	if(!choice)
 		return
 	switch(choice)