Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
Blundir committed Dec 2, 2024
1 parent 4cf452f commit 80a145f
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 9 deletions.
18 changes: 12 additions & 6 deletions code/modules/mob/living/carbon/human/species/working_joe/notice.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
key = "careful"
sound = 'sound/voice/joe/be_careful_with_that.ogg'
haz_sound = 'sound/voice/joe/be_careful_with_that_haz.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/ostorozhnee.ogg'
say_message = "Be careful with 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/notice/firearm
key = "firearm"
Expand All @@ -50,9 +51,10 @@
key = "permitforthat"
sound = 'sound/voice/joe/permit_for_that.ogg'
haz_sound = 'sound/voice/joe/permit_for_that_haz.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/nadeusuvasestrazre.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
joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE

/datum/emote/living/carbon/human/synthetic/working_joe/notice/invest_disturbance
key = "investigatedisturbance"
Expand Down Expand Up @@ -118,17 +120,19 @@
key = "safetylog"
sound = 'sound/voice/joe/safety_log.ogg'
haz_sound = 'sound/voice/joe/safety_log_haz.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/zurnal.ogg'
say_message = "Safety log updated."
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/strange
key = "strange"
sound = 'sound/voice/joe/strange.ogg'
haz_sound = 'sound/voice/joe/strange_haz.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/stranno.ogg'
say_message = "Strange."
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/report_this
key = "reportthis"
Expand All @@ -155,8 +159,9 @@
/datum/emote/living/carbon/human/synthetic/working_joe/notice/potential_hazard
key = "potentialhazard"
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
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE|UPP_JOE_EMOTE

/datum/emote/living/carbon/human/synthetic/working_joe/notice/saw_that
key = "sawthat"
Expand All @@ -168,9 +173,10 @@
key = "cleanup"
sound = 'sound/voice/joe/clean_up.ogg'
haz_sound = 'sound/voice/joe/clean_up_haz.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/uborka.ogg'
say_message = "Clean up required."
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/curious
key = "curious"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,10 @@
say_message = "Why would you do this?"
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE

/datum/emote/living/carbon/human/synthetic/working_joe/question/why_did_you
key = "whydidyou"
upp_joe_sound = 'sound/voice/joe/upp_joe/zachem.ogg'
say_message = "Why did you do this?"
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
joe_flag = UPP_JOE_EMOTE
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,10 @@
sound = 'sound/voice/joe/registration.ogg'
say_message = "Your registration is almost complete."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/quip/security_means
key = "securitymeans"
upp_joe_sound = 'sound/voice/joe/upp_joe/joinus.ogg'
say_message = "At the present moment, we have to strengthen security measures."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
joe_flag = UPP_JOE_EMOTE
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@
/datum/emote/living/carbon/human/synthetic/working_joe/task_update/follow_me
key = "followme"
sound = 'sound/voice/joe/follow_me.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/proydemte.ogg'
say_message = "Follow me."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
joe_flag = WORKING_JOE_EMOTE|UPP_JOE_EMOTE

/datum/emote/living/carbon/human/synthetic/working_joe/task_update/follow_me_please
key = "followmeplease"
sound = 'sound/voice/joe/follow_me_please.ogg'
haz_sound = 'sound/voice/joe/follow_me_please_haz.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/proydemte.ogg'
say_message = "Follow me please."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE|UPP_JOE_EMOTE
joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE

/datum/emote/living/carbon/human/synthetic/working_joe/task_update/come_with_me
key = "comewithme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,21 @@
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE

/datum/emote/living/carbon/human/synthetic/working_joe/warning/safety_breach_upp
key = "safetybreachupp"
upp_joe_sound = 'sound/voice/joe/upp_joe/vinarushaete.ogg'
say_message = "You are violating multiple rules at the same time."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
joe_flag = UPP_JOE_EMOTE

/datum/emote/living/carbon/human/synthetic/working_joe/warning/safety
key = "safety"
sound = 'sound/voice/joe/safety.ogg'
haz_sound = 'sound/voice/joe/safety_haz.ogg'
upp_joe_sound = 'sound/voice/joe/upp_joe/yavamobyasnyu.ogg'
say_message = "You and I are going to have a talk about safety."
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_tolerated
key = "nottolerated"
Expand Down
Binary file removed sound/voice/joe/upp_joe/vhodvospreshen.ogg
Binary file not shown.
Binary file removed sound/voice/joe/upp_joe/visebyavidalimozhet.ogg
Binary file not shown.
Binary file removed sound/voice/joe/upp_joe/yaznayuchovieshe.ogg
Binary file not shown.

0 comments on commit 80a145f

Please sign in to comment.