mugs are a subtype of glass, fixes icon bug on "beagle mug" [IMPORTAN…

…T] (#1073)

* fix clown title

* mugs are glasses now and have reagent filling sprites

* Revert "fix clown title", oops

* replaces paths

_maps/RandomRuins/SpaceRuins/spacehotel.dmm

@@ -967,7 +967,7 @@
 	dir = 10
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/glass/mug/tea,
 /turf/open/floor/stone,
 /area/ruin/space/has_grav/hotel/bar)
 "iI" = (
@@ -1513,7 +1513,7 @@
 /area/ruin/space/has_grav/hotel/dock)
 "mW" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/glass/mug/tea,
 /turf/open/floor/carpet/blue,
 /area/ruin/space/has_grav/hotel)
 "mX" = (
@@ -3044,7 +3044,7 @@
 	},
 /obj/structure/table/wood/fancy/orange,
 /obj/machinery/light/directional/north,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/glass/mug/tea,
 /turf/open/floor/carpet/royalblue,
 /area/ruin/space/has_grav/hotel/guestroom/room_4)
 "FB" = (
@@ -3151,7 +3151,7 @@
 /area/ruin/space/has_grav/hotel/guestroom/room_6)
 "Gz" = (
 /obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/glass/mug/tea,
 /turf/open/floor/carpet/orange,
 /area/ruin/space/has_grav/hotel/guestroom/room_6)
 "GB" = (

_maps/map_files/Theseus/Theseus.dmm

@@ -5813,9 +5813,7 @@
 /area/station/maintenance/starboard/fore)
 "bYj" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/coco{
-	pixel_x = 8
-	},
+/obj/item/reagent_containers/glass/mug/coco,
 /turf/open/floor/wood,
 /area/station/security/checkpoint/customs)
 "bYt" = (
@@ -10403,10 +10401,7 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = -6;
-	pixel_y = 8
-	},
+/obj/item/reagent_containers/glass/mug/brit,
 /turf/open/floor/iron/norn,
 /area/station/medical/break_room)
 "dLF" = (
@@ -55612,10 +55607,7 @@
 	pixel_y = -1
 	},
 /obj/item/radio/intercom/directional/north,
-/obj/item/reagent_containers/food/drinks/mug{
-	pixel_x = -4;
-	pixel_y = 4
-	},
+/obj/item/reagent_containers/glass/mug,
 /turf/open/floor/wood,
 /area/station/command/corporate_showroom)
 "uHx" = (

_maps/map_files/Theseus/medbay_holder.dmm

@@ -304,10 +304,7 @@
 	pixel_y = -1
 	},
 /obj/item/radio/intercom/directional/north,
-/obj/item/reagent_containers/food/drinks/mug{
-	pixel_x = -4;
-	pixel_y = 4
-	},
+/obj/item/reagent_containers/glass/mug,
 /turf/open/floor/wood,
 /area/station/command/corporate_showroom)
 "bh" = (

_maps/map_files/generic/CentCom.dmm

@@ -9170,7 +9170,7 @@
 /obj/item/reagent_containers/food/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/glass/mug/brit,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/centcom/tdome/observation)
@@ -10265,7 +10265,7 @@
 "Du" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/glass/mug/brit,
 /obj/structure/window/reinforced{
 	dir = 8
 	},

_maps/shuttles/emergency_cruise.dmm

@@ -412,10 +412,7 @@
 /area/shuttle/escape)
 "tJ" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = 8;
-	pixel_y = -1
-	},
+/obj/item/reagent_containers/glass/mug/brit,
 /obj/item/storage/medkit/regular{
 	pixel_x = -9;
 	pixel_y = 3

_maps/shuttles/emergency_monastery.dmm

@@ -1825,7 +1825,7 @@
 /area/shuttle/escape)
 "zP" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/glass/mug/tea,
 /turf/open/floor/iron/dark,
 /area/shuttle/escape)
 "zQ" = (

_maps/shuttles/whiteship_donut.dmm

@@ -425,7 +425,7 @@
 /area/shuttle/abandoned)
 "bn" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/glass/mug,
 /obj/effect/turf_decal/tile/blue,
 /turf/open/floor/iron/airless,
 /area/shuttle/abandoned)

code/game/objects/items/storage/uplink_kits.dm

@@ -478,7 +478,7 @@
 
 /obj/item/storage/box/syndie_kit/sleepytime/PopulateContents()
 	new /obj/item/clothing/under/syndicate/bloodred/sleepytime(src)
-	new /obj/item/reagent_containers/food/drinks/mug/coco(src)
+	new /obj/item/reagent_containers/glass/mug/coco(src)
 	new /obj/item/toy/plush/carpplushie(src)
 	new /obj/item/bedsheet/syndie(src)
 

code/modules/food_and_drinks/drinks/drinks.dm

