Merge branch 'master' into upstream-merge-29866

code/datums/action.dm

@@ -172,6 +172,7 @@
 
 /datum/action/item_action/rcl
 	name = "Change Cable Color"
+	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "rcl_rainbow"
 
 /datum/action/item_action/startchainsaw
@@ -405,27 +406,24 @@
 /datum/action/item_action/initialize_ninja_suit
 	name = "Toggle ninja suit"
 
-/datum/action/item_action/ninjajaunt
-	name = "Phase Jaunt (10E)"
-	desc = "Utilizes the internal VOID-shift device to rapidly transit in direction facing."
-	icon_icon = 'icons/mob/actions/actions_items.dmi'
-	button_icon_state = "ninja_phase"
-
 /datum/action/item_action/ninjasmoke
 	name = "Smoke Bomb"
 	desc = "Blind your enemies momentarily with a well-placed smoke bomb."
 	button_icon_state = "smoke"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 
 /datum/action/item_action/ninjaboost
-	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_CONSCIOUS
+	check_flags = NONE
 	name = "Adrenaline Boost"
 	desc = "Inject a secret chemical that will counteract all movement-impairing effect."
 	button_icon_state = "repulse"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 
 /datum/action/item_action/ninjapulse
 	name = "EM Burst (25E)"
 	desc = "Disable any nearby technology with a electro-magnetic pulse."
 	button_icon_state = "emp"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 
 /datum/action/item_action/ninjastar
 	name = "Create Throwing Stars (1E)"
@@ -448,8 +446,8 @@
 /datum/action/item_action/ninja_stealth
 	name = "Toggle Stealth"
 	desc = "Toggles stealth mode on and off."
-	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "ninja_cloak"
+	icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
 
 /datum/action/item_action/toggle_glove
 	name = "Toggle interaction"
@@ -491,7 +489,7 @@
 	S.action = src
 	name = S.name
 	desc = S.desc
-	button_icon = S.action_icon
+	icon_icon = S.action_icon
 	button_icon_state = S.action_icon_state
 	background_icon_state = S.action_background_icon_state
 	button.name = name

code/datums/antagonists/ninja.dm

@@ -41,7 +41,6 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/space_ninja(H), slot_wear_mask)
 	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses)
 	H.equip_to_slot_or_del(EK, slot_belt)
-	H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), slot_r_store)
 	H.equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(H), slot_l_store)
 	H.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen(H), slot_s_store)
 	H.equip_to_slot_or_del(new /obj/item/tank/jetpack/carbondioxide(H), slot_back)

code/datums/callback.dm.rej

@@ -1,62 +0,0 @@
-diff a/code/datums/callback.dm b/code/datums/callback.dm	(rejected hunks)
-@@ -100,60 +100,3 @@
- 	if (object == GLOBAL_PROC)
- 		return call(delegate)(arglist(calling_arguments))
- 	return call(object, delegate)(arglist(calling_arguments))
--
--
--/datum/callback_select
--	var/list/finished
--	var/pendingcount
--	var/total
--
--/datum/callback_select/New(count, savereturns)
--	total = count
--	if (savereturns)
--		finished = new(count)
--
--
--/datum/callback_select/proc/invoke_callback(index, datum/callback/callback, list/callback_args, savereturn = TRUE)
--	set waitfor = FALSE
--	if (!callback || !istype(callback))
--		//This check only exists because the alternative is callback_select would block forever if given invalid data
--		CRASH("invalid callback passed to invoke_callback")
--	if (!length(callback_args))
--		callback_args = list()
--	pendingcount++
--	debug_usr("calling callback")
--	var/rtn = callback.Invoke(arglist(callback_args))
--	debug_usr("callback returned")
--	pendingcount--
--	if (savereturn)
--		finished[index] = rtn
--
--
--
--
--//runs a list of callbacks asynchronously, returning once all of them return.
--//callbacks can be repeated.
--//callbacks-args is a optional list of argument lists, in the same order as the callbacks,
--//	the inner lists will be sent to the callbacks when invoked() as additional args.
--//can optionly save and return a list of return values, in the same order as the original list of callbacks
--//resolution is the number of byond ticks between checks.
--/proc/callback_select(list/callbacks, list/callback_args, savereturns = TRUE, resolution = 1)
--	if (!callbacks)
--		return
--	var/count = length(callbacks)
--	if (!count)
--		return
--	if (!callback_args)
--		callback_args = list()
--
--	callback_args.len = count
--
--	var/datum/callback_select/CS = new(count, savereturns)
--	for (var/i in 1 to count)
--		CS.invoke_callback(i, callbacks[i], callback_args[i], savereturns)
--	debug_usr("starting callbacks: [CS.pendingcount]")
--	while(CS.pendingcount)
--		debug_usr("callbacks: [CS.pendingcount]")
--		sleep(resolution*world.tick_lag)
--	return CS.finished
--

code/datums/components/component.dm.rej

@@ -1 +0,0 @@
--

code/datums/mind.dm

@@ -370,6 +370,9 @@
 	if(!SSticker.HasRoundStarted())
 		alert("Not before round-start!", "Alert")
 		return
