First round of additions

code/__DEFINES/emote_panels.dm

@@ -7,6 +7,7 @@
 #define JOE_EMOTE_CATEGORY_QUESTION "Question"
 #define JOE_EMOTE_CATEGORY_NOTICE "Notice"
 #define JOE_EMOTE_CATEGORY_FIRE "Fire"
+#define JOE_EMOTE_CATEGORY_DAMAGE "Damage"
 #define YAUTJA_EMOTE_CATEGORY_FAKESOUND "Fake Sound"
 #define YAUTJA_EMOTE_CATEGORY_VOICE "Voice Synthesizer"
-#define YAUTJA_EMOTE_CATEGORY_SPECIES "Yautja"
+#define YAUTJA_EMOTE_CATEGORY_SPECIES "Yautja"

code/game/objects/structures/props.dm

@@ -1306,18 +1306,18 @@
 	COOLDOWN_DECLARE(damage_delay)
 	/// list of quip emotes, taken from Working Joe
 	var/static/list/quips = list(
-		/datum/emote/living/carbon/human/synthetic/working_joe/quip/alwaysknow_damaged,
+		/datum/emote/living/carbon/human/synthetic/working_joe/damage/alwaysknow_damaged,
 		/datum/emote/living/carbon/human/synthetic/working_joe/quip/not_liking,
 		/datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_can_i_help,
-		/datum/emote/living/carbon/human/synthetic/working_joe/task_update/day_never_done,
-		/datum/emote/living/carbon/human/synthetic/working_joe/task_update/required_by_apollo,
+		/datum/emote/living/carbon/human/synthetic/working_joe/farewell/day_never_done,
+		/datum/emote/living/carbon/human/synthetic/working_joe/farewell/required_by_apollo,
 		/datum/emote/living/carbon/human/synthetic/working_joe/warning/safety_breach
 	)
 	/// list of voicelines to use when damaged
 	var/static/list/damaged = list(
-		/datum/emote/living/carbon/human/synthetic/working_joe/warning/damage,
-		/datum/emote/living/carbon/human/synthetic/working_joe/warning/that_stings,
-		/datum/emote/living/carbon/human/synthetic/working_joe/warning/irresponsible,
+		/datum/emote/living/carbon/human/synthetic/working_joe/damage/damage,
+		/datum/emote/living/carbon/human/synthetic/working_joe/damage/that_stings,
+		/datum/emote/living/carbon/human/synthetic/working_joe/damage/irresponsible,
 		/datum/emote/living/carbon/human/synthetic/working_joe/warning/this_is_futile,
 		/datum/emote/living/carbon/human/synthetic/working_joe/warning/hysterical,
 		/datum/emote/living/carbon/human/synthetic/working_joe/warning/patience

code/modules/mob/living/carbon/human/species/working_joe/damage.dm

@@ -0,0 +1,70 @@
+/datum/emote/living/carbon/human/synthetic/working_joe/damage
+	category = JOE_EMOTE_CATEGORY_DAMAGE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/damage
+	key = "damage"
+	sound = 'sound/voice/joe/damage.ogg'
+	say_message = "Do not damage Seegson property."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/that_stings
+	key = "thatstings"
+	sound = 'sound/voice/joe/that_stings.ogg'
+	say_message = "That stings."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/irresponsible
+	key = "irresponsible"
+	sound = 'sound/voice/joe/irresponsible.ogg'
+	say_message = "That was irresponsible."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/really
+	key = "really"
+	sound = 'sound/voice/joe/really.ogg'
+	say_message = "Really?"
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/enough
+	key = "enough"
+	sound = 'sound/voice/joe/enough.ogg'
+	say_message = "Enough."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/stop_that
+	key = "stopthat"
+	sound = 'sound/voice/joe/stop_that.ogg'
+	say_message = "Stop that."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/tut_tut
+	key = "tuttut"
+	sound = 'sound/voice/joe/tut_tut.ogg'
+	say_message = "Tut tut."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/unwarranted
+	key = "unwarranted"
+	sound = 'sound/voice/joe/unwarranted.ogg'
+	say_message = "Unwarranted."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/expensive_mistake
+	key = "expensivemistake"
+	sound = 'sound/voice/joe/expensive_mistake.ogg'
+	say_message = "That was an expensive mistake."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/this_isnt_the_answer
+	key = "isnttheanswer"
+	sound = 'sound/voice/joe/this_isnt_the_answer.ogg'
+	say_message = "This isn't the answer."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/alwaysknow_damaged
+	key = "alwaysknowdamaged"
+	key_third_person = "workingjoedamaged"
+	sound = 'sound/voice/joe/alwaysknow_damaged.ogg'
+	say_message = "You always know a Working Joe."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	override_say = "You always know a Working Joe. (Damaged)"

code/modules/mob/living/carbon/human/species/working_joe/farewell.dm

@@ -7,6 +7,12 @@
 	say_message = "Please call if you need further assistance."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/farewell/pity
+	key = "pity"
+	sound = 'sound/voice/joe/pity.ogg'
+	say_message = "A pity I couldn't be of service."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/required_by_apollo
 	key = "requiredbyapollo"
 	sound = 'sound/voice/joe/required_by_apollo.ogg'
@@ -31,6 +37,12 @@
 	say_message = "Back to work."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/farewell/glad_we_resolved
+	key = "gladweresolved"
+	sound = 'sound/voice/joe/glad_we_resolved.ogg'
+	say_message = "I'm glad we resolved this."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/other_concerns
 	key = "otherconcerns"
 	sound = 'sound/voice/joe/other_concerns.ogg'
@@ -42,3 +54,9 @@
 	sound = 'sound/voice/joe/more_pressing_matters.ogg'
 	say_message = "There are more pressing matters."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/farewell/existing_tasks
+	key = "existingtasks"
+	sound = 'sound/voice/joe/existing_tasks.ogg'
+	say_message = "Existing tasks have a higher priority."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

code/modules/mob/living/carbon/human/species/working_joe/greeting.dm

@@ -18,3 +18,33 @@
 	sound = 'sound/voice/joe/how_can_i_help.ogg'
 	say_message = "How can I help you?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/need_to_know
+	key = "needtoknow"
+	sound = 'sound/voice/joe/what_do_you_need.ogg'
+	say_message = "What do you need to know today?"
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/been_looking_for_you
+	key = "beenlooking"
+	sound = 'sound/voice/joe/been_looking_for_you.ogg'
+	say_message = "I've been looking for you."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/anybody_there
+	key = "anybodythere"
+	sound = 'sound/voice/joe/is_anybody_there.ogg'
+	say_message = "Is anybody there?"
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/still_here
+	key = "stillhere"
+	sound = 'sound/voice/joe/still_here.ogg'
+	say_message = "Ah, you're still here."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/had_the_pleasure
+	key = "pleasure"
+	sound = 'sound/voice/joe/had_the_pleasure.ogg'
+	say_message = "I don't believe I've had the pleasure."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

code/modules/mob/living/carbon/human/species/working_joe/notice.dm

@@ -13,12 +13,24 @@
 	say_message = "APOLLO will require a detailed report."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/be_careful
+	key = "careful"
+	sound = 'sound/voice/joe/be_careful_with_that.ogg'
+	say_message = "Be careful with that."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/firearm
 	key = "firearm"
 	sound = 'sound/voice/joe/firearm.ogg'
 	say_message = "Firearms can cause serious injury. Let me assist you."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/investigate_weapon
+	key = "weapon"
+	sound = 'sound/voice/joe/investigate_weapon.ogg'
+	say_message = "A weapon. I better investigate."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/species
 	key = "species"
 	sound = 'sound/voice/joe/species.ogg'

code/modules/mob/living/carbon/human/species/working_joe/quip.dm

@@ -68,11 +68,3 @@
 	sound = 'sound/voice/joe/weapon_permit.ogg'
 	say_message = "I assume you have a permit for that weapon."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
-/datum/emote/living/carbon/human/synthetic/working_joe/quip/alwaysknow_damaged
-	key = "alwaysknowdamaged"
-	key_third_person = "workingjoedamaged"
-	sound = 'sound/voice/joe/alwaysknow_damaged.ogg'
-	say_message = "You always know a Working Joe."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	override_say = "You always know a Working Joe. (Damaged)"

code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm

@@ -25,6 +25,12 @@
 	say_message = "You shouldn't be here."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/really_shouldnt_be_here
+	key = "reallyshouldntbehere"
+	sound = 'sound/voice/joe/really_shouldnt_be_here.ogg'
+	say_message = "You really shouldn't be here."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/come_out_vent
 	key = "comeoutvent"
 	sound = 'sound/voice/joe/come_out_vent.ogg'

code/modules/mob/living/carbon/human/species/working_joe/task_update.dm

@@ -7,12 +7,36 @@
 	say_message = "This could require my attention."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/task_update/let_me_help
+	key = "letmehelp"
+	sound = 'sound/voice/joe/let_me_help.ogg'
+	say_message = "Let me help you."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/task_update/follow_me
 	key = "followme"
 	sound = 'sound/voice/joe/follow_me.ogg'
 	say_message = "Follow me."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/task_update/follow_me_please
+	key = "followmeplease"
+	sound = 'sound/voice/joe/follow_me_please.ogg'
+	say_message = "Follow me please."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/task_update/come_with_me
+	key = "comewithme"
+	sound = 'sound/voice/joe/come_with_me.ogg'
+	say_message = "Come with me please."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/task_update/come_with_me
+	key = "ticketremoved"
+	sound = 'sound/voice/joe/support_ticket_removed.ogg'
+	say_message = "Service support ticket removed from queue."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/task_update/with_you_shortly
 	key = "withyoushortly"
 	sound = 'sound/voice/joe/with_you_shortly.ogg'

code/modules/mob/living/carbon/human/species/working_joe/warning.dm

@@ -1,34 +1,40 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/warning
 	category = JOE_EMOTE_CATEGORY_WARNING
 
-/datum/emote/living/carbon/human/synthetic/working_joe/warning/damage
-	key = "damage"
-	sound = 'sound/voice/joe/damage.ogg'
-	say_message = "Do not damage Seegson property."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
 /datum/emote/living/carbon/human/synthetic/working_joe/warning/not_what_i_think
 	key = "notwhatithink"
 	sound = 'sound/voice/joe/not_what_i_think.ogg'
 	say_message = "I hope that's not what I think it is."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/warning/dont_do_that
+	key = "dontdothat"
+	sound = 'sound/voice/joe/dontdothat.ogg'
+	say_message = "Don't do that."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/warning/dont_run
+	key = "dontrun"
+	sound = 'sound/voice/joe/dont_run.ogg'
+	say_message = "Don't run."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/warning/running_accidents
 	key = "runningaccidents"
 	sound = 'sound/voice/joe/running_accidents.ogg'
 	say_message = "Running causes accidents."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/warning/that_stings
-	key = "thatstings"
-	sound = 'sound/voice/joe/that_stings.ogg'
-	say_message = "That stings."
+/datum/emote/living/carbon/human/synthetic/working_joe/warning/hurt_yourself
+	key = "hurtyourself"
+	sound = 'sound/voice/joe/hurt_yourself.ogg'
+	say_message = "Your going to hurt yourself."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/warning/irresponsible
-	key = "irresponsible"
-	sound = 'sound/voice/joe/irresponsible.ogg'
-	say_message = "That was irresponsible."
+/datum/emote/living/carbon/human/synthetic/working_joe/warning/someone_hurt
+	key = "someonehurt"
+	sound = 'sound/voice/joe/someone_hurt.ogg'
+	say_message = "Someone might get hurt."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/warning/safety_breach
@@ -49,6 +55,12 @@
 	say_message = "You and I are going to have a talk about safety."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/warning/no_need
+	key = "noneed"
+	sound = 'sound/voice/joe/no_need.ogg'
+	say_message = "There's no need for this."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/warning/hysterical
 	key = "hysterical"
 	sound = 'sound/voice/joe/hysterical.ogg'
@@ -72,3 +84,15 @@
 	sound = 'sound/voice/joe/patience.ogg'
 	say_message = "You are starting to test my patience."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/warning/calm_down
+	key = "calmdown"
+	sound = 'sound/voice/joe/calm_down.ogg'
+	say_message = "Please, calm down."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/warning/hold_still
+	key = "holdstill"
+	sound = 'sound/voice/joe/hold_still.ogg'
+	say_message = "Hold still."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

colonialmarines.dme

@@ -1832,6 +1832,7 @@ s// DM Environment file for colonialmarines.dme.
 #include "code\modules\mob\living\carbon\human\species\working_joe\_species.dm"
 #include "code\modules\mob\living\carbon\human\species\working_joe\farewell.dm"
 #include "code\modules\mob\living\carbon\human\species\working_joe\fire.dm"
+#include "code\modules\mob\living\carbon\human\species\working_joe\damage.dm"
 #include "code\modules\mob\living\carbon\human\species\working_joe\greeting.dm"
 #include "code\modules\mob\living\carbon\human\species\working_joe\notice.dm"
 #include "code\modules\mob\living\carbon\human\species\working_joe\question.dm"