diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm index 4fb63982ce..79c8819edf 100644 --- a/code/modules/emotes/definitions/audible_furry_vr.dm +++ b/code/modules/emotes/definitions/audible_furry_vr.dm @@ -238,3 +238,8 @@ key = "coyawoo5" emote_message_3p = "lets out a scraggly, whine-awoo." emote_sound = 'sound/voice/coyoteawoo5.ogg' + +/decl/emote/audible/roarbark // Upstream port from CHOMP + key = "roarbark" + emote_message_3p = "lets out a roar-bark!" + emote_sound = 'sound/voice/roarbark.ogg' diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 0338603e64..ef2c271f71 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -170,7 +170,8 @@ var/list/_human_default_emotes = list( /decl/emote/visible/vibrate, /decl/emote/audible/croon, /decl/emote/audible/lwarble, - /decl/emote/audible/croak_skrell + /decl/emote/audible/croak_skrell, + /decl/emote/audible/roarbark //VOREStation Add End ) diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm index ab2f41cef4..80fe3e413f 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -901,4 +901,41 @@ icon = 'icons/mob/human_races/markings_vr.dmi' icon_state = "unathi_blocky_head_eyes" color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) \ No newline at end of file + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/manedwolf1 + name = "Maned Wolf Primary Markings" + icon_state = "manedwolf1" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD,BP_TORSO,BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT) + +/datum/sprite_accessory/marking/vr/manedwolf2 + name = "Maned Wolf Secondary Markings" + icon_state = "manedwolf2" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD,BP_TORSO,BP_GROIN) + +/datum/sprite_accessory/marking/vr/head_paint_front + name = "Head Paint Front" + icon_state = "paintfront" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/head_paint_back + name = "Head Paint" + icon_state = "paint" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/sect_drone + name = "Sect Drone Bodytype" + icon_state = "sectdrone" + color_blend_mode = ICON_MULTIPLY + hide_body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) + +/datum/sprite_accessory/marking/vr/sect_drone_eyes + name = "Sect Drone Eyes" + icon_state = "sectdrone_eyes" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index 33dab91447..ab16df28d1 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -1328,6 +1328,14 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/sectdrone_tail + name = "Sect Drone Tail (To use with bodytype-marking)" + icon = 'icons/mob/vore/tails_vr.dmi' + icon_state = "sectdrone_tail" + extra_overlay = "sectdrone_tail_mark" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + //LONG TAILS ARE NOT TAUR BUTTS >:O /datum/sprite_accessory/tail/longtail name = "You should not see this..." diff --git a/code/modules/mob/new_player/sprite_accessories_wing_vr.dm b/code/modules/mob/new_player/sprite_accessories_wing_vr.dm index 35753bf2ed..aba84d495b 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing_vr.dm @@ -311,3 +311,11 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "snail_shell_markings" + +/datum/sprite_accessory/wing/sectdrone_wing //We should some day make a variable to make some wings not be able to fly + name = "Sect drone wings (To use with bodytype marking)" + desc = "" + icon = 'icons/mob/vore/wings_vr.dmi' + icon_state = "sectdrone_wing" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 29442bf908..07c1f897b2 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/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index c9b2915651..d55293ae14 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ diff --git a/icons/mob/vore/wings_vr.dmi b/icons/mob/vore/wings_vr.dmi index 5edced1ac9..cdcac1d4cd 100644 Binary files a/icons/mob/vore/wings_vr.dmi and b/icons/mob/vore/wings_vr.dmi differ diff --git a/sound/voice/roarbark.ogg b/sound/voice/roarbark.ogg new file mode 100644 index 0000000000..adb3b23639 Binary files /dev/null and b/sound/voice/roarbark.ogg differ