From a02f56071138d4860ef3a2afa27205e4340f6d6d Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 8 May 2015 18:32:00 -0400 Subject: [PATCH] [Goonchem] Cryox/Clonex Change --- code/game/objects/items/random_items.dm | 2 +- code/game/objects/items/weapons/grenades.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 18 ++---------------- code/modules/reagents/Chemistry-Recipes.dm | 14 +++----------- code/setup.dm | 2 +- 5 files changed, 8 insertions(+), 30 deletions(-) diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 0bbd8ba35aa..1a6ab66a72e 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -61,7 +61,7 @@ // identify_probability = 0 New() ..() - var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","teporone","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","clonexadone","spaceacillin","carpotoxin","mindbreaker","fluorosurfactant","fluorosurfactant","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin") + var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","teporone","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","spaceacillin","carpotoxin","mindbreaker","fluorosurfactant","fluorosurfactant","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin") var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine") var/datum/reagent/R = pick(chems_only + rare_chems) diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index 74d2038edb7..3d6c101a109 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/code/game/objects/items/weapons/grenades.dm @@ -30,7 +30,7 @@ B1.reagents.add_reagent("blood",60) if(prob(5)) B1.reagents.add_reagent("blood",1) // Quality control problems, causes a mess - B2.reagents.add_reagent("clonexadone",30) + B2.reagents.add_reagent("cryoxadone",30) beakers += B1 beakers += B2 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 8766271a170..b8aab9cf616 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1270,25 +1270,11 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(M.bodytemperature < 170) - M.adjustCloneLoss(-1) + if(M.bodytemperature < 265) + M.adjustCloneLoss(-4) M.adjustOxyLoss(-10) M.heal_organ_damage(12,12) M.adjustToxLoss(-3) - ..() - return - - clonexadone - name = "Clonexadone" - id = "clonexadone" - description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube." - reagent_state = LIQUID - color = "#0000C8" // rgb: 200, 165, 220 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.bodytemperature < 170) - M.adjustCloneLoss(-3) M.status_flags &= ~DISFIGURED ..() return diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 00f9a662b91..f4fc2e30b34 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -113,8 +113,8 @@ datum name = "mitocholide" id = "mitocholide" result = "mitocholide" - required_reagents = list("synthflesh" = 1, "clonexadone" = 1) - result_amount = 2 + required_reagents = list("synthflesh" = 1, "cryoxadone" = 1, "plasma" = 1) + result_amount = 3 holy_water name = "Holy Water" @@ -132,14 +132,6 @@ datum result_amount = 4 mix_message = "The solution bubbles softly." - clonexadone - name = "Clonexadone" - id = "clonexadone" - result = "clonexadone" - required_reagents = list("cryoxadone" = 1, "sodium" = 1) - required_catalysts = list("plasma" = 5) - result_amount = 2 - spaceacillin name = "Spaceacillin" id = "spaceacillin" @@ -983,7 +975,7 @@ datum name = "Syntiflesh" id = "syntiflesh" result = null - required_reagents = list("blood" = 5, "clonexadone" = 1) + required_reagents = list("blood" = 5, "cryoxadone" = 1) result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) diff --git a/code/setup.dm b/code/setup.dm index f629ab3b14f..c14124cb929 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -795,7 +795,7 @@ var/list/be_special_flags = list( #define PULSE_THREADY 5 //occurs during hypovolemic shock //feel free to add shit to lists below var/list/tachycardics = list("coffee", "methamphetamine", "nitroglycerin", "thirteenloko", "nicotine") //increase heart rate -var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs") //decrease heart rate +var/list/bradycardics = list("neurotoxin", "cryoxadone", "space_drugs") //decrease heart rate var/list/heartstopper = list("capulettium", "capulettium_plus") //this stops the heart var/list/cheartstopper = list() //this stops the heart when overdose is met -- c = conditional