Skip to content

Commit 6362167

Browse files
CheffieGithubCheffieGithub
authored
Fix no options for spawns (#4792)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request Client needed, not always in mob <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: fix: Fixed jobs selectable items not always having options roundstart /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. -->
1 parent ea0ce26 commit 6362167

File tree

11 files changed

+15
-15
lines changed

11 files changed

+15
-15
lines changed

‎code/modules/jobs/job_types/adventurer/types/combat/cleric.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"Great axe" = /obj/item/weapon/polearm/halberd/bardiche/woodcutter,
9797
)
9898

99-
var/weaponchoice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Specialisation", title = "Warrior of the ten!")
99+
var/weaponchoice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Specialisation", title = "Warrior of the ten!")
100100
if(!weaponchoice)
101101
return
102102

‎code/modules/jobs/job_types/adventurer/types/pilgrim/noble.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"Rapier" = /obj/item/weapon/sword/rapier/dec, \
5050
"Cane Blade" = /obj/item/weapon/sword/rapier/caneblade, \
5151
)
52-
var/choice = spawned.select_equippable(spawned, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
52+
var/choice = spawned.select_equippable(player_client, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
5353
if(!choice)
5454
return
5555
switch(choice)

‎code/modules/jobs/job_types/adventurer/types/wretch/berserker.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"Sword" = /obj/item/weapon/sword/arming
5252
)
5353

54-
var/choice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Specialisation", title = "BERSERKER")
54+
var/choice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Specialisation", title = "BERSERKER")
5555
if(!choice)
5656
return
5757

‎code/modules/jobs/job_types/adventurer/types/wretch/deserter.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"Mace" = /obj/item/weapon/mace/goden/steel,
7171
)
7272

73-
var/weaponchoice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Specialisation", title = "DISGRACED KNIGHT")
73+
var/weaponchoice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Specialisation", title = "DISGRACED KNIGHT")
7474
if(!weaponchoice)
7575
return
7676

@@ -113,7 +113,7 @@
113113
"None" = /obj/item/clothing/head/roguehood/colored/uncolored,
114114
)
115115

116-
var/helmetchoice = spawned.select_equippable(spawned, selectablehelmets, message = "Choose Your Helmet", title = "DISGRACED KNIGHT")
116+
var/helmetchoice = spawned.select_equippable(player_client, selectablehelmets, message = "Choose Your Helmet", title = "DISGRACED KNIGHT")
117117
if(!helmetchoice)
118118
return
119119

‎code/modules/jobs/job_types/adventurer/types/wretch/pyromaniac.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"Bow" = /obj/item/gun/ballistic/revolver/grenadelauncher/bow/short,
4242
"Crossbow" = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow,
4343
)
44-
var/weaponschoice = spawned.select_equippable(spawned, selectableweapon, message = "Choose Your Weapon of choice", title = "PYROMANIAC")
44+
var/weaponschoice = spawned.select_equippable(player_client, selectableweapon, message = "Choose Your Weapon of choice", title = "PYROMANIAC")
4545
if(!weaponschoice)
4646
return
4747

@@ -79,4 +79,4 @@
7979
/obj/item/rope/chain = 1,
8080
/obj/item/flint = 1,
8181
/obj/item/reagent_containers/glass/bottle/stronghealthpot = 1,
82-
)
82+
)

‎code/modules/jobs/job_types/church/templar.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"Heartstring (Rapier)" = /obj/item/weapon/sword/rapier/eora,
8585
"Close Caress (Knuckles)" = /obj/item/weapon/knuckles/eora,
8686
)
87-
var/choice = spawned.select_equippable(spawned, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
87+
var/choice = spawned.select_equippable(player_client, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
8888
if(!choice)
8989
return
9090
switch(choice)
@@ -105,7 +105,7 @@
105105
"DepthSeeker (Spear)" = /obj/item/weapon/polearm/spear/abyssor,
106106
"Barotrauma (Katars)" = /obj/item/weapon/katar/abyssor,
107107
)
108-
var/choice = spawned.select_equippable(spawned, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
108+
var/choice = spawned.select_equippable(player_client, selectable, message = "Choose Your Specialisation", title = "TEMPLAR")
109109
if(!choice)
110110
return
111111
switch(choice)

‎code/modules/jobs/job_types/garrison/veteran.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
"Zweihander" = /obj/item/weapon/sword/long/greatsword/zwei, \
325325
"Halberd" = /obj/item/weapon/polearm/halberd \
326326
)
327-
var/weapon_choice = spawned.select_equippable(spawned, weapons, message = "CHOOSE YOUR WEAPON.", title = "TAKE UP ARMS")
327+
var/weapon_choice = spawned.select_equippable(player_client, weapons, message = "CHOOSE YOUR WEAPON.", title = "TAKE UP ARMS")
328328
switch(weapon_choice)
329329
if("Zweihander")
330330
spawned.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
@@ -404,7 +404,7 @@
404404
spawned.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE)
405405
spawned.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE)
406406

407-
spawned.select_equippable(spawned, list( \
407+
spawned.select_equippable(player_client, list( \
408408
"Knuckles" = /obj/item/weapon/knuckles, \
409409
"Katar" = /obj/item/weapon/katar, \
410410
),

‎code/modules/jobs/job_types/garrison/watchlieutenant.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"Spear" = /obj/item/weapon/polearm/spear, \
6666
"Sword" = /obj/item/weapon/sword/iron, \
6767
)
68-
var/choice = spawned.select_equippable(spawned, selectable, message = "CHOOSE YOUR SECONDARY WEAPON", title = "LIEUTENANT")
68+
var/choice = spawned.select_equippable(player_client, selectable, message = "CHOOSE YOUR SECONDARY WEAPON", title = "LIEUTENANT")
6969
if(!choice)
7070
return
7171
switch(choice)

‎code/modules/jobs/job_types/nobility/minor_noble.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"Rapier" = /obj/item/weapon/sword/rapier/dec, \
6363
"Cane Blade" = /obj/item/weapon/sword/rapier/caneblade, \
6464
)
65-
var/choice = spawned.select_equippable(spawned, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
65+
var/choice = spawned.select_equippable(player_client, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = "NOBLE")
6666
if(!choice)
6767
return
6868
switch(choice)

‎code/modules/jobs/job_types/other/folkheroes/lakkariancleric.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Silver Rungu" = /obj/item/weapon/mace/silver/rungu, \
4747
"Silver Sengese" = /obj/item/weapon/sword/scimitar/sengese/silver \
4848
)
49-
var/choice = spawned.select_equippable(spawned, selectable, message = "What is your weapon of choice?")
49+
var/choice = spawned.select_equippable(player_client, selectable, message = "What is your weapon of choice?")
5050
if(!choice)
5151
return
5252

0 commit comments

Comments
 (0)