upd

cmss13-devs · Dec 2, 2024 · 1c73111 · 1c73111
1 parent 549bfbb
commit 1c73111
Show file tree

Hide file tree

Showing 77 changed files with 273 additions and 43 deletions.
diff --git a/code/modules/mob/living/carbon/human/species/working_joe/damage.dm b/code/modules/mob/living/carbon/human/species/working_joe/damage.dm
@@ -41,21 +41,37 @@
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/seriously
+	key = "seriously"
+	upp_joe_sound = 'sound/voice/joe/upp_joe/seryozno.ogg'
+	say_message = "Seriously?"
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = UPP_JOE_EMOTE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/damage/dont_recommend
+	key = "dontrecommend"
+	upp_joe_sound = 'sound/voice/joe/upp_joe/ne_recomenduyu.ogg'
+	say_message = "I don't recommend that."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = UPP_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'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/hvatit.ogg'
 	say_message = "Enough."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_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'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/prekratite.ogg'
 	say_message = "Stop that."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/tut_tut
 	key = "tuttut"
@@ -68,7 +84,7 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/ay_ya_yay
 	key = "ayayay"
 	upp_joe_sound = 'sound/voice/joe/upp_joe/ay-ya-yay.ogg'
-	say_message = "Ay ya yay."
+	say_message = "Ay-ya-yay."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	joe_flag = UPP_JOE_EMOTE
 
@@ -84,25 +100,28 @@
 	key = "expensivemistake"
 	sound = 'sound/voice/joe/expensive_mistake.ogg'
 	haz_sound = 'sound/voice/joe/expensive_mistake_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/dorogo_stoit.ogg'
 	say_message = "That was an expensive mistake."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_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'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/ne_otvet.ogg'
 	say_message = "This isn't the answer."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_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'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/ochered.ogg'
 	say_message = "My turn now."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/damage/i_wish_you
 	key = "iwishyou"

diff --git a/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm b/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm
@@ -11,6 +11,7 @@
 	key = "gladweresolved"
 	sound = 'sound/voice/joe/glad_we_resolved.ogg'
 	haz_sound = 'sound/voice/joe/glad_we_resolved_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/radchtomiuladili.ogg'
 	say_message = "I'm glad we resolved this."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
@@ -42,11 +43,20 @@
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/farewell/day_never_done_upp
+	key = "dayneverdone_upp"
+	upp_joe_sound = 'sound/voice/joe/upp_joe/polno_raboti.ogg'
+	say_message = "Androids have tons of work to do."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = UPP_JOE_EMOTE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/returning_to_tasks
 	key = "returningtotasks"
 	sound = 'sound/voice/joe/returning_to_tasks.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/zadacham.ogg'
 	say_message = "Returning to assigned tasks."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/back_to_work
 	key = "backtowork"
@@ -91,9 +101,10 @@
 	key = "gone"
 	sound = 'sound/voice/joe/how_inconsiderate.ogg'
 	haz_sound = 'sound/voice/joe/how_inconsiderate_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/nikogo.ogg'
 	say_message = "Gone. How inconsiderate."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/facility_clear
 	key = "facilityclear"
@@ -114,8 +125,10 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/only_wanted
 	key = "onlywantedto"
 	sound = 'sound/voice/joe/only_wanted_to_help.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/hotel_pomoch.ogg'
 	say_message = "I only wanted to help."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/core_duties
 	key = "coreduties"
@@ -136,11 +149,15 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/time_waste
 	key = "timewasted"
 	sound = 'sound/voice/joe/time_wasted.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/zrya_potratil.ogg'
 	say_message = "Hmmm...Time wasted yet again."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/where_was_i
 	key = "wherewasi"
 	sound = 'sound/voice/joe/where_was_i.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/na_chem_ya.ogg'
 	say_message = "Now, where was I?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
diff --git a/code/modules/mob/living/carbon/human/species/working_joe/fire.dm b/code/modules/mob/living/carbon/human/species/working_joe/fire.dm
@@ -20,9 +20,10 @@
 	key = "fire"
 	sound = 'sound/voice/joe/fire.ogg'
 	haz_sound = 'sound/voice/joe/fire_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/tolko_zveri.ogg'
 	say_message = "Only wild animals fear fire."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/fire/unprotected_flames
 	key = "unprotectedflames"

diff --git a/code/modules/mob/living/carbon/human/species/working_joe/greeting.dm b/code/modules/mob/living/carbon/human/species/working_joe/greeting.dm
@@ -4,10 +4,16 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/hello
 	key = "hello"
 	sound = 'sound/voice/joe/hello.ogg'
-	upp_joe_sound = 'sound/voice/joe/upp_joe/zdravstvuyte.ogg'
 	say_message = "Hello."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/greetings
+	key = "greetings"
+	upp_joe_sound = 'sound/voice/joe/upp_joe/zdravstvuyte.ogg'
+	say_message = "Greetings."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/good_day
 	key = "goodday"