+	if(QDELETED(src) || QDELETED(current))
+		alert("This mind doesn't have a mob, or is deleted! For some reason!", "Edit Memory")
+		return
 
 	var/out = "<B>[name]</B>[(current&&(current.real_name!=name))?" (as [current.real_name])":""]<br>"
 	out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]<br>"
@@ -377,28 +380,155 @@
 	out += "Faction and special role: <b><font color='red'>[special_role]</font></b><br>"
 
 	var/list/sections = list(
+		"traitor", // "traitorchan",
+		"changeling",
+		"nuclear",
+		"wizard",
 		"revolution",
 		"gang",
 		"cult",
-		"wizard",
-		"changeling",
-		"nuclear",
-		"traitor", // "traitorchan",
-		"monkey",
 		"clockcult",
+		"abductor",
 		"devil",
-		"ninja"
+		"ninja",
+		"monkey"
 	)
 	var/text = ""
 
+	/** TRAITOR ***/
+	text = "traitor"
+	if (SSticker.mode.config_tag=="traitor" || SSticker.mode.config_tag=="traitorchan")
+		text = uppertext(text)
+	text = "<i><b>[text]</b></i>: "
+	if (src in SSticker.mode.traitors)
+		text += "<b>TRAITOR</b> | <a href='?src=\ref[src];traitor=clear'>loyal</a>"
+		if (objectives.len==0)
+			text += "<br>Objectives are empty! <a href='?src=\ref[src];traitor=autoobjectives'>Randomize</a>!"
+	else
+		text += "<a href='?src=\ref[src];traitor=traitor'>traitor</a> | <b>LOYAL</b>"
+
+	if(current && current.client && (ROLE_TRAITOR in current.client.prefs.be_special))
+		text += " | Enabled in Prefs"
+	else
+		text += " | Disabled in Prefs"
+
+	sections["traitor"] = text
+
+
+	if(ishuman(current) || ismonkey(current))
+
+		/** CHANGELING ***/
+		text = "changeling"
+		if (SSticker.mode.config_tag=="changeling" || SSticker.mode.config_tag=="traitorchan")
+			text = uppertext(text)
+		text = "<i><b>[text]</b></i>: "
+		if ((src in SSticker.mode.changelings) && special_role)
+			text += "<b>YES</b> | <a href='?src=\ref[src];changeling=clear'>no</a>"
+			if (objectives.len==0)
+				text += "<br>Objectives are empty! <a href='?src=\ref[src];changeling=autoobjectives'>Randomize!</a>"
+			if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) )
+				text += "<br><a href='?src=\ref[src];changeling=initialdna'>Transform to initial appearance.</a>"
+		else if(src in SSticker.mode.changelings) //Station Aligned Changeling
+			text += "<b>YES (but not an antag)</b> | <a href='?src=\ref[src];changeling=clear'>no</a>"
+			if (objectives.len==0)
+				text += "<br>Objectives are empty! <a href='?src=\ref[src];changeling=autoobjectives'>Randomize!</a>"
+			if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) )
+				text += "<br><a href='?src=\ref[src];changeling=initialdna'>Transform to initial appearance.</a>"
+		else
+			text += "<a href='?src=\ref[src];changeling=changeling'>yes</a> | <b>NO</b>"
+
+		if(current && current.client && (ROLE_CHANGELING in current.client.prefs.be_special))
+			text += " | Enabled in Prefs"
+		else
+			text += " | Disabled in Prefs"
+
+		sections["changeling"] = text
+
+
+		/** MONKEY ***/
+		text = "monkey"
+		if (SSticker.mode.config_tag=="monkey")
+			text = uppertext(text)
+		text = "<i><b>[text]</b></i>: "
+		if (ishuman(current))
+			text += "<a href='?src=\ref[src];monkey=healthy'>healthy</a> | <a href='?src=\ref[src];monkey=infected'>infected</a> | <b>HUMAN</b> | other"
+		else if(ismonkey(current))
+			var/found = FALSE
+			for(var/datum/disease/transformation/jungle_fever/JF in current.viruses)
+				found = TRUE
+				break
+
+			if(found)
+				text += "<a href='?src=\ref[src];monkey=healthy'>healthy</a> | <b>INFECTED</b> | <a href='?src=\ref[src];monkey=human'>human</a> | other"
+			else
+				text += "<b>HEALTHY</b> | <a href='?src=\ref[src];monkey=infected'>infected</a> | <a href='?src=\ref[src];monkey=human'>human</a> | other"
+
+		else
+			text += "healthy | infected | human | <b>OTHER</b>"
+
+		if(current && current.client && (ROLE_MONKEY in current.client.prefs.be_special))
+			text += " | Enabled in Prefs"
+		else
+			text += " | Disabled in Prefs"
+
+		sections["monkey"] = text
+
 	if(ishuman(current))
