Merge branch 'dev' into ofDryingAndRacks

code/modules/surgery/encased.dm

@@ -67,8 +67,7 @@
 /datum/surgery_step/open_encased/retract
 	allowed_tools = list(
 	/obj/item/weapon/retractor = 100, 	\
-	/obj/item/weapon/crowbar = 75,	\
-	/obj/item/weapon/kitchen/utensil/fork = 20
+	/obj/item/weapon/crowbar = 75
 	)
 
 	min_duration = 30
@@ -124,8 +123,7 @@
 /datum/surgery_step/open_encased/close
 	allowed_tools = list(
 	/obj/item/weapon/retractor = 100, 	\
-	/obj/item/weapon/crowbar = 75,	\
-	/obj/item/weapon/kitchen/utensil/fork = 20
+	/obj/item/weapon/crowbar = 75
 	)
 
 	min_duration = 20

code/modules/surgery/generic.dm

@@ -305,7 +305,7 @@
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\blue [user] cuts off [target]'s [affected.display_name] with \the [tool].", \
 		"\blue You cut off [target]'s [affected.display_name] with \the [tool].")
-		affected.droplimb(1,0)
+		affected.droplimb(1,1,1)
 
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/external/affected = target.get_organ(target_zone)

code/modules/surgery/surgery.dm

@@ -98,7 +98,7 @@ proc/do_surgery(mob/living/carbon/M, mob/living/user, obj/item/tool)
 				//We had proper tools! (or RNG smiled.) and user did not move or change hands.
 				if(prob(S.tool_quality(tool)) &&  do_mob(user, M, rand(S.min_duration, S.max_duration)))
 					S.end_step(user, M, user.zone_sel.selecting, tool)		//finish successfully
-				else if (tool in user.contents && user.Adjacent(M))			//or
+				else if ((tool in user.contents) && user.Adjacent(M))			//or
 					S.fail_step(user, M, user.zone_sel.selecting, tool)		//malpractice~
 				else // This failing silently was a pain.
 					user << "\red You must remain close to your patient to conduct surgery."