Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme

code/datums/statclick.dm

@@ -1,12 +1,13 @@
-// Not TECHNICALLY a datum, but this should never be instantiated
-// outside of the stat panel
 // Clickable stat() button
 /obj/effect/statclick
 	var/target
 
-/obj/effect/statclick/New(ntarget, text)
-	target = ntarget
+INITIALIZE_IMMEDIATE(/obj/effect/statclick)
+
+/obj/effect/statclick/Initialize(mapload, text, target)
+	. = ..()
 	name = text
+	src.target = target
 
 /obj/effect/statclick/proc/update(text)
 	name = text
@@ -19,10 +20,6 @@
 	if(!is_admin(usr) || !target)
 		return
 	if(!class)
-		if(istype(target, /datum/controller/process))
-			class = "process"
-		else if(istype(target, /datum/controller/processScheduler))
-			class = "scheduler"
 		if(istype(target, /datum/controller/subsystem))
 			class = "subsystem"
 		else if(istype(target, /datum/controller))