From bc3e4291c3ba70f3085a20c8e57a6296d2c6eba9 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 8 Mar 2017 18:03:04 -0500 Subject: [PATCH] Fix befriending pets Fixes Runtime and Renault's expected job titles for being befriended. --- code/modules/mob/living/simple_animal/friendly/cat.dm | 2 ++ code/modules/mob/living/simple_animal/friendly/fox_vr.dm | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 5c6561569b1..7016ec41d9c 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -194,6 +194,7 @@ var/mob/living/carbon/human/H = usr if(istype(H) && (!befriend_job || H.job == befriend_job)) friend = usr + prey_excludes |= usr //VOREStation Add - Friends not food! . = 1 else if(usr == friend) . = 1 //already friends, but show success anyways @@ -217,6 +218,7 @@ item_state = "cat" icon_living = "cat" icon_dead = "cat_dead" + befriend_job = "Chief Medical Officer" //VOREStation Add /mob/living/simple_animal/cat/kitten name = "kitten" diff --git a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm index 3440bd7b0fb..ad0bd7f499f 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox_vr.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox_vr.dm @@ -270,6 +270,7 @@ return friend = usr + prey_excludes |= usr set_dir(get_dir(src, friend)) say("Yap!") @@ -281,9 +282,9 @@ //Captain fox /mob/living/simple_animal/fox/fluff/Renault name = "Renault" - desc = "Renault, the Captain's trustworthy fox. I wonder what it says?" + desc = "Renault, the Colony Director's trustworthy fox. I wonder what it says?" isPredator = 1 - befriend_job = "Captain" + befriend_job = "Colony Director" /mob/living/simple_animal/fox/fluff/Renault/New() if(!vore_organs.len)