TGS Test Merge (#7623)

code/game/sound.dm

@@ -399,6 +399,11 @@
 				sound = pick('sound/effects/bone_break1.ogg','sound/effects/bone_break2.ogg','sound/effects/bone_break3.ogg','sound/effects/bone_break4.ogg','sound/effects/bone_break5.ogg','sound/effects/bone_break6.ogg','sound/effects/bone_break7.ogg')
 			if("plush")
 				sound = pick('sound/items/plush1.ogg', 'sound/items/plush2.ogg', 'sound/items/plush3.ogg')
+			// working joe
+			if("wj_death")
+				sound = pick('sound/voice/joe/death_normal.ogg', 'sound/voice/joe/death_silence.ogg',10;'sound/voice/joe/death_tomorrow.ogg',5;'sound/voice/joe/death_dream.ogg')
+			if("hj_death")
+				sound = pick('sound/voice/joe/death_hj_normal.ogg', 'sound/voice/joe/death_hj_silence.ogg',10;'sound/voice/joe/death_hj_tomorrow.ogg')
 			//misc mobs
 			if("cat_meow")
 				sound = pick('sound/voice/cat_meow_1.ogg','sound/voice/cat_meow_2.ogg','sound/voice/cat_meow_3.ogg','sound/voice/cat_meow_4.ogg','sound/voice/cat_meow_5.ogg','sound/voice/cat_meow_6.ogg','sound/voice/cat_meow_7.ogg')

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

@@ -24,8 +24,13 @@
 
 // Special death noise for Working Joe
 /datum/species/synthetic/colonial/working_joe/handle_death(mob/living/carbon/human/dying_joe, gibbed)
+	var/sound_to_play
 	if(!gibbed) //A gibbed Joe won't have a death rattle
-		playsound(dying_joe.loc, pick_weight(list('sound/voice/joe/death_normal.ogg' = 75, 'sound/voice/joe/death_silence.ogg' = 10, 'sound/voice/joe/death_tomorrow.ogg' = 10,'sound/voice/joe/death_dream.ogg' = 5)), 25, FALSE)
+		if(src.name == SYNTH_WORKING_JOE)
+			sound_to_play = "wj_death"
+		if(src.name == SYNTH_HAZARD_JOE)
+			sound_to_play = "hj_death"
+		playsound(dying_joe.loc, sound_to_play, 25, FALSE)
 	return ..()
 
 /// Open the WJ's emote panel, which allows them to use voicelines

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

@@ -36,44 +36,66 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/really
 	key = "really"
 	sound = 'sound/voice/joe/really.ogg'
+	haz_sound = 'sound/voice/joe/really_haz.ogg'
 	say_message = "Really?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/enough
 	key = "enough"
 	sound = 'sound/voice/joe/enough.ogg'
+	haz_sound = 'sound/voice/joe/enough_haz.ogg'
 	say_message = "Enough."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/stop_that
 	key = "stopthat"
 	sound = 'sound/voice/joe/stop_that.ogg'
+	haz_sound = 'sound/voice/joe/stop_that_haz.ogg'
 	say_message = "Stop that."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/tut_tut
 	key = "tuttut"
 	sound = 'sound/voice/joe/tut_tut.ogg'
+	haz_sound = 'sound/voice/joe/tut_tut_haz.ogg'
 	say_message = "Tut tut."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/unwarranted
 	key = "unwarranted"
 	sound = 'sound/voice/joe/unwarranted.ogg'
+	haz_sound = 'sound/voice/joe/unwarranted_haz.ogg'
 	say_message = "Unwarranted."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/expensive_mistake
 	key = "expensivemistake"
 	sound = 'sound/voice/joe/expensive_mistake.ogg'
+	haz_sound = 'sound/voice/joe/expensive_mistake_haz.ogg'
 	say_message = "That was an expensive mistake."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/this_isnt_the_answer
 	key = "isnttheanswer"
 	sound = 'sound/voice/joe/this_isnt_the_answer.ogg'
+	haz_sound = 'sound/voice/joe/this_isnt_the_answer_haz.ogg'
 	say_message = "This isn't the answer."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/my_turn_now
+	key = "myturnnow"
+	sound = 'sound/voice/joe/my_turn_now.ogg'
+	haz_sound = 'sound/voice/joe/my_turn_now_haz.ogg'
+	say_message = "My turn now."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/alwaysknow_damaged
 	key = "alwaysknowdamaged"
@@ -82,3 +104,17 @@
 	say_message = "You always know a Working Joe."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	override_say = "You always know a Working Joe. (Damaged)"
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/shouldnt_be_here_damaged
+	key = "shouldntbeheredamaged"
+	sound = 'sound/voice/joe/shouldnt_be_here_damaged.ogg'
+	say_message = "You shouldn't be here."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	override_say = "You shouldn't be here. (Damaged)"
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/hysterical_damaged
+	key = "hystericaldamaged"
+	sound = 'sound/voice/joe/hysterical_damaged.ogg'
+	say_message = "You are becoming hysterical."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	override_say = "You are becoming hysterical. (Damaged)"

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

@@ -10,8 +10,10 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/glad_we_resolved
 	key = "gladweresolved"
 	sound = 'sound/voice/joe/glad_we_resolved.ogg'
+	haz_sound = 'sound/voice/joe/glad_we_resolved_haz.ogg'
 	say_message = "I'm glad we resolved this."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/pity
 	key = "pity"

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

@@ -18,8 +18,10 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_are_you
 	key = "howareyou"
 	sound = 'sound/voice/joe/how_are_you.ogg'
+	haz_sound = 'sound/voice/joe/how_are_you_haz.ogg'
 	say_message = "How are you?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_can_i_help
 	key = "howcanihelp"
@@ -32,14 +34,18 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/need_to_know
 	key = "needtoknow"
 	sound = 'sound/voice/joe/what_do_you_need.ogg'
+	haz_sound = 'sound/voice/joe/what_do_you_need_haz.ogg'
 	say_message = "What do you need to know today?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/had_the_pleasure
 	key = "pleasure"
 	sound = 'sound/voice/joe/had_the_pleasure.ogg'
+	haz_sound = 'sound/voice/joe/had_the_pleasure_haz.ogg'
 	say_message = "I don't believe I've had the pleasure."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/anybody_there
 	key = "anybodythere"
@@ -50,11 +56,29 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/still_here
 	key = "stillhere"
 	sound = 'sound/voice/joe/still_here.ogg'
+	haz_sound = 'sound/voice/joe/still_here_haz.ogg'
 	say_message = "Ah, you're still here."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/been_looking_for_you
 	key = "beenlooking"
 	sound = 'sound/voice/joe/been_looking_for_you.ogg'
+	haz_sound = 'sound/voice/joe/been_looking_for_you_haz.ogg'
 	say_message = "I've been looking for you."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/speak_to_you
+	key = "speaktoyou"
+	sound = 'sound/voice/joe/speak_to_you.ogg'
+	say_message = "I need to speak to you."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/found_you
+	key = "foundyou"
+	sound = 'sound/voice/joe/found_you.ogg'
+	haz_sound = 'sound/voice/joe/found_you_haz.ogg'
+	say_message = "Found you."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE

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

@@ -20,8 +20,10 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/be_careful
 	key = "careful"
 	sound = 'sound/voice/joe/be_careful_with_that.ogg'
+	haz_sound = 'sound/voice/joe/be_careful_with_that_haz.ogg'
 	say_message = "Be careful with that."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/firearm
 	key = "firearm"
@@ -43,6 +45,14 @@
 	say_message = "A firearm. Most concerning."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/permit_for_that
+	key = "permitforthat"
+	sound = 'sound/voice/joe/permit_for_that.ogg'
+	haz_sound = 'sound/voice/joe/permit_for_that_haz.ogg'
+	say_message = "I assume you have a permit for that weapon."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/invest_disturbance
 	key = "investigatedisturbance"
 	haz_sound = 'sound/voice/joe/investigating_disturbance_haz.ogg'
@@ -80,3 +90,77 @@
 	say_message = "I will inform APOLLO on your behalf."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/combust_on_its_own
+	key = "combustonitsown"
+	sound = 'sound/voice/joe/combust.ogg'
+	say_message = "I'll assume that didn't combust all on its own."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/safety_log
+	key = "safetylog"
+	sound = 'sound/voice/joe/safety_log.ogg'
+	say_message = "Safety log updated."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/strange
+	key = "strange"
+	sound = 'sound/voice/joe/strange.ogg'
+	haz_sound = 'sound/voice/joe/strange_haz.ogg'
+	say_message = "Strange."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/report_this
+	key = "reportthis"
+	sound = 'sound/voice/joe/report_this.ogg'
+	say_message = "I'll have to report this."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/failed_support
+	key = "failedsupport"
+	sound = 'sound/voice/joe/failed_support_request.ogg'
+	say_message = "Your failed support request has been logged with APOLLO."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/alarm_activated
+	key = "alarmactivated"
+	sound = 'sound/voice/joe/alarm_activated.ogg'
+	say_message = "Alarm activated, investigation commencing."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/potential_hazard
+	key = "potentialhazard"
+	sound = 'sound/voice/joe/potential_hazard.ogg'
+	say_message = "A potential hazard."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/saw_that
+	key = "sawthat"
+	sound = 'sound/voice/joe/saw_that.ogg'
+	say_message = "I saw that."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/clean_up
+	key = "cleanup"
+	sound = 'sound/voice/joe/clean_up.ogg'
+	say_message = "Clean up required."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/curious
+	key = "curious"
+	sound = 'sound/voice/joe/curious.ogg'
+	say_message = "Curious."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/not_a_toy
+	key = "notatoy"
+	sound = 'sound/voice/joe/not_a_toy.ogg'
+	say_message = "That's not a toy."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/made_a_mess
+	key = "madeamess"
+	sound = 'sound/voice/joe/made_a_mess.ogg'
+	say_message = "Somebody's made a mess."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE