diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index 1e2b2e63f30..1b77745067e 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -272,6 +272,10 @@
#define TASTE_DULL 0.5 //anything below 30%
#define TASTE_NUMB 0.1 //anything below 150%
+//Used by emotes
+#define VISIBLE_MESSAGE 1
+#define AUDIBLE_MESSAGE 2
+
// If they're in an FBP, what braintype.
#define FBP_NONE ""
#define FBP_CYBORG "Cyborg"
@@ -436,3 +440,5 @@
#define MAX_NUTRITION 5000 //VOREStation Edit
#define FAKE_INVIS_ALPHA_THRESHOLD 127 // If something's alpha var is at or below this number, certain things will pretend it is invisible.
+
+#define DEATHGASP_NO_MESSAGE "no message"
diff --git a/code/datums/looping_sounds/weather_sounds.dm b/code/datums/looping_sounds/weather_sounds.dm
index 106c25643af..4a029930587 100644
--- a/code/datums/looping_sounds/weather_sounds.dm
+++ b/code/datums/looping_sounds/weather_sounds.dm
@@ -11,7 +11,7 @@
start_sound = 'sound/effects/weather/snowstorm/outside/active_start.ogg'
start_length = 13 SECONDS
end_sound = 'sound/effects/weather/snowstorm/outside/active_end.ogg'
- volume = 80
+ volume = 40
/datum/looping_sound/weather/inside_blizzard
mid_sounds = list(
@@ -23,7 +23,7 @@
start_sound = 'sound/effects/weather/snowstorm/inside/active_start.ogg'
start_length = 13 SECONDS
end_sound = 'sound/effects/weather/snowstorm/inside/active_end.ogg'
- volume = 60
+ volume = 20
/datum/looping_sound/weather/outside_snow
mid_sounds = list(
@@ -35,7 +35,7 @@
start_sound = 'sound/effects/weather/snowstorm/outside/weak_start.ogg'
start_length = 13 SECONDS
end_sound = 'sound/effects/weather/snowstorm/outside/weak_end.ogg'
- volume = 50
+ volume = 20
/datum/looping_sound/weather/inside_snow
mid_sounds = list(
@@ -47,7 +47,7 @@
start_sound = 'sound/effects/weather/snowstorm/inside/weak_start.ogg'
start_length = 13 SECONDS
end_sound = 'sound/effects/weather/snowstorm/inside/weak_end.ogg'
- volume = 30
+ volume = 10
/datum/looping_sound/weather/wind
mid_sounds = list(
@@ -59,11 +59,17 @@
'sound/effects/weather/wind/wind_5_1.ogg' = 1
)
mid_length = 10 SECONDS // The lengths for the files vary, but the longest is ten seconds, so this will make it sound like intermittent wind.
- volume = 50
+ volume = 45
// Don't have special sounds so we just make it quieter indoors.
/datum/looping_sound/weather/wind/indoors
- volume = 30
+ volume = 25
+
+/datum/looping_sound/weather/wind/gentle
+ volume = 15
+
+/datum/looping_sound/weather/wind/gentle/indoors
+ volume = 5
/datum/looping_sound/weather/rain
mid_sounds = list(
@@ -73,7 +79,13 @@
start_sound = 'sound/effects/weather/acidrain_start.ogg'
start_length = 13 SECONDS
end_sound = 'sound/effects/weather/acidrain_end.ogg'
- volume = 50
+ volume = 20
/datum/looping_sound/weather/rain/indoors
- volume = 30
\ No newline at end of file
+ volume = 10
+
+/datum/looping_sound/weather/rain/heavy
+ volume = 40
+
+/datum/looping_sound/weather/rain/heavy/indoors
+ volume = 20
\ No newline at end of file
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e4ad20f5d48..46f001c8e1b 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -490,7 +490,7 @@
// Use for objects performing visible actions
// message is output to anyone who can see, e.g. "The [src] does something!"
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
-/atom/proc/visible_message(var/message, var/blind_message, var/list/exclude_mobs = null)
+/atom/proc/visible_message(var/message, var/blind_message, var/list/exclude_mobs, var/range = world.view)
//VOREStation Edit
var/list/see
@@ -498,7 +498,7 @@
var/obj/belly/B = loc
see = B.get_mobs_and_objs_in_belly()
else
- see = get_mobs_and_objs_in_view_fast(get_turf(src),world.view,remote_ghosts = FALSE)
+ see = get_mobs_and_objs_in_view_fast(get_turf(src), range, remote_ghosts = FALSE)
//VOREStation Edit End
var/list/seeing_mobs = see["mobs"]
@@ -508,20 +508,20 @@
for(var/obj in seeing_objs)
var/obj/O = obj
- O.show_message(message, 1, blind_message, 2)
+ O.show_message(message, VISIBLE_MESSAGE, blind_message, AUDIBLE_MESSAGE)
for(var/mob in seeing_mobs)
var/mob/M = mob
if(M.see_invisible >= invisibility && MOB_CAN_SEE_PLANE(M, plane))
- M.show_message(message, 1, blind_message, 2)
+ M.show_message(message, VISIBLE_MESSAGE, blind_message, AUDIBLE_MESSAGE)
else if(blind_message)
- M.show_message(blind_message, 2)
+ M.show_message(blind_message, AUDIBLE_MESSAGE)
// Show a message to all mobs and objects in earshot of this atom
// Use for objects performing audible actions
// message is the message output to anyone who can hear.
// deaf_message (optional) is what deaf people will see.
// hearing_distance (optional) is the range, how many tiles away the message can be heard.
-/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance)
+/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance, var/radio_message)
var/range = hearing_distance || world.view
var/list/hear = get_mobs_and_objs_in_view_fast(get_turf(src),range,remote_ghosts = FALSE)
@@ -529,14 +529,19 @@
var/list/hearing_mobs = hear["mobs"]
var/list/hearing_objs = hear["objs"]
- for(var/obj in hearing_objs)
- var/obj/O = obj
- O.show_message(message, 2, deaf_message, 1)
+ if(radio_message)
+ for(var/obj in hearing_objs)
+ var/obj/O = obj
+ O.hear_talk(src, list(new /datum/multilingual_say_piece(GLOB.all_languages["Noise"], radio_message)), null)
+ else
+ for(var/obj in hearing_objs)
+ var/obj/O = obj
+ O.show_message(message, AUDIBLE_MESSAGE, deaf_message, VISIBLE_MESSAGE)
for(var/mob in hearing_mobs)
var/mob/M = mob
var/msg = message
- M.show_message(msg, 2, deaf_message, 1)
+ M.show_message(msg, AUDIBLE_MESSAGE, deaf_message, VISIBLE_MESSAGE)
/atom/movable/proc/dropInto(var/atom/destination)
while(istype(destination))
@@ -647,4 +652,7 @@
/atom/Exited(atom/movable/AM, atom/new_loc)
. = ..()
- SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, new_loc)
\ No newline at end of file
+ SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, new_loc)
+
+/atom/proc/get_visible_gender()
+ return gender
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 5b4305844ef..f17c97a627b 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -507,7 +507,6 @@
log_and_message_admins("[key_name(to_despawn)] ([to_despawn.mind.role_alt_title]) entered cryostorage.")
announce.autosay("[to_despawn.real_name], [to_despawn.mind.role_alt_title], [on_store_message]", "[on_store_name]", announce_channel, using_map.get_map_levels(z, TRUE, om_range = DEFAULT_OVERMAP_RANGE))
- //visible_message("\The [initial(name)] hums and hisses as it moves [to_despawn.real_name] into storage.", 3)
visible_message("\The [initial(name)] [on_store_visible_message_1] [to_despawn.real_name] [on_store_visible_message_2]", 3)
//VOREStation Edit begin: Dont delete mobs-in-mobs
diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm
index 94a55bba1b4..e6c5058881d 100644
--- a/code/game/machinery/vending_machines_vr.dm
+++ b/code/game/machinery/vending_machines_vr.dm
@@ -4614,3 +4614,36 @@
/obj/machinery/vending/cola/soft
icon = 'icons/obj/vending_vr.dmi'
icon_state = "Cola_Machine"
+
+//////////////////////Bepis Drinks (04/29/2021)//////////////////////
+
+/obj/machinery/vending/bepis
+ name = "Bepis Softdrinks"
+ desc = "A strange softdrink vendor that isn't owned by NanoTrasen... Why (and how) is it here?"
+ icon = 'icons/obj/vending_vr.dmi'
+ icon_state = "bepis"
+ product_slogans = "Refreshing!;Have a sip, you won't believe the taste!;Puts the 'B' in Best Soda!"
+ product_ads = "Refreshing!;Hope you're thirsty!;Please, have a drink!;Drink up!"
+ products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/bepis = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/astrodew = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/buzz = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/shambler = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/cranberry = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 10)
+
+ prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/bepis = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/astrodew = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/buzz = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/shambler = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/cranberry = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/icecoffee = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 1)
+ idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
+ vending_sound = "machines/vending/vending_cans.ogg"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 21775d0403c..6e10f0e783d 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -552,9 +552,7 @@ var/list/global/slot_flags_enumeration = list(
if(!hit_zone)
U.do_attack_animation(M)
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- //visible_message("[U] attempts to stab [M] in the eyes, but misses!")
- for(var/mob/V in viewers(M))
- V.show_message("[U] attempts to stab [M] in the eyes, but misses!")
+ visible_message(SPAN_DANGER("\The [U] attempts to stab \the [M] in the eyes, but misses!"))
return
add_attack_logs(user,M,"Attack eyes with [name]")
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index bfa8b616805..7dbb927f853 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -74,14 +74,12 @@
/obj/item/weapon/material/snow/snowball/attack_self(mob/user as mob)
if(user.a_intent == I_HURT)
- //visible_message("[user] has smashed the snowball in their hand!", "You smash the snowball in your hand.")
- to_chat(user, "You smash the snowball in your hand.")
+ to_chat(user, SPAN_NOTICE("You smash the snowball in your hand."))
var/atom/S = new /obj/item/stack/material/snow(user.loc)
qdel(src)
user.put_in_hands(S)
else
- //visible_message("[user] starts compacting the snowball.", "You start compacting the snowball.")
- to_chat(user, "You start compacting the snowball.")
+ to_chat(user, SPAN_NOTICE("You start compacting the snowball."))
if(do_after(user, 2 SECONDS))
var/atom/S = new /obj/item/weapon/material/snow/snowball/reinforced(user.loc)
qdel(src)
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 88085aa97cc..15f079d31cb 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -37,6 +37,43 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/g_wing3 = 30 // Wing tertiary color
var/b_wing3 = 30 // Wing tertiary color
+// Sanitize ear/wing/tail styles
+/datum/preferences/proc/sanitize_body_styles()
+
+ // Grandfather in anyone loading paths from a save.
+ if(ispath(ear_style, /datum/sprite_accessory))
+ var/datum/sprite_accessory/instance = global.ear_styles_list[ear_style]
+ if(istype(instance))
+ ear_style = instance.name
+ if(ispath(wing_style, /datum/sprite_accessory))
+ var/datum/sprite_accessory/instance = global.wing_styles_list[wing_style]
+ if(istype(instance))
+ wing_style = instance.name
+ if(ispath(tail_style, /datum/sprite_accessory))
+ var/datum/sprite_accessory/instance = global.tail_styles_list[tail_style]
+ if(istype(instance))
+ tail_style = instance.name
+
+ // Sanitize for non-existent keys.
+ if(ear_style && !(ear_style in get_available_styles(global.ear_styles_list)))
+ ear_style = null
+ if(wing_style && !(wing_style in get_available_styles(global.wing_styles_list)))
+ wing_style = null
+ if(tail_style && !(tail_style in get_available_styles(global.tail_styles_list)))
+ tail_style = null
+
+/datum/preferences/proc/get_available_styles(var/style_list)
+ . = list("Normal" = null)
+ for(var/path in style_list)
+ var/datum/sprite_accessory/instance = style_list[path]
+ if(!istype(instance))
+ continue
+ if(instance.ckeys_allowed && (!client || !(client.ckey in instance.ckeys_allowed)))
+ continue
+ if(instance.species_allowed && (!species || !(species in instance.species_allowed)) && (!client || !check_rights(R_ADMIN | R_EVENT | R_FUN, 0, client)))
+ continue
+ .[instance.name] = instance
+
/datum/category_item/player_setup_item/general/body
name = "Body"
sort_order = 3
@@ -228,12 +265,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.r_wing3 = sanitize_integer(pref.r_wing3, 0, 255, initial(pref.r_wing3))
pref.g_wing3 = sanitize_integer(pref.g_wing3, 0, 255, initial(pref.g_wing3))
pref.b_wing3 = sanitize_integer(pref.b_wing3, 0, 255, initial(pref.b_wing3))
- if(!(pref.ear_style in get_ear_styles()))
- pref.ear_style = initial(pref.ear_style)
- if(!(pref.wing_style in get_wing_styles()))
- pref.wing_style = initial(pref.wing_style)
- if(!(pref.tail_style in get_tail_styles()))
- pref.tail_style = initial(pref.tail_style)
+
+ pref.sanitize_body_styles()
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/general/body/copy_to_mob(var/mob/living/carbon/human/character)
@@ -265,37 +298,44 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
character.g_synth = pref.g_synth
character.b_synth = pref.b_synth
character.synth_markings = pref.synth_markings
- character.ear_style = ear_styles_list[pref.ear_style]
- character.r_ears = pref.r_ears
- character.b_ears = pref.b_ears
- character.g_ears = pref.g_ears
- character.r_ears2 = pref.r_ears2
- character.b_ears2 = pref.b_ears2
- character.g_ears2 = pref.g_ears2
- character.r_ears3 = pref.r_ears3
- character.b_ears3 = pref.b_ears3
- character.g_ears3 = pref.g_ears3
- character.tail_style = tail_styles_list[pref.tail_style]
- character.r_tail = pref.r_tail
- character.b_tail = pref.b_tail
- character.g_tail = pref.g_tail
- character.r_tail2 = pref.r_tail2
- character.b_tail2 = pref.b_tail2
- character.g_tail2 = pref.g_tail2
- character.r_tail3 = pref.r_tail3
- character.b_tail3 = pref.b_tail3
- character.g_tail3 = pref.g_tail3
- character.wing_style = wing_styles_list[pref.wing_style]
- character.r_wing = pref.r_wing
- character.b_wing = pref.b_wing
- character.g_wing = pref.g_wing
- character.r_wing2 = pref.r_wing2
- character.b_wing2 = pref.b_wing2
- character.g_wing2 = pref.g_wing2
- character.r_wing3 = pref.r_wing3
- character.b_wing3 = pref.b_wing3
- character.g_wing3 = pref.g_wing3
- character.set_gender( pref.biological_gender)
+
+ var/list/ear_styles = pref.get_available_styles(global.ear_styles_list)
+ character.ear_style = ear_styles[pref.ear_style]
+ character.r_ears = pref.r_ears
+ character.b_ears = pref.b_ears
+ character.g_ears = pref.g_ears
+ character.r_ears2 = pref.r_ears2
+ character.b_ears2 = pref.b_ears2
+ character.g_ears2 = pref.g_ears2
+ character.r_ears3 = pref.r_ears3
+ character.b_ears3 = pref.b_ears3
+ character.g_ears3 = pref.g_ears3
+
+ var/list/tail_styles = pref.get_available_styles(global.tail_styles_list)
+ character.tail_style = tail_styles[pref.tail_style]
+ character.r_tail = pref.r_tail
+ character.b_tail = pref.b_tail
+ character.g_tail = pref.g_tail
+ character.r_tail2 = pref.r_tail2
+ character.b_tail2 = pref.b_tail2
+ character.g_tail2 = pref.g_tail2
+ character.r_tail3 = pref.r_tail3
+ character.b_tail3 = pref.b_tail3
+ character.g_tail3 = pref.g_tail3
+
+ var/list/wing_styles = pref.get_available_styles(global.wing_styles_list)
+ character.wing_style = wing_styles[pref.wing_style]
+ character.r_wing = pref.r_wing
+ character.b_wing = pref.b_wing
+ character.g_wing = pref.g_wing
+ character.r_wing2 = pref.r_wing2
+ character.b_wing2 = pref.b_wing2
+ character.g_wing2 = pref.g_wing2
+ character.r_wing3 = pref.r_wing3
+ character.b_wing3 = pref.b_wing3
+ character.g_wing3 = pref.g_wing3
+
+ character.set_gender(pref.biological_gender)
// Destroy/cyborgize organs and limbs.
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
@@ -510,59 +550,47 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
. += "Genetics Settings
"
- var/ear_display = "Normal"
- if(pref.ear_style && (pref.ear_style in ear_styles_list))
- var/datum/sprite_accessory/ears/instance = ear_styles_list[pref.ear_style]
- ear_display = instance.name
-
- else if(pref.ear_style)
- ear_display = "REQUIRES UPDATE"
+ var/list/ear_styles = pref.get_available_styles(global.ear_styles_list)
+ var/datum/sprite_accessory/ears/ear = ear_styles[pref.ear_style]
. += "Ears
"
- . += " Style: [ear_display]
"
- if(ear_styles_list[pref.ear_style])
- var/datum/sprite_accessory/ears/ear = ear_styles_list[pref.ear_style]
+ if(istype(ear))
+ . += " Style: [ear.name]
"
if(ear.do_colouration)
. += "Change Color [color_square(pref.r_ears, pref.g_ears, pref.b_ears)]
"
if(ear.extra_overlay)
. += "Change Secondary Color [color_square(pref.r_ears2, pref.g_ears2, pref.b_ears2)]
"
if(ear.extra_overlay2)
. += "Change Tertiary Color [color_square(pref.r_ears3, pref.g_ears3, pref.b_ears3)]
"
+ else
+ . += " Style: Select
"
- var/tail_display = "Normal"
- if(pref.tail_style && (pref.tail_style in tail_styles_list))
- var/datum/sprite_accessory/tail/instance = tail_styles_list[pref.tail_style]
- tail_display = instance.name
- else if(pref.tail_style)
- tail_display = "REQUIRES UPDATE"
+ var/list/tail_styles = pref.get_available_styles(global.tail_styles_list)
+ var/datum/sprite_accessory/tail/tail = tail_styles[pref.tail_style]
. += "Tail
"
- . += " Style: [tail_display]
"
-
- if(tail_styles_list[pref.tail_style])
- var/datum/sprite_accessory/tail/T = tail_styles_list[pref.tail_style]
- if(T.do_colouration)
+ if(istype(tail))
+ . += " Style: [tail.name]
"
+ if(tail.do_colouration)
. += "Change Color [color_square(pref.r_tail, pref.g_tail, pref.b_tail)]
"
- if(T.extra_overlay)
+ if(tail.extra_overlay)
. += "Change Secondary Color [color_square(pref.r_tail2, pref.g_tail2, pref.b_tail2)]
"
- if(T.extra_overlay2)
+ if(tail.extra_overlay2)
. += "Change Tertiary Color [color_square(pref.r_tail3, pref.g_tail3, pref.b_tail3)]
"
+ else
+ . += " Style: Select
"
- var/wing_display = "Normal"
- if(pref.wing_style && (pref.wing_style in wing_styles_list))
- var/datum/sprite_accessory/wing/instance = wing_styles_list[pref.wing_style]
- wing_display = instance.name
- else if(pref.wing_style)
- wing_display = "REQUIRES UPDATE"
+ var/list/wing_styles = pref.get_available_styles(global.wing_styles_list)
+ var/datum/sprite_accessory/wing/wings = wing_styles[pref.wing_style]
. += "Wing
"
- . += " Style: [wing_display]
"
-
- if(wing_styles_list[pref.wing_style])
- var/datum/sprite_accessory/wing/W = wing_styles_list[pref.wing_style]
- if(W.do_colouration)
+ if(istype(wings))
+ . += " Style: [wings.name]
"
+ if(wings.do_colouration)
. += "Change Color [color_square(pref.r_wing, pref.g_wing, pref.b_wing)]
"
- if(W.extra_overlay)
+ if(wings.extra_overlay)
. += "Change Secondary Color [color_square(pref.r_wing2, pref.g_wing2, pref.b_wing2)]
"
- if(W.extra_overlay2)
+ if(wings.extra_overlay2)
. += "Change Secondary Color [color_square(pref.r_wing3, pref.g_wing3, pref.b_wing3)]
"
+ else
+ . += " Style: Select
"
. += "
Body Markings +
"
. += ""
@@ -661,13 +689,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
reset_limbs() // Safety for species with incompatible manufacturers; easier than trying to do it case by case.
pref.body_markings.Cut() // Basically same as above.
- // Sanitize ear/wing/tail styles
- if(!(pref.ear_style in get_ear_styles()))
- pref.ear_style = initial(pref.ear_style)
- if(!(pref.wing_style in get_wing_styles()))
- pref.wing_style = initial(pref.wing_style)
- if(!(pref.tail_style in get_tail_styles()))
- pref.tail_style = initial(pref.tail_style)
+ pref.sanitize_body_styles()
var/min_age = get_min_age()
var/max_age = get_max_age()
@@ -1084,13 +1106,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["ear_style"])
- // Construct the list of names allowed for this user.
- var/list/pretty_ear_styles = get_ear_styles()
-
- // Present choice to user
- var/new_ear_style = input(user, "Pick ears", "Character Preference", pref.ear_style) as null|anything in pretty_ear_styles
+ var/new_ear_style = input(user, "Select an ear style for this character:", "Character Preference", pref.ear_style) as null|anything in pref.get_available_styles(global.ear_styles_list)
if(new_ear_style)
- pref.ear_style = pretty_ear_styles[new_ear_style]
+ pref.ear_style = new_ear_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -1122,14 +1140,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["tail_style"])
- // Construct the list of names allowed for this user.
- var/list/pretty_tail_styles = get_tail_styles()
-
- // Present choice to user
- var/new_tail_style = input(user, "Pick tails", "Character Preference", pref.tail_style) as null|anything in pretty_tail_styles
+ var/new_tail_style = input(user, "Select a tail style for this character:", "Character Preference", pref.tail_style) as null|anything in pref.get_available_styles(global.tail_styles_list)
if(new_tail_style)
- pref.tail_style = pretty_tail_styles[new_tail_style]
-
+ pref.tail_style = new_tail_style
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["tail_color"])
@@ -1160,13 +1173,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["wing_style"])
- // Construct the list of names allowed for this user.
- var/list/pretty_wing_styles = get_wing_styles()
-
- // Present choice to user
- var/new_wing_style = input(user, "Pick wings", "Character Preference", pref.wing_style) as null|anything in pretty_wing_styles
+ var/new_wing_style = input(user, "Select a wing style for this character:", "Character Preference", pref.wing_style) as null|anything in pref.get_available_styles(global.wing_styles_list)
if(new_wing_style)
- pref.wing_style = pretty_wing_styles[new_wing_style]
+ pref.wing_style = new_wing_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -1291,27 +1300,3 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "
"
user << browse(dat, "window=species;size=700x400")
-
-/datum/category_item/player_setup_item/general/body/proc/get_tail_styles()
- var/list/pretty_tail_styles = list("Normal" = null)
- for(var/path in tail_styles_list)
- var/datum/sprite_accessory/tail/instance = tail_styles_list[path]
- if(((!instance.ckeys_allowed) || (pref.client.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, pref.client)) //VOREStation Edit
- pretty_tail_styles[instance.name] = path
- return pretty_tail_styles
-
-/datum/category_item/player_setup_item/general/body/proc/get_ear_styles()
- var/list/pretty_ear_styles = list("Normal" = null)
- for(var/path in ear_styles_list)
- var/datum/sprite_accessory/ears/instance = ear_styles_list[path]
- if(((!instance.ckeys_allowed) || (pref.client.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, pref.client)) //VOREStation Edit
- pretty_ear_styles[instance.name] = path
- return pretty_ear_styles
-
-/datum/category_item/player_setup_item/general/body/proc/get_wing_styles()
- var/list/pretty_wing_styles = list("Normal" = null)
- for(var/path in wing_styles_list)
- var/datum/sprite_accessory/wing/instance = wing_styles_list[path]
- if(((!instance.ckeys_allowed) || (pref.client.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (pref.species in instance.species_allowed)) || check_rights(R_ADMIN | R_EVENT | R_FUN, 0, pref.client)) //VOREStation Edit
- pretty_wing_styles[instance.name] = path
- return pretty_wing_styles
diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm
new file mode 100644
index 00000000000..8c10b4cde2f
--- /dev/null
+++ b/code/modules/emotes/definitions/_mob.dm
@@ -0,0 +1,41 @@
+var/list/_default_mob_emotes = list(
+ /decl/emote/visible,
+ /decl/emote/visible/scratch,
+ /decl/emote/visible/drool,
+ /decl/emote/visible/nod,
+ /decl/emote/visible/sway,
+ /decl/emote/visible/sulk,
+ /decl/emote/visible/twitch,
+ /decl/emote/visible/twitch_v,
+ /decl/emote/visible/dance,
+ /decl/emote/visible/roll,
+ /decl/emote/visible/shake,
+ /decl/emote/visible/jump,
+ /decl/emote/visible/shiver,
+ /decl/emote/visible/collapse,
+ /decl/emote/visible/spin,
+ /decl/emote/visible/sidestep,
+ /decl/emote/audible,
+ /decl/emote/audible/hiss,
+ /decl/emote/audible/whimper,
+ /decl/emote/audible/gasp,
+ /decl/emote/audible/scretch,
+ /decl/emote/audible/choke,
+ /decl/emote/audible/moan,
+ /decl/emote/audible/gnarl,
+)
+
+/mob
+ var/list/usable_emotes
+
+/mob/proc/update_emotes(var/skip_sort)
+ usable_emotes = list()
+ for(var/emote in get_default_emotes())
+ var/decl/emote/emote_datum = decls_repository.get_decl(emote)
+ if(emote_datum.check_user(src))
+ usable_emotes[emote_datum.key] = emote_datum
+ if(!skip_sort)
+ usable_emotes = sortAssoc(usable_emotes)
+
+/mob/proc/get_default_emotes()
+ return global._default_mob_emotes
diff --git a/code/modules/emotes/definitions/_species.dm b/code/modules/emotes/definitions/_species.dm
new file mode 100644
index 00000000000..ff15df2fae5
--- /dev/null
+++ b/code/modules/emotes/definitions/_species.dm
@@ -0,0 +1,11 @@
+/datum/species
+ var/list/default_emotes = list()
+
+/mob/living/carbon/update_emotes(var/skip_sort)
+ . = ..(skip_sort = TRUE)
+ if(species)
+ for(var/emote in species.default_emotes)
+ var/decl/emote/emote_datum = decls_repository.get_decl(emote)
+ if(emote_datum.check_user(src))
+ usable_emotes[emote_datum.key] = emote_datum
+ usable_emotes = sortAssoc(usable_emotes)
diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
new file mode 100644
index 00000000000..6365f1171dd
--- /dev/null
+++ b/code/modules/emotes/definitions/audible.dm
@@ -0,0 +1,229 @@
+/decl/emote/audible
+ key = "burp"
+ emote_message_3p = "burps."
+ message_type = AUDIBLE_MESSAGE
+
+/decl/emote/audible/New()
+ . = ..()
+ // Snips the 'USER' from 3p emote messages for radio.
+ if(!emote_message_radio && emote_message_3p)
+ emote_message_radio = emote_message_3p
+ if(!emote_message_radio_synthetic && emote_message_synthetic_3p)
+ emote_message_radio_synthetic = emote_message_synthetic_3p
+
+/decl/emote/audible/deathgasp_alien
+ key = "deathgasp"
+ emote_message_3p = "lets out a waning guttural screech, green blood bubbling from its maw."
+
+/decl/emote/audible/whimper
+ key = "whimper"
+ emote_message_3p = "whimpers."
+
+/decl/emote/audible/gasp
+ key = "gasp"
+ emote_message_3p = "gasps."
+ conscious = FALSE
+
+/decl/emote/audible/scretch
+ key = "scretch"
+ emote_message_3p = "scretches."
+
+/decl/emote/audible/choke
+ key ="choke"
+ emote_message_3p = "chokes."
+ conscious = FALSE
+
+/decl/emote/audible/gnarl
+ key = "gnarl"
+ emote_message_3p = "gnarls and shows USER_HIS teeth."
+
+/decl/emote/audible/multichirp
+ key = "mchirp"
+ emote_message_3p = "chirps a chorus of notes!"
+ emote_sound = 'sound/voice/multichirp.ogg'
+
+/decl/emote/audible/alarm
+ key = "alarm"
+ emote_message_1p = "You sound an alarm."
+ emote_message_3p = "sounds an alarm."
+
+/decl/emote/audible/alert
+ key = "alert"
+ emote_message_1p = "You let out a distressed noise."
+ emote_message_3p = "lets out a distressed noise."
+
+/decl/emote/audible/notice
+ key = "notice"
+ emote_message_1p = "You play a loud tone."
+ emote_message_3p = "plays a loud tone."
+
+/decl/emote/audible/boop
+ key = "boop"
+ emote_message_1p = "You boop."
+ emote_message_3p = "boops."
+
+/decl/emote/audible/beep
+ key = "beep"
+ emote_message_3p = "You beep."
+ emote_message_3p = "beeps."
+ emote_sound = 'sound/machines/twobeep.ogg'
+
+/decl/emote/audible/sniff
+ key = "sniff"
+ emote_message_3p = "sniffs."
+
+/decl/emote/audible/snore
+ key = "snore"
+ emote_message_3p = "snores."
+ conscious = FALSE
+
+/decl/emote/audible/whimper
+ key = "whimper"
+ emote_message_3p = "whimpers."
+
+/decl/emote/audible/yawn
+ key = "yawn"
+ emote_message_3p = "yawns."
+
+/decl/emote/audible/clap
+ key = "clap"
+ emote_message_3p = "claps."
+
+/decl/emote/audible/chuckle
+ key = "chuckle"
+ emote_message_3p = "chuckles."
+
+/decl/emote/audible/cry
+ key = "cry"
+ emote_message_3p = "cries."
+
+/decl/emote/audible/sigh
+ key = "sigh"
+ emote_message_3p = "sighs."
+
+/decl/emote/audible/laugh
+ key = "laugh"
+ emote_message_3p_target = "laughs at TARGET."
+ emote_message_3p = "laughs."
+
+/decl/emote/audible/mumble
+ key = "mumble"
+ emote_message_3p = "mumbles!"
+
+/decl/emote/audible/grumble
+ key = "grumble"
+ emote_message_3p = "grumbles!"
+
+/decl/emote/audible/groan
+ key = "groan"
+ emote_message_3p = "groans!"
+ conscious = FALSE
+
+/decl/emote/audible/moan
+ key = "moan"
+ emote_message_3p = "moans!"
+ conscious = FALSE
+
+/decl/emote/audible/giggle
+ key = "giggle"
+ emote_message_3p = "giggles."
+
+/decl/emote/audible/grunt
+ key = "grunt"
+ emote_message_3p = "grunts."
+
+/decl/emote/audible/bug_hiss
+ key ="hiss"
+ emote_message_3p_target = "hisses at TARGET."
+ emote_message_3p = "hisses."
+ emote_sound = 'sound/voice/BugHiss.ogg'
+
+/decl/emote/audible/bug_buzz
+ key ="buzz"
+ emote_message_3p = "buzzes its wings."
+ emote_sound = 'sound/voice/BugBuzz.ogg'
+
+/decl/emote/audible/bug_chitter
+ key ="chitter"
+ emote_message_3p = "chitters."
+ emote_sound = 'sound/voice/Bug.ogg'
+
+/decl/emote/audible/roar
+ key = "roar"
+ emote_message_3p = "roars!"
+
+/decl/emote/audible/bellow
+ key = "bellow"
+ emote_message_3p = "bellows!"
+
+/decl/emote/audible/howl
+ key = "howl"
+ emote_message_3p = "howls!"
+
+/decl/emote/audible/wheeze
+ key = "wheeze"
+ emote_message_3p = "wheezes."
+
+/decl/emote/audible/hiss
+ key = "hiss"
+ emote_message_3p_target = "hisses softly at TARGET."
+ emote_message_3p = "hisses softly."
+
+/decl/emote/audible/chirp
+ key = "chirp"
+ emote_message_3p = "chirps!"
+ emote_sound = 'sound/misc/nymphchirp.ogg'
+
+/decl/emote/audible/crack
+ key = "crack"
+ emote_message_3p = "cracks USER_HIS knuckles."
+ emote_sound = 'sound/voice/knuckles.ogg'
+
+/decl/emote/audible/squish
+ key = "squish"
+ emote_sound = 'sound/effects/slime_squish.ogg' //Credit to DrMinky (freesound.org) for the sound.
+ emote_message_3p = "squishes."
+
+/decl/emote/audible/warble
+ key = "warble"
+ emote_sound = 'sound/effects/warble.ogg' // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
+ emote_message_3p = "warbles."
+
+/decl/emote/audible/vox_shriek
+ key = "shriek"
+ emote_message_3p = "SHRIEKS!"
+ emote_sound = 'sound/voice/shriek1.ogg'
+
+/decl/emote/audible/purr
+ key = "purr"
+ emote_message_3p = "purrs."
+ emote_sound = 'sound/voice/cat_purr.ogg'
+
+/decl/emote/audible/purrlong
+ key = "purrl"
+ emote_message_3p = "purrs."
+ emote_sound = 'sound/voice/cat_purr_long.ogg'
+
+/decl/emote/audible/teshsqueak
+ key = "surprised"
+ emote_message_1p = "You chirp in surprise!"
+ emote_message_3p = "chirps in surprise!"
+ 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.
+
+/decl/emote/audible/teshchirp
+ key = "chirp"
+ emote_message_1p = "You chirp!"
+ emote_message_3p = "chirps!"
+ emote_message_1p_target = "You chirp at TARGET!"
+ emote_message_3p_target = "chirps at TARGET!"
+ emote_sound = 'sound/voice/teshchirp.ogg' // Copyright Sampling+ 1.0 Incarnidine (freesound.org) for the source audio.
+
+/decl/emote/audible/teshtrill
+ key = "trill"
+ emote_message_1p = "You trill."
+ emote_message_3p = "trills."
+ emote_message_1p_target = "You trill at TARGET."
+ emote_message_3p_target = "trills at TARGET."
+ emote_sound = 'sound/voice/teshtrill.ogg' // Copyright CC BY-NC 3.0 Arnaud Coutancier (freesound.org) for the source audio.
diff --git a/code/modules/emotes/definitions/audible_cough.dm b/code/modules/emotes/definitions/audible_cough.dm
new file mode 100644
index 00000000000..4e28d1db918
--- /dev/null
+++ b/code/modules/emotes/definitions/audible_cough.dm
@@ -0,0 +1,52 @@
+/decl/emote/audible/cough
+ key = "cough"
+ emote_message_1p = "You cough!"
+ emote_message_1p_target = "You cough on TARGET!"
+ emote_message_3p = "coughs!"
+ emote_message_3p_target = "coughs on TARGET!"
+ emote_message_synthetic_1p_target = "You emit a robotic cough towards TARGET."
+ emote_message_synthetic_1p = "You emit a robotic cough."
+ emote_message_synthetic_3p_target = "emits a robotic cough towards TARGET."
+ emote_message_synthetic_3p = "emits a robotic cough."
+ emote_volume = 120
+ emote_volume_synthetic = 50
+
+ conscious = FALSE
+ emote_sound_synthetic = list(
+ FEMALE = list(
+ 'sound/effects/mob_effects/f_machine_cougha.ogg',
+ 'sound/effects/mob_effects/f_machine_coughb.ogg'
+ ),
+ MALE = list(
+ 'sound/effects/mob_effects/m_machine_cougha.ogg',
+ 'sound/effects/mob_effects/m_machine_coughb.ogg',
+ 'sound/effects/mob_effects/m_machine_coughc.ogg'
+ ),
+ NEUTER = list(
+ 'sound/effects/mob_effects/m_machine_cougha.ogg',
+ 'sound/effects/mob_effects/m_machine_coughb.ogg',
+ 'sound/effects/mob_effects/m_machine_coughc.ogg'
+ ),
+ PLURAL = list(
+ 'sound/effects/mob_effects/m_machine_cougha.ogg',
+ 'sound/effects/mob_effects/m_machine_coughb.ogg',
+ 'sound/effects/mob_effects/m_machine_coughc.ogg'
+ )
+ )
+
+/decl/emote/audible/cough/get_emote_sound(var/atom/user)
+ if(ishuman(user) && !check_synthetic(user))
+ var/mob/living/carbon/human/H = user
+ if(H.get_gender() == FEMALE)
+ if(length(H.species.female_cough_sounds))
+ return list(
+ "sound" = H.species.female_cough_sounds,
+ "vol" = emote_volume
+ )
+ else
+ if(length(H.species.male_cough_sounds))
+ return list(
+ "sound" = H.species.male_cough_sounds,
+ "vol" = emote_volume
+ )
+ return ..()
diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm
new file mode 100644
index 00000000000..681e9101a29
--- /dev/null
+++ b/code/modules/emotes/definitions/audible_furry_vr.dm
@@ -0,0 +1,129 @@
+/decl/emote/audible/awoo
+ key = "awoo"
+ emote_message_3p = "lets out an awoo."
+ emote_sound = 'sound/voice/awoo.ogg'
+/decl/emote/audible/awoo2
+ key = "awoo2"
+ emote_message_3p = "lets out an awoo."
+ emote_sound = 'sound/voice/long_awoo.ogg'
+/decl/emote/audible/growl
+ key = "growl"
+ emote_message_3p = "lets out a growl."
+ emote_sound = 'sound/voice/growl.ogg'
+/decl/emote/audible/woof
+ key = "woof"
+ emote_message_3p = "lets out a woof."
+ emote_sound = 'sound/voice/woof.ogg'
+/decl/emote/audible/woof2
+ key = "woof2"
+ emote_message_3p = "lets out a woof."
+ emote_sound = 'sound/voice/woof2.ogg'
+/decl/emote/audible/nya
+ key = "nya"
+ emote_message_3p = "lets out a nya."
+ emote_sound = 'sound/voice/nya.ogg'
+/decl/emote/audible/mrowl
+ key = "mrowl"
+ emote_message_3p = "mrowls."
+ emote_sound = 'sound/voice/mrow.ogg'
+/decl/emote/audible/peep
+ key = "peep"
+ emote_message_3p = "peeps like a bird."
+ emote_sound = 'sound/voice/peep.ogg'
+/decl/emote/audible/chirp
+ key = "chirp"
+ emote_message_3p = "chirps!"
+ emote_sound = 'sound/misc/nymphchirp.ogg'
+/decl/emote/audible/hoot
+ key = "hoot"
+ emote_message_3p = "hoots!"
+ emote_sound = 'sound/voice/hoot.ogg'
+/decl/emote/audible/weh
+ key = "weh"
+ emote_message_3p = "lets out a weh."
+ emote_sound = 'sound/voice/weh.ogg'
+/decl/emote/audible/merp
+ key = "merp"
+ emote_message_3p = "lets out a merp."
+ emote_sound = 'sound/voice/merp.ogg'
+/decl/emote/audible/myarp
+ key = "myarp"
+ emote_message_3p = "lets out a myarp."
+ emote_sound = 'sound/voice/myarp.ogg'
+/decl/emote/audible/bark
+ key = "bark"
+ emote_message_3p = "lets out a bark."
+ emote_sound = 'sound/voice/bark2.ogg'
+/decl/emote/audible/bork
+ key = "bork"
+ emote_message_3p = "lets out a bork."
+ emote_sound = 'sound/voice/bork.ogg'
+/decl/emote/audible/mrow
+ emote_message_3p = "lets out a mrow."
+ emote_sound = 'sound/voice/mrow.ogg'
+/decl/emote/audible/hypno
+ emote_message_3p = "lets out a mystifying tone."
+ emote_sound = 'sound/voice/hypno.ogg'
+/decl/emote/audible/hiss
+ key = "hiss"
+ emote_message_3p = "lets out a hiss."
+ emote_sound = 'sound/voice/hiss.ogg'
+/decl/emote/audible/rattle
+ key = "rattle"
+ emote_message_3p = "rattles!"
+ emote_sound = 'sound/voice/rattle.ogg'
+/decl/emote/audible/squeak
+ key = "squeak"
+ emote_message_3p = "lets out a squeak."
+ emote_sound = 'sound/effects/mouse_squeak.ogg'
+/decl/emote/audible/geck
+ key = "geck"
+ emote_message_3p = "geckers!"
+ emote_sound = 'sound/voice/geck.ogg'
+/decl/emote/audible/baa
+ key = "baa"
+ emote_message_3p = "lets out a baa."
+ emote_sound = 'sound/voice/baa.ogg'
+/decl/emote/audible/baa2
+ key = "baa2"
+ emote_message_3p = "bleats."
+ emote_sound = 'sound/voice/baa2.ogg'
+/*
+/decl/emote/audible/deathgasp2
+ key = "deathgasp2"
+ emote_message_3p = "[species.get_death_message()]"
+ m_type = 1
+ emote_sound = 'sound/voice/deathgasp2.ogg'
+*/
+/decl/emote/audible/mar
+ key = "mar"
+ emote_message_3p = "lets out a mar."
+ emote_sound = 'sound/voice/mar.ogg'
+/decl/emote/audible/wurble
+ key = "wurble"
+ emote_message_3p = "lets out a wurble."
+ emote_sound = 'sound/voice/wurble.ogg'
+/decl/emote/audible/snort
+ key = "snort"
+ emote_message_3p = "snorts!"
+ emote_sound = 'sound/voice/Snort.ogg'
+/decl/emote/audible/meow
+ key = "meow"
+ emote_message_3p = "gently meows!"
+ emote_sound = 'sound/voice/Meow.ogg'
+/decl/emote/audible/moo
+ key = "moo"
+ emote_message_3p = "takes a breath and lets out a moo."
+ emote_sound = 'sound/voice/Moo.ogg'
+/decl/emote/audible/croak
+ key = "croak"
+ emote_message_3p = "rumbles their throat, puffs their cheeks and croaks."
+ emote_sound = 'sound/voice/Croak.ogg'
+/decl/emote/audible/gao
+ key = "gao"
+ emote_message_3p = "lets out a gao."
+ emote_sound = 'sound/voice/gao.ogg'
+/decl/emote/audible/cackle
+ key = "cackle"
+ emote_message_3p = "cackles hysterically!"
+ emote_sound = 'sound/voice/YeenCackle.ogg'
diff --git a/code/modules/emotes/definitions/audible_scream.dm b/code/modules/emotes/definitions/audible_scream.dm
new file mode 100644
index 00000000000..00ed9c29fc3
--- /dev/null
+++ b/code/modules/emotes/definitions/audible_scream.dm
@@ -0,0 +1,16 @@
+/decl/emote/audible/scream
+ key = "scream"
+ emote_message_1p = "You scream!"
+ emote_message_3p = "screams!"
+
+/decl/emote/audible/scream/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ return "You [H.species.scream_verb_1p]!"
+ . = ..()
+
+/decl/emote/audible/cough/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ return "[H.species.scream_verb_3p]!"
+ . = ..()
diff --git a/code/modules/emotes/definitions/audible_slap.dm b/code/modules/emotes/definitions/audible_slap.dm
new file mode 100644
index 00000000000..d0b5466c30c
--- /dev/null
+++ b/code/modules/emotes/definitions/audible_slap.dm
@@ -0,0 +1,24 @@
+/decl/emote/audible/slap
+ key = "slap"
+ emote_message_1p_target = "You slap TARGET across the face. Ouch!"
+ emote_message_1p = "You slap yourself across the face!"
+ emote_message_3p_target = "slaps TARGET across the face. Ouch!"
+ emote_message_3p = "slaps USER_SELF across the face!"
+ emote_sound = 'sound/effects/snap.ogg'
+ check_restraints = TRUE
+ check_range = 1
+
+/decl/emote/audible/slap/New()
+ ..()
+ emote_message_1p_target = SPAN_DANGER(emote_message_1p_target)
+ emote_message_1p = SPAN_DANGER(emote_message_1p)
+ emote_message_3p_target = SPAN_DANGER(emote_message_3p_target)
+ emote_message_3p = SPAN_DANGER(emote_message_3p)
+
+/decl/emote/audible/slap/do_extra(var/atom/user, var/atom/target)
+ . = ..()
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ var/obj/item/clothing/mask/smokable/mask = H.wear_mask
+ if(istype(mask) && H.unEquip(mask))
+ mask.forceMove(get_turf(H))
diff --git a/code/modules/emotes/definitions/audible_snap.dm b/code/modules/emotes/definitions/audible_snap.dm
new file mode 100644
index 00000000000..938273fe76c
--- /dev/null
+++ b/code/modules/emotes/definitions/audible_snap.dm
@@ -0,0 +1,22 @@
+/decl/emote/audible/snap
+ key = "snap"
+ emote_message_1p = "You snap your fingers."
+ emote_message_3p = "snaps USER_HIS fingers."
+ emote_message_1p_target = "You snap your fingers at TARGET."
+ emote_message_3p_target = "snaps USER_HIS fingers at TARGET."
+ emote_sound = 'sound/effects/fingersnap.ogg'
+
+/decl/emote/audible/snap/proc/can_snap(var/atom/user)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ for(var/limb in list(BP_L_HAND, BP_R_HAND))
+ var/obj/item/organ/external/L = H.get_organ(limb)
+ if(istype(L) && L.is_usable() && !L.splinted)
+ return TRUE
+ return FALSE
+
+/decl/emote/audible/snap/do_emote(var/atom/user, var/extra_params)
+ if(!can_snap(user))
+ to_chat(user, SPAN_WARNING("You need at least one working hand to snap your fingers."))
+ return FALSE
+ . = ..()
diff --git a/code/modules/emotes/definitions/audible_sneeze.dm b/code/modules/emotes/definitions/audible_sneeze.dm
new file mode 100644
index 00000000000..a15cbaf46db
--- /dev/null
+++ b/code/modules/emotes/definitions/audible_sneeze.dm
@@ -0,0 +1,29 @@
+/decl/emote/audible/sneeze
+ key = "sneeze"
+ emote_message_1p = "You sneeze."
+ emote_message_3p = "sneezes."
+ emote_sound_synthetic = list(
+ FEMALE = 'sound/effects/mob_effects/machine_sneeze.ogg',
+ MALE = 'sound/effects/mob_effects/f_machine_sneeze.ogg',
+ NEUTER = 'sound/effects/mob_effects/f_machine_sneeze.ogg',
+ PLURAL = 'sound/effects/mob_effects/f_machine_sneeze.ogg'
+ )
+ emote_message_synthetic_1p = "You emit a robotic sneeze."
+ emote_message_synthetic_1p_target = "You emit a robotic sneeze towards TARGET."
+ emote_message_synthetic_3p = "emits a robotic sneeze."
+ emote_message_synthetic_3p_target = "emits a robotic sneeze towards TARGET."
+
+/decl/emote/audible/sneeze/get_emote_sound(var/atom/user)
+ if(ishuman(user) && !check_synthetic(user))
+ var/mob/living/carbon/human/H = user
+ if(H.get_gender() == FEMALE)
+ return list(
+ "sound" = H.species.female_sneeze_sound,
+ "vol" = emote_volume
+ )
+ else
+ return list(
+ "sound" = H.species.male_sneeze_sound,
+ "vol" = emote_volume
+ )
+ return ..()
diff --git a/code/modules/emotes/definitions/audible_whistle.dm b/code/modules/emotes/definitions/audible_whistle.dm
new file mode 100644
index 00000000000..dabd64af59d
--- /dev/null
+++ b/code/modules/emotes/definitions/audible_whistle.dm
@@ -0,0 +1,36 @@
+/decl/emote/audible/whistle
+ key = "whistle"
+ emote_message_1p = "You whistle a tune."
+ emote_message_3p = "whistles a tune."
+ emote_sound = 'sound/voice/longwhistle.ogg'
+ emote_message_muffled = "makes a light spitting noise, a poor attempt at a whistle."
+ emote_sound_synthetic = 'sound/voice/longwhistle_robot.ogg'
+ emote_message_synthetic_1p = "You whistle a robotic tune."
+ emote_message_synthetic_3p = "whistles a robotic tune."
+
+/decl/emote/audible/whistle/quiet
+ key = "qwhistle"
+ emote_message_1p = "You whistle quietly."
+ emote_message_3p = "whistles quietly."
+ emote_sound = 'sound/voice/shortwhistle.ogg'
+ emote_message_synthetic_1p = "You whistle robotically."
+ emote_message_synthetic_3p = "whistles robotically."
+ emote_sound_synthetic = 'sound/voice/shortwhistle_robot.ogg'
+
+/decl/emote/audible/whistle/wolf
+ key = "wwhistle"
+ emote_message_1p = "You whistle inappropriately."
+ emote_message_3p = "whistles inappropriately."
+ emote_sound = 'sound/voice/wolfwhistle.ogg'
+ emote_message_synthetic_1p = "You beep inappropriately."
+ emote_message_synthetic_3p = "beeps inappropriately."
+ emote_sound_synthetic = 'sound/voice/wolfwhistle_robot.ogg'
+
+/decl/emote/audible/whistle/summon
+ key = "swhistle"
+ emote_message_1p = "You whistle a tune."
+ emote_message_3p = "whistles a tune."
+ emote_sound = 'sound/voice/summon_whistle.ogg'
+ emote_message_synthetic_1p = "You whistle a robotic tune."
+ emote_message_synthetic_3p = "whistles a robotic tune."
+ emote_sound_synthetic = 'sound/voice/summon_whistle_robot.ogg'
diff --git a/code/modules/emotes/definitions/exertion.dm b/code/modules/emotes/definitions/exertion.dm
new file mode 100644
index 00000000000..ac0061cca32
--- /dev/null
+++ b/code/modules/emotes/definitions/exertion.dm
@@ -0,0 +1,40 @@
+/decl/emote/exertion/biological
+ key = "esweat"
+ emote_range = 4
+ emote_message_1p = "You are sweating heavily."
+ emote_message_3p = "is sweating heavily."
+
+/decl/emote/exertion/biological/check_user(mob/living/user)
+ if(istype(user) && !user.isSynthetic())
+ return ..()
+ return FALSE
+
+/decl/emote/exertion/biological/breath
+ key = "ebreath"
+ emote_message_1p = "You feel out of breath."
+ emote_message_3p = "looks out of breath."
+
+/decl/emote/exertion/biological/pant
+ key = "epant"
+ emote_range = 3
+ message_type = AUDIBLE_MESSAGE
+ emote_message_1p = "You pant to catch your breath."
+ emote_message_3p = "pants for air."
+ emote_message_impaired = "You can see USER breathing heavily."
+
+/decl/emote/exertion/synthetic
+ key = "ewhine"
+ emote_range = 3
+ message_type = AUDIBLE_MESSAGE
+ emote_message_1p = "You overstress your actuators."
+ emote_message_3p = "USER's actuators whine with strain."
+
+/decl/emote/exertion/synthetic/check_user(mob/living/user)
+ if(istype(user) && user.isSynthetic())
+ return ..()
+ return FALSE
+
+/decl/emote/exertion/synthetic/creak
+ key = "ecreak"
+ emote_message_1p = "Your chassis stress indicators spike."
+ emote_message_3p = "USER's joints creak with stress."
diff --git a/code/modules/emotes/definitions/helpers_vr.dm b/code/modules/emotes/definitions/helpers_vr.dm
new file mode 100644
index 00000000000..6dc3a79bddc
--- /dev/null
+++ b/code/modules/emotes/definitions/helpers_vr.dm
@@ -0,0 +1,33 @@
+// Not specifically /human type because those won't allow FBPs to use them
+/decl/emote/helper/vwag
+ key = "vwag"
+ emote_message_3p = ""
+
+/decl/emote/helper/vwag/check_user(mob/living/carbon/human/user)
+ if(!istype(user) || (!user.tail_style || !user.tail_style.ani_state))
+ return FALSE
+ return ..()
+
+/decl/emote/helper/vwag/do_emote(var/mob/living/carbon/human/user, var/extra_params)
+ if(user.toggle_tail(message = 1))
+ return ..()
+
+/decl/emote/helper/vwag/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
+ return "[user.wagging ? "starts" : "stops"] wagging USER_THEIR tail."
+
+
+/decl/emote/helper/vflap
+ key = "vflap"
+ emote_message_3p = ""
+
+/decl/emote/helper/vflap/check_user(mob/living/carbon/human/user)
+ if(!istype(user) || (!user.wing_style || !user.wing_style.ani_state))
+ return FALSE
+ return ..()
+
+/decl/emote/helper/vflap/do_emote(var/mob/living/carbon/human/user, var/extra_params)
+ if(user.toggle_wing(message = 1))
+ return ..()
+
+/decl/emote/helper/vflap/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
+ return "[user.flapping ? "starts" : "stops"] flapping USER_THEIR wings."
diff --git a/code/modules/emotes/definitions/human.dm b/code/modules/emotes/definitions/human.dm
new file mode 100644
index 00000000000..982e472c5f2
--- /dev/null
+++ b/code/modules/emotes/definitions/human.dm
@@ -0,0 +1,62 @@
+/decl/emote/human
+ key = "vomit"
+
+/decl/emote/human/check_user(var/mob/living/carbon/human/user)
+ return (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
+
+/decl/emote/human/do_emote(var/mob/living/carbon/human/user)
+ user.vomit()
+
+/decl/emote/human/deathgasp
+ key = "deathgasp"
+
+/decl/emote/human/deathgasp/do_emote(mob/living/carbon/human/user)
+ if(istype(user) && user.species.get_death_message(user) == DEATHGASP_NO_MESSAGE)
+ to_chat(user, SPAN_WARNING("Your species has no deathgasp."))
+ return
+ . = ..()
+
+/decl/emote/human/deathgasp/get_emote_message_3p(var/mob/living/carbon/human/user)
+ return "USER [user.species.get_death_message(user)]"
+
+/decl/emote/human/swish
+ key = "swish"
+
+/decl/emote/human/swish/do_emote(var/mob/living/carbon/human/user)
+ user.animate_tail_once()
+
+/decl/emote/human/wag
+ key = "wag"
+
+/decl/emote/human/wag/do_emote(var/mob/living/carbon/human/user)
+ user.animate_tail_start()
+
+/decl/emote/human/sway
+ key = "sway"
+
+/decl/emote/human/sway/do_emote(var/mob/living/carbon/human/user)
+ user.animate_tail_start()
+
+/decl/emote/human/qwag
+ key = "qwag"
+
+/decl/emote/human/qwag/do_emote(var/mob/living/carbon/human/user)
+ user.animate_tail_fast()
+
+/decl/emote/human/fastsway
+ key = "fastsway"
+
+/decl/emote/human/fastsway/do_emote(var/mob/living/carbon/human/user)
+ user.animate_tail_fast()
+
+/decl/emote/human/swag
+ key = "swag"
+
+/decl/emote/human/swag/do_emote(var/mob/living/carbon/human/user)
+ user.animate_tail_stop()
+
+/decl/emote/human/stopsway
+ key = "stopsway"
+
+/decl/emote/human/stopsway/do_emote(var/mob/living/carbon/human/user)
+ user.animate_tail_stop()
diff --git a/code/modules/emotes/definitions/slimes.dm b/code/modules/emotes/definitions/slimes.dm
new file mode 100644
index 00000000000..877422825ba
--- /dev/null
+++ b/code/modules/emotes/definitions/slimes.dm
@@ -0,0 +1,32 @@
+/decl/emote/slime
+ key = "nomood"
+ var/mood
+
+/decl/emote/slime/do_extra(var/mob/living/simple_mob/slime/user)
+ . = ..()
+ if(istype(user))
+ user.mood = mood
+ user.update_icon()
+
+/decl/emote/slime/check_user(var/atom/user)
+ return isslime(user)
+
+/decl/emote/slime/pout
+ key = "pout"
+ mood = "pout"
+
+/decl/emote/slime/sad
+ key = "sad"
+ mood = "sad"
+
+/decl/emote/slime/angry
+ key = "angry"
+ mood = "angry"
+
+/decl/emote/slime/frown
+ key = "frown"
+ mood = "mischevous"
+
+/decl/emote/slime/smile
+ key = "smile"
+ mood = ":3"
diff --git a/code/modules/emotes/definitions/synthetics.dm b/code/modules/emotes/definitions/synthetics.dm
new file mode 100644
index 00000000000..007fe4bc32a
--- /dev/null
+++ b/code/modules/emotes/definitions/synthetics.dm
@@ -0,0 +1,51 @@
+/decl/emote/audible/synth
+ key = "beep"
+ emote_message_3p = "beeps."
+ emote_sound = 'sound/machines/twobeep.ogg'
+
+/decl/emote/audible/synth/check_user(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/buzz
+ key = "buzz"
+ emote_message_3p = "buzzes."
+ emote_sound = 'sound/machines/buzz-sigh.ogg'
+
+/decl/emote/audible/synth/confirm
+ key = "confirm"
+ emote_message_3p = "emits an affirmative blip."
+ emote_sound = 'sound/machines/synth_yes.ogg'
+
+/decl/emote/audible/synth/deny
+ key = "deny"
+ emote_message_3p = "emits a negative blip."
+ emote_sound = 'sound/machines/synth_no.ogg'
+
+/decl/emote/audible/synth/security
+ key = "law"
+ emote_message_3p = "shows USER_HIS legal authorization barcode."
+ emote_message_3p_target = "shows TARGET USER_THEIR legal authorization barcode."
+ 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) || istype(user.module, /obj/item/weapon/robot_module/robot/knine))) //VOREStation Add - knine module
+
+/decl/emote/audible/synth/security/halt
+ key = "halt"
+ emote_message_3p = "USER's speakers skreech, \"Halt! Security!\"."
+ emote_sound = 'sound/voice/halt.ogg'
+
+/decl/emote/audible/synth/dwoop
+ key = "dwoop"
+ emote_message_1p_target = "You chirp happily at TARGET!"
+ emote_message_1p = "You chirp happily."
+ emote_message_3p_target = "chirps happily at TARGET!"
+ emote_message_3p = "chirps happily."
+ emote_sound = 'sound/machines/dwoop.ogg'
diff --git a/code/modules/emotes/definitions/visible.dm b/code/modules/emotes/definitions/visible.dm
new file mode 100644
index 00000000000..b346dd3692f
--- /dev/null
+++ b/code/modules/emotes/definitions/visible.dm
@@ -0,0 +1,336 @@
+/decl/emote/visible
+ key ="tail"
+ emote_message_3p = "waves USER_THEIR tail."
+ message_type = VISIBLE_MESSAGE
+
+/decl/emote/visible/scratch
+ key = "scratch"
+ check_restraints = TRUE
+ emote_message_3p = "scratches."
+
+/decl/emote/visible/drool
+ key ="drool"
+ emote_message_3p = "drools."
+ conscious = FALSE
+
+/decl/emote/visible/nod
+ key ="nod"
+ emote_message_3p_target = "nods USER_THEIR head at TARGET."
+ emote_message_3p = "nods USER_THEIR head."
+
+/decl/emote/visible/sway
+ key ="sway"
+ emote_message_3p = "sways around dizzily."
+
+/decl/emote/visible/sulk
+ key ="sulk"
+ emote_message_3p = "sulks down sadly."
+
+/decl/emote/visible/dance
+ key ="dance"
+ check_restraints = TRUE
+ emote_message_3p = "dances around happily."
+
+/decl/emote/visible/roll
+ key ="roll"
+ check_restraints = TRUE
+ emote_message_3p = "rolls."
+
+/decl/emote/visible/shake
+ key ="shake"
+ emote_message_3p = "shakes USER_THEIR head."
+
+/decl/emote/visible/jump
+ key ="jump"
+ emote_message_3p = "jumps!"
+
+/decl/emote/visible/shiver
+ key ="shiver"
+ emote_message_3p = "shivers."
+ conscious = FALSE
+
+/decl/emote/visible/collapse
+ key ="collapse"
+ emote_message_3p = "collapses!"
+
+/decl/emote/visible/collapse/do_extra(var/mob/user)
+ ..()
+ if(istype(user))
+ user.Paralyse(2)
+
+/decl/emote/visible/flash
+ key = "flash"
+ emote_message_3p = "flash USER_HIS lights quickly."
+
+/decl/emote/visible/blink
+ key = "blink"
+ emote_message_3p = "blinks."
+
+/decl/emote/visible/airguitar
+ key = "airguitar"
+ check_restraints = TRUE
+ emote_message_3p = "is strumming the air and headbanging like a safari chimp."
+
+/decl/emote/visible/blink_r
+ key = "blink_r"
+ emote_message_3p = "blinks rapidly."
+
+/decl/emote/visible/bow
+ key = "bow"
+ emote_message_3p_target = "bows to TARGET."
+ emote_message_3p = "bows."
+
+/decl/emote/visible/salute
+ key = "salute"
+ emote_message_3p_target = "salutes TARGET."
+ emote_message_3p = "salutes."
+ check_restraints = TRUE
+
+/decl/emote/visible/flap
+ key = "flap"
+ check_restraints = TRUE
+ emote_message_3p = "flaps USER_THEIR wings."
+
+/decl/emote/visible/aflap
+ key = "aflap"
+ check_restraints = TRUE
+ emote_message_3p = "flaps USER_THEIR wings ANGRILY!"
+
+/decl/emote/visible/eyebrow
+ key = "eyebrow"
+ emote_message_3p = "raises an eyebrow."
+
+/decl/emote/visible/twitch
+ key = "twitch"
+ emote_message_3p = "twitches."
+ conscious = FALSE
+
+/decl/emote/visible/twitch_v
+ key = "twitch_v"
+ emote_message_3p = "twitches violently."
+ conscious = FALSE
+
+/decl/emote/visible/faint
+ key = "faint"
+ emote_message_3p = "faints."
+
+/decl/emote/visible/faint/do_extra(var/mob/user)
+ . = ..()
+ if(istype(user) && !user.sleeping)
+ user.Sleeping(10)
+
+/decl/emote/visible/frown
+ key = "frown"
+ emote_message_3p = "frowns."
+
+/decl/emote/visible/blush
+ key = "blush"
+ emote_message_3p = "blushes."
+
+/decl/emote/visible/wave
+ key = "wave"
+ emote_message_3p_target = "waves at TARGET."
+ emote_message_3p = "waves."
+ check_restraints = TRUE
+
+/decl/emote/visible/glare
+ key = "glare"
+ emote_message_3p_target = "glares at TARGET."
+ emote_message_3p = "glares."
+
+/decl/emote/visible/stare
+ key = "stare"
+ emote_message_3p_target = "stares at TARGET."
+ emote_message_3p = "stares."
+
+/decl/emote/visible/look
+ key = "look"
+ emote_message_3p_target = "looks at TARGET."
+ emote_message_3p = "looks."
+
+/decl/emote/visible/point
+ key = "point"
+ check_restraints = TRUE
+ emote_message_3p_target = "points to TARGET."
+ emote_message_3p = "points."
+
+/decl/emote/visible/raise
+ key = "raise"
+ check_restraints = TRUE
+ emote_message_3p = "raises a hand."
+
+/decl/emote/visible/grin
+ key = "grin"
+ emote_message_3p_target = "grins at TARGET."
+ emote_message_3p = "grins."
+
+/decl/emote/visible/shrug
+ key = "shrug"
+ emote_message_3p = "shrugs."
+
+/decl/emote/visible/smile
+ key = "smile"
+ emote_message_3p_target = "smiles at TARGET."
+ emote_message_3p = "smiles."
+
+/decl/emote/visible/pale
+ key = "pale"
+ emote_message_3p = "goes pale for a second."
+
+/decl/emote/visible/tremble
+ key = "tremble"
+ emote_message_3p = "trembles in fear!"
+
+/decl/emote/visible/wink
+ key = "wink"
+ emote_message_3p_target = "winks at TARGET."
+ emote_message_3p = "winks."
+
+/decl/emote/visible/hug
+ key = "hug"
+ check_restraints = TRUE
+ emote_message_3p_target = "hugs TARGET."
+ emote_message_3p = "hugs USER_SELF."
+ check_range = 1
+
+/decl/emote/visible/dap
+ key = "dap"
+ check_restraints = TRUE
+ emote_message_3p_target = "gives daps to TARGET."
+ emote_message_3p = "sadly can't find anybody to give daps to, and daps USER_SELF."
+
+/decl/emote/visible/bounce
+ key = "bounce"
+ emote_message_3p = "bounces in place."
+
+/decl/emote/visible/jiggle
+ key = "jiggle"
+ emote_message_3p = "jiggles!"
+
+/decl/emote/visible/lightup
+ key = "light"
+ emote_message_3p = "lights up for a bit, then stops."
+
+/decl/emote/visible/vibrate
+ key = "vibrate"
+ emote_message_3p = "vibrates!"
+
+/decl/emote/visible/deathgasp_robot
+ key = "deathgasp"
+ emote_message_3p = "shudders violently for a moment, then becomes motionless, USER_THEIR eyes slowly darkening."
+
+/decl/emote/visible/handshake
+ key = "handshake"
+ check_restraints = TRUE
+ emote_message_3p_target = "shakes hands with TARGET."
+ emote_message_3p = "shakes hands with USER_SELF."
+ check_range = 1
+
+/decl/emote/visible/handshake/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+ if(target && !user.Adjacent(target))
+ return "holds out USER_THEIR hand out to TARGET."
+ return ..()
+
+/decl/emote/visible/signal
+ key = "signal"
+ emote_message_3p_target = "signals at TARGET."
+ emote_message_3p = "signals."
+ check_restraints = TRUE
+
+/decl/emote/visible/signal/check_user(atom/user)
+ return ismob(user)
+
+/decl/emote/visible/signal/get_emote_message_3p(var/mob/living/user, var/atom/target, var/extra_params)
+ if(istype(user) && (!user.get_active_hand() || !user.get_inactive_hand()))
+ var/t1 = round(text2num(extra_params))
+ if(isnum(t1) && t1 <= 5)
+ return "raises [t1] finger\s."
+ return .. ()
+
+/decl/emote/visible/afold
+ key = "afold"
+ check_restraints = TRUE
+ emote_message_3p = "folds USER_THEIR arms."
+
+/decl/emote/visible/alook
+ key = "alook"
+ emote_message_3p = "looks away."
+
+/decl/emote/visible/hbow
+ key = "hbow"
+ emote_message_3p = "bows USER_THEIR head."
+
+/decl/emote/visible/hip
+ key = "hip"
+ check_restraints = TRUE
+ emote_message_3p = "puts USER_THEIR hands on USER_THEIR hips."
+
+/decl/emote/visible/holdup
+ key = "holdup"
+ check_restraints = TRUE
+ emote_message_3p = "holds up USER_THEIR palms."
+
+/decl/emote/visible/hshrug
+ key = "hshrug"
+ emote_message_3p = "gives a half shrug."
+
+/decl/emote/visible/crub
+ key = "crub"
+ check_restraints = TRUE
+ emote_message_3p = "rubs USER_THEIR chin."
+
+/decl/emote/visible/eroll
+ key = "eroll"
+ emote_message_3p = "rolls USER_THEIR eyes."
+ emote_message_3p_target = "rolls USER_THEIR eyes at TARGET."
+
+/decl/emote/visible/erub
+ key = "erub"
+ check_restraints = TRUE
+ emote_message_3p = "rubs USER_THEIR eyes."
+
+/decl/emote/visible/fslap
+ key = "fslap"
+ check_restraints = TRUE
+ emote_message_3p = "slaps USER_THEIR forehead."
+
+/decl/emote/visible/ftap
+ key = "ftap"
+ emote_message_3p = "taps USER_THEIR foot."
+
+/decl/emote/visible/hrub
+ key = "hrub"
+ check_restraints = TRUE
+ emote_message_3p = "rubs USER_THEIR hands together."
+
+/decl/emote/visible/hspread
+ key = "hspread"
+ check_restraints = TRUE
+ emote_message_3p = "spreads USER_THEIR hands."
+
+/decl/emote/visible/pocket
+ key = "pocket"
+ check_restraints = TRUE
+ emote_message_3p = "shoves USER_THEIR hands in USER_THEIR pockets."
+
+/decl/emote/visible/rsalute
+ key = "rsalute"
+ check_restraints = TRUE
+ emote_message_3p = "returns the salute."
+
+/decl/emote/visible/rshoulder
+ key = "rshoulder"
+ emote_message_3p = "rolls USER_THEIR shoulders."
+
+/decl/emote/visible/squint
+ key = "squint"
+ emote_message_3p = "squints."
+ emote_message_3p_target = "squints at TARGET."
+
+/decl/emote/visible/tfist
+ key = "tfist"
+ emote_message_3p = "tightens USER_THEIR hands into fists."
+
+/decl/emote/visible/tilt
+ key = "tilt"
+ emote_message_3p = "tilts USER_THEIR head."
diff --git a/code/modules/emotes/definitions/visible_animated.dm b/code/modules/emotes/definitions/visible_animated.dm
new file mode 100644
index 00000000000..2e035d289c7
--- /dev/null
+++ b/code/modules/emotes/definitions/visible_animated.dm
@@ -0,0 +1,76 @@
+/decl/emote/visible/spin
+ key = "spin"
+ check_restraints = TRUE
+ emote_message_3p = "spins!"
+
+/decl/emote/visible/spin/do_extra(mob/user)
+ if(istype(user))
+ user.spin(20, 1)
+
+/decl/emote/visible/sidestep
+ key = "sidestep"
+ check_restraints = TRUE
+ emote_message_3p = "steps rhythmically and moves side to side."
+
+/decl/emote/visible/sidestep/do_extra(mob/user)
+ if(istype(user))
+ animate(user, pixel_x = 5, time = 5)
+ sleep(3)
+ animate(user, pixel_x = -5, time = 5)
+ animate(pixel_x = user.default_pixel_x, pixel_y = user.default_pixel_x, time = 2)
+
+/decl/emote/visible/flip
+ key = "flip"
+ emote_message_1p = "You do a flip!"
+ emote_message_3p = "does a flip!"
+ emote_sound = 'sound/effects/bodyfall4.ogg'
+
+/decl/emote/visible/flip/do_extra(mob/user)
+ . = ..()
+ if(istype(user))
+ user.SpinAnimation(7,1)
+
+/decl/emote/visible/floorspin
+ key = "floorspin"
+ emote_message_1p = "You spin around on the floor!"
+ emote_message_3p = "spins around on the floor!"
+ var/static/list/spin_dirs = list(
+ NORTH,
+ SOUTH,
+ EAST,
+ WEST,
+ EAST,
+ SOUTH,
+ NORTH,
+ SOUTH,
+ EAST,
+ WEST,
+ EAST,
+ SOUTH,
+ NORTH,
+ SOUTH,
+ EAST,
+ WEST,
+ EAST,
+ SOUTH
+ )
+
+/decl/emote/visible/floorspin/proc/spin_dir(var/mob/user)
+ set waitfor = FALSE
+ for(var/i in spin_dirs)
+ user.set_dir(i)
+ sleep(1)
+ if(QDELETED(user))
+ return
+
+/decl/emote/visible/floorspin/proc/spin_anim(var/mob/user)
+ set waitfor = FALSE
+ sleep(1)
+ if(!QDELETED(user))
+ user.SpinAnimation(10,1)
+
+/decl/emote/visible/floorspin/do_extra(mob/user)
+ . = ..()
+ if(istype(user))
+ spin_dir(user)
+ spin_anim(user)
diff --git a/code/modules/emotes/definitions/visible_vomit.dm b/code/modules/emotes/definitions/visible_vomit.dm
new file mode 100644
index 00000000000..1ec79dea6a9
--- /dev/null
+++ b/code/modules/emotes/definitions/visible_vomit.dm
@@ -0,0 +1,10 @@
+/decl/emote/visible/vomit
+ key = "vomit"
+
+/decl/emote/visible/vomit/do_emote(var/atom/user, var/extra_params)
+ if(isliving(user))
+ var/mob/living/M = user
+ if(!M.isSynthetic())
+ M.vomit()
+ return
+ to_chat(src, SPAN_WARNING("You are unable to vomit."))
diff --git a/code/modules/emotes/definitions/visible_vr.dm b/code/modules/emotes/definitions/visible_vr.dm
new file mode 100644
index 00000000000..69252cf43be
--- /dev/null
+++ b/code/modules/emotes/definitions/visible_vr.dm
@@ -0,0 +1,7 @@
+/decl/emote/visible/mlem
+ key = "mlem"
+ emote_message_3p = "mlems USER_THEIR tongue up over USER_THEIR nose. Mlem."
+
+/decl/emote/visible/blep
+ key = "blep"
+ emote_message_3p = "bleps USER_THEIR tongue out. Blep."
diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm
new file mode 100644
index 00000000000..845a5202d31
--- /dev/null
+++ b/code/modules/emotes/emote_define.dm
@@ -0,0 +1,181 @@
+// Note about emote messages:
+// - USER / TARGET will be replaced with the relevant name, in bold.
+// - USER_THEM / TARGET_THEM / USER_THEIR / TARGET_THEIR will be replaced with a
+// gender-appropriate version of the same.
+// - Impaired messages do not do any substitutions.
+
+/decl/emote
+ var/key // Command to use emote ie. '*[key]'
+ var/emote_message_1p // First person message ('You do a flip!')
+ var/emote_message_3p // Third person message ('Urist McBackflip does a flip!')
+ var/emote_message_synthetic_1p // First person message for robits.
+ var/emote_message_synthetic_3p // Third person message for robits.
+
+ var/emote_message_impaired // Deaf/blind message ('You hear someone flipping out.', 'You see someone opening and closing their mouth')
+
+ var/emote_message_1p_target // 'You do a flip at Urist McTarget!'
+ var/emote_message_3p_target // 'Urist McShitter does a flip at Urist McTarget!'
+ var/emote_message_synthetic_1p_target // First person targeted message for robits.
+ var/emote_message_synthetic_3p_target // Third person targeted message for robits.
+
+ var/emote_message_radio // A message to send over the radio if one picks up this emote.
+ var/emote_message_radio_synthetic // As above, but for synthetics.
+ var/emote_message_muffled // A message to show if the emote is audible and the user is muzzled.
+
+ var/list/emote_sound // A sound for the emote to play.
+ // Can either be a single sound, a list of sounds to pick from, or an
+ // associative array of gender to single sounds/a list of sounds.
+ var/list/emote_sound_synthetic // As above, but used when check_synthetic() is true.
+ var/emote_volume = 50 // Volume of sound to play.
+ var/emote_volume_synthetic = 50 // As above, but used when check_synthetic() is true.
+
+ var/message_type = VISIBLE_MESSAGE // Audible/visual flag
+ var/check_restraints // Can this emote be used while restrained?
+ var/check_range // falsy, or a range outside which the emote will not work
+ var/conscious = TRUE // Do we need to be awake to emote this?
+ var/emote_range = 0 // If >0, restricts emote visibility to viewers within range.
+
+/decl/emote/proc/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+ if(target)
+ if(emote_message_synthetic_1p_target && check_synthetic(user))
+ return emote_message_synthetic_1p_target
+ return emote_message_1p_target
+ if(emote_message_synthetic_1p && check_synthetic(user))
+ return emote_message_synthetic_1p
+ return emote_message_1p
+
+/decl/emote/proc/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+ if(target)
+ if(emote_message_synthetic_3p_target && check_synthetic(user))
+ return emote_message_synthetic_3p_target
+ return emote_message_3p_target
+ if(emote_message_synthetic_3p && check_synthetic(user))
+ return emote_message_synthetic_3p
+ return emote_message_3p
+
+/decl/emote/proc/get_emote_sound(var/atom/user)
+ if(check_synthetic(user) && emote_sound_synthetic)
+ return list(
+ "sound" = emote_sound_synthetic,
+ "vol" = emote_volume_synthetic
+ )
+ if(emote_sound)
+ return list(
+ "sound" = emote_sound,
+ "vol" = emote_volume
+ )
+
+/decl/emote/proc/do_emote(var/atom/user, var/extra_params)
+ if(ismob(user) && check_restraints)
+ var/mob/M = user
+ if(M.restrained())
+ to_chat(user, SPAN_WARNING("You are restrained and cannot do that."))
+ return
+
+ var/atom/target
+ if(can_target() && extra_params)
+ extra_params = lowertext(extra_params)
+ for(var/atom/thing in view(user))
+ if(extra_params == lowertext(thing.name))
+ target = thing
+ break
+
+ if(target && target != user && check_range)
+ if (get_dist(user, target) > check_range)
+ to_chat(user, SPAN_WARNING("\The [target] is too far away."))
+ return
+
+ var/use_1p = get_emote_message_1p(user, target, extra_params)
+ if(use_1p)
+ if(target)
+ use_1p = replace_target_tokens(use_1p, target)
+ use_1p = "