+
+		/** NUCLEAR ***/
+		text = "nuclear"
+		if (SSticker.mode.config_tag=="nuclear")
+			text = uppertext(text)
+		text = "<i><b>[text]</b></i>: "
+		if (src in SSticker.mode.syndicates)
+			text += "<b>OPERATIVE</b> | <a href='?src=\ref[src];nuclear=clear'>nanotrasen</a>"
+			text += "<br><a href='?src=\ref[src];nuclear=lair'>To shuttle</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];nuclear=dressup'>dress up</a>."
+			var/code
+			for (var/obj/machinery/nuclearbomb/bombue in GLOB.machines)
+				if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
+					code = bombue.r_code
+					break
+			if (code)
+				text += " Code is [code]. <a href='?src=\ref[src];nuclear=tellcode'>tell the code.</a>"
+		else
+			text += "<a href='?src=\ref[src];nuclear=nuclear'>operative</a> | <b>NANOTRASEN</b>"
+
+		if(current && current.client && (ROLE_OPERATIVE in current.client.prefs.be_special))
+			text += " | Enabled in Prefs"
+		else
+			text += " | Disabled in Prefs"
+
+		sections["nuclear"] = text
+
+
+		/** WIZARD ***/
+		text = "wizard"
+		if (SSticker.mode.config_tag=="wizard")
+			text = uppertext(text)
+		text = "<i><b>[text]</b></i>: "
+		if ((src in SSticker.mode.wizards) || (src in SSticker.mode.apprentices))
+			text += "<b>YES</b> | <a href='?src=\ref[src];wizard=clear'>no</a>"
+			text += "<br><a href='?src=\ref[src];wizard=lair'>To lair</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];wizard=dressup'>dress up</a>, <a href='?src=\ref[src];wizard=name'>let choose name</a>."
+			if (objectives.len==0)
+				text += "<br>Objectives are empty! <a href='?src=\ref[src];wizard=autoobjectives'>Randomize!</a>"
+		else
+			text += "<a href='?src=\ref[src];wizard=wizard'>yes</a> | <b>NO</b>"
+
+		if(current && current.client && (ROLE_WIZARD in current.client.prefs.be_special))
+			text += " | Enabled in Prefs"
+		else
+			text += " | Disabled in Prefs"
+
+		sections["wizard"] = text
+
+
 		/** REVOLUTION ***/
 		text = "revolution"
 		if (SSticker.mode.config_tag=="revolution")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
 		if (assigned_role in GLOB.command_positions)
-			text += "<b>HEAD</b>|loyal|employee|headrev|rev"
+			text += "<b>HEAD</b> | not mindshielded | employee | headrev | rev"
 		else if (src in SSticker.mode.head_revolutionaries)
 			var/last_healthy_headrev = TRUE
 			for(var/I in SSticker.mode.head_revolutionaries)
@@ -408,16 +538,16 @@
 				if(M.z == ZLEVEL_STATION && !M.stat)
 					last_healthy_headrev = FALSE
 					break
-			text += "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>[last_healthy_headrev ? "<font color='red'>LAST </font> " : ""]HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
+			text += "head | not mindshielded | <a href='?src=\ref[src];revolution=clear'>employee</a> | <b>[last_healthy_headrev ? "<font color='red'>LAST </font> " : ""]HEADREV</b> | <a href='?src=\ref[src];revolution=rev'>rev</a>"
 			text += "<br>Flash: <a href='?src=\ref[src];revolution=flash'>give</a>"
 
 			var/list/L = current.get_contents()
 			var/obj/item/device/assembly/flash/flash = locate() in L
 			if (flash)
 				if(!flash.crit_fail)
-					text += "|<a href='?src=\ref[src];revolution=takeflash'>take</a>."
+					text += " | <a href='?src=\ref[src];revolution=takeflash'>take</a>."
 				else
-					text += "|<a href='?src=\ref[src];revolution=takeflash'>take</a>|<a href='?src=\ref[src];revolution=repairflash'>repair</a>."
+					text += " | <a href='?src=\ref[src];revolution=takeflash'>take</a> | <a href='?src=\ref[src];revolution=repairflash'>repair</a>."
 			else
 				text += "."
 
@@ -425,16 +555,16 @@
 			if (objectives.len==0)
 				text += "<br>Objectives are empty! <a href='?src=\ref[src];revolution=autoobjectives'>Set to kill all heads</a>."
 		else if(current.isloyal())
-			text += "head|<b>LOYAL</b>|employee|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|rev"
+			text += "head | <b>MINDSHIELDED</b> | employee | <a href='?src=\ref[src];revolution=headrev'>headrev</a> | rev"
 		else if (src in SSticker.mode.revolutionaries)
-			text += "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<b>REV</b>"
+			text += "head | not mindshielded | <a href='?src=\ref[src];revolution=clear'>employee</a> | <a href='?src=\ref[src];revolution=headrev'>headrev</a> | <b>REV</b>"
 		else
-			text += "head|loyal|<b>EMPLOYEE</b>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
+			text += "head | not mindshielded | <b>EMPLOYEE</b> | <a href='?src=\ref[src];revolution=headrev'>headrev</a> | <a href='?src=\ref[src];revolution=rev'>rev</a>"
 
 		if(current && current.client && (ROLE_REV in current.client.prefs.be_special))
-			text += "|Enabled in Prefs"
+			text += " | Enabled in Prefs"
 		else
-			text += "|Disabled in Prefs"
+			text += " | Disabled in Prefs"
 
 		sections["revolution"] = text
 
