From b0940456f5fd7629f8d15a15d94de4a38b3dccb5 Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Tue, 8 Jun 2021 13:13:22 -0300
Subject: [PATCH] upload files

---
 code/datums/chatmessage.dm                        |   5 +++++
 .../mob/living/silicon/robot/robot_modules.dm     |   5 ++++-
 code/modules/mob/living/silicon/silicon.dm        |   2 ++
 .../mob/living/simple_animal/slime/life.dm        |   1 +
 code/modules/mob/typing_indicator.dm              |   9 +++++++++
 icons/mob/talk_64x64.dmi                          | Bin 0 -> 756 bytes
 6 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 icons/mob/talk_64x64.dmi

diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 669e3ddd77..03c23e11f6 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -176,6 +176,11 @@
 	scheduled_destruction = world.time + (lifespan - CHAT_MESSAGE_EOL_FADE)
 	enter_subsystem()
 
+	var/mob/living/silicon/robot/R = target
+	if(iscyborg(R))
+		if(R.module.dogborg == TRUE || R.dogborg == TRUE) //I hate whoever that thought that putting two types of dogborg that don't even sync up properly was good
+			message.pixel_x = 16
+
 /**
   * Applies final animations to overlay CHAT_MESSAGE_EOL_FADE deciseconds prior to message deletion
   * Arguments:
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 0c3ba87f5f..d0c53508fa 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -231,8 +231,11 @@
 	R.update_module_innate()
 	RM.rebuild_modules()
 	INVOKE_ASYNC(RM, .proc/do_transform_animation)
-	if(RM.dogborg)
+	if(RM.dogborg || R.dogborg)
 		RM.dogborg_equip()
+		R.typing_indicator_state = /obj/effect/overlay/typing_indicator/machine/dogborg
+	else
+		R.typing_indicator_state = /obj/effect/overlay/typing_indicator/machine
 	R.maxHealth = borghealth
 	R.health = min(borghealth, R.health)
 	qdel(src)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 8af55370bb..77d1be2bcd 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -48,6 +48,8 @@
 	var/hack_software = FALSE //Will be able to use hacking actions
 	var/interaction_range = 7			//wireless control range
 
+	typing_indicator_state = /obj/effect/overlay/typing_indicator/machine
+
 /mob/living/silicon/Initialize()
 	. = ..()
 	GLOB.silicon_mobs += src
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 3513a916f9..600222df68 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -6,6 +6,7 @@
 	var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while
 	var/SStun = 0 // stun variable
 
+	typing_indicator_state = /obj/effect/overlay/typing_indicator/slime
 
 /mob/living/simple_animal/slime/BiologicalLife(seconds, times_fired)
 	if(!(. = ..()))
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 159d370b92..570f01f5d9 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -55,3 +55,12 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
 	icon_state = "normal_typing"
 	appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
 	layer = ABOVE_FLY_LAYER
+
+/obj/effect/overlay/typing_indicator/machine
+	icon_state = "machine_typing"
+
+/obj/effect/overlay/typing_indicator/machine/dogborg
+	icon = 'icons/mob/talk_64x64.dmi'
+
+/obj/effect/overlay/typing_indicator/slime
+	icon_state = "slime_typing"
diff --git a/icons/mob/talk_64x64.dmi b/icons/mob/talk_64x64.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a9c759985d63495451df221704dad6bdc76f9da1
GIT binary patch
literal 756
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRStyLirB`&GO$wiq3C7Jno3=9=>
zRF7}uI%FWg_Q3MHi2d6rmyLzHU4vAde{%`FxhZoaWYU5!Z)N{%TYt24$4}0@FJC6c
zlz1n6X;+@P{+wx3;meaQ7gev-d+~-I$hh{QW7d<n@7tFxRW#1lOPF)QrZ{40L!p}S
zY3(-&H_nw!i{hEwEN%OjA*4vLMs~yY8w?CgTAnVBAr*7p-rZPu$Uws3;ry6sA6Wvj
zwD=#c44K5a#jk5ltje<totOLfd^Z&d@c71@@@_-k)@uUSkH2Be&|_{eX0V_NvE%$r
zW{Y62%6-+oYrh&M=@|FSsXxV_q%<wH@@GtT?gNi!5~lV0nI7;koMU(p#J(Z-cI`Kb
zv|G>bf3{e{mk@h>{mtYVne*$<Kc4VSYr)pCH7%U0|J`>x`+wS3yT+wco^R5*81?)5
z^*`%-X4T(fP^#l&`uOC%+Zp>(hFAJul>+`sGR$E-KoYU^Z}JI^rBiM?&p72zr7!@8
z<c=xd*)^8h+~3=_XYQS;L2Lqo$JfnF@38Lt_9z_U$e33Q+j4i$w|!-$`JL}x`MJ8M
zr)0OjEa&vD7QGN<y^ba3>-Wh<4N<R?|LZ<DRlfV5*KW2ITkULq{$0wea47z_n}=+}
eFVds!H`|f0k|X@(C3V1L%;4$j=d#Wzp$Pygts|cR

literal 0
HcmV?d00001