cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-22 12:46:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes personal ownership of cats

Browse Source 
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.
This commit is contained in:
Unknown
2018-10-27 03:11:22 -04:00
parent 031e6dc092
commit 3271c5b61a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/animals/cat.dm
+3 -2
View File
@@ -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)