@@ -245,36 +245,6 @@
 	desc = "Either the station's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones."
 	list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5)
 
-/obj/item/reagent_containers/food/drinks/mug // parent type is literally just so empty mug sprites are a thing
-	name = "mug"
-	desc = "A drink served in a classy mug."
-	icon_state = "tea"
-	inhand_icon_state = "coffee"
-	spillable = TRUE
-
-/obj/item/reagent_containers/food/drinks/mug/update_icon_state()
-	icon_state = reagents.total_volume ? "tea" : "tea_empty"
-	return ..()
-
-/obj/item/reagent_containers/food/drinks/mug/tea
-	name = "Duke Purple tea"
-	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
-	list_reagents = list(/datum/reagent/consumable/tea = 30)
-
-/obj/item/reagent_containers/food/drinks/mug/coco
-	name = "Dutch hot coco"
-	desc = "Made in Space South America."
-	list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
-	foodtype = SUGAR
-	resistance_flags = FREEZE_PROOF
-	custom_price = PAYCHECK_ASSISTANT * 0.9
-
-/obj/item/reagent_containers/food/drinks/mug/beagle
-	name = "beagle mug"
-	desc = "A heavy mug. A beagle mug. Careful not to break it!"
-	icon_state = "beaglemug"
-
-
 /obj/item/reagent_containers/food/drinks/dry_ramen
 	name = "cup ramen"
 	desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!"
@@ -604,13 +574,6 @@
 	icon_state = "detflask"
 	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30)
 
-/obj/item/reagent_containers/food/drinks/britcup
-	name = "cup"
-	desc = "A cup with the british flag emblazoned on it."
-	icon_state = "britcup"
-	volume = 30
-	spillable = TRUE
-
 //////////////////////////soda_cans//
 //These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm
 /// How much fizziness is added to the can of soda by throwing it, in percentage points

code/modules/reagents/reagent_containers/glass.dm

@@ -388,3 +388,39 @@
 		grinded = I
 		return
 	to_chat(user, span_warning("You can't grind this!"))
+
+//TRUE MUGS for REAL MUG FANS !!!
+/obj/item/reagent_containers/glass/mug
+	name = "mug"
+	desc = "A generic porcelain mug, ready to hold your warm beverage."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "tea_empty"
+	inhand_icon_state = "coffee"
+	fill_icon_state = "mug"
+	fill_icon_thresholds = list(0, 40, 80, 100)
+	volume = 30
+
+/obj/item/reagent_containers/glass/mug/Initialize(mapload)
+	. = ..()
+	update_appearance()
+
+/obj/item/reagent_containers/glass/mug/tea
+	name = "Duke Purple tea"
+	list_reagents = list(/datum/reagent/consumable/tea = 30)
+
+/obj/item/reagent_containers/glass/mug/coco
+	name = "Duke Purple tea"
+	list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
+
+/obj/item/reagent_containers/glass/mug/brit
+	name = "mug"
+	desc = "A mug with the british flag emblazoned on it."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "britcup"
+
+/obj/item/reagent_containers/glass/mug/beagle
+	name = "beagle mug"
+	desc = "A mug, shaped like the head of a claymation beagle. What will they think of next?"
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "beaglemug"
+	fill_icon_state = null //it's not the right perspective to see inside. Don't blame me, we stole the sprite from baystation!

code/modules/vending/boozeomat.dm

@@ -43,7 +43,7 @@
 		/obj/item/reagent_containers/food/drinks/bottle/small = 15
 	)
 	contraband = list(
-		/obj/item/reagent_containers/food/drinks/mug/tea = 12,
+		/obj/item/reagent_containers/glass/mug/tea = 12,
 		/obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
 	)
 	premium = list(

code/modules/vending/coffee.dm

@@ -7,8 +7,8 @@
 	panel_type = "panel9"
 	products = list(
 		/obj/item/reagent_containers/food/drinks/coffee = 6,
-		/obj/item/reagent_containers/food/drinks/mug/tea = 6,
-		/obj/item/reagent_containers/food/drinks/mug/coco = 3
+		/obj/item/reagent_containers/glass/mug/tea = 6,
+		/obj/item/reagent_containers/glass/mug/coco = 3
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/drinks/ice = 12

tools/UpdatePaths/mugs.txt

@@ -0,0 +1,5 @@
+/obj/item/reagent_containers/food/drinks/mug : /obj/item/reagent_containers/glass/mug
+/obj/item/reagent_containers/food/drinks/mug/tea : /obj/item/reagent_containers/glass/mug/tea
+/obj/item/reagent_containers/food/drinks/mug/coco : /obj/item/reagent_containers/glass/mug/coco
+/obj/item/reagent_containers/food/drinks/mug/beagle : /obj/item/reagent_containers/glass/mug/beagle
+/obj/item/reagent_containers/food/drinks/britcup : /obj/item/reagent_containers/glass/mug/brit