Tweak various sprites 'n things

code/game/machinery/gear_dispenser.dm

@@ -565,6 +565,8 @@ var/list/dispenser_presets = list()
 	one_setting = /datum/gear_disp/voidsuit/autolok
 	special_frame = "frame_grey"
 
+<<<<<<< HEAD
+||||||| parent of f17916abb4... Merge pull request #11095 from VOREStation/Arokha/tweakkkk
 ////////////////////////////// MOEBIUS SUIT DISPENSERS ///////////////////////////
 /datum/gear_disp/voidsuit/aether
 	name = "Aether Voidsuit"
@@ -586,6 +588,28 @@ var/list/dispenser_presets = list()
 	one_setting = /datum/gear_disp/voidsuit/aether
 	special_frame = "frame_purple"
 
+=======
+////////////////////////////// MOEBIUS SUIT DISPENSERS ///////////////////////////
+/datum/gear_disp/voidsuit/aether
+	name = "Aether Voidsuit"
+	voidsuit_type = /obj/item/clothing/suit/space/void/aether
+	voidhelmet_type = /obj/item/clothing/head/helmet/space/void/aether
+
+/obj/machinery/gear_dispenser/suit/aether
+	name = "\improper Aether Voidsuit Dispenser"
+	desc = "An industrial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
+	icon_state = "suitdispenserMB"
+	dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
+	one_setting = /datum/gear_disp/voidsuit/aether
+
+/obj/machinery/gear_dispenser/suit_fancy/aether
+	name = "\improper Aether Voidsuit Dispenser"
+	desc = "A commercial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
+	dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
+	one_setting = /datum/gear_disp/voidsuit/aether
+	special_frame = "frame_purple"
+
+>>>>>>> f17916abb4... Merge pull request #11095 from VOREStation/Arokha/tweakkkk
 // Adminbuse
 /obj/machinery/gear_dispenser/vv_get_dropdown()
 	. = ..()

code/modules/clothing/spacesuits/void/event_vr.dm

@@ -73,6 +73,9 @@
 
 /obj/item/clothing/suit/space/void/refurb/mercenary/talon
 	name = "talon mercenary's voidsuit"
+<<<<<<< HEAD
+	desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer mercs swear by these old things, even if new powered hardsuits have more features and better armor. The red markings indicate this as the mercenary variant. \"ITV TALON\" has been stamped onto each pauldron and the right side of the breastplate."
+||||||| parent of f17916abb4... Merge pull request #11095 from VOREStation/Arokha/tweakkkk
 	desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer mercs swear by these old things, even if new powered hardsuits have more features and better armor. The red markings indicate this as the mercenary variant. \"ITV TALON\" has been stamped onto each pauldron and the right side of the breastplate."
 
 // HEV Suits
@@ -231,3 +234,153 @@
 	// No animal people sprites for these yet, sad times
 	species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
 	sprite_sheets = null
+=======
+	desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer mercs swear by these old things, even if new powered hardsuits have more features and better armor. The red markings indicate this as the mercenary variant. \"ITV TALON\" has been stamped onto each pauldron and the right side of the breastplate."
+
+// HEV Suits
+/obj/item/clothing/suit/space/void/hev
+	name = "hazardous environment suit"
+	desc = "Has a strange smell to it, but you feel like it might be an old friend."
+	
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+	icon_state = "hev_orange"
+	
+	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"
+	desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
+
+/obj/item/clothing/head/helmet/space/void/hev
+	name = "hazardous environment helmet"
+	desc = "Has a strange smell to it, but you feel like it might be an old friend."
+	
+	icon = 'icons/inventory/head/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "hev_orange"
+	
+	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"
+	desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
+
+// Makeshift void suit
+/obj/item/clothing/suit/space/void/makeshift
+	name = "makeshift voidsuit"
+	desc = "This is not something you should use if you have other options, but it's better than nothing!"
+	
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+	icon_state = "makeshift_void"
+	
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
+
+	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"
+	desc = "This is not something you should use if you have other options, but it's better than nothing!"
+	
+	icon = 'icons/inventory/head/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "makeshift_void"
+
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
+
+	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
+	name = "custodian suit"
+	desc = "Vacuum-capable armor for a Custodian to do their duty."
+	
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+	icon_state = "custodian"
+
+	armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
+	
+	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"
+	desc = "Vacuum-capable helmet for a Custodian to do their duty."
+	
+	icon = 'icons/inventory/head/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "custodian"
+
+	armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
+	
+	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
+	name = "\improper Aether voidsuit"
+	desc = "This suit seems rather high-end for a standard voidsuit. The air in it has a hint of 'new car smell', courtesy of Aether Atmospherics."
+	
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+	icon_state = "moebiussuit"
+
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
+
+	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"
+	desc = "Aether Atmospherics thought that giving this helmet selectable colored lighting would improve market penetration. Very comfortable, regardless."
+	
+	icon = 'icons/inventory/head/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "moebiushelm_White"
+
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
+
+	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"
+	set desc = "Change the color of [src]"
+	set category = "Object"
+
+	var/choice = tgui_input_list(usr, "Select a new color:", "[src] Color", list("White", "Blue", "Purple", "Yellow", "Red", "Green"))
+	if(!choice)
+		return
+	icon_state = "moebiushelm_[choice]"
+	update_clothing_icon()
+	to_chat(usr, "<span class='notice'>[src] color changed to: [choice]</span>")
+
+// Excelsior suit
+/obj/item/clothing/suit/space/void/excelsior
+	name = "\improper Excelsior voidsuit"
+	desc = "A space suit from a particular spaceship: Excelsior."
+	
+	icon = 'icons/inventory/suit/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+	icon_state = "excelsior"
+	
+	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"
+	desc = "A space helmet from a particular spaceship: Excelsior."
+	
+	icon = 'icons/inventory/head/item_vr.dmi'
+	default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+	icon_state = "excelsior"
+	
+	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
+	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
+>>>>>>> f17916abb4... Merge pull request #11095 from VOREStation/Arokha/tweakkkk

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