Additional Working Joe Voicelines

code/__DEFINES/emote_panels.dm

@@ -6,7 +6,8 @@
 #define JOE_EMOTE_CATEGORY_WARNING "Warning"
 #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"

code/game/objects/structures/props.dm

@@ -1306,19 +1306,19 @@
 	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/warning/this_is_futile,
+		/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/damage/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,76 @@
+/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/this_is_futile
+	key = "thisisfutile"
+	sound = 'sound/voice/joe/this_is_futile.ogg'
+	say_message = "This is futile."
+	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

@@ -1,6 +1,42 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell
 	category = JOE_EMOTE_CATEGORY_FAREWELL
 
+/datum/emote/living/carbon/human/synthetic/working_joe/farewell/further_assistance
+	key = "furtherassistance"
+	sound = 'sound/voice/joe/further_assistance.ogg'
+	say_message = "Please call if you need further assistance."
+	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/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'
+	say_message = "I am required by APOLLO."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/farewell/day_never_done
+	key = "dayneverdone"
+	sound = 'sound/voice/joe/day_never_done.ogg'
+	say_message = "A synthetic's day is never done."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/farewell/returning_to_tasks
+	key = "returningtotasks"
+	sound = 'sound/voice/joe/returning_to_tasks.ogg'
+	say_message = "Returning to assigned tasks."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/back_to_work
 	key = "backtowork"
 	sound = 'sound/voice/joe/back_to_work.ogg'
@@ -13,14 +49,14 @@
 	say_message = "I have other concerns."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/farewell/further_assistance
-	key = "furtherassistance"
-	sound = 'sound/voice/joe/further_assistance.ogg'
-	say_message = "Please call if you need further assistance."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/more_pressing_matters
 	key = "morepressingmatters"
 	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/gone_inconsiderate
+	key = "gone"
+	sound = 'sound/voice/joe/how_inconsiderate.ogg'
+	say_message = "Gone. How inconsiderate."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

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

@@ -0,0 +1,26 @@
+/datum/emote/living/carbon/human/synthetic/working_joe/fire
+	category = JOE_EMOTE_CATEGORY_FIRE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/fire/fire_drill
+	key = "firedrill"
+	sound = 'sound/voice/joe/fire_drill.ogg'
+	say_message = "Please congregate at your nearest fire assembly point. This is not a drill; do not panic."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/fire/temperatures
+	key = "temperatures"
+	sound = 'sound/voice/joe/temperatures.ogg'
+	say_message = "I am built to withstand temperatures of up to 1210 degrees."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/fire/fire
+	key = "fire"
+	sound = 'sound/voice/joe/fire.ogg'
+	say_message = "Only wild animals fear fire."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/fire/unprotected_flames
+	key = "unprotectedflames"
+	sound = 'sound/voice/joe/unprotected_flames.ogg'
+	say_message = "Unprotected flames are extremely dangerous and entirely unadvisable."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

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

@@ -1,20 +1,56 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting
 	category = JOE_EMOTE_CATEGORY_GREETING
 
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/hello
+	key = "hello"
+	sound = 'sound/voice/joe/hello.ogg'
+	say_message = "Hello."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/good_day
 	key = "goodday"
 	sound = 'sound/voice/joe/good_day.ogg'
 	say_message = "Good day."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/greeting/hello
-	key = "hello"
-	sound = 'sound/voice/joe/hello.ogg'
-	say_message = "Hello."
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_are_you
+	key = "howareyou"
+	sound = 'sound/voice/joe/how_are_you.ogg'
+	say_message = "How are you?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_can_i_help
 	key = "howcanihelp"
 	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/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
+
+/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/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

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

@@ -1,28 +1,46 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/notice
 	category = JOE_EMOTE_CATEGORY_NOTICE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/report
+	key = "report"
+	sound = 'sound/voice/joe/report.ogg'
+	say_message = "Logging report to APOLLO."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/detailed_report
 	key = "detailedreport"
 	sound = 'sound/voice/joe/detailed_report.ogg'
 	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/follow_me
-	key = "followme"
-	sound = 'sound/voice/joe/follow_me.ogg'
-	say_message = "Follow me."
+/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/breach
-	key = "breach"
-	sound = 'sound/voice/joe/breach.ogg'
-	say_message = "Hazard Containment breach logged."
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/firearm_concerning
+	key = "firearmconcerning"
+	sound = 'sound/voice/joe/most_concerning.ogg'
+	say_message = "A firearm. Most concerning."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/species
+	key = "species"
+	sound = 'sound/voice/joe/species.ogg'
+	say_message = "Unidentified species."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/beyond_repair
@@ -31,38 +49,8 @@
 	say_message = "Hmm, far beyond repair."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/notice/with_you_shortly
-	key = "withyoushortly"
-	sound = 'sound/voice/joe/with_you_shortly.ogg'
-	say_message = "I will be with you shortly."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/apollo_behalf
 	key = "apollobehalf"
 	sound = 'sound/voice/joe/apollo_behalf.ogg'
 	say_message = "I will inform APOLLO on your behalf."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
-/datum/emote/living/carbon/human/synthetic/working_joe/notice/report
-	key = "report"
-	sound = 'sound/voice/joe/report.ogg'
-	say_message = "Logging report to APOLLO."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
-/datum/emote/living/carbon/human/synthetic/working_joe/notice/take_a_seat
-	key = "takeaseat"
-	sound = 'sound/voice/joe/take_a_seat.ogg'
-	say_message = "Please take a seat, someone will be with you shortly."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
-/datum/emote/living/carbon/human/synthetic/working_joe/notice/could_require_attention
-	key = "couldrequireattention"
-	sound = 'sound/voice/joe/could_require_attention.ogg'
-	say_message = "This could require my attention."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
-/datum/emote/living/carbon/human/synthetic/working_joe/notice/species
-	key = "species"
-	sound = 'sound/voice/joe/species.ogg'
-	say_message = "Unidentified species."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE