Merge remote-tracking branch 'ParadiseSS13/master' into teleport_fixes

code/datums/datum.dm

@@ -37,4 +37,8 @@
 			qdel(C, FALSE, TRUE)
 		dc.Cut()
 
-	return QDEL_HINT_QUEUE
+	return QDEL_HINT_QUEUE
+
+
+/datum/nothing
+	// Placeholder object, used for ispath checks. Has to be defined to prevent errors, but shouldn't ever be created.

code/datums/diseases/kingstons.dm

@@ -66,7 +66,7 @@
 	chosentype = pick(virspecies)
 	chosensuff = pick(virsuffix)
 
-	name = "[chosentype] [chosensuff]"
+	name = "[initial(chosentype.name)] [chosensuff]"
 
 /datum/disease/kingstons/advanced/stage_act()
 	..()