Merge pull request #153 from zeskorion/master

[PORT]here you go, bee viro

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -467,7 +467,8 @@
 		/obj/item/reagent_containers/glass/bottle/mutagen = 1,
 		/obj/item/reagent_containers/glass/bottle/plasma = 1,
 		/obj/item/reagent_containers/glass/bottle/synaptizine = 1,
-		/obj/item/reagent_containers/glass/bottle/formaldehyde = 1)
+		/obj/item/reagent_containers/glass/bottle/formaldehyde = 1,
+		/obj/item/reagent_containers/glass/bottle/viralbase = 1)
 
 // ----------------------------
 // Disk """fridge"""

code/modules/mob/living/death.dm

@@ -48,7 +48,6 @@
 /mob/living/proc/spawn_dust(just_ash = FALSE)
 	new /obj/effect/decal/cleanable/ash(loc)
 
-
 /mob/living/death(gibbed)
 	stat = DEAD
 	unset_machine()
@@ -57,6 +56,10 @@
 	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

@@ -0,0 +1,35 @@
+/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

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -1582,6 +1582,22 @@
 	taste_description = "rainbows"
 	var/no_mob_color = FALSE
 
+/datum/reagent/consumable/laughter/laughtervirusfood
+	name = "anomolous virus food"
+	color = "#ffa6ff" //rgb: 255,166,255
+	taste_description = "a bad idea"
+	
+/datum/reagent/consumable/virus_food/advvirusfood
+	name = "highly unstable virus food"
+	color = "#ffffff" //rgb: 255,255,255 ITS PURE WHITE CMON
+	taste_description = "an EXTREMELY bad idea"
+
+/datum/reagent/consumable/virus_food/viralbase
+	name = "Experimental viral base"
+	description = "Recently discovered by Nanotrasen's top scientists after years of research, this substance can be used as the base for extremely rare and extremely dangerous viruses once exposed to uranium."
+	color = "#fff0da"
+	taste_description = "tears of scientists"
+
 /datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/M)
 	if(!no_mob_color)
 		M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
@@ -2174,4 +2190,4 @@
 	if(prob(20))
 		to_chat(M, "<span class = 'notice'>[pick("Headpats feel nice.", "The feeling of a hairball...", "Backrubs would be nice.", "Whats behind those doors?")]</span>")
 	M.adjustArousalLoss(2)
-	..()
+	..()

code/modules/reagents/chemistry/recipes/others.dm

@@ -229,7 +229,19 @@
 		var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
 		if(D)
 			D.Evolve(level_min, level_max)
+			
+/datum/chemical_reaction/virus_food_laughter
+	name = "Anomolous virus food"
+	id = "virusfood_laughter"
+	results = list(/datum/reagent/consumable/laughter/laughtervirusfood = 1)
+	required_reagents = list(/datum/reagent/consumable/laughter = 5, /datum/reagent/consumable/virus_food = 1)
 
+/datum/chemical_reaction/virus_food_admin
+	name = "Highly unstable virus Food"
+	id = "virusfood_admin"
+	results = list(/datum/reagent/consumable/virus_food/advvirusfood = 1)
+	required_reagents = list(/datum/reagent/consumable/virus_food/viralbase = 1, /datum/reagent/uranium = 20)
+	mix_message = "The mixture turns every colour of the rainbow, soon settling on a bright white. There's no way this isn't a good idea."
 
 /datum/chemical_reaction/mix_virus/mix_virus_2
 
@@ -318,6 +330,23 @@
 	required_reagents = list("uraniumplasmavirusfood_stable" = 1)
 	level_min = 8
 	level_max = 8
+	
+/datum/chemical_reaction/mix_virus/mix_virus_13
+	
+	name = "Mix Virus 13"
+	id = "mixvirus13"
+	required_reagents = list(/datum/reagent/consumable/laughter/laughtervirusfood = 1)
+	level_min = 0
+	level_max = 0
+	
+/datum/chemical_reaction/mix_virus/mix_virus_14
+
+	name = "Mix Virus 14"
+	id = "mixvirus14"
+	required_reagents = list(/datum/reagent/consumable/virus_food/advvirusfood = 1)
+	level_min = 9
+	level_max = 9
+
 
 /datum/chemical_reaction/mix_virus/rem_virus
 
@@ -702,4 +731,4 @@
 	name = "liquid royal blue carpet"
 	id = "royalbluecarpet"
 	results = list("royalbluecarpet" = 2)
-	required_reagents = list("carpet" = 1, "clonexadone" = 1)
+	required_reagents = list("carpet" = 1, "clonexadone" = 1)

code/modules/reagents/reagent_containers/glass.dm

@@ -126,6 +126,11 @@
 
 /obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype)
 	update_icon()
+	
+/obj/item/reagent_containers/glass/bottle/viralbase
+	name = "Highly potent Viral Base Bottle"
+	desc = "A small bottle. Contains a trace amount of a substance found by scientists that can be used to create extremely advanced diseases once exposed to uranium."
+	list_reagents = list(/datum/reagent/consumable/virus_food/viralbase = 1)
 
 /obj/item/reagent_containers/glass/beaker/update_icon()
 	cut_overlays()