Bug fixes: vampire bite hud, winding message, and drink sprites (#12107)

code/_onclick/hud/_defines.dm

@@ -61,7 +61,7 @@
 #define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12)
 
 // vampire
-#define ui_suck "EAST-4:22,SOUTH:5"
+#define ui_suck "EAST-3:24,SOUTH+1:7"
 
 #define ui_borg_pull "EAST-3:24,SOUTH+1:7"
 #define ui_borg_module "EAST-2:26,SOUTH+1:7"

code/modules/admin/admin.dm

@@ -1344,14 +1344,14 @@ proc/admin_notice(var/message, var/rights)
 	if(check_rights(R_ADMIN|R_MOD, user))
 		if (target.paralysis == 0)
 			msg = "has paralyzed [key_name_admin(target)]."
-			target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <span class='warning'>[user] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.</span>", "<span class='warning'><b>You have been winded by a member of staff! Please stand by until they contact you!</b></span>")
+			target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <span class='warning'>[target] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.</span>", "<span class='warning'><b>You have been winded by a member of staff! Please stand by until they contact you!</b></span>")
 			target.paralysis = 8000
 		else
 			if (alert(user, "The player is currently winded. Do you want to unwind him?", "Unwind player?", "Yes", "No") == "No")
 				return
 			target.paralysis = 0
 			msg = "has unparalyzed [key_name_admin(target)]."
-			target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <font color='green'>[user] has been unwinded by a member of staff!</font>", "<span class='warning'><b>You have been unwinded by a member of staff!</b></span>")
+			target.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <font color='green'>[target] has been unwinded by a member of staff!</font>", "<span class='warning'><b>You have been unwinded by a member of staff!</b></span>")
 		log_and_message_admins(msg, user)
 		feedback_add_details("admin_verb", "WIND")
 

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -4205,7 +4205,7 @@
 	nutriment_factor = 1
 	carbonated = TRUE
 
-	glass_icon_state = "khlibnyzglass"
+	glass_icon_state = "khlibnyz_glass"
 	glass_name = "glass of khlibnyz"
 	glass_desc = "A fermented beverage produced from Adhomian bread."
 
@@ -4218,7 +4218,7 @@
 	strength = 20
 	nutriment_factor = 1
 
-	glass_icon_state = "shyrrkirrtyrwineglass"
+	glass_icon_state = "shyrrkirrtyrwine_glass"
 	glass_name = "glass of shyyr kirr'tyr wine"
 	glass_desc = "Tajaran spirit infused with some eel-like Adhomian creature."
 
@@ -4230,7 +4230,7 @@
 
 	strength = 70
 
-	glass_icon_state = "nmshaanliquorglass"
+	glass_icon_state = "nmshaanliquor_glass"
 	glass_name = "glass of nm'shaan liquor"
 	glass_desc = "A strong Adhomian liquor reserved for special occasions."
 
@@ -4242,7 +4242,7 @@
 
 	strength = 75
 
-	glass_icon_state = "darmadhirbrewglass"
+	glass_icon_state = "darmadhirbrew_glass"
 	glass_name = "glass of Darmadhir Brew"
 	description = "A rare and expensive brand of nm'shaan liquor."
 
@@ -4254,7 +4254,7 @@
 
 	strength = 65
 
-	glass_icon_state = "treebarkfirewaterglass"
+	glass_icon_state = "treebarkfirewater_glass"
 	glass_name = "glass of tree-bark firewater"
 	glass_desc = "High-content alcohol distilled from Earthen-Root or Blizzard Ears."
 
@@ -4266,7 +4266,7 @@
 
 	strength = 25
 
-	glass_icon_state = "veteranschoiceglass"
+	glass_icon_state = "veteranschoice_glass"
 	glass_name = "glass of veteran's choice"
 	glass_desc = "A cocktail consisting of Messa's Mead and gunpowder."
 
@@ -4726,7 +4726,7 @@
 	color = "#95D44C"
 	taste_description = "creamy sweetness"
 
-	glass_icon_state = "midynhrwaterglass"
+	glass_icon_state = "midynhrwater_glass"
 	glass_name = "glass of midynhr water"
 	glass_desc = "A soft drink made from honey and tree syrup."
 	glass_center_of_mass = list("x"=15, "y"=9)

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -367,7 +367,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
 /obj/item/reagent_containers/food/drinks/carton
 	name = "carton"
 	desc = "An abstract way to organize bottles that are really cartons. Finally!"
-	item_state = "carton"
+	icon_state = "carton"
 	volume = 100
 	center_of_mass = list("x"=16, "y"=6)
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
@@ -430,12 +430,13 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
 
 /obj/item/reagent_containers/food/drinks/carton/mutthir
 	name = "mutthir carton"
+	icon_state = "mutthir"
 	desc = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs."
 	desc_fluff = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \
 	The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \
 	were quick to adopt the drink to their diet."
 
-	reagents_to_add = list(/decl/reagent/drink/milk/adhomai = 100)
+	reagents_to_add = list(/decl/reagent/drink/milk/adhomai/mutthir = 100)
 
 //////////////////////////drinkingglass and shaker//
 //Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink

html/changelogs/alberyk-fixes.yml

@@ -0,0 +1,8 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed admin winding displaying the wrong target message."
+  - bugfix: "Fixed the vampire bite hud icon covering the gun buttons."
+  - bugfix: "Fixed some adhomian drinks not having the correct icon."