diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 758f9f8938..e9d83b8c87 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -1184,4 +1184,89 @@ bee_stripes name = "bee stripes" icon_state = "beestripes" - body_parts = list(BP_TORSO,BP_GROIN) \ No newline at end of file +<<<<<<< HEAD + body_parts = list(BP_TORSO,BP_GROIN) +||||||| parent of bbd7600f00... Merge pull request #9307 from KasparoVy/port-some-citrp-stuff + body_parts = list(BP_TORSO,BP_GROIN) + + vas_toes + name = "Bug Paws (Vasilissan)" + icon_state = "vas_toes" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_FOOT,BP_R_FOOT) +======= + body_parts = list(BP_TORSO,BP_GROIN) + + vas_toes + name = "Bug Paws (Vasilissan)" + icon_state = "vas_toes" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_FOOT,BP_R_FOOT) + + //CitRP stuff + vox_alt + name = "Vox Alternate" + icon_state = "bay_vox" + 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_TORSO,BP_GROIN,BP_HEAD) + species_allowed = list(SPECIES_VOX) + + vox_alt_eyes + name = "Alternate Vox Eyes" + icon_state = "bay_vox_eyes" + body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_VOX) + + c_beast_body + name = "Cyber Body" + icon_state = "c_beast_body" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN) + + c_beast_plating + name = "Cyber Plating (Use w/ Cyber Body)" + icon_state = "c_beast_plating" + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM) + + c_beast_band + name = "Cyber Band (Use w/ Cybertech head)" + icon_state = "c_beast_band" + body_parts = list(BP_HEAD) + + c_beast_cheek_a + name = "Cyber Beast Cheeks A (Use A and B)" + icon_state = "c_beast_add_a" + body_parts = list(BP_HEAD) + + c_beast_cheek_b + name = "Cyber Beast Cheeks B (Use A and B)" + icon_state = "c_beast_add_b" + body_parts = list(BP_HEAD) + + teshari_large_eyes + name = "Teshari large eyes" + icon_state = "teshlarge_eyes" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_TESHARI) + + teshari_coat + name = "Teshari coat" + icon_state = "tesh_coat" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD) + species_allowed = list(SPECIES_TESHARI) + + teshari_pattern_male + name = "Teshari male pattern" + icon_state = "tesh-pattern-male" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD) + species_allowed = list(SPECIES_TESHARI) + + teshari_pattern_female + name = "Teshari female pattern" + icon_state = "tesh-pattern-fem" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD) + species_allowed = list(SPECIES_TESHARI) +>>>>>>> bbd7600f00... Merge pull request #9307 from KasparoVy/port-some-citrp-stuff diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index 5182c70e55..219950c7fa 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -3,6 +3,24 @@ var/includes_wing //Cyberlimbs dmi includes a wing sprite to wear. var/list/whitelisted_to //List of ckeys that are allowed to pick this in charsetup. +//CitRP Port +var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ + default=cyber_default;\ + static=cyber_static;\ + alert=cyber_alert;\ + happy=cyber_happ;\ + unhappy=cyber_unhapp;\ + flat=cyber_flat;\ + sad=cyber_sad;\ + heart=cyber_heart;\ + cross=cyber_cross;\ + wave=cyber_wave;\ + uwu=cyber_uwu;\ + question=cyber_question;\ + lowpower=cyber_lowpower;\ + idle=cyber_idle;\ + nwn=cyber_nwn" + //////////////// For-specific-character fluff ones ///////////////// // arokha : Aronai Sieyes /datum/robolimb/kitsuhana @@ -209,3 +227,16 @@ /obj/item/weapon/disk/limb/dsi_teshari company = "DSI - Teshari" + +//Ported from CitRP +/datum/robolimb/cyber_beast + company = "Cyber Tech" + desc = "Adjusted for deep space, the material is durable and heavy." + icon = 'icons/mob/human_races/cyberlimbs/c-tech/c_beast.dmi' + unavailable_to_build = 1 + parts = list(BP_HEAD) + monitor_icon = 'icons/mob/monitor_icons_vr.dmi' + monitor_styles = cyberbeast_monitor_styles + +/obj/item/weapon/disk/limb/cyber_beast + company = "Cyber Tech" diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index f8ba23f341..d3d7fe29e1 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -419,7 +419,7 @@ color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/teshari - name = "Teshari (colorable fluff)" + name = "Teshari (colorable)" desc = "" icon_state = "teshari" do_colouration = 1 @@ -427,7 +427,7 @@ extra_overlay = "teshariinner" /datum/sprite_accessory/ears/tesharihigh - name = "Teshari upper ears (colorable fluff)" + name = "Teshari upper ears (colorable)" desc = "" icon_state = "tesharihigh" do_colouration = 1 @@ -435,13 +435,29 @@ extra_overlay = "tesharihighinner" /datum/sprite_accessory/ears/tesharilow - name = "Teshari lower ears (colorable fluff)" + name = "Teshari lower ears (colorable)" desc = "" icon_state = "tesharilow" do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "tesharilowinner" +/datum/sprite_accessory/ears/tesh_pattern_ear_male + name = "Teshari male ear pattern (colorable)" + desc = "" + icon_state = "teshari" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "teshari_male_pattern" + +/datum/sprite_accessory/ears/tesh_pattern_ear_female + name = "Teshari female ear pattern (colorable)" + desc = "" + icon_state = "teshari" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "teshari_female_pattern" + /datum/sprite_accessory/ears/inkling name = "colorable mature inkling hair" desc = "" @@ -1227,13 +1243,53 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "deertail_mark" +/datum/sprite_accessory/tail/tesh_feathered + name = "Teshari tail" + desc = "" + icon_state = "teshtail_s" + do_colouration = 1 + extra_overlay = "teshtail_feathers_s" + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/tail/teshari_fluffytail name = "Teshari alternative, colorable" desc = "" icon_state = "teshari_fluffytail" - extra_overlay = "teshari_fluffytail_mark" do_colouration = 1 color_blend_mode = ICON_MULTIPLY + extra_overlay = "teshari_fluffytail_mark" + +/datum/sprite_accessory/tail/tesh_pattern_male + name = "Teshari male tail pattern" + desc = "" + icon_state = "teshtail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "teshpattern_male_tail" + +/datum/sprite_accessory/tail/tesh_pattern_male_alt + name = "Teshari male tail alt. pattern" + desc = "" + icon_state = "teshtail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "teshpattern_male_alt" + +/datum/sprite_accessory/tail/tesh_pattern_fem + name = "Teshari female tail pattern" + desc = "" + icon_state = "teshtail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "teshpattern_fem_tail" + +/datum/sprite_accessory/tail/tesh_pattern_fem_alt + name = "Teshari male tail alt. pattern" + desc = "" + icon_state = "teshtail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "teshpattern_fem_alt" /datum/sprite_accessory/tail/nightstalker name = "Nightstalker, colorable" @@ -1312,21 +1368,6 @@ desc = "" icon_state = "chimptail_s" -/datum/sprite_accessory/tail/special/seromitail - name = "seromi tail" - desc = "" - icon_state = "seromitail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/special/seromitailfeathered - name = "seromi tail w/ feathers" - desc = "" - icon_state = "seromitail_s" - extra_overlay = "seromitail_feathers_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/special/unathihc name = "unathi tail, colorable" desc = "" @@ -1412,20 +1453,6 @@ icon_state = "chimptail_hc_s" do_colouration = 1 -/datum/sprite_accessory/tail/special/seromitailhc - name = "seromi tail, colorable" - desc = "" - icon_state = "seromitail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/special/seromitailfeatheredhc - name = "seromi tail w/ feathers, colorable" - desc = "" - icon_state = "seromitail_feathers_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/special/vulpan name = "vulpkanin, colorable" desc = "" diff --git a/icons/mob/human_races/cyberlimbs/c-tech/c_beast.dmi b/icons/mob/human_races/cyberlimbs/c-tech/c_beast.dmi new file mode 100644 index 0000000000..60bf6df98f Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/c-tech/c_beast.dmi differ diff --git a/icons/mob/monitor_icons_vr.dmi b/icons/mob/monitor_icons_vr.dmi new file mode 100644 index 0000000000..9e48c64a4a Binary files /dev/null and b/icons/mob/monitor_icons_vr.dmi differ diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index 19ca05582f..602b3ac809 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 976b6c5a58..79c188a2d2 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