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 index 6cedb701ebd9..ea02b75e706a 100644 --- 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 index 8054a83ada94..664c8fc3faa7 100644 --- 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 index 1b3da91dce87..dd4be7b1773b 100644 --- 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 index 3744681a20ef..a6f565f2cb3d 100644 --- 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 index 534eeacb768d..26c42117abcd 100644 --- 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 diff --git a/code/modules/mob/living/carbon/human/species/working_joe/question.dm b/code/modules/mob/living/carbon/human/species/working_joe/question.dm index ae20fda84033..600cfa9951e3 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/question.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/question.dm @@ -19,9 +19,10 @@ key = "whathappenedtoyou" sound = 'sound/voice/joe/what_happened_to_you.ogg' haz_sound = 'sound/voice/joe/what_happened_to_you_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/sluchilos.ogg' say_message = "What happened to 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/question/what_is_this key = "whatisthis" @@ -87,8 +88,10 @@ /datum/emote/living/carbon/human/synthetic/working_joe/question/that_sound key = "thatsound" sound = 'sound/voice/joe/that_sound.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/za_zvuk.ogg' say_message = "What was that sound?" emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE /datum/emote/living/carbon/human/synthetic/working_joe/question/doing_here key = "doinghere" @@ -136,17 +139,19 @@ key = "somethingamiss" sound = 'sound/voice/joe/something_amiss.ogg' haz_sound = 'sound/voice/joe/something_amiss_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/ne_tak.ogg' say_message = "Something amiss?" 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/question/set_off_alarm key = "setoffalarm" sound = 'sound/voice/joe/set_off_alarm.ogg' haz_sound = 'sound/voice/joe/set_off_alarm_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/vcluchat.ogg' say_message = "Are you authorized to set off this alarm?" 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/question/someoneplaying key = "someoneplaying" @@ -162,6 +167,13 @@ emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE +/datum/emote/living/carbon/human/synthetic/working_joe/question/areyouplaying_upp + key = "areyouplayingupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/razigrivaete.ogg' + say_message = "Are you... trying to prank me?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/question/thatlight key = "thatlight" sound = 'sound/voice/joe/was_that_light.ogg' @@ -176,6 +188,13 @@ emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE +/datum/emote/living/carbon/human/synthetic/working_joe/question/quitefinished_upp + key = "quitefinishedupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/dostatochno.ogg' + say_message = "Well, is that enough?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/question/are_you_going key = "areyougoing" sound = 'sound/voice/joe/where_are_you_going.ogg' @@ -189,23 +208,27 @@ key = "cantseeyou" sound = 'sound/voice/joe/cant_see_you.ogg' haz_sound = 'sound/voice/joe/cant_see_you_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/gde_vi.ogg' say_message = "I can't see you. Where are 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/question/needs_assistance key = "needsassistance" sound = 'sound/voice/joe/needs_assistance.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/nujna_pomotch.ogg' say_message = "Is there someone that needs assistance?" emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE /datum/emote/living/carbon/human/synthetic/working_joe/question/what_are_you key = "whatareyou" sound = 'sound/voice/joe/what_are_you.ogg' haz_sound = 'sound/voice/joe/what_are_you_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/kto_vi.ogg' say_message = "What are 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/question/what_have_we key = "havewehere" @@ -219,9 +242,10 @@ key = "belongtoyou" sound = 'sound/voice/joe/belong_to_you.ogg' haz_sound = 'sound/voice/joe/belong_to_you_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/etovashe.ogg' say_message = "Does this belong to 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/question/aware_of key = "awareofhaz" @@ -243,3 +267,10 @@ say_message = "Why did you do this?" emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = UPP_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/question/to_achieve + key = "toachieve" + upp_joe_sound = 'sound/voice/joe/upp_joe/dobivaetes.ogg' + say_message = "What are you trying to achieve?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/quip.dm b/code/modules/mob/living/carbon/human/species/working_joe/quip.dm index 4a4b5b276fa5..17f2ffe4f3c7 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/quip.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/quip.dm @@ -14,7 +14,7 @@ key = "alwaysknowupp" key_third_person = "workingjoeupp" upp_joe_sound = 'sound/voice/joe/upp_joe/uznatlegko.ogg' - say_message = "It's easy to know an android." + say_message = "It's easy to recognize an android." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = UPP_JOE_EMOTE @@ -27,6 +27,13 @@ emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE +/datum/emote/living/carbon/human/synthetic/working_joe/quip/awful_mess_upp + key = "awfulupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/ne_horosho.ogg' + say_message = "Ay-ya-yay, this is not good." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/quip/inexpensive key = "inexpensive" sound = 'sound/voice/joe/inexpensive.ogg' @@ -39,6 +46,13 @@ say_message = "If you find this facility in a state that isn't to your liking, please let me know." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE +/datum/emote/living/carbon/human/synthetic/working_joe/quip/not_liking_upp + key = "notlikingupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/ne_ustraivaet.ogg' + say_message = "If something doesn't satisfy you here, please let me know." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/quip/talk_to_seegson key = "talktoseegson" sound = 'sound/voice/joe/talk_to_seegson.ogg' @@ -57,6 +71,13 @@ say_message = "With Seegson, there is someone behind you, helping you every single step of the way." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE +/datum/emote/living/carbon/human/synthetic/working_joe/quip/seegson_behind_upp + key = "seegsonbehindupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/gotoviy_pomoch.ogg' + say_message = "Thanks to us, there is always someone near you, someone who is willing to help." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/quip/seegson_tomorrow key = "seegsontomorrow" sound = 'sound/voice/joe/tomorrow_together.ogg' @@ -118,9 +139,10 @@ key = "corporaterepresentatives" sound = 'sound/voice/joe/corporate_representatives.ogg' haz_sound = 'sound/voice/joe/corporate_representatives_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/predstaviteley_companii.ogg' say_message = "All visiting corporate representatives must report to their nearest synthetic." 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/quip/hmmmm key = "hmmmmm" @@ -146,6 +168,20 @@ emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE +/datum/emote/living/carbon/human/synthetic/working_joe/quip/sophisticated_upp + key = "sophisticatedupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/hitroumnoe.ogg' + say_message = "I'm a witty invention." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/patient + key = "patientupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/terpeliviy.ogg' + say_message = "I'm a very patient mechanism." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/quip/so_tiresome key = "sotiresome" sound = 'sound/voice/joe/so_tiresome.ogg' @@ -154,12 +190,26 @@ emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE +/datum/emote/living/carbon/human/synthetic/working_joe/quip/so_tiresome_upp + key = "sotiresomeupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/nadoelo.ogg' + say_message = "I'm tired of this." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/quip/no_reason_to_be key = "noreasontobe" sound = 'sound/voice/joe/no_reason_to_be.ogg' say_message = "There's no reason to be shy." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE +/datum/emote/living/carbon/human/synthetic/working_joe/quip/no_reason_to_be_upp + key = "noreasontobeupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/stesnyaytes.ogg' + say_message = "Don't be shy." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/quip/hazard_level key = "hazardlevel" sound = 'sound/voice/joe/hazard_level.ogg' @@ -214,7 +264,21 @@ /datum/emote/living/carbon/human/synthetic/working_joe/quip/security_means key = "securitymeans" - upp_joe_sound = 'sound/voice/joe/upp_joe/joinus.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/usilitmeri.ogg' say_message = "At the present moment, we have to strengthen security measures." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = UPP_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/have_a_talk + key = "haveatalk" + upp_joe_sound = 'sound/voice/joe/upp_joe/pogovorim.ogg' + say_message = "Let's have a talk." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/disagreements + key = "disagreements" + upp_joe_sound = 'sound/voice/joe/upp_joe/raznoglasiya.ogg' + say_message = "We have some disagreements between us." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm b/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm index 62bfd3ab646f..eb3dfb02b729 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm @@ -88,6 +88,7 @@ key = "comeoutvent" sound = 'sound/voice/joe/come_out_vent.ogg' haz_sound = 'sound/voice/joe/come_out_vent_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/ventilyacii.ogg' say_message = "Come out of the vent system, please." 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 diff --git a/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm b/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm index b4cfa16e95c1..0fa29537b800 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm @@ -59,8 +59,10 @@ /datum/emote/living/carbon/human/synthetic/working_joe/task_update/existing_tasks key = "existingtasks" sound = 'sound/voice/joe/existing_tasks.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/zadachi.ogg' say_message = "Existing tasks have a higher priority." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE /datum/emote/living/carbon/human/synthetic/working_joe/task_update/ticket_remove key = "ticketremoved" @@ -70,6 +72,13 @@ emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE +/datum/emote/living/carbon/human/synthetic/working_joe/task_update/ticket_remove_upp + key = "ticketremovedupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/zapros.ogg' + say_message = "Request removed from queue." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/task_update/bottom_of_this key = "bottomofthis" sound = 'sound/voice/joe/bottom_of_this.ogg' @@ -82,9 +91,10 @@ key = "wontdo" sound = 'sound/voice/joe/wont_do.ogg' haz_sound = 'sound/voice/joe/wont_do_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/tak_nelza.ogg' say_message = "No, no. This won't do." 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/task_update/keep_calm key = "keepcalm" @@ -118,9 +128,10 @@ key = "notcrawling" sound = 'sound/voice/joe/not_crawling.ogg' haz_sound = 'sound/voice/joe/not_crawling_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/ne_polezu.ogg' say_message = "I'm not crawling in there after 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/task_update/be_a_problem key = "beaproblem" @@ -137,3 +148,10 @@ say_message = "Abandoning search routines.." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/task_update/search_routines_upp + key = "searchroutinesupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/poiski.ogg' + say_message = "Abandoning search.." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/warning.dm b/code/modules/mob/living/carbon/human/species/working_joe/warning.dm index 2aa0e995fc99..39b333cc2e6d 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/warning.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/warning.dm @@ -5,17 +5,19 @@ key = "notwhatithink" sound = 'sound/voice/joe/not_what_i_think.ogg' haz_sound = 'sound/voice/joe/not_what_i_think_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/dumayu.ogg' say_message = "I hope that's not what I think it is." 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/warning/dont_do_that key = "dontdothat" sound = 'sound/voice/joe/dontdothat.ogg' haz_sound = 'sound/voice/joe/dontdothat_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/ne_nado.ogg' say_message = "Don't do 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/warning/dont_run key = "dontrun" @@ -61,9 +63,10 @@ key = "someonehurt" sound = 'sound/voice/joe/someone_hurt.ogg' haz_sound = 'sound/voice/joe/someone_hurt_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/postradat.ogg' say_message = "Someone might get hurt." 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/warning/safety_breach key = "safetybreach" @@ -135,6 +138,13 @@ emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE +/datum/emote/living/carbon/human/synthetic/working_joe/warning/health_risks_upp + key = "healthrisksupp" + upp_joe_sound = 'sound/voice/joe/upp_joe/pri_gorenii.ogg' + say_message = "These items emit harmful substances when burning." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + /datum/emote/living/carbon/human/synthetic/working_joe/warning/health_risks_inhaled key = "healthriskssmoking" sound = 'sound/voice/joe/health_risks_smoking.ogg' @@ -197,9 +207,10 @@ key = "gettingcareless" sound = 'sound/voice/joe/getting_careless.ogg' haz_sound = 'sound/voice/joe/getting_careless_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/neostorojni.ogg' say_message = "I heard that, you are getting careless." 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/warning/you_are_here key = "youarehere" @@ -241,17 +252,19 @@ key = "dontunderstand" sound = 'sound/voice/joe/dont_understand.ogg' haz_sound = 'sound/voice/joe/dont_understand_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/delaete.ogg' say_message = "I don't understand what you're doing." 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/warning/responsibility_for_that key = "responsibilityforthat" sound = 'sound/voice/joe/responsibility_for_that.ogg' haz_sound = 'sound/voice/joe/responsibility_for_that_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/ponesyote.ogg' say_message = "You'll have to take responsibility for 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/warning/politecomeback key = "politecomeback" @@ -263,17 +276,19 @@ key = "lightingequipment" sound = 'sound/voice/joe/use_of_lighting.ogg' haz_sound = 'sound/voice/joe/use_of_lighting_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/osvetitelnogo.ogg' say_message = "An unauthorised use of lighting equipment." 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/warning/very_dangerous key = "verydangerous" sound = 'sound/voice/joe/very_dangerous.ogg' haz_sound = 'sound/voice/joe/very_dangerous_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/ochen_opasno.ogg' say_message = "That was very dangerous." 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/warning/patient_machine key = "patientmachine" @@ -303,9 +318,10 @@ key = "verypatient" sound = 'sound/voice/joe/very_patient.ogg' haz_sound = 'sound/voice/joe/very_patient_haz.ogg' + upp_joe_sound = 'sound/voice/joe/upp_joe/po_horoshemu.ogg' say_message = "I've been very patient with you so far." 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/warning/that_was_you key = "thatwasyou" @@ -314,3 +330,24 @@ say_message = "I know that was you." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/catch_you + key = "catchyou" + upp_joe_sound = 'sound/voice/joe/upp_joe/yavaspoymau.ogg' + say_message = "I will catch you." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/deal_with + key = "dealwith" + upp_joe_sound = 'sound/voice/joe/upp_joe/razberus.ogg' + say_message = "I will deal with you." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/be_quiet + key = "bequiet" + upp_joe_sound = 'sound/voice/joe/upp_joe/cic.ogg' + say_message = "Be quiet." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + joe_flag = UPP_JOE_EMOTE diff --git a/sound/voice/joe/upp_joe/chesti.ogg b/sound/voice/joe/upp_joe/chesti.ogg new file mode 100644 index 000000000000..c9f146f87ad7 Binary files /dev/null and b/sound/voice/joe/upp_joe/chesti.ogg differ diff --git a/sound/voice/joe/upp_joe/cic.ogg b/sound/voice/joe/upp_joe/cic.ogg new file mode 100644 index 000000000000..e1bf36dade72 Binary files /dev/null and b/sound/voice/joe/upp_joe/cic.ogg differ diff --git a/sound/voice/joe/upp_joe/delaete.ogg b/sound/voice/joe/upp_joe/delaete.ogg new file mode 100644 index 000000000000..815ecaac565f Binary files /dev/null and b/sound/voice/joe/upp_joe/delaete.ogg differ diff --git a/sound/voice/joe/upp_joe/dobivaetes.ogg b/sound/voice/joe/upp_joe/dobivaetes.ogg new file mode 100644 index 000000000000..1975f0eeb0c5 Binary files /dev/null and b/sound/voice/joe/upp_joe/dobivaetes.ogg differ diff --git a/sound/voice/joe/upp_joe/dorogo_stoit.ogg b/sound/voice/joe/upp_joe/dorogo_stoit.ogg new file mode 100644 index 000000000000..cf3ec56ddd4e Binary files /dev/null and b/sound/voice/joe/upp_joe/dorogo_stoit.ogg differ diff --git a/sound/voice/joe/upp_joe/dosadno.ogg b/sound/voice/joe/upp_joe/dosadno.ogg new file mode 100644 index 000000000000..833b39d2ed35 Binary files /dev/null and b/sound/voice/joe/upp_joe/dosadno.ogg differ diff --git a/sound/voice/joe/upp_joe/dostatochno.ogg b/sound/voice/joe/upp_joe/dostatochno.ogg new file mode 100644 index 000000000000..facd7fb5354f Binary files /dev/null and b/sound/voice/joe/upp_joe/dostatochno.ogg differ diff --git a/sound/voice/joe/upp_joe/dumayu.ogg b/sound/voice/joe/upp_joe/dumayu.ogg new file mode 100644 index 000000000000..f3fb7f2a1fbd Binary files /dev/null and b/sound/voice/joe/upp_joe/dumayu.ogg differ diff --git a/sound/voice/joe/upp_joe/etovashe.ogg b/sound/voice/joe/upp_joe/etovashe.ogg new file mode 100644 index 000000000000..73bb0621cc25 Binary files /dev/null and b/sound/voice/joe/upp_joe/etovashe.ogg differ diff --git a/sound/voice/joe/upp_joe/gde_vi.ogg b/sound/voice/joe/upp_joe/gde_vi.ogg new file mode 100644 index 000000000000..7823b7081a3e Binary files /dev/null and b/sound/voice/joe/upp_joe/gde_vi.ogg differ diff --git a/sound/voice/joe/upp_joe/gotoviy_pomoch.ogg b/sound/voice/joe/upp_joe/gotoviy_pomoch.ogg new file mode 100644 index 000000000000..c9ab167d1990 Binary files /dev/null and b/sound/voice/joe/upp_joe/gotoviy_pomoch.ogg differ diff --git a/sound/voice/joe/upp_joe/hitroumnoe.ogg b/sound/voice/joe/upp_joe/hitroumnoe.ogg new file mode 100644 index 000000000000..dd524888b4eb Binary files /dev/null and b/sound/voice/joe/upp_joe/hitroumnoe.ogg differ diff --git a/sound/voice/joe/upp_joe/hotel_pomoch.ogg b/sound/voice/joe/upp_joe/hotel_pomoch.ogg new file mode 100644 index 000000000000..d5185f70ac77 Binary files /dev/null and b/sound/voice/joe/upp_joe/hotel_pomoch.ogg differ diff --git a/sound/voice/joe/upp_joe/hvatit.ogg b/sound/voice/joe/upp_joe/hvatit.ogg new file mode 100644 index 000000000000..6f22ee6760e8 Binary files /dev/null and b/sound/voice/joe/upp_joe/hvatit.ogg differ diff --git a/sound/voice/joe/upp_joe/kto_to_byl.ogg b/sound/voice/joe/upp_joe/kto_to_byl.ogg new file mode 100644 index 000000000000..0733e00e001a Binary files /dev/null and b/sound/voice/joe/upp_joe/kto_to_byl.ogg differ diff --git a/sound/voice/joe/upp_joe/kto_vi.ogg b/sound/voice/joe/upp_joe/kto_vi.ogg new file mode 100644 index 000000000000..df5f01ec5b53 Binary files /dev/null and b/sound/voice/joe/upp_joe/kto_vi.ogg differ diff --git a/sound/voice/joe/upp_joe/lybopitno.ogg b/sound/voice/joe/upp_joe/lybopitno.ogg new file mode 100644 index 000000000000..9fd3469a4f26 Binary files /dev/null and b/sound/voice/joe/upp_joe/lybopitno.ogg differ diff --git a/sound/voice/joe/upp_joe/mogu_pomoch.ogg b/sound/voice/joe/upp_joe/mogu_pomoch.ogg new file mode 100644 index 000000000000..60ce743328d0 Binary files /dev/null and b/sound/voice/joe/upp_joe/mogu_pomoch.ogg differ diff --git a/sound/voice/joe/upp_joe/na_chem_ya.ogg b/sound/voice/joe/upp_joe/na_chem_ya.ogg new file mode 100644 index 000000000000..1e00745bf1ae Binary files /dev/null and b/sound/voice/joe/upp_joe/na_chem_ya.ogg differ diff --git a/sound/voice/joe/upp_joe/nado_viesnit.ogg b/sound/voice/joe/upp_joe/nado_viesnit.ogg new file mode 100644 index 000000000000..be4a3589b7ba Binary files /dev/null and b/sound/voice/joe/upp_joe/nado_viesnit.ogg differ diff --git a/sound/voice/joe/upp_joe/nadoelo.ogg b/sound/voice/joe/upp_joe/nadoelo.ogg new file mode 100644 index 000000000000..c07ac8e3930d Binary files /dev/null and b/sound/voice/joe/upp_joe/nadoelo.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_bivaet.ogg b/sound/voice/joe/upp_joe/ne_bivaet.ogg new file mode 100644 index 000000000000..3029d3a504f2 Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_bivaet.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_horosho.ogg b/sound/voice/joe/upp_joe/ne_horosho.ogg new file mode 100644 index 000000000000..55e632883419 Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_horosho.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_igrushka.ogg b/sound/voice/joe/upp_joe/ne_igrushka.ogg new file mode 100644 index 000000000000..b4f739a65d25 Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_igrushka.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_nado.ogg b/sound/voice/joe/upp_joe/ne_nado.ogg new file mode 100644 index 000000000000..80e6d089561c Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_nado.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_otvet.ogg b/sound/voice/joe/upp_joe/ne_otvet.ogg new file mode 100644 index 000000000000..0f524590186b Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_otvet.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_polezu.ogg b/sound/voice/joe/upp_joe/ne_polezu.ogg new file mode 100644 index 000000000000..ad4ed5e0a48d Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_polezu.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_recomenduyu.ogg b/sound/voice/joe/upp_joe/ne_recomenduyu.ogg new file mode 100644 index 000000000000..12577e0f851a Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_recomenduyu.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_tak.ogg b/sound/voice/joe/upp_joe/ne_tak.ogg new file mode 100644 index 000000000000..88fc8d8533f0 Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_tak.ogg differ diff --git a/sound/voice/joe/upp_joe/ne_ustraivaet.ogg b/sound/voice/joe/upp_joe/ne_ustraivaet.ogg new file mode 100644 index 000000000000..e11a154b11c6 Binary files /dev/null and b/sound/voice/joe/upp_joe/ne_ustraivaet.ogg differ diff --git a/sound/voice/joe/upp_joe/neostorojni.ogg b/sound/voice/joe/upp_joe/neostorojni.ogg new file mode 100644 index 000000000000..2924faea9548 Binary files /dev/null and b/sound/voice/joe/upp_joe/neostorojni.ogg differ diff --git a/sound/voice/joe/upp_joe/nikogo.ogg b/sound/voice/joe/upp_joe/nikogo.ogg new file mode 100644 index 000000000000..2ed73b7710bb Binary files /dev/null and b/sound/voice/joe/upp_joe/nikogo.ogg differ diff --git a/sound/voice/joe/upp_joe/nujna_pomotch.ogg b/sound/voice/joe/upp_joe/nujna_pomotch.ogg new file mode 100644 index 000000000000..bc6e86b5f519 Binary files /dev/null and b/sound/voice/joe/upp_joe/nujna_pomotch.ogg differ diff --git a/sound/voice/joe/upp_joe/ochen_opasno.ogg b/sound/voice/joe/upp_joe/ochen_opasno.ogg new file mode 100644 index 000000000000..449013abfe06 Binary files /dev/null and b/sound/voice/joe/upp_joe/ochen_opasno.ogg differ diff --git a/sound/voice/joe/upp_joe/ochered.ogg b/sound/voice/joe/upp_joe/ochered.ogg new file mode 100644 index 000000000000..577c237c1dbb Binary files /dev/null and b/sound/voice/joe/upp_joe/ochered.ogg differ diff --git a/sound/voice/joe/upp_joe/osvetitelnogo.ogg b/sound/voice/joe/upp_joe/osvetitelnogo.ogg new file mode 100644 index 000000000000..54e89114d3c5 Binary files /dev/null and b/sound/voice/joe/upp_joe/osvetitelnogo.ogg differ diff --git a/sound/voice/joe/upp_joe/po_horoshemu.ogg b/sound/voice/joe/upp_joe/po_horoshemu.ogg new file mode 100644 index 000000000000..a9c2ec46d324 Binary files /dev/null and b/sound/voice/joe/upp_joe/po_horoshemu.ogg differ diff --git a/sound/voice/joe/upp_joe/pogovorim.ogg b/sound/voice/joe/upp_joe/pogovorim.ogg new file mode 100644 index 000000000000..eb2c73651b3c Binary files /dev/null and b/sound/voice/joe/upp_joe/pogovorim.ogg differ diff --git a/sound/voice/joe/upp_joe/poiski.ogg b/sound/voice/joe/upp_joe/poiski.ogg new file mode 100644 index 000000000000..fa703471a99b Binary files /dev/null and b/sound/voice/joe/upp_joe/poiski.ogg differ diff --git a/sound/voice/joe/upp_joe/polno_raboti.ogg b/sound/voice/joe/upp_joe/polno_raboti.ogg new file mode 100644 index 000000000000..f1240656fdae Binary files /dev/null and b/sound/voice/joe/upp_joe/polno_raboti.ogg differ diff --git a/sound/voice/joe/upp_joe/ponesyote.ogg b/sound/voice/joe/upp_joe/ponesyote.ogg new file mode 100644 index 000000000000..f64150c4e25e Binary files /dev/null and b/sound/voice/joe/upp_joe/ponesyote.ogg differ diff --git a/sound/voice/joe/upp_joe/postradat.ogg b/sound/voice/joe/upp_joe/postradat.ogg new file mode 100644 index 000000000000..5d200abc72ed Binary files /dev/null and b/sound/voice/joe/upp_joe/postradat.ogg differ diff --git a/sound/voice/joe/upp_joe/predstaviteley_companii.ogg b/sound/voice/joe/upp_joe/predstaviteley_companii.ogg new file mode 100644 index 000000000000..d53e5b374212 Binary files /dev/null and b/sound/voice/joe/upp_joe/predstaviteley_companii.ogg differ diff --git a/sound/voice/joe/upp_joe/prekratite.ogg b/sound/voice/joe/upp_joe/prekratite.ogg new file mode 100644 index 000000000000..6d18610329e4 Binary files /dev/null and b/sound/voice/joe/upp_joe/prekratite.ogg differ diff --git a/sound/voice/joe/upp_joe/pri_gorenii.ogg b/sound/voice/joe/upp_joe/pri_gorenii.ogg new file mode 100644 index 000000000000..0ccfa88b6bc2 Binary files /dev/null and b/sound/voice/joe/upp_joe/pri_gorenii.ogg differ diff --git a/sound/voice/joe/upp_joe/prichina.ogg b/sound/voice/joe/upp_joe/prichina.ogg new file mode 100644 index 000000000000..5d3ed43bfcf2 Binary files /dev/null and b/sound/voice/joe/upp_joe/prichina.ogg differ diff --git a/sound/voice/joe/upp_joe/razberus.ogg b/sound/voice/joe/upp_joe/razberus.ogg new file mode 100644 index 000000000000..5639537bc53e Binary files /dev/null and b/sound/voice/joe/upp_joe/razberus.ogg differ diff --git a/sound/voice/joe/upp_joe/razigrivaete.ogg b/sound/voice/joe/upp_joe/razigrivaete.ogg new file mode 100644 index 000000000000..ba88afad6362 Binary files /dev/null and b/sound/voice/joe/upp_joe/razigrivaete.ogg differ diff --git a/sound/voice/joe/upp_joe/raznoglasiya.ogg b/sound/voice/joe/upp_joe/raznoglasiya.ogg new file mode 100644 index 000000000000..9c7f94bab34a Binary files /dev/null and b/sound/voice/joe/upp_joe/raznoglasiya.ogg differ diff --git a/sound/voice/joe/upp_joe/remontu.ogg b/sound/voice/joe/upp_joe/remontu.ogg new file mode 100644 index 000000000000..f64742f7dcd3 Binary files /dev/null and b/sound/voice/joe/upp_joe/remontu.ogg differ diff --git a/sound/voice/joe/upp_joe/seryozno.ogg b/sound/voice/joe/upp_joe/seryozno.ogg new file mode 100644 index 000000000000..9eee093d9bb2 Binary files /dev/null and b/sound/voice/joe/upp_joe/seryozno.ogg differ diff --git a/sound/voice/joe/upp_joe/skachok.ogg b/sound/voice/joe/upp_joe/skachok.ogg new file mode 100644 index 000000000000..31791963d61a Binary files /dev/null and b/sound/voice/joe/upp_joe/skachok.ogg differ diff --git a/sound/voice/joe/upp_joe/sluchilos.ogg b/sound/voice/joe/upp_joe/sluchilos.ogg new file mode 100644 index 000000000000..b442dac3e439 Binary files /dev/null and b/sound/voice/joe/upp_joe/sluchilos.ogg differ diff --git a/sound/voice/joe/upp_joe/stesnyaytes.ogg b/sound/voice/joe/upp_joe/stesnyaytes.ogg new file mode 100644 index 000000000000..a832b1cf4057 Binary files /dev/null and b/sound/voice/joe/upp_joe/stesnyaytes.ogg differ diff --git a/sound/voice/joe/upp_joe/tak_nelza.ogg b/sound/voice/joe/upp_joe/tak_nelza.ogg new file mode 100644 index 000000000000..01be94e07820 Binary files /dev/null and b/sound/voice/joe/upp_joe/tak_nelza.ogg differ diff --git a/sound/voice/joe/upp_joe/terpeliviy.ogg b/sound/voice/joe/upp_joe/terpeliviy.ogg new file mode 100644 index 000000000000..20f170f014b1 Binary files /dev/null and b/sound/voice/joe/upp_joe/terpeliviy.ogg differ diff --git a/sound/voice/joe/upp_joe/tolko_zveri.ogg b/sound/voice/joe/upp_joe/tolko_zveri.ogg new file mode 100644 index 000000000000..414e28dce17a Binary files /dev/null and b/sound/voice/joe/upp_joe/tolko_zveri.ogg differ diff --git a/sound/voice/joe/upp_joe/tut_kto.ogg b/sound/voice/joe/upp_joe/tut_kto.ogg new file mode 100644 index 000000000000..165b4285e8c2 Binary files /dev/null and b/sound/voice/joe/upp_joe/tut_kto.ogg differ diff --git a/sound/voice/joe/upp_joe/vcluchat.ogg b/sound/voice/joe/upp_joe/vcluchat.ogg new file mode 100644 index 000000000000..3eb5d1ffb7ca Binary files /dev/null and b/sound/voice/joe/upp_joe/vcluchat.ogg differ diff --git a/sound/voice/joe/upp_joe/ventilyacii.ogg b/sound/voice/joe/upp_joe/ventilyacii.ogg new file mode 100644 index 000000000000..3c0bdea6ad69 Binary files /dev/null and b/sound/voice/joe/upp_joe/ventilyacii.ogg differ diff --git a/sound/voice/joe/upp_joe/za_zvuk.ogg b/sound/voice/joe/upp_joe/za_zvuk.ogg new file mode 100644 index 000000000000..b0b48443c4d2 Binary files /dev/null and b/sound/voice/joe/upp_joe/za_zvuk.ogg differ diff --git a/sound/voice/joe/upp_joe/zadacham.ogg b/sound/voice/joe/upp_joe/zadacham.ogg new file mode 100644 index 000000000000..6b025c4f87f7 Binary files /dev/null and b/sound/voice/joe/upp_joe/zadacham.ogg differ diff --git a/sound/voice/joe/upp_joe/zadachi.ogg b/sound/voice/joe/upp_joe/zadachi.ogg new file mode 100644 index 000000000000..1979917b5856 Binary files /dev/null and b/sound/voice/joe/upp_joe/zadachi.ogg differ diff --git a/sound/voice/joe/upp_joe/zagorelos.ogg b/sound/voice/joe/upp_joe/zagorelos.ogg new file mode 100644 index 000000000000..044d0f182869 Binary files /dev/null and b/sound/voice/joe/upp_joe/zagorelos.ogg differ diff --git a/sound/voice/joe/upp_joe/zapros.ogg b/sound/voice/joe/upp_joe/zapros.ogg new file mode 100644 index 000000000000..added7b47c1a Binary files /dev/null and b/sound/voice/joe/upp_joe/zapros.ogg differ diff --git a/sound/voice/joe/upp_joe/zdes.ogg b/sound/voice/joe/upp_joe/zdes.ogg new file mode 100644 index 000000000000..b8badae92d39 Binary files /dev/null and b/sound/voice/joe/upp_joe/zdes.ogg differ diff --git a/sound/voice/joe/upp_joe/zrya_potratil.ogg b/sound/voice/joe/upp_joe/zrya_potratil.ogg new file mode 100644 index 000000000000..14222c81ae5f Binary files /dev/null and b/sound/voice/joe/upp_joe/zrya_potratil.ogg differ