Resolves conflicts.

code/modules/surgery/organs/augments_arms.dm

@@ -168,7 +168,6 @@
 /obj/item/organ/internal/cyberimp/arm/gun/laser/l
 	parent_organ = "l_arm"
 
-
 /obj/item/organ/internal/cyberimp/arm/gun/taser
 	name = "arm-mounted taser implant"
 	desc = "A variant of the arm cannon implant that fires electrodes and disabler shots. The cannon emerges from the subject's arm and remains inside when not in use."
@@ -245,6 +244,10 @@
 	contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/bonegel/augment, /obj/item/FixOVein/augment, /obj/item/bonesetter/augment)
 	origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
 
+/obj/item/organ/internal/cyberimp/arm/surgery/l
+	parent_organ = "l_arm"
+	slot = "l_arm_device"
+
 // lets make IPCs even *more* vulnerable to EMPs!
 /obj/item/organ/internal/cyberimp/arm/power_cord
 	name = "APC-compatible power adapter implant"
@@ -318,4 +321,16 @@
 		if(H.nutrition > NUTRITION_LEVEL_WELL_FED)
 			to_chat(H, "<span class='notice'>You are now fully charged.</span>")
 			break
-	H.visible_message("<span class='notice'>[H] unplugs from \the [A].</span>", "<span class='notice'>You unplug from \the [A].</span>")
+	H.visible_message("<span class='notice'>[H] unplugs from \the [A].</span>", "<span class='notice'>You unplug from \the [A].</span>")
+
+/obj/item/organ/internal/cyberimp/arm/telebaton
+	name = "telebaton implant"
+	desc = "Telescopic baton implant. Does what it says on the tin" // A better description
+	
+	contents = newlist(/obj/item/melee/classic_baton)
+
+/obj/item/organ/internal/cyberimp/arm/advmop
+	name = "advanced mop implant"
+	desc = "Advanced mop implant. Does what it says on the tin" // A better description
+	
+	contents = newlist(/obj/item/mop/advanced)

code/modules/surgery/organs/organ_external.dm

@@ -141,7 +141,7 @@
 			   DAMAGE PROCS
 ****************************************************/
 
-/obj/item/organ/external/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
+/obj/item/organ/external/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE)
 	if(tough && !ignore_resists)
 		brute = max(0, brute - 5)
 		burn = max(0, burn - 4)
@@ -232,14 +232,14 @@
 					droplimb(0, DROPLIMB_SHARP)
 
 	if(owner_old)
-		owner_old.updatehealth()
+		owner_old.updatehealth("limb receive damage")
 	return update_icon()
 
 #undef LIMB_SHARP_THRESH_INT_DMG
 #undef LIMB_THRESH_INT_DMG
 #undef LIMB_DMG_PROB
 
-/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
+/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0, updating_health = TRUE)
 	if(is_robotic() && !robo_repair)
 		return
 
@@ -250,7 +250,8 @@
 		status &= ~ORGAN_BROKEN
 		perma_injury = 0
 
-	owner.updatehealth()
+	if(updating_health)
+		owner.updatehealth("limb heal damage")
 
 	return update_icon()
 
@@ -279,7 +280,7 @@ This function completely restores a damaged organ to perfect condition.
 		EO.rejuvenate()
 
 	if(owner)
-		owner.updatehealth()
+		owner.updatehealth("limb rejuvenate")
 	update_icon()
 	if(!owner)
 		processing_objects |= src
@@ -497,7 +498,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		dir = 2
 
 	if(victim)
-		victim.updatehealth()
+		victim.updatehealth("droplimb")
 		victim.UpdateDamageIcon()
 		victim.regenerate_icons()
 
@@ -708,6 +709,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 			var/atom/movable/thing = O.remove(victim)
 			if(thing)
 				thing.forceMove(src)
+		victim.updatehealth("limb remove")
 
 	// Grab all the internal giblets too.
 	for(var/obj/item/organ/internal/organ in internal_organs)

code/modules/surgery/organs/vocal_cords.dm

@@ -231,7 +231,7 @@ var/static/regex/multispin_words = regex("like a record baby")
 	else if((findtext(message, heal_words)))
 		for(var/V in listeners)
 			var/mob/living/L = V
-			L.heal_overall_damage(10 * power_multiplier, 10 * power_multiplier, 0, 0)
+			L.heal_overall_damage(10 * power_multiplier, 10 * power_multiplier, TRUE, 0, 0)
 		next_command = world.time + cooldown_damage
 
 	//BRUTE DAMAGE
@@ -380,7 +380,7 @@ var/static/regex/multispin_words = regex("like a record baby")
 	else if((findtext(message, sit_words)))
 		for(var/V in listeners)
 			var/mob/living/L = V
-			for(var/obj/structure/stool/bed/chair/chair in get_turf(L))
+			for(var/obj/structure/chair/chair in get_turf(L))
 				chair.buckle_mob(L)
 				break
 		next_command = world.time + cooldown_meme
@@ -389,7 +389,7 @@ var/static/regex/multispin_words = regex("like a record baby")
 	else if((findtext(message, stand_words)))
 		for(var/V in listeners)
 			var/mob/living/L = V
-			if(L.buckled && istype(L.buckled, /obj/structure/stool/bed/chair))
+			if(L.buckled && istype(L.buckled, /obj/structure/chair))
 				L.buckled.unbuckle_mob(L)
 		next_command = world.time + cooldown_meme
 

code/modules/surgery/other.dm

@@ -307,7 +307,7 @@
 		to_chat(target, "<span class='shadowling'><b><i>NOT LIKE THIS!</i></b></span>")
 		user.visible_message("<span class='warning'>[target] suddenly slams upward and knocks down [user]!</span>", \
 							 "<span class='userdanger'>[target] suddenly bolts up and slams you with tremendous force!</span>")
-		user.resting = 0 //Remove all stuns
+		user.StopResting() //Remove all stuns
 		user.SetSleeping(0)
 		user.SetStunned(0)
 		user.SetWeakened(0)

code/modules/surgery/surgery.dm

@@ -86,8 +86,6 @@
 		if(target_zone == surgery.location)
 			initiate(user, target, target_zone, tool, surgery)
 			return 1//returns 1 so we don't stab the guy in the dick or wherever.
-	if(isrobot(user) && user.a_intent != INTENT_HARM) //to save asimov borgs a LOT of heartache
-		return 1
 	return 0
 
 /datum/surgery_step/proc/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)