From bc3ecd68c63c656d25574718e67034a802f3b450 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 24 May 2015 18:31:12 -0400 Subject: [PATCH] Removes Nanomachines --- code/modules/reagents/Chemistry-Reagents.dm | 22 +++++-------------- .../reagent_containers/food/snacks.dm | 1 - .../reagent_containers/glass/bottle.dm | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 2ef9ecde1c6..b02dbddc52d 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1381,7 +1381,7 @@ datum return /////////////////////////////////////////////////////////////////////////////////////////////////////////////// - +/* nanomachines name = "Nanomachines" id = "nanomachines" @@ -1389,23 +1389,11 @@ datum reagent_state = LIQUID color = "#535E66" // rgb: 83, 94, 102 - on_mob_life(var/mob/living/M as mob) - var/datum/disease2/disease/borg = new /datum/disease2/disease - var/datum/disease2/effectholder/holder = new /datum/disease2/effectholder - var/datum/disease2/effect/borg/O = new /datum/disease2/effect/borg - holder.effect += O - holder.chance = 10 - borg.infectionchance = 100 - borg.antigen |= text2num(pick(ANTIGENS)) - borg.spreadtype = "None" - borg.uniqueID = 1337 - borg.effects += holder - borg.speed = 1 - borg.stage = 2 - borg.clicks = 185 - infect_virus2(M,borg,0) + reaction_mob(var/mob/M, var/method=TOUCH, var/volume) + src = null + if( (prob(10) && method==TOUCH) || method==INGEST) + M.contract_disease(new /datum/disease/robotic_transformation(0),1) -/* xenomicrobes name = "Xenomicrobes" id = "xenomicrobes" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index f647bded3a1..70eb1bd8a9f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -928,7 +928,6 @@ New() ..() reagents.add_reagent("nutriment", 2) - reagents.add_reagent("nanomachines", 5) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/roburgerbig diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 56c877bd55b..3c5c213eef3 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -275,4 +275,4 @@ New() ..() - reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide", "nanomachines"), 40) \ No newline at end of file + reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide"), 40) \ No newline at end of file