diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 12cf90c0d6f..36c5d60f6fb 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -818,6 +818,29 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 pet.name = newname pet.real_name = newname del (src) + +/obj/item/weapon/slimesteroid + name = "docility steroid" + desc = "A potent chemical mix that will cause a slime to create generate more extract." + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle16" + + 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.cores == 1) + user <<"\red The slime already has the maximum amount of extract!" + + user <<"You feed the slime the steroid. It now has triple the amount of extract." + M.cores = 1 + del (src) //////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them//////////////////////// /* diff --git a/code/modules/mob/living/carbon/metroid/subtypes.dm b/code/modules/mob/living/carbon/metroid/subtypes.dm index 77f759dbb10..5b6e4a51291 100644 --- a/code/modules/mob/living/carbon/metroid/subtypes.dm +++ b/code/modules/mob/living/carbon/metroid/subtypes.dm @@ -8,7 +8,7 @@ mutationone = /mob/living/carbon/slime/darkpurple mutationtwo = /mob/living/carbon/slime/darkblue mutationthree = /mob/living/carbon/slime/green - mutationfour = /mob/living/carbon/slime + mutationfour = /mob/living/carbon/slime/green adulttype = /mob/living/carbon/slime/adult/purple coretype = /obj/item/slime_extract/purple @@ -19,7 +19,7 @@ mutationone = /mob/living/carbon/slime/darkpurple mutationtwo = /mob/living/carbon/slime/darkblue mutationthree = /mob/living/carbon/slime/green - mutationfour = /mob/living/carbon/slime + mutationfour = /mob/living/carbon/slime/green adulttype = /mob/living/carbon/slime/adult/purple coretype = /obj/item/slime_extract/purple @@ -30,7 +30,7 @@ mutationone = /mob/living/carbon/slime/silver mutationtwo = /mob/living/carbon/slime/yellow mutationthree = /mob/living/carbon/slime/gold - mutationfour = /mob/living/carbon/slime + mutationfour = /mob/living/carbon/slime/gold adulttype = /mob/living/carbon/slime/adult/metal coretype = /obj/item/slime_extract/metal @@ -41,7 +41,7 @@ mutationone = /mob/living/carbon/slime/silver mutationtwo = /mob/living/carbon/slime/yellow mutationthree = /mob/living/carbon/slime/gold - mutationfour = /mob/living/carbon/slime + mutationfour = /mob/living/carbon/slime/gold adulttype = /mob/living/carbon/slime/adult/metal coretype = /obj/item/slime_extract/metal @@ -50,9 +50,9 @@ icon_state = "orange baby slime" primarytype = /mob/living/carbon/slime/orange mutationone = /mob/living/carbon/slime/red - mutationtwo = /mob/living/carbon/slime/yellow + mutationtwo = /mob/living/carbon/slime/red mutationthree = /mob/living/carbon/slime/darkpurple - mutationfour = /mob/living/carbon/slime + mutationfour = /mob/living/carbon/slime/yellow adulttype = /mob/living/carbon/slime/adult/orange coretype = /obj/item/slime_extract/orange @@ -61,9 +61,9 @@ icon_state = "orange adult slime" primarytype = /mob/living/carbon/slime/orange mutationone = /mob/living/carbon/slime/red - mutationtwo = /mob/living/carbon/slime/yellow + mutationtwo = /mob/living/carbon/slime/red mutationthree = /mob/living/carbon/slime/darkpurple - mutationfour = /mob/living/carbon/slime + mutationfour = /mob/living/carbon/slime/yellow adulttype = /mob/living/carbon/slime/adult/orange coretype = /obj/item/slime_extract/orange @@ -73,8 +73,8 @@ 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 + 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 @@ -85,7 +85,7 @@ mutationone = /mob/living/carbon/slime/darkblue mutationtwo = /mob/living/carbon/slime/pink mutationthree = /mob/living/carbon/slime/silver - mutationfour = /mob/living/carbon/slime + mutationfour = /mob/living/carbon/slime/pink adulttype = /mob/living/carbon/slime/adult/blue coretype = /obj/item/slime_extract/blue diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index c217c9cf43d..56b9ecac75d 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -901,7 +901,7 @@ datum */ /////////////////////////////////////////////NEW SLIME CORE REACTIONS///////////////////////////////////////////// -//Grey (Functional) +//Grey slimespawn name = "Slime Spawn" id = "m_spawn" @@ -917,7 +917,19 @@ datum S.loc = get_turf_loc(holder.my_atom) del (holder.my_atom) -//Green (Functional) + slimemonkey + name = "Slime Monkey" + id = "m_monkey" + result = null + required_reagents = list("blood" = 5) + result_amount = 1 + required_container = /obj/item/slime_extract/grey + required_other = 1 + on_reaction(var/datum/reagents/holder, var/created_volume) + for(var/i = 1, i <= 3, i++) + var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube + M.loc = get_turf_loc(holder.my_atom) +//Green slimemutate name = "Mutation Toxin" id = "mutationtoxin" @@ -927,7 +939,7 @@ datum required_other = 1 required_container = /obj/item/slime_extract/green -//Metal (Functional) +//Metal slimemetal name = "Slime Metal" id = "m_metal" @@ -944,7 +956,7 @@ datum P.amount = 5 P.loc = get_turf_loc(holder.my_atom) del (holder.my_atom) -//Gold (Functional) +//Gold slimecrit name = "Slime Crit" id = "m_tele" @@ -984,7 +996,7 @@ datum for(var/j = 1, j <= rand(1, 3), j++) step(C, pick(NORTH,SOUTH,EAST,WEST)) del (holder.my_atom) -//Silver (Functional) +//Silver slimebork name = "Slime Bork" id = "m_tele2" @@ -1014,7 +1026,7 @@ datum step(B, pick(NORTH,SOUTH,EAST,WEST)) del (holder.my_atom) -//Blue (Functional) +//Blue slimefrost name = "Slime Frost Oil" id = "m_frostoil" @@ -1041,7 +1053,7 @@ datum M.bodytemperature -= 140 M << "\blue You feel a chill!" del (holder.my_atom) -//Orange (Functional) +//Orange slimecasp name = "Slime Capsaicin Oil" id = "m_capsaicinoil" @@ -1051,7 +1063,7 @@ datum required_container = /obj/item/slime_extract/orange required_other = 1 -//Yellow (Functional?) +//Yellow slimeoverload name = "Slime EMP" id = "m_emp" @@ -1063,18 +1075,34 @@ datum on_reaction(var/datum/reagents/holder, var/created_volume) empulse(get_turf_loc(holder.my_atom), 3, 7) del (holder.my_atom) -//Purple (Functional) +//Purple + + slimepsteroid + name = "Slime Steroid" + id = "m_steroid" + result = null + required_reagents = list("plasma" = 5) + result_amount = 1 + required_container = /obj/item/slime_extract/purple + required_other = 1 + on_reaction(var/datum/reagents/holder, var/created_volume) + var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid + P.loc = get_turf_loc(holder.my_atom) + del (holder.my_atom) + + + slimejam name = "Slime Jam" id = "m_jam" result = "slimejelly" - required_reagents = list("plasma" = 5) + required_reagents = list("sugar" = 5) result_amount = 10 required_container = /obj/item/slime_extract/purple required_other = 1 -//Dark Purple (Functional) +//Dark Purple slimeplasma name = "Slime Plasma" id = "m_plasma" @@ -1089,7 +1117,7 @@ datum P.loc = get_turf_loc(holder.my_atom) del (holder.my_atom) -//Red (Non functional) +//Red slimefire name = "Slime fire" id = "m_fire" @@ -1116,7 +1144,7 @@ datum spawn (0) target_tile.hotspot_expose(700, 400) del (holder.my_atom) -//Pink (Functional) +//Pink slimeppotion name = "Slime Potion" id = "m_potion"