From e5750c9f6bb30fcdf1d40bba809e9088ec1ca626 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Mon, 14 Jan 2013 23:31:04 +0000 Subject: [PATCH] Alien-speak and silicon binary-chat should now work properly using # or . instead of : Fixes issue 1243. Committing for Startoad: The janitor supply crate (from cargo) now comes with a trashbag inside. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5550 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/supplypacks.dm | 1 + code/modules/mob/living/carbon/alien/say.dm | 2 +- code/modules/mob/living/silicon/say.dm | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 0c6bbdcd03..785c91db59 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -146,6 +146,7 @@ /obj/item/weapon/caution, /obj/item/weapon/caution, /obj/item/weapon/caution, + /obj/item/weapon/storage/bag/trash, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/item/weapon/reagent_containers/glass/rag, /obj/item/weapon/grenade/chem_grenade/cleaner, diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index 6c6ee04950..37e313dfe3 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -9,7 +9,7 @@ return if (length(message) >= 2) - if (copytext(message, 1, 3) == ":a") + if (copytext(message, 1, 3) == ":a" || copytext(message, 1, 3) == "#a" || copytext(message, 1, 3) == ".a" ) message = copytext(message, 3) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) if (stat == 2) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 2d2d781c25..d9be362445 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -18,13 +18,17 @@ return if (length(message) >= 2) - if ((copytext(message, 1, 3) == ":b") || (copytext(message, 1, 3) == ":B")) + if ((copytext(message, 1, 3) == ":b") || (copytext(message, 1, 3) == ":B") || \ + (copytext(message, 1, 3) == "#b") || (copytext(message, 1, 3) == "#B") || \ + (copytext(message, 1, 3) == ".b") || (copytext(message, 1, 3) == ".B")) if(istype(src, /mob/living/silicon/pai)) return ..(message) message = copytext(message, 3) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) robot_talk(message) - else if ((copytext(message, 1, 3) == ":h") || (copytext(message, 1, 3) == ":H")) + else if ((copytext(message, 1, 3) == ":h") || (copytext(message, 1, 3) == ":H") || \ + (copytext(message, 1, 3) == "#h") || (copytext(message, 1, 3) == "#H") || \ + (copytext(message, 1, 3) == ".h") || (copytext(message, 1, 3) == ".H")) if(isAI(src)&&client)//For patching directly into AI holopads. var/mob/living/silicon/ai/U = src message = copytext(message, 3)