Manual merge of head.dmi.

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_animals.dm

@@ -68,7 +68,7 @@
 	harm_intent_damage = 8
 	melee_damage_lower = 15
 	melee_damage_upper = 15
-	attacktext = "slashes"
+	attacktext = "slashed"
 	attack_sound = 'sound/weapons/bite.ogg'
 
 	layer = 3.1		//so they can stay hidde under the /obj/structure/bush
@@ -126,7 +126,7 @@
 	harm_intent_damage = 2
 	melee_damage_lower = 3
 	melee_damage_upper = 10
-	attacktext = "bites"
+	attacktext = "bitten"
 	attack_sound = 'sound/weapons/bite.ogg'
 
 	layer = 3.1		//so they can stay hidde under the /obj/structure/bush

code/WorkInProgress/Chinsky/guestpass.dm

@@ -71,9 +71,6 @@
 /obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob)
 	return attack_hand(user)
 
-/obj/machinery/computer/guestpass/attack_paw(var/mob/user as mob)
-	return attack_hand(user)
-
 /obj/machinery/computer/guestpass/attack_hand(var/mob/user as mob)
 	if(..())
 		return

code/WorkInProgress/Mini/atmos_control.dm

@@ -34,9 +34,6 @@
 /obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)
 	return interact(user)
 
-/obj/machinery/computer/atmoscontrol/attack_paw(var/mob/user as mob)
-	return interact(user)
-
 /obj/machinery/computer/atmoscontrol/attack_hand(mob/user)
 	if(..())
 		return

code/WorkInProgress/Ported/policetape.dm

@@ -135,8 +135,7 @@
 	else
 		breaktape(null, user)
 
-/obj/item/tape/attack_paw(mob/user as mob)
-	breaktape(/obj/item/weapon/wirecutters,user)
+
 
 /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
 	if(user.a_intent == "help" && ((!can_puncture(W) && src.allowed(user))))

code/WorkInProgress/kilakk/fax.dm

@@ -38,9 +38,6 @@ var/list/alldepartments = list("Central Command")
 /obj/machinery/faxmachine/attack_ai(mob/user as mob)
 	return attack_hand(user)
 
-/obj/machinery/faxmachine/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
 /obj/machinery/faxmachine/attack_hand(mob/user as mob)
 	user.set_machine(src)