Shrapnel removal now queues up all implants at once. (#17598)

Co-authored-by: Matt Atlas <liermattia@gmail.com>

code/modules/surgery/implant.dm

@@ -181,46 +181,38 @@
 /singleton/surgery_step/cavity/implant_removal/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 	var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
 
-	var/find_prob = 0
-	var/list/implants = list()
+	if(length(affected.implants))
+		var/list/implants = list()
+		var/shrapnel_present = FALSE
+		for(var/obj/item/I in affected.implants)
+			implants += I
+			if(!istype(I, /obj/item/implant))
+				shrapnel_present = TRUE
 
-	if(affected.implants.len)
-		implants = affected.implants
+		for(var/obj/item/I in implants)
+			/// Prioritize shrapnel instead of stuff like loyalty implants.
+			if(shrapnel_present && istype(I, /obj/item/implant))
+				continue
+			if(do_mob(user, target, 0.5 SECONDS))
+				user.visible_message("<b>[user]</b> takes [I] out of incision on [target]'s [affected.name] with \the [tool].", \
+					SPAN_NOTICE("You take [I] out of incision on [target]'s [affected.name]s with \the [tool].") )
+				target.remove_implant(I, TRUE, affected)
 
-		var/obj/item/obj = pick(implants)
+				BITSET(target.hud_updateflag, IMPLOYAL_HUD)
 
-		if(istype(obj,/obj/item/implant))
-			var/obj/item/implant/imp = obj
-			if(imp.isLegal())
-				find_prob += 60
-			else
-				find_prob += 40
-		else
-			find_prob += 75
+				//Handle possessive brain borers.
+				if(istype(I, /mob/living/simple_animal/borer))
+					var/mob/living/simple_animal/borer/worm = I
+					if(worm.controlling)
+						target.release_control()
+					worm.detach()
+					worm.leave_host()
 
-		if(prob(find_prob))
-			user.visible_message("<b>[user]</b> takes something out of incision on [target]'s [affected.name] with \the [tool].", \
-				SPAN_NOTICE("You take [obj] out of incision on [target]'s [affected.name]s with \the [tool].") )
-			target.remove_implant(obj, TRUE, affected)
-
-			BITSET(target.hud_updateflag, IMPLOYAL_HUD)
-
-			//Handle possessive brain borers.
-			if(istype(obj,/mob/living/simple_animal/borer))
-				var/mob/living/simple_animal/borer/worm = obj
-				if(worm.controlling)
-					target.release_control()
-				worm.detach()
-				worm.leave_host()
-
-			else if(istype(obj, /obj/item/device/gps))
-				var/obj/item/device/gps/gps = obj
-				moved_event.unregister(target, gps)
-				gps.implanted_into = null
-			playsound(target.loc, 'sound/effects/squelch1.ogg', 50, 1)
-		else
-			user.visible_message("<b>[user]</b> removes \the [tool] from [target]'s [affected.name].", \
-				SPAN_NOTICE("There's something inside [target]'s [affected.name], but you just missed it this time.") )
+				else if(istype(I, /obj/item/device/gps))
+					var/obj/item/device/gps/gps = I
+					moved_event.unregister(target, gps)
+					gps.implanted_into = null
+				playsound(target.loc, 'sound/effects/squelch1.ogg', 50, 1)
 	else
 		user.visible_message("<b>[user]</b> could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \
 			SPAN_NOTICE("You could not find anything inside [target]'s [affected.name].") )

html/changelogs/mattatlas-loyalty.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "Implant removal surgery now queues up all the implants for removal at once, with a delay of 0.5 seconds between each removal, meaning you only need to click once. It priorizes shrapnel over implants, so in case you need to remove everything, you'll need to do the surgery once for shrapnel, and a second time to remove implants."