Maintainers Have No Sense of Right or Wrong (#12381)

code/modules/admin/secrets.dm

@@ -113,9 +113,7 @@
 					<A href='?src=[UID()];secretsfun=schoolgirl'>Japanese Animes Mode</A>&nbsp;&nbsp;
 					<A href='?src=[UID()];secretsfun=eagles'>Egalitarian Station Mode</A><BR>
 					<A href='?src=[UID()];secretsfun=guns'>Summon Guns</A>&nbsp;&nbsp;
-					<A href='?src=[UID()];secretsfun=magic'>Summon Magic</A>&nbsp;&nbsp;
-					<A href='?src=[UID()];secretsfun=revolver'>Summon Revolver Duel</A>&nbsp;&nbsp;
-					<A href='?src=[UID()];secretsfun=fakerevolver'>Summon Suicidal Revolver Duel</A>
+					<A href='?src=[UID()];secretsfun=magic'>Summon Magic</A>
 					<BR>
 					<A href='?src=[UID()];secretsfun=rolldice'>Roll the Dice</A><BR>
 					<BR>

code/modules/admin/topic.dm

@@ -37,7 +37,7 @@
 			return
 		var/ticketID = text2num(href_list["openmentorticket"])
 		SSmentor_tickets.showDetailUI(usr, ticketID)
-	
+
 	if(href_list["stickyban"])
 		stickyban(href_list["stickyban"],href_list)
 
@@ -2860,19 +2860,25 @@
 			if("guns")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","SG")
-				usr.rightandwrong(FALSE)
+				var/survivor_probability = 0
+				switch(alert("Do you want this to create survivors antagonists?", , "No Antags", "Some Antags", "All Antags!"))
+					if("Some Antags")
+						survivor_probability = 25
+					if("All Antags!")
+						survivor_probability = 100
+
+				rightandwrong(SUMMON_GUNS, usr, survivor_probability)
 			if("magic")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","SM")
-				usr.rightandwrong(TRUE)
-			if("revolver")
-				feedback_inc("admin_secrets_fun_used", 1)
-				feedback_add_details("admin_secrets_fun_used", "SRD")
-				usr.rightandwrong(FALSE, revolver_fight = TRUE)
-			if("fakerevolver")
-				feedback_inc("admin_secrets_fun_used", 1)
-				feedback_add_details("admin_secrets_fun_used", "SFD")
-				usr.rightandwrong(FALSE, fake_revolver_fight = TRUE)
+				var/survivor_probability = 0
+				switch(alert("Do you want this to create survivors antagonists?", , "No Antags", "Some Antags", "All Antags!"))
+					if("Some Antags")
+						survivor_probability = 25
+					if("All Antags!")
+						survivor_probability = 100
+
+				rightandwrong(SUMMON_MAGIC, usr, survivor_probability)
 			if("tdomereset")
 				var/delete_mobs = alert("Clear all mobs?","Confirm","Yes","No","Cancel")
 				if(delete_mobs == "Cancel")

code/modules/antagonists/survivalist/survivalist.dm

@@ -0,0 +1,41 @@
+/datum/antagonist/survivalist
+	name = "Survivalist"
+	var/greet_message = ""
+
+/datum/antagonist/survivalist/proc/forge_objectives()
+	var/datum/objective/survive/survive = new
+	survive.owner = owner
+	objectives += survive
+	owner.objectives |= objectives
+
+/datum/antagonist/survivalist/on_gain()
+	owner.special_role = "survivalist"
+	forge_objectives()
+	. = ..()
+
+/datum/antagonist/survivalist/greet()
+	to_chat(owner.current, "<B>You are the survivalist! [greet_message]</B>")
+	owner.announce_objectives()
+
+/datum/antagonist/survivalist/guns
+	greet_message = "Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, by any means necessary. Kill anyone who gets in your way."
+
+/datum/antagonist/survivalist/guns/forge_objectives()
+	var/datum/objective/steal_five_of_type/summon_guns/guns = new
+	guns.owner = owner
+	objectives += guns
+	..()
+
+/datum/antagonist/survivalist/magic
+	name = "Amateur Magician"
+	greet_message = "Grow your newfound talent! Grab as many magical artefacts as possible, by any means necessary. Kill anyone who gets in your way."
+
+/datum/antagonist/survivalist/magic/greet()
+	..()
+	to_chat(owner.current, "<span class='notice'>As a wonderful magician, you should remember that spellbooks don't mean anything if they are used up.</span>")
+
+/datum/antagonist/survivalist/magic/forge_objectives()
+	var/datum/objective/steal_five_of_type/summon_magic/magic = new
+	magic.owner = owner
+	objectives += magic
+	..()

code/modules/mob/new_player/new_player.dm

@@ -379,6 +379,11 @@
 			AnnounceArrival(character, rank, join_message)
 			AddEmploymentContract(character)
 
+			if(GLOB.summon_guns_triggered)
+				give_guns(character)
+			if(GLOB.summon_magic_triggered)
+				give_magic(character)
+
 	if(!thisjob.is_position_available() && thisjob in SSjobs.prioritized_jobs)
 		SSjobs.prioritized_jobs -= thisjob
 	qdel(src)