From 13643b6607f7c11f0b5cbcc082c656ed3ae8113b Mon Sep 17 00:00:00 2001
From: Incoming <Mewchu11@cox.net>
Date: Tue, 30 Sep 2014 14:08:01 -0400
Subject: [PATCH] Normal, Magic, and Holiday events will be seperated out on
 the trigger event menu Fixes #5033

The invincibilty event won't cure benificial viruses
Fixes #5034
---
 code/modules/events/event_manager.dm        | 15 +++++++++++++--
 code/modules/reagents/Chemistry-Reagents.dm |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index c2035b0e378..13ea11fb964 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -124,9 +124,20 @@ var/datum/controller/event/events
 	holder.forceEvent()
 
 /datum/admins/proc/forceEvent()
-	var/dat = ""
+	var/dat 	= ""
+	var/normal 	= ""
+	var/magic 	= ""
+	var/holiday = ""
 	for(var/datum/round_event_control/E in events.control)
-		dat += "<BR><A href='?src=\ref[src];forceevent=\ref[E]'>[E]</A>"
+		dat = "<BR><A href='?src=\ref[src];forceevent=\ref[E]'>[E]</A>"
+		if(E.holidayID)
+			holiday	+= dat
+		else if(E.wizardevent)
+			magic 	+= dat
+		else
+			normal 	+= dat
+
+	dat = normal + "<BR>" + magic + "<BR>" + holiday
 
 	var/datum/browser/popup = new(usr, "forceevent", "Force Random Event", 300, 750)
 	popup.set_content(dat)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 4ec642bdadf..c3f7b6b97ea 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -996,6 +996,8 @@ datum/reagent/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob)
 	M.sleeping = 0
 	M.jitteriness = 0
 	for(var/datum/disease/D in M.viruses)
+		if(D.severity == D.non_threat)
+			continue
 		D.spread = "Remissive"
 		D.stage--
 		if(D.stage < 1)