From d5fb23d4d75777238c8f361339b56301855d5330 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 26 Apr 2016 20:12:31 -0400 Subject: [PATCH] no fun crew has arrived --- .../chemical_reaction_slime.dm | 16 +------ .../research/xenobiology/xenobiology.dm | 44 ------------------- 2 files changed, 1 insertion(+), 59 deletions(-) diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm index c80370734d4..45480d91b50 100644 --- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm +++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm @@ -661,18 +661,4 @@ var/mob/living/carbon/slime/S = new /mob/living/carbon/slime S.colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black") S.forceMove(get_turf(holder.my_atom)) - S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!") - -/datum/chemical_reaction/slime_transfer - name = "Transfer Potion" - id = "slimetransfer" - result = null - required_reagents = list("blood" = 1) - result_amount = 1 - required_other = 1 - required_container = /obj/item/slime_extract/rainbow - -/datum/chemical_reaction/slime_transfer/on_reaction(datum/reagents/holder) - feedback_add_details("slime_cores_used","[type]") - var/obj/item/slimepotion/transference/P = new /obj/item/slimepotion/transference - P.forceMove(get_turf(holder.my_atom)) \ No newline at end of file + S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!") \ No newline at end of file diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 7d2462494e9..3c11bdba38a 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -223,50 +223,6 @@ being_used = 0 ..() -/obj/item/slimepotion/transference - name = "consciousness transference potion" - desc = "A strange slime-based chemical that, when used, allows the user to transfer their consciousness to a lesser being." - icon = 'icons/obj/chemical.dmi' - icon_state = "bottle6" - origin_tech = "biotech=6" - var/prompted = 0 - var/animal_type = SENTIENCE_ORGANIC - -/obj/item/slimepotion/transference/afterattack(mob/living/M, mob/user) - if(prompted || !ismob(M)) - return - if(!isanimal(M) || M.ckey) //much like sentience, these will not work on something that is already player controlled - user << "[M] already has a higher consciousness!" - return ..() - if(M.stat) - user << "[M] is dead!" - return ..() - var/mob/living/simple_animal/SM = M - if(SM.sentience_type != animal_type) - user << "You cannot transfer your consciousness to [SM]." //no controlling machines - return ..() - if(jobban_isbanned(user, ROLE_SENTIENT)) - user << "Your mind goes blank as you attempt to use the potion." - return - - prompted = 1 - if(alert("This will permanently transfer your consciousness to [SM]. Are you sure you want to do this?",,"Yes","No")=="No") - prompted = 0 - return - - user << "You drink the potion then place your hands on [SM]..." - - - user.mind.transfer_to(SM) - SM.universal_speak = 1 - SM.faction = user.faction - SM.sentience_act() //Same deal here as with sentience - user.death() - SM << "In a quick flash, you feel your consciousness flow into [SM]!" - SM << "You are now [SM]. Your allegiances, alliances, and roles are still the same as they were prior to consciousness transfer!" - SM.name = "[SM.name] as [user.real_name]" - qdel(src) - /obj/item/slimepotion/steroid name = "slime steroid" desc = "A potent chemical mix that will cause a baby slime to generate more extract."