From 3271c5b61afe901ac8ae90b87170fbded7b540e9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 27 Oct 2018 03:11:22 -0400 Subject: [PATCH] Fixes personal ownership of cats So, personal fluff cats are supposed to have a friend_name var where only that named character can be befriended, but, that var is not checked anywhere in the become_friends verb. --- code/modules/mob/living/simple_animal/animals/cat.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/cat.dm b/code/modules/mob/living/simple_animal/animals/cat.dm index 4b4eba06fb..111e9dc590 100644 --- a/code/modules/mob/living/simple_animal/animals/cat.dm +++ b/code/modules/mob/living/simple_animal/animals/cat.dm @@ -101,6 +101,7 @@ /mob/living/simple_animal/cat/fluff var/mob/living/carbon/human/friend var/befriend_job = null + var/friend_name = null /mob/living/simple_animal/cat/fluff/Life() . = ..() @@ -136,7 +137,7 @@ if(!friend) var/mob/living/carbon/human/H = usr - if(istype(H) && (!befriend_job || H.job == befriend_job)) + if(istype(H) && (!befriend_job || H.job == befriend_job) && (!friend_name || H.real_name == friend_name)) friend = usr . = 1 else if(usr == friend) @@ -191,7 +192,7 @@ icon_dead = "cat3_dead" icon_rest = "cat3_rest" holder_type = /obj/item/weapon/holder/cat/fluff/bones - var/friend_name = "Erstatz Vryroxes" + friend_name = "Erstatz Vryroxes" /mob/living/simple_animal/cat/kitten/New() gender = pick(MALE, FEMALE)