@@ -443,16 +573,16 @@
 		if (SSticker.mode.config_tag=="gang")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		text += "[current.isloyal() ? "<B>LOYAL</B>" : "loyal"]|"
+		text += "[current.isloyal() ? "<B>MINDSHIELDED</B>" : "not mindshielded"] | "
 		if(src in SSticker.mode.get_all_gangsters())
 			text += "<a href='?src=\ref[src];gang=clear'>none</a>"
 		else
 			text += "<B>NONE</B>"
 
 		if(current && current.client && (ROLE_GANG in current.client.prefs.be_special))
-			text += "|Enabled in Prefs<BR>"
+			text += " | Enabled in Prefs<BR>"
 		else
-			text += "|Disabled in Prefs<BR>"
+			text += " | Disabled in Prefs<BR>"
 
 		for(var/datum/gang/G in SSticker.mode.gangs)
 			text += "<i>[G.name]</i>: "
@@ -460,14 +590,14 @@
 				text += "<B>GANGSTER</B>"
 			else
 				text += "<a href='?src=\ref[src];gangster=\ref[G]'>gangster</a>"
-			text += "|"
+			text += " | "
 			if(src in (G.bosses))
 				text += "<B>GANG LEADER</B>"
-				text += "|Equipment: <a href='?src=\ref[src];gang=equip'>give</a>"
+				text += " | Equipment: <a href='?src=\ref[src];gang=equip'>give</a>"
 				var/list/L = current.get_contents()
 				var/obj/item/device/gangtool/gangtool = locate() in L
 				if (gangtool)
-					text += "|<a href='?src=\ref[src];gang=takeequip'>take</a>"
+					text += " | <a href='?src=\ref[src];gang=takeequip'>take</a>"
 
 			else
 				text += "<a href='?src=\ref[src];gangboss=\ref[G]'>gang leader</a>"
@@ -478,233 +608,113 @@
 
 		sections["gang"] = text
 
-		/** Abductors **/
-		text = "Abductor"
+		/** ABDUCTION **/
+		text = "abductor"
 		if(SSticker.mode.config_tag == "abductor")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
 		if(src in SSticker.mode.abductors)
-			text += "<b>Abductor</b>|<a href='?src=\ref[src];abductor=clear'>human</a>"
-			text += "|<a href='?src=\ref[src];common=undress'>undress</a>|<a href='?src=\ref[src];abductor=equip'>equip</a>"
+			text += "<b>Abductor</b> | <a href='?src=\ref[src];abductor=clear'>human</a>"
+			text += " | <a href='?src=\ref[src];common=undress'>undress</a> | <a href='?src=\ref[src];abductor=equip'>equip</a>"
 		else
-			text += "<a href='?src=\ref[src];abductor=abductor'>Abductor</a>|<b>human</b>"
+			text += "<a href='?src=\ref[src];abductor=abductor'>abductor</a> | <b>human</b>"
 
 		if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special))
-			text += "|Enabled in Prefs"
+			text += " | Enabled in Prefs"
 		else
-			text += "|Disabled in Prefs"
+			text += " | Disabled in Prefs"
 
 		sections["abductor"] = text
 
-		/** NUCLEAR ***/
-		text = "nuclear"
-		if (SSticker.mode.config_tag=="nuclear")
+
+		/** DEVIL ***/
+		text = "devil"
+		if(SSticker.mode.config_tag == "devil")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if (src in SSticker.mode.syndicates)
-			text += "<b>OPERATIVE</b>|<a href='?src=\ref[src];nuclear=clear'>nanotrasen</a>"
-			text += "<br><a href='?src=\ref[src];nuclear=lair'>To shuttle</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];nuclear=dressup'>dress up</a>."
-			var/code
-			for (var/obj/machinery/nuclearbomb/bombue in GLOB.machines)
-				if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
-					code = bombue.r_code
-					break
-			if (code)
-				text += " Code is [code]. <a href='?src=\ref[src];nuclear=tellcode'>tell the code.</a>"
+		var/datum/antagonist/devil/devilinfo = has_antag_datum(ANTAG_DATUM_DEVIL)
+		if(devilinfo)
+			if(!devilinfo.ascendable)
+				text += "<b>DEVIL</b> | <a href='?src=\ref[src];devil=ascendable_devil'>ascendable devil</a> | sintouched | <a href='?src=\ref[src];devil=clear'>human</a>"
+			else
+				text += "<a href='?src=\ref[src];devil=devil'>DEVIL</a> | <b>ASCENDABLE DEVIL</b> | sintouched | <a href='?src=\ref[src];devil=clear'>human</a>"
+		else if(src in SSticker.mode.sintouched)
+			text += "devil | ascendable devil | <b>SINTOUCHED</b> | <a href='?src=\ref[src];devil=clear'>human</a>"
 		else
-			text += "<a href='?src=\ref[src];nuclear=nuclear'>operative</a>|<b>NANOTRASEN</b>"
+			text += "<a href='?src=\ref[src];devil=devil'>devil</a> | <a href='?src=\ref[src];devil=ascendable_devil'>ascendable devil</a> | <a href='?src=\ref[src];devil=sintouched'>sintouched</a> | <b>HUMAN</b>"
 
