elementize pet collars (#29209)

code/modules/mob/living/living_status_procs.dm

@@ -120,6 +120,7 @@ STATUS EFFECTS
 			layer = LYING_MOB_LAYER //so mob lying always appear behind standing mobs
 	ADD_TRAIT(src, TRAIT_UI_BLOCKED, LYING_DOWN_TRAIT)
 	ADD_TRAIT(src, TRAIT_CANNOT_PULL, LYING_DOWN_TRAIT)
+	SEND_SIGNAL(src, COMSIG_LIVING_RESTING, TRUE)
 	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(orient_crawling))
 	set_density(FALSE)
 	set_lying_angle(pick(90, 270))
@@ -129,6 +130,7 @@ STATUS EFFECTS
 		layer = initial(layer)
 	set_density(initial(density))
 	REMOVE_TRAITS_IN(src, LYING_DOWN_TRAIT)
+	SEND_SIGNAL(src, COMSIG_LIVING_RESTING, FALSE)
 	UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
 	set_lying_angle(0)
 	pixel_y = 0

code/modules/mob/living/simple_animal/animal_defense.dm

@@ -1,8 +1,3 @@
-/mob/living/simple_animal/item_interaction(mob/living/user, obj/item/O, list/modifiers)
-	if(can_collar && istype(O, /obj/item/petcollar) && !pcollar)
-		add_collar(O, user)
-		return ITEM_INTERACT_COMPLETE
-
 /mob/living/simple_animal/attack_hand(mob/living/carbon/human/M)
 	..()
 	switch(M.a_intent)

code/modules/mob/living/simple_animal/friendly/bunny.dm

@@ -25,10 +25,13 @@
 	maxbodytemp = 323	//Above 50 Degrees Celcius
 	can_hide = TRUE
 	holder_type = /obj/item/holder/bunny
-	can_collar = TRUE
 	gold_core_spawnable = FRIENDLY_SPAWN
 	ventcrawler = VENTCRAWLER_ALWAYS
 
+/mob/living/simple_animal/bunny/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /mob/living/simple_animal/bunny/attack_hand(mob/living/carbon/human/M)
 	if(M.a_intent == INTENT_HELP)
 		get_scooped(M, TRUE)

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -22,12 +22,16 @@
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
 	gold_core_spawnable = FRIENDLY_SPAWN
-	collar_type = "cat"
 	var/turns_since_scan = 0
 	var/mob/living/simple_animal/mouse/movement_target
 	var/eats_mice = 1
+	var/collar_icon_state = "cat"
 	footstep_type = FOOTSTEP_MOB_CLAW
 
+/mob/living/simple_animal/pet/cat/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar, collar_icon_state_ = collar_icon_state, collar_resting_icon_state_ = TRUE)
+
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/pet/cat/runtime
 	name = "Runtime"
@@ -118,7 +122,6 @@
 	resting = TRUE
 	custom_emote(EMOTE_VISIBLE, pick("sits down.", "crouches on its hind legs.", "looks alert."))
 	icon_state = "[icon_living]_sit"
-	collar_type = "[initial(collar_type)]_sit"
 
 /mob/living/simple_animal/pet/cat/handle_automated_action()
 	if(stat == CONSCIOUS && !buckled)
@@ -195,7 +198,7 @@
 	gender = NEUTER
 	density = FALSE
 	pass_flags = PASSMOB
-	collar_type = "kitten"
+	collar_icon_state = "kitten"
 
 /mob/living/simple_animal/pet/cat/syndi
 	name = "SyndiCat"

code/modules/mob/living/simple_animal/friendly/corgi_stripping.dm

@@ -2,8 +2,7 @@
 
 GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 	/datum/strippable_item/corgi_head,
-	/datum/strippable_item/corgi_back,
-	/datum/strippable_item/pet_collar
+	/datum/strippable_item/corgi_back
 )))
 
 /datum/strippable_item/corgi_head
@@ -41,7 +40,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 	if(!istype(pet_source))
 		return
 
-	return pet_source.pcollar
+	return (locate(/obj/item/petcollar) in source)
 
 /datum/strippable_item/pet_collar/try_equip(atom/source, obj/item/equipping, mob/user)
 	. = ..()
@@ -59,15 +58,15 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 	if(!istype(pet_source))
 		return
 
-	INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living/simple_animal, add_collar), equipping, user)
+	user.transfer_item_to(equipping, source)
 
 /datum/strippable_item/pet_collar/finish_unequip(atom/source, mob/user)
 	var/mob/living/simple_animal/pet_source = source
 	if(!istype(pet_source))
 		return
 
-	INVOKE_ASYNC(pet_source, TYPE_PROC_REF(/mob/living/simple_animal, remove_collar), user.drop_location(), user)
-
+	var/obj/item/petcollar/collar = locate() in source
+	user.put_in_hands(collar)
 
 /datum/strippable_item/corgi_back
 	key = STRIPPABLE_ITEM_BACK

code/modules/mob/living/simple_animal/friendly/crab.dm

@@ -18,9 +18,12 @@
 	friendly = "pinches"
 	ventcrawler = VENTCRAWLER_ALWAYS
 	can_hide = TRUE
-	can_collar = TRUE
 	gold_core_spawnable = FRIENDLY_SPAWN
 
+/mob/living/simple_animal/crab/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /mob/living/simple_animal/crab/handle_automated_movement()
 	//CRAB movement
 	if(stat == CONSCIOUS || !isturf(loc) || IS_HORIZONTAL(src) || buckled)

code/modules/mob/living/simple_animal/friendly/deer.dm

@@ -15,6 +15,9 @@
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "kicks"
-	can_collar = TRUE
 	mob_biotypes = MOB_ORGANIC | MOB_BEAST
 	gold_core_spawnable = FRIENDLY_SPAWN
+
+/mob/living/simple_animal/deer/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)

code/modules/mob/living/simple_animal/friendly/diona_nymph.dm

@@ -43,7 +43,6 @@
 
 	var/list/donors = list()
 	holder_type = /obj/item/holder/diona
-	can_collar = TRUE
 
 	a_intent = INTENT_HELP
 	var/evolve_donors = 5 //amount of blood donors needed before evolving
@@ -54,6 +53,10 @@
 	var/datum/action/innate/diona/evolve/evolve_action = new()
 	var/datum/action/innate/diona/steal_blood/steal_blood_action = new()
 
+/mob/living/simple_animal/diona/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /datum/action/innate/diona/merge
 	name = "Merge with gestalt"
 	button_overlay_icon = 'icons/mob/human_races/r_diona.dmi'

code/modules/mob/living/simple_animal/friendly/dog.dm

