Merge pull request #317 from Chemlight/Make-Virology-Great-Again

Reverse Engineering Virology from Beeviro

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -174,15 +174,3 @@
 		var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src)
 		equip_to_slot_or_del(helmet,SLOT_HEAD)
 		helmet.attack_self(src) // todo encapsulate toggle
-
-/mob/living/carbon/monkey/tumor
-	name = "living teratoma"
-	verb_say = "blabbers"
-	initial_language_holder = /datum/language_holder/monkey
-	icon = 'icons/mob/monkey.dmi'
-	icon_state = ""
-	butcher_results = list(/obj/effect/spawner/lootdrop/teratoma/minor = 5, /obj/effect/spawner/lootdrop/teratoma/major = 1)
-	type_of_meat = /obj/effect/spawner/lootdrop/teratoma/minor
-	aggressive = TRUE
-	bodyparts = list(/obj/item/bodypart/chest/monkey/teratoma, /obj/item/bodypart/head/monkey/teratoma, /obj/item/bodypart/l_arm/monkey/teratoma,
-					 /obj/item/bodypart/r_arm/monkey/teratoma, /obj/item/bodypart/r_leg/monkey/teratoma, /obj/item/bodypart/l_leg/monkey/teratoma)

code/modules/mob/living/death.dm

@@ -56,10 +56,6 @@
 	var/turf/T = get_turf(src)
 	for(var/obj/item/I in contents)
 		I.on_mob_death(src, gibbed)
-	for(var/datum/disease/advance/D in diseases)
-		for(var/symptom in D.symptoms)
-			var/datum/symptom/S = symptom
-			S.OnDeath(D)
 	if(mind && mind.name && mind.active && !istype(T.loc, /area/ctf))
 		var/rendered = "<span class='deadsay'><b>[mind.name]</b> has died at <b>[get_area_name(T)]</b>.</span>"
 		deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)

code/modules/mob/living/simple_animal/hostile/heart.dm

@@ -1,35 +0,0 @@
-/mob/living/simple_animal/hostile/heart
-	name = "Heart"
-	desc = "A living heart. It's angry!."
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "heart-on"
-	icon_living = "heart-on"
-	icon_dead = "heart-on"
-	gender = NEUTER
-	turns_per_move = 5
-	speak_emote = list("beats")
-	emote_see = list("beats")
-	a_intent = INTENT_HARM
-	maxHealth = 24
-	health = 24
-	speed = -1
-	harm_intent_damage = 5
-	melee_damage_lower = 15
-	melee_damage_upper = 15
-	response_help = "touches"
-	response_disarm = "beats"
-	response_harm = "breaks"
-	density = FALSE
-	attacktext = "beats"
-	ventcrawler = VENTCRAWLER_ALWAYS
-	attack_sound = 'sound/effects/singlebeat.ogg'
-	stat_attack = UNCONSCIOUS
-	attack_same = 1
-	gold_core_spawnable = HOSTILE_SPAWN
-	see_in_dark = 8
-	deathmessage = "falls lifeless."
-	del_on_death = 1
-	loot = list(/obj/item/organ/heart)
-	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 150
-	maxbodytemp = 500