diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index adb204e4d9..690379fdb6 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -570,7 +570,6 @@ var/list/dispenser_presets = list() name = "Aether Voidsuit" voidsuit_type = /obj/item/clothing/suit/space/void/aether voidhelmet_type = /obj/item/clothing/head/helmet/space/void/aether - refit = FALSE // No animal sprites AAA! /obj/machinery/gear_dispenser/suit/aether name = "\improper Aether Voidsuit Dispenser" @@ -872,4 +871,4 @@ var/list/dispenser_presets = list() /datum/gear_disp/adventure_box/armor, /datum/gear_disp/adventure_box/light, /datum/gear_disp/adventure_box/weapon - ) \ No newline at end of file + ) diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index 177cd768b0..a786acfd51 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -84,9 +84,8 @@ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "hev_orange" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/suit/space/void/hev/violet icon_state = "hev_violet" @@ -100,9 +99,8 @@ default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "hev_orange" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM /obj/item/clothing/head/helmet/space/void/hev/violet icon_state = "hev_violet" @@ -119,9 +117,8 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0) - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/makeshift name = "makeshift voidsuit helmet" @@ -133,9 +130,8 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0) - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM // 'Custodian' armor /obj/item/clothing/suit/space/void/custodian @@ -148,9 +144,8 @@ armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20) - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/custodian name = "custodian helmet" @@ -162,9 +157,8 @@ armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20) - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM // 'Moebius' armor /obj/item/clothing/suit/space/void/aether @@ -177,9 +171,8 @@ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20) - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/aether name = "\improper Aether voidsuit helmet" @@ -191,9 +184,8 @@ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20) - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM /obj/item/clothing/head/helmet/space/void/aether/verb/select_color() set name = "Helmet Color" @@ -216,9 +208,8 @@ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "excelsior" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/excelsior name = "\improper Excelsior voidsuit helmet" @@ -228,6 +219,5 @@ default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "excelsior" - // No animal people sprites for these yet, sad times - species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA) - sprite_sheets = null + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index a94aa0334c..e940e154f1 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1168,6 +1168,13 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() return working /mob/living/carbon/human/proc/get_ears_overlay() + //If you are FBP with ear style and didn't set a custom one + var/datum/robolimb/model = isSynthetic() + if(istype(model) && model.includes_ears && !ear_style) + var/icon/ears_s = new/icon("icon" = synthetic.icon, "icon_state" = "ears") + ears_s.Blend(rgb(src.r_ears, src.g_ears, src.b_ears), species.color_mult ? ICON_MULTIPLY : ICON_ADD) + return ears_s + if(ear_style && !(head && (head.flags_inv & BLOCKHEADHAIR))) var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state) if(ear_style.do_colouration) @@ -1189,7 +1196,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() /mob/living/carbon/human/proc/get_tail_image() //If you are FBP with tail style and didn't set a custom one var/datum/robolimb/model = isSynthetic() - if(istype(model) && model.includes_tail && !tail_style) + if(istype(model) && model.includes_tail && !tail_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) var/icon/tail_s = new/icon("icon" = synthetic.icon, "icon_state" = "tail") tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) return image(tail_s) diff --git a/code/modules/organs/robolimbs_custom.dm b/code/modules/organs/robolimbs_custom.dm index 12f6dbaa00..1df6862cf2 100644 --- a/code/modules/organs/robolimbs_custom.dm +++ b/code/modules/organs/robolimbs_custom.dm @@ -1,6 +1,7 @@ /datum/robolimb var/includes_tail //Cyberlimbs dmi includes a tail sprite to wear. var/includes_wing //Cyberlimbs dmi includes a wing sprite to wear. + var/includes_ears //Cyberlimbs dmi includes ear sprites to wear. var/list/whitelisted_to //List of ckeys that are allowed to pick this in charsetup. //////////////// For-specific-character fluff ones ///////////////// May be viable to place these into a custom_item subfolder, in order to allow CI Repo integration. diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index faf6360014..79e132d4bd 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -33,9 +33,10 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ icon = 'icons/mob/human_races/cyberlimbs/_fluff_vr/aronai.dmi' blood_color = "#5dd4fc" includes_tail = 1 + includes_ears = 1 lifelike = 1 unavailable_to_build = 1 - suggested_species = "Tajara" + suggested_species = SPECIES_VULPKANIN whitelisted_to = list("arokha") /obj/item/weapon/disk/limb/kitsuhana diff --git a/icons/inventory/head/item_vr_akula.dmi b/icons/inventory/head/item_vr_akula.dmi index c1c62b0eef..3fd5294057 100644 Binary files a/icons/inventory/head/item_vr_akula.dmi and b/icons/inventory/head/item_vr_akula.dmi differ diff --git a/icons/inventory/head/item_vr_sergal.dmi b/icons/inventory/head/item_vr_sergal.dmi index 1798af00f3..48908b9e39 100644 Binary files a/icons/inventory/head/item_vr_sergal.dmi and b/icons/inventory/head/item_vr_sergal.dmi differ diff --git a/icons/inventory/head/item_vr_skrell.dmi b/icons/inventory/head/item_vr_skrell.dmi index ca89e62c98..9a23e59f20 100644 Binary files a/icons/inventory/head/item_vr_skrell.dmi and b/icons/inventory/head/item_vr_skrell.dmi differ diff --git a/icons/inventory/head/item_vr_tajaran.dmi b/icons/inventory/head/item_vr_tajaran.dmi index 42f2e3baaf..2223bafae4 100644 Binary files a/icons/inventory/head/item_vr_tajaran.dmi and b/icons/inventory/head/item_vr_tajaran.dmi differ diff --git a/icons/inventory/head/item_vr_unathi.dmi b/icons/inventory/head/item_vr_unathi.dmi index 42f2e3baaf..2223bafae4 100644 Binary files a/icons/inventory/head/item_vr_unathi.dmi and b/icons/inventory/head/item_vr_unathi.dmi differ diff --git a/icons/inventory/head/item_vr_vulpkanin.dmi b/icons/inventory/head/item_vr_vulpkanin.dmi index a436370991..b83b041501 100644 Binary files a/icons/inventory/head/item_vr_vulpkanin.dmi and b/icons/inventory/head/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/head/mob_vr_akula.dmi b/icons/inventory/head/mob_vr_akula.dmi index ca993093cb..d030932919 100644 Binary files a/icons/inventory/head/mob_vr_akula.dmi and b/icons/inventory/head/mob_vr_akula.dmi differ diff --git a/icons/inventory/head/mob_vr_sergal.dmi b/icons/inventory/head/mob_vr_sergal.dmi index d1278fdee1..4d5a35c047 100644 Binary files a/icons/inventory/head/mob_vr_sergal.dmi and b/icons/inventory/head/mob_vr_sergal.dmi differ diff --git a/icons/inventory/head/mob_vr_skrell.dmi b/icons/inventory/head/mob_vr_skrell.dmi index 5a93ec85aa..d3de0f973d 100644 Binary files a/icons/inventory/head/mob_vr_skrell.dmi and b/icons/inventory/head/mob_vr_skrell.dmi differ diff --git a/icons/inventory/head/mob_vr_tajaran.dmi b/icons/inventory/head/mob_vr_tajaran.dmi index 62fe3a4208..8f478fe37a 100644 Binary files a/icons/inventory/head/mob_vr_tajaran.dmi and b/icons/inventory/head/mob_vr_tajaran.dmi differ diff --git a/icons/inventory/head/mob_vr_unathi.dmi b/icons/inventory/head/mob_vr_unathi.dmi index 5f94c0689c..9e05584157 100644 Binary files a/icons/inventory/head/mob_vr_unathi.dmi and b/icons/inventory/head/mob_vr_unathi.dmi differ diff --git a/icons/inventory/head/mob_vr_vulpkanin.dmi b/icons/inventory/head/mob_vr_vulpkanin.dmi index 5e815142fd..50001ce846 100644 Binary files a/icons/inventory/head/mob_vr_vulpkanin.dmi and b/icons/inventory/head/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index cadbe89ab7..30fc466955 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/item_vr_akula.dmi b/icons/inventory/suit/item_vr_akula.dmi index d92ed2767f..4804ce6e4a 100644 Binary files a/icons/inventory/suit/item_vr_akula.dmi and b/icons/inventory/suit/item_vr_akula.dmi differ diff --git a/icons/inventory/suit/item_vr_sergal.dmi b/icons/inventory/suit/item_vr_sergal.dmi index 317437de1b..1c30a0b6af 100644 Binary files a/icons/inventory/suit/item_vr_sergal.dmi and b/icons/inventory/suit/item_vr_sergal.dmi differ diff --git a/icons/inventory/suit/item_vr_skrell.dmi b/icons/inventory/suit/item_vr_skrell.dmi index 47be343651..29b1dc6c74 100644 Binary files a/icons/inventory/suit/item_vr_skrell.dmi and b/icons/inventory/suit/item_vr_skrell.dmi differ diff --git a/icons/inventory/suit/item_vr_tajaran.dmi b/icons/inventory/suit/item_vr_tajaran.dmi index 47be343651..29b1dc6c74 100644 Binary files a/icons/inventory/suit/item_vr_tajaran.dmi and b/icons/inventory/suit/item_vr_tajaran.dmi differ diff --git a/icons/inventory/suit/item_vr_unathi.dmi b/icons/inventory/suit/item_vr_unathi.dmi index 47be343651..29b1dc6c74 100644 Binary files a/icons/inventory/suit/item_vr_unathi.dmi and b/icons/inventory/suit/item_vr_unathi.dmi differ diff --git a/icons/inventory/suit/item_vr_vulpkanin.dmi b/icons/inventory/suit/item_vr_vulpkanin.dmi index a0a7c18394..feeb780f60 100644 Binary files a/icons/inventory/suit/item_vr_vulpkanin.dmi and b/icons/inventory/suit/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index 3149708f46..4288fd0326 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr_akula.dmi b/icons/inventory/suit/mob_vr_akula.dmi index 203c946c2d..f248264064 100644 Binary files a/icons/inventory/suit/mob_vr_akula.dmi and b/icons/inventory/suit/mob_vr_akula.dmi differ diff --git a/icons/inventory/suit/mob_vr_skrell.dmi b/icons/inventory/suit/mob_vr_skrell.dmi index 497728f442..02832b4f2b 100644 Binary files a/icons/inventory/suit/mob_vr_skrell.dmi and b/icons/inventory/suit/mob_vr_skrell.dmi differ diff --git a/icons/inventory/suit/mob_vr_tajaran.dmi b/icons/inventory/suit/mob_vr_tajaran.dmi index 68c8385bff..d409d0cf18 100644 Binary files a/icons/inventory/suit/mob_vr_tajaran.dmi and b/icons/inventory/suit/mob_vr_tajaran.dmi differ diff --git a/icons/inventory/suit/mob_vr_unathi.dmi b/icons/inventory/suit/mob_vr_unathi.dmi index c65a8a0fb8..a5dddccaa2 100644 Binary files a/icons/inventory/suit/mob_vr_unathi.dmi and b/icons/inventory/suit/mob_vr_unathi.dmi differ diff --git a/icons/inventory/suit/mob_vr_vulpkanin.dmi b/icons/inventory/suit/mob_vr_vulpkanin.dmi index 08428d3bf5..7d0e5376bd 100644 Binary files a/icons/inventory/suit/mob_vr_vulpkanin.dmi and b/icons/inventory/suit/mob_vr_vulpkanin.dmi differ diff --git a/icons/mob/human_races/cyberlimbs/_fluff_vr/aronai.dmi b/icons/mob/human_races/cyberlimbs/_fluff_vr/aronai.dmi index 4d533fc8d3..50fcac9a56 100644 Binary files a/icons/mob/human_races/cyberlimbs/_fluff_vr/aronai.dmi and b/icons/mob/human_races/cyberlimbs/_fluff_vr/aronai.dmi differ