Merge pull request #2559 from CHOMPStationBot/upstream-merge-11095

[MIRROR] Tweak various sprites 'n things

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"

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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
-	sprite_sheets = null
 
 /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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-	sprite_sheets = null
 
 /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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
-	sprite_sheets = null
 
 /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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-	sprite_sheets = null
 
 // '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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
-	sprite_sheets = null
 
 /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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-	sprite_sheets = null
 
 // '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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
-	sprite_sheets = null
 
 /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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-	sprite_sheets = null
 
 /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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
-	sprite_sheets = null
 
 /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
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
-	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
-	sprite_sheets = null

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)

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.

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