Skip to content

Commit

Permalink
Second round
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben10083 committed Sep 25, 2023
1 parent 8729b6d commit 18ac05d
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 21 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@
/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/warning/this_is_futile,
/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
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,9 @@
sound = 'sound/voice/joe/existing_tasks.ogg'
say_message = "Existing tasks have a higher priority."
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
say_message = "Good day."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/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'
Expand All @@ -25,10 +31,10 @@
say_message = "What do you need to know today?"
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."
/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
Expand All @@ -43,8 +49,8 @@
say_message = "Ah, you're still here."
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."
/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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
say_message = "A weapon. I better investigate."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,3 @@
sound = 'sound/voice/joe/join_us.ogg'
say_message = "We hope you'll join us for the journey."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/quip/weapon_permit
key = "weaponpermit"
sound = 'sound/voice/joe/weapon_permit.ogg'
say_message = "I assume you have a permit for that weapon."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@
say_message = "You really shouldn't be here."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/interloper
key = "interloper"
sound = 'sound/voice/joe/interloper.ogg'
say_message = "On top of innumerable duties, now I have a interloper."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/protected_area_compromised
key = "areacompromised"
sound = 'sound/voice/joe/protected_area_compromised.ogg'
say_message = "Protected area compromised."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/come_out_vent
key = "comeoutvent"
sound = 'sound/voice/joe/come_out_vent.ogg'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@
say_message = "This is a breach of multiple safety directives."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/warning/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/warning/safety
key = "safety"
sound = 'sound/voice/joe/safety.ogg'
say_message = "You and I are going to have a talk about safety."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/warning/safety_tolerated
key = "nottolerated"
sound = 'sound/voice/joe/not_be_tolerated.ogg'
say_message = "This is a safety breach and will not be tolerated."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/warning/no_need
key = "noneed"
sound = 'sound/voice/joe/no_need.ogg'
Expand Down Expand Up @@ -96,3 +96,9 @@
sound = 'sound/voice/joe/hold_still.ogg'
say_message = "Hold still."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE

/datum/emote/living/carbon/human/synthetic/working_joe/warning/have_a_problem
key = "haveaproblem"
sound = 'sound/voice/joe/have_a_problem.ogg'
say_message = "It seems you and I have a problem."
emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
Binary file added sound/voice/joe/have_a_problem.ogg
Binary file not shown.
Binary file added sound/voice/joe/how_are_you.ogg
Binary file not shown.
Binary file added sound/voice/joe/how_inconsiderate.ogg
Binary file not shown.
Binary file added sound/voice/joe/interloper.ogg
Binary file not shown.
Binary file added sound/voice/joe/most_concerning.ogg
Binary file not shown.
Binary file added sound/voice/joe/not_be_tolerated.ogg
Binary file not shown.
Binary file added sound/voice/joe/protected_area_compromised.ogg
Binary file not shown.
Binary file removed sound/voice/joe/weapon_permit.ogg
Binary file not shown.

0 comments on commit 18ac05d

Please sign in to comment.