@@ -73,7 +73,6 @@
 	butcher_results = list(/obj/item/food/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
 	childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
 	animal_species = /mob/living/simple_animal/pet/dog
-	collar_type = "corgi"
 	hud_type = /datum/hud/corgi
 	///Currently worn item on the head slot
 	var/obj/item/inventory_head = null
@@ -84,13 +83,14 @@
 	var/shaved = FALSE
 	var/nofur = FALSE 		//Corgis that have risen past the material plane of existence.
 	var/razor_shave_delay = 5 SECONDS
+	var/collar_icon_state = "corgi"
+
 
 /mob/living/simple_animal/pet/dog/corgi/Initialize(mapload)
 	. = ..()
-	regenerate_icons()
-
-/mob/living/simple_animal/pet/dog/corgi/add_strippable_element()
+	AddElement(/datum/element/wears_collar, collar_icon_state_ = collar_icon_state)
 	AddElement(/datum/element/strippable, length(strippable_inventory_slots) ? create_strippable_list(strippable_inventory_slots) : GLOB.strippable_corgi_items)
+	regenerate_icons()
 
 /mob/living/simple_animal/pet/dog/corgi/Destroy()
 	QDEL_NULL(inventory_head)
@@ -246,7 +246,7 @@
 		item_to_add.forceMove(src)
 		inventory_head = item_to_add
 		update_corgi_fluff()
-		regenerate_icons()
+		update_appearance()
 	else
 		to_chat(user, "<span class='warning'>You set [item_to_add] on [src]'s head, but it falls off!</span>")
 		item_to_add.forceMove(drop_location())
@@ -276,8 +276,9 @@
 		var/datum/dog_fashion/DF = new inventory_back.dog_fashion(src)
 		DF.apply(src)
 
-/mob/living/simple_animal/pet/dog/corgi/regenerate_icons()
-	..()
+/mob/living/simple_animal/pet/dog/corgi/update_overlays()
+	. = ..()
+
 	if(inventory_head)
 		var/image/head_icon
 		var/datum/dog_fashion/DF = new inventory_head.dog_fashion(src)
@@ -296,7 +297,7 @@
 		else
 			head_icon = DF.get_overlay()
 
-		add_overlay(head_icon)
+		. += head_icon
 
 	if(inventory_back)
 		var/image/back_icon
@@ -315,7 +316,8 @@
 			back_icon.transform = turn(back_icon.transform, 180)
 		else
 			back_icon = DF.get_overlay()
-		add_overlay(back_icon)
+
+		. += back_icon
 
 //IAN! SQUEEEEEEEEE~
 /mob/living/simple_animal/pet/dog/corgi/ian
@@ -519,9 +521,8 @@
 	density = FALSE
 	pass_flags = PASSMOB
 	mob_size = MOB_SIZE_SMALL
-	collar_type = "puppy"
-	strippable_inventory_slots = list(/datum/strippable_item/pet_collar) // Puppies do not have a head or back equipment slot.
-
+	strippable_inventory_slots = list() // Puppies do not have a head or back equipment slot.
+	collar_icon_state = "puppy"
 
 /// Tribute to the corgis born in nullspace
 /mob/living/simple_animal/pet/dog/corgi/puppy/void
@@ -553,7 +554,7 @@
 	response_help  = "pets"
 	response_disarm = "bops"
 	response_harm   = "kicks"
-	strippable_inventory_slots = list(/datum/strippable_item/corgi_back, /datum/strippable_item/pet_collar) //Lisa already has a cute bow!
+	strippable_inventory_slots = list(/datum/strippable_item/corgi_back) //Lisa already has a cute bow!
 	var/turns_since_scan = 0
 
 /mob/living/simple_animal/pet/dog/corgi/lisa/Life()
@@ -655,7 +656,10 @@
 	icon_living = "pug"
 	icon_dead = "pug_dead"
 	butcher_results = list(/obj/item/food/meat/pug = 3)
-	collar_type = "pug"
+
+/mob/living/simple_animal/pet/dog/pug/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar, collar_icon_state_ = "pug")
 
 /mob/living/simple_animal/pet/dog/pug/handle_automated_movement()
 	. = ..()

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -26,7 +26,6 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 2
 	stop_automated_movement_when_pulled = TRUE
-	can_collar = TRUE
 	blood_volume = BLOOD_VOLUME_NORMAL
 	var/obj/item/udder/cow/udder = null
 	gender = FEMALE
@@ -35,6 +34,7 @@
 /mob/living/simple_animal/hostile/retaliate/goat/Initialize(mapload)
 	. = ..()
 	udder = new()
+	AddElement(/datum/element/wears_collar)
 
 /mob/living/simple_animal/hostile/retaliate/goat/Destroy()
 	QDEL_NULL(udder)
@@ -135,12 +135,12 @@
 	mob_size = MOB_SIZE_TINY
 	holder_type = /obj/item/holder/chicken
 	can_hide = TRUE
-	can_collar = TRUE
 	gold_core_spawnable = FRIENDLY_SPAWN
 	footstep_type = FOOTSTEP_MOB_CLAW
 
 /mob/living/simple_animal/chick/Initialize(mapload)
 	. = ..()
+	AddElement(/datum/element/wears_collar)
 	scatter_atom()
 
 /mob/living/simple_animal/chick/scatter_atom(x_offset, y_offset)
@@ -157,10 +157,10 @@
 				C.name = name
 			if(mind)
 				mind.transfer_to(C)
-			if(pcollar)
-				var/the_collar = pcollar
-				drop_item_to_ground(pcollar)
-				C.add_collar(the_collar)
+
+			for(var/atom/movable/AM in contents)
+				AM.forceMove(C)
+
 			qdel(src)
 
 
@@ -208,7 +208,6 @@ GLOBAL_VAR_INIT(chicken_count, 0)
 	mob_size = MOB_SIZE_SMALL
 	holder_type = /obj/item/holder/chicken
 	can_hide = TRUE
-	can_collar = TRUE
 	var/list/feedMessages = list("It clucks happily.","It clucks happily.")
 	var/list/layMessage = EGG_LAYING_MESSAGES
 	var/list/validColors = list("brown","black","white")
@@ -222,6 +221,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
 	icon_state = "[icon_prefix]_[body_color]"
 	icon_living = "[icon_prefix]_[body_color]"
 	icon_dead = "[icon_prefix]_[body_color]_dead"
+	AddElement(/datum/element/wears_collar)
 	scatter_atom()
 	update_appearance(UPDATE_ICON_STATE)
 	GLOB.chicken_count += 1
@@ -325,11 +325,14 @@ GLOBAL_VAR_INIT(chicken_count, 0)
 	attacktext = "pecks"
 	health = 50
 	maxHealth = 50
-	can_collar = TRUE
 	mob_biotypes = MOB_ORGANIC | MOB_BEAST
 	gold_core_spawnable = FRIENDLY_SPAWN
 	footstep_type = FOOTSTEP_MOB_CLAW
 
+/mob/living/simple_animal/turkey/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /mob/living/simple_animal/goose
 	name = "goose"
 	desc = "A pretty goose. Would make a nice comforter."
@@ -350,11 +353,14 @@ GLOBAL_VAR_INIT(chicken_count, 0)
 	attacktext = "kicks"
 	health = 50
 	maxHealth = 50
-	can_collar = TRUE
 	mob_biotypes = MOB_ORGANIC | MOB_BEAST
 	gold_core_spawnable = FRIENDLY_SPAWN
 	footstep_type = FOOTSTEP_MOB_CLAW
 
+/mob/living/simple_animal/goose/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /mob/living/simple_animal/seal
 	name = "seal"
 	desc = "A beautiful white seal."
@@ -375,11 +381,14 @@ GLOBAL_VAR_INIT(chicken_count, 0)
 	attacktext = "kicks"
 	health = 50
 	maxHealth = 50
-	can_collar = TRUE
 	mob_biotypes = MOB_ORGANIC | MOB_BEAST
 	gold_core_spawnable = FRIENDLY_SPAWN
 	blood_volume = BLOOD_VOLUME_NORMAL
 
+/mob/living/simple_animal/seal/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /mob/living/simple_animal/walrus
 	name = "walrus"
 	desc = "A big brown walrus."
@@ -400,11 +409,14 @@ GLOBAL_VAR_INIT(chicken_count, 0)
 	attacktext = "kicks"
 	health = 50
 	maxHealth = 50
-	can_collar = TRUE
 	mob_biotypes = MOB_ORGANIC | MOB_BEAST
 	gold_core_spawnable = FRIENDLY_SPAWN
 	blood_volume = BLOOD_VOLUME_NORMAL
 
+/mob/living/simple_animal/walrus/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /obj/item/udder
 	name = "udder"
 

code/modules/mob/living/simple_animal/friendly/lizard.dm

@@ -23,13 +23,16 @@
 	can_hide = TRUE
 	pass_door_while_hidden = TRUE
 	butcher_results = list(/obj/item/food/meat = 1)
-	can_collar = TRUE
 	mob_biotypes = MOB_ORGANIC | MOB_BEAST | MOB_REPTILE
 	gold_core_spawnable = FRIENDLY_SPAWN
 	var/eating_sound = 'sound/weapons/bite.ogg'
 	/// Lizards start with a tail
 	var/has_tail = TRUE
 
+/mob/living/simple_animal/lizard/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
+
 /mob/living/simple_animal/lizard/handle_automated_action()
 	if(stat == CONSCIOUS && !buckled)
 		if(prob(1))

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -34,12 +34,12 @@
 	can_hide = TRUE
 	pass_door_while_hidden = TRUE
 	holder_type = /obj/item/holder/mouse
-	can_collar = TRUE
 	gold_core_spawnable = FRIENDLY_SPAWN
 	var/chew_probability = 1
 
 /mob/living/simple_animal/mouse/Initialize(mapload)
 	. = ..()
+	AddElement(/datum/element/wears_collar)
 	AddComponent(/datum/component/squeak, list('sound/creatures/mousesqueak.ogg' = 1), 100, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) //as quiet as a mouse or whatever
 
 /mob/living/simple_animal/mouse/handle_automated_action()

code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm

@@ -41,7 +41,6 @@
 	attack_sound = 'sound/weapons/bite.ogg'
 
 	holder_type = /obj/item/holder/nian_caterpillar
-	can_collar = TRUE
 
 	/// Evolution action.
 	var/datum/action/innate/nian_caterpillar_emerge/evolve_action = new()
@@ -51,6 +50,7 @@
 /mob/living/simple_animal/nian_caterpillar/Initialize(mapload)
 	. = ..()
 	real_name = name
+	AddElement(/datum/element/wears_collar)
 	add_language("Tkachi")
 	evolve_action.Grant(src)
 

code/modules/mob/living/simple_animal/friendly/penguin.dm

@@ -19,6 +19,7 @@
 
 /mob/living/simple_animal/pet/penguin/Initialize(mapload)
 	. = ..()
+	AddElement(/datum/element/wears_collar)
 	AddElement(/datum/element/waddling)
 
 /mob/living/simple_animal/pet/penguin/emperor

code/modules/mob/living/simple_animal/friendly/pet.dm

@@ -3,7 +3,6 @@
 	mob_size = MOB_SIZE_SMALL
 	mob_biotypes = MOB_ORGANIC | MOB_BEAST
 	blood_volume = BLOOD_VOLUME_NORMAL
-	can_collar = TRUE
 	speed = 0 // same speed as a person.
 	hud_type = /datum/hud/corgi
 

code/modules/mob/living/simple_animal/friendly/sloth.dm

@@ -25,6 +25,9 @@
 	speed = 2
 	footstep_type = FOOTSTEP_MOB_CLAW
 
+/mob/living/simple_animal/pet/sloth/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/wears_collar)
 
 //IAA Sloth
 /mob/living/simple_animal/pet/sloth/paperwork

code/modules/mob/living/simple_animal/parrot.dm

@@ -33,7 +33,6 @@
 	icon_dead = "parrot_dead"
 	icon_resting = "parrot_sit"
 	pass_flags = PASSTABLE
-	can_collar = TRUE
 	blocks_emissive = EMISSIVE_BLOCK_UNIQUE
 	faction = list("neutral", "jungle")
 
@@ -127,7 +126,7 @@
 		/obj/machinery/computer/guestpass
 	))
 
-/mob/living/simple_animal/parrot/add_strippable_element()
+	AddElement(/datum/element/wears_collar)
 	AddElement(/datum/element/strippable, GLOB.strippable_parrot_items)
 
 /mob/living/simple_animal/parrot/Destroy()

code/modules/mob/living/simple_animal/parrot_stripping.dm

@@ -1,6 +1,5 @@
 GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 	/datum/strippable_item/parrot_headset,
-	/datum/strippable_item/pet_collar
 )))
 
 /datum/strippable_item/parrot_headset

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -87,13 +87,8 @@
 	/// Allows a mob to pass unbolted doors while hidden
 	var/pass_door_while_hidden = FALSE
 
