From f059a19d8bcb91473b115239daa5c788195de41d Mon Sep 17 00:00:00 2001 From: Fermi Date: Fri, 12 Apr 2019 00:44:54 +0100 Subject: [PATCH] Made plastic&metamaterial beakers slightly larger cause no one uses them --- .../chemistry/reagents/fermi_reagents.dm | 101 ------------------ .../reagents/chemistry/recipes/fermi.dm | 18 ---- .../reagents/reagent_containers/glass.dm | 12 +-- 3 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 code/modules/reagents/chemistry/reagents/fermi_reagents.dm delete mode 100644 code/modules/reagents/chemistry/recipes/fermi.dm diff --git a/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/code/modules/reagents/chemistry/reagents/fermi_reagents.dm deleted file mode 100644 index dcf933c183..0000000000 --- a/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ /dev/null @@ -1,101 +0,0 @@ -//Fermichem!! -//Fun chems for all the family - -//MCchem -//BE PE chemical -//Angel/astral chemical - -//eigenstate Chem -//Teleports you to chemistry and back -//OD teleports you randomly around the Station -//Addiction send you on a wild ride and replaces you with an alternative reality version of yourself. - -/datum/reagent/fermi/eigenstate - name = "Eigenstasium" - id = "eigenstate" - description = "A strange mixture formed from a controlled reaction of bluespace with plasma, that causes localised eigenstate fluxuations within the patient" - color = "#60A584" // rgb: 96, 0, 255 - overdose_threshold = 20 - addiction_threshold = 30 - metabolization_rate = 0.5 * REAGENTS_METABOLISM - addiction_stage3_end = 40 - addiction_stage4_end = 55 //Incase it's too long - -/obj/item/reagent/fermi/eigenstate/Initialize() - //. = ..() Unneeded? - var/turf/open/T = get_turf(src)//Sets up coordinate of where it was created - -/datum/reagent/fermi/eigenstate/on_mob_life(mob/living/carbon/M) //Teleports to chemistry! - if(holder.!has_reagent("eigenstate")) - var/turf/open/T2 = get_turf(src) //sets up return point - to_chat(M, "You feel your wavefunction split!") - do_sparks(5,FALSE,src) - src.forceMove(T) //Teleports to creation location - do_sparks(5,FALSE,src) - -/datum/reagent/fermi/eigenstate/on_mob_delete(mob/living/M) //returns back to original location - do_sparks(5,FALSE,src) - to_chat(M, "You feel your wavefunction collapse!") - src.forceMove(T2) //Teleports home - do_sparks(5,FALSE,src) - -/datum/reagent/fermi/eigenstate/overdose_start(mob/living/M) //Overdose, makes you teleport randomly - if(10) - to_chat(M, "Oh god, you feel like your wavefunction is about to hurl.") - M.Jitter(10) - - if(15 to INFINITY) - do_sparks(5,FALSE,src) - do_teleport(src, get_turf(src), 50, asoundin = 'sound/effects/phasein.ogg') - do_sparks(5,FALSE,src) - M.reagents.remove_reagent("eigenstate",1)//So you're not stuck for 10 minutes teleporting - - - //..() //loop function - - -/datum/reagent/fermi/eigenstate/addiction_act_stage1(mob/living/M) //Welcome to Fermis' wild ride. - to_chat(M, "Your wavefunction feels like it's been ripped in half. You feel empty inside.") - M.Jitter(10) - M.nutrition = M.nutrition - (M.nutrition/10) - -/datum/reagent/fermi/eigenstate/addiction_act_stage2(mob/living/M) - to_chat(M, "You start to convlse violently as you feel your consciousness split and merge across realities as your possessions fly wildy off your body.") - M.Jitter(50) - M.AdjustKnockdown(-40, 0) - for(var/obj/item/I in mob.get_contents()); do_teleport(I, get_turf(I), 5, no_effects=TRUE); - -/datum/reagent/fermi/eigenstate/addiction_act_stage3(mob/living/M)//Pulls multiple copies of the character from alternative realities while teleporting them around! - M.Jitter(100) - M.AdjustKnockdown(-40, 0) - to_chat(M, "Your eigenstate starts to rip apart, causing a localised collapsed field as you're ripped from alternative universes, trapped around the densisty of the eigenstate event horizon.") - - //Clone function - spawns a clone then deletes it - simulates multiple copies of the player teleporting in - if(1) - var/typepath = owner.type - clone = new typepath(owner.loc) - var/mob/living/carbon/O = owner - var/mob/living/carbon/C = clone - if(istype(C) && istype(O)) - C.real_name = O.real_name - O.dna.transfer_identity(C) - C.updateappearance(mutcolor_update=1) - visible_message("[M] collapses in from an alternative reality!") - if(2) - do_teleport(C, get_turf(C), 3, no_effects=TRUE) //teleports clone so it's hard to find the real one! - if(3) - qdel(C) //Deletes CLONE, or at least I hope it is. - visible_message("[M] is snapped across to a different alternative reality!") - .=1 //counter - - do_teleport(src, get_turf(src), 3, no_effects=TRUE) //Teleports player randomly - //..() //loop function - -/datum/reagent/fermi/eigenstate/addiction_act_stage4(mob/living/M) //Thanks for riding Fermis' wild ride. Mild jitter and player buggery. - M.Jitter(50) - M.AdjustKnockdown(0, 0) - to_chat(M, "You feel your eigenstate settle, snapping an alternative version of yourself into reality. All your previous memories are lost and replaced with the alternative version of yourself. This version of you feels more [pick("affectionate", "happy", "lusty", "radical", "shy", "ambitious", "frank", "voracious", "sensible", "witty")] than your pervious self, sent to god knows what universe.") - mob.emote("me",1,"gasps and gazes around in a bewildered and highly confused fashion!",TRUE) - SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "Alternative dimension", /datum/mood_event/eigenstate) - -//eigenstate END diff --git a/code/modules/reagents/chemistry/recipes/fermi.dm b/code/modules/reagents/chemistry/recipes/fermi.dm deleted file mode 100644 index cc9b5b1915..0000000000 --- a/code/modules/reagents/chemistry/recipes/fermi.dm +++ /dev/null @@ -1,18 +0,0 @@ -/datum/chemical_reaction/eigenstate - name = "Eigenstasium" - id = "eigenstate" - results = list("Eigenstasium" = ``) - required_reagents = list("bluespace_" = 1, "oxygen" = 1, "sugar" = 1) - //FermiChem vars: - OptimalTempMin = 350 // Lower area of bell curve for determining heat based rate reactions - OptimalTempMax = 500 // Upper end for above - ExplodeTemp = 550 //Temperature at which reaction explodes - OptimalpHMin = 4 // Lowest value of pH determining pH a 1 value for pH based rate reactions (Plateu phase) - OptimalpHMax = 9.5 // Higest value for above - ReactpHLim = 2 // How far out pH wil react, giving impurity place (Exponential phase) - CatalystFact = 0 // How much the catalyst affects the reaction (0 = no catalyst) - CurveSharp = 4 // How sharp the exponential curve is (to the power of value) - ThermicConstant = -2.5 //Temperature change per 1u produced - HIonRelease = 0.01 //pH change per 1u reaction - RateUpLim = 50 //Optimal/max rate possible if all conditions are perfect - FermiChem = 1 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 1912e9fe9d..2dc5059eb2 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -167,12 +167,12 @@ /obj/item/reagent_containers/glass/beaker/plastic name = "x-large beaker" - desc = "An extra-large beaker. Can hold up to 120 units." + desc = "An extra-large beaker. Can hold up to 150 units." icon_state = "beakerwhite" materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000) - volume = 120 + volume = 150 amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(5,10,15,20,25,30,60,120) + possible_transfer_amounts = list(5,10,15,20,25,30,60,120, 150) /obj/item/reagent_containers/glass/beaker/plastic/update_icon() icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states @@ -181,12 +181,12 @@ /obj/item/reagent_containers/glass/beaker/meta name = "metamaterial beaker" - desc = "A large beaker. Can hold up to 180 units." + desc = "A large beaker. Can hold up to 200 units." icon_state = "beakergold" materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000) - volume = 180 + volume = 200 amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(5,10,15,20,25,30,60,120,180) + possible_transfer_amounts = list(5,10,15,20,25,30,60,120,150,200) /obj/item/reagent_containers/glass/beaker/noreact name = "cryostasis beaker"