mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 12:37:50 +01:00
One more updoot
This commit is contained in:
@@ -15,7 +15,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
|
||||
var/looking_for_personality = 0
|
||||
var/mob/living/silicon/pai/pai
|
||||
var/image/screen_layer
|
||||
var/screen_color = "#21ffff"
|
||||
var/screen_color = "#00ff0d"
|
||||
|
||||
/obj/item/device/paicard/relaymove(var/mob/user, var/direction)
|
||||
if(user.stat || user.stunned)
|
||||
|
||||
@@ -183,6 +183,7 @@
|
||||
key = "squish"
|
||||
emote_sound = 'sound/effects/slime_squish.ogg' //Credit to DrMinky (freesound.org) for the sound.
|
||||
emote_message_3p = "squishes."
|
||||
sound_vary = FALSE
|
||||
|
||||
/decl/emote/audible/warble
|
||||
key = "warble"
|
||||
@@ -211,6 +212,7 @@
|
||||
emote_message_1p_target = "You chirp in surprise at TARGET!"
|
||||
emote_message_3p_target = "chirps in surprise at TARGET!"
|
||||
emote_sound = 'sound/voice/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
|
||||
sound_vary = FALSE
|
||||
|
||||
/decl/emote/audible/teshchirp
|
||||
key = "tchirp"
|
||||
|
||||
@@ -110,10 +110,12 @@
|
||||
key = "snort"
|
||||
emote_message_3p = "snorts!"
|
||||
emote_sound = 'sound/voice/Snort.ogg'
|
||||
sound_vary = FALSE
|
||||
/decl/emote/audible/meow
|
||||
key = "meow"
|
||||
emote_message_3p = "gently meows!"
|
||||
emote_sound = 'sound/voice/Meow.ogg'
|
||||
sound_vary = FALSE
|
||||
/decl/emote/audible/moo
|
||||
key = "moo"
|
||||
emote_message_3p = "takes a breath and lets out a moo."
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
/decl/emote/audible/synth
|
||||
key = "beep"
|
||||
emote_message_3p = "beeps."
|
||||
emote_sound = 'sound/machines/twobeep.ogg'
|
||||
key = "ping"
|
||||
emote_message_3p = "pings."
|
||||
emote_sound = 'sound/machines/ping.ogg'
|
||||
|
||||
/decl/emote/audible/synth/mob_can_use(var/mob/living/user)
|
||||
if(istype(user) && user.isSynthetic())
|
||||
return ..()
|
||||
return FALSE
|
||||
|
||||
/decl/emote/audible/synth/ping
|
||||
key = "ping"
|
||||
emote_message_3p = "pings."
|
||||
emote_sound = 'sound/machines/ping.ogg'
|
||||
/decl/emote/audible/synth/beep
|
||||
key = "beep"
|
||||
emote_message_3p = "beeps."
|
||||
emote_sound = 'sound/machines/twobeep.ogg'
|
||||
sound_vary = FALSE
|
||||
|
||||
/decl/emote/audible/synth/buzz
|
||||
key = "buzz"
|
||||
@@ -62,7 +63,6 @@
|
||||
emote_message_3p_target = "boops at TARGET!"
|
||||
emote_message_3p = "boops."
|
||||
emote_sound = 'sound/voice/roboboop.ogg'
|
||||
sound_vary = FALSE
|
||||
|
||||
/decl/emote/audible/synth/robochirp
|
||||
key = "robochirp"
|
||||
|
||||
@@ -187,7 +187,7 @@ var/global/list/emotes_by_key
|
||||
if(islist(sound_to_play) && length(sound_to_play))
|
||||
sound_to_play = pick(sound_to_play)
|
||||
if(sound_to_play)
|
||||
playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, preference = sound_preferences) //VOREStation Add - Preference
|
||||
playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, frequency = null, preference = sound_preferences) //VOREStation Add - Preference
|
||||
|
||||
/decl/emote/proc/mob_can_use(var/mob/user)
|
||||
return istype(user) && user.stat != DEAD && (type in user.get_available_emotes())
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
var/list/_human_default_emotes = list(
|
||||
/decl/emote/visible/blink,
|
||||
/decl/emote/audible/synth,
|
||||
/decl/emote/audible/synth/ping,
|
||||
/decl/emote/audible/synth/beep,
|
||||
/decl/emote/audible/synth/buzz,
|
||||
/decl/emote/audible/synth/confirm,
|
||||
/decl/emote/audible/synth/deny,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var/list/_silicon_default_emotes = list(
|
||||
/decl/emote/audible/synth,
|
||||
/decl/emote/audible/synth/ping,
|
||||
/decl/emote/audible/synth/beep,
|
||||
/decl/emote/audible/synth/buzz,
|
||||
/decl/emote/audible/synth/confirm,
|
||||
/decl/emote/audible/synth/deny,
|
||||
|
||||
@@ -47,7 +47,8 @@
|
||||
"Hawk" = "pai-hawk",
|
||||
"Duffel" = "pai-duffel",
|
||||
"Rat" = "rat",
|
||||
"Panther" = "panther"
|
||||
"Panther" = "panther",
|
||||
"Cyber Elf" = "cyberelf"
|
||||
//VOREStation Addition End
|
||||
)
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
"pai-parrot",
|
||||
"pai-bat",
|
||||
"pai-butterfly",
|
||||
"pai-hawk"
|
||||
"pai-hawk",
|
||||
"cyberelf"
|
||||
)
|
||||
|
||||
//Sure I could spend all day making wacky overlays for all of the different forms
|
||||
@@ -33,7 +34,8 @@
|
||||
"rat",
|
||||
"panther",
|
||||
"pai-bear",
|
||||
"pai-fen"
|
||||
"pai-fen",
|
||||
"cyberelf"
|
||||
)
|
||||
|
||||
/mob/living/silicon/pai/Initialize()
|
||||
|
||||
@@ -16,7 +16,7 @@ var/list/_robot_default_emotes = list(
|
||||
/decl/emote/visible/spin,
|
||||
/decl/emote/visible/sidestep,
|
||||
/decl/emote/audible/synth,
|
||||
/decl/emote/audible/synth/ping,
|
||||
/decl/emote/audible/synth/beep,
|
||||
/decl/emote/audible/synth/buzz,
|
||||
/decl/emote/audible/synth/confirm,
|
||||
/decl/emote/audible/synth/deny,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 167 KiB |
Binary file not shown.
Reference in New Issue
Block a user