diff --git a/code/__defines/mobs_yw.dm b/code/__defines/mobs_yw.dm
index adceca8519..8b18512935 100644
--- a/code/__defines/mobs_yw.dm
+++ b/code/__defines/mobs_yw.dm
@@ -1 +1,2 @@
-#define SPECIES_SHADEKIN_YW "GeneShadekin"
\ No newline at end of file
+#define SPECIES_SHADEKIN_YW "GeneShadekin"
+#define SPECIES_GREY_YW "Grey"
\ No newline at end of file
diff --git a/code/__defines/species_languages_YW.dm b/code/__defines/species_languages_YW.dm
new file mode 100644
index 0000000000..b47e78f693
--- /dev/null
+++ b/code/__defines/species_languages_YW.dm
@@ -0,0 +1 @@
+#define LANGUAGE_PSIONIC "Psionic Communication"
\ No newline at end of file
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index aa1a07b34c..400018d47a 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -767,7 +767,7 @@
//Clear the access reqs, disable the safeties, and open up all paintjobs.
to_chat(user, "You run the sequencer across the interface, corrupting the operating protocols.")
departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$", "Charring")
- species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Vasilissan", "Rapala") //VORESTATION EDIT
+ species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Vasilissan", "Rapala",/*YWEDITGREYADD*/SPECIES_GREY_YW) //VORESTATION EDIT
emagged = 1
safeties = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
index b9baafaa6b..6aafe31f4a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
@@ -21,12 +21,13 @@
/obj/item/weapon/melee/baton/loaded,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses/medhud,
- /obj/item/clothing/head/beret/centcom/officer,
+ /obj/item/clothing/head/beret/blueshield,
/obj/item/clothing/head/helmet/dermal,
/obj/item/clothing/under/yw/blueshield,
/obj/item/clothing/under/yw/blueshield2,
/obj/item/clothing/suit/armor/yw/blueshield,
/obj/item/clothing/suit/armor/yw/blueshieldcoat,
+ /obj/item/clothing/accessory/poncho/roles/cloak/blueshield,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/accessory/holster/leg,
/obj/item/clothing/shoes/boots/jackboots,
diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
index 30bbd07f30..6b167ef356 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
@@ -741,6 +741,14 @@
character_name = list("Mocha")
allowed_roles = list("Explorer", "Pathfinder")
+/datum/gear/fluff/mocha_cloak
+ path = /obj/item/clothing/accessory/poncho/cloak/fluff/mocha
+ display_name = "Warden Cloak"
+ description = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
+ ckeywhitelist = list("mocatheporg1")
+ character_name = list("Mocha")
+ allowed_roles = list("Warden")
+
// N CKEYS
//NESgamer190
/datum/gear/fluff/lucy_flask
diff --git a/code/modules/client/preference_setup/loadout/loadout_head_yw.dm b/code/modules/client/preference_setup/loadout/loadout_head_yw.dm
new file mode 100644
index 0000000000..e0178fa705
--- /dev/null
+++ b/code/modules/client/preference_setup/loadout/loadout_head_yw.dm
@@ -0,0 +1,4 @@
+/datum/gear/head/beret/blueshield
+ display_name = "beret, blueshield"
+ path = /obj/item/clothing/head/beret/blueshield
+ allowed_roles = list("Blueshield Guard")
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm
new file mode 100644
index 0000000000..bd62bf72b0
--- /dev/null
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm
@@ -0,0 +1,4 @@
+/datum/gear/suit/roles/poncho/cloak/blueshield
+ display_name = "cloak, blueshield"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/blueshield
+ allowed_roles = list("Blueshield Guard")
\ No newline at end of file
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index cce0641f3c..c6d3dcd6ed 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -457,8 +457,8 @@
SPECIES_TESHARI = 'icons/mob/species/seromi/masks.dmi',
SPECIES_VOX = 'icons/mob/species/vox/masks.dmi',
SPECIES_TAJ = 'icons/mob/species/tajaran/mask.dmi',
- SPECIES_UNATHI = 'icons/mob/species/unathi/mask.dmi'
- )
+ SPECIES_UNATHI = 'icons/mob/species/unathi/mask.dmi',
+ SPECIES_GREY_YW = 'icons/mob/species/grey/mask.dmi')
var/voicechange = 0
var/list/say_messages
@@ -664,7 +664,8 @@
var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
sprite_sheets = list(
SPECIES_TESHARI = 'icons/mob/species/seromi/uniform.dmi',
- SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi'
+ SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi',
+ SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'
)
//convenience var for defining the icon state for the overlay used when the clothing is worn.
diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm
index f81dd53c18..c1d95ecef4 100644
--- a/code/modules/clothing/clothing_vr.dm
+++ b/code/modules/clothing/clothing_vr.dm
@@ -114,7 +114,8 @@
SPECIES_AKULA = 'icons/mob/species/akula/mask_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/mask.dmi',
SPECIES_XENOCHIMERA = 'icons/mob/species/tajaran/mask_vr.dmi',
- SPECIES_WEREBEAST = 'icons/mob/species/werebeast/masks.dmi'
+ SPECIES_WEREBEAST = 'icons/mob/species/werebeast/masks.dmi',
+ SPECIES_GREY_YW = 'icons/mob/species/grey/mask.dmi'
)
//"Spider" = 'icons/mob/species/spider/mask_vr.dmi' Add this later when they have custom mask sprites and everything.
@@ -160,7 +161,9 @@
sprite_sheets = list(
SPECIES_TESHARI = 'icons/mob/species/seromi/uniform.dmi',
SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi',
- SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi')
+ SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi',
+ SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'
+ )
//TFF 5/8/19 - define numbers and specifics for suit sensor settings
/obj/item/clothing/under/New(var/mob/living/carbon/human/H)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 072e7e868d..e33ac42d51 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -31,7 +31,8 @@ BLIND // can't see anything
sprite_sheets = list(
"Teshari" = 'icons/mob/species/seromi/eyes.dmi',
"Vox" = 'icons/mob/species/vox/eyes.dmi',
- "Sergal" = 'icons/mob/species/sergal/eyes_yw.dmi'
+ "Sergal" = 'icons/mob/species/sergal/eyes_yw.dmi',
+ SPECIES_GREY_YW = 'icons/mob/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/update_clothing_icon()
diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm
index 90e53d89b2..62d9546f29 100644
--- a/code/modules/clothing/glasses/glasses_vr.dm
+++ b/code/modules/clothing/glasses/glasses_vr.dm
@@ -116,5 +116,6 @@
sprite_sheets = list(
SPECIES_TESHARI = 'icons/mob/species/seromi/eyes.dmi',
SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi',
- SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi'
+ SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi',
+ SPECIES_GREY_YW = 'icons/mob/species/grey/eyes.dmi'
)
\ No newline at end of file
diff --git a/code/modules/clothing/head/jobs_yw.dm b/code/modules/clothing/head/jobs_yw.dm
new file mode 100644
index 0000000000..57712f8798
--- /dev/null
+++ b/code/modules/clothing/head/jobs_yw.dm
@@ -0,0 +1,8 @@
+/obj/item/clothing/head/beret/blueshield
+ name = "bodyguard's beret"
+ desc = "A dark blue beret adorned with a silver patch. The mark of a professional bodyguard."
+ item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white")
+ icon = 'icons/obj/clothing/hats_yw.dmi'
+ icon_state = "beret_blueshield"
+ icon_override = 'icons/mob/head_yw.dmi'
+ item_state = "beret_blueshield"
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
index 04022b2331..6c08138c2f 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
@@ -35,17 +35,17 @@
)
/obj/item/clothing/head/helmet/space/rig
- species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_GREY_YW)
flags = PHORONGUARD //YAWN Edit
/obj/item/clothing/gloves/gauntlets/rig
- species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_GREY_YW)
flags = PHORONGUARD //YAWN Edit
/obj/item/clothing/shoes/magboots/rig
- species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_GREY_YW)
flags = PHORONGUARD //YAWN Edit
/obj/item/clothing/suit/space/rig
- species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
+ species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE, SPECIES_GREY_YW)
flags = PHORONGUARD //YAWN Edit
diff --git a/code/modules/clothing/under/accessories/accessory_yw.dm b/code/modules/clothing/under/accessories/accessory_yw.dm
new file mode 100644
index 0000000000..6dd9cd7e50
--- /dev/null
+++ b/code/modules/clothing/under/accessories/accessory_yw.dm
@@ -0,0 +1,7 @@
+/obj/item/clothing/accessory/poncho/roles/cloak/blueshield
+ name = "bodyguard's cloak"
+ desc = "A dark blue cloak with silver trim around the neck. The mark of a professional bodyguard, and ideal for concealing holsters or other items."
+ icon = 'icons/obj/clothing/ties_yw.dmi'
+ icon_state = "cloak_blueshield"
+ icon_override = 'icons/mob/ties_yw.dmi'
+ item_state = "cloak_blueshield"
\ No newline at end of file
diff --git a/code/modules/mob/language/station_YW.dm b/code/modules/mob/language/station_YW.dm
new file mode 100644
index 0000000000..88733bf02b
--- /dev/null
+++ b/code/modules/mob/language/station_YW.dm
@@ -0,0 +1,9 @@
+/datum/language/psioniccomm
+ name = LANGUAGE_PSIONIC
+ desc = "Grey Psionic communication"
+ speech_verb = "says"
+ whisper_verb = "whispers"
+ colour = "psionic"
+ key = "^"
+ flags = HIVEMIND
+ syllables = list("blah","blah","blah","bleh","meh","neh","nah","wah")
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_powers_YW.dm b/code/modules/mob/living/carbon/human/human_powers_YW.dm
new file mode 100644
index 0000000000..22bb6874e6
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_powers_YW.dm
@@ -0,0 +1,11 @@
+/mob/living/carbon/human/proc/telepathy(mob/M as mob in oview())
+ set name = "Project mind"
+ set desc = "Talk telepathically to someone over a distance."
+ set category = "Abilities"
+
+ var/msg = sanitize(input("Message:", "Project mind") as text|null)
+ if(msg)
+ log_say("(GreyTP to [key_name(M)]) [msg]", src)
+ M << "you hear a voice echo across the room in your head... [msg]"
+ to_chat(src, "You said: \"[msg]\" to [M]")
+ return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/greyYW.dm b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
new file mode 100644
index 0000000000..adfebcb3a5
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
@@ -0,0 +1,62 @@
+/datum/species/grey
+ name = SPECIES_GREY_YW
+ name_plural = "Gray"
+ icobase = 'icons/mob/human_races/r_grey.dmi'
+ deform = 'icons/mob/human_races/r_def_grey.dmi'
+ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch)
+ blurb = "Insert Grey Lore."
+ num_alternate_languages = 3
+ species_language = LANGUAGE_PSIONIC
+ secondary_langs = list(LANGUAGE_PSIONIC)
+ name_language = null // Use the first-name last-name generator rather than a language scrambler
+ assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_SKRELLIANFAR, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
+ flesh_color = "#a598ad"
+ blood_color = "#A200FF"
+ brute_mod = 1.25
+ flash_mod = 1.15
+ darksight = 5
+
+
+
+ min_age = 18
+ max_age = 130
+
+
+ health_hud_intensity = 1.5
+
+ spawn_flags = SPECIES_CAN_JOIN
+ appearance_flags = HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
+
+ has_organ = list(
+ O_HEART = /obj/item/organ/internal/heart,
+ O_LUNGS = /obj/item/organ/internal/lungs,
+ O_VOICE = /obj/item/organ/internal/voicebox,
+ O_LIVER = /obj/item/organ/internal/liver,
+ O_KIDNEYS = /obj/item/organ/internal/kidneys,
+ O_BRAIN = /obj/item/organ/internal/brain,
+ O_APPENDIX = /obj/item/organ/internal/appendix,
+ O_SPLEEN = /obj/item/organ/internal/spleen,
+ O_EYES = /obj/item/organ/internal/eyes/grey,
+ O_STOMACH = /obj/item/organ/internal/stomach,
+ O_INTESTINE = /obj/item/organ/internal/intestine
+ )
+
+ has_limbs = list(
+ BP_TORSO = list("path" = /obj/item/organ/external/chest),
+ BP_GROIN = list("path" = /obj/item/organ/external/groin),
+ BP_HEAD = list("path" = /obj/item/organ/external/head/vr/grey),
+ BP_L_ARM = list("path" = /obj/item/organ/external/arm),
+ BP_R_ARM = list("path" = /obj/item/organ/external/arm/right),
+ BP_L_LEG = list("path" = /obj/item/organ/external/leg),
+ BP_R_LEG = list("path" = /obj/item/organ/external/leg/right),
+ BP_L_HAND = list("path" = /obj/item/organ/external/hand),
+ BP_R_HAND = list("path" = /obj/item/organ/external/hand/right),
+ BP_L_FOOT = list("path" = /obj/item/organ/external/foot),
+ BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right)
+ )
+
+ inherent_verbs = list(/mob/living/carbon/human/proc/telepathy)
+
+/datum/species/grey/handle_environment_special(var/mob/living/carbon/human/H)
+ if(H.fire_stacks < 0 && H.get_water_protection() <= 0.5) // If over half your body is soaked, you're melting.
+ H.adjustToxLoss(max(0,(3 - (3 * H.get_water_protection())))) // Tripled because 0.5 is miniscule, and fire_stacks are capped in both directions.
diff --git a/code/modules/organs/subtypes/standard_vr.dm b/code/modules/organs/subtypes/standard_vr.dm
index ce6eaf9d9f..bf429cb878 100644
--- a/code/modules/organs/subtypes/standard_vr.dm
+++ b/code/modules/organs/subtypes/standard_vr.dm
@@ -69,3 +69,9 @@
eye_icons_vr = 'icons/mob/human_face_vr.dmi'
eye_icon_vr = "eyes_shadekin"
+
+ //yw edit
+/obj/item/organ/external/head/vr/grey
+ eye_icons_vr = 'icons/mob/human_face_yw.dmi'
+ eye_icon_vr = "eyes_grey"
+ //yw edit
diff --git a/code/modules/vore/appearance/sprite_accessories_taur_yw.dm b/code/modules/vore/appearance/sprite_accessories_taur_yw.dm
index 4fafae2adc..b8ce27f234 100644
--- a/code/modules/vore/appearance/sprite_accessories_taur_yw.dm
+++ b/code/modules/vore/appearance/sprite_accessories_taur_yw.dm
@@ -2,19 +2,34 @@
name = "Kentauri (Taur)"
icon_state = "kentauri_s"
extra_overlay = "kentauri_markings"
+ icon = 'icons/mob/vore/taurs_yw.dmi'
/datum/sprite_accessory/tail/taur/wolf/husky
name = "Husky (Taur)"
icon_state = "husky_s"
+ icon = 'icons/mob/vore/taurs_yw.dmi'
-/datum/sprite_accessory/tail/taur/wolf/huskyfat
+/datum/sprite_accessory/tail/taur/wolf/husky/huskyfat
name = "Fat Husky (Taur)"
icon_state = "huskyf_s"
-/datum/sprite_accessory/tail/taur/wolf/wolf_2
+/datum/sprite_accessory/tail/taur/wolf/husky/wolf_2
name = "WolfTG (Taur)"
icon_state = "wolf2_s"
-/datum/sprite_accessory/tail/taur/wolf/wolf_2fat
- name = "Fat Wolf (Taur)"
- icon_state = "wolf2f_s"
\ No newline at end of file
+/datum/sprite_accessory/tail/taur/wolf/husky/wolf_2fat
+ name = "Fat WolfTG (Taur)"
+ icon_state = "wolf2f_s"
+
+/datum/sprite_accessory/tail/taur/long_lizard
+ name = "Large Dragon Tail"
+ icon_state = "big_liz"
+ icon = 'icons/mob/vore/taurs_yw.dmi'
+ can_ride = 0
+ hide_body_parts = null
+ clip_mask_icon = null
+ clip_mask_state = null
+
+/datum/sprite_accessory/tail/taur/long_lizard/scaled
+ name = "Large Dragon Tail/W scales"
+ extra_overlay = "big_liz_mark"
diff --git a/code/modules/vore/appearance/sprite_accessories_yw.dm b/code/modules/vore/appearance/sprite_accessories_yw.dm
index 89ccde1ed1..5d9df5a5d4 100644
--- a/code/modules/vore/appearance/sprite_accessories_yw.dm
+++ b/code/modules/vore/appearance/sprite_accessories_yw.dm
@@ -101,29 +101,39 @@
extra_overlay = "ninekitsune-tips"
/datum/sprite_accessory/tail/vulpkanin_alt_color
- icon = 'icons/mob/vore/tails_yw.dmi'
- name = "Vulpkanin alt"
- desc = ""
- icon_state = "vulpkanin_alt_color"
- do_colouration = 1
- color_blend_mode = ICON_MULTIPLY
- extra_overlay = "vulpkanin_alt_color_tips"
- ani_state = "vulpkanin_alt_color_w"
- extra_overlay_w = "vulpkanin_alt_color_tips_w"
+ icon = 'icons/mob/vore/tails_yw.dmi'
+ name = "Vulpkanin alt"
+ desc = ""
+ icon_state = "vulpkanin_alt_color"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+ extra_overlay = "vulpkanin_alt_color_tips"
+ ani_state = "vulpkanin_alt_color_w"
+ extra_overlay_w = "vulpkanin_alt_color_tips_w"
/datum/sprite_accessory/tail/raccoon_tail
- icon = 'icons/mob/vore/tails_yw.dmi'
- name = "Raccoon gray tail"
- desc = ""
- icon_state = "raccoon_tail"
- do_colouration = 0
- color_blend_mode = ICON_MULTIPLY
+ icon = 'icons/mob/vore/tails_yw.dmi'
+ name = "Raccoon gray tail"
+ desc = ""
+ icon_state = "raccoon_tail"
+ do_colouration = 0
+ color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/tail/striped_tail
- icon = "icons/mob/vore/tails_yw.dmi"
- name = "Striped tail, colorable"
- desc = ""
- icon_state = "stripedtail_colorable"
- do_colouration = 1
- color_blend_mode = ICON_MULTIPLY
- extra_overlay = "stripedtail_colorable_w"
\ No newline at end of file
+ icon = 'icons/mob/vore/tails_yw.dmi'
+ name = "Striped tail, colorable"
+ desc = ""
+ icon_state = "stripedtail_colorable"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+ extra_overlay = "stripedtail_colorable_w"
+
+//ears
+
+/datum/sprite_accessory/ears/large_dragon
+ icon = 'icons/mob/vore/ears_yw.dmi'
+ name = "vary large dragon horns"
+ desc = ""
+ icon_state = "big_liz"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
\ No newline at end of file
diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
index 22cc6ef33f..6f42eb1b6b 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -1578,6 +1578,14 @@
siemens_coefficient = 0.9
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35)
+/obj/item/clothing/accessory/poncho/cloak/fluff/mocha
+ name = "Warden Cloak"
+ desc = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
+ icon = 'icons/vore/custom_clothes_yw.dmi'
+ icon_state = "mocha_cloak"
+ icon_override = "icons/vore/custom_clothes_yw.dmi"
+ item_state = "mocha_cloak_s"
+
// ******
// Lawst
// ******
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index 4fc84eeee6..8bf7679c35 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -109,6 +109,7 @@ 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;}
+.psionic {color: #993399;}
BIG IMG.icon {width: 32px; height: 32px;}
diff --git a/icons/mob/head_yw.dmi b/icons/mob/head_yw.dmi
index 76d6e80edd..124168cd68 100644
Binary files a/icons/mob/head_yw.dmi and b/icons/mob/head_yw.dmi differ
diff --git a/icons/mob/human_face_yw.dmi b/icons/mob/human_face_yw.dmi
new file mode 100644
index 0000000000..3f777b1af1
Binary files /dev/null and b/icons/mob/human_face_yw.dmi differ
diff --git a/icons/mob/human_races/r_def_grey.dmi b/icons/mob/human_races/r_def_grey.dmi
new file mode 100644
index 0000000000..b243f88e40
Binary files /dev/null and b/icons/mob/human_races/r_def_grey.dmi differ
diff --git a/icons/mob/human_races/r_grey.dmi b/icons/mob/human_races/r_grey.dmi
new file mode 100644
index 0000000000..1f66332a57
Binary files /dev/null and b/icons/mob/human_races/r_grey.dmi differ
diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/species/grey/eyes.dmi
new file mode 100644
index 0000000000..a49fd089ca
Binary files /dev/null and b/icons/mob/species/grey/eyes.dmi differ
diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/species/grey/mask.dmi
new file mode 100644
index 0000000000..041cbb1267
Binary files /dev/null and b/icons/mob/species/grey/mask.dmi differ
diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/species/grey/uniform.dmi
new file mode 100644
index 0000000000..74d62beb33
Binary files /dev/null and b/icons/mob/species/grey/uniform.dmi differ
diff --git a/icons/mob/suit_yw.dmi b/icons/mob/suit_yw.dmi
index ba2331842e..d8f572fb53 100644
Binary files a/icons/mob/suit_yw.dmi and b/icons/mob/suit_yw.dmi differ
diff --git a/icons/mob/ties_yw.dmi b/icons/mob/ties_yw.dmi
new file mode 100644
index 0000000000..1609af6fb2
Binary files /dev/null and b/icons/mob/ties_yw.dmi differ
diff --git a/icons/mob/vore/ears_yw.dmi b/icons/mob/vore/ears_yw.dmi
new file mode 100644
index 0000000000..d0dfd80776
Binary files /dev/null and b/icons/mob/vore/ears_yw.dmi differ
diff --git a/icons/mob/vore/taurs_yw.dmi b/icons/mob/vore/taurs_yw.dmi
index e8dde65548..7192f08ae3 100644
Binary files a/icons/mob/vore/taurs_yw.dmi and b/icons/mob/vore/taurs_yw.dmi differ
diff --git a/icons/mob/widerobot_yw.dmi b/icons/mob/widerobot_yw.dmi
index f7a001cf1d..1a139ace53 100644
Binary files a/icons/mob/widerobot_yw.dmi and b/icons/mob/widerobot_yw.dmi differ
diff --git a/icons/obj/clothing/hats_yw.dmi b/icons/obj/clothing/hats_yw.dmi
index 0a9dcecabb..ab7089a4ed 100644
Binary files a/icons/obj/clothing/hats_yw.dmi and b/icons/obj/clothing/hats_yw.dmi differ
diff --git a/icons/obj/clothing/ties_yw.dmi b/icons/obj/clothing/ties_yw.dmi
new file mode 100644
index 0000000000..49ebe2fd36
Binary files /dev/null and b/icons/obj/clothing/ties_yw.dmi differ
diff --git a/icons/vore/custom_clothes_yw.dmi b/icons/vore/custom_clothes_yw.dmi
index 65ae5d1eb3..2cb2f39bdd 100644
Binary files a/icons/vore/custom_clothes_yw.dmi and b/icons/vore/custom_clothes_yw.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index f4df020f4d..3e7fe345c9 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1688,12 +1688,14 @@
#include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm"
#include "code\modules\client\preference_setup\loadout\loadout_head.dm"
#include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm"
+#include "code\modules\client\preference_setup\loadout\loadout_head_yw.dm"
#include "code\modules\client\preference_setup\loadout\loadout_mask.dm"
#include "code\modules\client\preference_setup\loadout\loadout_shoes.dm"
#include "code\modules\client\preference_setup\loadout\loadout_shoes_vr.dm"
#include "code\modules\client\preference_setup\loadout\loadout_smoking.dm"
#include "code\modules\client\preference_setup\loadout\loadout_suit.dm"
#include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm"
+#include "code\modules\client\preference_setup\loadout\loadout_suit_yw.dm"
#include "code\modules\client\preference_setup\loadout\loadout_uniform.dm"
#include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm"
#include "code\modules\client\preference_setup\loadout\loadout_uniform_yw.dm"
@@ -1739,6 +1741,7 @@
#include "code\modules\clothing\head\hood.dm"
#include "code\modules\clothing\head\hood_yw.dm"
#include "code\modules\clothing\head\jobs.dm"
+#include "code\modules\clothing\head\jobs_yw.dm"
#include "code\modules\clothing\head\misc.dm"
#include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\misc_vr.dm"
@@ -1836,6 +1839,7 @@
#include "code\modules\clothing\under\syndicate.dm"
#include "code\modules\clothing\under\accessories\accessory.dm"
#include "code\modules\clothing\under\accessories\accessory_vr.dm"
+#include "code\modules\clothing\under\accessories\accessory_yw.dm"
#include "code\modules\clothing\under\accessories\armband.dm"
#include "code\modules\clothing\under\accessories\armor.dm"
#include "code\modules\clothing\under\accessories\badges.dm"