Merge pull request #70 from Tastyfish/master

SkyMarshal thingy's - everyone can be cult, paper label, also emote updates

code/game/gamemodes/cult/cult.dm

@@ -9,7 +9,6 @@
 
 /proc/is_convertable_to_cult(datum/mind/mind)
 	if(!istype(mind))	return 0
-	if(istype(mind.current, /mob/living/carbon/human) && (mind.assigned_role in list("Captain", "Head of Security", "Security Officer", "Detective", "Chaplain", "Warden")))	return 0
 	for(var/obj/item/weapon/implant/loyalty/L in mind.current)
 		if(L && L.implanted)
 			return 0
@@ -19,7 +18,7 @@
 /datum/game_mode/cult
 	name = "cult"
 	config_tag = "cult"
-	restricted_jobs = list("Chaplain", "Security Officer", "Warden", "Detective", "AI", "Cyborg", "Captain", "Head of Security")
+	restricted_jobs = list("AI", "Cyborg")
 	required_players = 3
 	required_enemies = 3
 
@@ -71,12 +70,11 @@
 /datum/game_mode/cult/post_setup()
 	modePlayer += cult
 	if("sacrifice" in objectives)
-		var/list/possible_targets = get_unconvertables()
+		var/list/possible_targets = list()
 
-		if(!possible_targets.len)
-			for(var/mob/living/carbon/human/player in world)
-				if(player.mind && !(player.mind in cult))
-					possible_targets += player.mind
+		for(var/mob/living/carbon/human/player in world)
+			if(player.mind && !(player.mind in cult))
+				possible_targets += player.mind
 
 		if(possible_targets.len > 0)
 			sacrifice_target = pick(possible_targets)
@@ -247,14 +245,6 @@
 						del(I)
 
 
-/datum/game_mode/cult/proc/get_unconvertables()
-	var/list/ucs = list()
-	for(var/mob/living/carbon/human/player in world)
-		if(!is_convertable_to_cult(player.mind))
-			ucs += player.mind
-	return ucs
-
-
 /datum/game_mode/cult/proc/check_cult_victory()
 	var/cult_fail = 0
 	if(objectives.Find("survive"))

code/game/objects/items/weapons/papers_bins.dm

@@ -62,7 +62,7 @@ CLIPBOARDS
 	var/n_name = input(usr, "What would you like to label the paper?", "Paper Labelling", null)  as text
 	n_name = copytext(n_name, 1, 32)
 	if ((src.loc == usr && usr.stat == 0))
-		src.name = text("paper[]", (n_name ? text("- '[n_name]'") : null))
+		src.name = n_name && n_name != "" ? n_name : "Untitled paper"
 	src.add_fingerprint(usr)
 	return
 

code/modules/mob/living/carbon/human/death.dm

@@ -6,6 +6,8 @@
 	src.stat = 2
 	src.dizziness = 0
 	src.jitteriness = 0
+	src.sleeping = 0
+	src.sleeping_willingly = 0
 
 	tension_master.death(src)
 

code/modules/mob/living/carbon/human/emote.dm

@@ -74,7 +74,14 @@
 			if(!(message))
 				return
 			else
-				message = "<B>[src]</B> [message]"
+				if(cmptext(copytext(message, 1, 3), "v "))
+					message = "<B>[src]</B> [copytext(message, 3)]"
+					m_type = 1
+				else if(cmptext(copytext(message, 1, 3), "h "))
+					message = "<B>[src]</B> [copytext(message, 3)]"
+					m_type = 2
+				else
+					message = "<B>[src]</B> [message]"
 
 		if ("salute")
 			if (!src.buckled)

code/modules/mob/living/silicon/robot/emote.dm

@@ -100,6 +100,7 @@
 				message = "<B>[src]</B> glares at [param]."
 			else
 				message = "<B>[src]</B> glares."
+			m_type = 1
 
 		if ("stare")
 			var/M = null
@@ -115,6 +116,7 @@
 				message = "<B>[src]</B> stares at [param]."
 			else
 				message = "<B>[src]</B> stares."
+			m_type = 1
 
 		if ("look")
 			var/M = null
@@ -132,6 +134,7 @@
 			else
 				message = "<B>[src]</B> looks."
 			m_type = 1
+
 		if("beep")
 			var/M = null
 			if(param)
@@ -147,7 +150,8 @@
 			else
 				message = "<B>[src]</B> beeps."
 			playsound(src.loc, 'twobeep.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
 		if("ping")
 			var/M = null
 			if(param)
@@ -163,7 +167,8 @@
 			else
 				message = "<B>[src]</B> pings."
 			playsound(src.loc, 'ping.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
 		if("buzz")
 			var/M = null
 			if(param)
@@ -179,7 +184,11 @@
 			else
 				message = "<B>[src]</B> buzzes."
 			playsound(src.loc, 'buzz-sigh.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
+		if("help")
+			src << "beep-(none)/mob, ping-(none)/mob, buzz-(none)/mob, look-(none)/mob, stare-(none)/mob, glare-(none)/mob, twitch, twitch_s"
+
 		else
 			src << text("Invalid Emote: []", act)
 	if ((message && src.stat == 0))