-	var/obj/item/petcollar/pcollar = null
-	/// If the mob has collar sprites, define them.
-	var/collar_type
 	/// If the mob can be renamed
 	var/unique_pet = FALSE
-	/// Can add collar to mob or not, use the set_can_collar if you want to change this on runtime
-	var/can_collar = FALSE
 
 	/// Hot simple_animal baby making vars
 	var/list/childtype = null
@@ -152,12 +147,8 @@
 	if(can_hide)
 		var/datum/action/innate/hide/hide = new()
 		hide.Grant(src)
-	if(pcollar)
-		pcollar = new(src)
-		regenerate_icons()
 	if(footstep_type)
 		AddComponent(/datum/component/footstep, footstep_type)
-	add_strippable_element()
 
 	apply_atmos_requirements()
 	AddElement(/datum/element/body_temperature, minbodytemp, maxbodytemp, cold_damage_per_tick, heat_damage_per_tick)
@@ -165,7 +156,6 @@
 /mob/living/simple_animal/Destroy()
 	/// We need to clear the reference to where we're walking to properly GC
 	GLOB.move_manager.stop_looping(src)
-	QDEL_NULL(pcollar)
 	for(var/datum/action/innate/hide/hide in actions)
 		hide.Remove(src)
 	master_commander = null
@@ -200,11 +190,6 @@
 /mob/living/simple_animal/proc/remove_atmos_requirements()
 	RemoveElement(/datum/element/atmos_requirements)
 
-/mob/living/simple_animal/handle_atom_del(atom/A)
-	if(A == pcollar)
-		pcollar = null
-	return ..()
-
 /mob/living/simple_animal/examine(mob/user)
 	. = ..()
 	if(stat == DEAD)
@@ -222,9 +207,6 @@
 	..()
 	if(icon_resting && stat != DEAD)
 		icon_state = icon_resting
-		if(collar_type)
-			collar_type = "[initial(collar_type)]_rest"
-			regenerate_icons()
 	if(!can_crawl)
 		ADD_TRAIT(src, TRAIT_IMMOBILIZED, LYING_DOWN_TRAIT) //simple mobs cannot crawl (unless they can)
 
@@ -232,9 +214,6 @@
 	..()
 	if(icon_resting && stat != DEAD)
 		icon_state = icon_living
-		if(collar_type)
-			collar_type = "[initial(collar_type)]"
-			regenerate_icons()
 
 /mob/living/simple_animal/update_stat(reason = "none given")
 	if(status_flags & GODMODE)
@@ -316,10 +295,8 @@
 		for(var/path in butcher_results)
 			for(var/i in 1 to butcher_results[path])
 				new path(Tsec)
-	if(pcollar)
-		pcollar.forceMove(drop_location())
-		pcollar = null
 	..()
+
 /mob/living/simple_animal/say_quote(message)
 	var/verb = "says"
 
@@ -353,9 +330,6 @@
 	density = initial(density)
 	if(TRAIT_FLYING in initial_traits)
 		ADD_TRAIT(src, TRAIT_FLYING, INNATE_TRAIT)
-	if(collar_type)
-		collar_type = "[initial(collar_type)]"
-		regenerate_icons()
 
 /mob/living/simple_animal/death(gibbed)
 	// Only execute the below if we successfully died
@@ -389,9 +363,6 @@
 		if(flip_on_death)
 			transform = transform.Turn(180)
 		density = FALSE
-		if(collar_type)
-			collar_type = "[initial(collar_type)]_dead"
-			regenerate_icons()
 
 /mob/living/simple_animal/proc/CanAttack(atom/the_target)
 	if(see_invisible < the_target.invisibility)
@@ -472,20 +443,11 @@
 /mob/living/simple_animal/get_item_by_slot(slot_id)
 	switch(slot_id)
 		if(ITEM_SLOT_COLLAR)
-			return pcollar
+			return (locate(/obj/item/petcollar) in src)
 	. = ..()
 
 /mob/living/simple_animal/can_equip(obj/item/I, slot, disable_warning = 0)
