From 7ce6be92a019db92027b1af75fa29ed7e5522cff Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 24 Jul 2017 06:08:07 -0500
Subject: [PATCH] Virology fixes (#2097)

---
 code/datums/diseases/advance/advance.dm               | 3 ++-
 code/modules/reagents/chemistry/machinery/pandemic.dm | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 2e22fd59e0..bc089d5082 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -295,6 +295,8 @@
 		var/list/L = list()
 		for(var/datum/symptom/S in symptoms)
 			L += S.id
+			if(S.neutered)
+				L += "N"
 		L = sortList(L) // Sort the list so it doesn't matter which order the symptoms are in.
 		var/result = jointext(L, ":")
 		id = result
@@ -325,7 +327,6 @@
 	if(!S.neutered)
 		S.neutered = TRUE
 		S.name += " (neutered)"
-		S.id += "N" //new disease is unique
 
 /*
 
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index ab68dffc0b..85b357c774 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -46,10 +46,11 @@
 		var/list/this = list()
 		this["name"] = D.name
 		if(istype(D, /datum/disease/advance))
-			var/datum/disease/advance/A = SSdisease.archive_diseases[D.GetDiseaseID()]
-			if(A.name == "Unknown")
+			var/datum/disease/advance/A = D
+			var/datum/disease/advance/archived = SSdisease.archive_diseases[D.GetDiseaseID()]
+			if(archived.name == "Unknown")
 				this["can_rename"] = TRUE
-			this["name"] = A.name
+			this["name"] = archived.name
 			this["is_adv"] = TRUE
 			this["resistance"] = A.totalResistance()
 			this["stealth"] = A.totalStealth()