cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3943 from CHOMPStation2/upstream-merge-12554

Browse Source 
[MIRROR] Re-enables Amber Slime's feed aura (with restrictions)
This commit is contained in:
Razgriz
2022-03-27 16:42:01 -07:00
committed by GitHub
parent 91d46d9fd1 b32dfc9648
commit e79303936c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
View File

@@ -441,15 +441,16 @@
/mob/living/simple_mob/slime/xenobio/amber /mob/living/simple_mob/slime/xenobio/amber
) )
/* VOREStation Edit. We've had enough server crashes.
/mob/living/simple_mob/slime/xenobio/amber/handle_special() /mob/living/simple_mob/slime/xenobio/amber/handle_special()
if(stat != DEAD) if(stat != DEAD)
feed_aura() feed_aura()
..() ..()
/mob/living/simple_mob/slime/xenobio/amber/proc/feed_aura() /mob/living/simple_mob/slime/xenobio/amber/proc/feed_aura()
for(var/mob/living/L in view(2, src)) for(var/mob/living/L in view(1, src))
if(L == src) // Don't feed themselves, or it is impossible to stop infinite slimes without killing all of the ambers. if(L.stat == DEAD || !IIsAlly(L))
continue
if(L == src || istype(L, /mob/living/simple_mob/slime/xenobio/amber)) // Don't feed themselves, or it is impossible to stop infinite slimes without killing all of the ambers.
continue continue
if(istype(L, /mob/living/simple_mob/slime/xenobio)) if(istype(L, /mob/living/simple_mob/slime/xenobio))
var/mob/living/simple_mob/slime/xenobio/X = L var/mob/living/simple_mob/slime/xenobio/X = L
@@ -459,7 +460,6 @@
if(H.isSynthetic()) if(H.isSynthetic())
continue continue
H.nutrition = between(0, H.nutrition + rand(15, 25), 800) H.nutrition = between(0, H.nutrition + rand(15, 25), 800)
*/
/mob/living/simple_mob/slime/xenobio/cerulean /mob/living/simple_mob/slime/xenobio/cerulean
desc = "This slime is generally superior in a wide range of attributes, compared to the common slime. The jack of all trades, but master of none." desc = "This slime is generally superior in a wide range of attributes, compared to the common slime. The jack of all trades, but master of none."