Merge pull request NebulaSS13#5223 from out-of-phaze/removal/provocateur

Remove provocateur/semi-antagonist role

Author: MistakeNot4892

code/game/antagonist/station/provocateur.dm

@@ -23,7 +23,6 @@
 	var/minimum_character_age                 // List of species = age, if species is not here, it's auto-pass
 	var/ideal_character_age = 30              // Preferred character age when populate job at roundstart.
 	var/create_record = 1                     // Do we announce/make records for people who spawn on this job?
-	var/is_semi_antagonist = FALSE            // Whether or not this job is given semi-antagonist status.
 	var/account_allowed = 1                   // Does this job type come with a station account?
 	var/economic_power = 2                    // With how much does this job modify the initial account amount?
 	var/is_holy = FALSE                       // Can this role perform blessings?
@@ -401,8 +400,6 @@
 	var/list/reasons = list()
 	if(jobban_isbanned(calling_client, title))
 		reasons["You are jobbanned."] = TRUE
-	if(is_semi_antagonist && jobban_isbanned(calling_client, /decl/special_role/provocateur))
-		reasons["You are semi-antagonist banned."] = TRUE
 	if(!player_old_enough(calling_client))
 		reasons["Your player age is too low."] = TRUE
 	if(!is_position_available())
@@ -434,8 +431,6 @@
 		return FALSE
 	if(jobban_isbanned(calling_client, title))
 		return FALSE
-	if(is_semi_antagonist && jobban_isbanned(calling_client, /decl/special_role/provocateur))
-		return FALSE
 	if(!player_old_enough(calling_client))
 		return FALSE
 	return TRUE
@@ -482,10 +477,9 @@
 				break
 	return spawnpos
 
+/// Used for applying "finishing touches" to characters, like additional role text or applying a /decl/special_role.
 /datum/job/proc/post_equip_job_title(var/mob/person, var/alt_title, var/rank)
-	if(is_semi_antagonist && person.mind)
-		var/decl/special_role/provocateur/provocateurs = GET_DECL(/decl/special_role/provocateur)
-		provocateurs.add_antagonist(person.mind)
+	return
 
 /datum/job/proc/get_alt_title_for(var/client/C)
 	return C.prefs.GetPlayerAltTitle(src)

code/game/jobs/job/_job.dm

@@ -1,4 +1,5 @@
 #define MAX_JOBBAN_CELLS 5
+var/global/list/misc_jobban_roles = list("Botany Roles", "Graffiti")
 
 /datum/admins/Topic(href, href_list)
 	..()
@@ -385,11 +386,10 @@
 		jobs += "</tr></table>"
 		#undef ANTAG_COLUMNS
 
-		var/list/misc_roles = list("Botany Roles", "Graffiti")
 		//Other roles  (BLUE, because I have no idea what other color to make this)
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='ccccff'><th colspan='[LAZYLEN(misc_roles)]'>Other Roles</th></tr><tr align='center'>"
-		for(var/entry in misc_roles)
+		jobs += "<tr bgcolor='ccccff'><th colspan='[LAZYLEN(misc_jobban_roles)]'>Other Roles</th></tr><tr align='center'>"
+		for(var/entry in misc_jobban_roles)
 			if(jobban_isbanned(M, entry))
 				jobs += "<td width='20%'><a href='byond://?src=\ref[src];jobban_category=[entry];jobban_mob_target=\ref[M]'><font color=red>[entry]</font></a></td>"
 			else

code/modules/admin/topic.dm

@@ -29,10 +29,6 @@
 		to_chat(joining, SPAN_WARNING("You are banned from playing offstation roles."))
 		return FALSE
 
-	if(job.is_semi_antagonist && jobban_isbanned(joining, /decl/special_role/provocateur))
-		to_chat(joining, SPAN_WARNING("You are banned from playing semi-antagonist roles."))
-		return FALSE
-
 	if(job.is_restricted(joining.client.prefs, joining))
 		return FALSE
 

code/modules/submaps/submap_join.dm

@@ -4,8 +4,10 @@
 #define BODY_EQUIP_FLAG_ALATE BITFLAG(4)
 #define BODY_EQUIP_FLAG_GYNE  BITFLAG(5)
 
-#define BP_SYSTEM_CONTROLLER "system controller"
-#define BP_EGG               "egg sac"
+#define BP_SYSTEM_CONTROLLER  "system controller"
+#define BP_EGG                "egg sac"
+
+#define MANTID_NYMPH_BAN      "Mantid Nymph"
 
 #define MANTIDIFY(_thing, _name, _desc) \
 ##_thing/ascent/name = _name; \
@@ -14,3 +16,7 @@
 
 /decl/modpack/ascent
 	name = "The Ascent"
+
+/decl/modpack/ascent/pre_initialize()
+	global.misc_jobban_roles += MANTID_NYMPH_BAN
+	. = ..()

mods/species/ascent/ascent.dm

@@ -2,7 +2,7 @@ var/global/default_gyne
 
 /decl/ghosttrap/kharmaani_egg
 	name = "mantid nymph"
-	ban_checks = list(/decl/special_role/provocateur)
+	ban_checks = list(MANTID_NYMPH_BAN)
 	ghost_trap_message = "They are hatching from a kharmaan egg now."
 
 /decl/ghosttrap/kharmaani_egg/forced(var/mob/user)

mods/species/ascent/mobs/insectoid_egg.dm

@@ -776,7 +776,6 @@
 #include "code\game\antagonist\antagonist_print.dm"
 #include "code\game\antagonist\antagonist_update.dm"
 #include "code\game\antagonist\outsider\ert.dm"
-#include "code\game\antagonist\station\provocateur.dm"
 #include "code\game\area\area_abstract.dm"
 #include "code\game\area\area_access.dm"
 #include "code\game\area\area_fishing.dm"