diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index 041737ce50..158bef6e16 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -788,3 +788,18 @@ /mob/living/simple_mob/slime/xenobio/rainbow/kendrick/Initialize() pacify() // So the physical mob also gets made harmless. return ..() + +//ChompAdd Begins +// A pacified pink slime for either Admin-spawning or putting in a casino reward or capture crystal. +/mob/living/simple_mob/slime/xenobio/pink/sana + name = "Sana" + desc = "A pink slime that seems to be oddly friendly, and doesn't seem interested in eating your face like the rest of them." + rainbow_core_candidate = FALSE + // Doing pacify() in initialize() won't actually pacify the AI due to the ai_holder not existing due to parent initialize() not being called yet. + // Instead lets just give them an ai_holder that does that for us. + ai_holder_type = /datum/ai_holder/simple_mob/xenobio_slime/passive + +/mob/living/simple_mob/slime/xenobio/pink/sana/Initialize() + pacify() // So the physical mob also gets made harmless. + return ..() +//ChompAdd End \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm index b9d69d7d0a..bc7634effe 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm @@ -16,7 +16,7 @@ var/untamable_inheirit = FALSE //Makes slime inheirit its untamability. var/list/slime_mutation = list( /mob/living/simple_mob/slime/xenobio/orange, -// /mob/living/simple_mob/slime/xenobio/metal, //Chompedit, Removes metal slimes from the basic grey slimes' evolution options. + /mob/living/simple_mob/slime/xenobio/metal, /mob/living/simple_mob/slime/xenobio/blue, /mob/living/simple_mob/slime/xenobio/purple ) diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index 00abebfcb1..e925544ea2 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -99,7 +99,7 @@ required = /obj/item/slime_extract/grey /decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder) - for(var/i = 1 to 4) + for(var/i = 1 to 5) //CHOMPedit Increased number of monkey cubes from 4 to 5 new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom)) ..()