From 206ddda717d48a5f0093336821e87dd2c2d0f905 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 21 Sep 2015 04:25:26 -0400 Subject: [PATCH 1/2] Borg Transformation Virus Symptom --- code/modules/virus2/effect.dm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 3bbdbf03568..90c11296066 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -15,7 +15,7 @@ /datum/disease2/effectholder/proc/getrandomeffect(var/badness = 1) var/list/datum/disease2/effect/list = list() - for(var/e in subtypesof(/datum/disease2/effect)) + for(var/e in subtypesof(/datum/disease2/effect) - /datum/disease2/effect/organs/vampire) var/datum/disease2/effect/f = new e if (f.badness > badness) //we don't want such strong effects continue @@ -104,6 +104,25 @@ ////////////////////////STAGE 4///////////////////////////////// +/datum/disease2/effect/borg + name = "Borgification Disorder" + stage = 4 + badness = 2 + activate(var/mob/living/carbon/mob,var/multiplier) + mob << "You feel like beeping and booping..." + mob.adjustBruteLoss(10) + mob.updatehealth() + if(prob(40)) + if(mob.client) + if(!jobban_isbanned(mob, "Cyborg") || !jobban_isbanned(mob,"nonhumandept")) + var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(mob.loc)) + mob.mind.transfer_to(O) + else + new/mob/living/silicon/robot(get_turf(mob.loc)) + var/datum/disease2/disease/D = mob.virus2 + mob.gib() + qdel(D) + /datum/disease2/effect/omnizine name = "Panacea Effect" stage = 4 From 562305902ed4d75a88a3e967db32195f4f9e8711 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 21 Sep 2015 21:10:20 -0400 Subject: [PATCH 2/2] fix for symptom --- code/modules/virus2/effect.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 90c11296066..e73fea39d27 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -114,7 +114,7 @@ mob.updatehealth() if(prob(40)) if(mob.client) - if(!jobban_isbanned(mob, "Cyborg") || !jobban_isbanned(mob,"nonhumandept")) + if(!jobban_isbanned(mob, "Cyborg") && !jobban_isbanned(mob,"nonhumandept")) var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(mob.loc)) mob.mind.transfer_to(O) else