-		if(current && current.client && (ROLE_OPERATIVE in current.client.prefs.be_special))
-			text += "|Enabled in Prefs"
+		if(current && current.client && (ROLE_DEVIL in current.client.prefs.be_special))
+			text += " | Enabled in Prefs"
 		else
-			text += "|Disabled in Prefs"
+			text += " | Disabled in Prefs"
+		sections["devil"] = text
 
-		sections["nuclear"] = text
 
-		/** WIZARD ***/
-		text = "wizard"
-		if (SSticker.mode.config_tag=="wizard")
+		/** NINJA ***/
+		text = "ninja"
+		if(SSticker.mode.config_tag == "ninja")
 			text = uppertext(text)
 		text = "<i><b>[text]</b></i>: "
-		if ((src in SSticker.mode.wizards) || (src in SSticker.mode.apprentices))
-			text += "<b>YES</b>|<a href='?src=\ref[src];wizard=clear'>no</a>"
-			text += "<br><a href='?src=\ref[src];wizard=lair'>To lair</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];wizard=dressup'>dress up</a>, <a href='?src=\ref[src];wizard=name'>let choose name</a>."
-			if (objectives.len==0)
-				text += "<br>Objectives are empty! <a href='?src=\ref[src];wizard=autoobjectives'>Randomize!</a>"
+		var/datum/antagonist/ninja/ninjainfo = has_antag_datum(ANTAG_DATUM_NINJA)
+		if(ninjainfo)
+			if(ninjainfo.helping_station)
+				text += "<a href='?src=\ref[src];ninja=clear'>employee</a>  |  syndicate  |  <b>NANOTRASEN</b>  |  <b><a href='?src=\ref[src];ninja=equip'>EQUIP</a></b>"
+			else
+				text += "<a href='?src=\ref[src];ninja=clear'>employee</a>  |  <b>SYNDICATE</b>  |  nanotrasen  |  <b><a href='?src=\ref[src];ninja=equip'>EQUIP</a></b>"
 		else
-			text += "<a href='?src=\ref[src];wizard=wizard'>yes</a>|<b>NO</b>"
-
-		if(current && current.client && (ROLE_WIZARD in current.client.prefs.be_special))
-			text += "|Enabled in Prefs"
+			text += "<b>EMPLOYEE</b>  |  <a href='?src=\ref[src];ninja=syndicate'>syndicate</a>  |  <a href='?src=\ref[src];ninja=nanotrasen'>nanotrasen</a>  |  <a href='?src=\ref[src];ninja=random'>random allegiance</a>"
+		if(current && current.client && (ROLE_NINJA in current.client.prefs.be_special))
+			text += "  |  Enabled in Prefs"
 		else
-			text += "|Disabled in Prefs"
+			text += "  |  Disabled in Prefs"
+		sections["ninja"] = text
 
-		sections["wizard"] = text
 
-	/** CULT ***/
-	text = "cult"
-	if (SSticker.mode.config_tag=="cult")
-		text = uppertext(text)
-	text = "<i><b>[text]</b></i>: "
-	if(iscultist(current))
-		text += "loyal|<a href='?src=\ref[src];cult=clear'>employee</a>|<b>CULTIST</b>"
-		text += "<br>Give <a href='?src=\ref[src];cult=tome'>tome</a>|<a href='?src=\ref[src];cult=amulet'>amulet</a>."
+	if(!issilicon(current))
+		/** CULT ***/
+		text = "cult"
+		if (SSticker.mode.config_tag=="cult")
+			text = uppertext(text)
+		text = "<i><b>[text]</b></i>: "
+		if(iscultist(current))
+			text += "not mindshielded | <a href='?src=\ref[src];cult=clear'>employee</a> | <b>CULTIST</b>"
+			text += "<br>Give <a href='?src=\ref[src];cult=tome'>tome</a> | <a href='?src=\ref[src];cult=amulet'>amulet</a>."
+		else if(is_convertable_to_cult(current))
+			text += "not mindshielded | <b>EMPLOYEE</b> | <a href='?src=\ref[src];cult=cultist'>cultist</a>"
+		else
+			text += "[!current.isloyal() ? "not mindshielded" : "<b>MINDSHIELDED</b>"] | <b>EMPLOYEE</b> | <i>cannot serve Nar-Sie</i>"
 
-	else if(current.isloyal())
-		text += "<b>LOYAL</b>|employee|<a href='?src=\ref[src];cult=cultist'>cultist</a>"
-	else if(is_convertable_to_cult(current))
-		text += "loyal|<b>EMPLOYEE</b>|<a href='?src=\ref[src];cult=cultist'>cultist</a>"
-	else
-		text += "loyal|<b>EMPLOYEE</b>|<i>cannot serve Nar-Sie</i>"
+		if(current && current.client && (ROLE_CULTIST in current.client.prefs.be_special))
+			text += " | Enabled in Prefs"
+		else
+			text += " | Disabled in Prefs"
 
-	if(current && current.client && (ROLE_CULTIST in current.client.prefs.be_special))
-		text += "|Enabled in Prefs"
-	else
-		text += "|Disabled in Prefs"
+		sections["cult"] = text
 
