mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 13:09:11 +01:00
Complete emote file cleanup and rescue VS edits
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
emote_sound = 'sound/voice/biamthelaw.ogg'
|
||||
|
||||
/decl/emote/audible/synth/security/check_user(var/mob/living/silicon/robot/user)
|
||||
return (istype(user) && istype(user.module, /obj/item/weapon/robot_module/robot/security))
|
||||
return (istype(user) && (istype(user.module, /obj/item/weapon/robot_module/robot/security) || istype(user.module, /obj/item/weapon/robot_module/robot/knine))) //VOREStation Add - knine module
|
||||
|
||||
/decl/emote/audible/synth/security/halt
|
||||
key = "halt"
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
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"], 0)
|
||||
playsound(user.loc, sound_to_play, use_sound["vol"], 0, preference = /datum/client_preference/emote_noises) //VOREStation Add - Preference
|
||||
|
||||
/decl/emote/proc/check_user(var/atom/user)
|
||||
return TRUE
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
if(act == "custom")
|
||||
if(!message)
|
||||
message = sanitize(input("Enter an emote to display.") as text|null)
|
||||
message = sanitize_or_reflect(input(src,"Choose an emote to display.") as text|null, src) //VOREStation Edit - Reflect too long messages, within reason
|
||||
if(!message)
|
||||
return
|
||||
if (!m_type)
|
||||
|
||||
Reference in New Issue
Block a user