From 131b5ee0ec35b83094f6510f4c8779f73926b6bd Mon Sep 17 00:00:00 2001 From: ikarrus Date: Fri, 26 Sep 2014 19:53:09 -0600 Subject: [PATCH] - Removes the useless has_been_rev var - Reworded intercept report to discourage security from inadvertently causing a gang to win. - Recaller use is logged - Made the text explaining membership visibility more visible --- code/datums/mind.dm | 2 -- code/game/gamemodes/intercept_report.dm | 2 +- code/game/objects/items/devices/flash.dm | 1 - code/game/objects/items/devices/recaller.dm | 2 ++ code/modules/admin/topic.dm | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 29635eae655..b8efb6fa02d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -46,8 +46,6 @@ var/list/datum/objective/objectives = list() var/list/datum/objective/special_verbs = list() - var/has_been_rev = 0//Tracks if this mind has been a rev or not - var/list/cult_words = list() var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button. diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 2be2b45d984..93ec09810de 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -227,7 +227,7 @@ /datum/intercept_text/proc/build_gang(datum/mind/correct_person) src.text += "

Syndicate forces may be supplying opposing criminal organizations within your sector in an attempt at destabilizing our operations." src.text += "Ensure law and order is maintained on the station and be on the lookout for violent confrontations between station factions." - src.text += "Forced labor on the mining asteroid is recommended for anyone convicted of heading a criminal organization." + src.text += "Central Command retains an interest in any criminal leaders captured by station security. The execution or exile of these persons are ill-advised." /datum/intercept_text/proc/build_wizard(datum/mind/correct_person) var/SWF_desc = pick(SWF_names) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 17eb72e4114..ae0c9ab83c2 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -81,7 +81,6 @@ var/resisted if(!isloyal(M)) if(user.mind in ticker.mode.head_revolutionaries) - M.mind.has_been_rev = 1 if(!ticker.mode.add_revolutionary(M.mind)) resisted = 1 if(user.mind in ticker.mode.A_bosses) diff --git a/code/game/objects/items/devices/recaller.dm b/code/game/objects/items/devices/recaller.dm index 72ec1e64b08..efe0ae00066 100644 --- a/code/game/objects/items/devices/recaller.dm +++ b/code/game/objects/items/devices/recaller.dm @@ -31,6 +31,8 @@ loc << "\icon[src]Comm arrays accessed. Broadcasting recall signal..." sleep(rand(10,30)) recalling = 0 + log_game("[key_name(user)] has recalled the shuttle with a recaller.") + message_admins("[key_name_admin(user)] has recalled the shuttle with a recaller.", 1) if(!cancel_call_proc(user)) loc << "\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time." return diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 54ca285ed53..6275aceffeb 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1296,9 +1296,9 @@ //Job + antagonist if(M.mind) - special_role_description = "Role: [M.mind.assigned_role]; Antagonist: [M.mind.special_role]; Has been rev: [(M.mind.has_been_rev)?"Yes":"No"]" + special_role_description = "Role: [M.mind.assigned_role]; Antagonist: [M.mind.special_role]" else - special_role_description = "Role: Mind datum missing Antagonist: Mind datum missing; Has been rev: Mind datum missing;" + special_role_description = "Role: Mind datum missing Antagonist: Mind datum missing" //Health if(isliving(M))