Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Erp panel and some new emotes (#639)
Browse files Browse the repository at this point in the history
* initial

* include

* human emote

* robo

* cat
  • Loading branch information
homexp13 authored Jun 21, 2024
1 parent b197e9c commit 62f7c8c
Show file tree
Hide file tree
Showing 19 changed files with 823 additions and 1 deletion.
691 changes: 691 additions & 0 deletions modular_RUtgmc/code/modules/emotes/emote_panel.dm

Large diffs are not rendered by default.

132 changes: 131 additions & 1 deletion modular_RUtgmc/code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@

/datum/emote/living/carbon/human/giggle/get_sound(mob/living/user)
if(isrobot(user))
return
if(user.gender == FEMALE)
return 'modular_RUtgmc/sound/voice/robotic/female_giggle.ogg'
else
return 'modular_RUtgmc/sound/voice/robotic/male_giggle.ogg'
if(user.gender == FEMALE)
return 'modular_RUtgmc/sound/voice/human_female_giggle_1.ogg'
else
Expand Down Expand Up @@ -51,6 +54,133 @@
else
return 'modular_RUtgmc/sound/voice/human_male_cry_1.ogg'

/datum/emote/living/carbon/human/laugh/get_sound(mob/living/user)
if(isrobot(user))
if(user.gender == FEMALE)
return 'modular_RUtgmc/sound/voice/robotic/female_laugh.ogg'
else
return pick('modular_RUtgmc/sound/voice/robotic/male_laugh_1.ogg', 'modular_RUtgmc/sound/voice/robotic/male_laugh_2.ogg')
return ..()

/datum/emote/living/carbon/human/medic/get_sound(mob/living/carbon/human/user)
if(isrobot(user))
if(user.gender == MALE)
if(prob(95))
return 'modular_RUtgmc/sound/voice/robotic/male_medic.ogg'
else
return 'modular_RUtgmc/sound/voice/robotic/male_medic2.ogg'
else
return 'modular_RUtgmc/sound/voice/robotic/female_medic.ogg'
return ..()

/datum/emote/living/carbon/human/whistle
key = "whistle"
key_third_person = "whistles"
message = "whistle"
emote_type = EMOTE_AUDIBLE

/datum/emote/living/carbon/human/whistle/get_sound(mob/living/user)
if(isrobot(user))
return
return 'modular_RUtgmc/sound/voice/sound_voice_human_whistle1.ogg'

/datum/emote/living/carbon/human/crack
key = "crack"
key_third_person = "cracks"
message = "cracks their knuckles."
emote_type = EMOTE_AUDIBLE
flags_emote = EMOTE_RESTRAINT_CHECK|EMOTE_MUZZLE_IGNORE|EMOTE_ARMS_CHECK
sound = 'modular_RUtgmc/sound/misc/sound_misc_knuckles.ogg'

//Robotic

/datum/emote/living/carbon/robot
mob_type_allowed_typecache = list(/mob/living/carbon/human/species/robot, /mob/living/carbon/human/species/synthetic, /mob/living/carbon/human/species/early_synthetic)

/datum/emote/living/carbon/robot/dwoop
key = "dwoop"
key_third_person = "dwoops"
message = "pips happily!"
emote_type = EMOTE_AUDIBLE
sound = 'modular_RUtgmc/sound/voice/robotic/dwoop.ogg'

/datum/emote/living/carbon/robot/yes
key = "yes"
message = "emits an affirmative blip."
emote_type = EMOTE_AUDIBLE
sound = 'modular_RUtgmc/sound/voice/robotic/synth_yes.ogg'

/datum/emote/living/carbon/robot/no
key = "no"
message = "emits a negative blip."
emote_type = EMOTE_AUDIBLE
sound = 'modular_RUtgmc/sound/voice/robotic/synth_no.ogg'

/datum/emote/living/carbon/robot/buzz
key = "buzz"
key_third_person = "buzzes"
message = "buzzes."
message_param = "buzzes at %t."
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/buzz-sigh.ogg'

/datum/emote/living/carbon/robot/buzz2
key = "buzz2"
message = "buzzes twice."
message_param = "buzzes twice at %t."
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/buzz-two.ogg'

/datum/emote/living/carbon/robot/beep
key = "beep"
message = "beeps sharply."
message_param = "beeps sharply at %t."
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/twobeep.ogg'

/datum/emote/living/carbon/robot/chime
key = "chime"
key_third_person = "chimes"
message = "chimes."
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/chime.ogg'

/datum/emote/living/carbon/robot/honk
key = "honk"
key_third_person = "honks"
message = "honks."
emote_type = EMOTE_AUDIBLE
sound = 'sound/items/bikehorn.ogg'

/datum/emote/living/carbon/robot/ping
key = "ping"
key_third_person = "pings"
message = "pings."
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/ping.ogg'

/datum/emote/living/carbon/robot/sad
key = "sad"
message = "plays a sad trombone..."
emote_type = EMOTE_AUDIBLE
sound = 'sound/misc/sadtrombone.ogg'

/datum/emote/living/carbon/robot/warn
key = "warn"
key_third_person = "warns"
message = "blares an alarm!"
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/warning-buzzer.ogg'

/datum/emote/living/carbon/robot/laughtrack
key = "laughtrack"
message = "plays a laughtrack."
emote_type = EMOTE_AUDIBLE

/datum/emote/living/carbon/robot/laughtrack/get_sound(mob/living/user)
return pick('modular_RUtgmc/sound/voice/robotic/sitcomLaugh1.ogg', 'modular_RUtgmc/sound/voice/robotic/sitcomLaugh2.ogg')

//Neco Ark

/datum/emote/living/carbon/necoarc
mob_type_allowed_typecache = /mob/living/carbon/human/species/necoarc
Expand Down
1 change: 1 addition & 0 deletions modular_RUtgmc/includes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
#include "code\game\turfs\walls\walls.dm"
#include "code\modules\admin\admin_verbs.dm"
#include "code\modules\admin\fun_verbs.dm"
#include "code\modules\emotes\emote_panel.dm"
#include "code\modules\admin\holder.dm"
#include "code\modules\admin\panels\player_panel.dm"
#include "code\modules\ai\presets\xeno_presets.dm"
Expand Down
Binary file added modular_RUtgmc/sound/misc/sound_misc_knuckles.ogg
Binary file not shown.
Binary file added modular_RUtgmc/sound/voice/robotic/dwoop.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added modular_RUtgmc/sound/voice/robotic/male_medic.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added modular_RUtgmc/sound/voice/robotic/synth_no.ogg
Binary file not shown.
Binary file added modular_RUtgmc/sound/voice/robotic/synth_yes.ogg
Binary file not shown.
Binary file added modular_RUtgmc/sound/voice/robotic/twobeep.ogg
Binary file not shown.
Binary file not shown.

0 comments on commit 62f7c8c

Please sign in to comment.