cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 14:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5713 from Novacat/spriteadd

Browse Source 
Fixes personal ownership of cats
This commit is contained in:
Atermonera
2018-11-30 21:38:54 -08:00
committed by GitHub
parent a6b168f950 3271c5b61a
commit c6b8fb332d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/simple_animal/animals/cat.dm
View File

@@ -101,6 +101,7 @@
/mob/living/simple_animal/cat/fluff /mob/living/simple_animal/cat/fluff
var/mob/living/carbon/human/friend var/mob/living/carbon/human/friend
var/befriend_job = null var/befriend_job = null
var/friend_name = null
/mob/living/simple_animal/cat/fluff/Life() /mob/living/simple_animal/cat/fluff/Life()
. = ..() . = ..()
@@ -136,7 +137,7 @@
if(!friend) if(!friend)
var/mob/living/carbon/human/H = usr 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 friend = usr
. = 1 . = 1
else if(usr == friend) else if(usr == friend)
@@ -191,7 +192,7 @@
icon_dead = "cat3_dead" icon_dead = "cat3_dead"
icon_rest = "cat3_rest" icon_rest = "cat3_rest"
holder_type = /obj/item/weapon/holder/cat/fluff/bones 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() /mob/living/simple_animal/cat/kitten/New()
gender = pick(MALE, FEMALE) gender = pick(MALE, FEMALE)