Merge Conflict Fix, Attempt 2

code/game/objects/effects/aliens.dm

@@ -119,10 +119,6 @@
 		healthcheck()
 
 
-/obj/structure/alien/resin/attack_paw(mob/user)
-	return attack_hand(user)
-
-
 /obj/structure/alien/resin/attack_alien(mob/living/user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
@@ -314,7 +310,7 @@
 		Grow()
 
 
-/obj/structure/alien/egg/attack_paw(mob/user)
+/obj/structure/alien/egg/attack_alien(mob/user)
 	if(isalien(user))
 		switch(status)
 			if(BURST)

code/game/objects/effects/effect_system.dm

@@ -1105,10 +1105,6 @@ steam.start() -- spawns the effect
 		if(metal==1 || prob(50))
 			del(src)
 
-	attack_paw(var/mob/user)
-		attack_hand(user)
-		return
-
 	attack_hand(var/mob/user)
 		if ((HULK in user.mutations) || (prob(75 - metal*25)))
 			user << "\blue You smash through the metal foam wall."

code/game/objects/effects/mines.dm

@@ -19,7 +19,7 @@
 
 	if(triggered) return
 
-	if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))
+	if(istype(M, /mob/living/carbon/human))
 		for(var/mob/O in viewers(world.view, src.loc))
 			O << "<font color='red'>[M] triggered the \icon[src] [src]</font>"
 		triggered = 1

code/game/objects/items.dm

@@ -165,7 +165,7 @@
 	return 1
 
 
-/obj/item/attack_paw(mob/user as mob)
+/obj/item/attack_alien(mob/user as mob)
 
 	if(isalien(user)) // -- TLE
 		var/mob/living/carbon/alien/A = user
@@ -202,7 +202,7 @@
 			A.unEquip(src)
 		user << "Your claws aren't capable of such fine manipulation."
 		return
-	attack_paw(A)
+	attack_hand(A)
 
 /obj/item/attack_ai(mob/user as mob)
 	if (istype(src.loc, /obj/item/weapon/robot_module))
@@ -494,34 +494,6 @@
 		return 0 //Unsupported slot
 		//END HUMAN
 
-	else if(ismonkey(M))
-		//START MONKEY
-		var/mob/living/carbon/monkey/MO = M
-		switch(slot)
-			if(slot_l_hand)
-				if(MO.l_hand)
-					return 0
-				return 1
-			if(slot_r_hand)
-				if(MO.r_hand)
-					return 0
-				return 1
-			if(slot_wear_mask)
-				if(MO.wear_mask)
-					return 0
-				if( !(slot_flags & SLOT_MASK) )
-					return 0
-				return 1
-			if(slot_back)
-				if(MO.back)
-					return 0
-				if( !(slot_flags & SLOT_BACK) )
-					return 0
-				return 1
-		return 0 //Unsupported slot
-
-		//END MONKEY
-
 
 /obj/item/verb/verb_pickup()
 	set src in oview(1)
@@ -586,14 +558,6 @@
 		user << "\red You're going to need to remove that mask/helmet/glasses first."
 		return
 
-	var/mob/living/carbon/monkey/Mo = M
-	if(istype(Mo) && ( \
-			(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
-		))
-		// you can't stab someone in the eyes wearing a mask!
-		user << "\red You're going to need to remove that mask/helmet/glasses first."
-		return
-
 	if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N     slimes also don't have eyes!
 		user << "\red You cannot locate any eyes on this creature!"
 		return

code/game/objects/items/devices/PDA/PDA.dm

@@ -1134,9 +1134,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				JFLOG("[user] used the fingerprint scanner on [C]")
 				if (!istype(C:dna, /datum/dna))
 					user << "\blue No fingerprints found on [C]"
-				else if(!istype(C, /mob/living/carbon/monkey))
-					if(!isnull(C:gloves))
-						user << "\blue No fingerprints found on [C]"
 				else
 					user << text("\blue [C]'s Fingerprints: [md5(C:dna.uni_identity)]")
 				if ( !(C:blood_DNA) )

code/game/objects/items/devices/flashlight.dm

@@ -68,7 +68,7 @@
 		user.visible_message("<span class='notice'>[user] directs [src] to [M]'s eyes.</span>", \
 							 "<span class='notice'>You direct [src] to [M]'s eyes.</span>")
 
-		if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))	//robots and aliens are unaffected
+		if(istype(M, /mob/living/carbon/human))	//robots and aliens are unaffected
 			if(M.stat == DEAD || M.sdisabilities & BLIND)	//mob is dead or fully blind
 				user << "<span class='notice'>[M] pupils does not react to the light!</span>"
 			else if(XRAY in M.mutations)	//mob has X-RAY vision

code/game/objects/items/devices/powersink.dm

@@ -67,8 +67,6 @@
 		attached = null
 		..()
 
-	attack_paw()
-		return
 
 	attack_ai()
 		return

code/game/objects/items/devices/radio/intercom.dm

@@ -40,9 +40,6 @@
 	spawn (0)
 		attack_self(user)
 
-/obj/item/device/radio/intercom/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
 /obj/item/device/radio/intercom/attack_hand(mob/user as mob)
 	add_fingerprint(user)
 	spawn (0)

code/game/objects/items/policetape.dm

@@ -172,9 +172,6 @@ var/list/tape_roll_applications = list()
 	else
 		breaktape(/obj/item/weapon/soap, user)//cant be null, and can't be sharp.
 
-/obj/item/tape/attack_paw(mob/user as mob)
-	breaktape(/obj/item/weapon/wirecutters,user)
-
 /obj/item/tape/attack_alien(mob/user as mob)
 	breaktape(/obj/item/weapon/wirecutters,user)
 

code/game/objects/items/stacks/medical.dm

@@ -15,7 +15,7 @@
 		user << "<span class='danger'>\The [src] cannot be applied to [M]!</span>"
 		return 1
 
-	if (!(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon) || istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey"))
+	if (!(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon)))
 		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
 		return 1
 

code/game/objects/items/weapons/dna_injector.dm

@@ -26,9 +26,6 @@
 		buf.dna.ResetSE()
 		SetValue(value)
 
-/obj/item/weapon/dnainjector/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
 /obj/item/weapon/dnainjector/proc/GetRealBlock(var/selblock)
 	if(selblock==0)
 		return block
@@ -102,8 +99,7 @@
 		var/mob/living/carbon/human/H = M
 		if(H.species.flags & IS_SYNTHETIC)
 			return
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		user << "\red You don't have the dexterity to do this!"
+	if (!usr.IsAdvancedToolUser())
 		return
 
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [name] by [user.name] ([user.ckey])</font>")
@@ -160,7 +156,7 @@
 				for(var/mob/O in viewers(M, null))
 					O.show_message(text("\red [] has been injected with [] by [].", M, src, user), 1)
 					//Foreach goto(192)
-				if (!(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)))
+				if (!(istype(M, /mob/living/carbon/human)))
 					user << "\red Apparently it didn't work."
 					return
 

code/game/objects/items/weapons/grenades.dm

@@ -385,7 +385,7 @@
 /obj/item/weapon/grenade/clusterbuster/monkey
 	name = "Barrel of Monkeys"
 	desc = "Not really that much fun."
-	payload = /mob/living/carbon/monkey
+	payload = /mob/living/carbon/human/monkey
 /obj/item/weapon/grenade/clusterbuster/fluffy
 	name = "Fluffy Love Bomb"
 	desc = "Exactly as snuggly as it sounds."

code/game/objects/items/weapons/grenades/grenade.dm

@@ -102,6 +102,3 @@
 /obj/item/weapon/grenade/attack_hand()
 	walk(src, null, null)
 	..()
-
-/obj/item/weapon/grenade/attack_paw(mob/user as mob)
-	return attack_hand(user)

code/game/objects/items/weapons/handcuffs.dm

@@ -17,6 +17,9 @@
 	var/trashtype = null //For disposable cuffs
 
 /obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/user)
+	if(!user.IsAdvancedToolUser())
+		return
+
 	if(CLUMSY in user.mutations && prob(50))
 		user << "<span class='warning'>Uh... how do those things work?!</span>"
 		apply_cuffs(user,user)

code/game/objects/items/weapons/storage/bags.dm

@@ -378,7 +378,7 @@
 	else
 		playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
 
-	if(ishuman(M) || ismonkey(M))
+	if(ishuman(M))
 		if(prob(10))
 			M.Weaken(2)
 

code/game/objects/items/weapons/storage/boxes.dm

@@ -411,7 +411,7 @@
 		for(var/i = 1; i <= 5; i++)
 			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
 
-
+/*
 /obj/item/weapon/storage/box/wolpincubes
 	name = "wolpin cube box"
 	desc = "Drymate brand wolpin cubes. Just add water!"
@@ -423,6 +423,7 @@
 		..()
 		for(var/i = 1; i <= 5; i++)
 			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src)
+*/
 
 /obj/item/weapon/storage/box/permits
 	name = "box of construction permits"

code/game/objects/items/weapons/storage/firstaid.dm

@@ -168,7 +168,7 @@
 
 /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
 
-	if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+	if (ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
 		var/mob/M = usr
 		if (!( istype(over_object, /obj/screen) ))
 			return ..()

code/game/objects/items/weapons/storage/internal.dm

@@ -26,7 +26,7 @@
 //returns 1 if the master item's parent's MouseDrop() should be called, 0 otherwise. It's strange, but no other way of
 //doing it without the ability to call another proc's parent, really.
 /obj/item/weapon/storage/internal/proc/handle_mousedrop(mob/user as mob, obj/over_object as obj)
-	if (ishuman(user) || ismonkey(user)) //so monkeys can take off their backpacks -- Urist
+	if (ishuman(user)) //so monkeys can take off their backpacks -- Urist
 
 		if (istype(user.loc,/obj/mecha)) // stops inventory actions in a mech
 			return 0

code/game/objects/items/weapons/storage/storage.dm

@@ -25,7 +25,7 @@
 	var/use_sound = "rustle"	//sound played when used. null for no sound.
 
 /obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
-	if (ishuman(usr) || ismonkey(usr)) //so monkeys can take off their backpacks -- Urist
+	if (ishuman(usr)) //so monkeys can take off their backpacks -- Urist
 		var/mob/M = usr
 
 		if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech

code/game/objects/items/weapons/twohanded.dm

@@ -59,11 +59,16 @@
 	unwield()
 
 /obj/item/weapon/twohanded/attack_self(mob/user as mob)
-	if( istype(user,/mob/living/carbon/monkey) )
-		user << "<span class='warning'>It's too heavy for you to wield fully.</span>"
+	..()
+
+	if(istype(user, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		if(H.species.is_small)
+			user << "<span class='warning'>It's too heavy for you to wield fully.</span>"
+			return
+	else
 		return
 
-	..()
 	if(wielded) //Trying to unwield it
 		unwield()
 		user << "<span class='notice'>You are now carrying the [name] with one hand.</span>"

code/game/objects/structures/bedsheet_bin.dm

@@ -193,10 +193,6 @@ LINEN BINS
 
 
 
-/obj/structure/bedsheetbin/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
-
 /obj/structure/bedsheetbin/attack_hand(mob/user as mob)
 	if(amount >= 1)
 		amount--

code/game/objects/structures/crates_lockers/closets.dm

@@ -328,10 +328,6 @@
 			spawn(30)
 				lastbang = 0
 
-
-/obj/structure/closet/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
 /obj/structure/closet/attack_hand(mob/user as mob)
 	src.add_fingerprint(user)
 	src.toggle(user)

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -183,10 +183,6 @@
 			usr << "\blue The [src.name] is closed."
 		update_icon()
 
-	attack_paw(mob/user as mob)
-		attack_hand(user)
-		return
-
 	attack_ai(mob/user as mob)
 		if(src.smashed)
 			user << "\red The security of the cabinet is compromised."

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -100,9 +100,6 @@
 	else
 		src.toggle(user)
 
-/obj/structure/closet/secure_closet/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
 /obj/structure/closet/secure_closet/verb/verb_togglelock()
 	set src in oview(1) // One square distance
 	set category = "Object"

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -14,7 +14,7 @@
 
 /obj/structure/closet/statue/New(loc, var/mob/living/L)
 
-	if(ishuman(L) || ismonkey(L) || iscorgi(L))
+	if(ishuman(L) || iscorgi(L))
 		if(L.buckled)
 			L.buckled = 0
 			L.anchored = 0
@@ -28,13 +28,13 @@
 		intialFire = L.getFireLoss()
 		intialBrute = L.getBruteLoss()
 		intialOxy = L.getOxyLoss()
-		if(ishuman(L))
+		if(issmall(L))
+			name = "statue of a monkey"
+			icon_state = "monkey"
+		else if(ishuman(L))
 			name = "statue of [L.name]"
 			if(L.gender == "female")
 				icon_state = "human_female"
-		else if(ismonkey(L))
-			name = "statue of a monkey"
-			icon_state = "monkey"
 		else if(iscorgi(L))
 			name = "statue of a corgi"
 			icon_state = "corgi"

code/game/objects/structures/displaycase.dm

@@ -72,7 +72,7 @@
 	desc = "A display case for the captain's antique laser gun. It taunts you to kick it."
 
 /obj/structure/displaycase/captains_laser/New()
-	req_access = list(access_captain)	
+	req_access = list(access_captain)
 	locked = 1
 	spawn(5)
 		occupant = new /obj/item/weapon/gun/energy/laser/captain(src)
@@ -217,8 +217,6 @@
 			occupant=W
 			update_icon()
 
-/obj/structure/displaycase/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
 
 /obj/structure/displaycase/attack_hand(mob/user as mob)
 	if (destroyed)

code/game/objects/structures/extinguisher.dm

@@ -55,10 +55,6 @@
 		opened = !opened
 	update_icon()
 
-/obj/structure/extinguisher_cabinet/attack_paw(mob/user)
-	attack_hand(user)
-	return
-
 
 /obj/structure/extinguisher_cabinet/update_icon()
 	if(!opened)

code/game/objects/structures/grille.dm

@@ -54,9 +54,6 @@
 	if(ismob(user)) shock(user, 70)
 
 
-/obj/structure/grille/attack_paw(mob/living/user as mob)
-	attack_hand(user)
-
 /obj/structure/grille/attack_hand(mob/living/user as mob)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)

code/game/objects/structures/inflatable.dm

@@ -67,9 +67,6 @@
 	//world << "glass at [x],[y],[z] Mhit"
 		deflate(1)
 
-	attack_paw(mob/user as mob)
-		return attack_generic(user, 15)
-
 	attack_hand(mob/user as mob)
 		add_fingerprint(user)
 		return
@@ -184,9 +181,6 @@
 			if(get_dist(user,src) <= 1) //not remotely though
 				return TryToSwitchState(user)
 
-	attack_paw(mob/user as mob)
-		return TryToSwitchState(user)
-
 	attack_hand(mob/user as mob)
 		return TryToSwitchState(user)
 

code/game/objects/structures/kitchen_spike.dm

@@ -4,77 +4,57 @@
 	name = "a meat spike"
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "spike"
-	desc = "A spike for collecting meat from animals"
+	desc = "A spike for collecting meat from animals."
 	density = 1
 	anchored = 1
 	var/meat = 0
-	var/occupied = 0
-	var/meattype = 0 // 0 - Nothing, 1 - Monkey, 2 - Xeno
+	var/occupied
+	var/meat_type
+	var/victim_name = "corpse"
 
-/obj/structure/kitchenspike
-	attack_paw(mob/user as mob)
-		return src.attack_hand(usr)
-
-	attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params)
-		if(!istype(G, /obj/item/weapon/grab))
-			return
-		if(istype(G.affecting, /mob/living/carbon/monkey))
-			if(src.occupied == 0)
-				src.icon_state = "spikebloody"
-				src.occupied = 1
-				src.meat = 5
-				src.meattype = 1
-				for(var/mob/O in viewers(src, null))
-					O.show_message(text("\red [user] has forced [G.affecting] onto the spike, killing them instantly!"))
-				del(G.affecting)
-				del(G)
-
-			else
-				user << "\red The spike already has something on it, finish collecting its meat first!"
-		else if(istype(G.affecting, /mob/living/carbon/alien))
-			if(src.occupied == 0)
-				src.icon_state = "spikebloodygreen"
-				src.occupied = 1
-				src.meat = 5
-				src.meattype = 2
-				for(var/mob/O in viewers(src, null))
-					O.show_message(text("\red [user] has forced [G.affecting] onto the spike, killing them instantly!"))
-				del(G.affecting)
-				del(G)
-			else
-				user << "\red The spike already has something on it, finish collecting its meat first!"
+/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
+	if(!istype(G, /obj/item/weapon/grab) || !G.affecting)
+		return
+	if(occupied)
+		user << "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>"
+	else
+		if(spike(G.affecting))
+			visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>")
+			del(G.affecting)
+			del(G)
 		else
-			user << "\red They are too big for the spike, try something smaller!"
-			return
+			user << "<span class='danger'>They are too big for the spike, try something smaller!</span>"
 
-//	MouseDrop_T(var/atom/movable/C, mob/user)
-//		if(istype(C, /obj/mob/carbon/monkey)
-//		else if(istype(C, /obj/mob/carbon/alien) && !istype(C, /mob/living/carbon/alien/larva/slime))
-//		else if(istype(C, /obj/livestock/spesscarp
+/obj/structure/kitchenspike/proc/spike(var/mob/living/victim)
 
-	attack_hand(mob/user as mob)
-		if(..())
-			return
-		if(src.occupied)
-			if(src.meattype == 1)
-				if(src.meat > 1)
-					src.meat--
-					new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey( src.loc )
-					usr << "You remove some meat from the monkey."
-				else if(src.meat == 1)
-					src.meat--
-					new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src.loc)
-					usr << "You remove the last piece of meat from the monkey!"
-					src.icon_state = "spike"
-					src.occupied = 0
-			else if(src.meattype == 2)
-				if(src.meat > 1)
-					src.meat--
-					new /obj/item/weapon/reagent_containers/food/snacks/xenomeat( src.loc )
-					usr << "You remove some meat from the alien."
-				else if(src.meat == 1)
-					src.meat--
-					new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src.loc)
-					usr << "You remove the last piece of meat from the alien!"
-					src.icon_state = "spike"
-					src.occupied = 0
+	if(!istype(victim))
+		return
+
+	if(istype(victim, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = victim
+		if(!H.species.is_small)
+			return 0
+		meat_type = H.species.meat_type
+		icon_state = "spikebloody"
+	else if(istype(victim, /mob/living/carbon/alien))
+		meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
+		icon_state = "spikebloodygreen"
+	else
+		return 0
+
+	victim_name = victim.name
+	occupied = 1
+	meat = 5
+	return 1
+
+/obj/structure/kitchenspike/attack_hand(mob/user as mob)
+	if(..() || !occupied)
+		return
+	meat--
+	new meat_type(get_turf(src))
+	if(src.meat > 1)
+		user << "You remove some meat from \the [victim_name]."
+	else if(src.meat == 1)
+		user << "You remove the last piece of meat from \the [victim_name]!"
+		icon_state = "spike"
+		occupied = 0

code/game/objects/structures/ladders.dm

@@ -66,8 +66,5 @@
 
 	add_fingerprint(user)
 
-/obj/structure/ladder/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
 /obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params)
 	return attack_hand(user)

code/game/objects/structures/lamarr_cage.dm

@@ -72,9 +72,6 @@
 	..()
 	return
 
-/obj/structure/lamarr/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
 /obj/structure/lamarr/attack_hand(mob/user as mob)
 	if (src.destroyed)
 		return

code/game/objects/structures/mineral_doors.dm

@@ -44,9 +44,6 @@
 			if(get_dist(user,src) <= 1) //not remotely though
 				return TryToSwitchState(user)
 
-	attack_paw(mob/user as mob)
-		return TryToSwitchState(user)
-
 	attack_hand(mob/user as mob)
 		return TryToSwitchState(user)
 

code/game/objects/structures/morgue.dm

@@ -27,13 +27,13 @@
 		if(src.contents.len)
 
 			var/mob/living/M = locate() in contents
-			
+
 			var/obj/structure/closet/body_bag/B = locate() in contents
 			if(M==null) M = locate() in B
 
 			if(M)
 				var/mob/dead/observer/G = M.get_ghost()
-				
+
 				if(M.client)
 					src.icon_state = "morgue3"
 				else if(G && G.client) //There is a ghost and it is connected to the server
@@ -73,8 +73,6 @@
 /obj/structure/morgue/alter_health()
 	return src.loc
 
-/obj/structure/morgue/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
 
 /obj/structure/morgue/attack_hand(mob/user as mob)
 	if (src.connected)
@@ -155,8 +153,6 @@
 	anchored = 1.0
 	throwpass = 1
 
-/obj/structure/m_tray/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
 
 /obj/structure/m_tray/attack_hand(mob/user as mob)
 	if (src.connected)
@@ -240,8 +236,6 @@
 /obj/structure/crematorium/alter_health()
 	return src.loc
 
-/obj/structure/crematorium/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
 
 /obj/structure/crematorium/attack_hand(mob/user as mob)
 //	if (cremating) AWW MAN! THIS WOULD BE SO MUCH MORE FUN ... TO WATCH
@@ -375,9 +369,6 @@
 	anchored = 1.0
 	throwpass = 1
 
-/obj/structure/c_tray/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
 /obj/structure/c_tray/attack_hand(mob/user as mob)
 	if (src.connected)
 		for(var/atom/movable/A as mob|obj in src.loc)

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -30,9 +30,6 @@
 	..()
 	return
 
-/obj/structure/stool/bed/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
 /obj/structure/stool/bed/attack_hand(mob/user as mob)
 	manual_unbuckle(user)
 	return

code/game/objects/structures/tables_racks.dm

@@ -294,13 +294,6 @@
 	if(prob(75))
 		destroy()
 
-/obj/structure/table/attack_paw(mob/living/user)
-	if(HULK in user.mutations)
-		user.do_attack_animation(src)
-		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-		visible_message("<span class='danger'>[user] smashes the [src] apart!</span>")
-		destroy()
-
 
 /obj/structure/table/attack_alien(mob/living/user)
 	user.do_attack_animation(src)
@@ -923,13 +916,6 @@
 		destroy()
 
 
-/obj/structure/rack/attack_paw(mob/living/user)
-	if(HULK in user.mutations)
-		user.do_attack_animation(src)
-		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
-		destroy()
-
 
 /obj/structure/rack/attack_alien(mob/living/user)
 	user.do_attack_animation(src)

code/game/objects/structures/window.dm

@@ -148,9 +148,6 @@ var/global/wcColored
 	return
 
 
-/obj/structure/window/attack_paw(mob/user as mob)
-	return attack_hand(user)
-
 /obj/structure/window/proc/attack_generic(mob/living/user as mob, damage = 0)	//used by attack_alien, attack_animal, and attack_slime
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)