cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-25 05:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2023-06-21 19:03:35 +02:00
parent 89fc57f631 a848dd292d
commit ff7df50a7e
346 changed files with 5621 additions and 4174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/sprite_accessories.dm
+1 -1
View File
@@ -1203,7 +1203,7 @@
flags = HAIR_TIEABLE
/datum/sprite_accessory/hair/una_hood
name = "Cobra Hood"
name = "Cobra Hood (small)"
icon = 'icons/mob/human_face_alt.dmi'
icon_add = 'icons/mob/human_face_alt_add.dmi'
icon_state = "soghun_hood"
code/modules/mob/new_player/sprite_accessories_ear_vr.dm
+92 -1
View File
@@ -518,6 +518,14 @@
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/cobra_hood
name = "Cobra hood (large)"
desc = ""
icon_state = "cobra_hood"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "cobra_hood-inner"
// Special snowflake ears go below here.
/datum/sprite_accessory/ears/molenar_kitsune
@@ -923,4 +931,87 @@
desc = ""
icon = 'icons/mob/vore/ears_vr.dmi'
icon_state = "kara_horn"
ckeys_allowed = list("satinisle")
ckeys_allowed = list("satinisle")
/datum/sprite_accessory/ears/shark
name = "shark ears (Colorable)"
desc = ""
icon_state = "shark_ears"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/sharkhigh
name = "shark upper ears (Colorable)"
desc = ""
icon_state = "shark_ears_upper"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/sharklow
name = "shark lower ears (Colorable)"
desc = ""
icon_state = "shark_ears_lower"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/sharkfin
name = "shark fin (Colorable)"
desc = ""
icon_state = "shark_fin"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/sharkfinalt
name = "shark fin alt style (Colorable)"
desc = ""
icon_state = "shark_fin_alt"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/sharkboth
name = "shark ears and fin (Colorable)"
desc = ""
icon_state = "shark_ears"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "shark_fin"
/datum/sprite_accessory/ears/sharkbothalt
name = "shark ears and fin alt style (Colorable)"
desc = ""
icon_state = "shark_ears"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "shark_fin_alt"
/datum/sprite_accessory/ears/sharkhighboth
name = "shark upper ears and fin (Colorable)"
desc = ""
icon_state = "shark_ears_upper"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "shark_fin"
/datum/sprite_accessory/ears/sharkhighbothalt
name = "shark upper ears and fin alt style (Colorable)"
desc = ""
icon_state = "shark_ears_upper"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "shark_fin_alt"
/datum/sprite_accessory/ears/sharklowboth
name = "shark lower ears and fin (Colorable)"
desc = ""
icon_state = "shark_ears_lower"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "shark_fin"
/datum/sprite_accessory/ears/sharklowbothalt
name = "shark lower ears and fin alt style (Colorable)"
desc = ""
icon_state = "shark_ears_lower"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "shark_fin_alt"
code/modules/mob/new_player/sprite_accessories_extra_vr.dm
+15 -1
View File
@@ -758,7 +758,7 @@
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/vr_unathihood
name = "Cobra Hood"
name = "Cobra hood (small)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "unathihood"
color_blend_mode = ICON_MULTIPLY
@@ -981,3 +981,17 @@
icon_state = "nevrean_long"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr_heterochromia_l
name = "Heterochromia (left eye)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "heterochromia_l"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/vr_teshi_heterochromia_l
name = "Heterochromia (Teshari) (left eye)"
icon = 'icons/mob/human_races/markings_vr.dmi'
icon_state = "teshi_heterochromia_l"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
code/modules/mob/new_player/sprite_accessories_tail_vr.dm
+29
View File
@@ -1385,3 +1385,32 @@
clip_mask_icon = 'icons/mob/vore/taurs_vr.dmi'
clip_mask_state = "taur_clip_mask_def" //Used to clip off the lower part of suits & uniforms.
extra_overlay = "horse" //I can't believe this works.
/datum/sprite_accessory/tail/turkey //Would have been a really good thing for Thanksgiving probably but I'm not going to wait that long.
name = "turkey"
desc = ""
icon_state = "turkey"
/datum/sprite_accessory/tail/shark_markings
name = "akula tail, colorable, tail and fins"
desc = ""
icon_state = "sharktail"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "sharktail_markings"
/datum/sprite_accessory/tail/shark_stripes
name = "akula tail, colorable, stripe"
desc = ""
icon_state = "sharktail"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "sharktail_stripemarkings"
/datum/sprite_accessory/tail/shark_tips
name = "akula tail, colorable, tips"
desc = ""
icon_state = "sharktail"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
extra_overlay = "sharktail_tipmarkings"
code/modules/mob/new_player/sprite_accessories_taur_vr.dm
+64
View File
@@ -488,6 +488,30 @@
extra_overlay_w = "fatsynthfeline_markings"
extra_overlay2_w = "fatsynthfeline_glow"
/datum/sprite_accessory/tail/taur/synthetic/syntheticagi
name = "Synthetic chassis - agile (Taur)"
icon_state = "synthtaur1_s"
extra_overlay = "synthtaur1_markings"
extra_overlay2 = "synthtaur1_glow"
clip_mask_state = "taur_clip_mask_synthtaur1"
/datum/sprite_accessory/tail/taur/synthetic/syntheticagi_fat
name = "Synthetic chassis - agile (Taur, Fat)"
icon_state = "synthtaur1_s"
extra_overlay = "synthtaur1_fat_markings"
extra_overlay2 = "synthtaur1_glow"
clip_mask_state = "taur_clip_mask_synthtaur1"
/datum/sprite_accessory/tail/taur/synthetic/syntheticagi_wag
name = "Synthetic chassis - agile (Taur, Fat vwag)"
icon_state = "synthtaur1_s"
extra_overlay = "synthtaur1_markings"
extra_overlay2 = "synthtaur1_glow"
ani_state = "synthtaur1_s"
extra_overlay_w = "synthtaur1_fat_markings"
extra_overlay2_w = "synthtaur1_glow"
clip_mask_state = "taur_clip_mask_synthtaur1"
/datum/sprite_accessory/tail/taur/slug
name = "Slug (Taur)"
icon_state = "slug_s"
@@ -657,6 +681,45 @@
msg_prey_stepunder = "You jump over %prey's thick tail."
msg_owner_stepunder = "%owner bounds over your tail."
/datum/sprite_accessory/tail/taur/altmermaid
name = "Mermaid Alt. (Taur)"
icon_state = "altmermaid_s"
can_ride = 0
icon_sprite_tag = "altmermaid"
msg_owner_help_walk = "You carefully slither around %prey."
msg_prey_help_walk = "%owner's huge tail slithers past beside you!"
msg_owner_help_run = "You carefully slither around %prey."
msg_prey_help_run = "%owner's huge tail slithers past beside you!"
msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!"
msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!"
msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!"
msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!"
msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!"
msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!"
msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!"
msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!"
msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!"
msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!"
msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!"
msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!"
msg_prey_stepunder = "You jump over %prey's thick tail."
msg_owner_stepunder = "%owner bounds over your tail."
/datum/sprite_accessory/tail/taur/altmermaid/marked
name = "Mermaid Koi (Taur)"
icon_state = "altmermaid_s"
extra_overlay = "altmermaid_markings"
extra_overlay2 = "altmermaid_markings2"
/datum/sprite_accessory/tail/taur/pawcow // this grabs suit sprites from the normal cow, the outline is the same
name = "Cow w/ paws (Taur)"
icon_state = "pawcow_s"
@@ -962,3 +1025,4 @@
name = "Naga (Taur, Fat, dual color)"
icon_state = "fatnaga_s"
extra_overlay = "fatnaga_markings"