cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Spays and neuters holographic animals (#46829)

Browse Source
This commit is contained in:
81Denton
2019-10-02 12:17:25 -04:00
committed by moo
parent 822e109228
commit ca7c1a651b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/cat.dm
+1 -1
View File
@@ -142,7 +142,7 @@
family = list()
if(!dead)
for(var/mob/living/simple_animal/pet/cat/kitten/C in children)
if(istype(C,type) || C.stat || !C.z || !C.butcher_results) //That last one is a work around for hologram cats
if(istype(C,type) || C.stat || !C.z || (C.flags_1 & HOLOGRAM_1))
continue
if(C.type in family)
family[C.type] += 1
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -384,7 +384,7 @@
else if(istype(M, animal_species))
if(M.ckey)
continue
else if(!istype(M, childtype) && M.gender == MALE) //Better safe than sorry ;_;
else if(!istype(M, childtype) && M.gender == MALE && !(M.flags_1 & HOLOGRAM_1)) //Better safe than sorry ;_;
partner = M
else if(isliving(M) && !faction_check_mob(M)) //shyness check. we're not shy in front of things that share a faction with us.