Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection

2019-10-11 20:06:26 -05:00
parent 323460efee f57fa7f471
commit b50804dfc3
581 changed files with 63735 additions and 58634 deletions
@@ -18,7 +18,7 @@
 		return FALSE
 /datum/surgery_step/pacify
 	name = "rewire brain"
-	implements = list(/obj/item/hemostat = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15)
+	implements = list(TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15)
 	time = 40

 /datum/surgery_step/pacify/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)