Merge pull request #15018 from LanCartwright/fungaltbchange

removes fungal tb from traitor
This commit is contained in:
tkdrg
2016-01-31 11:36:06 -03:00
3 changed files with 10 additions and 35 deletions
+9 -13
View File
@@ -1,6 +1,6 @@
/datum/disease/tuberculosis
name = "Fungal tuberculosis"
max_stages = 4
max_stages = 5
spread_text = "Airborne"
cure_text = "Spaceacillin & salbutamol"
cures = list("spaceacillin", "salbutamol")
@@ -13,7 +13,6 @@
/datum/disease/tuberculosis/stage_act() //it begins
..()
switch(stage)
if(2)
if(prob(2))
@@ -21,24 +20,21 @@
affected_mob << "<span class='danger'>Your chest hurts.</span>"
if(prob(2))
affected_mob << "<span class='danger'>Your stomach violently rumbles!</span>"
if(prob(2))
affected_mob << "<span class='danger'>You feel a sharp pain from your lower chest!</span>"
affected_mob.adjustOxyLoss(5)
affected_mob.emote("gasp")
if(prob(5))
affected_mob.vomit(20)
if(3)
affected_mob << "<span class='danger'>You feel a cold sweat form.</span>"
if(4)
if(prob(2))
affected_mob << "<span class='userdanger'>You see four of everything</span>"
affected_mob.Dizzy(5)
if(prob(2))
affected_mob << "<span class='danger'>You feel a cold sweat form.</span>"
affected_mob << "<span class='danger'>You feel a sharp pain from your lower chest!</span>"
affected_mob.adjustOxyLoss(5)
affected_mob.emote("gasp")
if(prob(10))
affected_mob << "<span class='danger'>You feel air escape from your lungs painfully.</span>"
affected_mob.adjustOxyLoss(25)
affected_mob.emote("gasp")
if(4)
if(5)
if(prob(2))
affected_mob << "<span class='userdanger'>[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]</span>"
affected_mob.adjustStaminaLoss(70)
@@ -49,8 +45,8 @@
if(prob(2))
affected_mob << "<span class='userdanger'>You feel your mind relax and your thoughts drift!</span>"
affected_mob.confused = min(100, affected_mob.confused + 8)
if(prob(15))
affected_mob.vomit(0, 1)
if(prob(10))
affected_mob.vomit(20)
if(prob(3))
affected_mob << "<span class='warning'><i>[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "You could eat a crayon")]</i></span>"
affected_mob.overeatduration = max(affected_mob.overeatduration - 100, 0)
@@ -242,15 +242,4 @@
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure(src)
return
/obj/item/weapon/storage/box/syndie_kit/tuberculosiskit
name = "boxed virus kit"
/obj/item/weapon/storage/box/syndie_kit/tuberculosiskit/New()
..()
new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosis(src)
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure(src)
new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure(src)
return
return
-10
View File
@@ -576,16 +576,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
cost = 1
surplus = 50
/datum/uplink_item/stealthy_weapons/traitor_virus_kit
name = "Virus Kit"
desc = "An active fungal pathogen in a sterile, compact box. Comes with one Bio Virus Antidote Kit (BVAK) \
autoinjector for rapid application on up to two targets each, a syringe, and a bottle containing \
the BVAK solution."
item = /obj/item/weapon/storage/box/syndie_kit/tuberculosiskit
cost = 20
surplus = 50
exclude_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/stealthy_weapons/traitor_chem_bottle
name = "Poison Kit"
desc = "An assortment of deadly chemicals packed into a compact box. Comes with a syringe for more precise application."