diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index 19fed9d99db..d2422b85f97 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -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 << "Your chest hurts." if(prob(2)) affected_mob << "Your stomach violently rumbles!" - if(prob(2)) - affected_mob << "You feel a sharp pain from your lower chest!" - affected_mob.adjustOxyLoss(5) - affected_mob.emote("gasp") if(prob(5)) - affected_mob.vomit(20) - if(3) + affected_mob << "You feel a cold sweat form." + if(4) if(prob(2)) affected_mob << "You see four of everything" affected_mob.Dizzy(5) if(prob(2)) - affected_mob << "You feel a cold sweat form." + affected_mob << "You feel a sharp pain from your lower chest!" + affected_mob.adjustOxyLoss(5) + affected_mob.emote("gasp") if(prob(10)) affected_mob << "You feel air escape from your lungs painfully." affected_mob.adjustOxyLoss(25) affected_mob.emote("gasp") - - if(4) + if(5) if(prob(2)) affected_mob << "[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]" affected_mob.adjustStaminaLoss(70) @@ -49,8 +45,8 @@ if(prob(2)) affected_mob << "You feel your mind relax and your thoughts drift!" 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 << "[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "You could eat a crayon")]" affected_mob.overeatduration = max(affected_mob.overeatduration - 100, 0) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 6dc851cd335..ee3d5426af2 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -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 \ No newline at end of file diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 5a37128f9b2..ab22ab0dfa5 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -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."