cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Okay I'm done testing on the players, I've set the diseases for cold9 and spanish flu to their own disease path stuffs.

Browse Source 
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
This commit is contained in:
tronaldnwn@hotmail.com
2011-06-14 19:53:45 +00:00
parent 482d0f2d95
commit 20a2b4375e
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -18,8 +18,7 @@
var/direct = "SOUTH" var/direct = "SOUTH"
var/obj/item/weapon/circuitboard/circuit = null var/obj/item/weapon/circuitboard/circuit = null
var/list/beakers = new/list() 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/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/list/disallowed_container = "/obj/item/weapon/reagent_containers/glass/large"
var/affected_area = 3 var/affected_area = 3
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
@@ -48,7 +47,7 @@
stage = 2 stage = 2
else else
user << "\red You need to add at least one beaker before locking the assembly." 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 path = 1
if(beakers.len == 2) if(beakers.len == 2)
user << "\red The grenade can not hold more containers." user << "\red The grenade can not hold more containers."
@@ -250,7 +249,6 @@
desc = "An oversized grenade that affects a larger area." desc = "An oversized grenade that affects a larger area."
icon_state = "large_grenade" icon_state = "large_grenade"
allowed_containers = list("/obj/item/weapon/reagent_containers/glass") 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" origin_tech = "combat=3;materials=3"
affected_area = 4 affected_area = 4

10
code/datums/diseases/cold9.dm
View File

@@ -10,11 +10,11 @@
desc = "If left untreated the subject will slow, as if partly frozen." desc = "If left untreated the subject will slow, as if partly frozen."
severity = "Moderate" severity = "Moderate"
/datum/disease/cold/stage_act() /datum/disease/cold9/stage_act()
..() ..()
switch(stage) switch(stage)
if(2) if(2)
affected_mob.bodytemperature -= 5 affected_mob.bodytemperature -= 10
if(prob(1) && prob(10)) if(prob(1) && prob(10))
affected_mob << "\blue You feel better." affected_mob << "\blue You feel better."
affected_mob.virus.cure() affected_mob.virus.cure()
@@ -25,15 +25,15 @@
affected_mob.emote("cough") affected_mob.emote("cough")
if(prob(1)) if(prob(1))
affected_mob << "\red Your throat feels sore." affected_mob << "\red Your throat feels sore."
if(prob(1)) if(prob(5))
affected_mob << "\red You feel stiff." affected_mob << "\red You feel stiff."
if(3) if(3)
affected_mob.bodytemperature -= 10 affected_mob.bodytemperature -= 20
if(prob(1)) if(prob(1))
affected_mob.emote("sneeze") affected_mob.emote("sneeze")
if(prob(1)) if(prob(1))
affected_mob.emote("cough") affected_mob.emote("cough")
if(prob(1)) if(prob(1))
affected_mob << "\red Your throat feels sore." affected_mob << "\red Your throat feels sore."
if(prob(1)) if(prob(10))
affected_mob << "\red You feel stiff." affected_mob << "\red You feel stiff."

22
code/datums/diseases/fluspanish.dm
View File

@@ -11,28 +11,26 @@
desc = "If left untreated the subject will burn to death for being a heretic." desc = "If left untreated the subject will burn to death for being a heretic."
severity = "Serious" severity = "Serious"
/datum/disease/flu/stage_act() /datum/disease/inquisition/stage_act()
..() ..()
switch(stage) switch(stage)
if(2) if(2)
affected_mob.bodytemperature += 5 affected_mob.bodytemperature += 10
if(prob(1)) if(prob(5))
affected_mob.emote("sneeze") affected_mob.emote("sneeze")
if(prob(1)) if(prob(5))
affected_mob.emote("cough") affected_mob.emote("cough")
if(prob(1)) if(prob(1))
affected_mob << "\red You're burning in your own skin!" affected_mob << "\red You're burning in your own skin!"
if(prob(20)) affected_mob.take_organ_damage(0,5)
affected_mob.take_organ_damage(0,3)
if(3) if(3)
affected_mob.bodytemperature += 10 affected_mob.bodytemperature += 20
if(prob(1)) if(prob(5))
affected_mob.emote("sneeze") affected_mob.emote("sneeze")
if(prob(1)) if(prob(5))
affected_mob.emote("cough") affected_mob.emote("cough")
if(prob(1)) if(prob(5))
affected_mob << "\red You're soul feels on fire!" affected_mob << "\red You're burning in your own skin!"
if(prob(20))
affected_mob.take_organ_damage(0,5) affected_mob.take_organ_damage(0,5)
return return