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

Merge pull request #17165 from Incoming5643/no_cat_cucks

Browse Source 
Fixes? Catsploision? [Maybe?]
This commit is contained in:
KorPhaeron
2016-04-29 11:18:24 -05:00
parent 407ae0e7cd f612c83c87
commit 29baead8a5
1 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
+2 -2
View File
@@ -115,7 +115,7 @@
var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
family = list()
for(var/mob/living/simple_animal/pet/cat/C in mob_list)
if(istype(C,type) || C.stat || !C.butcher_results) //That last one is a work around for hologram cats
if(istype(C,type) || C.stat || !C.z || !C.butcher_results) //That last one is a work around for hologram cats
continue
if(C.type in family)
family[C.type] += 1
@@ -125,11 +125,11 @@
memory_saved = 1
/mob/living/simple_animal/pet/cat/Runtime/proc/Deploy_The_Cats()
cats_deployed = 1
for(var/cat_type in family)
if(family[cat_type] > 0)
for(var/i in 1 to min(family[cat_type],100)) //Limits to about 500 cats, you wouldn't think this would be needed (BUT IT IS)
new cat_type(loc)
cats_deployed = 1
/mob/living/simple_animal/pet/cat/Proc
name = "Proc"