From 7cd6d5eaa49ad9c97dcb0d3bb47f441903d1cf00 Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Sun, 25 Nov 2012 21:56:18 +0000 Subject: [PATCH] -Added the previously unobtainable hallucigen disease to the virus crate. Increased the virus crate from 20 to 25. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5194 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/diseases/advance/advance.dm | 4 ++-- code/datums/diseases/advance/presets.dm | 9 +++++++++ code/datums/supplypacks.dm | 7 ++++--- .../reagents/reagent_containers/glass/bottle.dm | 11 +++++++++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 106ee983a2d..939960d5fe9 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -210,8 +210,8 @@ var/list/advance_cures = list( hidden = list( (properties["stealth"] > 2), (properties["stealth"] > 3) ) // The more symptoms we have, the less transmittable it is but some symptoms can make up for it. SetSpread(Clamp(properties["transmittable"] - symptoms.len, BLOOD, AIRBORNE)) - permeability_mod = max(Ceiling(0.5 * properties["transmittable"]), 1) - cure_chance = 10 - Clamp(properties["resistance"], -5, 5) // can be between 5 and 15 + permeability_mod = max(Ceiling(0.4 * properties["transmittable"]), 1) + cure_chance = 15 - Clamp(properties["resistance"], -5, 5) // can be between 10 and 20 stage_prob = max(properties["stage_rate"], 2) SetSeverity(properties["severity"]) GenerateCure(properties) diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm index b0ff058950a..b62b18e306c 100644 --- a/code/datums/diseases/advance/presets.dm +++ b/code/datums/diseases/advance/presets.dm @@ -31,4 +31,13 @@ if(!D) name = "Liver Enhancer" symptoms = list(new/datum/symptom/heal) + ..(process, D, copy) + + +// Hullucigen + +/datum/disease/advance/hullucigen/New(var/process = 1, var/datum/disease/advance/D, var/copy = 0) + if(!D) + name = "Reality Impairment" + symptoms = list(new/datum/symptom/hallucigen) ..(process, D, copy) \ No newline at end of file diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index c67c2b1158a..24d0690a309 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -286,10 +286,11 @@ /obj/item/weapon/reagent_containers/glass/bottle/magnitis, /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat, /obj/item/weapon/reagent_containers/glass/bottle/brainrot, - /obj/item/weapon/reagent_containers/glass/bottle/mutagen, + /obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion, /obj/item/weapon/storage/syringes, - /obj/item/weapon/storage/beakerbox) - cost = 20 + /obj/item/weapon/storage/beakerbox, + /obj/item/weapon/reagent_containers/glass/bottle/mutagen) + cost = 25 containertype = /obj/structure/closet/crate/secure/weapon containername = "Virus crate" access = access_cmo diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 8adb066e480..f931097b259 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -140,6 +140,17 @@ var/list/data = list("viruses"= list(F)) reagents.add_reagent("blood", 20, data) +/obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion + name = "Hullucigen virion culture bottle" + desc = "A small bottle. Contains hullucigen virion culture in synthblood medium." + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle3" + New() + ..() + var/datum/disease/F = new /datum/disease/advance/hullucigen(0) + var/list/data = list("viruses"= list(F)) + reagents.add_reagent("blood", 20, data) + /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat name = "Pierrot's Throat culture bottle" desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."