diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index d0e793a3882..d65b3d50ffd 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -9,7 +9,7 @@
/datum/disease2/effectholder/proc/runeffect(var/mob/living/carbon/human/mob,var/stage)
if(happensonce > -1 && effect.stage <= stage && prob(chance))
- effect.activate(mob)
+ effect.activate(mob,multiplier)
if(happensonce == 1)
happensonce = -1
@@ -161,8 +161,6 @@
C.status &= ~ORGAN_DEAD
-
-
/datum/disease2/effect/immortal
name = "Longevity Syndrome"
stage = 4
@@ -211,48 +209,16 @@
if(h.set_species("Tajaran"))
h.regenerate_icons()
-////////////////////////STAGE 3/////////////////////////////////
-
-/datum/disease2/effect/bones
- name = "Fragile Bones Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- for (var/datum/organ/external/E in H.organs)
- E.min_broken_damage = max(5, E.min_broken_damage - 30)
-
- deactivate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- for (var/datum/organ/external/E in H.organs)
- E.min_broken_damage = initial(E.min_broken_damage)
-
-
-
-
-
-
/datum/disease2/effect/scc
name = "Spontaneous Cellular Collapse"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
- //
var/mob/living/carbon/human/H = mob
- mob.reagents.add_reagent("pacid", 10)
+ mob.reagents.add_reagent("pacid", 1)
mob << " Your body burns as your cells break down."
shake_camera(mob,5*multiplier)
- for (var/datum/organ/external/E in H.organs)
- if(pick(1,0))
- //
- E.createwound(CUT, pick(2,4,6,8,10))
- E.fracture()
-
-
-
-
/datum/disease2/effect/necrosis
name = "Necrosis"
@@ -273,7 +239,6 @@
var/sourcejob = mob.job
var/sourcenutriment = mob.nutrition / 15
//var/sourcetotalreagents = mob.reagents.total_volume
-
for(var/i=1 to totalslabs)
var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new
newmeat.name = sourcename + newmeat.name
@@ -282,38 +247,23 @@
newmeat.reagents.add_reagent("nutriment", sourcenutriment / totalslabs) // Thehehe. Fat guys go first
//src.occupant.reagents.trans_to(newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
allmeat[i] = newmeat
-
-
-
var/obj/item/meatslab = allmeat[i]
var/turf/Tx = locate(mob.x, mob.y, mob.z)
meatslab.loc = mob.loc
meatslab.throw_at(Tx,i,3)
if (!Tx.density)
new /obj/effect/decal/cleanable/blood/gibs(Tx,i)
-
-
if(2)
- //mob << "\red i dont think i need this here"
-
for (var/datum/organ/external/E in H.organs)
if(pick(1,0))
E.droplimb(1)
-
-
if(3)
if(H.species.name != "Skellington")
mob << " Your necrotic skin ruptures!"
-
-
for (var/datum/organ/external/E in H.organs)
if(pick(1,0))
- E.createwound(CUT, pick(2,4,6,8,10))
-
-
+ E.createwound(CUT, pick(2,4))
if(prob(30))
- //
-
if(H.species.name != "Skellington")
if(H.set_species("Skellington"))
mob << " A massive amount of flesh sloughs off your bones!"
@@ -322,9 +272,6 @@
return
-
-
-
/datum/disease2/effect/fizzle
name = "Fizzle Effect"
stage = 4
@@ -332,18 +279,14 @@
mob.emote("me",1,pick("sniffles...", "clears their throat..."))
-
-
-
-/datum/disease2/effect/spawn
+/datum/disease2/effect/spider
name = "Arachnogenesis Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
//var/mob/living/carbon/human/H = mob
var/placemob = locate(mob.x + pick(1,-1), mob.y, mob.z)
playsound(mob.loc, 'sound/effects/splat.ogg', 50, 1)
-
- new /mob/living/simple_animal/hostile/giant_spider/hunter(placemob)
+ new /obj/effect/spider/spiderling(placemob)
mob.emote("me",1,"vomits up a live spider!")
@@ -352,8 +295,6 @@
name = "Biolobulin Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
- //
-
var/obj/item/toy/snappop/virus = new /obj/item/toy/snappop/virus
mob.equip_to_slot(virus, slot_l_hand)
@@ -371,8 +312,6 @@
..()
-
-
/datum/disease2/effect/plasma
name = "Toxin Sublimation"
stage = 4
@@ -395,13 +334,22 @@
return
-
-
-
////////////////////////STAGE 3/////////////////////////////////
+/datum/disease2/effect/bones
+ name = "Fragile Bones Syndrome"
+ stage = 3
+ activate(var/mob/living/carbon/mob,var/multiplier)
+ if(istype(mob, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = mob
+ for (var/datum/organ/external/E in H.organs)
+ E.min_broken_damage = max(5, E.min_broken_damage - 30)
-
+ deactivate(var/mob/living/carbon/mob,var/multiplier)
+ if(istype(mob, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = mob
+ for (var/datum/organ/external/E in H.organs)
+ E.min_broken_damage = initial(E.min_broken_damage)
/datum/disease2/effect/toxins
@@ -527,32 +475,22 @@
var/obj/item/clothing/glasses/virussunglasses = new /obj/item/clothing/glasses/virussunglasses
mob.equip_to_slot(virussunglasses, slot_glasses)
mob.confused += 10
-
-
-
-
if(pick(0,1))
mob.say(pick("Uh HUH!", "Thank you, Thank you very much...", "I ain't nothin' but a hound dog!", "Swing low, sweet chariot!"))
else
mob.emote("me",1,pick("curls his lip!", "gyrates his hips!", "thrusts his hips!"))
-
if(istype(mob, /mob/living/carbon/human))
-
var/mob/living/carbon/human/H = mob
if(H.species.name == "Human" && !(H.f_style == "Pompadour"))
spawn(50)
H.h_style = "Pompadour"
H.update_hair()
-
-
-
if(H.species.name == "Human" && !(H.f_style == "Elvis Sideburns"))
spawn(50)
H.f_style = "Elvis Sideburns"
H.update_hair()
-
/obj/item/clothing/glasses/virussunglasses
dropped(mob/user as mob)
@@ -565,12 +503,6 @@
..()
-
-
-
-
-
-
/datum/disease2/effect/pthroat
name = "Pierrot's Throat"
stage = 3
@@ -595,16 +527,11 @@
..()
-
-
-
var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
/datum/disease2/effect/horsethroat
name = "Horse Throat"
stage = 3
activate(var/mob/living/carbon/mob,var/multiplier)
-
-
if(!(mob.type in compatible_mobs))
return
@@ -628,9 +555,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
..()
-
-
-
/datum/disease2/effect/spaceadapt
name = "Space Adaptation Effect"
stage = 3
@@ -641,7 +565,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
mob.reagents.add_reagent("bicaridine", 200)
mob.reagents.add_reagent("dermaline", 200)
mob.emote("me",1,"exhales slowly.")
-
var/datum/organ/external/chest/chest = H.get_organ("chest")
for(var/datum/organ/internal/I in chest.internal_organs)
I.damage = 0
@@ -753,7 +676,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
activate(var/mob/living/carbon/mob,var/multiplier)
if (prob(50))
mob << "[pick("Your stomach rumbles strangely.", "You feel like you're going shit your pants any second now!")]"
-
else
mob.visible_message("[mob] has explosive diarrhea all over the floor!")
mob.nutrition -= 20
@@ -762,9 +684,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
P.virus2 = virus_copylist(mob.virus2)
playsound(P.loc, 'sound/effects/splat.ogg', 50, 1)
-
-
-
/datum/disease2/effect/bloodynose
name = "Intranasal Hemorrhage"
stage = 2
@@ -773,15 +692,9 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
var/obj/effect/decal/cleanable/blood/D= locate(/obj/effect/decal/cleanable/blood) in get_turf(mob)
if(D==null)
D = new(get_turf(mob))
-
D.virus2 |= virus_copylist(mob.virus2)
-
-
-
-
-
/datum/disease2/effect/viralsputum
name = "Respiratory Putrification"
stage = 2
@@ -792,12 +705,9 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
var/obj/effect/decal/cleanable/blood/viralsputum/D= locate(/obj/effect/decal/cleanable/blood/viralsputum) in get_turf(mob)
if(D==null)
D = new(get_turf(mob))
-
D.virus2 |= virus_copylist(mob.virus2)
-
-
/datum/disease2/effect/lantern
name = "Lantern Syndrome"
stage = 2
@@ -806,7 +716,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
mob << "You are glowing!"
-
////////////////////////STAGE 1/////////////////////////////////
/datum/disease2/effect/sneeze