From 9aae3d9fadffdeac2217e783065ca0df0eb7bd2e Mon Sep 17 00:00:00 2001 From: Fghj240 <43589874+Fghj240@users.noreply.github.com> Date: Thu, 4 Dec 2025 15:10:01 -0800 Subject: [PATCH] Pet collar bugfixes (#94309) ## About The Pull Request ~Since you can't wear pet collars and the bartender doesn't have a pet, I'm not sure why they're in the bartender drobe and bartender clothes locker. I removed them.~ Also, the felinid deathmatch loadout is supposed to spawn with a pet collar equipped but can't since they aren't wearable by humans so now they spawn with an alternate version that is wearable and NOT OBTAINABLE OUTSIDE OF DEATHMATCH. ## Why It's Good For The Game bugfix ## Changelog :cl: fix: Deathmatch felinids now spawn in with pet collars as intended /:cl: Co-authored-by: Fghj240 --- code/modules/clothing/neck/_neck.dm | 6 +++++- code/modules/deathmatch/deathmatch_loadouts.dm | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index d6e061aebe7..d54f9c57175 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -496,16 +496,20 @@ desc = "It's for pets." icon_state = "petcollar" var/tagname = null + var/human_wearable = FALSE /datum/armor/large_scarf_syndie fire = 50 acid = 40 /obj/item/clothing/neck/petcollar/mob_can_equip(mob/M, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE, ignore_equipped = FALSE, indirect_action = FALSE) - if(!ismonkey(M)) + if(!ismonkey(M) && !human_wearable) return FALSE return ..() +/obj/item/clothing/neck/petcollar/wearable + human_wearable = TRUE + /obj/item/clothing/neck/petcollar/attack_self(mob/user) tagname = sanitize_name(tgui_input_text(user, "Would you like to change the name on the tag?", "Pet Naming", "Spot", MAX_NAME_LEN)) if (!tagname || !length(tagname)) diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index 10702126112..021128b218e 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -890,7 +890,7 @@ head = /obj/item/clothing/head/soft/rainbow glasses = null ears = /obj/item/radio/headset - neck = /obj/item/clothing/neck/petcollar + neck = /obj/item/clothing/neck/petcollar/wearable //suit uniform = /obj/item/clothing/under/color/rainbow l_pocket = /obj/item/toy/cattoy