Migrant Waves to replace Drifters

code/__DEFINES/jobs.dm

@@ -143,7 +143,7 @@
 #define ADVENTURER	(1<<9)
 #define COOK		(1<<10)
 #define GRABBER		(1<<11)
-#define WAVE_DRIFTER (1<<16)
+#define MIGRANT		(1<<16)
 
 #define APPRENTICES		(1<<5)
 
@@ -222,7 +222,7 @@
 
 #define JDO_ADVENTURER 32.1
 #define JDO_PILGRIM 32.2
-#define JDO_DRIFTER 32.3
+#define JDO_MIGRANT  32.3
 
 #define JDO_MERCENARY 33
 

code/__DEFINES/migrants.dm

@@ -0,0 +1,2 @@
+#define MIGRANT_ROLE(role_type) GLOB.migrant_roles[role_type]
+#define MIGRANT_WAVE(wave_type) GLOB.migrant_waves[wave_type]

code/__DEFINES/roguetown.dm

@@ -113,16 +113,6 @@ GLOBAL_LIST_EMPTY(job_respawn_delays)
 #define CTAG_GARRISON		"CAT_GARRISON"
 #define CTAG_ADEPT			"CAT_ADEPT" // Used for Adept class selection
 
-/*
-	String category tags
-	This time for the drifter waves, used for sorting and scheduling purposes
-*/
-#define DTAG_ALLWAVES		"CAT_ALLWAVES"		// Another define for jus the basic allclass
-#define DTAG_DISABLED		"CAT_DISABLED"		// Disabled, do not use
-#define DTAG_FILLERS		"CAT_FILLER"		// If we have nothing better to do, time for filler
-#define DTAG_ANTAGS			"CAT_ANTAGS"		// A catchall for antag groups
-#define DTAG_BANDITS		"CAT_BANDITS"		// some bandits I guess 	<- Disabled; issues with spawning bandits as drifters
-
 /*
 	Defines for the triumph buy datum categories
 */

code/_globalvars/migrants.dm

@@ -0,0 +1,16 @@
+GLOBAL_LIST_INIT(migrant_waves, build_migrant_waves())
+GLOBAL_LIST_INIT(migrant_roles, build_migrant_roles())
+/proc/build_migrant_waves()
+	. = list()
+	for(var/type in typesof(/datum/migrant_wave))
+		if(is_abstract(type))
+			continue
+		.[type] = new type()
+	return .
+/proc/build_migrant_roles()
+	. = list()
+	for(var/type in typesof(/datum/migrant_role))
+		if(is_abstract(type))
+			continue
+		.[type] = new type()
+	return .

code/_onclick/hud/screen_objects.dm

@@ -774,6 +774,11 @@
 		qdel(src)
 		return
 	var/mob/living/carbon/human/H = hud.mymob
+	if(H.mind && H.mind.antag_datums)
+		for(var/datum/antagonist/D in H.mind.antag_datums)
+			if(istype(D, /datum/antagonist/vampirelord) || istype(D, /datum/antagonist/vampire) || istype(D, /datum/antagonist/bandit))
+				qdel(src)
+				return
 	if(H.advsetup)
 		alpha = 0
 		icon = 'icons/mob/advsetup.dmi'