More Ta Fixes (#17350)

* More Ta Fixes

* wing bugginess fix

* cl

* floating chat offset

code/controllers/subsystems/typing.dm

@@ -156,6 +156,9 @@ Updated 09/10/2022 to include chatbar using Spookerton's SStyping system from Po
 	if(!ismovable(master))
 		stack_trace("Typing indicator initialized with [isnull(master) ? "null" : master] as master.")
 		return INITIALIZE_HINT_QDEL
+	if(ismob(master))
+		var/mob/mob = master
+		mob.adjust_typing_indicator_offsets(src)
 
 /atom/movable/typing_indicator/Destroy()
 	if(master)

code/game/atoms_movable.dm

@@ -593,6 +593,9 @@
 /atom/movable/proc/get_floating_chat_x_offset()
 	return 0
 
+/atom/movable/proc/get_floating_chat_y_offset()
+	return 0
+
 /atom/movable/proc/can_attach_sticker(var/mob/user, var/obj/item/sticker/S)
 	return TRUE
 

code/game/objects/items/weapons/storage/backpack.dm

@@ -876,10 +876,30 @@
 	w_class = ITEMSIZE_HUGE
 	slot_flags = SLOT_BACK
 	max_storage_space = 12
-	canremove = 0
+	canremove = FALSE
 	species_restricted = list(BODYTYPE_VAURCA_BREEDER)
 	sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/back.dmi')
-	var/wings
+	var/wings_extended = FALSE
+
+/obj/item/storage/backpack/typec/verb/toggle_wings()
+	set name = "Spread Wings"
+	set desc = "Spread your wings."
+	set category = "Object"
+	set src in usr
+
+	if(use_check_and_message(usr) || !ishuman(usr))
+		return FALSE
+
+	var/mob/living/carbon/human/user = usr
+
+	wings_extended = !wings_extended
+	playsound(src.loc, 'sound/items/storage/wings.ogg', 50)
+	user.visible_message("<b>[user]</b> [wings_extended ? "extend" : "collapse"]s their wings.", SPAN_NOTICE("You [wings_extended ? "extend" : "collapse"] your wings."))
+	icon_state = "[initial(icon_state)][wings_extended ? "_open" : ""]"
+	item_state = "icon_state"
+
+	user.update_icon()
+	user.update_inv_back()
 
 /obj/item/storage/backpack/typec/klax
 	icon = 'icons/mob/species/breeder/inventory.dmi'
@@ -895,22 +915,6 @@
 	icon_state = "wings_cthur"
 	item_state = "wings_cthur"
 
-/obj/item/storage/backpack/typec/verb/toggle_wings()
-	set name = "Spread Wings"
-	set desc = "Spread your wings."
-	set category = "Object"
-	set src in usr
-	if(use_check_and_message(usr))
-		return 0
-	wings = !wings
-	playsound(src.loc, 'sound/items/storage/wings.ogg', 50)
-	to_chat(usr, "You [wings ? "extend" : "collapse"] your [src].")
-	icon_state = "[initial(icon_state)][wings ? "_open" : ""]"
-	item_state = "icon_state"
-	var/mob/living/carbon/human/H = src.loc
-	H.update_icon()
-	H.update_inv_back()
-
 
 //**Vaurca cloaks**//
 

code/modules/mob/floating_messages.dm

@@ -61,12 +61,13 @@ var/list/floating_chat_colors = list()
 	I.maptext_height = 64
 	I.plane = FLOAT_PLANE
 	I.layer = HUD_LAYER - 0.01
+	I.pixel_y = attached_holder.get_floating_chat_y_offset()
 	I.pixel_x = (-round(I.maptext_width/2) + 16) + attached_holder.get_floating_chat_x_offset()
 	I.appearance_flags = RESET_COLOR|RESET_ALPHA|RESET_TRANSFORM
 
 	style = "font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: [size]px; [style]"
 	I.maptext = "<center><span style=\"[style]\">[message]</span></center>"
-	animate(I, 1, alpha = 255, pixel_y = 23)
+	animate(I, 1, alpha = 255, pixel_y = I.pixel_y + 23)
 
 	for(var/image/old in holder.stored_chat_text)
 		animate(old, 2, pixel_y = old.pixel_y + 8)

code/modules/mob/living/carbon/human/human.dm

@@ -1477,6 +1477,8 @@
 	hydration_loss = THIRST_FACTOR * species.hydration_loss_factor
 
 	speech_bubble_type = species.possible_speech_bubble_types[1]
+	if(typing_indicator)
+		adjust_typing_indicator_offsets(typing_indicator)
 
 	fill_out_culture_data()
 

code/modules/mob/living/carbon/human/human_helpers.dm

@@ -408,6 +408,13 @@
 		return species.floating_chat_x_offset
 	return species.icon_x_offset
 
+/mob/living/carbon/human/get_floating_chat_y_offset()
+	if(!species)
+		return ..()
+	if(!isnull(species.floating_chat_y_offset))
+		return species.floating_chat_y_offset
+	return species.icon_y_offset
+
 /mob/living/carbon/human/get_stutter_verbs()
 	return species.stutter_verbs
 
@@ -428,3 +435,7 @@
 	if(length(G.tail_storage.contents))
 		return G.tail_storage.contents[1]
 	return null
+
+/mob/living/carbon/human/adjust_typing_indicator_offsets(var/atom/movable/typing_indicator/indicator)
+	indicator.pixel_x = species.typing_indicator_x_offset
+	indicator.pixel_y = species.typing_indicator_y_offset

code/modules/mob/living/carbon/human/species/species.dm

@@ -40,7 +40,10 @@
 	var/prone_icon                                       // If set, draws this from icobase when mob is prone.
 	var/icon_x_offset = 0
 	var/icon_y_offset = 0
+	var/typing_indicator_x_offset = 0
+	var/typing_indicator_y_offset = 0
 	var/floating_chat_x_offset = null
+	var/floating_chat_y_offset = null
 	var/eyes = "eyes_s"                                  // Icon for eyes.
 	var/eyes_icons = 'icons/mob/human_face/eyes.dmi'     // DMI file for eyes, mostly for none 32x32 species.
 	var/has_floating_eyes                                // Eyes will overlay over darkness (glow)

code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm

@@ -61,6 +61,10 @@
 	icobase = 'icons/mob/human_races/vaurca/r_vaurcac.dmi'
 	deform = 'icons/mob/human_races/vaurca/r_vaurcac.dmi'
 	icon_x_offset = -8
+	floating_chat_x_offset = 8
+	floating_chat_y_offset = 16
+	typing_indicator_x_offset = 16
+	typing_indicator_y_offset = 12
 	healths_x = 22
 	healths_overlay_x = 9
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick,  /datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/strong)

code/modules/mob/living/say.dm

@@ -341,6 +341,7 @@ var/list/channel_to_radio_key = new
 	var/image/speech_bubble
 	if(speech_bubble_state)
 		speech_bubble = image('icons/mob/talk.dmi', src, speech_bubble_state)
+		adjust_typing_indicator_offsets(speech_bubble)
 		speech_bubble.layer = layer
 		speech_bubble.plane = plane
 

code/modules/mob/mob_helpers.dm

@@ -1305,6 +1305,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
 /mob/proc/get_talk_bubble()
 	return 'icons/mob/talk.dmi'
 
+/mob/proc/adjust_typing_indicator_offsets(var/atom/movable/typing_indicator/indicator)
+	return
+
 /datum/proc/get_client()
 	return null
 

html/changelogs/geeves-more_ta_fixes.yml

@@ -0,0 +1,8 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed Vaurca Breeder typing indicator offsets."
+  - bugfix: "Fixed Vaurca Breeder floating chat offsets."
+  - bugfix: "Fixed Vaurca Breeder wings sometimes losing their sprites."