From 149542ca26aa7e1c01a44986fb0b65074ad58f8a Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Thu, 11 Jan 2018 01:36:33 -0800 Subject: [PATCH 1/2] Replace CentComm with CentCom in deadchat message (#34249) --- code/__HELPERS/roundend.dm | 2 +- code/game/machinery/computer/communications.dm | 2 +- code/modules/research/research_disk.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 0ba19e795e..ed960bc791 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -1,5 +1,5 @@ #define POPCOUNT_SURVIVORS "survivors" //Not dead at roundend -#define POPCOUNT_ESCAPEES "escapees" //Not dead and on centcomm/shuttles marked as escaped +#define POPCOUNT_ESCAPEES "escapees" //Not dead and on centcom/shuttles marked as escaped #define POPCOUNT_GHOSTS "ghosts" //Ghosts on roundend #define POPCOUNT_HUMAN_ESCAPEES "human_escapees" //Same as escapees but human only #define POPCOUNT_HUMAN_SURVIVORS "human_survivors" //Same as survivors but human only diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 9823df5fc8..0f41d9f519 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -289,7 +289,7 @@ CentCom_announce(input, usr) to_chat(usr, "Message transmitted to Central Command.") log_talk(usr,"[key_name(usr)] has made a CentCom announcement: [input]",LOGSAY) - deadchat_broadcast("[usr.name] has messaged CentComm: [input]", usr) + deadchat_broadcast("[usr.name] has messaged CentCom: [input]", usr) CM.lastTimeUsed = world.time // OMG SYNDICATE ...LETTERHEAD diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm index ac06bbdbd5..bec3ab36de 100644 --- a/code/modules/research/research_disk.dm +++ b/code/modules/research/research_disk.dm @@ -13,7 +13,7 @@ stored_research = new /datum/techweb /obj/item/disk/tech_disk/debug - name = "centcomm technology disk" + name = "centcom technology disk" desc = "A debug item for research" materials = list()