Changelog merge. I hate the changelog.

code/modules/admin/topic.dm

@@ -2029,17 +2029,13 @@
 			if("virus")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","V")
-				var/answer = alert("Do you want this to be a random disease or do you have something in mind?",,"Make Your Own","Random","Choose")
-				if(answer=="Random")
-					viral_outbreak()
-					message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1)
-				else if(answer == "Choose")
-					var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu","pierrot's throat","rhumba beat")
-					var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses
-					viral_outbreak(V)
-					message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1)
+				var/answer = alert("Do you want this to be a greater disease or a lesser one?",,"Greater","Lesser")
+				if(answer=="Lesser")
+					virus2_lesser_infection()
+					message_admins("[key_name_admin(usr)] has triggered a lesser virus outbreak.", 1)
 				else
-					AdminCreateVirus(usr)
+					virus2_greater_infection()
+					message_admins("[key_name_admin(usr)] has triggered a greater virus outbreak.", 1)
 			if("retardify")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","RET")

code/modules/mob/living/living.dm

@@ -269,6 +269,15 @@
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
 		C.handcuffed = initial(C.handcuffed)
+	if(ishuman(src))
+		var/mob/living/carbon/human/H = src
+		for(var/datum/organ/external/O in H.organs)
+			O.heal_damage(1000,1000,1,1)
+		for(var/datum/organ/internal/I in H.internal_organs)
+			I.damage = 0
+		for (var/ID in H.virus2)
+			var/datum/disease2/disease/V = H.virus2[ID]
+			V.cure(src)
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
 	if(stat == 2)

code/modules/mob/mob.dm

@@ -607,6 +607,11 @@ var/list/slot_equipment_priority = list( \
 	src.pulling = AM
 	AM.pulledby = src
 
+	//Attempted fix for people flying away through space when cuffed and dragged.
+	if(ismob(AM))
+		var/mob/pulled = AM
+		pulled.inertia_dir = 0
+
 /mob/proc/can_use_hands()
 	return
 
@@ -955,4 +960,4 @@ mob/verb/yank_out_object()
 			pinned -= O
 		if(!pinned.len)
 			anchored = 0
-	return 1
+	return 1

code/modules/reagents/Chemistry-Recipes.dm

@@ -1019,7 +1019,7 @@ datum
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 
-				var/blocked = list(/mob/living/simple_animal/hostile,
+				/*var/blocked = list(/mob/living/simple_animal/hostile,
 					/mob/living/simple_animal/hostile/pirate,
 					/mob/living/simple_animal/hostile/pirate/ranged,
 					/mob/living/simple_animal/hostile/russian,
@@ -1051,7 +1051,9 @@ datum
 					C.loc = get_turf_loc(holder.my_atom)
 					if(prob(50))
 						for(var/j = 1, j <= rand(1, 3), j++)
-							step(C, pick(NORTH,SOUTH,EAST,WEST))
+							step(C, pick(NORTH,SOUTH,EAST,WEST))*/
+				for(var/mob/O in viewers(get_turf_loc(holder.my_atom), null))
+					O.show_message(text("\red The slime core fizzles disappointingly,"), 1)
 
 //Silver
 		slimebork

code/modules/virus2/disease2.dm

@@ -162,3 +162,27 @@ var/global/list/virusDB = list()
 	v.fields["spread type"] = spreadtype
 	virusDB["[uniqueID]"] = v
 	return 1
+
+proc/virus2_lesser_infection()
+	var/list/candidates = list()	//list of candidate keys
+
+	for(var/mob/living/carbon/human/G in player_list)
+		if(G.client && G.stat != DEAD)
+			candidates += G
+	if(!candidates.len)	return
+
+	candidates = shuffle(candidates)
+
+	infect_mob_random_lesser(candidates[1])
+
+proc/virus2_greater_infection()
+	var/list/candidates = list()	//list of candidate keys
+
+	for(var/mob/living/carbon/human/G in player_list)
+		if(G.client && G.stat != DEAD)
+			candidates += G
+	if(!candidates.len)	return
+
+	candidates = shuffle(candidates)
+
+	infect_mob_random_greater(candidates[1])