diff --git a/code/__defines/chemistry_vr.dm b/code/__defines/chemistry_vr.dm
index 7c29bced61..a9fde04734 100644
--- a/code/__defines/chemistry_vr.dm
+++ b/code/__defines/chemistry_vr.dm
@@ -1,4 +1,5 @@
// More for our custom races
#define IS_SERGAL 10
#define IS_AKULA 11
-#define IS_NEVREAN 12
\ No newline at end of file
+#define IS_NEVREAN 12
+#define IS_CHIRRET 13
\ No newline at end of file
diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index 9ebf60632c..28d6d6d116 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -175,6 +175,7 @@
#define O_ACID "acid gland"
#define O_EGG "egg sac"
#define O_RESIN "resin spinner"
+#define O_SILKSPINNER "silk spinner" //VOREStation Edit
#define BP_L_FOOT "l_foot"
#define BP_R_FOOT "r_foot"
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 7a9926c102..665d920de7 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -588,7 +588,7 @@
//Departments that the cycler can paint suits to look like.
var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control")
//Species that the suits can be configured to fit.
- var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan", "Rapala") //VORESTATION EDIT
+ var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan", "Rapala", "Chirret") //VORESTATION EDIT
var/target_department
var/target_species
@@ -753,7 +753,7 @@
//Clear the access reqs, disable the safeties, and open up all paintjobs.
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("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Vasilissan", "Rapala") //VORESTATION EDIT
+ species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Vasilissan", "Rapala", "Chirret") //VORESTATION EDIT
emagged = 1
safeties = 0
diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm
index abab98b8f1..a811010d80 100644
--- a/code/game/machinery/suit_storage_unit_vr.dm
+++ b/code/game/machinery/suit_storage_unit_vr.dm
@@ -1,2 +1,2 @@
/obj/machinery/suit_cycler
- species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan", "Rapala") //Added xenochimera while I was at it. Someone put in an issue about it.
+ species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan", "Rapala", "Chirret") //Added xenochimera while I was at it. Someone put in an issue about it.
diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm
index 895b5530a2..07ae8e5fa3 100644
--- a/code/modules/mob/living/carbon/human/emote_vr.dm
+++ b/code/modules/mob/living/carbon/human/emote_vr.dm
@@ -51,6 +51,14 @@
SC.emote_into(nifmessage,src)
return 1
+ if("chirp")
+ if(src.species.name == "Chirret")
+ message = "The [src.name] chirps!"
+ playsound(src.loc, 'sound/misc/nymphchirp.ogg', 50, 0)
+ m_type = 2
+ else
+ to_chat(src, "You can't chirp without being a Chirret!")
+
if ("flip")
var/danger = 1 //Base 1% chance to break something.
var/list/involved_parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
diff --git a/code/modules/mob/living/carbon/human/human_species_vr.dm b/code/modules/mob/living/carbon/human/human_species_vr.dm
index 596de6a1fa..93fece7324 100644
--- a/code/modules/mob/living/carbon/human/human_species_vr.dm
+++ b/code/modules/mob/living/carbon/human/human_species_vr.dm
@@ -15,4 +15,7 @@
..(new_loc, "Xenomorph Hybrid")
/mob/living/carbon/human/spider/New(var/new_loc)
- ..(new_loc, "Vasilissan")
\ No newline at end of file
+ ..(new_loc, "Vasilissan")
+
+/mob/living/carbon/human/chirret/New(var/new_loc)
+ ..(new_loc, "Chirret")
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm
index 3816a1721e..4af746ebef 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm
@@ -1,7 +1,7 @@
/datum/species/shapeshifter/promethean
min_age = 18
max_age = 80
- valid_transform_species = list("Human", "Unathi", "Tajara", "Skrell", "Diona", "Teshari", "Monkey","Sergal","Akula","Nevrean","Highlander Zorren","Flatland Zorren", "Vulpkanin", "Vasilissan", "Rapala", "Neaera", "Stok", "Farwa", "Sobaka", "Wolpin", "Saru", "Sparra")
+ valid_transform_species = list("Human", "Unathi", "Tajara", "Skrell", "Diona", "Teshari", "Monkey","Sergal","Akula","Nevrean","Highlander Zorren","Flatland Zorren", "Vulpkanin", "Vasilissan", "Rapala", "Neaera", "Stok", "Farwa", "Sobaka", "Wolpin", "Saru", "Sparra", "Chirret")
heal_rate = 0.2 //They heal .2, along with the natural .2 heal per tick when below the organ natural heal damage threshhold.
siemens_coefficient = 1 //Prevents them from being immune to tasers and stun weapons.
death_message = "goes limp, their body becoming softer..."
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index b17ae7fd8e..882eae427f 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -841,3 +841,48 @@
C.anchored = 0
else
return
+
+
+/obj/structure/closet/body_bag/chirret
+ name = "odd silk webbing"
+ desc = "Some odd silk webbing. It looks as though it could hold someone!"
+ icon = 'icons/obj/bodybag_vr.dmi'
+ icon_state = "silk_closed"
+ icon_closed = "silk_closed"
+ icon_opened = "silk_open"
+ open_sound = 'sound/effects/rustle1.ogg'
+ close_sound = 'sound/effects/rustle1.ogg'
+ item_path = null
+ density = 0
+ storage_capacity = (MOB_MEDIUM * 2) - 1
+
+/obj/structure/closet/body_bag/chirret/MouseDrop(over_object, src_location, over_location) //No folding up webbing! Bad!
+ return
+
+/mob/living/carbon/human/proc/create_silk()
+ set name = "Create Silk Cocoon"
+ set desc = "Creates a silk cocoon! If you are holding someone, you will wrap them up in it."
+ set category = "Abilities"
+
+ if(world.time < last_special)
+ return
+
+ var/mob/living/carbon/human/O = src
+ var/obj/item/weapon/grab/G = src.get_active_hand()
+ last_special = world.time + 600 //60 seconds. You don't get
+ if(!istype(G))
+ new /obj/structure/closet/body_bag/chirret(src.loc)
+ to_chat(O, "You create a soft silk cocoon!")
+ O.visible_message("[O] creates a soft silk cocoon!")
+ return
+ var/mob/living/carbon/human/T = G.affecting
+ //If they're holding someone, cocoon them.
+ O.visible_message("[O] begins to encase [T] in soft silk!")
+ if(do_after(O, 200, T)) //20 seconds to cocoon someone.
+ if(!Adjacent(T)) return
+ var/obj/structure/closet/body_bag/chirret/chirrret_silk = new /obj/structure/closet/body_bag/chirret(src.loc)
+ T.forceMove(chirrret_silk) //Put them in the body bag!
+ to_chat(T, "You're encased in a soft silk cocoon by [O]!")
+ to_chat(O, "You encase [T] in a soft silk cocoon!")
+ O.visible_message("[O] encases [T] in a soft silk cocoon!")
+
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
index 2f46b1b13f..9e33962bce 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
@@ -312,3 +312,115 @@
H.eye_blurry = 5
H.shock_stage = min(H.shock_stage + coldshock, 160) //cold hurts and gives them pain messages, eventually weakening and paralysing, but doesn't damage.
return
+
+///////////////////////
+////////Chirret////////
+///////////////////////
+/datum/species/chirret
+ name = "Chirret"
+ name_plural = "Chirrets"
+ icobase = 'icons/mob/human_races/r_chirret.dmi'
+ deform = 'icons/mob/human_races/r_def_chirret.dmi'
+ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
+ darksight = 8 //Darksight+
+ slowdown = -0.5 //Haste
+ total_health = 80
+ brute_mod = 1.25
+ burn_mod = 0.75
+ trashcan = 1 //Yes.
+ reagent_tag = IS_CHIRRET //Sugar messses them up. Coffee makes them jittery.
+
+ num_alternate_languages = 3
+ secondary_langs = list("Sol Common")
+ color_mult = 1
+ tail = "tail" //Scree's tail. Can be disabled in the vore tab by choosing "hide species specific tail sprite"
+ icobase_tail = 1
+ inherent_verbs = list(
+ /mob/living/carbon/human/proc/begin_reconstitute_form,
+ /mob/living/carbon/human/proc/sonar_ping,
+ /mob/living/carbon/human/proc/succubus_drain,
+ /mob/living/carbon/human/proc/succubus_drain_finialize,
+ /mob/living/carbon/human/proc/succubus_drain_lethal,
+ /mob/living/carbon/human/proc/bloodsuck,
+ /mob/living/carbon/human/proc/shred_limb,
+ /mob/living/carbon/human/proc/create_silk) //Chirrets get all the special verbs since they can't select traits.
+
+ male_cough_sounds = list('sound/effects/mob_effects/tesharicougha.ogg','sound/effects/mob_effects/tesharicoughb.ogg')
+ female_cough_sounds = list('sound/effects/mob_effects/tesharicougha.ogg','sound/effects/mob_effects/tesharicoughb.ogg')
+ male_sneeze_sound = 'sound/effects/mob_effects/tesharisneeze.ogg'
+ female_sneeze_sound = 'sound/effects/mob_effects/tesharisneeze.ogg'
+
+ min_age = 18
+ max_age = 80
+
+
+ blurb = "The Chirret are a species of semi-insectoids living in a harsh, unforgiving planet, plagued with scorching summers and freezing winters. \
+ Active during the winter nights, and hibernating in the summer, they're adapted to a live in the cold, living in enormous hives made of both organic silk \
+ they secrete from the three ant-like, flat abdomens sprouting from their rear, as well as modern construction materials. \
+ They all have four arms, the lower pair being slightly shorter than the upper, elongated heads, and smooth, dark skin. They also have four antennae atop their chitinous headshell, \
+ The females are known to have a 'blush'-like pattern under their eyes, making it the only superficial method to determine a Chirrets gender, as their bodies are androgynous."
+
+ cold_level_1 = -5000 //Temp immune
+ cold_level_2 = -5000
+ cold_level_3 = -5000
+ heat_level_1 = 500000 //Handled below. Temperature immune, but confusion at 45c, unconscious at 60+, organs take damage at 80c+
+ heat_level_2 = 500000
+ heat_level_3 = 500000
+ breath_heat_level_1 = 500000
+ breath_heat_level_2 = 500000
+ breath_heat_level_3 = 500000
+ breath_cold_level_1 = -5000
+ breath_cold_level_2 = -5000
+ breath_cold_level_3 = -5000
+
+ hazard_high_pressure = (HAZARD_HIGH_PRESSURE + 10)
+ warning_high_pressure =(WARNING_HIGH_PRESSURE + 10)
+ warning_low_pressure = (WARNING_LOW_PRESSURE - 10)
+ hazard_low_pressure = (HAZARD_LOW_PRESSURE - 10)
+
+ has_organ = list(
+ O_HEART = /obj/item/organ/internal/heart/chirret,
+ O_LUNGS = /obj/item/organ/internal/lungs/chirret,
+ O_LIVER = /obj/item/organ/internal/liver/chirret,
+ O_KIDNEYS = /obj/item/organ/internal/kidneys/,
+ O_BRAIN = /obj/item/organ/internal/brain/chirret,
+ O_EYES = /obj/item/organ/internal/eyes/,
+ O_SILKSPINNER = /obj/item/organ/internal/silkspinner,
+ O_NUTRIENT = /obj/item/organ/internal/diona/nutrients/chirret)
+
+ 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/chirret),
+ 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)
+ )
+
+ spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED //Whitelisted as restricted is broken.
+ flags = NO_MINOR_CUT
+ appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
+
+ flesh_color = "#AFA59E"
+ base_color = "#333333"
+ blood_color = "#14AD8B"
+
+
+/datum/species/chirret/handle_environment_special(var/mob/living/carbon/human/H)
+ if(H.stat == 2)
+ return
+
+ if(H.bodytemperature >= 318.15 && H.bodytemperature < 333.15) //45C Confusion
+ H.confused = max(H.confused, 20)
+ else if(H.bodytemperature >= 333.15 && H.bodytemperature < 353.15) //60C Sleeping
+ H.sleeping = max(H.sleeping, 20)
+ else if(H.bodytemperature >= 353.15) //80C Organ damage and sleeping
+ H.sleeping = max(H.sleeping, 20)
+ var/obj/item/organ/internal/O = pick(H.internal_organs)
+ if(O) //In case they have no internal organs but are still alive by some magic. Prevents runtimes.
+ O.take_damage(5) //Welp.
diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm
index 3b0478fd1b..574acfa7ac 100644
--- a/code/modules/mob/new_player/sprite_accessories_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_vr.dm
@@ -9,7 +9,7 @@
icon = 'icons/mob/human_face_or_vr.dmi'
//var/icon_add = 'icons/mob/human_face.dmi' //Already defined in sprite_accessories.dm line 49.
var/color_blend_mode = ICON_MULTIPLY
- species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Rapala") //This lets all races use the default hairstyles.
+ species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Rapala", "Chirret") //This lets all races use the default hairstyles.
awoohair
name = "Shoulder-length Messy"
@@ -69,7 +69,7 @@
name = "Bald"
icon_state = "bald"
gender = MALE
- species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Xenochimera", "Rapala") //Lets all the races be bald if they want.
+ species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Xenochimera", "Rapala", "Chirret") //Lets all the races be bald if they want.
ponytail6_fixed //Eggnerd's done with waiting for upstream fixes lmao.
name = "Ponytail 6 but fixed"
@@ -428,13 +428,13 @@
/datum/sprite_accessory/facial_hair
icon = 'icons/mob/human_face_or_vr.dmi'
var/color_blend_mode = ICON_MULTIPLY
- species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Rapala") //This lets all races use the facial hair styles.
+ species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Rapala", "Chirret") //This lets all races use the facial hair styles.
shaved
name = "Shaved"
icon_state = "bald"
gender = NEUTER
- species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Rapala") //This needed to be manually defined, apparantly.
+ species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid", "Vasilissan", "Rapala", "Chirret") //This needed to be manually defined, apparantly.
vulp_none
@@ -781,6 +781,30 @@
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND)
+ chirret_cheeks
+ name = "Chirret Cheeks"
+ icon_state = "chirret_cheeks"
+ body_parts = list(BP_HEAD)
+ color_blend_mode = ICON_MULTIPLY
+
+ chirret_claws
+ name = "Chirret Claws"
+ icon_state = "chirret_claws"
+ body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND)
+ color_blend_mode = ICON_MULTIPLY
+
+ chirret_face_and_belly_v1
+ name = "Chirret Face and Belly Variant 1"
+ icon_state = "chirret_fb_1"
+ body_parts = list(BP_HEAD,BP_GROIN,BP_TORSO,BP_R_LEG,BP_L_LEG)
+ color_blend_mode = ICON_MULTIPLY
+
+ chirret_face_and_belly_v2
+ name = "Chirret Face and Belly Variant 2"
+ icon_state = "chirret_fb_2"
+ body_parts = list(BP_HEAD,BP_GROIN,BP_TORSO,BP_R_LEG,BP_L_LEG)
+ color_blend_mode = ICON_MULTIPLY
+
harpy_feathers
name = "Rapala leg Feather"
icon_state = "harpy-feathers"
diff --git a/code/modules/organs/subtypes/chirret_vr.dm b/code/modules/organs/subtypes/chirret_vr.dm
new file mode 100644
index 0000000000..ffed1bbbe5
--- /dev/null
+++ b/code/modules/organs/subtypes/chirret_vr.dm
@@ -0,0 +1,21 @@
+/obj/item/organ/internal/heart/chirret
+ icon = 'icons/obj/surgery_vr.dmi'
+ name = "alien heart"
+/obj/item/organ/internal/lungs/chirret
+ icon = 'icons/obj/surgery_vr.dmi'
+ name = "alien lungs"
+/obj/item/organ/internal/liver/chirret
+ icon = 'icons/obj/surgery_vr.dmi'
+ name = "alien liver"
+/obj/item/organ/internal/brain/chirret
+ icon = 'icons/obj/surgery_vr.dmi'
+ name = "alien silk spinner"
+/obj/item/organ/internal/silkspinner
+ icon = 'icons/obj/surgery_vr.dmi'
+ name = "alien silk spinner"
+ icon_state = "silk"
+/obj/item/organ/internal/diona/nutrients/chirret
+ name = "alien organ"
+/obj/item/organ/external/head/vr/chirret
+ eye_icon = "blank_eyes"
+ eye_icon_vr = "eyes_chirret"
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
index 51ba5d3782..19f9195881 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
@@ -414,6 +414,20 @@
else
M.sleeping = max(M.sleeping, 20)
M.drowsyness = max(M.drowsyness, 60)
+ else if(alien == IS_CHIRRET) //VOREStation Edit Start
+ if(effective_dose < 2)
+ if(effective_dose == metabolism * 2 || prob(5))
+ M.make_dizzy(6)
+ M.slurring = max(M.slurring, 30)
+ M.eye_blurry = max(M.eye_blurry, 10)
+ else if(effective_dose < 10)
+ M.slurring = max(M.slurring, 30)
+ M.eye_blurry = max(M.eye_blurry, 10)
+ M.drowsyness = max(M.drowsyness, 20)
+ M.eye_blurry = max(M.eye_blurry, 10)
+ M.confused = max(M.confused, 20)
+ else
+ M.paralysis = max(M.paralysis, 20)//VOREStation Edit End
/datum/reagent/sulfur
name = "Sulfur"
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 50bdd413d2..763d382fd5 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -804,6 +804,8 @@
//if(alien == IS_TAJARA) //VOREStation Edit Begin
//M.adjustToxLoss(0.5 * removed)
//M.make_jittery(4) //extra sensitive to caffine
+ if(alien == IS_CHIRRET)
+ M.make_jittery(20) //VOREStation Edit End
if(adj_temp > 0)
holder.remove_reagent("frostoil", 10 * removed)
diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm
index 31b155cd3b..fb634cb136 100644
--- a/code/modules/vore/appearance/sprite_accessories_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_vr.dm
@@ -90,6 +90,13 @@
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
+/datum/sprite_accessory/ears/antennae
+ name = "chirret antennae, colorable"
+ desc = ""
+ icon_state = "antennae_chirret"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+
/datum/sprite_accessory/ears/oni_h1
name = "oni horns"
desc = ""
@@ -845,6 +852,14 @@
color_blend_mode = ICON_MULTIPLY
extra_overlay = "sergal_mark"
+/datum/sprite_accessory/tail/sergaltaildc
+ name = "chirret, dual-color"
+ desc = ""
+ icon_state = "chirret"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+ extra_overlay = "chirret_mark"
+
//For all species tails. Includes haircolored tails.
/datum/sprite_accessory/tail/special
name = "Blank tail. Do not select."
diff --git a/icons/mob/human_face_vr.dmi b/icons/mob/human_face_vr.dmi
index 00b2e58f72..fdbcbc244a 100644
Binary files a/icons/mob/human_face_vr.dmi and b/icons/mob/human_face_vr.dmi differ
diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi
index 1c3e45a03e..2b688e1af7 100644
Binary files a/icons/mob/human_races/markings_vr.dmi and b/icons/mob/human_races/markings_vr.dmi differ
diff --git a/icons/mob/human_races/r_chirret.dmi b/icons/mob/human_races/r_chirret.dmi
new file mode 100644
index 0000000000..26008114e7
Binary files /dev/null and b/icons/mob/human_races/r_chirret.dmi differ
diff --git a/icons/mob/human_races/r_def_chirret.dmi b/icons/mob/human_races/r_def_chirret.dmi
new file mode 100644
index 0000000000..26008114e7
Binary files /dev/null and b/icons/mob/human_races/r_def_chirret.dmi differ
diff --git a/icons/mob/species/chirret/helmet_vr.dmi b/icons/mob/species/chirret/helmet_vr.dmi
new file mode 100644
index 0000000000..320a6cef91
Binary files /dev/null and b/icons/mob/species/chirret/helmet_vr.dmi differ
diff --git a/icons/mob/species/chirret/mask_vr.dmi b/icons/mob/species/chirret/mask_vr.dmi
new file mode 100644
index 0000000000..bbe1b658d5
Binary files /dev/null and b/icons/mob/species/chirret/mask_vr.dmi differ
diff --git a/icons/mob/species/chirret/suit_vr.dmi b/icons/mob/species/chirret/suit_vr.dmi
new file mode 100644
index 0000000000..4580510466
Binary files /dev/null and b/icons/mob/species/chirret/suit_vr.dmi differ
diff --git a/icons/mob/species/chirret/tail.dmi b/icons/mob/species/chirret/tail.dmi
new file mode 100644
index 0000000000..d514cf3777
Binary files /dev/null and b/icons/mob/species/chirret/tail.dmi differ
diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi
index a4844214c6..2b2c1cc52e 100644
Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ
diff --git a/icons/mob/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi
index 3b10ec215f..4c7bd4cc69 100644
Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ
diff --git a/icons/obj/bodybag_vr.dmi b/icons/obj/bodybag_vr.dmi
new file mode 100644
index 0000000000..911f77f8b2
Binary files /dev/null and b/icons/obj/bodybag_vr.dmi differ
diff --git a/icons/obj/surgery_vr.dmi b/icons/obj/surgery_vr.dmi
new file mode 100644
index 0000000000..d78994b4bb
Binary files /dev/null and b/icons/obj/surgery_vr.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index d73e38350c..c822e5a9ca 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2153,6 +2153,7 @@
#include "code\modules\organs\internal\liver.dm"
#include "code\modules\organs\internal\lungs.dm"
#include "code\modules\organs\internal\organ_internal.dm"
+#include "code\modules\organs\subtypes\chirret_vr.dm"
#include "code\modules\organs\subtypes\diona.dm"
#include "code\modules\organs\subtypes\machine.dm"
#include "code\modules\organs\subtypes\seromi.dm"