diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 795a29527b9..d0eb0b7e264 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -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) diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index 1a5a4e30842..4df078aa11b 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -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" diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm index 7fc32a39862..832c5e6dfa0 100644 --- a/code/modules/emotes/definitions/audible_furry_vr.dm +++ b/code/modules/emotes/definitions/audible_furry_vr.dm @@ -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." diff --git a/code/modules/emotes/definitions/synthetics.dm b/code/modules/emotes/definitions/synthetics.dm index fa4937b6d1a..32e7bdf5045 100644 --- a/code/modules/emotes/definitions/synthetics.dm +++ b/code/modules/emotes/definitions/synthetics.dm @@ -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" diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index 712b5f016fe..14e7481d5d7 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -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()) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 1f8f33b2085..47cc1e8f574 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -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, diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm index de001c9e952..a471c62b220 100644 --- a/code/modules/mob/living/silicon/emote.dm +++ b/code/modules/mob/living/silicon/emote.dm @@ -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, diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 53700c4a223..f9d8ef7495e 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -47,7 +47,8 @@ "Hawk" = "pai-hawk", "Duffel" = "pai-duffel", "Rat" = "rat", - "Panther" = "panther" + "Panther" = "panther", + "Cyber Elf" = "cyberelf" //VOREStation Addition End ) diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index 7ba5e435327..57124aa955a 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -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() diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index f05ee135acb..9def436c7cb 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -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, diff --git a/icons/mob/pai_vr.dmi b/icons/mob/pai_vr.dmi index b26283e08c5..d54bc26fbe7 100644 Binary files a/icons/mob/pai_vr.dmi and b/icons/mob/pai_vr.dmi differ diff --git a/sound/voice/roboboop.ogg b/sound/voice/roboboop.ogg index a56749a1048..6a2d9fd0af9 100644 Binary files a/sound/voice/roboboop.ogg and b/sound/voice/roboboop.ogg differ