diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 8c5d1d1093..db976d8714 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -40,6 +40,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.preview_icon = null
S["bgstate"] >> pref.bgstate
S["body_descriptors"] >> pref.body_descriptors
+ S["Wingdings"] >> pref.wingdings
/datum/category_item/player_setup_item/general/body/save_character(var/savefile/S)
S["species"] << pref.species
@@ -70,6 +71,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["synth_markings"] << pref.synth_markings
S["bgstate"] << pref.bgstate
S["body_descriptors"] << pref.body_descriptors
+ S["Wingdings"] << pref.wingdings
/datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S)
if(!pref.species || !(pref.species in GLOB.playable_species))
@@ -125,6 +127,7 @@ 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.wingdings = pref.wingdings
// 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))
@@ -203,6 +206,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
. += "Needs Glasses: [pref.disabilities & NEARSIGHTED ? "Yes" : "No"]
"
. += "Limbs: Adjust Reset
"
. += "Internal Organs: Adjust
"
+ //YW Edit ADD
+ if(pref.species == "Grey")
+ . += "Speak Wingdings: [pref.wingdings ? "Yes" : "No"]
"
+ //YW Edit End
//display limbs below
var/ind = 0
@@ -807,6 +814,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options)
return TOPIC_REFRESH_UPDATE_PREVIEW
+ else if(href_list["wingdings"])
+ pref.wingdings = !pref.wingdings
+ return TOPIC_REFRESH_UPDATE_PREVIEW
+
return ..()
/datum/category_item/player_setup_item/general/body/proc/reset_limbs()
diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm
index 746a95d6db..d0288dfbd1 100644
--- a/code/modules/client/preferences_vr.dm
+++ b/code/modules/client/preferences_vr.dm
@@ -2,6 +2,7 @@
datum/preferences
var/show_in_directory = 1 //TFF 5/8/19 - show in Character Directory
var/sensorpref = 5 //TFF 5/8/19 - set character's suit sensor level
+ var/wingdings = 1 //YW Add
//Why weren't these in game toggles already?
/client/verb/toggle_eating_noises()
diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm
index 6e9b96fc13..a9b8033646 100644
--- a/code/modules/mob/living/living_defines_vr.dm
+++ b/code/modules/mob/living/living_defines_vr.dm
@@ -9,4 +9,9 @@
var/custom_say = null
var/custom_ask = null
var/custom_exclaim = null
- var/custom_whisper = null
\ No newline at end of file
+ var/custom_whisper = null
+
+//YW Add Start
+/mob
+ var/wingdings = 0
+//Yw Add End
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index f15ca63904..46cccd60d9 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -113,6 +113,11 @@ proc/get_radio_key_from_channel(var/channel)
whispering = 1
. = 1
//VOREStation Edit End
+ //YW Edit start
+ if(wingdings)
+ message = span("wingdings",(message))
+ . = 1
+ //YW Edit End
message_data[1] = message
message_data[2] = verb
diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css
index 375ebb5d80..1e60cb435e 100644
--- a/code/modules/vchat/css/ss13styles.css
+++ b/code/modules/vchat/css/ss13styles.css
@@ -169,6 +169,10 @@ h1.alert, h2.alert {color: #000000;}
.say_quote {font-family: Georgia, Verdana, sans-serif;}
.terminus {font-family: "Times New Roman", Times, serif, sans-serif}
.interface {color: #330033;}
+/* YW Edit start */
+.psionic {color: #993399;}
+.wingdings {font-family: Wingdings, Webdings}
+/* YW Edit End */
/*BIG IMG.icon {width: 32px; height: 32px;}*/
img.icon {vertical-align: middle; max-height: 1em;}