-	sections["cult"] = text
 
-	/** CLOCKWORK CULT **/
-	text = "clockwork cult"
-	if(SSticker.mode.config_tag == "clockwork cult")
-		text = uppertext(text)
-	text = "<i><b>[text]</b></i>: "
-	if(is_servant_of_ratvar(current))
-		text += "loyal|<a href='?src=\ref[src];clockcult=clear'>employee</a>|<b>SERVANT</b>"
-		text += "<br><a href='?src=\ref[src];clockcult=slab'>Give slab</a>"
-	else if(current.isloyal())
-		text += "<b>LOYAL</b>|employee|<a href='?src=\ref[src];clockcult=servant'>servant</a>"
-	else if(is_eligible_servant(current))
-		text += "loyal|<b>EMPLOYEE</b>|<a href='?src=\ref[src];clockcult=servant'>servant</a>"
-	else
-		text += "loyal|<b>EMPLOYEE</b>|<i>cannot serve Ratvar</i>"
+	if(ishuman(current) || issilicon(current))
+		/** CLOCKWORK CULT **/
+		text = "clockwork cult"
+		if(SSticker.mode.config_tag == "clockwork cult")
+			text = uppertext(text)
+		text = "<i><b>[text]</b></i>: "
+		if(is_servant_of_ratvar(current))
+			text += "not mindshielded | <a href='?src=\ref[src];clockcult=clear'>employee</a> | <b>SERVANT</b>"
+			text += "<br><a href='?src=\ref[src];clockcult=slab'>Give slab</a>"
+		else if(is_eligible_servant(current))
+			text += "not mindshielded | <b>EMPLOYEE</b> | <a href='?src=\ref[src];clockcult=servant'>servant</a>"
+		else
+			text += "[!current.isloyal() ? "not mindshielded" : "<b>MINDSHIELDED</b>"] | <b>EMPLOYEE</b> | <i>cannot serve Ratvar</i>"
 
-	if(current && current.client && (ROLE_SERVANT_OF_RATVAR in current.client.prefs.be_special))
-		text += "|Enabled in Prefs"
-	else
-		text += "|Disabled in Prefs"
+		if(current && current.client && (ROLE_SERVANT_OF_RATVAR in current.client.prefs.be_special))
+			text += " | Enabled in Prefs"
+		else
+			text += " | Disabled in Prefs"
 
 	sections["clockcult"] = text
 
-	/** TRAITOR ***/
-	text = "traitor"
-	if (SSticker.mode.config_tag=="traitor" || SSticker.mode.config_tag=="traitorchan")
-		text = uppertext(text)
-	text = "<i><b>[text]</b></i>: "
-	if (src in SSticker.mode.traitors)
-		text += "<b>TRAITOR</b>|<a href='?src=\ref[src];traitor=clear'>loyal</a>"
-		if (objectives.len==0)
-			text += "<br>Objectives are empty! <a href='?src=\ref[src];traitor=autoobjectives'>Randomize</a>!"
-	else
-		text += "<a href='?src=\ref[src];traitor=traitor'>traitor</a>|<b>LOYAL</b>"
 
