diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 2d1dad641eb..78f987cc2b6 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -45,6 +45,8 @@ proc/get_location_modifier(mob/M)
 					else
 						user << "<span class='notice'>You need to expose [M]'s [procedure.location] first.</span>"
 						return 1	//return 1 so we don't slap the guy in the dick with the drapes.
+			else
+				return 1	//once the input menu comes up, cancelling it shouldn't hit the guy with the drapes either.
 	return 0
 
 
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index d9d057cac21..f8aea15eb38 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -33,7 +33,6 @@
 
 
 //TODO
-//empty hand surgery steps, surgery steps with any item
 //specific steps for some surgeries (fluff text)
 //R&D researching new surgeries (especially for non-humans)
 //surgeries (not steps) that can be initiated on any body part (corresponding with damage locations)
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index b098cd6c1e8..6336c920166 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -51,8 +51,8 @@
 	attack_verb = list("drilled")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("/red <b>[user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
-							"/red <b>[user] is pressing the [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
+		viewers(user) << pick("/red <b>[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
+							"/red <b>[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
 		return (BRUTELOSS)
 
 
@@ -73,9 +73,9 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 	suicide_act(mob/user)
-		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
-							"\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku.</b>")
 		return (BRUTELOSS)
 
 
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 9fbc56b1369..9eff29d8b12 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 77593f52715..cdb2e8cae8b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1087,6 +1087,7 @@
 #include "code\modules\security levels\security levels.dm"
 #include "code\modules\surgery\appendectomy.dm"
 #include "code\modules\surgery\brain_removal.dm"
+#include "code\modules\surgery\cavity_implant.dm"
 #include "code\modules\surgery\core_removal.dm"
 #include "code\modules\surgery\eye_surgery.dm"
 #include "code\modules\surgery\gender_reassignment.dm"