Skip to content
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

Jump to bottom

Fixes spec kit, AGAIN #6390

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Fixes spec kit, AGAIN #6390

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1eb104
I really need to stop breaking this thing
realforest2001 Jun 7, 2024
4eabbdf
fix
realforest2001 Jul 13, 2024
1468e2b
Merge remote-tracking branch 'cmss13-devs/master' into forest/ifixity…
realforest2001 Jul 13, 2024
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
5 changes: 1 addition & 4 deletions code/modules/cm_marines/equipment/kit_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,9 @@
return TRUE

/obj/item/spec_kit/proc/select_and_spawn(mob/living/carbon/human/user)
var/selection = tgui_input_list(user, "Pick your specialist equipment type.", "Specialist Kit Selection", GLOB.available_specialist_kit_boxes)
var/selection = tgui_input_list(user, "Pick your specialist equipment type.", "Specialist Kit Selection", GLOB.available_specialist_kit_boxes, 10 SECONDS)
if(!selection || QDELETED(src))
return FALSE
if(!skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_TRAINED) && !skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL))
to_chat(user, SPAN_WARNING("You already unwrapped your [name], give this one to someone else!"))
return
Comment on lines -254 to -256
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What exactly are we fixing by removing this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a duplicate check that is overriding the check in /obj/item/spec_kit/rifleman/can_use(mob/living/carbon/human/user)

if(!GLOB.available_specialist_kit_boxes[selection] || GLOB.available_specialist_kit_boxes[selection] <= 0)
realforest2001 marked this conversation as resolved.
Show resolved Hide resolved
to_chat(user, SPAN_WARNING("No more kits of this type may be chosen!"))
return FALSE
Expand Down
Loading