From ba02c80bdf71253a103ccb90064598d70601974a Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 28 Dec 2015 01:33:59 +0000 Subject: [PATCH 01/14] better be gpd da,m gicco at thos [pomt --- code/datums/diseases/tuberculosis.dm | 61 +++++++++++++++++++ code/datums/uplink_item.dm | 15 +++++ .../items/weapons/grenades/chem_grenade.dm | 19 ++++++ .../items/weapons/storage/uplink_kits.dm | 29 +++++++++ .../chemistry/reagents/other_reagents.dm | 11 ++++ .../reagents/reagent_containers/bottle.dm | 14 ++++- .../reagents/reagent_containers/hypospray.dm | 8 +++ tgstation.dme | 30 +-------- 8 files changed, 158 insertions(+), 29 deletions(-) create mode 100644 code/datums/diseases/tuberculosis.dm diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm new file mode 100644 index 000000000000..3fce93536c47 --- /dev/null +++ b/code/datums/diseases/tuberculosis.dm @@ -0,0 +1,61 @@ +/datum/disease/tuberculosis + name = "Fungal tuberculosis" + max_stages = 4 + spread_text = "Airborne" + cure_text = "Spaceacillin & salbutamol" + cures = list("spaceacillin", "salbutamol") + agent = "Fungal Tubercle bacillus Cosmosis" + viable_mobtypes = list(/mob/living/carbon/human) + cure_chance = 5//like hell are you getting out of hell + desc = "A rare highly transmittable virulent virus. Few samples exist, rumoured to be carefully grown and cultured by clandestine bio-weapon specialists. Causes fever, blood vomiting, lung damage, weight loss, and fatigue." + required_organs = list(/obj/item/organ/limb/head) + severity = DANGEROUS + +/datum/disease/tuberculosis/stage_act() //it begins + ..() + + switch(stage) + if(2) + if(prob(2)) + affected_mob.emote("cough") + affected_mob << "Your chest hurts." + if(prob(2)) + affected_mob << "Your stomach violently rumbles!" + if(prob(2)) + affected_mob << "You feel a cavity in your lung forming." + affected_mob.adjustOxyLoss(5) + affected_mob.emote("gasp") + if(prob(5)) + affected_mob.vomit(20) + if(3) + 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." + if(prob(10) + affected_mob << "You feel air escape from your lungs painfully." + affected_mob.adjustOxyLoss(25) + affected_mob.emote("gasp") + + if(4) + if(prob(2)) + affected_mob << "[pick("You feel your heart slowing...", "You slow your heartbeat.")]" + affected_mob.adjustStaminaLoss(40) + if(affected_mob.getStaminaLoss() > 60 && !M.stat) + affected_mob.visible_message("[M] faints!", "You surrender yourself and feel at peace...") + affected_mob.sleeping += 5 + if(prob(2)) + affected_mob << "You feel your mind relax and your thoughts drift!" + affected_mob.confused = min(100, M.confused + 8) + if(prob(15) + affected_mob.vomit(0, 1) + 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) + affected_mob.nutrition = max(M.nutrition - 100, 0 + if(prob(15)) + affected_mob << "[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]" + affected_mob.bodytemperature += 40 + return + diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 42fa4018f688..269639b15460 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -292,6 +292,14 @@ var/list/uplink_items = list() gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) surplus = 0 +/datum/uplink_item/stealthy_weapons/operator_virus_grenade + name = "Fungal Tuberculosis grenade" + desc = "A primed bio-grenade packed into a compact box. Comes with five Bio Virus Antidote Kit (BVAK) autoinjectors for rapid application on upto two targets each, a syringe, and a bottle containing the BVAK solution." + item = /obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade + cost = 12 + surplus = 35 + gamemodes = list(/datum/game_mode/nuclear) + /datum/uplink_item/dangerous/gygax name = "Gygax Exosuit" desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent for hit-and-run style attacks. \ @@ -549,6 +557,13 @@ var/list/uplink_items = list() 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 upto two targets each, a syringe, and a bottle containing the BVAK solution." + item = /obj/item/weapon/storage/box/syndie_kit/tuberculosiskit + cost = 9 + surplus = 50 + /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." diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index a6a525541d5d..76f22d6a233f 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -441,6 +441,25 @@ beakers += B1 beakers += B2 +/obj/item/weapon/grenade/chem_grenade/tuberculosis + name = "Fungal tuberculosis grenade" + desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE." + stage = READY + + /obj/item/weapon/grenade/chem_grenade/tuberculosis/New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src) + + B1.reagents.add_reagent("potassium", 50) + B1.reagents.add_reagent("phosphorus", 50) + B1.reagents.add_reagent("fungalspores", 200) + B2.reagents.add_reagent("blood", 250) + B2.reagents.add_reagent("sugar", 50) + + beakers += B1 + beakers += B2 + #undef EMPTY #undef WIRED #undef READY diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 2ccaa9071f09..e98f91318b1f 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -240,3 +240,32 @@ new /obj/item/weapon/screwdriver/nuke(src) new /obj/item/nuke_core_container(src) new /obj/item/weapon/paper/nuke_instructions(src) + + +/obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade + name = "boxed virus grenade kit" + +/obj/item/weapon/storage/box/virus_kit/tuberculosisgrenade/New() + ..() + new /obj/item/weapon/grenade/chem_grenade/tuberculosis + new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure + new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure + new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure + new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure + new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure + new /obj/item/weapon/reagent_containers/syringe + new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure + return + +/obj/item/weapon/storage/box/syndie_kit/tuberculosiskit + name = "boxed virus kit" + +/obj/item/weapon/storage/box/virus_kit/tuberculosiskit/New() + ..() + new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosis + new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure + new /obj/item/weapon/reagent_containers/syringe + new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure + return + + diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 11d169070d1e..b30cec42be69 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -763,6 +763,17 @@ if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) M.ContractDisease(new /datum/disease/transformation/xeno(0)) + + /datum/reagent/fungalspores + name = "Tubercle bacillus Cosmosis microbes" + id = "fungalspores" + description = "Active fungal spores." + color = "#92D17D" // rgb: 146, 209, 125 + + /datum/reagent/fungalspores/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) + if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) + M.ForceContractDisease(new /datum/disease/tuberculosis(0)) + /datum/reagent/fluorosurfactant//foam precursor name = "Fluorosurfactant" id = "fluorosurfactant" diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 1ac7629b5bd3..36b9eb2ed218 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -296,4 +296,16 @@ name = "Spanish flu culture bottle" desc = "A small bottle. Contains a sample of Inquisitius." icon_state = "bottle3" - spawned_disease = /datum/disease/fluspanish \ No newline at end of file + spawned_disease = /datum/disease/fluspanish + +/obj/item/weapon/reagent_containers/glass/bottle/tuberculosis + name = "Fungal Tuberculosis culture bottle" + desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus." + icon_state = "bottle3" + spawned_disease = /datum/disease/tuberculosis + +/obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure + name = "BVAK bottle" + desc = "A small bottle containing Bio Virus Antidote Kit." + icon_state = "bottle5" + list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index df207b0b3cfb..090942bf0e62 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -112,3 +112,11 @@ name = "morphine medipen" desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though." list_reagents = list("morphine" = 10) + +/obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure + name = "BVAK autoinjector" + desc = "Bio Virus Antidote Kit autoinjector. Has a two use system for yourself, and someone else. Inject when infected." + icon_state = "stimpen" + volume = 60 + amount_per_transfer_from_this = 30 + list_reagents = list("atropine" = 10, "epinephrine" = 10, "salbutamol" = 20, "spaceacillin" = 20) diff --git a/tgstation.dme b/tgstation.dme index 3822e2fec1fe..41caac838506 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -22,6 +22,7 @@ #include "code\__DATASTRUCTURES\linked_lists.dm" #include "code\__DATASTRUCTURES\priority_queue.dm" #include "code\__DATASTRUCTURES\stacks.dm" +#include "code\__DEFINES\_readme.dm" #include "code\__DEFINES\admin.dm" #include "code\__DEFINES\atmospherics.dm" #include "code\__DEFINES\bots.dm" @@ -166,7 +167,6 @@ #include "code\controllers\subsystem\ticker.dm" #include "code\controllers\subsystem\timer.dm" #include "code\controllers\subsystem\voting.dm" -#include "code\controllers\subsystem\shuttles\assault_pod.dm" #include "code\controllers\subsystem\shuttles\emergency.dm" #include "code\controllers\subsystem\shuttles\supply.dm" #include "code\datums\ai_laws.dm" @@ -206,6 +206,7 @@ #include "code\datums\diseases\retrovirus.dm" #include "code\datums\diseases\rhumba_beat.dm" #include "code\datums\diseases\transformation.dm" +#include "code\datums\diseases\tuberculosis.dm" #include "code\datums\diseases\wizarditis.dm" #include "code\datums\diseases\advance\advance.dm" #include "code\datums\diseases\advance\presets.dm" @@ -366,25 +367,6 @@ #include "code\game\gamemodes\malfunction\Malf_Modules.dm" #include "code\game\gamemodes\meteor\meteor.dm" #include "code\game\gamemodes\meteor\meteors.dm" -#include "code\game\gamemodes\miniantags\abduction\abduction.dm" -#include "code\game\gamemodes\miniantags\abduction\abduction_gear.dm" -#include "code\game\gamemodes\miniantags\abduction\abduction_surgery.dm" -#include "code\game\gamemodes\miniantags\abduction\gland.dm" -#include "code\game\gamemodes\miniantags\abduction\machinery\camera.dm" -#include "code\game\gamemodes\miniantags\abduction\machinery\console.dm" -#include "code\game\gamemodes\miniantags\abduction\machinery\dispenser.dm" -#include "code\game\gamemodes\miniantags\abduction\machinery\experiment.dm" -#include "code\game\gamemodes\miniantags\abduction\machinery\pad.dm" -#include "code\game\gamemodes\miniantags\bot_swarm\swarmer.dm" -#include "code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm" -#include "code\game\gamemodes\miniantags\monkey\monkey.dm" -#include "code\game\gamemodes\miniantags\morph\morph.dm" -#include "code\game\gamemodes\miniantags\revenant\revenant.dm" -#include "code\game\gamemodes\miniantags\revenant\revenant_abilities.dm" -#include "code\game\gamemodes\miniantags\revenant\revenant_blight.dm" -#include "code\game\gamemodes\miniantags\revenant\revenant_spawn_event.dm" -#include "code\game\gamemodes\miniantags\slaughter\slaughter.dm" -#include "code\game\gamemodes\miniantags\slaughter\slaughterevent.dm" #include "code\game\gamemodes\nuclear\nuclear.dm" #include "code\game\gamemodes\nuclear\nuclear_challenge.dm" #include "code\game\gamemodes\nuclear\nuclearbomb.dm" @@ -880,7 +862,6 @@ #include "code\modules\admin\verbs\getlogs.dm" #include "code\modules\admin\verbs\machine_upgrade.dm" #include "code\modules\admin\verbs\manipulate_organs.dm" -#include "code\modules\admin\verbs\map_template_loadverb.dm" #include "code\modules\admin\verbs\mapping.dm" #include "code\modules\admin\verbs\maprotation.dm" #include "code\modules\admin\verbs\massmodvar.dm" @@ -1300,7 +1281,6 @@ #include "code\modules\mob\living\simple_animal\bot\secbot.dm" #include "code\modules\mob\living\simple_animal\friendly\butterfly.dm" #include "code\modules\mob\living\simple_animal\friendly\cat.dm" -#include "code\modules\mob\living\simple_animal\friendly\cockroach.dm" #include "code\modules\mob\living\simple_animal\friendly\crab.dm" #include "code\modules\mob\living\simple_animal\friendly\dog.dm" #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" @@ -1443,16 +1423,12 @@ #include "code\modules\power\singularity\particle_accelerator\particle_power.dm" #include "code\modules\power\supermatter\supermatter.dm" #include "code\modules\power\supermatter\supermatter_crate.dm" -#include "code\modules\power\tesla\coil.dm" -#include "code\modules\power\tesla\energy_ball.dm" -#include "code\modules\power\tesla\generator.dm" #include "code\modules\procedural mapping\mapGenerator.dm" #include "code\modules\procedural mapping\mapGeneratorModule.dm" #include "code\modules\procedural mapping\mapGeneratorReadme.dm" #include "code\modules\procedural mapping\mapGeneratorModules\helpers.dm" #include "code\modules\procedural mapping\mapGeneratorModules\nature.dm" #include "code\modules\procedural mapping\mapGenerators\asteroid.dm" -#include "code\modules\procedural mapping\mapGenerators\cellular.dm" #include "code\modules\procedural mapping\mapGenerators\nature.dm" #include "code\modules\procedural mapping\mapGenerators\shuttle.dm" #include "code\modules\procedural mapping\mapGenerators\syndicate.dm" @@ -1483,7 +1459,6 @@ #include "code\modules\projectiles\guns\projectile\launchers.dm" #include "code\modules\projectiles\guns\projectile\pistol.dm" #include "code\modules\projectiles\guns\projectile\revolver.dm" -#include "code\modules\projectiles\guns\projectile\saw.dm" #include "code\modules\projectiles\guns\projectile\shotgun.dm" #include "code\modules\projectiles\guns\projectile\sniper.dm" #include "code\modules\projectiles\guns\projectile\toy.dm" @@ -1580,7 +1555,6 @@ #include "code\modules\surgery\remove_embedded_object.dm" #include "code\modules\surgery\surgery.dm" #include "code\modules\surgery\surgery_step.dm" -#include "code\modules\surgery\tail_modification.dm" #include "code\modules\surgery\tools.dm" #include "code\modules\surgery\organs\augments_external.dm" #include "code\modules\surgery\organs\augments_eyes.dm" From 84c2ae3678d8bc7648b538197663e0cc937c32fb Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 28 Dec 2015 02:18:50 +0000 Subject: [PATCH 02/14] now now I'm drunkl --- code/datums/diseases/tuberculosis.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index 3fce93536c47..c4f9c7cd60cf 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -33,7 +33,7 @@ affected_mob.Dizzy(5) if(prob(2)) affected_mob << "You feel a cold sweat form." - if(prob(10) + if(prob(10)) affected_mob << "You feel air escape from your lungs painfully." affected_mob.adjustOxyLoss(25) affected_mob.emote("gasp") @@ -48,7 +48,7 @@ if(prob(2)) affected_mob << "You feel your mind relax and your thoughts drift!" affected_mob.confused = min(100, M.confused + 8) - if(prob(15) + if(prob(15)) affected_mob.vomit(0, 1) 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")]" From c20c8c03591ff515ef72b428a9170d0f02a90165 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Mon, 28 Dec 2015 02:20:19 +0000 Subject: [PATCH 03/14] Update tuberculosis.dm --- code/datums/diseases/tuberculosis.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index c4f9c7cd60cf..ad5b3557fb56 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -53,7 +53,7 @@ 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) - affected_mob.nutrition = max(M.nutrition - 100, 0 + affected_mob.nutrition = max(M.nutrition - 100, 0) if(prob(15)) affected_mob << "[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]" affected_mob.bodytemperature += 40 From d80a8542c36909c5d4d73cc2d7ba54c58cf22169 Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 28 Dec 2015 02:29:54 +0000 Subject: [PATCH 04/14] gotta sstop drinking and doing karaoke --- .../items/weapons/grenades/chem_grenade.dm | 22 +++++++++---------- .../chemistry/reagents/other_reagents.dm | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 76f22d6a233f..f7037ee55162 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -446,19 +446,19 @@ desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE." stage = READY - /obj/item/weapon/grenade/chem_grenade/tuberculosis/New() - ..() - var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src) +/obj/item/weapon/grenade/chem_grenade/tuberculosis/New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src) - B1.reagents.add_reagent("potassium", 50) - B1.reagents.add_reagent("phosphorus", 50) - B1.reagents.add_reagent("fungalspores", 200) - B2.reagents.add_reagent("blood", 250) - B2.reagents.add_reagent("sugar", 50) + B1.reagents.add_reagent("potassium", 50) + B1.reagents.add_reagent("phosphorus", 50) + B1.reagents.add_reagent("fungalspores", 200) + B2.reagents.add_reagent("blood", 250) + B2.reagents.add_reagent("sugar", 50) - beakers += B1 - beakers += B2 + beakers += B1 + beakers += B2 #undef EMPTY #undef WIRED diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index b30cec42be69..67c0786e8a47 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -764,13 +764,13 @@ M.ContractDisease(new /datum/disease/transformation/xeno(0)) - /datum/reagent/fungalspores +/datum/reagent/fungalspores name = "Tubercle bacillus Cosmosis microbes" id = "fungalspores" description = "Active fungal spores." color = "#92D17D" // rgb: 146, 209, 125 - /datum/reagent/fungalspores/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) +/datum/reagent/fungalspores/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) M.ForceContractDisease(new /datum/disease/tuberculosis(0)) From f10b0d4ef46944acff506822185449f92da52c37 Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 28 Dec 2015 02:36:59 +0000 Subject: [PATCH 05/14] ravuis --- .../reagents/chemistry/reagents/other_reagents.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 67c0786e8a47..a1eb743a34e9 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -763,16 +763,15 @@ if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) M.ContractDisease(new /datum/disease/transformation/xeno(0)) - /datum/reagent/fungalspores - name = "Tubercle bacillus Cosmosis microbes" - id = "fungalspores" - description = "Active fungal spores." - color = "#92D17D" // rgb: 146, 209, 125 + name = "Tubercle bacillus Cosmosis microbes" + id = "fungalspores" + description = "Active fungal spores." + color = "#92D17D" // rgb: 146, 209, 125 /datum/reagent/fungalspores/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) - if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) - M.ForceContractDisease(new /datum/disease/tuberculosis(0)) + if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) + M.ForceContractDisease(new /datum/disease/tuberculosis(0)) /datum/reagent/fluorosurfactant//foam precursor name = "Fluorosurfactant" From 0d5a51f09afdc8ba398075e46e4c9a72a3645460 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Mon, 28 Dec 2015 02:50:40 +0000 Subject: [PATCH 06/14] Update tgstation.dme --- tgstation.dme | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 41caac838506..1c42551288f4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -22,7 +22,6 @@ #include "code\__DATASTRUCTURES\linked_lists.dm" #include "code\__DATASTRUCTURES\priority_queue.dm" #include "code\__DATASTRUCTURES\stacks.dm" -#include "code\__DEFINES\_readme.dm" #include "code\__DEFINES\admin.dm" #include "code\__DEFINES\atmospherics.dm" #include "code\__DEFINES\bots.dm" @@ -167,6 +166,7 @@ #include "code\controllers\subsystem\ticker.dm" #include "code\controllers\subsystem\timer.dm" #include "code\controllers\subsystem\voting.dm" +#include "code\controllers\subsystem\shuttles\assault_pod.dm" #include "code\controllers\subsystem\shuttles\emergency.dm" #include "code\controllers\subsystem\shuttles\supply.dm" #include "code\datums\ai_laws.dm" @@ -367,6 +367,25 @@ #include "code\game\gamemodes\malfunction\Malf_Modules.dm" #include "code\game\gamemodes\meteor\meteor.dm" #include "code\game\gamemodes\meteor\meteors.dm" +#include "code\game\gamemodes\miniantags\abduction\abduction.dm" +#include "code\game\gamemodes\miniantags\abduction\abduction_gear.dm" +#include "code\game\gamemodes\miniantags\abduction\abduction_surgery.dm" +#include "code\game\gamemodes\miniantags\abduction\gland.dm" +#include "code\game\gamemodes\miniantags\abduction\machinery\camera.dm" +#include "code\game\gamemodes\miniantags\abduction\machinery\console.dm" +#include "code\game\gamemodes\miniantags\abduction\machinery\dispenser.dm" +#include "code\game\gamemodes\miniantags\abduction\machinery\experiment.dm" +#include "code\game\gamemodes\miniantags\abduction\machinery\pad.dm" +#include "code\game\gamemodes\miniantags\bot_swarm\swarmer.dm" +#include "code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm" +#include "code\game\gamemodes\miniantags\monkey\monkey.dm" +#include "code\game\gamemodes\miniantags\morph\morph.dm" +#include "code\game\gamemodes\miniantags\revenant\revenant.dm" +#include "code\game\gamemodes\miniantags\revenant\revenant_abilities.dm" +#include "code\game\gamemodes\miniantags\revenant\revenant_blight.dm" +#include "code\game\gamemodes\miniantags\revenant\revenant_spawn_event.dm" +#include "code\game\gamemodes\miniantags\slaughter\slaughter.dm" +#include "code\game\gamemodes\miniantags\slaughter\slaughterevent.dm" #include "code\game\gamemodes\nuclear\nuclear.dm" #include "code\game\gamemodes\nuclear\nuclear_challenge.dm" #include "code\game\gamemodes\nuclear\nuclearbomb.dm" @@ -862,6 +881,7 @@ #include "code\modules\admin\verbs\getlogs.dm" #include "code\modules\admin\verbs\machine_upgrade.dm" #include "code\modules\admin\verbs\manipulate_organs.dm" +#include "code\modules\admin\verbs\map_template_loadverb.dm" #include "code\modules\admin\verbs\mapping.dm" #include "code\modules\admin\verbs\maprotation.dm" #include "code\modules\admin\verbs\massmodvar.dm" @@ -1281,6 +1301,7 @@ #include "code\modules\mob\living\simple_animal\bot\secbot.dm" #include "code\modules\mob\living\simple_animal\friendly\butterfly.dm" #include "code\modules\mob\living\simple_animal\friendly\cat.dm" +#include "code\modules\mob\living\simple_animal\friendly\cockroach.dm" #include "code\modules\mob\living\simple_animal\friendly\crab.dm" #include "code\modules\mob\living\simple_animal\friendly\dog.dm" #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" @@ -1423,12 +1444,16 @@ #include "code\modules\power\singularity\particle_accelerator\particle_power.dm" #include "code\modules\power\supermatter\supermatter.dm" #include "code\modules\power\supermatter\supermatter_crate.dm" +#include "code\modules\power\tesla\coil.dm" +#include "code\modules\power\tesla\energy_ball.dm" +#include "code\modules\power\tesla\generator.dm" #include "code\modules\procedural mapping\mapGenerator.dm" #include "code\modules\procedural mapping\mapGeneratorModule.dm" #include "code\modules\procedural mapping\mapGeneratorReadme.dm" #include "code\modules\procedural mapping\mapGeneratorModules\helpers.dm" #include "code\modules\procedural mapping\mapGeneratorModules\nature.dm" #include "code\modules\procedural mapping\mapGenerators\asteroid.dm" +#include "code\modules\procedural mapping\mapGenerators\cellular.dm" #include "code\modules\procedural mapping\mapGenerators\nature.dm" #include "code\modules\procedural mapping\mapGenerators\shuttle.dm" #include "code\modules\procedural mapping\mapGenerators\syndicate.dm" @@ -1459,6 +1484,7 @@ #include "code\modules\projectiles\guns\projectile\launchers.dm" #include "code\modules\projectiles\guns\projectile\pistol.dm" #include "code\modules\projectiles\guns\projectile\revolver.dm" +#include "code\modules\projectiles\guns\projectile\saw.dm" #include "code\modules\projectiles\guns\projectile\shotgun.dm" #include "code\modules\projectiles\guns\projectile\sniper.dm" #include "code\modules\projectiles\guns\projectile\toy.dm" @@ -1555,6 +1581,7 @@ #include "code\modules\surgery\remove_embedded_object.dm" #include "code\modules\surgery\surgery.dm" #include "code\modules\surgery\surgery_step.dm" +#include "code\modules\surgery\tail_modification.dm" #include "code\modules\surgery\tools.dm" #include "code\modules\surgery\organs\augments_external.dm" #include "code\modules\surgery\organs\augments_eyes.dm" From 1135a271f550993b5246d06e975bfde0b56599f9 Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 28 Dec 2015 03:46:27 +0000 Subject: [PATCH 07/14] nothing works here --- code/datums/diseases/tuberculosis.dm | 11 ++++++----- code/datums/uplink_item.dm | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index ad5b3557fb56..27e8253fd12a 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -41,19 +41,20 @@ if(4) if(prob(2)) affected_mob << "[pick("You feel your heart slowing...", "You slow your heartbeat.")]" - affected_mob.adjustStaminaLoss(40) - if(affected_mob.getStaminaLoss() > 60 && !M.stat) - affected_mob.visible_message("[M] faints!", "You surrender yourself and feel at peace...") + affected_mob.adjustStaminaLoss(70) + if(prob(10)) + affected_mob.adjustStaminaLoss(100) + affected_mob.visible_message("[affected_mob] faints!", "You surrender yourself and feel at peace...") affected_mob.sleeping += 5 if(prob(2)) affected_mob << "You feel your mind relax and your thoughts drift!" - affected_mob.confused = min(100, M.confused + 8) + affected_mob.confused = min(100, affected_mob.confused + 8) if(prob(15)) affected_mob.vomit(0, 1) 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) - affected_mob.nutrition = max(M.nutrition - 100, 0) + affected_mob.nutrition = max(affected_mob.nutrition - 100, 0) if(prob(15)) affected_mob << "[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]" affected_mob.bodytemperature += 40 diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 269639b15460..a6979c01b800 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -561,8 +561,8 @@ var/list/uplink_items = list() 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 upto two targets each, a syringe, and a bottle containing the BVAK solution." item = /obj/item/weapon/storage/box/syndie_kit/tuberculosiskit - cost = 9 - surplus = 50 + cost = 9 + surplus = 50 /datum/uplink_item/stealthy_weapons/traitor_chem_bottle name = "Poison Kit" From 11a3cb3d8249a0b9f00a28040849c294755f37e1 Mon Sep 17 00:00:00 2001 From: Akke Date: Wed, 30 Dec 2015 23:30:55 +0000 Subject: [PATCH 08/14] indentation --- code/datums/diseases/tuberculosis.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index 27e8253fd12a..a9e5d0280821 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -43,9 +43,9 @@ affected_mob << "[pick("You feel your heart slowing...", "You slow your heartbeat.")]" affected_mob.adjustStaminaLoss(70) if(prob(10)) - affected_mob.adjustStaminaLoss(100) - affected_mob.visible_message("[affected_mob] faints!", "You surrender yourself and feel at peace...") - affected_mob.sleeping += 5 + affected_mob.adjustStaminaLoss(100) + affected_mob.visible_message("[affected_mob] faints!", "You surrender yourself and feel at peace...") + affected_mob.sleeping += 5 if(prob(2)) affected_mob << "You feel your mind relax and your thoughts drift!" affected_mob.confused = min(100, affected_mob.confused + 8) From 3e10ee04f66136aec4c76fcba7eef9f939846bd4 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Thu, 31 Dec 2015 01:54:49 +0000 Subject: [PATCH 09/14] god dammit --- code/datums/diseases/tuberculosis.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index a9e5d0280821..19fed9d99dbd 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -22,7 +22,7 @@ if(prob(2)) affected_mob << "Your stomach violently rumbles!" if(prob(2)) - affected_mob << "You feel a cavity in your lung forming." + affected_mob << "You feel a sharp pain from your lower chest!" affected_mob.adjustOxyLoss(5) affected_mob.emote("gasp") if(prob(5)) @@ -40,7 +40,7 @@ if(4) if(prob(2)) - affected_mob << "[pick("You feel your heart slowing...", "You slow your heartbeat.")]" + affected_mob << "[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]" affected_mob.adjustStaminaLoss(70) if(prob(10)) affected_mob.adjustStaminaLoss(100) From afadb0bbecd29bf47e1838a4eead7fb6a686e180 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Thu, 31 Dec 2015 02:12:18 +0000 Subject: [PATCH 10/14] typo --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index a6979c01b800..52c3a7480a2a 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -294,7 +294,7 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_weapons/operator_virus_grenade name = "Fungal Tuberculosis grenade" - desc = "A primed bio-grenade packed into a compact box. Comes with five Bio Virus Antidote Kit (BVAK) autoinjectors for rapid application on upto two targets each, a syringe, and a bottle containing the BVAK solution." + desc = "A primed bio-grenade packed into a compact box. Comes with five Bio Virus Antidote Kit (BVAK) autoinjectors 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/tuberculosisgrenade cost = 12 surplus = 35 From fa2276fca673d3e7ff36ab8f72ca951b95ef85a6 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Thu, 31 Dec 2015 02:13:36 +0000 Subject: [PATCH 11/14] fixes random tab actually I hit tab instead of space --- code/game/objects/items/weapons/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index e98f91318b1f..659a483c38d1 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -265,7 +265,7 @@ new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosis new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure new /obj/item/weapon/reagent_containers/syringe - new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure + new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure return From 02dc51db6ffc90816db92e46595aeab889c5643a Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Thu, 31 Dec 2015 02:17:30 +0000 Subject: [PATCH 12/14] Update uplink_kits.dm --- code/game/objects/items/weapons/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 659a483c38d1..46963c125f55 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -254,7 +254,7 @@ new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure new /obj/item/weapon/reagent_containers/syringe - new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure + new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure return /obj/item/weapon/storage/box/syndie_kit/tuberculosiskit From 023f6064068d5baf3330a6aebabc8ec7db429d48 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Thu, 31 Dec 2015 02:20:35 +0000 Subject: [PATCH 13/14] Update uplink_item.dm --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 52c3a7480a2a..8674b8b7f9b1 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -559,7 +559,7 @@ var/list/uplink_items = list() /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 upto two targets each, a syringe, and a bottle containing the BVAK solution." + 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 = 9 surplus = 50 From f9aa12d19067681035ea9c02607e9f5c998432e4 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Thu, 31 Dec 2015 02:22:51 +0000 Subject: [PATCH 14/14] excludes virus kits from nuke --- code/datums/uplink_item.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 8674b8b7f9b1..0fca453ee489 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -561,8 +561,9 @@ var/list/uplink_items = list() 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 = 9 + cost = 20 //because nobody knows jack shit about virology surplus = 50 + excludefrom = list(/datum/game_mode/nuclear) /datum/uplink_item/stealthy_weapons/traitor_chem_bottle name = "Poison Kit"