@@ -30,11 +36,18 @@
 	key = "howcanihelp"
 	sound = 'sound/voice/joe/how_can_i_help.ogg'
 	haz_sound = 'sound/voice/joe/how_can_i_help_haz.ogg'
-	upp_joe_sound = 'sound/voice/joe/upp_joe/polezen.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/mogu_pomoch.ogg'
 	say_message = "How can I help you?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_can_i_help_upp
+	key = "howcanihelpupp"
+	upp_joe_sound = 'sound/voice/joe/upp_joe/polezen.ogg'
+	say_message = "How can I be useful to you?"
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = UPP_JOE_EMOTE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/need_to_know
 	key = "needtoknow"
 	sound = 'sound/voice/joe/what_do_you_need.ogg'
@@ -51,27 +64,38 @@
 	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_upp
+	key = "pleasureupp"
+	upp_joe_sound = 'sound/voice/joe/upp_joe/chesti.ogg'
+	say_message = "I don't have the honor of knowing you."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = UPP_JOE_EMOTE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/anybody_there
 	key = "anybodythere"
 	sound = 'sound/voice/joe/is_anybody_there.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/tut_kto.ogg'
 	say_message = "Is anybody there?"
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
 
 /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'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/zdes.ogg'
 	say_message = "Ah, you're still here."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_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'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/yavasiskal.ogg'
 	say_message = "I've been looking for you."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/greeting/is_that_you_help
 	key = "thatyouhelp"

diff --git a/code/modules/mob/living/carbon/human/species/working_joe/notice.dm b/code/modules/mob/living/carbon/human/species/working_joe/notice.dm
@@ -38,8 +38,10 @@
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/investigate_weapon
 	key = "weapon"
 	sound = 'sound/voice/joe/investigate_weapon.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/nado_viesnit.ogg'
 	say_message = "A weapon. I better investigate."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/firearm_concerning
 	key = "firearmconcerning"
@@ -70,6 +72,13 @@
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 	joe_flag = HAZARD_JOE_EMOTE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/notice/unexplained_disturbance_upp
+	key = "disturbanceupp"
+	upp_joe_sound = 'sound/voice/joe/upp_joe/prichina.ogg'
+	say_message = "The most unpleasant, not knowing what the reason is."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = UPP_JOE_EMOTE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/species
 	key = "species"
 	sound = 'sound/voice/joe/species.ogg'
@@ -89,9 +98,10 @@
 	key = "beyondrepair"
 	sound = 'sound/voice/joe/beyond_repair.ogg'
 	haz_sound = 'sound/voice/joe/beyond_repair_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/remontu.ogg'
 	say_message = "Hmm, far beyond repair."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/apollo_behalf
 	key = "apollobehalf"
@@ -112,9 +122,10 @@
 	key = "combustonitsown"
 	sound = 'sound/voice/joe/combust.ogg'
 	haz_sound = 'sound/voice/joe/combust_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/zagorelos.ogg'
 	say_message = "I'll assume that didn't combust all on its own."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/safety_log
 	key = "safetylog"
@@ -161,7 +172,8 @@
 	sound = 'sound/voice/joe/potential_hazard.ogg'
 	upp_joe_sound = 'sound/voice/joe/upp_joe/ugroza.ogg'
 	say_message = "A potential hazard."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE|UPP_JOE_EMOTE
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+	joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/saw_that
 	key = "sawthat"
@@ -182,9 +194,10 @@
 	key = "curious"
 	sound = 'sound/voice/joe/curious.ogg'
 	haz_sound = 'sound/voice/joe/curious_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/lybopitno.ogg'
 	say_message = "Curious."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/thats_odd
 	key = "thatsodd"
@@ -198,17 +211,19 @@
 	key = "usuallyhappen"
 	sound = 'sound/voice/joe/usually_happen.ogg'
 	haz_sound = 'sound/voice/joe/usually_happen_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/ne_bivaet.ogg'
 	say_message = "This doesn't usually happen."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/not_a_toy
 	key = "notatoy"
 	sound = 'sound/voice/joe/not_a_toy.ogg'
 	haz_sound = 'sound/voice/joe/not_a_toy_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/ne_igrushka.ogg'
 	say_message = "That's not a toy."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/made_a_mess
 	key = "madeamess"
@@ -222,22 +237,25 @@
 	key = "sbeenhere"
 	sound = 'sound/voice/joe/been_here.ogg'
 	haz_sound = 'sound/voice/joe/been_here_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/kto_to_byl.ogg'
 	say_message = "Someone's been here."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/as_i_thought
 	key = "asithought"
 	sound = 'sound/voice/joe/as_i_thought.ogg'
 	haz_sound = 'sound/voice/joe/as_i_thought_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/dosadno.ogg'
 	say_message = "As I thought. Unfortunate."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/energy_surge
 	key = "energysurge"
 	sound = 'sound/voice/joe/energy_surge.ogg'
 	haz_sound = 'sound/voice/joe/energy_surge_haz.ogg'
+	upp_joe_sound = 'sound/voice/joe/upp_joe/skachok.ogg'
 	say_message = "Energy surge detected."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE