Lets have all the ammo and kegs together

code/modules/reagents/reagent_dispenser.dm

@@ -39,6 +39,10 @@
 	else
 		qdel(src)
 
+///////////////
+//Water Tanks//
+///////////////
+
 /obj/structure/reagent_dispensers/watertank
 	name = "water tank"
 	desc = "A water tank."
@@ -57,12 +61,52 @@
 	reagent_id = "firefighting_foam"
 	tank_volume = 500
 
+/obj/structure/reagent_dispensers/water_cooler
+	name = "liquid cooler"
+	desc = "A machine that dispenses liquid to drink."
+	icon = 'icons/obj/vending.dmi'
+	icon_state = "water_cooler"
+	anchored = TRUE
+	tank_volume = 500
+	var/paper_cups = 25 //Paper cups left from the cooler
+
+/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
+	..()
+	if (paper_cups > 1)
+		to_chat(user, "There are [paper_cups] paper cups left.")
+	else if (paper_cups == 1)
+		to_chat(user, "There is one paper cup left.")
+	else
+		to_chat(user, "There are no paper cups left.")
+
+/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/user)
+	. = ..()
+	if(.)
+		return
+	if(!paper_cups)
+		to_chat(user, "<span class='warning'>There aren't any cups left!</span>")
+		return
+	user.visible_message("<span class='notice'>[user] takes a cup from [src].</span>", "<span class='notice'>You take a paper cup from [src].</span>")
+	var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src))
+	user.put_in_hands(S)
+	paper_cups--
+
+//////////////
+//Fuel Tanks//
+//////////////
+
 /obj/structure/reagent_dispensers/fueltank
 	name = "fuel tank"
 	desc = "A tank full of industrial welding fuel. Do not consume."
 	icon_state = "fuel"
 	reagent_id = "welding_fuel"
 
+/obj/structure/reagent_dispensers/fueltank/high //Unused - Good for ghost roles
+	name = "high-capacity fuel tank"
+	desc = "A now illegal tank, full of highly pressurized industrial welding fuel. Do not consume or have a open flame close to this tank."
+	icon_state = "fuel_high"
+	tank_volume = 3000
+
 /obj/structure/reagent_dispensers/fueltank/boom()
 	explosion(get_turf(src), 0, 1, 5, flame_range = 5)
 	qdel(src)
@@ -117,6 +161,9 @@
 		return
 	return ..()
 
+///////////////////
+//Misc Dispenders//
+///////////////////
 
 /obj/structure/reagent_dispensers/peppertank
 	name = "pepper spray refiller"
@@ -131,36 +178,24 @@
 	if(prob(1))
 		desc = "IT'S PEPPER TIME, BITCH!"
 
-
-/obj/structure/reagent_dispensers/water_cooler
-	name = "liquid cooler"
-	desc = "A machine that dispenses liquid to drink."
-	icon = 'icons/obj/vending.dmi'
-	icon_state = "water_cooler"
+/obj/structure/reagent_dispensers/virusfood
+	name = "virus food dispenser"
+	desc = "A dispenser of low-potency virus mutagenic."
+	icon_state = "virus_food"
 	anchored = TRUE
-	tank_volume = 500
-	var/paper_cups = 25 //Paper cups left from the cooler
+	density = FALSE
+	reagent_id = "virusfood"
 
-/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
-	..()
-	if (paper_cups > 1)
-		to_chat(user, "There are [paper_cups] paper cups left.")
-	else if (paper_cups == 1)
-		to_chat(user, "There is one paper cup left.")
-	else
-		to_chat(user, "There are no paper cups left.")
+/obj/structure/reagent_dispensers/cooking_oil
+	name = "vat of cooking oil"
+	desc = "A huge metal vat with a tap on the front. Filled with cooking oil for use in frying food."
+	icon_state = "vat"
+	anchored = TRUE
+	reagent_id = "cooking_oil"
 
-/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/user)
-	. = ..()
-	if(.)
-		return
-	if(!paper_cups)
-		to_chat(user, "<span class='warning'>There aren't any cups left!</span>")
-		return
-	user.visible_message("<span class='notice'>[user] takes a cup from [src].</span>", "<span class='notice'>You take a paper cup from [src].</span>")
-	var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src))
-	user.put_in_hands(S)
-	paper_cups--
+////////
+//Kegs//
+////////
 
 /obj/structure/reagent_dispensers/beerkeg
 	name = "beer keg"
@@ -173,19 +208,44 @@
 	if(!QDELETED(src))
 		qdel(src)
 
+/obj/structure/reagent_dispensers/keg
+	name = "keg"
+	desc = "A keg."
+	icon = 'modular_citadel/icons/obj/objects.dmi'
+	icon_state = "keg"
+	reagent_id = "water"
 
-/obj/structure/reagent_dispensers/virusfood
-	name = "virus food dispenser"
-	desc = "A dispenser of low-potency virus mutagenic."
-	icon_state = "virus_food"
-	anchored = TRUE
-	density = FALSE
-	reagent_id = "virusfood"
+/obj/structure/reagent_dispensers/keg/mead
+	name = "keg of mead"
+	desc = "A keg of mead."
+	icon_state = "orangekeg"
+	reagent_id = "mead"
 
+/obj/structure/reagent_dispensers/keg/aphro
+	name = "keg of aphrodisiac"
+	desc = "A keg of aphrodisiac."
+	icon_state = "pinkkeg"
+	reagent_id = "aphro"
 
-/obj/structure/reagent_dispensers/cooking_oil
-	name = "vat of cooking oil"
-	desc = "A huge metal vat with a tap on the front. Filled with cooking oil for use in frying food."
-	icon_state = "vat"
-	anchored = TRUE
-	reagent_id = "cooking_oil"
+/obj/structure/reagent_dispensers/keg/aphro/strong
+	name = "keg of strong aphrodisiac"
+	desc = "A keg of strong and addictive aphrodisiac."
+	reagent_id = "aphro+"
+
+/obj/structure/reagent_dispensers/keg/milk
+	name = "keg of milk"
+	desc = "It's not quite what you were hoping for."
+	icon_state = "whitekeg"
+	reagent_id = "milk"
+
+/obj/structure/reagent_dispensers/keg/semen
+	name = "keg of semen"
+	desc = "Dear lord, where did this even come from?"
+	icon_state = "whitekeg"
+	reagent_id = "semen"
+
+/obj/structure/reagent_dispensers/keg/gargle
+	name = "keg of pan galactic gargleblaster"
+	desc = "A keg of... wow that's a long name."
+	icon_state = "bluekeg"
+	reagent_id = "gargleblaster"