-	if(current && current.client && (ROLE_TRAITOR in current.client.prefs.be_special))
-		text += "|Enabled in Prefs"
-	else
-		text += "|Disabled in Prefs"
-
-	sections["traitor"] = text
-
-	if(ishuman(current) || ismonkey(current))
-
-		/** CHANGELING ***/
-		text = "changeling"
-		if (SSticker.mode.config_tag=="changeling" || SSticker.mode.config_tag=="traitorchan")
-			text = uppertext(text)
-		text = "<i><b>[text]</b></i>: "
-		if ((src in SSticker.mode.changelings) && special_role)
-			text += "<b>YES</b>|<a href='?src=\ref[src];changeling=clear'>no</a>"
-			if (objectives.len==0)
-				text += "<br>Objectives are empty! <a href='?src=\ref[src];changeling=autoobjectives'>Randomize!</a>"
-			if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) )
-				text += "<br><a href='?src=\ref[src];changeling=initialdna'>Transform to initial appearance.</a>"
-		else if(src in SSticker.mode.changelings) //Station Aligned Changeling
-			text += "<b>YES (but not an antag)</b>|<a href='?src=\ref[src];changeling=clear'>no</a>"
-			if (objectives.len==0)
-				text += "<br>Objectives are empty! <a href='?src=\ref[src];changeling=autoobjectives'>Randomize!</a>"
-			if(changeling && changeling.stored_profiles.len && (current.real_name != changeling.first_prof.name) )
-				text += "<br><a href='?src=\ref[src];changeling=initialdna'>Transform to initial appearance.</a>"
-		else
-			text += "<a href='?src=\ref[src];changeling=changeling'>yes</a>|<b>NO</b>"
-
-		if(current && current.client && (ROLE_CHANGELING in current.client.prefs.be_special))
-			text += "|Enabled in Prefs"
-		else
-			text += "|Disabled in Prefs"
-
-		sections["changeling"] = text
-
-		/** MONKEY ***/
-		text = "monkey"
-		if (SSticker.mode.config_tag=="monkey")
-			text = uppertext(text)
-		text = "<i><b>[text]</b></i>: "
-		if (ishuman(current))
-			text += "<a href='?src=\ref[src];monkey=healthy'>healthy</a>|<a href='?src=\ref[src];monkey=infected'>infected</a>|<b>HUMAN</b>|other"
-		else if(ismonkey(current))
-			var/found = FALSE
-			for(var/datum/disease/transformation/jungle_fever/JF in current.viruses)
-				found = TRUE
-				break
-
-			if(found)
-				text += "<a href='?src=\ref[src];monkey=healthy'>healthy</a>|<b>INFECTED</b>|<a href='?src=\ref[src];monkey=human'>human</a>|other"
-			else
-				text += "<b>HEALTHY</b>|<a href='?src=\ref[src];monkey=infected'>infected</a>|<a href='?src=\ref[src];monkey=human'>human</a>|other"
-
-		else
-			text += "healthy|infected|human|<b>OTHER</b>"
-
-		if(current && current.client && (ROLE_MONKEY in current.client.prefs.be_special))
-			text += "|Enabled in Prefs"
-		else
-			text += "|Disabled in Prefs"
-
-		sections["monkey"] = text
-
-	/** devil ***/
-	text = "devil"
-	if(SSticker.mode.config_tag == "devil")
-		text = uppertext(text)
-	text = "<i><b>[text]</b></i>: "
-	var/datum/antagonist/devil/devilinfo = has_antag_datum(ANTAG_DATUM_DEVIL)
-	if(devilinfo)
-		if(!devilinfo.ascendable)
-			text += "<b>DEVIL</b>|<a href='?src=\ref[src];devil=ascendable_devil'>Ascendable Devil</a>|sintouched|<a href='?src=\ref[src];devil=clear'>human</a>"
-		else
-			text += "<a href='?src=\ref[src];devil=devil'>DEVIL</a>|<b>ASCENDABLE DEVIL</b>|sintouched|<a href='?src=\ref[src];devil=clear'>human</a>"
-	else if(src in SSticker.mode.sintouched)
-		text += "devil|Ascendable Devil|<b>SINTOUCHED</b>|<a href='?src=\ref[src];devil=clear'>human</a>"
-	else
-		text += "<a href='?src=\ref[src];devil=devil'>devil</a>|<a href='?src=\ref[src];devil=ascendable_devil'>Ascendable Devil</a>|<a href='?src=\ref[src];devil=sintouched'>sintouched</a>|<b>HUMAN</b>"
-
-	if(current && current.client && (ROLE_DEVIL in current.client.prefs.be_special))
-		text += "|Enabled in Prefs"
-	else
-		text += "|Disabled in Prefs"
-	sections["devil"] = text
-
-/** NINJA ***/
-	text = "ninja"
-	if(SSticker.mode.config_tag == "ninja")
-		text = uppertext(text)
-	text = "<i><b>[text]</b></i>: "
-	var/datum/antagonist/ninja/ninjainfo = has_antag_datum(ANTAG_DATUM_NINJA)
-	if(ninjainfo)
-		if(ninjainfo.helping_station)
-			text += "<a href='?src=\ref[src];ninja=clear'>employee</a> | syndicate | <b>NANOTRASEN</b> | <b><a href='?src=\ref[src];ninja=equip'>EQUIP</a></b>"
-		else
-			text += "<a href='?src=\ref[src];ninja=clear'>employee</a> | <b>SYNDICATE</b> | nanotrasen | <b><a href='?src=\ref[src];ninja=equip'>EQUIP</a></b>"
-	else
-		text += "<b>EMPLOYEE</b> | <a href='?src=\ref[src];ninja=syndicate'>syndicate</a> | <a href='?src=\ref[src];ninja=nanotrasen'>nanotrasen</a> | <a href='?src=\ref[src];ninja=random'>random allegiance</a>"
-	if(current && current.client && (ROLE_NINJA in current.client.prefs.be_special))
-		text += " | Enabled in Prefs"
-	else
-		text += " | Disabled in Prefs"
-	sections["ninja"] = text
-
-
-/** SILICON ***/
+	/** SILICON ***/
 	if(issilicon(current))
 		text = "silicon"
 		var/mob/living/silicon/robot/robot = current
@@ -738,7 +748,7 @@
 		text = "Uplink: <a href='?src=\ref[src];common=uplink'>give</a>"
 		var/obj/item/device/uplink/U = find_syndicate_uplink()
 		if(U)
-			text += "|<a href='?src=\ref[src];common=takeuplink'>take</a>"
+			text += " | <a href='?src=\ref[src];common=takeuplink'>take</a>"
 			if (check_rights(R_FUN, 0))
 				text += ", <a href='?src=\ref[src];common=crystals'>[U.telecrystals]</a> TC"
 			else
@@ -763,7 +773,10 @@
 
 	out += "<a href='?src=\ref[src];obj_announce=1'>Announce objectives</a><br><br>"
 
-	usr << browse(out, "window=edit_memory[src];size=500x600")
+	var/datum/browser/popup = new(usr, "edit_memory", "", 600, 600)
+	popup.set_content(out)
+	popup.open()
+	//usr << browse(out, "window=edit_memory[src];size=575x600")
 
 
 /datum/mind/Topic(href, href_list)
