From c1eb10471f3ee88b4ebb0ea3dd14fd58706e8097 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Fri, 7 Jun 2024 01:51:28 +0100 Subject: [PATCH 1/2] I really need to stop breaking this thing --- code/modules/cm_marines/equipment/kit_boxes.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index e0220d017d42..1b37c6296d17 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -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 if(!GLOB.available_specialist_kit_boxes[selection] || GLOB.available_specialist_kit_boxes[selection] <= 0) to_chat(user, SPAN_WARNING("No more kits of this type may be chosen!")) return FALSE From 4eabbdfc71735053bd529124b054238eb3d2d54e Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 13 Jul 2024 03:08:56 +0100 Subject: [PATCH 2/2] fix --- code/modules/cm_marines/equipment/kit_boxes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 1b37c6296d17..810c964481e3 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -296,6 +296,7 @@ user.put_in_hands(spec_box) ID.set_assignment((user.assigned_squad && squad_assignment_update ? (user.assigned_squad.name + " ") : "") + ID.assignment + " ([specialist_assignment])") GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), ID.assignment) + GLOB.available_specialist_kit_boxes[selection]-- return TRUE return FALSE