From 665856c1522038dcf6ce8077e1e3086860599e0b Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Sat, 13 Jan 2018 12:58:21 -0200
Subject: [PATCH 1/2] Merge pull request #34358 from ShizCalev/nest-pet-collar

Cleans up a nesting level in pet attackby
---
 .../mob/living/simple_animal/friendly/pet.dm  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm
index 04295dfbd1..8c39cf0c0b 100644
--- a/code/modules/mob/living/simple_animal/friendly/pet.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pet.dm
@@ -7,17 +7,16 @@
 	blood_volume = BLOOD_VOLUME_NORMAL
 
 /mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar)
-		if(collar_type)
-			var/obj/item/clothing/neck/petcollar/P = O
-			pcollar = P.type
-			regenerate_icons()
-			to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
-			if(P.tagname && !unique_pet)
-				real_name = "\proper [P.tagname]"
-				name = real_name
-			qdel(P)
-			return
+	if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar && collar_type)
+		var/obj/item/clothing/neck/petcollar/P = O
+		pcollar = P.type
+		regenerate_icons()
+		to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
+		if(P.tagname && !unique_pet)
+			real_name = "\proper [P.tagname]"
+			name = real_name
+		qdel(P)
+		return
 
 	if(istype(O, /obj/item/newspaper))
 		if(!stat)