From 68c6b97fd3ee9b4ab07b784c5fcc10e28f968976 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Mon, 5 Dec 2011 23:19:39 -0500 Subject: [PATCH 1/2] everyone cult!, paper label --- code/game/gamemodes/cult/cult.dm | 20 +++++-------------- .../game/objects/items/weapons/papers_bins.dm | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 623fea38f81..67cd8981d04 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/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")) diff --git a/code/game/objects/items/weapons/papers_bins.dm b/code/game/objects/items/weapons/papers_bins.dm index 1cdca99ea36..0b8bdbbc5fc 100644 --- a/code/game/objects/items/weapons/papers_bins.dm +++ b/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 From 139252dbdaada8e78cea1c311b3c463d975822d4 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Tue, 6 Dec 2011 00:30:07 -0500 Subject: [PATCH 2/2] made me accept v/h in form of "me v waves."/"me h shouts!", fixed v/h types of robot emotes, added *help for robots --- code/modules/mob/living/carbon/human/death.dm | 2 ++ code/modules/mob/living/carbon/human/emote.dm | 9 ++++++++- code/modules/mob/living/silicon/robot/emote.dm | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index fcc51e9f13d..0892d7ea1a4 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/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) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 4be5616d753..960de60b470 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -74,7 +74,14 @@ if(!(message)) return else - message = "[src] [message]" + if(cmptext(copytext(message, 1, 3), "v ")) + message = "[src] [copytext(message, 3)]" + m_type = 1 + else if(cmptext(copytext(message, 1, 3), "h ")) + message = "[src] [copytext(message, 3)]" + m_type = 2 + else + message = "[src] [message]" if ("salute") if (!src.buckled) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index fb07c374e72..7d6740e9136 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -100,6 +100,7 @@ message = "[src] glares at [param]." else message = "[src] glares." + m_type = 1 if ("stare") var/M = null @@ -115,6 +116,7 @@ message = "[src] stares at [param]." else message = "[src] stares." + m_type = 1 if ("look") var/M = null @@ -132,6 +134,7 @@ else message = "[src] looks." m_type = 1 + if("beep") var/M = null if(param) @@ -147,7 +150,8 @@ else message = "[src] 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 = "[src] 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 = "[src] 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))