diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index 16491096..ed39b2ca 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -4,7 +4,7 @@
icon_state = "grey baby slime"
pass_flags = PASSTABLE
var/is_adult = 0
- speak_emote = list("hums")
+ speak_emote = list("telepathically chirps")
layer = 5
@@ -13,7 +13,7 @@
gender = NEUTER
update_icon = 0
- nutrition = 700 // 1000 = max
+ nutrition = 700
see_in_dark = 8
update_slimes = 0
@@ -48,29 +48,8 @@
///////////TIME FOR SUBSPECIES
var/colour = "grey"
- var/primarytype = /mob/living/carbon/slime
- var/mutationone = /mob/living/carbon/slime/orange
- var/mutationtwo = /mob/living/carbon/slime/metal
- var/mutationthree = /mob/living/carbon/slime/blue
- var/mutationfour = /mob/living/carbon/slime/purple
- var/adulttype = /mob/living/carbon/slime/adult
var/coretype = /obj/item/slime_extract/grey
-
- ///////////GOLD SLIME CATALYST VAR
- var/catalyst = 0
-
-/mob/living/carbon/slime/adult
- name = "adult slime"
- icon = 'icons/mob/slimes.dmi'
- icon_state = "grey adult slime"
- speak_emote = list("telepathically chirps")
-
- health = 200
- gender = NEUTER
-
- update_icon = 0
- nutrition = 800 // 1200 = max
-
+ var/list/slime_mutation[4]
/mob/living/carbon/slime/New()
create_reagents(100)
@@ -79,7 +58,7 @@
name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])"
icon_state = "[colour] [is_adult ? "adult" : "baby"] slime"
real_name = name
-// slime_mutation = mutation_table(colour)
+ slime_mutation = mutation_table(colour)
mutation_chance = rand(25, 35)
var/sanitizedcolour = replacetext(colour, " ", "")
coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
@@ -108,7 +87,7 @@
if(reagents.has_reagent("hyperzine")) // Hyperzine slows slimes down
tally *= 2
- if(reagents.has_reagent("frostoil")) // frostoil also makes them move VEEERRYYYYY slow
+ if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow
tally *= 5
if(health <= 0) // if damaged, the slime moves twice as slow
@@ -648,7 +627,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
var/Uses = 1 // uses before it goes inert
var/enhanced = 0 //has it been enhanced before?
-/* attackby(obj/item/O as obj, mob/user as mob)
+ attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/weapon/slimesteroid2))
if(enhanced == 1)
user << " This extract has already been enhanced!"
@@ -660,7 +639,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
Uses = 3
enhanced = 1
del(O)
-*/
+
/obj/item/slime_extract/New()
..()
create_reagents(100)
@@ -843,34 +822,26 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
user <<"You feed the slime the steroid. It now has triple the amount of extract."
M.cores = 3
- del (src)
+ del(src)
-////////Slime Catalyst. Makes it halve into slimes of the same type.
-
-/obj/item/weapon/slimecatalyst
- name = "slime catalyst"
- desc = "A potent chemical mixture that will influence a slime's splitting behaviour."
+/obj/item/weapon/slimesteroid2
+ name = "extract enhancer"
+ desc = "A potent chemical mix that will give a slime extract three uses."
icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle15"
-
- attack(mob/living/carbon/slime/M as mob, mob/user as mob)
- if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
- user << "\red The steroid only works on baby slimes!"
- return ..()
- if(istype(M, /mob/living/carbon/slime/adult)) //Can't tame adults
- user << "\red Only baby slimes can use the steroid!"
- return..()
- if(M.stat)
- user << "\red The slime is dead!"
- return..()
- if(M.catalyst == 1)
- user <<"\red The slime has already been fed a catalyst!"
- return..()
-
- user <<"You feed the slime the catalyst. It's core now glows golden."
- M.catalyst = 1
- del (src)
+ icon_state = "bottle17"
+ /*afterattack(obj/target, mob/user , flag)
+ if(istype(target, /obj/item/slime_extract))
+ if(target.enhanced == 1)
+ user << " This extract has already been enhanced!"
+ return ..()
+ if(target.Uses == 0)
+ user << " You can't enhance a used extract!"
+ return ..()
+ user <<"You apply the enhancer. It now has triple the amount of uses."
+ target.Uses = 3
+ target.enahnced = 1
+ del(src)*/
////////Adamantine Golem stuff I dunno where else to put it
diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm
index 5e4c1b65..2098b8a8 100644
--- a/code/modules/mob/living/carbon/metroid/powers.dm
+++ b/code/modules/mob/living/carbon/metroid/powers.dm
@@ -104,7 +104,7 @@
adjustBruteLoss(-10)
adjustFireLoss(-10)
adjustCloneLoss(-10)
-
+
updatehealth()
if(Victim)
Victim.updatehealth()
@@ -204,35 +204,16 @@
var/new_powerlevel = round(powerlevel / 4)
for(var/i=1,i<=4,i++)
var/mob/living/carbon/slime/M = new /mob/living/carbon/slime/(loc)
-// if(prob(mutation_chance))
-// M.colour = slime_mutation[rand(1,4)]
-// else
- var/mutations = pick("one","two","three","four")
- switch(mutations)
- if("one")
- var/mob/living/carbon/slime/O = new mutationone(loc)
- O.nutrition = new_nutrition
- O.powerlevel = new_powerlevel
- if(i != 1) step_away(M,src)
- babies += O
- if("two")
- var/mob/living/carbon/slime/K = new mutationtwo(loc)
- K.nutrition = new_nutrition
- K.powerlevel = new_powerlevel
- if(i != 1) step_away(M,src)
- babies += K
- if("three")
- var/mob/living/carbon/slime/L = new mutationthree(loc)
- L.nutrition = new_nutrition
- L.powerlevel = new_powerlevel
- if(i != 1) step_away(M,src)
- babies += L
- if("four")
- var/mob/living/carbon/slime/N = new mutationfour(loc)
- N.nutrition = new_nutrition
- N.powerlevel = new_powerlevel
- if(i != 1) step_away(M,src)
- babies += N
+ if(prob(mutation_chance))
+ M.colour = slime_mutation[rand(1,4)]
+ else
+ M.colour = colour
+ if(ckey) M.nutrition = new_nutrition //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature!
+ M.powerlevel = new_powerlevel
+ if(i != 1) step_away(M,src)
+ M.Friends = Friends.Copy()
+ babies += M
+ feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]")
var/mob/living/carbon/slime/new_slime = pick(babies)
new_slime.universal_speak = universal_speak
diff --git a/code/modules/mob/living/carbon/metroid/subtypes.dm b/code/modules/mob/living/carbon/metroid/subtypes.dm
index b1c3661b..35d38e31 100644
--- a/code/modules/mob/living/carbon/metroid/subtypes.dm
+++ b/code/modules/mob/living/carbon/metroid/subtypes.dm
@@ -1,372 +1,79 @@
-
-////////////////Tier 2
-
-/mob/living/carbon/slime/purple
- colour = "purple"
- icon_state = "purple baby slime"
- primarytype = /mob/living/carbon/slime/purple
- mutationone = /mob/living/carbon/slime/darkpurple
- mutationtwo = /mob/living/carbon/slime/darkblue
- mutationthree = /mob/living/carbon/slime/green
- mutationfour = /mob/living/carbon/slime/green
- adulttype = /mob/living/carbon/slime/adult/purple
- coretype = /obj/item/slime_extract/purple
-
-/mob/living/carbon/slime/adult/purple
- icon_state = "purple adult slime"
- colour = "purple"
- primarytype = /mob/living/carbon/slime/purple
- mutationone = /mob/living/carbon/slime/darkpurple
- mutationtwo = /mob/living/carbon/slime/darkblue
- mutationthree = /mob/living/carbon/slime/green
- mutationfour = /mob/living/carbon/slime/green
- adulttype = /mob/living/carbon/slime/adult/purple
- coretype = /obj/item/slime_extract/purple
-
-/mob/living/carbon/slime/metal
- colour = "metal"
- icon_state = "metal baby slime"
- primarytype = /mob/living/carbon/slime/metal
- mutationone = /mob/living/carbon/slime/silver
- mutationtwo = /mob/living/carbon/slime/yellow
- mutationthree = /mob/living/carbon/slime/gold
- mutationfour = /mob/living/carbon/slime/gold
- adulttype = /mob/living/carbon/slime/adult/metal
- coretype = /obj/item/slime_extract/metal
-
-/mob/living/carbon/slime/adult/metal
- icon_state = "metal adult slime"
- colour = "metal"
- primarytype = /mob/living/carbon/slime/metal
- mutationone = /mob/living/carbon/slime/silver
- mutationtwo = /mob/living/carbon/slime/yellow
- mutationthree = /mob/living/carbon/slime/gold
- mutationfour = /mob/living/carbon/slime/gold
- adulttype = /mob/living/carbon/slime/adult/metal
- coretype = /obj/item/slime_extract/metal
-
-/mob/living/carbon/slime/orange
- colour = "orange"
- icon_state = "orange baby slime"
- primarytype = /mob/living/carbon/slime/orange
- mutationone = /mob/living/carbon/slime/red
- mutationtwo = /mob/living/carbon/slime/red
- mutationthree = /mob/living/carbon/slime/darkpurple
- mutationfour = /mob/living/carbon/slime/yellow
- adulttype = /mob/living/carbon/slime/adult/orange
- coretype = /obj/item/slime_extract/orange
-
-/mob/living/carbon/slime/adult/orange
- colour = "orange"
- icon_state = "orange adult slime"
- primarytype = /mob/living/carbon/slime/orange
- mutationone = /mob/living/carbon/slime/red
- mutationtwo = /mob/living/carbon/slime/red
- mutationthree = /mob/living/carbon/slime/darkpurple
- mutationfour = /mob/living/carbon/slime/yellow
- adulttype = /mob/living/carbon/slime/adult/orange
- coretype = /obj/item/slime_extract/orange
-
-/mob/living/carbon/slime/blue
- colour = "blue"
- icon_state = "blue baby slime"
- primarytype = /mob/living/carbon/slime/blue
- mutationone = /mob/living/carbon/slime/darkblue
- mutationtwo = /mob/living/carbon/slime/pink
- mutationthree = /mob/living/carbon/slime/pink
- mutationfour = /mob/living/carbon/slime/silver
- adulttype = /mob/living/carbon/slime/adult/blue
- coretype = /obj/item/slime_extract/blue
-
-/mob/living/carbon/slime/adult/blue
- icon_state = "blue adult slime"
- colour = "blue"
- primarytype = /mob/living/carbon/slime/blue
- mutationone = /mob/living/carbon/slime/darkblue
- mutationtwo = /mob/living/carbon/slime/pink
- mutationthree = /mob/living/carbon/slime/silver
- mutationfour = /mob/living/carbon/slime/pink
- adulttype = /mob/living/carbon/slime/adult/blue
- coretype = /obj/item/slime_extract/blue
-
-
-
-
-//Tier 3
-
-/mob/living/carbon/slime/darkblue
- colour = "dark blue"
- icon_state = "dark blue baby slime"
- primarytype = /mob/living/carbon/slime/darkblue
- mutationone = /mob/living/carbon/slime/purple
- mutationtwo = /mob/living/carbon/slime/purple
- mutationthree = /mob/living/carbon/slime/blue
- mutationfour = /mob/living/carbon/slime/blue
- adulttype = /mob/living/carbon/slime/adult/darkblue
- coretype = /obj/item/slime_extract/darkblue
-
-/mob/living/carbon/slime/adult/darkblue
- icon_state = "dark blue adult slime"
- colour = "dark blue"
- primarytype = /mob/living/carbon/slime/darkblue
- mutationone = /mob/living/carbon/slime/purple
- mutationtwo = /mob/living/carbon/slime/purple
- mutationthree = /mob/living/carbon/slime/blue
- mutationfour = /mob/living/carbon/slime/blue
- adulttype = /mob/living/carbon/slime/adult/darkblue
- coretype = /obj/item/slime_extract/darkblue
-
-/mob/living/carbon/slime/darkpurple
- colour = "dark purple"
- icon_state = "dark purple baby slime"
- primarytype = /mob/living/carbon/slime/darkpurple
- mutationone = /mob/living/carbon/slime/purple
- mutationtwo = /mob/living/carbon/slime/purple
- mutationthree = /mob/living/carbon/slime/orange
- mutationfour = /mob/living/carbon/slime/orange
- adulttype = /mob/living/carbon/slime/adult/darkpurple
- coretype = /obj/item/slime_extract/darkpurple
-
-/mob/living/carbon/slime/adult/darkpurple
- icon_state = "dark purple adult slime"
- colour = "dark purple"
- primarytype = /mob/living/carbon/slime/darkpurple
- mutationone = /mob/living/carbon/slime/purple
- mutationtwo = /mob/living/carbon/slime/purple
- mutationthree = /mob/living/carbon/slime/orange
- mutationfour = /mob/living/carbon/slime/orange
- adulttype = /mob/living/carbon/slime/adult/darkpurple
- coretype = /obj/item/slime_extract/darkpurple
-
-
-/mob/living/carbon/slime/yellow
- icon_state = "yellow baby slime"
- colour = "yellow"
- primarytype = /mob/living/carbon/slime/yellow
- mutationone = /mob/living/carbon/slime/metal
- mutationtwo = /mob/living/carbon/slime/metal
- mutationthree = /mob/living/carbon/slime/orange
- mutationfour = /mob/living/carbon/slime/orange
- adulttype = /mob/living/carbon/slime/adult/yellow
- coretype = /obj/item/slime_extract/yellow
-
-/mob/living/carbon/slime/adult/yellow
- icon_state = "yellow adult slime"
- colour = "yellow"
- primarytype = /mob/living/carbon/slime/yellow
- mutationone = /mob/living/carbon/slime/metal
- mutationtwo = /mob/living/carbon/slime/metal
- mutationthree = /mob/living/carbon/slime/orange
- mutationfour = /mob/living/carbon/slime/orange
- adulttype = /mob/living/carbon/slime/adult/yellow
- coretype = /obj/item/slime_extract/yellow
-
-
-/mob/living/carbon/slime/silver
- colour = "silver"
- icon_state = "silver baby slime"
- primarytype = /mob/living/carbon/slime/silver
- mutationone = /mob/living/carbon/slime/metal
- mutationtwo = /mob/living/carbon/slime/metal
- mutationthree = /mob/living/carbon/slime/blue
- mutationfour = /mob/living/carbon/slime/blue
- adulttype = /mob/living/carbon/slime/adult/silver
- coretype = /obj/item/slime_extract/silver
-
-/mob/living/carbon/slime/adult/silver
- icon_state = "silver adult slime"
- colour = "silver"
- primarytype = /mob/living/carbon/slime/silver
- mutationone = /mob/living/carbon/slime/metal
- mutationtwo = /mob/living/carbon/slime/metal
- mutationthree = /mob/living/carbon/slime/blue
- mutationfour = /mob/living/carbon/slime/blue
- adulttype = /mob/living/carbon/slime/adult/silver
- coretype = /obj/item/slime_extract/silver
-
-
-
-/////////////Tier 4
-
-
-/mob/living/carbon/slime/pink
- colour = "pink"
- icon_state = "pink baby slime"
- primarytype = /mob/living/carbon/slime/pink
- mutationone = /mob/living/carbon/slime/pink
- mutationtwo = /mob/living/carbon/slime/pink
- mutationthree = /mob/living/carbon/slime/lightpink
- mutationfour = /mob/living/carbon/slime/lightpink
- adulttype = /mob/living/carbon/slime/adult/pink
- coretype = /obj/item/slime_extract/pink
-
-/mob/living/carbon/slime/adult/pink
- icon_state = "pink adult slime"
- colour = "pink"
- primarytype = /mob/living/carbon/slime/pink
- mutationone = /mob/living/carbon/slime/pink
- mutationtwo = /mob/living/carbon/slime/pink
- mutationthree = /mob/living/carbon/slime/lightpink
- mutationfour = /mob/living/carbon/slime/lightpink
- adulttype = /mob/living/carbon/slime/adult/pink
- coretype = /obj/item/slime_extract/pink
-
-/mob/living/carbon/slime/red
- colour = "red"
- icon_state = "red baby slime"
- primarytype = /mob/living/carbon/slime/red
- mutationone = /mob/living/carbon/slime/red
- mutationtwo = /mob/living/carbon/slime/red
- mutationthree = /mob/living/carbon/slime/oil
- mutationfour = /mob/living/carbon/slime/oil
- adulttype = /mob/living/carbon/slime/adult/red
- coretype = /obj/item/slime_extract/red
-
-/mob/living/carbon/slime/adult/red
- icon_state = "red adult slime"
- colour = "red"
- primarytype = /mob/living/carbon/slime/red
- mutationone = /mob/living/carbon/slime/red
- mutationtwo = /mob/living/carbon/slime/red
- mutationthree = /mob/living/carbon/slime/oil
- mutationfour = /mob/living/carbon/slime/oil
- adulttype = /mob/living/carbon/slime/adult/red
- coretype = /obj/item/slime_extract/red
-
-/mob/living/carbon/slime/gold
- colour = "gold"
- icon_state = "gold baby slime"
- primarytype = /mob/living/carbon/slime/gold
- mutationone = /mob/living/carbon/slime/gold
- mutationtwo = /mob/living/carbon/slime/gold
- mutationthree = /mob/living/carbon/slime/adamantine
- mutationfour = /mob/living/carbon/slime/adamantine
- adulttype = /mob/living/carbon/slime/adult/gold
- coretype = /obj/item/slime_extract/gold
-
-/mob/living/carbon/slime/adult/gold
- icon_state = "gold adult slime"
- colour = "gold"
- primarytype = /mob/living/carbon/slime/gold
- mutationone = /mob/living/carbon/slime/gold
- mutationtwo = /mob/living/carbon/slime/gold
- mutationthree = /mob/living/carbon/slime/adamantine
- mutationfour = /mob/living/carbon/slime/adamantine
- adulttype = /mob/living/carbon/slime/adult/gold
- coretype = /obj/item/slime_extract/gold
-
-/mob/living/carbon/slime/green
- colour = "green"
- icon_state = "green baby slime"
- primarytype = /mob/living/carbon/slime/green
- mutationone = /mob/living/carbon/slime/green
- mutationtwo = /mob/living/carbon/slime/green
- mutationthree = /mob/living/carbon/slime/black
- mutationfour = /mob/living/carbon/slime/black
- adulttype = /mob/living/carbon/slime/adult/green
- coretype = /obj/item/slime_extract/green
-
-/mob/living/carbon/slime/adult/green
- icon_state = "green adult slime"
- colour = "green"
- primarytype = /mob/living/carbon/slime/green
- mutationone = /mob/living/carbon/slime/green
- mutationtwo = /mob/living/carbon/slime/green
- mutationthree = /mob/living/carbon/slime/black
- mutationfour = /mob/living/carbon/slime/black
- adulttype = /mob/living/carbon/slime/adult/green
- coretype = /obj/item/slime_extract/green
-
-
-
-// Tier 5
-
-/mob/living/carbon/slime/lightpink
- colour = "light pink"
- icon_state = "light pink baby slime"
- primarytype = /mob/living/carbon/slime/lightpink
- mutationone = /mob/living/carbon/slime/lightpink
- mutationtwo = /mob/living/carbon/slime/lightpink
- mutationthree = /mob/living/carbon/slime/lightpink
- mutationfour = /mob/living/carbon/slime/lightpink
- adulttype = /mob/living/carbon/slime/adult/lightpink
- coretype = /obj/item/slime_extract/lightpink
-
-/mob/living/carbon/slime/adult/lightpink
- icon_state = "light pink adult slime"
- colour = "light pink"
- primarytype = /mob/living/carbon/slime/lightpink
- mutationone = /mob/living/carbon/slime/lightpink
- mutationtwo = /mob/living/carbon/slime/lightpink
- mutationthree = /mob/living/carbon/slime/lightpink
- mutationfour = /mob/living/carbon/slime/lightpink
- adulttype = /mob/living/carbon/slime/adult/lightpink
- coretype = /obj/item/slime_extract/lightpink
-
-
-/mob/living/carbon/slime/oil
- icon_state = "oil baby slime"
- colour = "oil"
- primarytype = /mob/living/carbon/slime/oil
- mutationone = /mob/living/carbon/slime/oil
- mutationtwo = /mob/living/carbon/slime/oil
- mutationthree = /mob/living/carbon/slime/oil
- mutationfour = /mob/living/carbon/slime/oil
- adulttype = /mob/living/carbon/slime/adult/oil
- coretype = /obj/item/slime_extract/oil
-
-/mob/living/carbon/slime/adult/oil
- icon_state = "oil adult slime"
- colour = "oil"
- primarytype = /mob/living/carbon/slime/oil
- mutationone = /mob/living/carbon/slime/oil
- mutationtwo = /mob/living/carbon/slime/oil
- mutationthree = /mob/living/carbon/slime/oil
- mutationfour = /mob/living/carbon/slime/oil
- adulttype = /mob/living/carbon/slime/adult/oil
- coretype = /obj/item/slime_extract/oil
-
-
-/mob/living/carbon/slime/black
- icon_state = "black baby slime"
- colour = "black"
- primarytype = /mob/living/carbon/slime/black
- mutationone = /mob/living/carbon/slime/black
- mutationtwo = /mob/living/carbon/slime/black
- mutationthree = /mob/living/carbon/slime/black
- mutationfour = /mob/living/carbon/slime/black
- adulttype = /mob/living/carbon/slime/adult/black
- coretype = /obj/item/slime_extract/black
-
-/mob/living/carbon/slime/adult/black
- icon_state = "black adult slime"
- colour = "black"
- primarytype = /mob/living/carbon/slime/black
- mutationone = /mob/living/carbon/slime/black
- mutationtwo = /mob/living/carbon/slime/black
- mutationthree = /mob/living/carbon/slime/black
- mutationfour = /mob/living/carbon/slime/black
- adulttype = /mob/living/carbon/slime/adult/black
- coretype = /obj/item/slime_extract/black
-
-/mob/living/carbon/slime/adamantine
- icon_state = "adamantine baby slime"
- colour = "adamantine"
- primarytype = /mob/living/carbon/slime/adamantine
- mutationone = /mob/living/carbon/slime/adamantine
- mutationtwo = /mob/living/carbon/slime/adamantine
- mutationthree = /mob/living/carbon/slime/adamantine
- mutationfour = /mob/living/carbon/slime/adamantine
- adulttype = /mob/living/carbon/slime/adult/adamantine
- coretype = /obj/item/slime_extract/adamantine
-
-/mob/living/carbon/slime/adult/adamantine
- icon_state = "adamantine adult slime"
- colour = "adamantine"
- primarytype = /mob/living/carbon/slime/adamantine
- mutationone = /mob/living/carbon/slime/adamantine
- mutationtwo = /mob/living/carbon/slime/adamantine
- mutationthree = /mob/living/carbon/slime/adamantine
- mutationfour = /mob/living/carbon/slime/adamantine
- adulttype = /mob/living/carbon/slime/adult/adamantine
- coretype = /obj/item/slime_extract/adamantine
\ No newline at end of file
+proc/mutation_table(var/colour)
+ var/list/slime_mutation[4]
+ switch(colour)
+ //Tier 1
+ if("grey")
+ slime_mutation[1] = "orange"
+ slime_mutation[2] = "metal"
+ slime_mutation[3] = "blue"
+ slime_mutation[4] = "purple"
+ //Tier 2
+ if("purple")
+ slime_mutation[1] = "dark purple"
+ slime_mutation[2] = "dark blue"
+ slime_mutation[3] = "green"
+ slime_mutation[4] = "green"
+ if("metal")
+ slime_mutation[1] = "silver"
+ slime_mutation[2] = "yellow"
+ slime_mutation[3] = "gold"
+ slime_mutation[4] = "gold"
+ if("orange")
+ slime_mutation[1] = "dark purple"
+ slime_mutation[2] = "yellow"
+ slime_mutation[3] = "red"
+ slime_mutation[4] = "red"
+ if("blue")
+ slime_mutation[1] = "dark blue"
+ slime_mutation[2] = "silver"
+ slime_mutation[3] = "pink"
+ slime_mutation[4] = "pink"
+ //Tier 3
+ if("dark blue")
+ slime_mutation[1] = "purple"
+ slime_mutation[2] = "blue"
+ slime_mutation[3] = "cerulean"
+ slime_mutation[4] = "cerulean"
+ if("dark purple")
+ slime_mutation[1] = "purple"
+ slime_mutation[2] = "orange"
+ slime_mutation[3] = "sepia"
+ slime_mutation[4] = "sepia"
+ if("yellow")
+ slime_mutation[1] = "metal"
+ slime_mutation[2] = "orange"
+ slime_mutation[3] = "bluespace"
+ slime_mutation[4] = "bluespace"
+ if("silver")
+ slime_mutation[1] = "metal"
+ slime_mutation[2] = "blue"
+ slime_mutation[3] = "pyrite"
+ slime_mutation[4] = "pyrite"
+ //Tier 4
+ if("pink")
+ slime_mutation[1] = "pink"
+ slime_mutation[2] = "pink"
+ slime_mutation[3] = "light pink"
+ slime_mutation[4] = "light pink"
+ if("red")
+ slime_mutation[1] = "red"
+ slime_mutation[2] = "red"
+ slime_mutation[3] = "oil"
+ slime_mutation[4] = "oil"
+ if("gold")
+ slime_mutation[1] = "gold"
+ slime_mutation[2] = "gold"
+ slime_mutation[3] = "adamantine"
+ slime_mutation[4] = "adamantine"
+ if("green")
+ slime_mutation[1] = "green"
+ slime_mutation[2] = "green"
+ slime_mutation[3] = "black"
+ slime_mutation[4] = "black"
+ // Tier 5
+ else
+ slime_mutation[1] = colour
+ slime_mutation[2] = colour
+ slime_mutation[3] = colour
+ slime_mutation[4] = colour
+ return(slime_mutation)
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm
index c1001291..a6b17f1c 100644
--- a/code/modules/projectiles/projectile/change.dm
+++ b/code/modules/projectiles/projectile/change.dm
@@ -49,8 +49,7 @@
Robot.mmi = new /obj/item/device/mmi(new_mob)
Robot.mmi.transfer_identity(M) //Does not transfer key/client.
if("slime")
- if(prob(50)) new_mob = new /mob/living/carbon/slime/adult(M.loc)
- else new_mob = new /mob/living/carbon/slime(M.loc)
+ new_mob = new /mob/living/carbon/slime(M.loc)
new_mob.universal_speak = 1
if("xeno")
var/alien_caste = pick("Hunter","Sentinel","Drone","Larva")
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index a6cc4928..3d3b02bb 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1104,7 +1104,7 @@ datum
// for(var/mob/O in viewers(get_turf(holder.my_atom), null))
// O.show_message(text("\red The slime core fizzles disappointingly,"), 1)
- slimecatalyst
+/* slimecatalyst
name = "slime catalyst"
id = "m_catalyst"
result = null
@@ -1114,7 +1114,7 @@ datum
required_other = 1
on_reaction(var/datum/reagents/holder)
var/obj/item/weapon/slimecatalyst/P = new /obj/item/weapon/slimecatalyst
- P.loc = get_turf(holder.my_atom)
+ P.loc = get_turf(holder.my_atom)*/
/*
slimecritlesser
name = "Slime Crit Lesser"