cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alien-speak and silicon binary-chat should now work properly using # or . instead of :

Browse Source 
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
This commit is contained in:
johnsonmt88@gmail.com
2013-01-14 23:31:04 +00:00
parent 4e022a9b45
commit e5750c9f6b
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/datums/supplypacks.dm
View File

@@ -146,6 +146,7 @@
/obj/item/weapon/caution, /obj/item/weapon/caution,
/obj/item/weapon/caution, /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/spray/cleaner,
/obj/item/weapon/reagent_containers/glass/rag, /obj/item/weapon/reagent_containers/glass/rag,
/obj/item/weapon/grenade/chem_grenade/cleaner, /obj/item/weapon/grenade/chem_grenade/cleaner,

2
code/modules/mob/living/carbon/alien/say.dm
View File

@@ -9,7 +9,7 @@
return return
if (length(message) >= 2) 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 = copytext(message, 3)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if (stat == 2) if (stat == 2)

8
code/modules/mob/living/silicon/say.dm
View File

@@ -18,13 +18,17 @@
return return
if (length(message) >= 2) 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)) if(istype(src, /mob/living/silicon/pai))
return ..(message) return ..(message)
message = copytext(message, 3) message = copytext(message, 3)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
robot_talk(message) 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. if(isAI(src)&&client)//For patching directly into AI holopads.
var/mob/living/silicon/ai/U = src var/mob/living/silicon/ai/U = src
message = copytext(message, 3) message = copytext(message, 3)