-	// . = ..() // Do not call parent. We do not want animals using their hand slots.
-	switch(slot)
-		if(ITEM_SLOT_COLLAR)
-			if(pcollar)
-				return FALSE
-			if(!can_collar)
-				return FALSE
-			if(!istype(I, /obj/item/petcollar))
-				return FALSE
-			return TRUE
+	return FALSE
 
 /mob/living/simple_animal/equip_to_slot(obj/item/W, slot, initial = FALSE)
 	if(!istype(W))
@@ -497,23 +459,15 @@
 	W.layer = ABOVE_HUD_LAYER
 	W.plane = ABOVE_HUD_PLANE
 
-	switch(slot)
-		if(ITEM_SLOT_COLLAR)
-			add_collar(W)
-
 /mob/living/simple_animal/unequip_to(obj/item/target, atom/destination, force = FALSE, silent = FALSE, drop_inventory = TRUE, no_move = FALSE)
 	. = ..()
 	if(!. || !target)
 		return
 
-	if(target == pcollar)
-		pcollar = null
-		regenerate_icons()
-
 /mob/living/simple_animal/get_access()
 	. = ..()
-	if(pcollar)
-		. |= pcollar.GetAccess()
+	for(var/obj/item/petcollar/collar in contents)
+		. |= collar.GetAccess()
 
 /mob/living/simple_animal/update_transform()
 	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
@@ -587,41 +541,6 @@
 		LAZYREMOVE(idle_mobs_on_old_z, src)
 		toggle_ai(initial(AIStatus))
 
-/mob/living/simple_animal/proc/add_collar(obj/item/petcollar/P, mob/user)
-	if(!istype(P) || QDELETED(P) || pcollar)
-		return
-	if(user && !user.drop_item_to_ground(P))
-		return
-	P.forceMove(src)
-	P.equipped(src)
-	pcollar = P
-	regenerate_icons()
-	if(user)
-		to_chat(user, "<span class='notice'>You put [P] around [src]'s neck.</span>")
-	if(P.tagname && !unique_pet)
-		name = P.tagname
-		real_name = P.tagname
-
-/mob/living/simple_animal/proc/remove_collar(atom/new_loc, mob/user)
-	if(!pcollar)
-		return
-
-	var/obj/old_collar = pcollar
-
-	drop_item_to_ground(pcollar)
-
-	if(user)
-		user.put_in_hands(old_collar)
-
-	return old_collar
-
-
-/mob/living/simple_animal/regenerate_icons()
-	cut_overlays()
-	if(pcollar && collar_type)
-		add_overlay("[collar_type]collar")
-		add_overlay("[collar_type]tag")
-
 /mob/living/simple_animal/Login()
 	..()
 	GLOB.move_manager.stop_looping(src) // if mob is moving under ai control, then stop AI movement
@@ -639,16 +558,3 @@
 
 /mob/living/simple_animal/proc/end_dchat_plays()
 	stop_automated_movement = FALSE
-
-/mob/living/simple_animal/proc/set_can_collar(new_value)
-	can_collar = (new_value ? TRUE : FALSE)
-	if(can_collar)
-		add_strippable_element()
-		return
-	remove_collar(drop_location())
-	RemoveElement(/datum/element/strippable)
-
-/mob/living/simple_animal/proc/add_strippable_element()
-	if(!can_collar)
-		return
-	AddElement(/datum/element/strippable, create_strippable_list(list(/datum/strippable_item/pet_collar)))

code/modules/mob/mob_misc_procs.dm

@@ -5,13 +5,6 @@
 			return 1
 	return 0
 
-/proc/ispet(A)
-	if(isanimal(A))
-		var/mob/living/simple_animal/SA = A
-		if(SA.can_collar)
-			return 1
-	return 0
-
 /mob/proc/get_screen_colour()
 	SHOULD_CALL_PARENT(TRUE)
 	// OOC Colourblind setting takes priority over everything else.