From 20a2b4375e7743805ab05b5a07bc8318f90d7983 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Tue, 14 Jun 2011 19:53:45 +0000 Subject: [PATCH] Okay I'm done testing on the players, I've set the diseases for cold9 and spanish flu to their own disease path stuffs. Grenades - Quick patch because some one wanted to make an "allowed list", but rather than make the beakers loaded use the allowed list... they used a single item path (for single beakers). It is just a few OR experssion so bottles and dispenser beakers can be used in grenade assemblies. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1692 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Tools.dm | 6 ++---- code/datums/diseases/cold9.dm | 10 +++++----- code/datums/diseases/fluspanish.dm | 24 +++++++++++------------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 230e67cc456..228b5203a3c 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -18,8 +18,7 @@ var/direct = "SOUTH" var/obj/item/weapon/circuitboard/circuit = null var/list/beakers = new/list() - var/list/allowed_containers = list("/obj/item/weapon/reagent_containers/glass/beaker", "/obj/item/weapon/reagent_containers/glass/dispenser") - var/list/disallowed_container = "/obj/item/weapon/reagent_containers/glass/large" + var/list/allowed_containers = list("/obj/item/weapon/reagent_containers/glass/beaker", "/obj/item/weapon/reagent_containers/glass/dispenser", "/obj/item/weapon/reagent_containers/glass/bottle") var/affected_area = 3 throw_speed = 4 throw_range = 20 @@ -48,7 +47,7 @@ stage = 2 else user << "\red You need to add at least one beaker before locking the assembly." - else if (istype(W,/obj/item/weapon/reagent_containers/glass/beaker) && stage == 1 && path != 2) + else if ((istype(W,/obj/item/weapon/reagent_containers/glass/beaker)||istype(W,/obj/item/weapon/reagent_containers/glass/dispenser)||istype(W,/obj/item/weapon/reagent_containers/glass/bottle)) && stage == 1 && path != 2) path = 1 if(beakers.len == 2) user << "\red The grenade can not hold more containers." @@ -250,7 +249,6 @@ desc = "An oversized grenade that affects a larger area." icon_state = "large_grenade" allowed_containers = list("/obj/item/weapon/reagent_containers/glass") - disallowed_container = "/obj/item/weapon/reagent_containers/glass/blender_jug" origin_tech = "combat=3;materials=3" affected_area = 4 diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index f8af3aab217..c10aae21de1 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -10,11 +10,11 @@ desc = "If left untreated the subject will slow, as if partly frozen." severity = "Moderate" -/datum/disease/cold/stage_act() +/datum/disease/cold9/stage_act() ..() switch(stage) if(2) - affected_mob.bodytemperature -= 5 + affected_mob.bodytemperature -= 10 if(prob(1) && prob(10)) affected_mob << "\blue You feel better." affected_mob.virus.cure() @@ -25,15 +25,15 @@ affected_mob.emote("cough") if(prob(1)) affected_mob << "\red Your throat feels sore." - if(prob(1)) + if(prob(5)) affected_mob << "\red You feel stiff." if(3) - affected_mob.bodytemperature -= 10 + affected_mob.bodytemperature -= 20 if(prob(1)) affected_mob.emote("sneeze") if(prob(1)) affected_mob.emote("cough") if(prob(1)) affected_mob << "\red Your throat feels sore." - if(prob(1)) + if(prob(10)) affected_mob << "\red You feel stiff." \ No newline at end of file diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm index 4bbd8a15a1d..8400d196b67 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -11,28 +11,26 @@ desc = "If left untreated the subject will burn to death for being a heretic." severity = "Serious" -/datum/disease/flu/stage_act() +/datum/disease/inquisition/stage_act() ..() switch(stage) if(2) - affected_mob.bodytemperature += 5 - if(prob(1)) + affected_mob.bodytemperature += 10 + if(prob(5)) affected_mob.emote("sneeze") - if(prob(1)) + if(prob(5)) affected_mob.emote("cough") if(prob(1)) affected_mob << "\red You're burning in your own skin!" - if(prob(20)) - affected_mob.take_organ_damage(0,3) + affected_mob.take_organ_damage(0,5) if(3) - affected_mob.bodytemperature += 10 - if(prob(1)) + affected_mob.bodytemperature += 20 + if(prob(5)) affected_mob.emote("sneeze") - if(prob(1)) + if(prob(5)) affected_mob.emote("cough") - if(prob(1)) - affected_mob << "\red You're soul feels on fire!" - if(prob(20)) - affected_mob.take_organ_damage(0,5) + if(prob(5)) + affected_mob << "\red You're burning in your own skin!" + affected_mob.take_organ_damage(0,5) return