Added a new disease.

Removed GBS.
Fixed mime invisiwall.
Removed the red stripe on HoS's suit AGAIN.
Added metroid jam.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@314 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-10-18 18:29:59 +00:00
parent bfeec3212b
commit 50b8c9dd35
13 changed files with 127 additions and 19 deletions

View File

@@ -44,11 +44,11 @@ datum
on_mob_life(var/mob/M)
holder.remove_reagent(src.id, 0.4) //By default it slowly disappears.
return
/*
metroid
name = "Metroid Jelly"
name = "Metroid Jam"
id = "metroid"
description = "A green liquid produced from one of the deadliest lifeforms in existence."
description = "A green semi-liquid produced from one of the deadliest lifeforms in existence."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(prob(10))
@@ -56,8 +56,8 @@ datum
M.toxloss+=20
else if(prob(40))
M.bruteloss-=5
..() //Code no work :< -- Urist
*/
..()
blood
@@ -593,6 +593,18 @@ datum
description = "Pure iron is a metal."
reagent_state = SOLID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if((M.virus) && (prob(8) && (M.virus.name=="Magnitis")))
if(M.virus.spread == "Airborne")
M.virus.spread = "Remissive"
M.virus.stage--
if(M.virus.stage <= 0)
M.resistances += M.virus.type
M.virus = null
holder.remove_reagent(src.id, 0.2)
return
aluminium
name = "Aluminium"
id = "aluminium"
@@ -942,7 +954,7 @@ datum
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if((M.virus) && (prob(8)))
if((M.virus) && (prob(8) && (M.virus.name!="Magnitis")))
if(M.virus.spread == "Airborne")
M.virus.spread = "Remissive"
M.virus.stage--

View File

@@ -1170,7 +1170,7 @@
var/list/data = list("virus"= F)
R.add_reagent("blood", 20, data)
/*
/obj/item/weapon/reagent_containers/glass/bottle/gbs
name = "GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
@@ -1184,8 +1184,8 @@
R.my_atom = src
var/datum/disease/F = new /datum/disease/gbs
var/list/data = list("virus"= F)
R.add_reagent("blood", 20, data)
R.add_reagent("blood", 20, data) -- No.
*/
/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs
name = "GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
@@ -1217,6 +1217,21 @@
var/list/data = list("virus"= F)
R.add_reagent("blood", 20, data)
/obj/item/weapon/reagent_containers/glass/bottle/magnitis
name = "GBS culture bottle"
desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
icon = 'chemical.dmi'
icon_state = "bottle3"
amount_per_transfer_from_this = 5
New()
var/datum/reagents/R = new/datum/reagents(20)
reagents = R
R.my_atom = src
var/datum/disease/F = new /datum/disease/magnitis
var/list/data = list("virus"= F)
R.add_reagent("blood", 20, data)
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"
@@ -2029,7 +2044,6 @@
///jar
/*
/obj/item/weapon/reagent_containers/food/drinks/jar
name = "empty jar"
desc = "A jar. You're not sure what it's supposed to hold."
@@ -2040,6 +2054,7 @@
var/datum/reagents/R = new/datum/reagents(50)
reagents = R
R.my_atom = src
R.add_reagent("metroid", 50)
on_reagent_change()
if (reagents.reagent_list.len > 0)
@@ -2056,5 +2071,4 @@
icon_state = "jar"
name = "empty jar"
desc = "A jar. You're not sure what it's supposed to hold."
return //Code no work :< -- Urist
*/
return