@@ -890,7 +903,7 @@
 				if(objective&&objective.type==text2path("/datum/objective/[new_obj_type]"))
 					def_num = objective.target_amount
 
-				var/target_number = input("Input target number:", "Objective", def_num) as num|null
+				var/target_number = input("Input target number:", "Objective", def_num) as num | null
 				if (isnull(target_number))//Ordinarily, you wouldn't need isnull. In this case, the value may already exist.
 					return
 
@@ -1387,7 +1400,7 @@
 							sleep(0) //because deleting of virus is doing throught spawn(0) //What
 						log_admin("[key_name(usr)] attempting to humanize [key_name(current)]")
 						message_admins("<span class='notice'>[key_name_admin(usr)] attempting to humanize [key_name_admin(current)]</span>")
-						H = M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG)
+						H = M.humanize(TR_KEEPITEMS  |  TR_KEEPIMPLANTS  |  TR_KEEPORGANS  |  TR_KEEPDAMAGE  |  TR_KEEPVIRUS  |  TR_DEFAULTMSG)
 						if(H)
 							src = H.mind
 
@@ -1421,7 +1434,7 @@
 				if(check_rights(R_FUN, 0))
 					var/obj/item/device/uplink/U = find_syndicate_uplink()
 					if(U)
-						var/crystals = input("Amount of telecrystals for [key]","Syndicate uplink", U.telecrystals) as null|num
+						var/crystals = input("Amount of telecrystals for [key]","Syndicate uplink", U.telecrystals) as null | num
 						if(!isnull(crystals))
 							U.telecrystals = crystals
 							message_admins("[key_name_admin(usr)] changed [current]'s telecrystal count to [crystals].")
@@ -1468,6 +1481,7 @@
 	if(!(src in SSticker.mode.syndicates))
 		SSticker.mode.syndicates += src
 		SSticker.mode.update_synd_icons_added(src)
+		assigned_role = "Syndicate"
 		special_role = "Syndicate"
 		SSticker.mode.forge_syndicate_objectives(src)
 		SSticker.mode.greet_syndicate(src)
@@ -1715,7 +1729,7 @@
 /mob/living/carbon/human/mind_initialize()
 	..()
 	if(!mind.assigned_role)
-		mind.assigned_role = "Assistant" //defualt
+		mind.assigned_role = "Unassigned" //default
 
 //XENO
 /mob/living/carbon/alien/mind_initialize()

code/datums/riding.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/datums/riding.dm b/code/datums/riding.dm	(rejected hunks)
-@@ -419,7 +419,7 @@
- 	icon = 'icons/obj/items_and_weapons.dmi.dmi'
- 	icon_state = "offhand"
- 	w_class = WEIGHT_CLASS_HUGE
--	flags = ABSTRACT | DROPDEL | NOBLUDGEON
-+	flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
- 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- 	var/mob/living/carbon/rider
- 	var/mob/living/ridden

code/datums/spawners_menu.dm

@@ -0,0 +1,48 @@
+/datum/spawners_menu
+	var/mob/dead/observer/owner
+
+/datum/spawners_menu/New(mob/dead/observer/new_owner)
+	if(!istype(new_owner))
+		qdel(src)
+	owner = new_owner
+
+/datum/spawners_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "spawners_menu", "Spawners Menu", 700, 600, master_ui, state)
+		ui.open()
+
+/datum/spawners_menu/ui_data(mob/user)
+	var/list/data = list()
+	data["spawners"] = list()
+	for(var/spawner in GLOB.mob_spawners)
+		var/list/this = list()
+		this["name"] = spawner
+		this["desc"] = ""
+		this["refs"] = list()
+		for(var/spawner_obj in GLOB.mob_spawners[spawner])
+			this["refs"] += "\ref[spawner_obj]"
+			if(!this["desc"])
+				var/obj/effect/mob_spawn/MS = spawner_obj
+				this["desc"] = MS.flavour_text
+		this["amount_left"] = LAZYLEN(GLOB.mob_spawners[spawner])
+		data["spawners"] += list(this)
+
+	return data
+
+/datum/spawners_menu/ui_act(action, params)
+	if(..())
+		return
+
+	var/spawner_ref = pick(GLOB.mob_spawners[params["name"]])
+	var/obj/effect/mob_spawn/MS = locate(spawner_ref) in GLOB.poi_list
+
+	switch(action)
+		if("jump")
+			if(MS)
+				owner.forceMove(get_turf(MS))
+				. = TRUE
+		if("spawn")
+			if(MS)
+				MS.attack_ghost(owner)
+				. = TRUE

code/datums/status_effects/debuffs.dm

@@ -251,6 +251,10 @@
 	duration = -1
 	alert_type = null
 
+/datum/status_effect/cultghost/tick()
+	if(owner.reagents)
+		owner.reagents.del_reagent("holywater") //can't be deconverted
+
 /datum/status_effect/crusher_mark
 	id = "crusher_mark"
 	duration = 300 //if you leave for 30 seconds you lose the mark, deal with it