diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index 9a5f948942e..24cd07a9793 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -184,16 +184,18 @@
 	if(length(affected.implants))
 		var/list/implants = list()
 		var/shrapnel_present = FALSE
-		for(var/obj/item/I in affected.implants)
+		for(var/obj/I in affected.implants)
 			implants += I
 			if(!istype(I, /obj/item/implant))
 				shrapnel_present = TRUE
 
-		for(var/obj/item/I in implants)
+		for(var/obj/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)
@@ -212,6 +214,7 @@
 					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.", \
diff --git a/html/changelogs/fluffyghost-fixgremeggremovalsurgery.yml b/html/changelogs/fluffyghost-fixgremeggremovalsurgery.yml
new file mode 100644
index 00000000000..ed915fc723d
--- /dev/null
+++ b/html/changelogs/fluffyghost-fixgremeggremovalsurgery.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: FluffyGhost
+
+# 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:
+  - bugfix: "Fixed gremorian eggs not being extractable by surgery."