Skip to content

Fix no options for spawns #4792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CheffieGithub merged 3 commits into from
Jan 17, 2026
Merged

Fix no options for spawns #4792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b637cb7
need dis
CheffieGithub Jan 4, 2026
ed23aae
Merge branch 'main' of https://github.com/Vanderlin-Tales-Of-Wine/Van…
CheffieGithub Jan 4, 2026
fb373e8
Merge branch 'main' of https://github.com/Vanderlin-Tales-Of-Wine/Van…
CheffieGithub Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/adventurer/types/combat/cleric.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/adventurer/types/pilgrim/noble.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/adventurer/types/wretch/berserker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/adventurer/types/wretch/deserter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/adventurer/types/wretch/pyromaniac.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -79,4 +79,4 @@
/obj/item/rope/chain = 1,
/obj/item/flint = 1,
/obj/item/reagent_containers/glass/bottle/stronghealthpot = 1,
)
)
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/church/templar.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/garrison/veteran.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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, \
),
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/garrison/watchlieutenant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/nobility/minor_noble.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/other/folkheroes/lakkariancleric.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/other/merc_classes/blackoak.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading