From 5d73dcc11eb7ed8e2c5ce526bc603f10840d0023 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 6 Feb 2023 14:29:57 +0100
Subject: [PATCH] [MIRROR] Cat Nuzzles [MDB IGNORE] (#19163)

* Cat Nuzzles (#73182)

## About The Pull Request
Fixes https://github.com/tgstation/tgstation/issues/72946

Cat still splats rats, nuzzles everything else, everything is okay in
the world.

![dreamseeker_evbIZr3ejw](https://user-images.githubusercontent.com/83487515/216530178-93b83d72-ae7c-4e07-92c1-0d4732ff2333.gif)

![image](https://user-images.githubusercontent.com/83487515/216531463-360e05d4-8b68-4aad-9353-41eb61cb3607.png)
## Why It's Good For The Game
Cat nuzzling broken is Against God and Nature

## Changelog
:cl: LT3
fix: Cats can nuzzle people
/:cl:

* Cat Nuzzles

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
---
 code/modules/mob/living/simple_animal/friendly/cat.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 8dab8456ded..398cf2f239f 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -35,9 +35,6 @@
 	has_collar_resting_icon_state = TRUE
 	can_be_held = TRUE
 	held_state = "cat2"
-	///only for attacking rats
-	melee_damage_upper = 6
-	melee_damage_lower = 4
 	attack_verb_continuous = "claws"
 	attack_verb_simple = "claw"
 	attack_sound = 'sound/weapons/slash.ogg'
@@ -224,7 +221,7 @@
 
 	//MICE! RATS! OH MY!
 	if((src.loc) && isturf(src.loc))
-		if(!stat && !resting && !buckled)
+		if(!stat && !buckled)
 			//Targeting anything in the rat faction nearby
 			for(var/mob/living/M in view(1,src))
 				if(!M.stat && Adjacent(M))
@@ -244,8 +241,6 @@
 							movement_target = null
 							stop_automated_movement = 0
 							break
-						//Rat scratching, or anything else that could be in the rat faction
-						M.attack_animal(src)
 			for(var/obj/item/toy/cattoy/T in view(1,src))
 				if (T.cooldown < (world.time - 400))
 					manual_emote("bats \the [T] around with \his paw!")