From dc16dfbcc2e9cc95a72d0c5dc5871640b13a7f3c Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 7 Sep 2015 09:48:31 -0400 Subject: [PATCH] Fixes/tweaks slime potions. --- .../research/xenobiology/xenobiology.dm | 39 +++++-------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 58ef59bfd34..777cb0bc607 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -13,19 +13,14 @@ throw_range = 6 origin_tech = "biotech=3" var/Uses = 1 // uses before it goes inert - var/enhanced = 0 //has it been enhanced before? /obj/item/slime_extract/attackby(obj/item/O, mob/user) - if(istype(O, /obj/item/slimepotion/steroid)) - if(enhanced == 1) - user << "This extract has already been enhanced!" + if(istype(O, /obj/item/slimepotion/enhancer)) + if(Uses >= 5) + user << "You cannot enhance this extract further!" return ..() - if(Uses == 0) - user << "You can't enhance a used extract!" - return ..() - user <<"You apply the enhancer. It now has triple the amount of uses." - Uses = 3 - enhanced = 1 + user <<"You apply the enhancer to the slime extract. It may now be reused one more time." + Uses++ qdel(O) /obj/item/slime_extract/New() @@ -226,7 +221,7 @@ /obj/item/slimepotion/steroid name = "slime steroid" - desc = "A potent chemical mix that will cause a slime to generate more extract." + desc = "A potent chemical mix that will cause a baby slime to generate more extract." icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" @@ -240,34 +235,20 @@ if(M.stat) user << "The slime is dead!" return..() - if(M.cores == 3) + if(M.cores >= 5) user <<"The slime already has the maximum amount of extract!" return..() - user <<"You feed the slime the steroid. It now has triple the amount of extract." - M.cores = 3 + user <<"You feed the slime the steroid. It will now produce one more extract." + M.cores++ qdel(src) /obj/item/slimepotion/enhancer name = "extract enhancer" - desc = "A potent chemical mix that will give a slime extract three uses." + desc = "A potent chemical mix that will give a slime extract an additional use." icon = 'icons/obj/chemical.dmi' 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 - qdel(src)*/ - - /obj/item/slimepotion/stabilizer name = "slime stabilizer" desc = "A potent chemical mix that will reduce the chance of a slime mutating."