fixing merge conflicts

code/modules/surgery/bodyparts/bodyparts.dm

@@ -5,6 +5,7 @@
 	force = 3
 	throwforce = 3
 	icon = 'icons/mob/human_parts.dmi'
+	w_class = WEIGHT_CLASS_SMALL
 	icon_state = ""
 	layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor
 	var/mob/living/carbon/owner = null

code/modules/surgery/experimental_dissection.dm

@@ -24,8 +24,8 @@
 
 /datum/surgery_step/dissection
 	name = "dissection"
-	implements = list(/obj/item/scalpel/augment = 75, /obj/item/scalpel/advanced = 60, /obj/item/scalpel = 45, /obj/item/kitchen/knife = 20, /obj/item/shard = 10)// special tools not only cut down time but also improve probability, doesn't use TOOL_SCALPEL because different scalpels have different probs
-	time = 125
+	implements = list(/obj/item/scalpel/alien = 100, /obj/item/scalpel/advanced = 99, /obj/item/scalpel = 90, /obj/item/kitchen/knife = 45, /obj/item/shard = 25)// special tools not only cut down time but also improve probability, doesn't use TOOL_SCALPEL because different scalpels have different probs
+	time = 100
 	silicons_obey_prob = TRUE
 	repeatable = TRUE
 
@@ -110,4 +110,4 @@
 	requires_tech = TRUE
 	replaced_by = null
 
-#undef BASE_HUMAN_REWARD
+#undef BASE_HUMAN_REWARD

code/modules/surgery/organs/eyes.dm

@@ -51,7 +51,7 @@
 	clear_eye_trauma()
 	. = ..()
 	var/mob/living/carbon/C = .
-	if(C)
+	if(!QDELETED(C))
 		if(ishuman(C) && eye_color)
 			var/mob/living/carbon/human/H = C
 			H.eye_color = old_eye_color

code/modules/surgery/organs/heart.dm

@@ -6,7 +6,7 @@
 	slot = ORGAN_SLOT_HEART
 
 	healing_factor = STANDARD_ORGAN_HEALING
-	decay_factor = 2.5 * STANDARD_ORGAN_DECAY		//designed to fail about 5 minutes after death
+	decay_factor = 2 * STANDARD_ORGAN_DECAY
 
 	low_threshold_passed = "<span class='info'>Prickles of pain appear then die out from within your chest...</span>"
 	high_threshold_passed = "<span class='warning'>Something inside your chest hurts, and the pain isn't subsiding. You notice yourself breathing far faster than before.</span>"