cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5456 from VOREStation/upstream-merge-6282

Browse Source 
[MIRROR] Try to fix slimes and Prometheans.
This commit is contained in:
Novacat
2019-07-12 02:43:37 -04:00
committed by GitHub
parent d2060bda31 27585285cc
commit 969c6032f5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm
View File

@@ -175,9 +175,8 @@
if(istype(H.species, /datum/species/monkey)) // istype() is so they'll eat the alien monkeys too. if(istype(H.species, /datum/species/monkey)) // istype() is so they'll eat the alien monkeys too.
return TRUE // Monkeys are always food (sorry Pun Pun). return TRUE // Monkeys are always food (sorry Pun Pun).
else if(H.species && H.species.name == SPECIES_PROMETHEAN) // Prometheans are always our friends. else if(H.species && H.species.name == SPECIES_PROMETHEAN) // Prometheans are always our friends.
if(H in grudges) // Unless they're an ass. if(!(H in grudges)) // Unless they're an ass.
return TRUE return FALSE
return FALSE
if(discipline && !rabid) if(discipline && !rabid)
return FALSE // We're a good slime. return FALSE // We're a good slime.