Merge pull request #70 from alex-gh/baton_fixes

Fixed harmbatoning,glove snipping

code/modules/clothing/clothing.dm

@@ -126,6 +126,23 @@ BLIND     // can't see anything
 	var/clipped = 0
 	species_restricted = list("exclude","Unathi","Tajaran")
 
+/obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user)
+	if(istype(W, /obj/item/weapon/wirecutters))
+		if(clipped == 0)
+			playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			user.visible_message("\red [user] snips the fingertips off [src].","\red You snip the fingertips off [src].")
+			clipped = 1
+			if("exclude" in species_restricted)
+				name = "mangled [name]"
+				desc = "[desc] They have had the fingertips cut off of them."
+				species_restricted -= "Unathi"
+				species_restricted -= "Tajaran"
+		else if(clipped == 1)
+			user << "<span class='notice'>[src] have already been clipped!</span>"
+			update_icon()
+		return
+		..()
+
 /obj/item/clothing/gloves/proc/Touch()
 	return
 

code/modules/surgery/surgery.dm

@@ -77,7 +77,7 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user)
 proc/do_surgery(mob/living/M, mob/living/user, obj/item/tool)
 	if(!istype(M,/mob/living/carbon))
 		return 0
-	if (user.a_intent == "harm")	//check for Hippocratic Oath
+	if (user.a_intent == "hurt")	//check for Hippocratic Oath
 		return 0
 	for(var/datum/surgery_step/S in surgery_steps)
 		//check if tool is right or close enough and if this step is possible