From 5eeee291941dc5e1e5bf7f490a04918b7af65591 Mon Sep 17 00:00:00 2001
From: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
Date: Mon, 14 Oct 2024 19:44:17 +0100
Subject: [PATCH 01/14] Specifically defines days-before-pr-stale (#11699)

* Specifically defines days-before-pr-stale

* Update .github/workflows/stale_prs.yml

Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>

---------

Co-authored-by: Crossedfall <ping@crossedfall.io>
---
 .github/workflows/stale_prs.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale_prs.yml b/.github/workflows/stale_prs.yml
index 9dfeb7224292f..989409fcab174 100644
--- a/.github/workflows/stale_prs.yml
+++ b/.github/workflows/stale_prs.yml
@@ -14,7 +14,9 @@ jobs:
         stale-pr-message: "This PR has been marked as stale due to being in an unmergable state for 7 days. Please resolve any conflicts and add testing evidence, then contact a project maintainer to have the stale label removed."
         stale-pr-label: 'Stale'
         any-of-pr-labels: 'Needs Testing Evidence,Merge Conflict'
-        days-before-stale: 7
-        days-before-close: 5
+        days-before-stale: -1
+        days-before-close: -1
+        days-before-pr-stale: 7
+        days-before-pr-close: 5
         remove-pr-stale-when-updated: true
         labels-to-remove-when-unstale: 'Stale'

From 7b8ba46215852370d964dfdd5dea8eb8d3c1636b Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:52:45 -0500
Subject: [PATCH 02/14] Automatic changelog generation for PR #11699 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-11699.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-11699.yml

diff --git a/html/changelogs/AutoChangeLog-pr-11699.yml b/html/changelogs/AutoChangeLog-pr-11699.yml
new file mode 100644
index 0000000000000..ce24a997c3631
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11699.yml
@@ -0,0 +1,5 @@
+author: PowerfulBacon
+delete-after: true
+changes:
+  - bugfix: Github issues will correctly be marked as stale after 30 days instead
+      of 7

From 386a8816a893a3c4738e2ef05eae516263bd09cc Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Mon, 14 Oct 2024 19:03:14 +0000
Subject: [PATCH 03/14] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 6 ++++++
 html/changelogs/.all_changelog.yml         | 4 ++++
 html/changelogs/AutoChangeLog-pr-11699.yml | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11699.yml

diff --git a/html/changelog.html b/html/changelog.html
index 24fce097de092..9d3b0bce7b124 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">14 October 2024</h2>
+			<h3 class="author">PowerfulBacon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Github issues will correctly be marked as stale after 30 days instead of 7</li>
+			</ul>
+
 			<h2 class="date">13 October 2024</h2>
 			<h3 class="author">Absolucy, LT3, san7890, Melbert, Aylong updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index efdc98719eda7..bbf2e4b6435fe 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -44624,3 +44624,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - code_imp: stoplag no longer stops lag in unit tests (it can hardelete)
   - code_imp: Refactored the incapacitated proc to skip optional arguments and use
       the named arguments properly to improve readability.
+2024-10-14:
+  PowerfulBacon:
+  - bugfix: Github issues will correctly be marked as stale after 30 days instead
+      of 7
diff --git a/html/changelogs/AutoChangeLog-pr-11699.yml b/html/changelogs/AutoChangeLog-pr-11699.yml
deleted file mode 100644
index ce24a997c3631..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-11699.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: PowerfulBacon
-delete-after: true
-changes:
-  - bugfix: Github issues will correctly be marked as stale after 30 days instead
-      of 7

From e6256a9c1a239974607c0f2cf52e0f43a7fd3b29 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Wed, 16 Oct 2024 00:13:23 +0000
Subject: [PATCH 04/14] Automatic changelog compile [ci skip]

---
 html/changelog.html | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 9d3b0bce7b124..dbac2115a2481 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -992,20 +992,6 @@ <h3 class="author">rkz updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">possibly fixes stamina healing</li>
 			</ul>
-
-			<h2 class="date">14 August 2024</h2>
-			<h3 class="author">PowerfulBacon updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Billy clubs will now deal bonus to damage all structures and machines.</li>
-				<li class="balance">Billy clubs no longer conduct electricity.</li>
-				<li class="balance">Breaching rounds will now deal bonus damage all structures and machines. Increases damage against turfs.</li>
-				<li class="tweak">Added a maximum damage to prevent important structures in defense gamemodes from being killed in a single shot (Space dragons & Clock Cult).</li>
-				<li class="bugfix">Airlocks will no longer shock the target upon being broken due to an unintentional side-effect of using usr.</li>
-			</ul>
-			<h3 class="author">ro5490 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="admin">sorted out keypress log clutter</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

From d96266717ff7e56cdf5bb4d297621d8bb4799c44 Mon Sep 17 00:00:00 2001
From: BeeLover66 <78232749+BeeLover66@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:48:07 -0400
Subject: [PATCH 05/14] fixes radio channels defaulting to common (#11686)

---
 code/game/machinery/doors/brigdoors.dm         | 4 ++--
 code/game/objects/items/devices/radio/radio.dm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index a0223969a3e88..5ee9958d26fb2 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -32,6 +32,7 @@
 
 	sec_radio = new/obj/item/radio(src)
 	sec_radio.set_listening(FALSE)
+	sec_radio.set_frequency(FREQ_SECURITY)
 
 	if(id != null)
 		for(var/obj/machinery/door/window/brigdoor/M in urange(20, src))
@@ -123,8 +124,7 @@
 		return 0
 
 	if(!forced)
-		sec_radio.set_frequency(FREQ_SECURITY)
-		sec_radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_SECURITY)
+		sec_radio.talk_into(src, "Timer has expired. Releasing prisoner.")
 
 	timing = FALSE
 	activation_time = null
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 75ca46dabf00f..b2deba79e7b60 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -284,8 +284,8 @@
 
 	// From the channel, determine the frequency and get a reference to it.
 	var/freq
-	if(channel && channels && channels.len > 0)
-		if(channel == MODE_DEPARTMENT)
+	if(channel && channels)
+		if(channel == MODE_DEPARTMENT && channels.len > 0)
 			channel = channels[1]
 		freq = secure_radio_connections[channel]
 		if(istype(talking_movable, /mob) && !freq && channel != RADIO_CHANNEL_UPLINK)

From 8fbd735e70341931c5bd34fd1f29c8bb29bf1e5d Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:57:53 -0500
Subject: [PATCH 06/14] Automatic changelog generation for PR #11686 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-11686.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-11686.yml

diff --git a/html/changelogs/AutoChangeLog-pr-11686.yml b/html/changelogs/AutoChangeLog-pr-11686.yml
new file mode 100644
index 0000000000000..866d6ec8c1c22
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11686.yml
@@ -0,0 +1,5 @@
+author: BeeLover66
+delete-after: true
+changes:
+  - bugfix: Radio channels no longer always default to common when no encryption key
+      is installed

From b59c40724e6ecbe64a3450005352f2f98531e0ff Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:03:59 +0000
Subject: [PATCH 07/14] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 6 ++++++
 html/changelogs/.all_changelog.yml         | 4 ++++
 html/changelogs/AutoChangeLog-pr-11686.yml | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11686.yml

diff --git a/html/changelog.html b/html/changelog.html
index dbac2115a2481..954988f0176ab 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">16 October 2024</h2>
+			<h3 class="author">BeeLover66 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Radio channels no longer always default to common when no encryption key is installed</li>
+			</ul>
+
 			<h2 class="date">14 October 2024</h2>
 			<h3 class="author">PowerfulBacon updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index bbf2e4b6435fe..90b806a3ff51d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -44628,3 +44628,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   PowerfulBacon:
   - bugfix: Github issues will correctly be marked as stale after 30 days instead
       of 7
+2024-10-16:
+  BeeLover66:
+  - bugfix: Radio channels no longer always default to common when no encryption key
+      is installed
diff --git a/html/changelogs/AutoChangeLog-pr-11686.yml b/html/changelogs/AutoChangeLog-pr-11686.yml
deleted file mode 100644
index 866d6ec8c1c22..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-11686.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: BeeLover66
-delete-after: true
-changes:
-  - bugfix: Radio channels no longer always default to common when no encryption key
-      is installed

From acf21216109af7f1985bad340b32629fa64c7519 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Thu, 17 Oct 2024 00:13:22 +0000
Subject: [PATCH 08/14] Automatic changelog compile [ci skip]

---
 html/changelog.html | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 954988f0176ab..5a7f1494c3188 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -981,23 +981,6 @@ <h3 class="author">rkz, Kylerace, LemonInTheDark, Tastyfish, Mat05usz updated:</
 			<ul class="changes bgimages16">
 				<li class="code_imp">Adds new subsystem to optimize radio and searching areas</li>
 			</ul>
-
-			<h2 class="date">15 August 2024</h2>
-			<h3 class="author">Tsar-Salat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">you can buckle to stuff from adjacent turfs again</li>
-				<li class="bugfix">adds missing step() hook in cardboard box relaymove. Boxes (and traitor stealth implant boxes) will now move when the player moves.</li>
-			</ul>
-			<h3 class="author">XeonMations updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Examining a syndicate bomb now shows a balloon popup with the time remaining</li>
-				<li class="rscadd">Gave fire alarms a toggleable lock. (Requires atmospherics access)</li>
-				<li class="balance">Fire alarms now lock themselves when they detect a fire.</li>
-			</ul>
-			<h3 class="author">rkz updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">possibly fixes stamina healing</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

From 11fcb63d7ac40eacf0d0adb19c9b84255c09cbdc Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Fri, 18 Oct 2024 00:13:18 +0000
Subject: [PATCH 09/14] Automatic changelog compile [ci skip]

---
 html/changelog.html | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 5a7f1494c3188..a0b2af2cea53e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -956,31 +956,6 @@ <h3 class="author">ro5490 updated:</h3>
 				<li class="rscadd">Added a new Floor Cluwne Smite, and interaction</li>
 				<li class="bugfix">fixed the stalker smite from killing people</li>
 			</ul>
-
-			<h2 class="date">16 August 2024</h2>
-			<h3 class="author">Dejaku51 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">BSA now has a windup with sparks on target location</li>
-				<li class="rscadd">BSA now has integrated battery and is powered with a cable attached to the end of BSA</li>
-				<li class="rscadd">BSA shows amount of charge in quarters on the capacitor part of the BSA</li>
-				<li class="balance">BSA requires 5MW to shoot</li>
-				<li class="soundadd">BSA now makes a sound when winding up and shooting</li>
-				<li class="soundadd">BSA makes a sound on quarters charged with unique one on full charge</li>
-			</ul>
-			<h3 class="author">Sarchutar updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">ability to close morgues when adjacent without having to click on the tray</li>
-				<li class="bugfix">cyborgs can now close morgues by clicking on the tray</li>
-			</ul>
-			<h3 class="author">Spockye updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Remakes the escape pod shuttle</li>
-				<li class="rscadd">Ports Capybaras from Shiptest</li>
-			</ul>
-			<h3 class="author">rkz, Kylerace, LemonInTheDark, Tastyfish, Mat05usz updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">Adds new subsystem to optimize radio and searching areas</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

From 6cd8a5cc60b06f544b78e3b370df7a4d3c4cea65 Mon Sep 17 00:00:00 2001
From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Date: Fri, 18 Oct 2024 15:43:09 -0400
Subject: [PATCH 10/14] Newfood: Drink Refactor (#11701)

* initial

* file reorg

* updatepaths

* fix code

* cocoa fix

* lints

* missing sprite

* mapfixes

* missed somethin
---
 _maps/Prefab/Departments.dmm                  |   2 +-
 _maps/RandomRooms/10x10/rdm_dorms.dmm         |   2 +-
 .../10x10/rdm_organ_harvesting.dmm            |  22 +-
 .../10x10/sk_rdm060_snakefighter.dmm          |   2 +-
 .../RandomRooms/10x10/sk_rdm070_pubbybar.dmm  |  14 +-
 .../10x10/sk_rdm083_bigtheatre.dmm            |   8 +-
 .../10x10/sk_rdm098_graffitiroom.dmm          |   2 +-
 .../10x10/sk_rdm106_sanitarium.dmm            |  14 +-
 _maps/RandomRooms/10x10/sk_rdm129_beach.dmm   |  20 +-
 .../10x10/sk_rdm141_6sectorsdown.dmm          |   6 +-
 .../RandomRooms/10x10/sk_rdm142_olddiner.dmm  |   2 +-
 .../RandomRooms/10x10/sk_rdm143_gamercave.dmm |  16 +-
 .../10x10/sk_rdm144_smallmagician.dmm         |   6 +-
 .../RandomRooms/10x10/sk_rdm147_advbotany.dmm |   4 +-
 .../10x10/sk_rdm148_botany_apiary.dmm         |   4 +-
 _maps/RandomRooms/10x10/sk_rdm157_chess.dmm   |   6 +-
 .../10x10/sk_rdm167_library_ritual.dmm        |   2 +-
 .../RandomRooms/10x5/rdm_pirate_derelict.dmm  |   4 +-
 .../RandomRooms/10x5/sk_rdm011_barbershop.dmm |  36 +-
 .../10x5/sk_rdm031_deltarobotics.dmm          |   2 +-
 .../10x5/sk_rdm040_deltabotnis.dmm            |   8 +-
 .../10x5/sk_rdm045_deltacafeteria.dmm         |   4 +-
 .../10x5/sk_rdm082_maintmedical.dmm           |  52 +-
 _maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm  |   4 +-
 .../10x5/sk_rdm100_meetingroom.dmm            |   2 +-
 .../RandomRooms/10x5/sk_rdm151_ratburger.dmm  |   8 +-
 .../10x5/sk_rdm153_hobowithpeter.dmm          |   4 +-
 _maps/RandomRooms/3x3/rdm_workout.dmm         |   2 +-
 .../RandomRooms/3x3/sk_rdm020_boxclutter6.dmm |   2 +-
 .../3x3/sk_rdm037_deltajanniecloset.dmm       |   2 +-
 .../RandomRooms/3x3/sk_rdm050_medicloset.dmm  |   4 +-
 .../3x3/sk_rdm077_kilolustymaid.dmm           |   4 +-
 _maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm |  14 +-
 _maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm   |   2 +-
 .../RandomRooms/3x5/sk_rdm013_boxkitchen.dmm  |   8 +-
 .../RandomRooms/3x5/sk_rdm137_tinyshrink.dmm  |   4 +-
 .../3x5/sk_rdm160_kilomaintbar.dmm            |   4 +-
 .../5x3/sk_rdm054_metaclutter3.dmm            |   2 +-
 .../5x3/sk_rdm066_pubbybedroom.dmm            |   2 +-
 .../5x3/sk_rdm071_pubbykitchen.dmm            |   8 +-
 _maps/RandomRooms/5x3/sk_rdm080_cloner.dmm    |   4 +-
 .../5x3/sk_rdm101_minibreakroom.dmm           |   2 +-
 .../RandomRooms/5x4/sk_rdm026_boxsurgery.dmm  |   2 +-
 _maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm  |   8 +-
 .../RandomRooms/5x4/sk_rdm049_metakitchen.dmm |  10 +-
 .../RandomRooms/5x4/sk_rdm055_metamedical.dmm |  10 +-
 .../5x4/sk_rdm067_pubbysurgery.dmm            |   2 +-
 .../5x4/sk_rdm090_tinybarbershop.dmm          |   4 +-
 .../RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm |   2 +-
 .../fland/sk_rdm_fln_05_apiary.dmm            |   2 +-
 .../fland/sk_rdm_fln_06_publicgarden.dmm      |  10 +-
 .../fland/sk_rdm_fln_08_zenroom.dmm           |   8 +-
 .../fland/sk_rdm_fln_09_barbershop.dmm        |   4 +-
 .../fland/sk_rdm_fln_11_hobobox.dmm           |   2 +-
 .../LavaRuins/lavaland_biodome_beach.dmm      |  10 +-
 .../lavaland_biodome_clown_planet.dmm         |   2 +-
 .../lavaland_surface_animal_hospital.dmm      |   4 +-
 .../lavaland_surface_ash_walker1.dmm          |   4 +-
 .../lavaland_surface_biodome_winter.dmm       |   4 +-
 .../LavaRuins/lavaland_surface_hermit.dmm     |   2 +-
 .../LavaRuins/lavaland_surface_seed_vault.dmm |  18 +-
 .../lavaland_surface_syndicate_base1.dmm      |  54 +-
 _maps/RandomRuins/SpaceRuins/TheDerelict.dmm  |  12 +-
 _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm |   4 +-
 _maps/RandomRuins/SpaceRuins/bigderelict1.dmm |   2 +-
 _maps/RandomRuins/SpaceRuins/bus.dmm          |   8 +-
 _maps/RandomRuins/SpaceRuins/crashedship.dmm  |  24 +-
 _maps/RandomRuins/SpaceRuins/deepstorage.dmm  |  28 +-
 .../RandomRuins/SpaceRuins/gasthelizards.dmm  |  14 +-
 .../SpaceRuins/hilbertshoteltestingsite.dmm   |   2 +-
 .../SpaceRuins/listeningstation.dmm           |   4 +-
 .../SpaceRuins/mrow_thats_right.dmm           |   8 +-
 _maps/RandomRuins/SpaceRuins/oldstation.dmm   |  66 +-
 _maps/RandomRuins/SpaceRuins/onehalf.dmm      |   4 +-
 _maps/RandomRuins/SpaceRuins/refference.dmm   |   2 +-
 _maps/RandomRuins/SpaceRuins/sos6.dmm         |   2 +-
 _maps/RandomRuins/SpaceRuins/spacearcade.dmm  |  32 +-
 _maps/RandomRuins/SpaceRuins/spacehotel.dmm   |  54 +-
 .../SpaceRuins/turretedoutpost.dmm            |   4 +-
 _maps/RandomZLevels/SnowCabin.dmm             |  50 +-
 _maps/RandomZLevels/TheBeach.dmm              |  88 +--
 _maps/RandomZLevels/caves.dmm                 |   4 +-
 _maps/RandomZLevels/moonoutpost19.dmm         |  28 +-
 _maps/RandomZLevels/research.dmm              |   8 +-
 _maps/RandomZLevels/snowdin.dmm               |  30 +-
 _maps/RandomZLevels/spacebattle.dmm           |   6 +-
 _maps/RandomZLevels/undergroundoutpost45.dmm  |  44 +-
 _maps/RuinGeneration/13x13_cafe.dmm           |   4 +-
 _maps/RuinGeneration/13x13_corgrobotics.dmm   |   4 +-
 _maps/RuinGeneration/13x13_hilberttest.dmm    |   2 +-
 _maps/RuinGeneration/13x13_listening_base.dmm |   4 +-
 _maps/RuinGeneration/13x13_shotelroom.dmm     |   8 +-
 _maps/RuinGeneration/13x17_permabrig.dmm      |   2 +-
 _maps/RuinGeneration/13x9_medical.dmm         |   6 +-
 _maps/RuinGeneration/17x17_charliecrew.dmm    |   4 +-
 .../5x5_4_room-janitor_closet.dmm             |   2 +-
 _maps/RuinGeneration/9x13_kitchen.dmm         |   8 +-
 _maps/RuinGeneration/9x13_vault.dmm           |   2 +-
 _maps/RuinGeneration/9x9_chemlab.dmm          |   8 +-
 _maps/arenas/bar.dmm                          |   8 +-
 _maps/arenas/beach.dmm                        |  10 +-
 _maps/arenas/survival pod.dmm                 |   6 +-
 _maps/holodeck/beach.dmm                      |   2 +-
 _maps/holodeck/lounge.dmm                     |   4 +-
 _maps/holodeck/medicalsim.dmm                 |   8 +-
 _maps/holodeck/petpark.dmm                    |   2 +-
 _maps/holodeck/small/beach.dmm                |   2 +-
 _maps/holodeck/small/kitchen.dmm              |   6 +-
 _maps/holodeck/small/lounge.dmm               |   4 +-
 _maps/holodeck/small/medicalsim.dmm           |   8 +-
 _maps/holodeck/small/petpark.dmm              |   2 +-
 _maps/holodeck/small/teahouse.dmm             |  10 +-
 _maps/holodeck/workshop/donut.dmm             |  42 +-
 _maps/holodeck/workshop/plush.dmm             |   8 +-
 _maps/map_files/BoxStation/BoxStation.dmm     | 186 +++---
 _maps/map_files/CorgStation/CorgStation.dmm   | 258 +++----
 .../map_files/Deltastation/DeltaStation2.dmm  | 220 +++---
 _maps/map_files/EchoStation/EchoStation.dmm   | 110 +--
 _maps/map_files/FlandStation/FlandStation.dmm | 272 ++++----
 _maps/map_files/KiloStation/KiloStation.dmm   | 226 +++----
 _maps/map_files/MetaStation/MetaStation.dmm   | 194 +++---
 _maps/map_files/Mining/Lavaland.dmm           |  42 +-
 _maps/map_files/RadStation/RadStation.dmm     | 222 +++----
 _maps/map_files/generic/CentCom.dmm           |  92 +--
 _maps/shuttles/emergency/emergency_bar.dmm    |   6 +-
 _maps/shuttles/emergency/emergency_cere.dmm   |   2 +-
 _maps/shuttles/emergency/emergency_corg.dmm   |  12 +-
 _maps/shuttles/emergency/emergency_delta.dmm  |   8 +-
 .../emergency/emergency_discoinferno.dmm      |  16 +-
 _maps/shuttles/emergency/emergency_donut.dmm  |   8 +-
 _maps/shuttles/emergency/emergency_fland.dmm  |  18 +-
 .../emergency_imfedupwiththisworld.dmm        |  10 +-
 _maps/shuttles/emergency/emergency_kilo.dmm   |   2 +-
 _maps/shuttles/emergency/emergency_meta.dmm   |   8 +-
 _maps/shuttles/emergency/emergency_pubby.dmm  |   2 +-
 _maps/shuttles/emergency/emergency_raven.dmm  |   8 +-
 .../emergency/emergency_russiafightpit.dmm    |  18 +-
 .../shuttles/emergency/emergency_theatre.dmm  |  18 +-
 _maps/shuttles/emergency/emergency_tiny.dmm   |   2 +-
 .../emergency/emergency_wabbajack.dmm         |   4 +-
 .../exploration/exploration_fland.dmm         |  14 +-
 _maps/shuttles/hunter/hunter_bounty.dmm       |   2 +-
 _maps/shuttles/hunter/hunter_russian.dmm      |  14 +-
 _maps/shuttles/hunter/hunter_space_cop.dmm    |   6 +-
 .../infiltrator/infiltrator_advanced.dmm      |   8 +-
 .../infiltrator/infiltrator_basic.dmm         |  12 +-
 _maps/shuttles/pirate/pirate_default.dmm      |  30 +-
 _maps/shuttles/ruin/ruin_caravan_victim.dmm   |  12 +-
 _maps/shuttles/ruin/ruin_pirate_cutter.dmm    |   8 +-
 _maps/shuttles/whiteship/whiteship_box.dmm    |  34 +-
 _maps/shuttles/whiteship/whiteship_delta.dmm  |  24 +-
 _maps/shuttles/whiteship/whiteship_fland.dmm  |  16 +-
 _maps/shuttles/whiteship/whiteship_meta.dmm   |  54 +-
 _maps/templates/hilbertshotel.dmm             |   4 +-
 _maps/templates/holodeck_asylum.dmm           |   2 +-
 _maps/templates/holodeck_kitchen.dmm          |   2 +-
 _maps/templates/holodeck_teahouse.dmm         |  10 +-
 _maps/templates/shelter_2.dmm                 |   6 +-
 _maps/templates/shelter_3.dmm                 |   8 +-
 _maps/templates/shelter_4.dmm                 |   6 +-
 _maps/templates/warped_room.dmm               |   4 +-
 beestation.dme                                |  14 +-
 .../dcs/signals/signals_atom/signals_atom.dm  |   2 +
 .../signals_obj/signals_item/signals_food.dm  |   5 +
 code/__DEFINES/economy.dm                     |   8 +-
 code/__DEFINES/is_helpers.dm                  |   2 +
 code/__HELPERS/randoms.dm                     |   7 +-
 code/__HELPERS/type_processing.dm             |   2 +-
 code/_globalvars/lists/flavor_misc.dm         |  14 +-
 code/_globalvars/lists/maintenance_loot.dm    |   6 +-
 code/_onclick/item_attack.dm                  |  24 +-
 code/controllers/subsystem/traumas.dm         |   4 +-
 code/datums/ai/monkey/monkey_controller.dm    |   6 +-
 .../crafting/crafting_lists/drinks.dm         |  46 +-
 .../crafting_lists/foodstuffs/recipes_egg.dm  |   2 +-
 .../foodstuffs/recipes_frozen.dm              |  36 +-
 .../crafting_lists/foodstuffs/recipes_meat.dm |   2 +-
 .../crafting_lists/foodstuffs/recipes_misc.dm |   6 +-
 .../foodstuffs/recipes_salad.dm               |  14 +-
 .../crafting_lists/foodstuffs/recipes_soup.dm |  52 +-
 .../foodstuffs/recipes_spaghetti.dm           |   2 +-
 .../crafting/crafting_lists/misc.dm           |   2 +-
 .../crafting/crafting_lists/primal.dm         |   2 +-
 .../crafting/crafting_lists/robots.dm         |   2 +-
 .../crafting_lists/weaponry/weapons.dm        |  12 +-
 code/datums/components/food/edible.dm         |   6 +-
 code/datums/components/infective.dm           |  13 +
 .../components/storage/concrete/pockets.dm    |   6 +-
 code/datums/components/udder.dm               |   6 +-
 code/datums/diseases/transformation.dm        |   2 +-
 .../mood_events/generic_negative_events.dm    |  17 +
 code/datums/station_traits/positive_traits.dm |   2 +-
 code/datums/traits/negative_quirk.dm          |  36 +-
 code/game/atoms.dm                            |  15 +
 code/game/machinery/cloning.dm                |   4 +-
 code/game/machinery/computer/arena.dm         |   2 +-
 code/game/machinery/dish_drive.dm             |   4 +-
 code/game/machinery/iv_drip.dm                |   6 +-
 code/game/machinery/limbgrower.dm             |  10 +-
 code/game/machinery/newscaster/newspaper.dm   |   2 +-
 code/game/machinery/sleeper.dm                |   2 +-
 code/game/machinery/syndicatebomb.dm          |   8 +-
 code/game/machinery/washing_machine.dm        |   2 +-
 code/game/objects/effects/decals/cleanable.dm |   2 +-
 code/game/objects/effects/landmarks.dm        |   2 +-
 code/game/objects/items/RSF.dm                |   2 +-
 code/game/objects/items/cigs_lighters.dm      |   2 +-
 .../circuitboards/machine_circuitboards.dm    |  14 +-
 code/game/objects/items/clown_items.dm        |   2 +-
 code/game/objects/items/devices/scanners.dm   |   2 +-
 code/game/objects/items/food/donuts.dm        |   6 +-
 code/game/objects/items/food/frozen.dm        |   2 +-
 code/game/objects/items/food/salad.dm         |   6 +-
 code/game/objects/items/food/soup.dm          |   4 +-
 code/game/objects/items/food/spaghetti.dm     |   2 +-
 .../objects/items/grenades/chem_grenade.dm    | 152 +++--
 .../game/objects/items/grenades/ghettobomb.dm |   2 +-
 code/game/objects/items/holy_weapons.dm       |   2 +-
 code/game/objects/items/mail.dm               |   8 +-
 code/game/objects/items/mop.dm                |   2 +-
 code/game/objects/items/robot/robot_items.dm  |  24 +-
 .../miscellaneous_mats_recipes.dm             |   4 +-
 .../stacks/sheets/organic/cloths_recipes.dm   |   2 +-
 .../stacks/sheets/organic/wood_recipes.dm     |   2 +-
 code/game/objects/items/storage/backpack.dm   |   4 +-
 code/game/objects/items/storage/bags.dm       |   8 +-
 code/game/objects/items/storage/belt.dm       |  43 +-
 code/game/objects/items/storage/book.dm       |   2 +-
 code/game/objects/items/storage/boxes.dm      |  26 +-
 code/game/objects/items/storage/firstaid.dm   |   8 +-
 .../game/objects/items/storage/uplink_kits.dm |  34 +-
 code/game/objects/items/toys.dm               |   2 +-
 code/game/objects/structures/artstuff.dm      |   2 +-
 .../crates_lockers/closets/job_closets.dm     |   4 +-
 .../crates_lockers/closets/l3closet.dm        |   4 +-
 .../crates_lockers/closets/secure/bar.dm      |   2 +-
 .../crates_lockers/closets/secure/freezer.dm  |  14 +-
 .../crates_lockers/closets/secure/medical.dm  |  24 +-
 .../crates_lockers/crates/wooden.dm           |   2 +-
 code/game/objects/structures/watercloset.dm   |   2 +-
 .../antagonists/cult/cult_structures.dm       |   2 +-
 .../heretic/items/eldritch_flask.dm           |   2 +-
 .../heretic/knowledge/side_rust_ash.dm        |   2 +-
 code/modules/asset_cache/asset_list_items.dm  |   2 +-
 .../components/unary_devices/cryo.dm          |   4 +-
 .../awaymissions/mission_code/snowdin.dm      |   2 +-
 .../modules/awaymissions/super_secret_room.dm |   4 +-
 code/modules/cargo/bounties/mining.dm         |   2 +-
 code/modules/cargo/bounties/science.dm        |   2 +-
 code/modules/cargo/exports/lavaland.dm        |   2 +-
 code/modules/cargo/packs.dm                   | 140 ++--
 .../entries/character/quirks/alcoholic.dm     |   2 +-
 code/modules/clothing/head/jobs.dm            |   2 +-
 code/modules/clothing/outfits/ert.dm          |   2 +-
 code/modules/clothing/outfits/standard.dm     |   4 +-
 .../clothing/spacesuits/miscellaneous.dm      |   4 +-
 code/modules/clothing/suits/chaplainsuits.dm  |  10 +-
 code/modules/clothing/suits/costume.dm        |   4 +-
 code/modules/clothing/suits/jobs.dm           |   8 +-
 code/modules/clothing/suits/labcoat.dm        |   4 +-
 code/modules/clothing/suits/wintercoats.dm    |  28 +-
 .../crew_objectives/civilian_objectives.dm    |   2 +-
 .../detectivework/footprints_and_rag.dm       |   6 +-
 code/modules/events/shuttle_loan.dm           |   6 +-
 .../exploration_crew/exploration_vendor.dm    |   4 +-
 code/modules/food_and_drinks/drinks/drinks.dm | 629 ------------------
 code/modules/food_and_drinks/food.dm          |  53 --
 .../kitchen_machinery/deep_fryer.dm           |   4 +-
 .../kitchen_machinery/food_cart.dm            |   6 +-
 .../kitchen_machinery/grill.dm                |   2 +-
 .../kitchen_machinery/microwave.dm            |   4 +-
 .../kitchen_machinery/smartfridge.dm          |  28 +-
 code/modules/food_and_drinks/pizzabox.dm      |   2 +-
 code/modules/food_and_drinks/plate.dm         |   2 +-
 .../food_and_drinks/recipes/drinks_recipes.dm |  18 +-
 .../food_and_drinks/recipes/food_mixtures.dm  |  18 -
 code/modules/hydroponics/beekeeping/beebox.dm |   4 +-
 .../hydroponics/beekeeping/beekeeper_suit.dm  |   2 +-
 .../hydroponics/beekeeping/honeycomb.dm       |   8 +-
 code/modules/hydroponics/biogenerator.dm      |   6 +-
 code/modules/hydroponics/hydroitemdefines.dm  |  18 +-
 code/modules/jobs/job_mail.dm                 |  56 +-
 code/modules/jobs/job_types/mime.dm           |   2 +-
 code/modules/mining/abandoned_crates.dm       |  10 +-
 code/modules/mining/lavaland/ash_flora.dm     |   4 +-
 .../mining/lavaland/necropolis_chests.dm      |  14 +-
 code/modules/mining/machine_vending.dm        |   4 +-
 .../mob/living/silicon/robot/robot_modules.dm |   4 +-
 .../mob/living/simple_animal/bot/cleanbot.dm  |   2 +-
 .../mob/living/simple_animal/bot/medbot.dm    |   2 +-
 .../mob/living/simple_animal/bot/secbot.dm    |   2 +-
 .../mob/living/simple_animal/hostile/goose.dm |   6 +-
 .../hostile/mining_mobs/hivelord.dm           |   4 +-
 .../file_system/programs/phys_scanner.dm      |   2 +-
 code/modules/ninja/suit/suit_attackby.dm      |   2 +-
 code/modules/paperwork/fax.dm                 |   4 +-
 .../chemistry/machinery/chem_master.dm        |  22 +-
 .../chemistry/machinery/chem_synthesizer.dm   |   2 +-
 .../reagents/chemistry/machinery/pandemic.dm  |   4 +-
 .../chemistry/machinery/reagentgrinder.dm     |   2 +-
 .../chemistry/reagents/drink_reagents.dm      |  35 +
 .../chemistry/reagents/food_reagents.dm       |  18 -
 .../chemistry/recipes/slime_extracts.dm       |   2 +-
 code/modules/reagents/reagent_containers.dm   |  45 +-
 .../reagent_containers/chem_heirloom.dm       |  14 +-
 .../reagent_containers}/condiment.dm          |  80 +--
 .../{glass.dm => cups/_cup.dm}                | 262 +++++---
 .../reagent_containers/{ => cups}/bottle.dm   | 216 +++---
 .../reagent_containers/cups}/drinkingglass.dm |  54 +-
 .../reagent_containers/cups/drinks.dm         | 501 ++++++++++++++
 .../reagent_containers/cups/glassbottle.dm}   | 491 +++++++-------
 .../reagents/reagent_containers/cups/soda.dm  | 248 +++++++
 code/modules/reagents/reagent_dispenser.dm    |   2 +-
 .../research/designs/autolathe_designs.dm     |  14 +-
 .../research/designs/biogenerator_designs.dm  |  24 +-
 .../research/designs/medical_designs.dm       |   8 +-
 .../modules/research/machinery/_production.dm |   4 +-
 .../xenobiology/crossbreeding/_structures.dm  |   4 +-
 .../ruins/lavalandruin_code/syndicate_base.dm |   2 +-
 .../ruin_generator/mapping.dm                 |  10 +-
 code/modules/uplink/uplink_items.dm           |   8 +-
 code/modules/vending/boozeomat.dm             | 102 +--
 code/modules/vending/coffee.dm                |  10 +-
 code/modules/vending/cola.dm                  |  44 +-
 code/modules/vending/drinnerware.dm           |  14 +-
 code/modules/vending/liberation.dm            |   2 +-
 code/modules/vending/magivend.dm              |   2 +-
 code/modules/vending/medical.dm               |  20 +-
 code/modules/vending/medical_wall.dm          |   8 +-
 code/modules/vending/mining.dm                |   4 +-
 code/modules/vending/nutrimax.dm              |  10 +-
 code/modules/vending/snack.dm                 |   2 +-
 code/modules/vending/sovietsoda.dm            |   4 +-
 code/modules/vending/sustenance.dm            |   4 +-
 code/modules/vending/wardrobes.dm             |  40 +-
 .../modules/wiremod/core/component_printer.dm |   4 +-
 icons/mob/inhands/misc/drinks_lefthand.dmi    | Bin 0 -> 1875 bytes
 icons/mob/inhands/misc/drinks_righthand.dmi   | Bin 0 -> 1253 bytes
 icons/obj/drinks.dmi                          | Bin 93529 -> 92987 bytes
 sound/effects/can_pop.ogg                     | Bin 0 -> 20919 bytes
 sound/effects/can_shake.ogg                   | Bin 0 -> 18518 bytes
 .../Scripts/11701_drinks_refactor.txt         |  25 +
 342 files changed, 4038 insertions(+), 3767 deletions(-)
 delete mode 100644 code/modules/food_and_drinks/drinks/drinks.dm
 delete mode 100644 code/modules/food_and_drinks/food.dm
 rename code/modules/{food_and_drinks/food => reagents/reagent_containers}/condiment.dm (86%)
 rename code/modules/reagents/reagent_containers/{glass.dm => cups/_cup.dm} (64%)
 mode change 100755 => 100644
 rename code/modules/reagents/reagent_containers/{ => cups}/bottle.dm (76%)
 rename code/modules/{food_and_drinks/drinks/drinks => reagents/reagent_containers/cups}/drinkingglass.dm (58%)
 create mode 100644 code/modules/reagents/reagent_containers/cups/drinks.dm
 rename code/modules/{food_and_drinks/drinks/drinks/bottle.dm => reagents/reagent_containers/cups/glassbottle.dm} (60%)
 create mode 100644 code/modules/reagents/reagent_containers/cups/soda.dm
 create mode 100644 icons/mob/inhands/misc/drinks_lefthand.dmi
 create mode 100644 icons/mob/inhands/misc/drinks_righthand.dmi
 create mode 100644 sound/effects/can_pop.ogg
 create mode 100644 sound/effects/can_shake.ogg
 create mode 100644 tools/UpdatePaths/Scripts/11701_drinks_refactor.txt

diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm
index ea0449e2d9a27..bf4f39c690325 100644
--- a/_maps/Prefab/Departments.dmm
+++ b/_maps/Prefab/Departments.dmm
@@ -362,7 +362,7 @@
 /area/security/detectives_office)
 "ir" = (
 /obj/effect/turf_decal/tile/purple/fourcorners/contrasted,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 11;
 	pixel_y = -5
 	},
diff --git a/_maps/RandomRooms/10x10/rdm_dorms.dmm b/_maps/RandomRooms/10x10/rdm_dorms.dmm
index 91df1aebb4e33..a6ad57c148469 100644
--- a/_maps/RandomRooms/10x10/rdm_dorms.dmm
+++ b/_maps/RandomRooms/10x10/rdm_dorms.dmm
@@ -312,7 +312,7 @@
 /area/template_noop)
 "Vu" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/glass/waterbottle/empty{
+/obj/item/reagent_containers/cup/waterbottle/empty{
 	pixel_x = -6;
 	pixel_y = 7
 	},
diff --git a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm
index 732ec6abcaf21..4bcb264df0c5b 100644
--- a/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm
+++ b/_maps/RandomRooms/10x10/rdm_organ_harvesting.dmm
@@ -19,13 +19,13 @@
 /turf/open/floor/carpet/royalblack,
 /area/template_noop)
 "bq" = (
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_x = 5
 	},
 /turf/open/floor/eighties,
 /area/template_noop)
 "dZ" = (
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	list_reagents = list(/datum/reagent/medicine/morphine = 5);
 	pixel_x = 4
 	},
@@ -196,7 +196,7 @@
 /area/template_noop)
 "Aa" = (
 /obj/structure/bed/maint,
-/obj/item/reagent_containers/food/drinks/bottle/hcider{
+/obj/item/reagent_containers/cup/glass/bottle/hcider{
 	pixel_x = 12;
 	pixel_y = -5
 	},
@@ -243,11 +243,11 @@
 /turf/open/floor/iron,
 /area/template_noop)
 "Ik" = (
-/obj/item/reagent_containers/food/drinks/bottle/molotov{
+/obj/item/reagent_containers/cup/glass/bottle/molotov{
 	pixel_x = 10;
 	pixel_y = -6
 	},
-/obj/item/reagent_containers/food/drinks/bottle/trappist{
+/obj/item/reagent_containers/cup/glass/bottle/trappist{
 	pixel_y = 2
 	},
 /turf/open/floor/eighties,
@@ -261,9 +261,9 @@
 /area/template_noop)
 "Mx" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/item/reagent_containers/food/drinks/bottle/moonshine,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
-/obj/item/reagent_containers/food/drinks/bottle/ale,
+/obj/item/reagent_containers/cup/glass/bottle/moonshine,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/ale,
 /obj/item/paper/monitorkey,
 /turf/open/floor/eighties,
 /area/template_noop)
@@ -288,12 +288,12 @@
 /obj/item/gun/syringe{
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_x = -7;
 	pixel_y = 13
 	},
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine{
 	list_reagents = list(/datum/reagent/medicine/morphine = 20);
 	pixel_x = 7;
 	pixel_y = 2
diff --git a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
index 6a5bfa67322de..7af9523a269de 100644
--- a/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
@@ -116,7 +116,7 @@
 /turf/open/floor/wood,
 /area/template_noop)
 "x" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
diff --git a/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm b/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
index 801eb76b8cb96..2c2f58e3e131f 100644
--- a/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
@@ -56,15 +56,15 @@
 /area/template_noop)
 "m" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
 	pixel_x = 6;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
 	pixel_x = -6;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/plating,
 /area/template_noop)
 "n" = (
@@ -133,11 +133,11 @@
 /area/template_noop)
 "y" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 4;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
 /turf/open/floor/plating,
 /area/template_noop)
 "z" = (
@@ -148,7 +148,7 @@
 /area/template_noop)
 "A" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
 	pixel_y = 8
 	},
 /obj/machinery/light/small{
@@ -277,7 +277,7 @@
 /turf/open/floor/plating,
 /area/template_noop)
 "V" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/structure/sink{
 	dir = 4;
diff --git a/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm b/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm
index 2060e30f0642b..55db5b2d1ef9d 100644
--- a/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm083_bigtheatre.dmm
@@ -44,7 +44,7 @@
 /turf/open/floor/wood,
 /area/template_noop)
 "l" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /turf/open/floor/carpet/red,
 /area/template_noop)
 "m" = (
@@ -59,7 +59,7 @@
 "o" = (
 /obj/structure/chair/fancy/comfy,
 /obj/item/food/popcorn,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
 /turf/open/floor/wood,
 /area/template_noop)
 "p" = (
@@ -67,7 +67,7 @@
 /turf/open/floor/carpet/red,
 /area/template_noop)
 "q" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
 /turf/open/floor/carpet/red,
 /area/template_noop)
 "r" = (
@@ -81,7 +81,7 @@
 /area/template_noop)
 "t" = (
 /obj/structure/chair/fancy/comfy,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
 /turf/open/floor/wood,
 /area/template_noop)
 "u" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm b/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm
index a07548908a39a..d31a0a10debfb 100644
--- a/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm098_graffitiroom.dmm
@@ -39,7 +39,7 @@
 /area/template_noop)
 "g" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron/dark,
 /area/template_noop)
 "l" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
index 821b36e7b9186..b3c4d4672b548 100644
--- a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
@@ -246,8 +246,8 @@
 	},
 /obj/structure/closet,
 /obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/item/gun/syringe,
 /obj/item/storage/box/syringes,
 /obj/item/restraints/handcuffs,
@@ -368,17 +368,17 @@
 /area/template_noop)
 "KV" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = 9;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup,
 /turf/open/floor/iron/white,
 /area/template_noop)
 "Ls" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm b/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm
index 14a137e58b4c5..a2de7497ebca4 100644
--- a/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm129_beach.dmm
@@ -104,16 +104,16 @@
 /obj/structure/closet/crate/freezer{
 	name = "Beer Cooler"
 	},
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating/beach/sand,
 /area/template_noop)
 "L" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm b/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm
index e2c83fb23553a..aa002135e93c6 100644
--- a/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm141_6sectorsdown.dmm
@@ -129,7 +129,7 @@
 /area/template_noop)
 "qP" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
 	pixel_x = 4;
 	pixel_y = 7
 	},
@@ -176,7 +176,7 @@
 /area/template_noop)
 "AU" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
 	pixel_x = -4;
 	pixel_y = 5
 	},
@@ -260,7 +260,7 @@
 "Qx" = (
 /obj/structure/closet,
 /obj/structure/window/reinforced/tinted/frosted,
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
 	pixel_x = -6;
 	pixel_y = 4
 	},
diff --git a/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm b/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm
index d150aa47c9313..de41faf9920dc 100644
--- a/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm142_olddiner.dmm
@@ -295,7 +295,7 @@
 /area/template_noop)
 "ZH" = (
 /obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
 	pixel_x = -2;
 	pixel_y = 12
 	},
diff --git a/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm b/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm
index 784fc5f25a9cf..305304a90d4e4 100644
--- a/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm143_gamercave.dmm
@@ -24,19 +24,19 @@
 /area/template_noop)
 "i" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
 	pixel_x = -7;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = 12;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
 	pixel_x = 10;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = 32
 	},
@@ -99,11 +99,11 @@
 /area/template_noop)
 "w" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{
+/obj/item/reagent_containers/cup/soda_cans/shamblers{
 	pixel_x = 9;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = 32
 	},
@@ -117,7 +117,7 @@
 /turf/open/floor/plating,
 /area/template_noop)
 "A" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
 	pixel_x = -7;
 	pixel_y = 10
 	},
@@ -136,7 +136,7 @@
 /turf/open/floor/iron,
 /area/template_noop)
 "D" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
 	pixel_x = 4
 	},
 /turf/open/floor/plating,
diff --git a/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm b/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm
index 4473fa80c1585..cc7e03f86ec9d 100644
--- a/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm144_smallmagician.dmm
@@ -28,11 +28,11 @@
 /area/template_noop)
 "g" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -8;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 5;
 	pixel_y = 4
 	},
@@ -184,7 +184,7 @@
 /area/template_noop)
 "J" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 4;
 	pixel_y = 4
 	},
diff --git a/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm b/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm
index b7f72482782ad..49bd54fa4b4f5 100644
--- a/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm147_advbotany.dmm
@@ -21,8 +21,8 @@
 /area/template_noop)
 "g" = (
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/machinery/light/small{
 	dir = 4
 	},
diff --git a/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm b/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm
index 06e10c8e996aa..9b7be400425e8 100644
--- a/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm
@@ -52,8 +52,8 @@
 /obj/item/cultivator{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/grass,
 /area/template_noop)
 "k" = (
diff --git a/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm b/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm
index 1c0b8fe3e54d4..858f8a63bc9e4 100644
--- a/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm
@@ -132,15 +132,15 @@
 /area/template_noop)
 "F" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic{
+/obj/item/reagent_containers/cup/soda_cans/tonic{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic{
+/obj/item/reagent_containers/cup/soda_cans/tonic{
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic{
+/obj/item/reagent_containers/cup/soda_cans/tonic{
 	pixel_y = -3
 	},
 /turf/open/floor/carpet/orange,
diff --git a/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm b/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm
index cab51223247e1..57797c4adeb41 100644
--- a/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm
+++ b/_maps/RandomRooms/10x10/sk_rdm167_library_ritual.dmm
@@ -527,7 +527,7 @@
 	pixel_x = -5;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
 /turf/open/floor/carpet/green,
 /area/template_noop)
 "Ra" = (
diff --git a/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm b/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm
index 271274cf8cde1..e9eedc726cc00 100644
--- a/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm
+++ b/_maps/RandomRooms/10x5/rdm_pirate_derelict.dmm
@@ -5,7 +5,7 @@
 /area/template_noop)
 "c" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
 	name = "Captain Pete's Private Reserve Cuban Spaced Rum";
 	pixel_x = -6;
 	pixel_y = 8
@@ -91,7 +91,7 @@
 /turf/open/floor/wood,
 /area/template_noop)
 "q" = (
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/glowstick/lit,
 /turf/open/floor/plating,
diff --git a/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm b/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm
index 0494353f618ee..61ea44a02775a 100644
--- a/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm011_barbershop.dmm
@@ -76,8 +76,8 @@
 /obj/item/storage/firstaid,
 /obj/item/storage/firstaid/toxin,
 /obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/item/stack/sheet/mineral/silver{
 	amount = 2
 	},
@@ -185,22 +185,22 @@
 /obj/effect/spawner/lootdrop/teratoma/minor,
 /obj/effect/spawner/lootdrop/teratoma/minor,
 /obj/effect/spawner/lootdrop/teratoma/minor,
-/obj/item/reagent_containers/food/drinks/beer/light,
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/air,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/soda_cans/sodawater,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/air,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/starkist,
 /obj/item/storage/pill_bottle/happy,
 /turf/open/floor/carpet{
 	icon_state = "carpetsymbol"
diff --git a/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm b/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm
index f73227dfd0a8f..7b69a241b0a61 100644
--- a/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm
@@ -39,7 +39,7 @@
 /obj/structure/rack,
 /obj/item/book/manual/wiki/robotics_cyborgs,
 /obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
diff --git a/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm b/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm
index e4c7ce33eac91..2f1c4580cc273 100644
--- a/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm040_deltabotnis.dmm
@@ -113,10 +113,10 @@
 "p" = (
 /obj/structure/table,
 /obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
 	pixel_x = -5
 	},
 /obj/item/reagent_containers/syringe,
@@ -130,7 +130,7 @@
 /obj/machinery/status_display/evac{
 	pixel_y = -32
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/template_noop)
@@ -142,7 +142,7 @@
 /obj/structure/table,
 /obj/item/crowbar,
 /obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/template_noop)
diff --git a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
index 04c8cd5a89474..091b60ee966ea 100644
--- a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
@@ -27,11 +27,11 @@
 /area/template_noop)
 "s" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
 /obj/effect/turf_decal/delivery,
diff --git a/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm b/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm
index fb74ee00abeb6..b2678159eccdd 100644
--- a/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm082_maintmedical.dmm
@@ -40,18 +40,18 @@
 /area/template_noop)
 "n" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -91,10 +91,10 @@
 /area/template_noop)
 "w" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -112,14 +112,14 @@
 /area/template_noop)
 "C" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
 	dir = 1
 	},
@@ -127,13 +127,13 @@
 /area/template_noop)
 "F" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -141,10 +141,10 @@
 /turf/open/floor/iron,
 /area/template_noop)
 "I" = (
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -157,10 +157,10 @@
 /area/template_noop)
 "N" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -171,10 +171,10 @@
 /area/template_noop)
 "Q" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -183,13 +183,13 @@
 /area/template_noop)
 "R" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -201,13 +201,13 @@
 /area/template_noop)
 "X" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -219,10 +219,10 @@
 /area/template_noop)
 "Z" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
diff --git a/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm b/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm
index acca4e479dbbf..84d9ccd80a5a4 100644
--- a/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm091_skidrow.dmm
@@ -8,7 +8,7 @@
 /obj/effect/decal/cleanable/shreds,
 /obj/item/toy/cards/singlecard,
 /obj/effect/spawner/lootdrop/maintenance/seven,
-/obj/item/reagent_containers/glass/waterbottle/relic,
+/obj/item/reagent_containers/cup/waterbottle/relic,
 /obj/item/cigbutt,
 /turf/open/floor/plating,
 /area/template_noop)
@@ -168,7 +168,7 @@
 /obj/structure/closet/cardboard,
 /obj/item/storage/toolbox/emergency,
 /obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
 /turf/open/floor/plating,
 /area/template_noop)
 "L" = (
diff --git a/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm b/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm
index 0739616fbf7c3..b52939d9cec8c 100644
--- a/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm100_meetingroom.dmm
@@ -75,7 +75,7 @@
 /area/template_noop)
 "v" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
 /turf/open/floor/iron/dark,
 /area/template_noop)
 "A" = (
diff --git a/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm b/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm
index eb4c4306446f1..64248597f28fa 100644
--- a/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm151_ratburger.dmm
@@ -96,18 +96,18 @@
 /obj/structure/window/reinforced/spawner/north,
 /obj/structure/window/reinforced/spawner/east,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -7;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 6;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -1
 	},
 /turf/open/floor/iron/cafeteria,
diff --git a/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm b/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm
index 6617e2dd2710c..9eba5ed746d0e 100644
--- a/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm
+++ b/_maps/RandomRooms/10x5/sk_rdm153_hobowithpeter.dmm
@@ -61,11 +61,11 @@
 /area/template_noop)
 "v" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
 /obj/effect/spawner/lootdrop/maintenance/two,
 /turf/open/floor/plating,
 /area/template_noop)
diff --git a/_maps/RandomRooms/3x3/rdm_workout.dmm b/_maps/RandomRooms/3x3/rdm_workout.dmm
index 0c011d4e8bf19..963ff0f701ee9 100644
--- a/_maps/RandomRooms/3x3/rdm_workout.dmm
+++ b/_maps/RandomRooms/3x3/rdm_workout.dmm
@@ -11,7 +11,7 @@
 /obj/effect/turf_decal/stripes{
 	dir = 9
 	},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = 13;
 	pixel_y = -7
 	},
diff --git a/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm b/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm
index c587509c96aa8..6daed4f93509c 100644
--- a/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm020_boxclutter6.dmm
@@ -6,7 +6,7 @@
 /area/template_noop)
 "c" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating,
 /area/template_noop)
 "d" = (
diff --git a/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm b/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm
index 58d6b0c48cb28..ddcd0ac416599 100644
--- a/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm037_deltajanniecloset.dmm
@@ -15,7 +15,7 @@
 	name = "old sink";
 	pixel_y = 28
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/template_noop)
 "g" = (
diff --git a/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm b/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm
index 431420bcdb38b..1e9774eb79025 100644
--- a/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm050_medicloset.dmm
@@ -18,7 +18,7 @@
 /obj/item/hemostat,
 /obj/item/healthanalyzer,
 /obj/item/clothing/glasses/eyepatch,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = 3;
 	pixel_y = 2
 	},
@@ -38,7 +38,7 @@
 /area/template_noop)
 "f" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 8;
 	pixel_y = 2
 	},
diff --git a/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm b/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm
index bc826c4b8fd55..f8d8fb1b02b66 100644
--- a/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm077_kilolustymaid.dmm
@@ -20,7 +20,7 @@
 	pixel_x = -12;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /turf/open/floor/plating{
 	broken = 1
@@ -29,7 +29,7 @@
 "s" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/structure/mirror{
diff --git a/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm b/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm
index 04f787182db82..79e89e56bf672 100644
--- a/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm081_biohazard.dmm
@@ -1,11 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 7;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -2;
 	pixel_y = 6
 	},
@@ -40,23 +40,23 @@
 "g" = (
 /obj/structure/table/glass,
 /obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/glass/bottle/random_virus{
+/obj/item/reagent_containers/cup/bottle/random_virus{
 	pixel_x = -9;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter{
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter{
 	pixel_x = -2;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/glass/bottle/mutagen,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/bottle/mutagen,
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 6;
 	pixel_y = 4
 	},
 /turf/open/floor/plating,
 /area/template_noop)
 "h" = (
-/obj/item/reagent_containers/glass/bottle/synaptizine,
+/obj/item/reagent_containers/cup/bottle/synaptizine,
 /obj/structure/table/glass,
 /obj/effect/spawner/lootdrop/teratoma/major,
 /obj/effect/spawner/lootdrop/maintenance/three,
diff --git a/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm b/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm
index b170e37558df0..23b91e43ea937 100644
--- a/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm
+++ b/_maps/RandomRooms/3x3/sk_rdm092_hobohut.dmm
@@ -2,7 +2,7 @@
 "a" = (
 /obj/structure/closet/cardboard,
 /obj/item/storage/toolbox/emergency,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
 /turf/open/floor/plating,
 /area/template_noop)
 "b" = (
diff --git a/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm b/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm
index a2dfa26e39cb7..d18e242b1d83a 100644
--- a/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm
+++ b/_maps/RandomRooms/3x5/sk_rdm013_boxkitchen.dmm
@@ -2,8 +2,8 @@
 "a" = (
 /obj/structure/table,
 /obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/sugar,
 /turf/open/floor/plating,
 /area/template_noop)
 "b" = (
@@ -43,10 +43,10 @@
 /area/template_noop)
 "i" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 2
 	},
 /obj/item/food/mint{
diff --git a/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm b/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm
index 9380a05a52138..1891d23f815d3 100644
--- a/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm
+++ b/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm
@@ -57,8 +57,8 @@
 	},
 /obj/structure/closet,
 /obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/item/gun/syringe,
 /obj/item/storage/box/syringes,
 /obj/item/restraints/handcuffs,
diff --git a/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm b/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm
index 268234dd5115c..03b47be28c30c 100644
--- a/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm
+++ b/_maps/RandomRooms/3x5/sk_rdm160_kilomaintbar.dmm
@@ -8,11 +8,11 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = 4;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -5;
 	pixel_y = 6
 	},
diff --git a/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm b/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm
index 51be66a5609d5..9493dae1ba257 100644
--- a/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm
@@ -43,7 +43,7 @@
 "e" = (
 /obj/structure/closet,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	desc = "Takes you to a whole new level of thinking.";
 	name = "Meta-Cider"
 	},
diff --git a/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm b/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm
index 715857670f706..c1b5ad3c79732 100644
--- a/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm066_pubbybedroom.dmm
@@ -16,7 +16,7 @@
 /obj/structure/sink/kitchen{
 	pixel_y = 28
 	},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/plating,
 /area/template_noop)
 "e" = (
diff --git a/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm b/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm
index e9618c8efda05..00a9d3cbbf5ec 100644
--- a/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm
@@ -19,9 +19,9 @@
 /area/template_noop)
 "e" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/cup/bowl,
+/obj/item/reagent_containers/condiment/rice,
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -55,7 +55,7 @@
 /obj/item/seeds/dionapod,
 /obj/item/seeds/carrot,
 /obj/item/seeds/tomato,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
 /turf/open/floor/plating,
 /area/template_noop)
 "j" = (
diff --git a/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm b/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm
index 625353e6c6ed1..8ed123ce80a1a 100644
--- a/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm080_cloner.dmm
@@ -6,8 +6,8 @@
 /turf/open/floor/iron/white,
 /area/template_noop)
 "i" = (
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
 /obj/structure/closet,
 /turf/open/floor/iron/white,
 /area/template_noop)
diff --git a/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm b/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm
index 70162a872ce86..2b84b5f21a127 100644
--- a/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm
+++ b/_maps/RandomRooms/5x3/sk_rdm101_minibreakroom.dmm
@@ -39,7 +39,7 @@
 "i" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
 /turf/open/floor/iron,
 /area/template_noop)
 "j" = (
diff --git a/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm b/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm
index d0ec60f199533..d155aa87f1f81 100644
--- a/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm026_boxsurgery.dmm
@@ -61,7 +61,7 @@
 /obj/structure/closet/wardrobe/white,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
 /turf/open/floor/plating,
 /area/template_noop)
 "m" = (
diff --git a/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm b/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm
index 684e99df77599..45708d0993c7c 100644
--- a/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm029_deltabar.dmm
@@ -14,11 +14,11 @@
 /area/template_noop)
 "b" = (
 /obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
 	pixel_x = 6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_y = 7
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -39,8 +39,8 @@
 /area/template_noop)
 "e" = (
 /obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
 /obj/item/reagent_containers/dropper,
 /turf/open/floor/plating,
 /area/template_noop)
diff --git a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm
index 6e53fd6d8973c..911e2cbf7cafd 100644
--- a/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm049_metakitchen.dmm
@@ -1,16 +1,16 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/flour,
 /turf/open/floor/plating,
 /area/template_noop)
 "c" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
 /turf/open/floor/plating,
@@ -31,7 +31,7 @@
 "f" = (
 /obj/structure/table,
 /obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/plating{
 	broken = 1
 	},
diff --git a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm
index d4c361d178aca..fe6b004116ebd 100644
--- a/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm055_metamedical.dmm
@@ -4,7 +4,7 @@
 /obj/structure/sign/departments/medbay{
 	pixel_y = 32
 	},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/plating,
 /area/template_noop)
 "b" = (
@@ -24,15 +24,15 @@
 /area/template_noop)
 "d" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 4;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 6;
 	pixel_y = -1
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -4;
 	pixel_y = 6
 	},
@@ -43,7 +43,7 @@
 /turf/open/floor/plating,
 /area/template_noop)
 "e" = (
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/toxin{
 	pixel_x = 4;
 	pixel_y = 2
 	},
diff --git a/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm b/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm
index 0bdefdca57f09..bf336d9ac4188 100644
--- a/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm067_pubbysurgery.dmm
@@ -60,7 +60,7 @@
 /turf/open/floor/plating,
 /area/template_noop)
 "i" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /turf/open/floor/plating{
 	broken = 1
 	},
diff --git a/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm b/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm
index b90724a57434f..155b44094f006 100644
--- a/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm090_tinybarbershop.dmm
@@ -91,8 +91,8 @@
 /obj/item/surgical_drapes,
 /obj/item/storage/firstaid,
 /obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/item/stack/sheet/mineral/silver{
 	amount = 2
 	},
diff --git a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm
index cc28a3652ee57..f1153b82c6430 100644
--- a/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm
+++ b/_maps/RandomRooms/5x4/sk_rdm124_oldcryoroom.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/freezer,
 /area/template_noop)
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm
index 339f4c479fa9f..13c28c0a646ee 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm
@@ -35,7 +35,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /turf/open/floor/iron/dark,
 /area/template_noop)
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm
index 3241234da08b7..3d4fcf9d4b06e 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_06_publicgarden.dmm
@@ -49,8 +49,8 @@
 /area/template_noop)
 "p" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -8
 	},
 /obj/item/hatchet,
@@ -63,12 +63,12 @@
 /obj/structure/table,
 /obj/item/plant_analyzer,
 /obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
 	pixel_x = 2;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
 /obj/item/reagent_containers/spray/pestspray{
 	pixel_x = 3;
 	pixel_y = 4
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm
index fe7ad17d7f458..21f5e4fa175c9 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_08_zenroom.dmm
@@ -31,7 +31,7 @@
 /area/template_noop)
 "k" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/sake{
+/obj/item/reagent_containers/cup/glass/bottle/sake{
 	pixel_x = 5;
 	pixel_y = 12
 	},
@@ -95,12 +95,12 @@
 /area/template_noop)
 "G" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -3;
 	pixel_y = 15
 	},
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm
index 9710dd92ae103..d7e47b8911db1 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_09_barbershop.dmm
@@ -34,8 +34,8 @@
 /obj/item/storage/firstaid,
 /obj/item/storage/firstaid/toxin,
 /obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/item/stack/sheet/mineral/silver{
 	amount = 2
 	},
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm
index e6a09e7813810..3e57f73405176 100644
--- a/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm
+++ b/_maps/RandomRooms/fland/sk_rdm_fln_11_hobobox.dmm
@@ -177,7 +177,7 @@
 "R" = (
 /obj/structure/closet/cardboard,
 /obj/item/storage/toolbox/emergency,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
 /turf/open/floor/plating,
 /area/template_noop)
 "S" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index e282e294b0e7e..e240edd2c4f9c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -206,7 +206,7 @@
 /area/ruin/powered/beach)
 "aR" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/tequila,
+/obj/item/reagent_containers/cup/glass/bottle/tequila,
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "aS" = (
@@ -236,7 +236,7 @@
 /area/ruin/powered/beach)
 "aX" = (
 /obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "aY" = (
@@ -363,7 +363,7 @@
 /turf/open/floor/plating/beach/sand,
 /area/ruin/powered/beach)
 "bP" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating/beach/sand,
 /area/ruin/powered/beach)
 "bQ" = (
@@ -592,8 +592,8 @@
 "NQ" = (
 /obj/structure/table/wood,
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "QS" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
index 72a6698515e07..a9e48230deabc 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -274,7 +274,7 @@
 	},
 /area/ruin/powered/clownplanet)
 "bL" = (
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
 /obj/structure/table/glass,
 /turf/open/floor/carpet,
 /area/ruin/powered/clownplanet)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
index baba995eb3e92..344afa36d5b7e 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
@@ -667,7 +667,7 @@
 /turf/open/floor/iron/white,
 /area/ruin/powered/animal_hospital)
 "vL" = (
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
 /obj/item/reagent_containers/spray/cleaner,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
@@ -745,7 +745,7 @@
 /obj/item/trash/cheesie,
 /obj/item/reagent_containers/syringe/antiviral,
 /obj/item/bodybag,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /turf/open/floor/grass{
 	initial_gas_mix = "o2=14;n2=5;co2=13;TEMP=300"
 	},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index adde229bb82d0..fd8cb555089ab 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -290,7 +290,7 @@
 	dir = 8
 	},
 /obj/machinery/iv_drip,
-/obj/item/reagent_containers/glass/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "aR" = (
@@ -1305,7 +1305,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "dw" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/stone_tile/block/cracked{
 	dir = 4
 	},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
index c4655da79ffb3..62a6df4aaf1e6 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
@@ -32,7 +32,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered/snow_biodome)
 "ah" = (
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
 /turf/open/floor/plating,
 /area/ruin/powered/snow_biodome)
 "ai" = (
@@ -136,7 +136,7 @@
 /area/ruin/powered/snow_biodome)
 "aF" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa,
+/obj/item/reagent_containers/cup/glass/mug/cocoa,
 /turf/open/floor/wood,
 /area/ruin/powered/snow_biodome)
 "aG" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 56f5a21f4a3fe..e78618e875b3a 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -32,7 +32,7 @@
 	},
 /area/ruin/powered)
 "i" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating/asteroid{
 	name = "dirt"
 	},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
index d9bd0c6bfeed7..73e6ae270c375 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -314,16 +314,16 @@
 /area/ruin/powered/seedvault)
 "nO" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 7
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -6;
 	pixel_y = 2
 	},
@@ -645,10 +645,10 @@
 /obj/machinery/reagentgrinder{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/beaker/bluespace,
-/obj/item/reagent_containers/glass/beaker/bluespace,
-/obj/item/reagent_containers/glass/beaker/bluespace,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
 /obj/machinery/button{
 	id = "lifebring";
 	pixel_y = 32
@@ -1290,7 +1290,7 @@
 /area/ruin/powered/seedvault)
 "Ud" = (
 /obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/pod,
 /area/ruin/powered/seedvault)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index ccd5c580b5f42..3d9314923f0f5 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -93,14 +93,14 @@
 	icon_state = "0-2"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
-/obj/item/reagent_containers/glass/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
 /turf/open/floor/iron/white/side{
 	dir = 9
 	},
@@ -119,8 +119,8 @@
 	dir = 4;
 	pixel_x = 26
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter,
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter,
 /obj/item/extrapolator,
 /turf/open/floor/iron/white/side{
 	dir = 5
@@ -389,10 +389,10 @@
 	pixel_y = -2
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /turf/open/floor/iron/white/corner{
 	dir = 4
 	},
@@ -414,7 +414,7 @@
 /obj/machinery/reagentgrinder{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/iron/white/side{
 	dir = 5
 	},
@@ -566,10 +566,10 @@
 	},
 /obj/structure/table/glass,
 /obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3
 	},
 /obj/item/reagent_containers/dropper,
@@ -960,21 +960,21 @@
 "ft" = (
 /obj/effect/turf_decal/box/white/corners,
 /obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large,
-/obj/item/reagent_containers/glass/waterbottle/large,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 3;
 	pixel_y = -3
 	},
@@ -2750,7 +2750,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/soap/syndie,
 /obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/ruin/unpowered/syndicate_lava_base/main)
 "kQ" = (
@@ -2898,7 +2898,7 @@
 	pixel_y = 6
 	},
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/wood,
 /area/ruin/unpowered/syndicate_lava_base/bar)
 "ll" = (
@@ -3014,11 +3014,11 @@
 /area/ruin/unpowered/syndicate_lava_base/bar)
 "lz" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_x = -4;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 5;
 	pixel_y = -2
 	},
@@ -4103,7 +4103,7 @@
 /area/ruin/unpowered/syndicate_lava_base/main)
 "qa" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron/dark,
@@ -4849,7 +4849,7 @@
 /area/ruin/unpowered/syndicate_lava_base/arrivals)
 "Fz" = (
 /obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /obj/item/food/chocolatebar,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 03e7de95c4eab..2f1b40c5b4bb0 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -1019,7 +1019,7 @@
 /turf/open/floor/iron,
 /area/ruin/space/derelict/bridge/access)
 "dq" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
@@ -1241,7 +1241,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/derelict/bridge/access)
 "dZ" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/iron,
 /area/ruin/space/derelict/bridge)
 "ea" = (
@@ -1489,7 +1489,7 @@
 /area/ruin/space/derelict/bridge)
 "eU" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -2520,7 +2520,7 @@
 	dir = 8
 	},
 /obj/structure/window/reinforced,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/iron/white/airless,
 /area/ruin/space/derelict/medical)
 "iC" = (
@@ -2734,7 +2734,7 @@
 	},
 /area/ruin/space/derelict/medical)
 "jk" = (
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/iron/airless{
 	icon_state = "damaged3"
 	},
@@ -3374,7 +3374,7 @@
 /area/ruin/space/derelict/hallway/primary)
 "lq" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	list_reagents = list(/datum/reagent/toxin/acid = 50)
 	},
 /obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 8a9ae9ac8c3e9..e24e01482c05a 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -243,7 +243,7 @@
 /area/ruin/space/has_grav/abandonedzoo)
 "aP" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/random_virus,
+/obj/item/reagent_containers/cup/bottle/random_virus,
 /obj/item/reagent_containers/dropper,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
@@ -379,7 +379,7 @@
 "bi" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/hypospray/medipen/stimpack,
-/obj/item/reagent_containers/glass/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "bj" = (
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index ab18c9e534dfc..e0c41cdc41d87 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -80,7 +80,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/derelictoutpost/cargobay)
 "aq" = (
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index 5bae30eefbee6..fa317740e732f 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -50,7 +50,7 @@
 /area/ruin/unpowered/no_grav)
 "al" = (
 /obj/effect/decal/cleanable/food/salt,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered/no_grav)
 "am" = (
@@ -125,7 +125,7 @@
 /area/ruin/unpowered/no_grav)
 "aC" = (
 /obj/structure/fluff/bus/passable,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
@@ -154,7 +154,7 @@
 /area/ruin/unpowered/no_grav)
 "aH" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered/no_grav)
 "aI" = (
@@ -199,7 +199,7 @@
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered/no_grav)
 "aQ" = (
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered/no_grav)
 "aR" = (
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index c3f63abb553a1..176cc2ac6f00b 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -63,7 +63,7 @@
 /area/awaymission/BMPship/Fore)
 "cl" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/BMPship/Midship)
@@ -485,7 +485,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/BMPship/Aft)
 "oh" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating,
 /area/awaymission/BMPship/Aft)
 "ol" = (
@@ -655,7 +655,7 @@
 "rv" = (
 /obj/structure/table,
 /obj/item/pen/red,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/iron,
 /area/awaymission/BMPship/Aft)
 "rB" = (
@@ -1169,7 +1169,7 @@
 /turf/open/floor/plating,
 /area/awaymission/BMPship/Fore)
 "Ds" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/iron,
 /area/awaymission/BMPship/Midship)
 "Dz" = (
@@ -1195,8 +1195,8 @@
 /area/awaymission/BMPship/Midship)
 "Et" = (
 /obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating,
 /area/awaymission/BMPship/Aft)
 "Ey" = (
@@ -1221,7 +1221,7 @@
 /turf/template_noop,
 /area/space/nearstation)
 "Fd" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/BMPship/Midship)
@@ -1360,7 +1360,7 @@
 /area/awaymission/BMPship/Aft)
 "HJ" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/carpet,
 /area/awaymission/BMPship/Fore)
 "HL" = (
@@ -1373,7 +1373,7 @@
 /turf/closed/wall/mineral/titanium,
 /area/awaymission/BMPship/Aft)
 "HZ" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/BMPship/Midship)
@@ -1664,7 +1664,7 @@
 /obj/structure/table/wood,
 /obj/item/stack/spacecash/c500,
 /obj/item/stack/spacecash/c100,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/wood,
 /area/awaymission/BMPship/Fore)
 "OE" = (
@@ -1711,7 +1711,7 @@
 /turf/template_noop,
 /area/space/nearstation)
 "Pd" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron/showroomfloor,
 /area/awaymission/BMPship/Aft)
 "Pf" = (
@@ -1988,7 +1988,7 @@
 "Vr" = (
 /obj/structure/table,
 /obj/item/knife/butcher,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/item/food/meat,
 /obj/effect/turf_decal/tile/blue/opposingcorners{
 	dir = 1
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 05e2a42452989..a847cf5a5d9b4 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -379,13 +379,13 @@
 	dir = 1
 	},
 /obj/item/storage/box/cups,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/has_grav/deepstorage/kitchen)
 "aY" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/soysauce{
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/soysauce{
 	pixel_x = 4
 	},
 /obj/machinery/firealarm{
@@ -410,8 +410,8 @@
 /area/ruin/space/has_grav/deepstorage/kitchen)
 "ba" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -968,11 +968,11 @@
 	dir = 4
 	},
 /obj/machinery/light,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "cx" = (
@@ -987,7 +987,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "cz" = (
@@ -1009,25 +1009,25 @@
 /obj/structure/closet/crate{
 	name = "food crate"
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 2;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 1;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 8;
 	pixel_y = -3
 	},
diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
index 1b16fb6b5579b..8a8277243b798 100644
--- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -254,20 +254,20 @@
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/has_grav/gasthelizard)
 "I" = (
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = -4;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = 5;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
 	name = "fluorosulfuric acid bottle";
 	pixel_x = -3;
 	pixel_y = 6
@@ -331,8 +331,8 @@
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/syringe,
 /obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/bottle/mutagen,
-/obj/item/reagent_containers/glass/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
+/obj/item/reagent_containers/cup/bottle/mutagen,
 /obj/item/razor,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/has_grav/gasthelizard)
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
index fd689a7b13664..fa8dacffc4eb9 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
@@ -91,7 +91,7 @@
 /area/ruin/space/has_grav/hilbertresearchfacility)
 "r" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
 /turf/open/floor/carpet/grimy{
 	icon_state = "engine"
 	},
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index a8432f71eae07..89618fd243b0a 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -788,11 +788,11 @@
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = -30
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -4;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 3;
 	pixel_y = 11
 	},
diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
index fdbda4defe1ce..229243a548023 100644
--- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -28,7 +28,7 @@
 "ai" = (
 /obj/structure/janitorialcart,
 /obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/cat_man)
@@ -170,13 +170,13 @@
 /area/ruin/space/has_grav/powered/cat_man)
 "aK" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/cat_man)
 "aL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/cat_man)
 "aM" = (
@@ -691,7 +691,7 @@
 "hz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/item/food/meat/slab/synthmeat{
 	desc = "A slab of cat meat. Tastes like furball.";
 	name = "cat meat"
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 67e086897491a..2a114fb99921f 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1027,8 +1027,8 @@
 	desc = "A highly-pressurized water tank, this one seems almost empty..";
 	tank_volume = 1000
 	},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/ancientstation/hydroponics)
@@ -2301,7 +2301,7 @@
 "hb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/ancientstation/sec)
@@ -2597,14 +2597,14 @@
 	dir = 4
 	},
 /obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/ancientstation/rnd)
 "ip" = (
 /obj/machinery/chem_master,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -2634,18 +2634,18 @@
 /area/ruin/space/has_grav/ancientstation/rnd)
 "it" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -2714,11 +2714,11 @@
 "iL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 5;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -2;
 	pixel_y = 2
 	},
@@ -2744,10 +2744,10 @@
 /area/ruin/space/has_grav/ancientstation/rnd)
 "iR" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -3794,10 +3794,10 @@
 /area/ruin/space/has_grav/ancientstation/kitchen)
 "nT" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -3806,13 +3806,13 @@
 /area/ruin/space/has_grav/ancientstation/rnd)
 "ot" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -4136,10 +4136,10 @@
 /area/ruin/space/has_grav/ancientstation/sec)
 "AP" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -4201,7 +4201,7 @@
 "CJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
 	},
@@ -4220,13 +4220,13 @@
 /area/ruin/space/has_grav/ancientstation/rnd)
 "En" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -4307,13 +4307,13 @@
 /area/ruin/space/has_grav/ancientstation/rnd)
 "Fn" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -4747,10 +4747,10 @@
 /area/ruin/space/has_grav/ancientstation)
 "Qy" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -4761,10 +4761,10 @@
 /area/ruin/space/has_grav/ancientstation/rnd)
 "QS" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -4904,10 +4904,10 @@
 /area/ruin/space/has_grav/ancientstation/sec)
 "VX" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
index a61b507f17af5..38172723b326f 100644
--- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -982,8 +982,8 @@
 /obj/item/tank/internals/oxygen/red,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/item/clothing/suit/space/hardsuit/syndi,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
 /obj/item/folder/syndicate/mining,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/onehalf/bridge)
diff --git a/_maps/RandomRuins/SpaceRuins/refference.dmm b/_maps/RandomRuins/SpaceRuins/refference.dmm
index d7bf8dfabbb83..dc599a1179bde 100644
--- a/_maps/RandomRuins/SpaceRuins/refference.dmm
+++ b/_maps/RandomRuins/SpaceRuins/refference.dmm
@@ -3,7 +3,7 @@
 /turf/open/space/basic,
 /area/space)
 "ab" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered/no_grav)
 "ad" = (
diff --git a/_maps/RandomRuins/SpaceRuins/sos6.dmm b/_maps/RandomRuins/SpaceRuins/sos6.dmm
index c8dd9f8414a1a..3e3887a518cb2 100644
--- a/_maps/RandomRuins/SpaceRuins/sos6.dmm
+++ b/_maps/RandomRuins/SpaceRuins/sos6.dmm
@@ -14,7 +14,7 @@
 	dir = 4
 	},
 /obj/effect/mob_spawn/human/corpse/russian,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/unpowered)
 "e" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacearcade.dmm b/_maps/RandomRuins/SpaceRuins/spacearcade.dmm
index 565b7f40d1a59..a753d7cb49f4f 100644
--- a/_maps/RandomRuins/SpaceRuins/spacearcade.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacearcade.dmm
@@ -76,22 +76,22 @@
 /obj/structure/closet/crate/freezer{
 	name = "refreshment cooler"
 	},
-/obj/item/reagent_containers/food/drinks/beer/light,
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,
-/obj/item/reagent_containers/food/drinks/soda_cans/air,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
+/obj/item/reagent_containers/cup/glass/bottle/beer/light,
+/obj/item/reagent_containers/cup/soda_cans/sodawater,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/grey_bull,
+/obj/item/reagent_containers/cup/soda_cans/air,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/starkist,
 /turf/open/floor/carpet/purple,
 /area/ruin/space/has_grav/powered)
 "r" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index a84a0ece122b4..adeeca1933aa7 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -1853,14 +1853,14 @@
 /area/ruin/space/has_grav/hotel/bar)
 "gb" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/has_grav/hotel/bar)
 "gc" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/has_grav/hotel/bar)
 "ge" = (
@@ -1990,11 +1990,11 @@
 /area/ruin/space/has_grav/hotel/bar)
 "gE" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/pack/hotsauce,
-/obj/item/reagent_containers/food/condiment/pack/hotsauce,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/condiment/pack/hotsauce,
+/obj/item/reagent_containers/condiment/pack/hotsauce,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/has_grav/hotel/bar)
 "gF" = (
@@ -2056,9 +2056,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
 /obj/structure/closet/secure_closet/freezer/fridge{
 	req_access = null;
 	req_access_txt = "200"
@@ -2092,7 +2092,7 @@
 /area/ruin/space/has_grav/hotel/workroom)
 "hd" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/tea,
+/obj/item/reagent_containers/cup/glass/mug/tea,
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/hotel/dock)
 "he" = (
@@ -2152,10 +2152,10 @@
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/hotel/bar)
 "hm" = (
-/obj/item/reagent_containers/food/condiment/rice,
-/obj/item/reagent_containers/food/condiment/rice,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/reagent_containers/condiment/rice,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
 /obj/structure/closet/secure_closet/freezer/kitchen{
 	req_access = null;
 	req_access_txt = "200"
@@ -2240,10 +2240,10 @@
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/hotel/bar)
 "hx" = (
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 4
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -4
 	},
 /obj/structure/table,
@@ -2327,7 +2327,7 @@
 /area/ruin/space/has_grav/hotel/bar)
 "hJ" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/soysauce,
+/obj/item/reagent_containers/condiment/soysauce,
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/has_grav/hotel/bar)
 "hK" = (
@@ -2994,7 +2994,7 @@
 /area/ruin/space/has_grav/hotel/power)
 "kL" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hotel/security)
@@ -3800,7 +3800,7 @@
 /area/ruin/space/has_grav/hotel/dock)
 "yJ" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/reagent_containers/spray/cleaner,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron,
@@ -3904,7 +3904,7 @@
 /area/ruin/space/has_grav/hotel/workroom)
 "Ci" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hotel/bar)
@@ -4191,7 +4191,7 @@
 /area/ruin/space/has_grav/hotel/pool)
 "KR" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hotel/bar)
@@ -4411,7 +4411,7 @@
 "SQ" = (
 /obj/structure/table,
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hotel/bar)
@@ -4437,10 +4437,10 @@
 /area/ruin/space/has_grav/hotel/pool)
 "TR" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 4
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -4
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index 167aed15b539a..0bab58df25677 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -172,11 +172,11 @@
 /area/ruin/space/has_grav/turretedoutpost)
 "aV" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
 	pixel_x = 3
 	},
 /turf/open/floor/iron,
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 2794aa837cbdc..d6a544e723706 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -297,7 +297,7 @@
 	},
 /obj/structure/janitorialcart,
 /obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/caution,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -353,7 +353,7 @@
 /area/awaymission/cabin)
 "bc" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
 /turf/open/floor/carpet,
 /area/awaymission/cabin)
 "bd" = (
@@ -604,7 +604,7 @@
 /area/awaymission/cabin)
 "bU" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/wood,
 /area/awaymission/cabin)
 "bV" = (
@@ -883,25 +883,25 @@
 /area/awaymission/cabin)
 "cJ" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8
 	},
 /turf/open/floor/iron/cafeteria,
 /area/awaymission/cabin)
 "cK" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton{
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton{
 	pixel_y = 4
 	},
 /turf/open/floor/wood,
@@ -992,7 +992,7 @@
 	dir = 1
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
 	desc = "A fancy bottle of vodka. The name isn't in Galactic Common though.";
 	name = "Porosha Vodka"
 	},
@@ -1099,7 +1099,7 @@
 /area/awaymission/cabin)
 "dt" = (
 /obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/mayonnaise,
 /turf/open/floor/iron/freezer,
 /area/awaymission/cabin)
 "du" = (
@@ -1360,11 +1360,11 @@
 /area/awaymission/cabin)
 "eo" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_x = 8;
 	pixel_y = 8
@@ -1410,7 +1410,7 @@
 /area/awaymission/cabin)
 "ev" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
 /turf/open/floor/wood,
 /area/awaymission/cabin)
 "ew" = (
@@ -2341,7 +2341,7 @@
 /area/awaymission/cabin)
 "hF" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_y = 2
 	},
@@ -2407,7 +2407,7 @@
 /turf/open/floor/plating/snowed,
 /area/awaymission/cabin/caves)
 "hQ" = (
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating/snowed,
 /area/awaymission/cabin/caves)
 "hR" = (
@@ -2612,7 +2612,7 @@
 /area/awaymission/cabin/caves/sovietcave)
 "is" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /turf/open/floor/iron/freezer,
 /area/awaymission/cabin)
 "it" = (
@@ -2710,7 +2710,7 @@
 /area/awaymission/cabin/caves)
 "iR" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_x = -7;
 	pixel_y = -2
@@ -2719,7 +2719,7 @@
 /area/awaymission/cabin)
 "iS" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_x = 7;
 	pixel_y = 2
@@ -2728,7 +2728,7 @@
 /area/awaymission/cabin)
 "iT" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_x = -4;
 	pixel_y = 4
@@ -2737,12 +2737,12 @@
 /area/awaymission/cabin)
 "iU" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_x = -5;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	desc = "Still hot!";
 	pixel_x = 7;
 	pixel_y = -2
@@ -3003,14 +3003,14 @@
 /area/awaymission/cabin)
 "jy" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -7;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 7;
 	pixel_y = 3
 	},
@@ -3468,7 +3468,7 @@
 "kK" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /turf/open/floor/mineral/plastitanium/red{
 	name = "soviet floor"
 	},
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index c02738946b515..dfe81d0620b9f 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -197,7 +197,7 @@
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "aH" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
 	pixel_x = -17;
 	pixel_y = 17
 	},
@@ -214,7 +214,7 @@
 /turf/open/floor/plating/beach/water,
 /area/awaymission/beach)
 "aJ" = (
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_x = -14;
 	pixel_y = 15
 	},
@@ -284,7 +284,7 @@
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "aS" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
 	pixel_x = -12;
 	pixel_y = 14
 	},
@@ -478,8 +478,8 @@
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "bu" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/wine,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
 /obj/structure/table/wood,
 /turf/open/floor/wood,
 /area/awaymission/beach)
@@ -621,7 +621,7 @@
 /area/awaymission/beach)
 "bO" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/champagne,
+/obj/item/reagent_containers/cup/glass/bottle/champagne,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "bP" = (
@@ -788,14 +788,14 @@
 /area/awaymission/beach)
 "cl" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cm" = (
 /obj/structure/table/wood,
 /obj/item/clothing/glasses/sunglasses,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cn" = (
@@ -827,14 +827,14 @@
 	req_access = list(25)
 	},
 /obj/item/storage/fancy/egg_box,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/mayonnaise,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cs" = (
@@ -888,7 +888,7 @@
 /area/awaymission/beach)
 "cB" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/ale,
+/obj/item/reagent_containers/cup/glass/bottle/ale,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cC" = (
@@ -897,19 +897,19 @@
 /area/awaymission/beach)
 "cD" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_y = 7
 	},
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cE" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cF" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cG" = (
@@ -937,12 +937,12 @@
 /area/awaymission/beach)
 "cK" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cL" = (
@@ -961,12 +961,12 @@
 /area/awaymission/beach)
 "cN" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/air,
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic,
+/obj/item/reagent_containers/cup/soda_cans/sodawater,
+/obj/item/reagent_containers/cup/soda_cans/shamblers,
+/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+/obj/item/reagent_containers/cup/soda_cans/air,
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter,
+/obj/item/reagent_containers/cup/soda_cans/tonic,
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cO" = (
@@ -974,45 +974,45 @@
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cP" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
 	pixel_x = -12
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
 	pixel_x = 13
 	},
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cQ" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
 	pixel_x = -12;
 	pixel_y = 3
 	},
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cR" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = -8;
 	pixel_y = -4
 	},
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cS" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
 	pixel_x = -9;
 	pixel_y = -7
 	},
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cT" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cU" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = -8;
 	pixel_y = -4
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
 	pixel_x = 15
 	},
 /turf/open/floor/plating/beach/sand,
@@ -1025,19 +1025,19 @@
 /turf/open/floor/plating/beach/coastline_t/sandwater_inner,
 /area/awaymission/beach)
 "cW" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
 	pixel_x = -12
 	},
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cX" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = -5
 	},
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
 "cY" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
 	pixel_x = -6
 	},
 /turf/open/floor/plating/beach/sand,
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index c4b31d08c3fdb..ce6c0ab602e3c 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1899,7 +1899,7 @@
 /area/awaymission/caves/BMP_asteroid)
 "gf" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /turf/open/floor/iron,
 /area/awaymission/caves/BMP_asteroid)
 "gg" = (
@@ -1989,7 +1989,7 @@
 /turf/open/floor/iron,
 /area/awaymission/caves/BMP_asteroid)
 "gy" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /turf/open/floor/iron,
 /area/awaymission/caves/BMP_asteroid)
 "gz" = (
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index c7cd6fb0b6ac7..d7c863c10116b 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -904,7 +904,7 @@
 /obj/item/book/manual/wiki/barman_recipes{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/iron/cafeteria{
 	dir = 5
 	},
@@ -1223,15 +1223,15 @@
 /area/awaymission/moonoutpost19/arrivals)
 "mE" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_x = -6;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 3
 	},
 /turf/open/floor/iron/dark,
@@ -4289,7 +4289,7 @@
 "Nv" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_y = 5
 	},
 /obj/machinery/door/poddoor/shutters{
@@ -4329,10 +4329,10 @@
 "NE" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
 /obj/machinery/door/poddoor/shutters{
@@ -4347,9 +4347,9 @@
 	name = "refrigerator";
 	req_access_txt = "201"
 	},
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
 /obj/item/storage/fancy/egg_box,
 /turf/open/floor/iron/showroomfloor{
 	initial_temperature = 273.15
@@ -4851,9 +4851,9 @@
 	name = "kitchen Cabinet";
 	req_access_txt = "201"
 	},
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/showroomfloor{
 	initial_temperature = 273.15
@@ -4911,7 +4911,7 @@
 /obj/item/reagent_containers/peppercloud_deployer,
 /obj/item/grenade/flashbang,
 /obj/item/storage/belt/security,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -3;
 	pixel_y = -2
 	},
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index b47fee0ad7f33..9bcc9baa59930 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -982,11 +982,11 @@
 /area/awaymission/research/interior/cryo)
 "fd" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -7;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -7;
 	pixel_y = 1
 	},
@@ -994,11 +994,11 @@
 /area/awaymission/research/interior/cryo)
 "fe" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 7;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 7;
 	pixel_y = 1
 	},
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 492f8e203617e..f6c483d80b1fc 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -737,7 +737,7 @@
 /area/awaymission/snowdin/post/kitchen)
 "dv" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/kitchen)
 "dw" = (
@@ -861,7 +861,7 @@
 /area/awaymission/snowdin/post/kitchen)
 "dT" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/kitchen)
 "dU" = (
@@ -2883,7 +2883,7 @@
 /area/awaymission/snowdin/post/hydro)
 "nA" = (
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/hydro)
 "nB" = (
@@ -3218,7 +3218,7 @@
 /obj/structure/closet/crate/hydroponics,
 /obj/item/shovel/spade,
 /obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/wirecutters,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/hydro)
@@ -7625,7 +7625,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -7685,7 +7685,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -7895,7 +7895,7 @@
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/cave)
 "Ea" = (
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /turf/open/floor/iron/dark,
@@ -7981,7 +7981,7 @@
 /area/awaymission/snowdin/cave)
 "Eo" = (
 /obj/effect/turf_decal/weather/snow,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /turf/open/floor/iron/dark/snowdin,
@@ -8007,7 +8007,7 @@
 /area/awaymission/snowdin/post/hydro)
 "Eu" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /turf/open/floor/iron/dark,
@@ -8017,7 +8017,7 @@
 	dir = 4
 	},
 /obj/item/stack/rods,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -8050,7 +8050,7 @@
 	dir = 10
 	},
 /obj/item/shard,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -8059,7 +8059,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/mineral/plastitanium/red,
 /area/awaymission/snowdin/cave)
 "ED" = (
@@ -10056,7 +10056,7 @@
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/dorm)
 "Lg" = (
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -10371,7 +10371,7 @@
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/messhall)
 "Md" = (
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -11910,7 +11910,7 @@
 /area/awaymission/snowdin/post/garage)
 "RW" = (
 /obj/item/stack/rods,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
 	},
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index d4dd647763d72..c0b26f639246c 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -541,7 +541,7 @@
 /area/awaymission/spacebattle/cruiser)
 "cD" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /turf/open/floor/iron/cafeteria,
 /area/awaymission/spacebattle/cruiser)
 "cE" = (
@@ -2355,7 +2355,7 @@
 /area/awaymission/spacebattle/cruiser)
 "oS" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/saltshaker,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/spacebattle/cruiser)
@@ -2405,7 +2405,7 @@
 /area/awaymission/spacebattle/syndicate5)
 "vH" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/condiment/peppermill,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/spacebattle/cruiser)
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 35f59016044c6..9f90e95d848f5 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -2754,7 +2754,7 @@
 "zn" = (
 /obj/structure/table,
 /obj/item/stack/package_wrap,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /turf/open/floor/iron/cafeteria{
 	dir = 5
 	},
@@ -2940,9 +2940,9 @@
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/crew_quarters)
 "zU" = (
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
 /obj/item/storage/fancy/egg_box,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/secure_closet/freezer{
@@ -3242,10 +3242,10 @@
 /area/awaymission/undergroundoutpost45/research)
 "AW" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
 /turf/open/floor/iron/cafeteria{
@@ -4242,7 +4242,7 @@
 "Eh" = (
 /obj/structure/table,
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/crew_quarters)
@@ -4604,7 +4604,7 @@
 "FB" = (
 /obj/structure/table,
 /obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/crew_quarters)
@@ -5471,11 +5471,11 @@
 	dir = 4
 	},
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 8;
 	pixel_y = 2
 	},
@@ -6118,7 +6118,7 @@
 /area/awaymission/undergroundoutpost45/engineering)
 "KM" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/crew_quarters)
@@ -6208,10 +6208,10 @@
 /area/awaymission/undergroundoutpost45/crew_quarters)
 "KZ" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -6228,7 +6228,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 4
 	},
@@ -6355,7 +6355,7 @@
 /area/awaymission/undergroundoutpost45/engineering)
 "Lu" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/crew_quarters)
@@ -7279,7 +7279,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 5
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -7954,7 +7954,7 @@
 /area/awaymission/undergroundoutpost45/gateway)
 "QS" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
 /turf/open/floor/carpet/grimy,
 /area/awaymission/undergroundoutpost45/central)
 "QT" = (
@@ -8874,7 +8874,7 @@
 /area/awaymission/undergroundoutpost45/caves)
 "TW" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/central)
 "TX" = (
@@ -8946,7 +8946,7 @@
 /obj/item/shovel/spade,
 /obj/item/wrench,
 /obj/item/screwdriver,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron/dark,
 /area/awaymission/undergroundoutpost45/central)
 "Up" = (
@@ -9805,9 +9805,9 @@
 	name = "kitchen Cabinet";
 	req_access_txt = "201"
 	},
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/cafeteria{
 	dir = 5
diff --git a/_maps/RuinGeneration/13x13_cafe.dmm b/_maps/RuinGeneration/13x13_cafe.dmm
index 9d2f9359829c4..e3e17df7d2887 100644
--- a/_maps/RuinGeneration/13x13_cafe.dmm
+++ b/_maps/RuinGeneration/13x13_cafe.dmm
@@ -148,11 +148,11 @@
 /obj/item/book/manual/wiki/barman_recipes{
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = 6;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_x = -3;
 	pixel_y = 2
 	},
diff --git a/_maps/RuinGeneration/13x13_corgrobotics.dmm b/_maps/RuinGeneration/13x13_corgrobotics.dmm
index e093c426f171c..d5776a3b5fbe2 100644
--- a/_maps/RuinGeneration/13x13_corgrobotics.dmm
+++ b/_maps/RuinGeneration/13x13_corgrobotics.dmm
@@ -315,8 +315,8 @@
 /obj/structure/table,
 /obj/item/stack/package_wrap,
 /obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
diff --git a/_maps/RuinGeneration/13x13_hilberttest.dmm b/_maps/RuinGeneration/13x13_hilberttest.dmm
index 4e1dec816fa19..43e6c52dc11ce 100644
--- a/_maps/RuinGeneration/13x13_hilberttest.dmm
+++ b/_maps/RuinGeneration/13x13_hilberttest.dmm
@@ -114,7 +114,7 @@
 /area/ruin/unpowered)
 "S" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/item/reagent_containers/cup/beaker/bluespace,
 /turf/open/floor/carpet/grimy{
 	icon_state = "engine"
 	},
diff --git a/_maps/RuinGeneration/13x13_listening_base.dmm b/_maps/RuinGeneration/13x13_listening_base.dmm
index 77b6075c3231d..1f1ae3eab42c3 100644
--- a/_maps/RuinGeneration/13x13_listening_base.dmm
+++ b/_maps/RuinGeneration/13x13_listening_base.dmm
@@ -119,11 +119,11 @@
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = -30
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -4;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 3;
 	pixel_y = 11
 	},
diff --git a/_maps/RuinGeneration/13x13_shotelroom.dmm b/_maps/RuinGeneration/13x13_shotelroom.dmm
index 9e11ccf71a09c..504683b88a164 100644
--- a/_maps/RuinGeneration/13x13_shotelroom.dmm
+++ b/_maps/RuinGeneration/13x13_shotelroom.dmm
@@ -19,7 +19,7 @@
 /area/ruin/unpowered)
 "d" = (
 /obj/structure/table/wood/fancy/purple,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
 	pixel_x = 2;
 	pixel_y = 7
 	},
@@ -163,7 +163,7 @@
 /area/ruin/unpowered)
 "J" = (
 /obj/structure/table/wood/fancy/purple,
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda{
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda{
 	pixel_x = -5;
 	pixel_y = 5
 	},
@@ -221,7 +221,7 @@
 	pixel_y = -1
 	},
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -8;
 	pixel_y = -1
 	},
@@ -259,7 +259,7 @@
 /area/ruin/unpowered)
 "Z" = (
 /obj/structure/table/wood/fancy/purple,
-/obj/item/reagent_containers/food/drinks/bottle/applejack{
+/obj/item/reagent_containers/cup/glass/bottle/applejack{
 	pixel_y = 2
 	},
 /turf/open/floor/carpet/orange,
diff --git a/_maps/RuinGeneration/13x17_permabrig.dmm b/_maps/RuinGeneration/13x17_permabrig.dmm
index c06af229e26eb..f74976dc55ce6 100644
--- a/_maps/RuinGeneration/13x17_permabrig.dmm
+++ b/_maps/RuinGeneration/13x17_permabrig.dmm
@@ -440,7 +440,7 @@
 /turf/open/floor/iron,
 /area/ruin/unpowered)
 "SX" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "TT" = (
diff --git a/_maps/RuinGeneration/13x9_medical.dmm b/_maps/RuinGeneration/13x9_medical.dmm
index 94ba7360af311..8369045cc4862 100644
--- a/_maps/RuinGeneration/13x9_medical.dmm
+++ b/_maps/RuinGeneration/13x9_medical.dmm
@@ -138,11 +138,11 @@
 /area/ruin/unpowered)
 "aJ" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 9;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 6;
 	pixel_y = 5
 	},
@@ -197,7 +197,7 @@
 /area/ruin/unpowered)
 "aR" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
 /obj/effect/spawner/lootdrop/ruinloot/medical,
 /obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
 /turf/open/floor/iron/white,
diff --git a/_maps/RuinGeneration/17x17_charliecrew.dmm b/_maps/RuinGeneration/17x17_charliecrew.dmm
index 74b4216144d02..c51fd1c848505 100644
--- a/_maps/RuinGeneration/17x17_charliecrew.dmm
+++ b/_maps/RuinGeneration/17x17_charliecrew.dmm
@@ -67,7 +67,7 @@
 	pixel_x = 7;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = -7
 	},
 /turf/open/floor/iron/white,
@@ -511,7 +511,7 @@
 /turf/open/floor/iron/white,
 /area/ruin/unpowered)
 "SR" = (
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /obj/structure/table,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 8
diff --git a/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm b/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm
index 74e52f9c81eb1..2f8351b7603f0 100644
--- a/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm
+++ b/_maps/RuinGeneration/5x5_4_room-janitor_closet.dmm
@@ -49,7 +49,7 @@
 /area/ruin/unpowered)
 "S" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/green/anticorner/contrasted{
 	dir = 8
 	},
diff --git a/_maps/RuinGeneration/9x13_kitchen.dmm b/_maps/RuinGeneration/9x13_kitchen.dmm
index 4e16f38b5494a..fe1c17c793242 100644
--- a/_maps/RuinGeneration/9x13_kitchen.dmm
+++ b/_maps/RuinGeneration/9x13_kitchen.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "b" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /obj/item/stack/package_wrap,
 /turf/open/floor/iron/cafeteria,
 /area/ruin/unpowered)
@@ -11,7 +11,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 5
 	},
 /turf/open/floor/iron/cafeteria,
@@ -41,10 +41,10 @@
 /area/ruin/unpowered)
 "m" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
 /turf/open/floor/iron/cafeteria,
diff --git a/_maps/RuinGeneration/9x13_vault.dmm b/_maps/RuinGeneration/9x13_vault.dmm
index 1bb78b9a506c8..1b7a3c2ac5c48 100644
--- a/_maps/RuinGeneration/9x13_vault.dmm
+++ b/_maps/RuinGeneration/9x13_vault.dmm
@@ -104,7 +104,7 @@
 /obj/item/paper{
 	default_raw_text = "IOU - One Very Cool Revolver (Thanks HOP)"
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/unpowered)
diff --git a/_maps/RuinGeneration/9x9_chemlab.dmm b/_maps/RuinGeneration/9x9_chemlab.dmm
index 413060bdf953f..f2b99cee7a3c9 100644
--- a/_maps/RuinGeneration/9x9_chemlab.dmm
+++ b/_maps/RuinGeneration/9x9_chemlab.dmm
@@ -250,11 +250,11 @@
 /area/ruin)
 "JC" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -6;
 	pixel_y = 2
 	},
@@ -277,11 +277,11 @@
 /area/ruin)
 "Rt" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -2;
 	pixel_y = 1
 	},
diff --git a/_maps/arenas/bar.dmm b/_maps/arenas/bar.dmm
index 18942cc5a4b78..d16e9c1c60cef 100644
--- a/_maps/arenas/bar.dmm
+++ b/_maps/arenas/bar.dmm
@@ -8,10 +8,10 @@
 /area/tdome/arena)
 "w" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -76,8 +76,8 @@
 /area/tdome/arena)
 "L" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = -5
 	},
 /obj/structure/sign/plaques/deempisi{
diff --git a/_maps/arenas/beach.dmm b/_maps/arenas/beach.dmm
index 5cca3a6b01b76..aa1a0a33ba94b 100644
--- a/_maps/arenas/beach.dmm
+++ b/_maps/arenas/beach.dmm
@@ -11,7 +11,7 @@
 /turf/open/floor/plating/beach/sand,
 /area/tdome/arena)
 "c" = (
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	list_reagents = list(/datum/reagent/consumable/cooking_oil = 50)
 	},
 /turf/open/floor/plating/beach/sand,
@@ -35,7 +35,7 @@
 /turf/open/floor/wood,
 /area/tdome/arena)
 "h" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy,
 /turf/open/floor/plating/beach/sand,
 /area/tdome/arena)
 "i" = (
@@ -65,17 +65,17 @@
 /area/tdome/arena)
 "n" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
 /turf/open/floor/wood,
 /area/tdome/arena)
 "o" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium,
 /turf/open/floor/wood,
 /area/tdome/arena)
 "p" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/tequila,
+/obj/item/reagent_containers/cup/glass/bottle/tequila,
 /turf/open/floor/wood,
 /area/tdome/arena)
 "q" = (
diff --git a/_maps/arenas/survival pod.dmm b/_maps/arenas/survival pod.dmm
index d41f152cf8017..8c1dbf965cc32 100644
--- a/_maps/arenas/survival pod.dmm	
+++ b/_maps/arenas/survival pod.dmm	
@@ -60,11 +60,11 @@
 /area/tdome/arena)
 "m" = (
 /obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 7;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
 	pixel_x = -6;
 	pixel_y = 10
 	},
@@ -126,7 +126,7 @@
 /area/tdome/arena)
 "v" = (
 /obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 7;
 	pixel_y = 2
 	},
diff --git a/_maps/holodeck/beach.dmm b/_maps/holodeck/beach.dmm
index 75a7272ee144d..5586e76354940 100644
--- a/_maps/holodeck/beach.dmm
+++ b/_maps/holodeck/beach.dmm
@@ -19,7 +19,7 @@
 /turf/open/floor/holofloor/beach/coast_b,
 /area/template_noop)
 "q" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/holofloor/beach/coast_t,
 /area/template_noop)
 "t" = (
diff --git a/_maps/holodeck/lounge.dmm b/_maps/holodeck/lounge.dmm
index 6c1c58f31c284..4b649704e4cd2 100644
--- a/_maps/holodeck/lounge.dmm
+++ b/_maps/holodeck/lounge.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /obj/structure/table/wood/bar,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_x = 10;
 	pixel_y = 1
 	},
@@ -51,7 +51,7 @@
 /area/template_noop)
 "i" = (
 /obj/structure/table/wood/bar,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/holofloor{
 	dir = 9;
 	icon_state = "wood"
diff --git a/_maps/holodeck/medicalsim.dmm b/_maps/holodeck/medicalsim.dmm
index 839b01f7cf3d7..2901a1e9491da 100644
--- a/_maps/holodeck/medicalsim.dmm
+++ b/_maps/holodeck/medicalsim.dmm
@@ -12,7 +12,7 @@
 /area/template_noop)
 "dl" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 1
 	},
@@ -528,9 +528,9 @@
 /area/template_noop)
 "SF" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/cup/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
 	dir = 1
 	},
diff --git a/_maps/holodeck/petpark.dmm b/_maps/holodeck/petpark.dmm
index b6b940daa6038..2b530ce0c51ec 100644
--- a/_maps/holodeck/petpark.dmm
+++ b/_maps/holodeck/petpark.dmm
@@ -118,7 +118,7 @@
 /turf/open/floor/holofloor/grass,
 /area/template_noop)
 "X" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/holofloor/grass,
 /area/template_noop)
 
diff --git a/_maps/holodeck/small/beach.dmm b/_maps/holodeck/small/beach.dmm
index 6fec9185b3218..4a44f826bef65 100644
--- a/_maps/holodeck/small/beach.dmm
+++ b/_maps/holodeck/small/beach.dmm
@@ -9,7 +9,7 @@
 /turf/open/floor/holofloor/carpet,
 /area/template_noop)
 "v" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/shovel/spade,
 /turf/open/floor/holofloor/beach/coast_t,
 /area/template_noop)
diff --git a/_maps/holodeck/small/kitchen.dmm b/_maps/holodeck/small/kitchen.dmm
index c1122e4f4101a..1e6058f1eb543 100644
--- a/_maps/holodeck/small/kitchen.dmm
+++ b/_maps/holodeck/small/kitchen.dmm
@@ -43,7 +43,7 @@
 /area/template_noop)
 "p" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 1
 	},
@@ -153,7 +153,7 @@
 	pixel_x = 5;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = -6;
 	pixel_y = 4
 	},
@@ -169,7 +169,7 @@
 /area/template_noop)
 "Q" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -6;
 	pixel_y = 19
 	},
diff --git a/_maps/holodeck/small/lounge.dmm b/_maps/holodeck/small/lounge.dmm
index cb3c53c73486f..3f06ba54ff401 100644
--- a/_maps/holodeck/small/lounge.dmm
+++ b/_maps/holodeck/small/lounge.dmm
@@ -28,7 +28,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = 4
 	},
 /obj/item/book/manual/wiki/barman_recipes{
@@ -42,7 +42,7 @@
 /area/template_noop)
 "i" = (
 /obj/structure/table/wood/bar,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_x = 10;
 	pixel_y = 1
 	},
diff --git a/_maps/holodeck/small/medicalsim.dmm b/_maps/holodeck/small/medicalsim.dmm
index 6777e297407cf..d842508f4e86c 100644
--- a/_maps/holodeck/small/medicalsim.dmm
+++ b/_maps/holodeck/small/medicalsim.dmm
@@ -311,22 +311,22 @@
 /area/template_noop)
 "Ky" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 10;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 4;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 5;
 	pixel_y = 11
 	},
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
 	dir = 1
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -7;
 	pixel_y = 3
 	},
diff --git a/_maps/holodeck/small/petpark.dmm b/_maps/holodeck/small/petpark.dmm
index 227532eb51acf..2371eb8400ba3 100644
--- a/_maps/holodeck/small/petpark.dmm
+++ b/_maps/holodeck/small/petpark.dmm
@@ -86,7 +86,7 @@
 /area/template_noop)
 "O" = (
 /obj/machinery/hydroponics/soil,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/holofloor/grass,
 /area/template_noop)
 "R" = (
diff --git a/_maps/holodeck/small/teahouse.dmm b/_maps/holodeck/small/teahouse.dmm
index d74ce697bc0ad..fc4a94f202fe1 100644
--- a/_maps/holodeck/small/teahouse.dmm
+++ b/_maps/holodeck/small/teahouse.dmm
@@ -24,12 +24,12 @@
 /area/template_noop)
 "g" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	icon_state = "sakecup";
 	pixel_x = -8;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	icon_state = "sakecup";
 	pixel_x = 8;
 	pixel_y = 3
@@ -47,9 +47,9 @@
 	dir = 8
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
 /turf/open/floor/holofloor{
 	dir = 9;
 	icon_state = "wood"
diff --git a/_maps/holodeck/workshop/donut.dmm b/_maps/holodeck/workshop/donut.dmm
index 16c4d478c545a..e8d69760d79e5 100644
--- a/_maps/holodeck/workshop/donut.dmm
+++ b/_maps/holodeck/workshop/donut.dmm
@@ -10,8 +10,8 @@
 /obj/item/stack/package_wrap,
 /obj/item/stack/package_wrap,
 /obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/holofloor/monotile/steel,
 /area/template_noop)
 "f" = (
@@ -47,11 +47,11 @@
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/dark_blue/fourcorners,
 /obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
@@ -126,20 +126,20 @@
 /area/template_noop)
 "I" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -9;
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
 /turf/open/floor/holofloor/monotile/steel,
 /area/template_noop)
 "J" = (
@@ -177,7 +177,7 @@
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/dark_blue/fourcorners,
 /obj/item/toy/figure/chef,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
@@ -225,12 +225,12 @@
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/dark_blue/fourcorners,
 /obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/milk,
-/obj/item/reagent_containers/food/condiment/soymilk,
-/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/milk,
+/obj/item/reagent_containers/condiment/soymilk,
+/obj/item/reagent_containers/condiment/soymilk,
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/holofloor/monotile/steel,
 /area/template_noop)
diff --git a/_maps/holodeck/workshop/plush.dmm b/_maps/holodeck/workshop/plush.dmm
index 4a7693aece527..1e1a1e7563a86 100644
--- a/_maps/holodeck/workshop/plush.dmm
+++ b/_maps/holodeck/workshop/plush.dmm
@@ -78,7 +78,7 @@
 /area/template_noop)
 "L" = (
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/dark_green/fourcorners,
 /turf/open/floor/holofloor/monotile/steel,
 /area/template_noop)
@@ -121,9 +121,9 @@
 "W" = (
 /obj/structure/closet/crate,
 /obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
 /obj/effect/turf_decal/tile/dark_green/fourcorners,
 /turf/open/floor/holofloor/monotile/steel,
 /area/template_noop)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 28b7c753deaa7..fe6294641882a 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -1894,7 +1894,7 @@
 /obj/structure/closet,
 /obj/effect/landmark/blobstart,
 /obj/effect/spawner/lootdrop/maintenance,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "aAC" = (
@@ -3299,7 +3299,7 @@
 "aQh" = (
 /obj/structure/table/wood,
 /obj/item/food/chips,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
@@ -3938,7 +3938,7 @@
 "aVW" = (
 /obj/structure/table/wood,
 /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -5;
 	pixel_y = 9
 	},
@@ -5041,7 +5041,7 @@
 /area/medical/medbay/central)
 "bhi" = (
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
@@ -8589,11 +8589,11 @@
 /obj/item/stack/sheet/mineral/plasma{
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -10842,21 +10842,21 @@
 /area/engine/atmos)
 "ccO" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = -4;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = 5;
 	pixel_y = 1
 	},
 /obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
 	name = "fluorosulfuric acid bottle";
 	pixel_x = -3;
 	pixel_y = 6
@@ -13777,7 +13777,7 @@
 /obj/item/storage/fancy/cigarettes/cigpack_robust{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 2;
 	pixel_y = 3
 	},
@@ -15979,7 +15979,7 @@
 "daL" = (
 /obj/structure/table/wood,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
 /turf/open/floor/carpet/grimy,
 /area/chapel/office)
 "daM" = (
@@ -18951,7 +18951,7 @@
 /obj/item/hatchet,
 /obj/item/crowbar,
 /obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/green/half/contrasted,
 /turf/open/floor/iron,
 /area/hydroponics/garden)
@@ -20659,12 +20659,12 @@
 /area/crew_quarters/kitchen)
 "eSA" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = 4
 	},
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 5
 	},
 /turf/open/floor/prison,
@@ -24325,7 +24325,7 @@
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 7;
 	pixel_y = 10
 	},
@@ -24923,7 +24923,7 @@
 	dir = 8
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron,
 /area/hydroponics)
 "gDB" = (
@@ -25184,7 +25184,7 @@
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 6
 	},
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine{
 	pixel_x = 6;
 	pixel_y = 5
 	},
@@ -28246,7 +28246,7 @@
 /area/maintenance/port/aft)
 "hYo" = (
 /obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/machinery/light_switch{
 	pixel_x = 28
 	},
@@ -29032,7 +29032,7 @@
 	pixel_x = -1;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 9;
 	pixel_y = 3
 	},
@@ -29598,11 +29598,11 @@
 "iwV" = (
 /obj/structure/safe,
 /obj/item/clothing/head/costume/bearpelt,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
 /obj/item/gun/ballistic/revolver/russian,
 /obj/item/ammo_box/a357,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
 /obj/effect/turf_decal/bot_white/left,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron/dark,
@@ -30451,11 +30451,11 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 6;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/item/toy/cards/deck{
 	pixel_x = -10;
 	pixel_y = 6
@@ -31442,7 +31442,7 @@
 	},
 /obj/effect/turf_decal/bot,
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/sign/poster/contraband/missing_gloves{
 	pixel_x = -32
 	},
@@ -32212,7 +32212,7 @@
 /obj/structure/table/wood/fancy,
 /obj/item/soulstone/anybody/chaplain,
 /obj/item/organ/heart,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
 /obj/item/book/granter/spell/smoke/lesser,
 /turf/open/floor/iron/dark,
 /area/chapel/office)
@@ -35777,7 +35777,7 @@
 /obj/item/pen/charcoal{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = -8;
 	pixel_y = 3
 	},
@@ -37077,15 +37077,15 @@
 /turf/open/floor/carpet/royalblue,
 /area/crew_quarters/bar/atrium)
 "loD" = (
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 7;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 7;
 	pixel_y = 1
 	},
@@ -37098,7 +37098,7 @@
 /obj/item/hatchet,
 /obj/item/cultivator,
 /obj/item/crowbar,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/plant_analyzer,
 /obj/machinery/firealarm{
 	dir = 4;
@@ -37576,81 +37576,81 @@
 /turf/open/floor/iron,
 /area/hallway/primary/central)
 "lAN" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/structure/closet/crate/medical,
@@ -37712,7 +37712,7 @@
 /turf/open/floor/iron,
 /area/security/checkpoint/science)
 "lBV" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/reagent_dispensers/watertank/high,
 /obj/effect/turf_decal/tile/dark_green/half/contrasted,
 /turf/open/floor/iron,
@@ -38157,7 +38157,7 @@
 /obj/item/knife,
 /obj/item/paint/green,
 /obj/item/pushbroom,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron,
 /area/hallway/secondary/service)
 "lMW" = (
@@ -40938,7 +40938,7 @@
 	pixel_y = 5
 	},
 /obj/item/folder/blue,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = -8;
 	pixel_y = 3
 	},
@@ -41821,11 +41821,11 @@
 /area/bridge)
 "nvZ" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 8;
 	pixel_y = 2
 	},
@@ -44297,7 +44297,7 @@
 "owA" = (
 /obj/structure/closet/crate/hydroponics,
 /obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/storage/toolbox/mechanical{
 	pixel_x = -4;
 	pixel_y = 4
@@ -46280,7 +46280,7 @@
 	dir = 1
 	},
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/machinery/light{
 	bulb_colour = "#22bfa2";
 	bulb_vacuum_colour = "#22bfa2";
@@ -51366,7 +51366,7 @@
 	pixel_y = 5
 	},
 /obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
 /turf/open/floor/carpet/green,
 /area/security/detectives_office)
 "rpN" = (
@@ -52187,7 +52187,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port)
 "rEo" = (
-/obj/item/reagent_containers/glass/bottle/salglu_solution{
+/obj/item/reagent_containers/cup/bottle/salglu_solution{
 	pixel_x = -8;
 	pixel_y = 10
 	},
@@ -52203,7 +52203,7 @@
 	pixel_y = 6;
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -8;
 	pixel_y = 3
 	},
@@ -53074,7 +53074,7 @@
 	pixel_x = -1;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = 13;
 	pixel_y = 17
 	},
@@ -53712,8 +53712,8 @@
 	pixel_x = 3;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
 	pixel_x = 2;
 	pixel_y = 1
 	},
@@ -54691,7 +54691,7 @@
 /obj/item/stack/sheet/mineral/copper{
 	amount = 5
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/storage/toolbox/drone,
 /obj/effect/turf_decal/tile/dark_green/half/contrasted{
 	dir = 4
@@ -55473,7 +55473,7 @@
 	pixel_x = 2;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/item/stack/sheet/mineral/copper{
 	amount = 5
 	},
@@ -55782,10 +55782,10 @@
 "sYk" = (
 /obj/structure/table,
 /obj/item/gps/mining/exploration,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 9;
 	pixel_y = -3
 	},
@@ -61531,11 +61531,11 @@
 /area/maintenance/starboard/fore)
 "vpf" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -9;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -9
 	},
 /obj/item/storage/box/papersack{
@@ -61867,7 +61867,7 @@
 /area/maintenance/starboard/fore)
 "vuz" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/item/kitchen/fork,
 /turf/open/floor/prison,
 /area/security/prison)
@@ -64000,11 +64000,11 @@
 "wlD" = (
 /obj/structure/table,
 /obj/machinery/light,
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = -6;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 8
 	},
 /obj/structure/sign/poster/official/random{
@@ -64510,9 +64510,9 @@
 /area/engine/atmos)
 "wwq" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
 /obj/structure/noticeboard{
 	pixel_y = 29
 	},
@@ -65303,7 +65303,7 @@
 /turf/open/floor/iron/dark,
 /area/security/main)
 "wMF" = (
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
 	pixel_x = 6;
 	pixel_y = -2
 	},
@@ -65518,7 +65518,7 @@
 "wSz" = (
 /obj/item/paper,
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 1
 	},
@@ -65707,7 +65707,7 @@
 	dir = 1
 	},
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron,
 /area/hydroponics)
 "wWP" = (
@@ -66478,23 +66478,23 @@
 /area/quartermaster/sorting)
 "xnm" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 2;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 9;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index b6f84a728c576..f4625672bfb67 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -1327,7 +1327,7 @@
 "anV" = (
 /obj/structure/table/glass,
 /obj/item/candle,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = -7;
 	pixel_y = 10
 	},
@@ -1924,7 +1924,7 @@
 /obj/machinery/requests_console{
 	pixel_x = 32
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 4;
 	pixel_y = -1
 	},
@@ -6678,19 +6678,19 @@
 "bSa" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 9;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -2;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 6;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -5;
 	pixel_y = 5
 	},
@@ -9661,7 +9661,7 @@
 	pixel_x = -1;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
@@ -9809,7 +9809,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
@@ -10857,7 +10857,7 @@
 	pixel_y = -2
 	},
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/green/anticorner/contrasted{
 	dir = 1
 	},
@@ -11990,9 +11990,9 @@
 	dir = 6
 	},
 /obj/structure/rack,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron/dark,
 /area/science/robotics/lab)
 "dLE" = (
@@ -13438,7 +13438,7 @@
 	id = "medical_shutters";
 	name = "medical Shutters"
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/machinery/door/window/northleft{
 	dir = 4;
 	name = "medbay Interior";
@@ -15104,7 +15104,7 @@
 /area/engine/engine_room)
 "eOo" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/item/stack/spacecash/c10,
 /obj/item/stack/spacecash/c100{
 	pixel_x = -1;
@@ -16943,10 +16943,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3;
 	pixel_y = -1
 	},
@@ -18058,7 +18058,7 @@
 /area/hydroponics)
 "fLK" = (
 /obj/structure/closet/crate,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
 /obj/item/storage/fancy/egg_box,
 /obj/item/storage/fancy/egg_box,
 /turf/open/floor/plating,
@@ -18366,11 +18366,11 @@
 /area/security/checkpoint/supply)
 "fQu" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_x = -5;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 5;
 	pixel_y = 10
 	},
@@ -19719,9 +19719,9 @@
 /area/science/lab)
 "goL" = (
 /obj/structure/closet/crate,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "goM" = (
@@ -24890,7 +24890,7 @@
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
 "hVH" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/assembly/prox_sensor,
 /obj/item/mop,
 /obj/item/bodypart/r_arm/robot,
@@ -24921,7 +24921,7 @@
 /area/medical/virology)
 "hWu" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
@@ -25713,8 +25713,8 @@
 /obj/structure/table/glass,
 /obj/item/storage/bag/plants/portaseeder,
 /obj/item/storage/bag/plants/portaseeder,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
 /turf/open/floor/grass,
 /area/hydroponics/garden)
 "iiO" = (
@@ -26858,7 +26858,7 @@
 /area/engine/atmos)
 "izd" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -4;
 	pixel_y = 2
 	},
@@ -27157,7 +27157,7 @@
 /area/science/nanite)
 "iEL" = (
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/hydroponics)
@@ -28112,11 +28112,11 @@
 /area/science/xenobiology)
 "iXf" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 3;
 	pixel_y = 4
 	},
@@ -30030,7 +30030,7 @@
 /area/maintenance/fore)
 "jDX" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /turf/open/floor/prison/dark,
 /area/security/prison)
 "jEd" = (
@@ -30629,11 +30629,11 @@
 "jOn" = (
 /obj/structure/table/reinforced,
 /obj/item/book/manual/wiki/cooking_to_serve_man,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/saltshaker,
+/obj/item/reagent_containers/condiment/sugar,
 /obj/effect/turf_decal/tile/red,
 /turf/open/floor/iron/white,
 /area/crew_quarters/kitchen)
@@ -32236,7 +32236,7 @@
 	dir = 1
 	},
 /obj/machinery/airalarm/directional/north,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/green/anticorner/contrasted{
 	dir = 1
 	},
@@ -32976,8 +32976,8 @@
 /obj/structure/table,
 /obj/item/stack/package_wrap,
 /obj/item/stack/package_wrap,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
@@ -33945,7 +33945,7 @@
 /turf/open/floor/iron/white,
 /area/medical/medbay/lobby)
 "kTr" = (
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	pixel_x = 10
 	},
 /obj/structure/table,
@@ -34535,7 +34535,7 @@
 /area/teleporter)
 "lcN" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/syringe/epinephrine,
 /obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
 /turf/open/floor/iron/white,
@@ -37862,11 +37862,11 @@
 /area/maintenance/starboard/aft)
 "mfc" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
 	pixel_x = 2;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
 	pixel_x = -3;
 	pixel_y = 4
 	},
@@ -39171,11 +39171,11 @@
 /area/security/prison)
 "mxF" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8;
 	pixel_y = 4
 	},
@@ -41932,7 +41932,7 @@
 /area/janitor)
 "ntl" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -8;
 	pixel_y = 8
 	},
@@ -43069,10 +43069,10 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3;
 	pixel_y = -1
 	},
@@ -43364,7 +43364,7 @@
 /area/medical/surgery)
 "nPW" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -1;
 	pixel_y = 4
 	},
@@ -44149,7 +44149,7 @@
 /area/maintenance/starboard/aft)
 "ods" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 4;
 	pixel_y = 10
 	},
@@ -45396,15 +45396,15 @@
 /area/science/shuttle)
 "ozd" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
 	pixel_x = -1;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh{
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh{
 	pixel_x = -7;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 6;
 	pixel_y = 4
 	},
@@ -46813,11 +46813,11 @@
 /area/science/xenobiology)
 "paH" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = -2;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 2;
 	pixel_y = 4
 	},
@@ -50792,7 +50792,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
 /obj/effect/turf_decal/tile/red/fourcorners/contrasted,
 /turf/open/floor/iron/white,
 /area/crew_quarters/kitchen)
@@ -53833,23 +53833,23 @@
 /area/hallway/primary/aft)
 "rup" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 2;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 9;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
@@ -54567,11 +54567,11 @@
 /area/hallway/primary/central)
 "rGa" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -2;
 	pixel_y = 1
 	},
@@ -55350,7 +55350,7 @@
 /area/crew_quarters/fitness/recreation)
 "rUv" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -9;
 	pixel_y = 4
 	},
@@ -55708,15 +55708,15 @@
 /area/engine/atmos)
 "sac" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 2;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 5;
 	pixel_y = 1
 	},
@@ -55938,11 +55938,11 @@
 	pixel_y = -1;
 	pixel_x = -7
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 8;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 3;
 	pixel_y = 1
 	},
@@ -56329,7 +56329,7 @@
 /area/science/robotics/lab)
 "skk" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = -2;
 	pixel_y = 13
 	},
@@ -56348,10 +56348,10 @@
 /area/security/prison)
 "sks" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
@@ -56581,81 +56581,81 @@
 /turf/open/floor/iron/white/corner,
 /area/science/research)
 "sou" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/structure/closet/crate/medical,
@@ -57533,7 +57533,7 @@
 /area/crew_quarters/heads/chief)
 "sDy" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 6;
 	pixel_y = 6
 	},
@@ -57789,11 +57789,11 @@
 	name = "Hydroponics Desk";
 	req_access_txt = "35"
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = -1;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 3;
 	pixel_y = 3
 	},
@@ -59645,9 +59645,9 @@
 	dir = 8
 	},
 /obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/rag,
 /obj/effect/turf_decal/tile/red/opposingcorners{
 	dir = 1
 	},
@@ -60253,16 +60253,16 @@
 "tzW" = (
 /obj/structure/table/reinforced,
 /obj/item/book/manual/wiki/cooking_to_serve_man,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/condiment/peppermill,
 /obj/machinery/requests_console{
 	department = "Kitchen";
 	departmentType = 2;
 	pixel_y = -32
 	},
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
 /obj/effect/turf_decal/tile/red,
 /turf/open/floor/iron/white,
 /area/crew_quarters/kitchen)
@@ -61113,15 +61113,15 @@
 /area/engine/atmos)
 "tNf" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing{
+/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing{
 	pixel_x = 4;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -4;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 6
 	},
@@ -61954,7 +61954,7 @@
 /area/hallway/primary/aft)
 "ucp" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -4;
 	pixel_y = 2
 	},
@@ -62341,11 +62341,11 @@
 	pixel_x = -8;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 8;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 8;
 	pixel_y = 6
 	},
@@ -64173,11 +64173,11 @@
 /area/quartermaster/warehouse)
 "uLg" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8;
 	pixel_y = 5
 	},
@@ -65527,7 +65527,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/syringe/epinephrine{
 	pixel_x = -1;
 	pixel_y = -1
@@ -67301,7 +67301,7 @@
 /obj/structure/desk_bell{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 9;
 	pixel_y = -3
 	},
@@ -67647,7 +67647,7 @@
 /area/crew_quarters/heads/chief)
 "vOe" = (
 /obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
 	pixel_x = -1;
 	pixel_y = 9
 	},
@@ -69455,10 +69455,10 @@
 	pixel_y = -30
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3;
 	pixel_y = -1
 	},
@@ -70154,10 +70154,10 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3;
 	pixel_y = -1
 	},
@@ -70679,11 +70679,11 @@
 	pixel_y = 32
 	},
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -6;
 	pixel_y = 2
 	},
@@ -73569,9 +73569,9 @@
 "xNY" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
@@ -74073,23 +74073,23 @@
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_y = 2;
 	pixel_x = 11
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_y = 2;
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_y = 13;
 	pixel_x = 11
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_y = 13;
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
 	pixel_x = -8;
 	pixel_y = 7
 	},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index ecfb0f5238116..7697c861abef1 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1221,11 +1221,11 @@
 /area/maintenance/starboard/fore)
 "ajQ" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
 /obj/effect/turf_decal/delivery,
@@ -3646,7 +3646,7 @@
 /area/engine/atmospherics_engine)
 "axJ" = (
 /obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
@@ -5265,7 +5265,7 @@
 /obj/effect/turf_decal/bot,
 /obj/item/plate/small,
 /obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 5;
 	pixel_x = -4
 	},
@@ -7453,8 +7453,8 @@
 	dir = 8;
 	pixel_x = -12
 	},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/mop,
 /obj/item/mop,
@@ -8071,7 +8071,7 @@
 	dir = 1;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/hydroponics)
@@ -8345,7 +8345,7 @@
 "bdq" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/structure/window/reinforced,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /obj/structure/sign/poster/official/nanotrasen_logo{
 	pixel_x = -32
@@ -8817,7 +8817,7 @@
 /obj/structure/table/reinforced,
 /obj/item/storage/bag/tray,
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
 /turf/open/floor/iron,
 /area/crew_quarters/kitchen)
 "bgt" = (
@@ -8977,7 +8977,7 @@
 /area/engine/atmos)
 "bhy" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -8986,7 +8986,7 @@
 /area/hydroponics)
 "bhz" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -9621,11 +9621,11 @@
 /area/crew_quarters/kitchen)
 "blA" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
 /obj/item/knife/kitchen,
@@ -14392,8 +14392,8 @@
 	receive_ore_updates = 1
 	},
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron/dark,
 /area/crew_quarters/bar)
@@ -15915,7 +15915,7 @@
 	},
 /obj/item/clothing/mask/cigarette/cigar,
 /obj/item/clothing/glasses/hud/security/sunglasses,
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
 /turf/open/floor/carpet/red,
 /area/security/detectives_office)
 "ceQ" = (
@@ -16144,7 +16144,7 @@
 	name = "Captain's Intercom";
 	pixel_x = -26
 	},
-/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/item/reagent_containers/cup/glass/flask/gold,
 /obj/item/razor,
 /turf/open/floor/carpet/royalblue,
 /area/crew_quarters/heads/captain/private)
@@ -16529,7 +16529,7 @@
 "ciH" = (
 /obj/item/paper,
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 1
 	},
@@ -19178,10 +19178,10 @@
 /area/crew_quarters/locker)
 "cxs" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/syringe,
 /turf/open/floor/iron,
 /area/medical/medbay/lobby)
@@ -20337,7 +20337,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /turf/open/floor/carpet/blue,
 /area/bridge/showroom/corporate)
 "cCZ" = (
@@ -21944,8 +21944,8 @@
 "cKS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
 /obj/item/reagent_containers/dropper,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
@@ -23500,8 +23500,8 @@
 /obj/item/stack/sheet/mineral/plasma{
 	amount = 5
 	},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
 /obj/item/reagent_containers/dropper,
 /obj/machinery/light{
 	dir = 4
@@ -25339,8 +25339,8 @@
 "dkc" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/white,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
 /obj/item/reagent_containers/dropper,
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
@@ -32975,7 +32975,7 @@
 "eFd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "eFj" = (
@@ -34192,12 +34192,12 @@
 /area/medical/chemistry)
 "eZt" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = 4
 	},
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/tile/red/half/contrasted{
@@ -34848,10 +34848,10 @@
 /obj/item/stack/sheet/mineral/plasma,
 /obj/item/stack/sheet/mineral/plasma,
 /obj/item/stack/sheet/mineral/plasma,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/dropper,
 /obj/item/storage/box/beakers{
 	pixel_x = -5;
@@ -36166,81 +36166,81 @@
 /turf/open/floor/catwalk_floor/flat_white,
 /area/science/mixing)
 "fHD" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/structure/closet/crate/medical,
@@ -40064,20 +40064,20 @@
 /area/crew_quarters/heads/captain)
 "gOU" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -6;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 6;
 	pixel_y = 6
 	},
 /obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -2;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 5;
 	pixel_y = 9
 	},
@@ -40353,7 +40353,7 @@
 	pixel_x = -1;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 9;
 	pixel_y = 3
 	},
@@ -41612,7 +41612,7 @@
 /area/crew_quarters/locker)
 "hlk" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/reagent_containers/cup/glass/coffee,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/effect/turf_decal/tile/yellow/opposingcorners{
 	dir = 1
@@ -42756,7 +42756,7 @@
 /area/medical/virology)
 "hGh" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/effect/turf_decal/tile/yellow/opposingcorners{
 	dir = 1
@@ -43859,7 +43859,7 @@
 "hVg" = (
 /obj/structure/table/wood/fancy,
 /obj/item/organ/heart,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
 /obj/item/soulstone/anybody/chaplain,
 /obj/item/book/granter/spell/smoke/lesser,
 /turf/open/floor/carpet/grimy,
@@ -43989,8 +43989,8 @@
 /obj/machinery/reagentgrinder{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -45808,7 +45808,7 @@
 /area/hallway/primary/central)
 "iBx" = (
 /obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
 	desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
 	name = "Carton of Estus"
 	},
@@ -46794,7 +46794,7 @@
 /area/storage/primary)
 "iVm" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko,
 /obj/machinery/firealarm{
 	dir = 4;
 	pixel_x = -24
@@ -49691,7 +49691,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /obj/effect/mapping_helpers/dead_body_placer,
 /turf/open/floor/iron,
 /area/medical/morgue)
@@ -59961,7 +59961,7 @@
 /area/quartermaster/storage)
 "nkq" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /obj/machinery/camera/directional/east{
 	c_tag = "Science - Break Room";
 	name = "science camera"
@@ -60951,7 +60951,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/structure/rack,
 /obj/item/clothing/head/utility/chefhat,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /turf/open/floor/iron,
 /area/crew_quarters/kitchen)
 "nze" = (
@@ -63046,7 +63046,7 @@
 /area/science/research)
 "ohm" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/effect/turf_decal/tile/yellow/opposingcorners{
 	dir = 1
@@ -69385,23 +69385,23 @@
 /area/science/xenobiology)
 "qnP" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 2;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 9;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
@@ -70652,7 +70652,7 @@
 /area/maintenance/starboard/aft)
 "qHA" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/item/kitchen/fork,
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 1
@@ -72286,7 +72286,7 @@
 /area/quartermaster/office)
 "rhP" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/effect/turf_decal/tile/yellow/opposingcorners{
 	dir = 1
@@ -72649,12 +72649,12 @@
 	pixel_y = 2
 	},
 /obj/machinery/vending/wallmed{
-	contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+	contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
 	name = "Upgraded NanoMed";
 	pixel_x = -1;
 	pixel_y = -32;
 	premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
-	products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+	products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
 	},
 /obj/item/reagent_containers/dropper{
 	pixel_x = 2;
@@ -74315,11 +74315,11 @@
 /turf/open/floor/iron,
 /area/science/research)
 "rMB" = (
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
 /obj/structure/table/wood,
@@ -76470,7 +76470,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "stW" = (
@@ -77040,7 +77040,7 @@
 /area/security/execution/transfer)
 "sCM" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/effect/turf_decal/tile/yellow/opposingcorners{
@@ -79041,17 +79041,17 @@
 	pixel_x = 25
 	},
 /obj/item/paper_bin,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
 /turf/open/floor/iron/white,
 /area/medical/medbay/central)
 "tku" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = 7;
 	pixel_y = -1
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = -7;
 	pixel_y = 5
 	},
@@ -79725,14 +79725,14 @@
 	name = "Kitchen Counter Shutters"
 	},
 /obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/crew_quarters/kitchen)
@@ -80530,7 +80530,7 @@
 "tHG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/maintenance/department/medical/central)
 "tHM" = (
@@ -83622,7 +83622,7 @@
 /obj/structure/sign/warning/nosmoking{
 	pixel_x = 32
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -84717,7 +84717,7 @@
 "vbA" = (
 /obj/structure/table/glass,
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = 7;
 	pixel_y = 17
 	},
@@ -84729,7 +84729,7 @@
 	pixel_x = -6;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 9;
 	pixel_y = 7
 	},
@@ -85635,7 +85635,7 @@
 /obj/item/folder/yellow,
 /obj/item/pen,
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -85998,7 +85998,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /turf/open/floor/iron/white,
 /area/janitor/custodian)
@@ -86732,15 +86732,15 @@
 /area/bridge)
 "vHo" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -3;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	desc = "Whatever it is, it reeks of foul, putrid froth.";
 	list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 15);
 	name = "Delta-Down";
@@ -93220,10 +93220,10 @@
 /area/medical/patients_rooms)
 "xDQ" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/syringe,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/firedoor,
@@ -94858,21 +94858,21 @@
 /area/crew_quarters/bar/atrium)
 "ydf" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = -4;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = 5;
 	pixel_y = 1
 	},
 /obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
 	name = "fluorosulfuric acid bottle";
 	pixel_x = -3;
 	pixel_y = 6
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index 8fd32c55f820a..b9cf308678185 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -3174,7 +3174,7 @@
 	pixel_x = -6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 4;
 	pixel_y = -5
 	},
@@ -3324,7 +3324,7 @@
 	pixel_x = -1;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	desc = "Kingston's personal cup.";
 	pixel_x = 16
 	},
@@ -4709,10 +4709,10 @@
 /area/quartermaster/storage)
 "cbu" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_y = 25
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 21
 	},
 /obj/effect/turf_decal/siding/wood,
@@ -6649,7 +6649,7 @@
 /obj/machinery/status_display/evac{
 	pixel_y = -32
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/maintenance/department/medical/morgue)
@@ -9953,7 +9953,7 @@
 /area/engine/atmos)
 "eNg" = (
 /obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 12;
 	pixel_y = 7
 	},
@@ -10346,7 +10346,7 @@
 /area/science/robotics)
 "eVT" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
@@ -11951,7 +11951,7 @@
 /turf/open/openspace,
 /area/engineering/hallway)
 "fKS" = (
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_x = -13;
 	pixel_y = -11
 	},
@@ -12612,7 +12612,7 @@
 /turf/closed/wall,
 /area/maintenance/department/chapel)
 "fZX" = (
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = -8;
 	pixel_y = 2
 	},
@@ -14636,10 +14636,10 @@
 /turf/open/floor/iron/cafeteria_red,
 /area/crew_quarters/cafeteria)
 "haN" = (
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_y = 25
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 21
 	},
 /obj/structure/table/wood,
@@ -15057,7 +15057,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 14
 	},
@@ -15114,7 +15114,7 @@
 	icon_state = "0-2"
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 5;
 	pixel_y = 8
 	},
@@ -15181,7 +15181,7 @@
 	pixel_x = -5;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 6;
 	pixel_y = 10
 	},
@@ -15189,7 +15189,7 @@
 	pixel_x = -3;
 	pixel_y = -4
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = 9;
 	pixel_y = 1
 	},
@@ -15339,7 +15339,7 @@
 	pixel_x = -4;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
 	pixel_x = 8;
 	pixel_y = 4
 	},
@@ -15713,7 +15713,7 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine{
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine{
 	pixel_x = 11;
 	pixel_y = 23
 	},
@@ -17897,7 +17897,7 @@
 	pixel_x = 10;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 4;
 	pixel_y = 12
 	},
@@ -18242,7 +18242,7 @@
 /area/maintenance/department/medical/central)
 "iYE" = (
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/closet/secure_closet/hydroponics{
 	req_access = null;
 	req_one_access_txt = "28;25;35"
@@ -18807,11 +18807,11 @@
 	dir = 8
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -9;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -2;
 	pixel_y = 2
 	},
@@ -19809,11 +19809,11 @@
 	dir = 1
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -2;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -6;
 	pixel_y = 9
 	},
@@ -22179,7 +22179,7 @@
 /obj/structure/table,
 /obj/item/crowbar,
 /obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/maintenance/department/medical/morgue)
@@ -22249,15 +22249,15 @@
 /area/maintenance/department/science/central)
 "kUF" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_x = -8;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_x = 9;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_y = 3
 	},
 /obj/effect/spawner/lootdrop/glowstick/lit,
@@ -22446,7 +22446,7 @@
 /area/quartermaster/qm)
 "lbc" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{
 	dir = 1
 	},
@@ -23114,7 +23114,7 @@
 	dir = 10
 	},
 /obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/prison/dark,
 /area/security/prison)
 "lsH" = (
@@ -23934,7 +23934,7 @@
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 7;
 	pixel_y = 10
 	},
@@ -24072,7 +24072,7 @@
 /area/asteroid/paradise)
 "lRO" = (
 /obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /obj/machinery/door/window/eastright{
 	dir = 8;
@@ -24531,7 +24531,7 @@
 /obj/effect/turf_decal/siding/wood/corner,
 /obj/structure/closet/secure_closet/captains,
 /obj/item/book/manual/wiki/security_space_law,
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
 	pixel_x = 3;
 	pixel_y = 8
 	},
@@ -27582,7 +27582,7 @@
 /turf/open/floor/iron/white,
 /area/science/lab)
 "nGn" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -7;
 	pixel_y = 6
 	},
@@ -27993,7 +27993,7 @@
 	pixel_x = 9;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -5;
 	pixel_y = 9
 	},
@@ -32436,7 +32436,7 @@
 /turf/open/floor/iron,
 /area/maintenance/department/medical/morgue)
 "pXT" = (
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 6;
 	pixel_y = 27
 	},
@@ -32846,7 +32846,7 @@
 	pixel_x = -8;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 6;
 	pixel_y = 3
 	},
@@ -33671,7 +33671,7 @@
 "qMj" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 9;
 	pixel_y = 6
 	},
@@ -34858,7 +34858,7 @@
 "rnq" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/under/suit/tan,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
 	pixel_x = 6;
 	pixel_y = 10
 	},
@@ -35243,10 +35243,10 @@
 "rxA" = (
 /obj/structure/table,
 /obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
 	pixel_x = -5
 	},
 /obj/item/reagent_containers/syringe,
@@ -36023,7 +36023,7 @@
 	pixel_y = -33
 	},
 /obj/item/book/manual/hydroponics_pod_people,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron/grid/steel,
 /area/hydroponics)
 "rSK" = (
@@ -36456,15 +36456,15 @@
 	},
 /obj/machinery/airalarm/directional/east,
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 5;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 9;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
 	pixel_x = -7;
 	pixel_y = 17
 	},
@@ -38412,11 +38412,11 @@
 /area/ai_monitored/security/armory)
 "teS" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = -2;
 	pixel_y = 13
 	},
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/item/clothing/head/utility/chefhat{
 	pixel_x = 5;
 	pixel_y = 4
@@ -39827,11 +39827,11 @@
 /area/hallway/primary/fore)
 "tJw" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
 /obj/machinery/door/poddoor/shutters{
@@ -41684,7 +41684,7 @@
 	},
 /obj/item/vending_refill/cigarette,
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/iron,
 /area/hallway/secondary/service)
 "uIG" = (
@@ -41929,7 +41929,7 @@
 "uNj" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 4;
 	pixel_y = 9
 	},
@@ -43246,11 +43246,11 @@
 /obj/structure/chair/fancy/plastic{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -8;
 	pixel_y = 17
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -12;
 	pixel_y = 11
 	},
@@ -45468,7 +45468,7 @@
 	pixel_x = -1;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 9;
 	pixel_y = 3
 	},
@@ -46160,10 +46160,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_y = 28
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 23
 	},
 /obj/item/paicard,
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 0247ebe9e24ab..88d3c34a5fa80 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -1800,7 +1800,7 @@
 	pixel_x = -7;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/flask/det{
+/obj/item/reagent_containers/cup/glass/flask/det{
 	pixel_x = 4;
 	pixel_y = -1
 	},
@@ -2447,81 +2447,81 @@
 /area/security/main)
 "aGl" = (
 /obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/item/circuitboard/machine/chem_heater,
@@ -3125,7 +3125,7 @@
 	pixel_y = 1
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 7
 	},
 /obj/item/reagent_containers/dropper,
@@ -4874,7 +4874,7 @@
 	pixel_x = -11
 	},
 /obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /turf/open/floor/iron/dark,
 /area/security/main)
@@ -8372,7 +8372,7 @@
 /area/chapel/main)
 "cgB" = (
 /obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
@@ -10316,15 +10316,15 @@
 /area/maintenance/department/science)
 "cIH" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -3;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 3
 	},
@@ -11166,19 +11166,19 @@
 /turf/open/floor/iron/dark,
 /area/bridge)
 "cSw" = (
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 5;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -2;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 6;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -3;
 	pixel_y = 1
 	},
@@ -11788,8 +11788,8 @@
 /obj/effect/turf_decal/bot,
 /obj/structure/table,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = 4
 	},
 /turf/open/floor/iron/cafeteria,
@@ -12961,7 +12961,7 @@
 /area/quartermaster/sorting)
 "dqI" = (
 /obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/aft)
@@ -13625,8 +13625,8 @@
 /obj/item/stack/sheet/mineral/plasma{
 	amount = 5
 	},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
 /obj/item/reagent_containers/dropper,
 /obj/machinery/camera/directional/north{
 	c_tag = "Xenobiology - Research Area";
@@ -14531,7 +14531,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/item/dest_tagger,
 /obj/machinery/computer/security/telescreen/rd{
 	pixel_y = 30
@@ -16322,23 +16322,23 @@
 /area/hallway/primary/aft)
 "emH" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/patron{
+/obj/item/reagent_containers/cup/glass/bottle/patron{
 	pixel_x = -5;
 	pixel_y = 16
 	},
-/obj/item/reagent_containers/food/drinks/bottle/grappa{
+/obj/item/reagent_containers/cup/glass/bottle/grappa{
 	pixel_x = 10;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/bottle/absinthe{
+/obj/item/reagent_containers/cup/glass/bottle/absinthe{
 	pixel_x = -5;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/kahlua{
+/obj/item/reagent_containers/cup/glass/bottle/kahlua{
 	pixel_x = 9;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = 2;
 	pixel_y = 4
 	},
@@ -17061,9 +17061,9 @@
 /turf/open/floor/plating,
 /area/crew_quarters/heads/chief)
 "exT" = (
-/obj/item/reagent_containers/food/drinks/bottle/wine,
+/obj/item/reagent_containers/cup/glass/bottle/wine,
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/trophy{
+/obj/item/reagent_containers/cup/glass/trophy{
 	pixel_x = 9;
 	pixel_y = 8
 	},
@@ -17466,7 +17466,7 @@
 	dir = 1
 	},
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "eDN" = (
@@ -18569,7 +18569,7 @@
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
 "ePp" = (
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..."
 	},
 /turf/open/floor/cult,
@@ -19283,34 +19283,34 @@
 "eWR" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 2;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 9;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
 /obj/machinery/firealarm/directional/west,
 /obj/machinery/vending/wallmed{
-	contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+	contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
 	name = "Upgraded NanoMed";
 	pixel_x = -1;
 	pixel_y = -32;
 	premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
-	products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+	products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
 	},
 /turf/open/floor/iron/grid/steel,
 /area/medical/virology)
@@ -20170,7 +20170,7 @@
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/structure/table,
 /obj/item/food/dough,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/item/food/grown/tomato,
 /turf/open/floor/iron/cafeteria,
 /area/crew_quarters/kitchen)
@@ -21021,7 +21021,7 @@
 /area/crew_quarters/locker)
 "ftA" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -1;
 	pixel_y = 9
 	},
@@ -25881,7 +25881,7 @@
 /obj/structure/table,
 /obj/item/storage/bag/plants/portaseeder,
 /obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/seeds/wheat,
 /obj/item/seeds/wheat,
 /obj/item/seeds/wheat,
@@ -26381,7 +26381,7 @@
 /turf/open/floor/iron,
 /area/engine/atmos)
 "gJI" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -27856,25 +27856,25 @@
 /obj/structure/closet/crate{
 	name = "food crate"
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 2;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 1;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 8;
 	pixel_y = -3
 	},
@@ -28795,7 +28795,7 @@
 	pixel_x = 6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_x = -6;
 	pixel_y = 6
 	},
@@ -29008,7 +29008,7 @@
 /area/maintenance/department/science)
 "hus" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/machinery/computer/security/telescreen/minisat{
 	dir = 1;
 	pixel_y = -29
@@ -30117,7 +30117,7 @@
 	pixel_x = 4;
 	pixel_y = -1
 	},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
 	pixel_x = -8;
 	pixel_y = -5
 	},
@@ -31204,7 +31204,7 @@
 	pixel_y = 2
 	},
 /obj/item/clothing/mask/cigarette/cigar,
-/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/item/reagent_containers/cup/glass/flask/gold,
 /turf/open/floor/carpet/royalblue,
 /area/crew_quarters/heads/captain/private)
 "hYU" = (
@@ -31423,8 +31423,8 @@
 	pixel_y = 31
 	},
 /obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/item/mop,
 /turf/open/floor/iron/dark/side{
@@ -31852,7 +31852,7 @@
 	name = "Animal Pen"
 	},
 /obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/seeds/tower,
 /turf/open/floor/plating,
 /area/hydroponics/garden)
@@ -32065,10 +32065,10 @@
 /area/quartermaster/sorting)
 "iiZ" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/dropper,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/effect/turf_decal/tile/green/opposingcorners{
@@ -32700,7 +32700,7 @@
 	dir = 1
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
 /obj/item/pestle,
 /obj/item/clothing/glasses/hud/health{
 	pixel_x = 4;
@@ -33755,7 +33755,7 @@
 "iDU" = (
 /obj/structure/table/wood,
 /obj/item/storage/lockbox/medal,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/iron/dark,
 /area/crew_quarters/heads/captain)
 "iDW" = (
@@ -34859,7 +34859,7 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 10;
 	pixel_y = 9
 	},
@@ -36757,7 +36757,7 @@
 /area/hallway/primary/port)
 "jsw" = (
 /obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
 	desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
 	name = "Carton of Estus"
 	},
@@ -36831,7 +36831,7 @@
 	pixel_y = 5
 	},
 /obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/requests_console{
 	department = "Robotics Lab";
@@ -39735,7 +39735,7 @@
 /area/security/main)
 "keX" = (
 /obj/structure/rack,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/central/secondary)
@@ -51244,7 +51244,7 @@
 	pixel_x = 8;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
 /obj/item/book/granter/spell/smoke/lesser,
 /turf/open/floor/cult,
 /area/chapel/office)
@@ -51729,7 +51729,7 @@
 /obj/effect/turf_decal/bot,
 /obj/machinery/light,
 /obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron/cafeteria,
 /area/crew_quarters/kitchen)
@@ -52639,8 +52639,8 @@
 /area/science/mixing)
 "nwP" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
 /obj/structure/sign/plaques/deempisi{
 	pixel_y = 28
 	},
@@ -55861,7 +55861,7 @@
 	dir = 6
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /obj/structure/railing,
 /turf/open/floor/iron/techmaint,
 /area/science/misc_lab)
@@ -60218,7 +60218,7 @@
 /area/crew_quarters/heads/hor)
 "pBN" = (
 /obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 4
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -61895,7 +61895,7 @@
 	pixel_x = 1;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 8;
 	pixel_y = -1
 	},
@@ -63143,7 +63143,7 @@
 /area/security/brig)
 "qpL" = (
 /obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /turf/open/floor/iron/techmaint,
 /area/science/research)
@@ -63513,19 +63513,19 @@
 	pixel_x = 6;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = 8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
 	pixel_x = 8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -4;
 	pixel_y = 17
 	},
@@ -63819,12 +63819,12 @@
 "qxm" = (
 /obj/structure/table,
 /obj/item/food/spaghetti/raw,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/peppermill,
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 6
 	},
 /obj/effect/turf_decal/bot,
@@ -63996,7 +63996,7 @@
 /obj/item/screwdriver,
 /obj/item/wrench,
 /obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /obj/item/knife/kitchen,
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -30
@@ -66678,7 +66678,7 @@
 "rkq" = (
 /obj/item/folder,
 /obj/item/clipboard,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /obj/structure/table/wood,
 /obj/item/reagent_containers/spray/cleaner{
 	pixel_x = -3;
@@ -68448,7 +68448,7 @@
 	pixel_x = 1;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -6;
 	pixel_y = 6
 	},
@@ -70994,7 +70994,7 @@
 /area/science/xenobiology)
 "smb" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
 "sme" = (
@@ -71229,10 +71229,10 @@
 "soC" = (
 /obj/structure/table/wood,
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/food/drinks/mug/cocoa{
+/obj/item/reagent_containers/cup/glass/mug/cocoa{
 	pixel_x = 6
 	},
 /turf/open/floor/iron/sepia,
@@ -73905,7 +73905,7 @@
 	},
 /obj/structure/table/reinforced,
 /obj/item/food/popcorn,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = 4;
 	pixel_y = 6
 	},
@@ -75597,11 +75597,11 @@
 "tvw" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -2;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 5;
 	pixel_y = -2
 	},
@@ -77058,10 +77058,10 @@
 /obj/item/food/mint{
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 2
 	},
 /obj/structure/noticeboard{
@@ -80981,11 +80981,11 @@
 	pixel_x = 28
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{
+/obj/item/reagent_containers/cup/soda_cans/grey_bull{
 	pixel_x = -6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -81197,10 +81197,10 @@
 	},
 /obj/item/clothing/glasses/science,
 /obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3
 	},
 /obj/effect/turf_decal/tile/purple/opposingcorners,
@@ -82378,7 +82378,7 @@
 /turf/open/floor/iron/dark,
 /area/chapel/main)
 "vdJ" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /obj/structure/reagent_dispensers/watertank/high,
 /obj/effect/turf_decal/tile/green/opposingcorners,
@@ -84370,7 +84370,7 @@
 	dir = 8
 	},
 /obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
 /obj/item/food/tofu/prison,
 /turf/open/floor/iron/dark,
 /area/vacant_room/commissary/commissaryFood)
@@ -87734,14 +87734,14 @@
 /obj/structure/desk_bell/speed_demon{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
 	name = "Bottle of Tears";
 	pixel_x = 8;
@@ -88347,20 +88347,20 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/old,
 /obj/structure/closet/secure_closet/injection,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/toxin{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
 	name = "fluorosulfuric acid bottle";
 	pixel_x = -3;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = 5;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = -4;
 	pixel_y = 1
 	},
@@ -88369,7 +88369,7 @@
 /obj/item/reagent_containers/syringe{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
@@ -89401,10 +89401,10 @@
 	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
@@ -89999,7 +89999,7 @@
 	name = "Virology Desk Window";
 	req_access_txt = "20"
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 2;
 	pixel_y = 12
 	},
@@ -90007,7 +90007,7 @@
 	pixel_x = -5;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
@@ -93387,7 +93387,7 @@
 	pixel_y = 2
 	},
 /obj/item/pen,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = -6;
 	pixel_y = 1
 	},
@@ -95043,8 +95043,8 @@
 	dir = 1
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 7
 	},
 /obj/item/reagent_containers/dropper,
@@ -95436,7 +95436,7 @@
 /area/crew_quarters/fitness/recreation)
 "xTR" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /turf/open/floor/carpet/grimy,
 /area/hallway/primary/port)
 "xUa" = (
@@ -95705,10 +95705,10 @@
 /area/hallway/primary/starboard)
 "xXA" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/syringe,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -95717,7 +95717,7 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/tile/green/fourcorners/contrasted,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 5;
 	pixel_y = 1
 	},
@@ -95936,12 +95936,12 @@
 "yaa" = (
 /obj/structure/table,
 /obj/item/kitchen/fork,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 5;
 	pixel_y = 6
 	},
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 4c553ce62a51c..e0c8ee46563a1 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -3353,19 +3353,19 @@
 /turf/open/floor/iron,
 /area/bridge)
 "aqK" = (
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
 	pixel_x = 3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 7;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
 /obj/machinery/status_display/evac{
 	pixel_y = 32
 	},
@@ -10347,17 +10347,17 @@
 /obj/item/storage/box/seccarts{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
 	name = "Bottle of Tears";
 	pixel_x = 3;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_y = 2
 	},
 /obj/machinery/keycard_auth{
@@ -10684,12 +10684,12 @@
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
@@ -10883,12 +10883,12 @@
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
@@ -11115,7 +11115,7 @@
 /area/crew_quarters/kitchen)
 "boy" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -11612,17 +11612,17 @@
 	dir = 4;
 	pixel_x = -27
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -11819,7 +11819,7 @@
 	dir = 4
 	},
 /obj/item/clothing/suit/hooded/chaplain_hoodie,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
 /obj/item/soulstone/anybody/chaplain,
 /obj/item/organ/heart,
 /obj/item/book/granter/spell/smoke/lesser,
@@ -11909,7 +11909,7 @@
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_x = 8;
 	pixel_y = 6
 	},
@@ -15537,7 +15537,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "bNU" = (
@@ -26264,12 +26264,12 @@
 "cYd" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
@@ -27354,16 +27354,16 @@
 	},
 /obj/structure/table/glass,
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -7
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -7
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 7
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 7
 	},
 /turf/open/floor/iron/showroomfloor,
@@ -27379,7 +27379,7 @@
 	pixel_x = -5;
 	pixel_y = -4
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 9;
 	pixel_y = 5
 	},
@@ -30240,7 +30240,7 @@
 /area/science/mixing)
 "eja" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = -2;
 	pixel_y = 6
 	},
@@ -32491,15 +32491,15 @@
 /area/science/lab)
 "eWx" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -3;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death.";
 	list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30);
 	name = "Kilo-Kocktail";
@@ -36155,7 +36155,7 @@
 /area/maintenance/central)
 "giB" = (
 /obj/structure/mopbucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/structure/sign/warning/securearea{
@@ -38545,7 +38545,7 @@
 	},
 /obj/item/clothing/glasses/science,
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -6
 	},
 /turf/open/floor/iron/showroomfloor,
@@ -39549,7 +39549,7 @@
 /area/bridge)
 "htk" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /turf/open/floor/plating{
 	burnt = 1
 	},
@@ -42894,12 +42894,12 @@
 /area/science/aft)
 "izu" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
 	pixel_x = 6;
 	pixel_y = 7;
 	list_reagents = list(/datum/reagent/consumable/pwr_game = 5)
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 1
 	},
@@ -42998,7 +42998,7 @@
 "iAH" = (
 /obj/structure/table/wood,
 /obj/item/clipboard,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = -2;
 	pixel_y = 2
 	},
@@ -43006,7 +43006,7 @@
 	pixel_x = 8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/rag,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -44720,7 +44720,7 @@
 /turf/open/floor/iron,
 /area/security/execution/transfer)
 "jcF" = (
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
 /turf/open/floor/plating,
 /area/quartermaster/warehouse)
 "jcT" = (
@@ -45990,81 +45990,81 @@
 	pixel_y = 4
 	},
 /obj/item/circuitboard/machine/chem_heater,
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
 /obj/structure/closet/crate/secure/plasma{
@@ -47427,7 +47427,7 @@
 	dir = 4;
 	pixel_x = 11
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /turf/open/floor/plating{
 	burnt = 1
@@ -50408,16 +50408,16 @@
 	pixel_y = 27
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = 5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = -8;
 	pixel_y = 7
 	},
@@ -54090,7 +54090,7 @@
 /obj/item/crowbar/red,
 /obj/item/cultivator,
 /obj/item/wirecutters,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/circuitboard/machine/biogenerator,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -54205,17 +54205,17 @@
 /area/crew_quarters/bar)
 "lZo" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
 	desc = "An emerald flask, from the Keeper's soul. High in vitamins!";
 	name = "estus flask";
 	pixel_x = 4;
@@ -57522,7 +57522,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/effect/turf_decal/stripes/corner,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/radio/intercom{
 	pixel_y = 22
 	},
@@ -59033,7 +59033,7 @@
 /obj/item/crowbar/red,
 /obj/item/cultivator,
 /obj/item/wirecutters,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/circuitboard/machine/biogenerator,
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
 	dir = 1
@@ -59264,15 +59264,15 @@
 "nPI" = (
 /obj/structure/table,
 /obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -2;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -59874,12 +59874,12 @@
 /area/security/main)
 "nZh" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table.";
 	pixel_x = -8;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	desc = "Salt. From space oceans, presumably. A staple of modern medicine.";
 	pixel_x = -8;
 	pixel_y = 12
@@ -62333,11 +62333,11 @@
 	dir = 4
 	},
 /obj/item/storage/box/masks,
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -9;
 	pixel_y = 5
 	},
@@ -63920,7 +63920,7 @@
 /area/security/execution/education)
 "pmx" = (
 /obj/structure/bonfire,
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice{
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
 	desc = "For the weary spacemen on their quest to rekindle the first plasma fire.";
 	name = "Carton of Estus"
 	},
@@ -67368,17 +67368,17 @@
 /area/quartermaster/warehouse)
 "qti" = (
 /obj/item/book/manual/wiki/medicine,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -6;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 6;
 	pixel_y = 10
 	},
@@ -67960,7 +67960,7 @@
 /area/engine/atmos)
 "qCD" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/item/book/manual/chef_recipes{
 	pixel_x = 2;
 	pixel_y = 6
@@ -69029,7 +69029,7 @@
 "qVe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/green{
@@ -69197,7 +69197,7 @@
 	name = "Trash Chute";
 	req_one_access_txt = "26"
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/purple/half/contrasted,
@@ -70444,10 +70444,10 @@
 /obj/item/stack/sheet/mineral/plasma,
 /obj/item/stack/sheet/mineral/plasma,
 /obj/item/stack/sheet/mineral/plasma,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -4
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 4
 	},
 /obj/item/reagent_containers/dropper,
@@ -74136,7 +74136,7 @@
 /area/maintenance/aft)
 "sHz" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -74422,15 +74422,15 @@
 /area/security/prison)
 "sMK" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -3;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -76628,11 +76628,11 @@
 	pixel_x = 6;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 9;
 	pixel_y = -7
 	},
@@ -77835,7 +77835,7 @@
 "tXJ" = (
 /obj/structure/reagent_dispensers/watertank/high,
 /obj/effect/turf_decal/delivery,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
@@ -77882,10 +77882,10 @@
 "tZQ" = (
 /obj/structure/table,
 /obj/item/clipboard,
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 6
 	},
 /obj/item/clothing/glasses/science,
@@ -79910,7 +79910,7 @@
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/turf_decal/delivery,
 /obj/machinery/light/small,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
@@ -80466,7 +80466,7 @@
 "uQT" = (
 /obj/structure/flora/ausbushes/leafybush,
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/grass,
 /area/security/prison)
 "uRb" = (
@@ -83733,7 +83733,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
@@ -84372,7 +84372,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/iron/dark,
 /area/chapel/main)
@@ -85030,11 +85030,11 @@
 	pixel_x = -3;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
@@ -85154,7 +85154,7 @@
 /obj/item/multitool{
 	pixel_x = 4
 	},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
@@ -89113,27 +89113,27 @@
 	icon_state = "4-8"
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
 	pixel_x = 10;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{
+/obj/item/reagent_containers/cup/soda_cans/shamblers{
 	pixel_x = 2;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime{
 	pixel_x = -7;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
 	pixel_x = -4;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = 6;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
 	pixel_y = 20
 	},
 /obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -91286,7 +91286,7 @@
 	dir = 4
 	},
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 6efd704bfb060..0271a1ec07e76 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -4247,8 +4247,8 @@
 	pixel_x = 3;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/obj/item/reagent_containers/glass/bottle/nutrient/rh{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh{
 	pixel_x = 2;
 	pixel_y = 1
 	},
@@ -4276,7 +4276,7 @@
 	dir = 1
 	},
 /obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
 /area/hydroponics/garden)
@@ -5799,7 +5799,7 @@
 /obj/item/hatchet,
 /obj/item/cultivator,
 /obj/item/crowbar,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/plant_analyzer,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -8217,7 +8217,7 @@
 	pixel_y = 2
 	},
 /obj/item/clothing/mask/cigarette/cigar,
-/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/item/reagent_containers/cup/glass/flask/gold,
 /turf/open/floor/carpet/royalblue,
 /area/crew_quarters/heads/captain/private)
 "bhv" = (
@@ -10659,7 +10659,7 @@
 /area/crew_quarters/heads/captain/private)
 "byr" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/carpet/royalblue,
 /area/crew_quarters/heads/captain/private)
 "byv" = (
@@ -12238,11 +12238,11 @@
 	dir = 1
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 7;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -4;
 	pixel_y = -3
 	},
@@ -12251,7 +12251,7 @@
 	pixel_y = -2
 	},
 /obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 8;
 	pixel_y = 2
 	},
@@ -14576,7 +14576,7 @@
 "bUn" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -14588,7 +14588,7 @@
 	dir = 4
 	},
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron,
 /area/hydroponics)
 "bUq" = (
@@ -15187,7 +15187,7 @@
 /area/hydroponics)
 "bYn" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/structure/railing{
 	dir = 1
 	},
@@ -16769,21 +16769,21 @@
 /area/quartermaster/office)
 "cmb" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = -4;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/bottle/chloralhydrate,
-/obj/item/reagent_containers/glass/bottle/toxin{
+/obj/item/reagent_containers/cup/bottle/chloralhydrate,
+/obj/item/reagent_containers/cup/bottle/toxin{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = 5;
 	pixel_y = 1
 	},
 /obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/bottle/facid{
+/obj/item/reagent_containers/cup/bottle/facid{
 	name = "fluorosulfuric acid bottle";
 	pixel_x = -3;
 	pixel_y = 6
@@ -17002,7 +17002,7 @@
 /turf/open/floor/iron/freezer,
 /area/crew_quarters/toilet/restrooms)
 "cou" = (
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = 8;
 	pixel_y = 12
 	},
@@ -18016,7 +18016,7 @@
 	pixel_x = -13;
 	pixel_y = -10
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -8;
 	pixel_y = 8
 	},
@@ -18153,11 +18153,11 @@
 	amount = 4;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 8;
 	pixel_y = 2
 	},
@@ -18568,7 +18568,7 @@
 	pixel_y = 5
 	},
 /obj/item/storage/belt/utility,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/science/robotics/lab)
@@ -21717,7 +21717,7 @@
 /obj/structure/closet/crate/hydroponics,
 /obj/item/shovel/spade,
 /obj/item/wrench,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/cultivator,
 /obj/item/wirecutters,
 /turf/open/floor/iron,
@@ -23375,7 +23375,7 @@
 "dJG" = (
 /obj/structure/table/reinforced,
 /obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = -2;
 	pixel_y = 13
 	},
@@ -28508,10 +28508,10 @@
 	id = "kitchen";
 	name = "Serving Hatch"
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
 /obj/machinery/door/firedoor,
@@ -29972,7 +29972,7 @@
 /area/security/main)
 "glg" = (
 /obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
 	pixel_x = -9;
 	pixel_y = 6
 	},
@@ -30738,81 +30738,81 @@
 /turf/open/floor/iron,
 /area/hallway/secondary/service)
 "gEW" = (
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/structure/closet/crate/medical,
@@ -34559,7 +34559,7 @@
 "hVW" = (
 /obj/structure/table/glass,
 /obj/item/storage/box/donkpockets,
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko{
 	pixel_x = -6;
 	pixel_y = 6
 	},
@@ -36182,10 +36182,10 @@
 /obj/item/stack/sheet/mineral/plasma{
 	pixel_x = 9
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/dropper,
 /obj/item/storage/box/beakers{
 	pixel_x = -6;
@@ -37195,12 +37195,12 @@
 	pixel_y = 2
 	},
 /obj/machinery/vending/wallmed{
-	contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/glass/bottle/random_virus = 1);
+	contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1);
 	name = "Upgraded NanoMed";
 	pixel_x = -1;
 	pixel_y = -32;
 	premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1);
-	products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/glass/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 4, /obj/item/reagent_containers/glass/bottle/tricordrazine = 1, /obj/item/reagent_containers/glass/bottle/spaceacillin = 1, /obj/item/reagent_containers/glass/bottle/morphine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
+	products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4)
 	},
 /obj/item/reagent_containers/dropper{
 	pixel_x = 2;
@@ -40346,8 +40346,8 @@
 /obj/machinery/reagentgrinder{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/iron,
 /area/medical/chemistry)
 "kiA" = (
@@ -43726,7 +43726,7 @@
 /area/crew_quarters/fitness/recreation)
 "lyj" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/holywater{
+/obj/item/reagent_containers/cup/glass/bottle/holywater{
 	pixel_x = -2;
 	pixel_y = 2
 	},
@@ -45127,11 +45127,11 @@
 	pixel_x = 6;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = -7;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 6;
 	pixel_y = 4
 	},
@@ -49730,23 +49730,23 @@
 "nIt" = (
 /obj/structure/rack,
 /obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -8;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -8;
 	pixel_y = -2
 	},
@@ -50058,7 +50058,7 @@
 	},
 /obj/item/storage/box/trackimp,
 /obj/item/storage/lockbox/loyalty,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/machinery/light/small,
 /obj/machinery/firealarm{
 	dir = 4;
@@ -50400,20 +50400,20 @@
 /area/medical/medbay/aft)
 "nSE" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/sillycup,
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup,
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = 5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = 5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/sillycup{
+/obj/item/reagent_containers/cup/glass/sillycup{
 	pixel_x = 5;
 	pixel_y = 3
 	},
@@ -54432,7 +54432,7 @@
 	pixel_x = -6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = 8;
 	pixel_y = 12
 	},
@@ -60169,10 +60169,10 @@
 "rwt" = (
 /obj/structure/table,
 /obj/item/kitchen/rollingpin,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
 /turf/open/floor/iron/checker,
@@ -60915,20 +60915,20 @@
 /area/crew_quarters/locker)
 "rMj" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -6;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 6;
 	pixel_y = 6
 	},
 /obj/item/storage/pill_bottle/mannitol,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -2;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 5;
 	pixel_y = 9
 	},
@@ -63437,7 +63437,7 @@
 /obj/item/cultivator,
 /obj/item/crowbar,
 /obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/structure/table/glass,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
@@ -66234,23 +66234,23 @@
 /area/bridge)
 "tGk" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 2;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 9;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
@@ -66502,10 +66502,10 @@
 /area/security/brig)
 "tLJ" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 3
 	},
 /obj/effect/turf_decal/siding/wood{
@@ -68756,7 +68756,7 @@
 /obj/structure/desk_bell{
 	pixel_x = 8
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 1
 	},
@@ -70413,7 +70413,7 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "vfv" = (
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = -4;
 	pixel_y = -7
 	},
@@ -72018,10 +72018,10 @@
 /area/maintenance/central)
 "vJj" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 6
 	},
 /obj/item/food/mint,
@@ -73069,7 +73069,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/structure/table,
 /obj/item/storage/bag/plants,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -73397,8 +73397,8 @@
 /area/quartermaster/sorting)
 "wld" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag{
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/siding/wood{
@@ -76465,7 +76465,7 @@
 	dir = 4;
 	pixel_x = 11
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/structure/sign/poster/random{
 	pixel_x = 32
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 2f12771147948..ec3253b933315 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -943,10 +943,10 @@
 /area/mine/living_quarters)
 "gD" = (
 /obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
-/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/condiment/sugar,
 /obj/item/food/tofu/prison,
 /obj/item/knife/kitchen,
-/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/condiment/enzyme,
 /obj/item/kitchen/rollingpin,
 /obj/item/wrench,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -2760,7 +2760,7 @@
 "tM" = (
 /obj/structure/table,
 /obj/effect/landmark/event_spawn,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /obj/item/shovel/spade,
 /obj/item/cultivator,
 /turf/open/floor/iron/grid/steel,
@@ -2916,7 +2916,7 @@
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "uL" = (
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /obj/structure/reagent_dispensers/watertank/high,
 /turf/open/floor/iron/grid/steel,
@@ -3670,15 +3670,15 @@
 /area/mine/laborcamp)
 "Bd" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 7;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -1;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -8
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -4702,10 +4702,10 @@
 /area/mine/laborcamp/security)
 "IX" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 2
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -5304,7 +5304,7 @@
 /obj/structure/table,
 /obj/item/plate,
 /obj/item/kitchen/fork,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 1
 	},
@@ -5558,10 +5558,10 @@
 "Pp" = (
 /obj/structure/table,
 /obj/item/storage/bag/tray,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = 3
 	},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
 /turf/open/floor/iron/grid/steel,
 /area/mine/laborcamp)
 "Pz" = (
@@ -5646,8 +5646,8 @@
 /area/lavaland/surface/outdoors)
 "Qc" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee,
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 8;
 	pixel_y = 6
 	},
@@ -6726,19 +6726,19 @@
 /area/lavaland/surface/outdoors)
 "XP" = (
 /obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	desc = "Whatever it is, it reeks of foul, putrid froth.";
 	list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing=15);
 	name = "Delta-Down";
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/bottle/champagne,
-/obj/item/reagent_containers/food/drinks/bottle/cognac,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/champagne,
+/obj/item/reagent_containers/cup/glass/bottle/cognac,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/vomit/old,
 /turf/open/floor/carpet/black,
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index ee40069275007..23d9aa66dabee 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -19,7 +19,7 @@
 	},
 /obj/structure/closet/secure_closet/captains,
 /obj/item/book/manual/wiki/security_space_law,
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
 	pixel_x = 3;
 	pixel_y = 8
 	},
@@ -2577,15 +2577,15 @@
 	pixel_x = -6;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/absinthe{
+/obj/item/reagent_containers/cup/glass/bottle/absinthe{
 	pixel_x = -10;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 3;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 9;
 	pixel_y = 10
 	},
@@ -3068,10 +3068,10 @@
 /obj/machinery/light{
 	light_color = "#7AC3FF"
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_y = 25
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 21
 	},
 /obj/machinery/computer/security/telescreen/entertainment{
@@ -4371,7 +4371,7 @@
 	dir = 4
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/glass/mortar,
+/obj/item/reagent_containers/cup/mortar,
 /obj/item/pestle,
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -5768,7 +5768,7 @@
 	pixel_x = -1;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = 13;
 	pixel_y = 17
 	},
@@ -7282,7 +7282,7 @@
 "coF" = (
 /obj/machinery/reagentgrinder,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = -9;
 	pixel_y = 1
 	},
@@ -7879,81 +7879,81 @@
 	dir = 1
 	},
 /obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/glass/bottle/bromine{
+/obj/item/reagent_containers/cup/bottle/bromine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/aluminium{
+/obj/item/reagent_containers/cup/bottle/aluminium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/chlorine{
+/obj/item/reagent_containers/cup/bottle/chlorine{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/carbon{
+/obj/item/reagent_containers/cup/bottle/carbon{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/ethanol{
+/obj/item/reagent_containers/cup/bottle/ethanol{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/copper{
+/obj/item/reagent_containers/cup/bottle/copper{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/hydrogen{
+/obj/item/reagent_containers/cup/bottle/hydrogen{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/fluorine{
+/obj/item/reagent_containers/cup/bottle/fluorine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/water{
+/obj/item/reagent_containers/cup/bottle/water{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/lithium{
+/obj/item/reagent_containers/cup/bottle/lithium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/iron{
+/obj/item/reagent_containers/cup/bottle/iron{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/iodine{
+/obj/item/reagent_containers/cup/bottle/iodine{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/oxygen{
+/obj/item/reagent_containers/cup/bottle/oxygen{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/phosphorus{
+/obj/item/reagent_containers/cup/bottle/phosphorus{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/nitrogen{
+/obj/item/reagent_containers/cup/bottle/nitrogen{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/mercury{
+/obj/item/reagent_containers/cup/bottle/mercury{
 	pixel_x = 6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/radium{
+/obj/item/reagent_containers/cup/bottle/radium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/potassium{
+/obj/item/reagent_containers/cup/bottle/potassium{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/welding_fuel{
+/obj/item/reagent_containers/cup/bottle/welding_fuel{
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/sacid{
+/obj/item/reagent_containers/cup/bottle/sacid{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/silicon{
+/obj/item/reagent_containers/cup/bottle/silicon{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/silver{
+/obj/item/reagent_containers/cup/bottle/silver{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sodium{
+/obj/item/reagent_containers/cup/bottle/sodium{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/glass/bottle/sugar{
+/obj/item/reagent_containers/cup/bottle/sugar{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/sulfur{
+/obj/item/reagent_containers/cup/bottle/sulfur{
 	pixel_x = -6
 	},
 /obj/item/circuitboard/machine/chem_heater,
@@ -11143,19 +11143,19 @@
 /turf/open/floor/wood,
 /area/crew_quarters/theatre/backstage)
 "dBb" = (
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -1;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -2;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 9
 	},
 /obj/item/storage/pill_bottle/mannitol{
@@ -12558,10 +12558,10 @@
 /obj/machinery/light{
 	light_color = "#7AC3FF"
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_y = 28
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_y = 23
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -15716,7 +15716,7 @@
 	},
 /obj/machinery/vending/wallmed{
 	pixel_y = -32;
-	products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2)
+	products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2)
 	},
 /obj/machinery/newscaster{
 	pixel_x = -32;
@@ -16114,7 +16114,7 @@
 	dir = 1
 	},
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/carbon,
+/obj/item/reagent_containers/cup/bottle/carbon,
 /turf/open/floor/plating/rust,
 /area/maintenance/starboard/aft)
 "fbi" = (
@@ -16849,7 +16849,7 @@
 	pixel_x = -3;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_x = 4;
 	pixel_y = 3
 	},
@@ -17622,7 +17622,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/wood,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 7;
 	pixel_y = 1
 	},
@@ -18697,7 +18697,7 @@
 /obj/item/food/donut/apple{
 	name = "forbidden toilet donut"
 	},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = -10;
 	pixel_y = 17
 	},
@@ -19134,7 +19134,7 @@
 "fWj" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable/yellow,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -2;
 	pixel_y = 10
 	},
@@ -19340,7 +19340,7 @@
 	departmentType = 2;
 	pixel_y = 30
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -9;
 	pixel_y = 5
 	},
@@ -20343,7 +20343,7 @@
 /obj/item/clothing/suit/jacket/det_suit{
 	icon_state = "curator"
 	},
-/obj/item/reagent_containers/food/drinks/flask/det,
+/obj/item/reagent_containers/cup/glass/flask/det,
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
@@ -26077,7 +26077,7 @@
 "ijU" = (
 /obj/structure/table/wood,
 /obj/item/toy/foamblade,
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull{
+/obj/item/reagent_containers/cup/soda_cans/grey_bull{
 	pixel_x = 7;
 	pixel_y = 15
 	},
@@ -26664,7 +26664,7 @@
 /turf/open/floor/engine/air,
 /area/engine/atmos)
 "ivW" = (
-/obj/item/reagent_containers/glass/waterbottle/empty{
+/obj/item/reagent_containers/cup/waterbottle/empty{
 	pixel_x = -10
 	},
 /obj/item/storage/belt/utility,
@@ -29137,7 +29137,7 @@
 /turf/open/floor/iron/white,
 /area/medical/office)
 "jmw" = (
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -7;
 	pixel_y = 6
 	},
@@ -29223,11 +29223,11 @@
 /area/hallway/primary/central)
 "joH" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 4;
 	pixel_y = 13
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -2;
 	pixel_y = 14
 	},
@@ -32134,7 +32134,7 @@
 	icon_state = "0-2"
 	},
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/iron/grid/steel,
 /area/hydroponics)
 "kkV" = (
@@ -33950,7 +33950,7 @@
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/beaker{
+/obj/item/reagent_containers/cup/beaker{
 	pixel_x = 9;
 	pixel_y = 10
 	},
@@ -33958,7 +33958,7 @@
 	pixel_x = -3;
 	pixel_y = -4
 	},
-/obj/item/reagent_containers/glass/beaker/large{
+/obj/item/reagent_containers/cup/beaker/large{
 	pixel_x = 8;
 	pixel_y = 1
 	},
@@ -35335,7 +35335,7 @@
 	},
 /obj/structure/table/wood/fancy/purple,
 /obj/item/book/granter/spell/smoke/lesser,
-/obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/item/reagent_containers/cup/glass/bottle/holywater,
 /obj/item/soulstone/anybody/chaplain,
 /obj/item/organ/heart,
 /turf/open/floor/carpet/grimy,
@@ -37344,7 +37344,7 @@
 /area/science/research)
 "lYd" = (
 /obj/effect/decal/cleanable/food/flour,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -9;
 	pixel_y = 44
 	},
@@ -37365,7 +37365,7 @@
 /area/hallway/primary/central)
 "lYy" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
 	pixel_x = 6;
 	pixel_y = 10
 	},
@@ -38627,7 +38627,7 @@
 /turf/open/floor/iron,
 /area/hallway/primary/port)
 "mrr" = (
-/obj/item/reagent_containers/glass/bottle/iodine,
+/obj/item/reagent_containers/cup/bottle/iodine,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "mrF" = (
@@ -40073,7 +40073,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/cup/soda_cans/pwr_game{
 	pixel_x = -7;
 	pixel_y = 10
 	},
@@ -42970,7 +42970,7 @@
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -8
 	},
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -43647,7 +43647,7 @@
 "nQW" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/open/floor/grass,
 /area/hallway/primary/central)
 "nQZ" = (
@@ -44791,7 +44791,7 @@
 /area/hallway/secondary/exit/departure_lounge)
 "okF" = (
 /obj/machinery/chem_master,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/iron,
 /area/medical/apothecary)
 "okN" = (
@@ -46043,7 +46043,7 @@
 /area/hallway/primary/port)
 "oHE" = (
 /obj/structure/lattice/catwalk,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 9;
 	pixel_y = 6
 	},
@@ -46051,7 +46051,7 @@
 	pixel_x = -3;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 2;
 	pixel_y = 1
 	},
@@ -46641,19 +46641,19 @@
 /area/security/checkpoint/escape)
 "oPl" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
 	pixel_x = -7;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = 12;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/cup/soda_cans/starkist{
 	pixel_x = 10;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
+/obj/item/reagent_containers/cup/soda_cans/space_up,
 /turf/open/floor/iron,
 /area/maintenance/port/aft)
 "oPx" = (
@@ -48019,7 +48019,7 @@
 /area/crew_quarters/heads/captain/private)
 "piH" = (
 /obj/structure/janitorialcart,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 11;
 	pixel_y = -5
 	},
@@ -49260,7 +49260,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /turf/open/floor/iron,
 /area/medical/apothecary)
 "pEF" = (
@@ -55293,15 +55293,15 @@
 	pixel_x = -22
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 5;
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 9;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
 	pixel_x = -7;
 	pixel_y = 17
 	},
@@ -56060,7 +56060,7 @@
 /obj/structure/closet/cardboard,
 /obj/item/storage/toolbox/emergency,
 /obj/effect/spawner/lootdrop/maintenance/eight,
-/obj/item/reagent_containers/food/drinks/bottle/hooch,
+/obj/item/reagent_containers/cup/glass/bottle/hooch,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "rJX" = (
@@ -57213,7 +57213,7 @@
 	pixel_x = 5;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = -8;
 	pixel_y = 3
 	},
@@ -60341,7 +60341,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/obj/item/reagent_containers/glass/bowl,
+/obj/item/reagent_containers/cup/bowl,
 /obj/item/food/grown/carrot{
 	pixel_x = 4;
 	pixel_y = 4
@@ -61200,14 +61200,14 @@
 	pixel_x = -1;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -4
 	},
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 4
 	},
 /obj/item/shovel/spade{
@@ -63699,7 +63699,7 @@
 	id = "cell";
 	pixel_x = -25
 	},
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = 11;
 	pixel_y = 15
 	},
@@ -63876,7 +63876,7 @@
 	pixel_x = -4;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 2;
 	pixel_y = 9
 	},
@@ -65464,14 +65464,14 @@
 /turf/open/floor/iron/dark,
 /area/security/nuke_storage)
 "uLH" = (
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_x = 9;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_x = -8;
 	pixel_y = 11
 	},
@@ -66221,7 +66221,7 @@
 /area/maintenance/department/science)
 "uZg" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -5;
 	pixel_y = 1
 	},
@@ -66277,15 +66277,15 @@
 "vam" = (
 /obj/machinery/recharger,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
 	pixel_x = -9;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 10;
 	pixel_y = 13
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = 10;
 	pixel_y = 5
 	},
@@ -66648,7 +66648,7 @@
 /area/hallway/secondary/entry)
 "viS" = (
 /obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
 	pixel_x = -2;
 	pixel_y = 12
 	},
@@ -66772,7 +66772,7 @@
 /area/chapel/main)
 "vkC" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/glass/bottle/nutrient/ez{
+/obj/item/reagent_containers/cup/bottle/nutrient/ez{
 	pixel_x = 9;
 	pixel_y = 4
 	},
@@ -67664,11 +67664,11 @@
 /area/crew_quarters/heads/hor)
 "vAV" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -7;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 7;
 	pixel_y = -3
 	},
@@ -67677,17 +67677,17 @@
 	pixel_x = -3;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -4;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 8;
 	pixel_y = 6
 	},
 /obj/item/reagent_containers/syringe/antiviral,
 /obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -4;
 	pixel_y = -3
 	},
@@ -68457,7 +68457,7 @@
 /area/solar/starboard/fore)
 "vPl" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -5;
 	pixel_y = 16
 	},
@@ -69642,7 +69642,7 @@
 	dir = 4
 	},
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -6;
 	pixel_y = 3
 	},
@@ -71531,7 +71531,7 @@
 	pixel_x = 2;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = -5;
 	pixel_y = 5
 	},
@@ -71704,23 +71704,23 @@
 /area/hydroponics)
 "wUw" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = 2;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/virusfood{
+/obj/item/reagent_containers/cup/glass/bottle/virusfood{
 	pixel_x = -6;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 9;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/spaceacillin{
+/obj/item/reagent_containers/cup/bottle/spaceacillin{
 	pixel_x = 2;
 	pixel_y = -1
 	},
@@ -72484,7 +72484,7 @@
 /turf/open/floor/iron/dark,
 /area/security/brig/dock)
 "xjA" = (
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 3;
 	pixel_y = 12
 	},
@@ -72613,7 +72613,7 @@
 	pixel_x = -7;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -8;
 	pixel_y = 10
 	},
@@ -74135,11 +74135,11 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/siding/wideplating/dark,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -6;
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_x = 6;
 	pixel_y = 8
 	},
@@ -75247,7 +75247,7 @@
 /area/security/execution/education)
 "yaV" = (
 /obj/machinery/biogenerator,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/bot,
 /obj/machinery/door/window/eastleft{
 	name = "Hydroponics Desk";
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index b7bddd9b25c04..ada8a8d8a658f 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -190,7 +190,7 @@
 "aH" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder,
-/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/cup/beaker/large,
 /obj/effect/turf_decal/tile/green/fourcorners/contrasted,
 /turf/open/floor/iron/white,
 /area/centcom/holding)
@@ -492,7 +492,7 @@
 "bK" = (
 /obj/structure/table/reinforced,
 /obj/item/food/mint,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -953,7 +953,7 @@
 /obj/structure/sign/poster/official/cohiba_robusto_ad{
 	pixel_x = 32
 	},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = -10;
 	pixel_y = 1
 	},
@@ -987,7 +987,7 @@
 "dH" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_y = 5
 	},
 /obj/machinery/light,
@@ -1075,17 +1075,17 @@
 /turf/open/floor/iron/dark,
 /area/centcom/ferry)
 "ef" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
@@ -1208,7 +1208,7 @@
 	pixel_y = 7;
 	pixel_x = -4
 	},
-/obj/item/reagent_containers/food/drinks/mug/tea{
+/obj/item/reagent_containers/cup/glass/mug/tea{
 	pixel_x = 9
 	},
 /turf/open/floor/iron/dark,
@@ -1357,8 +1357,8 @@
 "eQ" = (
 /obj/structure/table/wood,
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
 /obj/machinery/newscaster{
 	pixel_y = -32
 	},
@@ -2075,7 +2075,7 @@
 /area/tdome/tdomeobserve)
 "hT" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 5;
 	pixel_y = -2
 	},
@@ -4195,7 +4195,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 4;
 	pixel_y = 7
 	},
@@ -4798,7 +4798,7 @@
 /area/centcom/evac)
 "si" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/wood,
 /area/syndicate_mothership/control)
 "sj" = (
@@ -5765,7 +5765,7 @@
 /area/centcom/holding)
 "vu" = (
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
 /obj/structure/table/wood,
 /turf/open/floor/wood,
 /area/syndicate_mothership/control)
@@ -6226,7 +6226,7 @@
 /area/wizard_station)
 "wR" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
 /turf/open/floor/carpet/grimy,
 /area/tdome/tdomeobserve)
 "wS" = (
@@ -7104,7 +7104,7 @@
 	pixel_x = 6;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = -7;
 	pixel_y = -1
 	},
@@ -8030,7 +8030,7 @@
 "Du" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -9230,14 +9230,14 @@
 "HK" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/cup/glass/britcup,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/tdome/tdomeobserve)
@@ -9389,7 +9389,7 @@
 /obj/item/trash/candy{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = -4;
 	pixel_y = 11
 	},
@@ -9501,7 +9501,7 @@
 /area/tdome/arena)
 "IG" = (
 /obj/structure/bookcase/manuals,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /turf/closed/indestructible/riveted,
 /area/ctf)
 "IJ" = (
@@ -9910,18 +9910,18 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
 	pixel_x = 11;
 	pixel_y = -2
 	},
 /obj/structure/sign/barsign{
 	pixel_y = 32
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 12;
 	pixel_y = 15
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = 8;
 	pixel_y = 13
 	},
@@ -10309,12 +10309,12 @@
 "LJ" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 5;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -5
 	},
 /turf/open/floor/iron/dark,
@@ -10719,7 +10719,7 @@
 "Nh" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /turf/open/floor/iron/dark,
 /area/centcom/supplypod)
 "Nk" = (
@@ -11478,14 +11478,14 @@
 "PO" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -8;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 6
 	},
 /turf/open/floor/iron/dark,
@@ -11569,7 +11569,7 @@
 "Qf" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -11591,7 +11591,7 @@
 /area/centcom/holding)
 "Qj" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/sake,
+/obj/item/reagent_containers/cup/glass/bottle/sake,
 /turf/open/floor/wood,
 /area/centcom/holding)
 "Qk" = (
@@ -11993,10 +11993,10 @@
 /area/ctf)
 "RK" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -4
 	},
 /obj/item/reagent_containers/hypospray/medipen,
@@ -12201,7 +12201,7 @@
 "Sn" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
@@ -12473,11 +12473,11 @@
 /area/tdome/tdomeobserve)
 "Ti" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8
 	},
 /obj/item/knife/kitchen,
@@ -12489,7 +12489,7 @@
 /area/tdome/tdomeobserve)
 "Tj" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_y = 5
 	},
 /obj/item/clothing/mask/cigarette/cigar/havana{
@@ -13492,8 +13492,8 @@
 /obj/item/wrench,
 /obj/item/watertank,
 /obj/item/cultivator,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/turf_decal/tile/green/fourcorners/contrasted,
 /turf/open/floor/iron/white,
 /area/centcom/holding)
@@ -13894,8 +13894,8 @@
 /turf/open/floor/iron,
 /area/centcom/control)
 "YJ" = (
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/condiment/enzyme,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/item/book/manual/wiki/barman_recipes,
 /obj/structure/closet/crate,
 /turf/open/floor/iron/cafeteria,
@@ -13925,7 +13925,7 @@
 /area/centcom/supplypod/loading/four)
 "YQ" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /turf/open/floor/iron/cafeteria,
 /area/centcom/holding)
 "YS" = (
diff --git a/_maps/shuttles/emergency/emergency_bar.dmm b/_maps/shuttles/emergency/emergency_bar.dmm
index b1720b49d0f1c..e6d1845ee49e6 100644
--- a/_maps/shuttles/emergency/emergency_bar.dmm
+++ b/_maps/shuttles/emergency/emergency_bar.dmm
@@ -115,7 +115,7 @@
 "at" = (
 /obj/structure/table/wood/poker,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /obj/machinery/light,
 /obj/effect/turf_decal/siding/dark,
 /turf/open/floor/carpet/royalblue,
@@ -441,7 +441,7 @@
 "hS" = (
 /obj/structure/table,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/item/storage/fancy/cigarettes/cigars/havana,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
@@ -726,7 +726,7 @@
 	},
 /obj/structure/table,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_cere.dmm b/_maps/shuttles/emergency/emergency_cere.dmm
index 7dc14e723c105..ebbabaa23f450 100644
--- a/_maps/shuttles/emergency/emergency_cere.dmm
+++ b/_maps/shuttles/emergency/emergency_cere.dmm
@@ -458,7 +458,7 @@
 /area/shuttle/escape)
 "gd" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/cryoxadone,
+/obj/item/reagent_containers/cup/beaker/cryoxadone,
 /obj/item/wrench,
 /obj/effect/turf_decal/tile/blue/anticorner/contrasted{
 	dir = 4
diff --git a/_maps/shuttles/emergency/emergency_corg.dmm b/_maps/shuttles/emergency/emergency_corg.dmm
index b1d5de11fe706..4f2bb9b67a7d9 100644
--- a/_maps/shuttles/emergency/emergency_corg.dmm
+++ b/_maps/shuttles/emergency/emergency_corg.dmm
@@ -293,7 +293,7 @@
 /area/shuttle/escape)
 "kD" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/cup/bottle/epinephrine,
 /obj/item/reagent_containers/syringe/epinephrine,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
@@ -482,10 +482,10 @@
 /area/shuttle/escape)
 "rX" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/sugar,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
 /obj/item/food/meat/rawbacon,
 /obj/item/food/meat/rawbacon,
 /obj/item/food/meat/rawbacon,
@@ -1028,7 +1028,7 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_y = 5
 	},
 /obj/item/food/chocolatebar,
diff --git a/_maps/shuttles/emergency/emergency_delta.dmm b/_maps/shuttles/emergency/emergency_delta.dmm
index de3aa740a6542..cd967380d5889 100644
--- a/_maps/shuttles/emergency/emergency_delta.dmm
+++ b/_maps/shuttles/emergency/emergency_delta.dmm
@@ -1268,17 +1268,17 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "Gd" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
diff --git a/_maps/shuttles/emergency/emergency_discoinferno.dmm b/_maps/shuttles/emergency/emergency_discoinferno.dmm
index 2629b06e99961..d6980dcd1f23e 100644
--- a/_maps/shuttles/emergency/emergency_discoinferno.dmm
+++ b/_maps/shuttles/emergency/emergency_discoinferno.dmm
@@ -70,7 +70,7 @@
 "n" = (
 /obj/structure/table/wood/poker,
 /obj/item/storage/box/drinkingglasses,
-/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
 /obj/machinery/light,
 /turf/open/floor/mineral/gold,
 /area/shuttle/escape)
@@ -112,12 +112,12 @@
 /area/shuttle/escape)
 "A" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/cognac,
+/obj/item/reagent_containers/cup/glass/bottle/cognac,
 /turf/open/floor/wood,
 /area/shuttle/escape)
 "B" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
 /turf/open/floor/wood,
 /area/shuttle/escape)
 "C" = (
@@ -152,9 +152,9 @@
 /area/shuttle/escape)
 "H" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
 /obj/machinery/light{
 	dir = 4
 	},
@@ -176,12 +176,12 @@
 /area/shuttle/escape)
 "K" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+/obj/item/reagent_containers/cup/glass/bottle/absinthe,
 /turf/open/floor/wood,
 /area/shuttle/escape)
 "L" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine,
 /turf/open/floor/wood,
 /area/shuttle/escape)
 "M" = (
diff --git a/_maps/shuttles/emergency/emergency_donut.dmm b/_maps/shuttles/emergency/emergency_donut.dmm
index 9a74f82daa4b4..5b62cf55e6e95 100644
--- a/_maps/shuttles/emergency/emergency_donut.dmm
+++ b/_maps/shuttles/emergency/emergency_donut.dmm
@@ -359,17 +359,17 @@
 /area/shuttle/escape)
 "bn" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
diff --git a/_maps/shuttles/emergency/emergency_fland.dmm b/_maps/shuttles/emergency/emergency_fland.dmm
index 65b2116ce2033..a60fbc50f6c29 100644
--- a/_maps/shuttles/emergency/emergency_fland.dmm
+++ b/_maps/shuttles/emergency/emergency_fland.dmm
@@ -339,17 +339,17 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "pF" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
@@ -658,17 +658,17 @@
 /area/shuttle/escape)
 "zB" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
@@ -905,7 +905,7 @@
 /obj/item/reagent_containers/hypospray/medipen{
 	pixel_y = -6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
 /obj/item/defibrillator/compact/loaded,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
index c6c506d1210bf..f25f156c2401f 100644
--- a/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
+++ b/_maps/shuttles/emergency/emergency_imfedupwiththisworld.dmm
@@ -155,16 +155,16 @@
 /area/shuttle/escape)
 "U" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "V" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/cup/glass/shaker,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_kilo.dmm b/_maps/shuttles/emergency/emergency_kilo.dmm
index 61c5969117929..974cb677e70fe 100644
--- a/_maps/shuttles/emergency/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency/emergency_kilo.dmm
@@ -463,7 +463,7 @@
 /obj/item/reagent_containers/hypospray/medipen{
 	pixel_y = -6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "cY" = (
diff --git a/_maps/shuttles/emergency/emergency_meta.dmm b/_maps/shuttles/emergency/emergency_meta.dmm
index 43daa06db9753..8b1be9081bdbb 100644
--- a/_maps/shuttles/emergency/emergency_meta.dmm
+++ b/_maps/shuttles/emergency/emergency_meta.dmm
@@ -436,17 +436,17 @@
 /area/shuttle/escape)
 "bJ" = (
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
diff --git a/_maps/shuttles/emergency/emergency_pubby.dmm b/_maps/shuttles/emergency/emergency_pubby.dmm
index 638c0e726d90d..f0f93bc16b853 100644
--- a/_maps/shuttles/emergency/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency/emergency_pubby.dmm
@@ -374,7 +374,7 @@
 /area/shuttle/escape)
 "vo" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/bottle/wine,
+/obj/item/reagent_containers/cup/glass/bottle/wine,
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 1
 	},
diff --git a/_maps/shuttles/emergency/emergency_raven.dmm b/_maps/shuttles/emergency/emergency_raven.dmm
index fe28a505f0961..9a2f8ab6f9f51 100644
--- a/_maps/shuttles/emergency/emergency_raven.dmm
+++ b/_maps/shuttles/emergency/emergency_raven.dmm
@@ -447,17 +447,17 @@
 /turf/open/floor/iron/white/side,
 /area/shuttle/escape)
 "bL" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
diff --git a/_maps/shuttles/emergency/emergency_russiafightpit.dmm b/_maps/shuttles/emergency/emergency_russiafightpit.dmm
index be30341adae41..a9f91777a46a4 100644
--- a/_maps/shuttles/emergency/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency/emergency_russiafightpit.dmm
@@ -58,7 +58,7 @@
 "am" = (
 /obj/structure/table,
 /obj/item/storage/fancy/cigarettes/cigars/cohiba,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{
 	pixel_x = 5;
 	pixel_y = 18
 	},
@@ -303,7 +303,7 @@
 /area/shuttle/escape)
 "be" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "bf" = (
@@ -396,7 +396,7 @@
 	pixel_x = 27
 	},
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "bv" = (
@@ -459,12 +459,12 @@
 /area/shuttle/escape)
 "bH" = (
 /obj/structure/closet,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "bI" = (
diff --git a/_maps/shuttles/emergency/emergency_theatre.dmm b/_maps/shuttles/emergency/emergency_theatre.dmm
index 445a67b1940c0..c0bdc1ab2577e 100644
--- a/_maps/shuttles/emergency/emergency_theatre.dmm
+++ b/_maps/shuttles/emergency/emergency_theatre.dmm
@@ -10,17 +10,17 @@
 /turf/open/floor/carpet/black,
 /area/shuttle/escape)
 "eX" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
@@ -425,22 +425,22 @@
 /area/shuttle/escape)
 "JO" = (
 /obj/structure/table/wood/fancy/royalblue,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_y = 9;
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_y = 9;
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/food/drinks/bottle/champagne{
+/obj/item/reagent_containers/cup/glass/bottle/champagne{
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_y = 4;
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_y = 4;
 	pixel_x = -6
 	},
diff --git a/_maps/shuttles/emergency/emergency_tiny.dmm b/_maps/shuttles/emergency/emergency_tiny.dmm
index 9bdc48160d4e6..a325822887e5f 100644
--- a/_maps/shuttles/emergency/emergency_tiny.dmm
+++ b/_maps/shuttles/emergency/emergency_tiny.dmm
@@ -323,7 +323,7 @@
 /obj/machinery/vending/wallmed{
 	pixel_x = -32;
 	pixel_y = 1;
-	products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 2, /obj/item/reagent_containers/glass/bottle/charcoal = 2)
+	products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 6, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2)
 	},
 /turf/open/floor/iron/white,
 /area/shuttle/escape)
diff --git a/_maps/shuttles/emergency/emergency_wabbajack.dmm b/_maps/shuttles/emergency/emergency_wabbajack.dmm
index 3d71a8948f4e4..cda35866266b3 100644
--- a/_maps/shuttles/emergency/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency/emergency_wabbajack.dmm
@@ -186,11 +186,11 @@
 /area/shuttle/escape)
 "aT" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 2;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "be" = (
diff --git a/_maps/shuttles/exploration/exploration_fland.dmm b/_maps/shuttles/exploration/exploration_fland.dmm
index 6a75042c81328..8c61415c2cb5c 100644
--- a/_maps/shuttles/exploration/exploration_fland.dmm
+++ b/_maps/shuttles/exploration/exploration_fland.dmm
@@ -39,7 +39,7 @@
 	pixel_x = 6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/syndicatebeer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -8;
 	pixel_y = 2
 	},
@@ -645,10 +645,10 @@
 /area/shuttle/exploration)
 "JR" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/rag{
+/obj/item/reagent_containers/cup/rag{
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/shaker{
+/obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = 4;
 	pixel_y = 1
 	},
@@ -783,7 +783,7 @@
 	dir = 8
 	},
 /obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/reagent_containers/spray/cleaner,
 /obj/effect/turf_decal/box,
 /turf/open/floor/iron/grid/steel,
@@ -870,7 +870,7 @@
 /area/shuttle/exploration)
 "UN" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
+/obj/item/reagent_containers/cup/glass/britcup{
 	pixel_x = 9;
 	pixel_y = -3
 	},
@@ -879,7 +879,7 @@
 	pixel_x = -3;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/beer/light{
+/obj/item/reagent_containers/cup/glass/bottle/beer/light{
 	pixel_x = 4;
 	pixel_y = 7
 	},
@@ -895,7 +895,7 @@
 	pixel_y = 1
 	},
 /obj/item/trash/pistachios,
-/obj/item/reagent_containers/food/drinks/beer/almost_empty{
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{
 	pixel_x = -8
 	},
 /obj/machinery/light,
diff --git a/_maps/shuttles/hunter/hunter_bounty.dmm b/_maps/shuttles/hunter/hunter_bounty.dmm
index 9bc7ba09d5318..ec8b4afb4c495 100644
--- a/_maps/shuttles/hunter/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter/hunter_bounty.dmm
@@ -29,7 +29,7 @@
 	},
 /obj/effect/turf_decal/delivery,
 /obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/machinery/airalarm/directional/east{
 	req_access = null;
 	req_access_txt = "181"
diff --git a/_maps/shuttles/hunter/hunter_russian.dmm b/_maps/shuttles/hunter/hunter_russian.dmm
index ebde43f81b867..3ee9fa8e724bc 100644
--- a/_maps/shuttles/hunter/hunter_russian.dmm
+++ b/_maps/shuttles/hunter/hunter_russian.dmm
@@ -108,9 +108,9 @@
 /obj/item/food/rationpack,
 /obj/item/food/rationpack,
 /obj/item/food/rationpack,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
-/obj/item/reagent_containers/food/drinks/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
+/obj/item/reagent_containers/cup/glass/bottle/vodka,
 /turf/open/floor/iron/techmaint,
 /area/shuttle/hunter)
 "jP" = (
@@ -157,7 +157,7 @@
 /area/shuttle/hunter)
 "my" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/storage/bag/trash{
 	pixel_x = 6
 	},
@@ -689,7 +689,7 @@
 /area/shuttle/hunter)
 "Jx" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = 8;
 	pixel_y = 6
 	},
@@ -988,7 +988,7 @@
 /turf/open/floor/iron/dark,
 /area/shuttle/hunter)
 "Ul" = (
-/obj/item/reagent_containers/food/drinks/flask/gold{
+/obj/item/reagent_containers/cup/glass/flask/gold{
 	list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30);
 	pixel_y = 8;
 	pixel_x = 4
@@ -1030,7 +1030,7 @@
 	pixel_y = 8;
 	pixel_x = 2
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_x = -8;
 	pixel_y = 11
 	},
diff --git a/_maps/shuttles/hunter/hunter_space_cop.dmm b/_maps/shuttles/hunter/hunter_space_cop.dmm
index d79dd2d7bba92..8884b78dc8304 100644
--- a/_maps/shuttles/hunter/hunter_space_cop.dmm
+++ b/_maps/shuttles/hunter/hunter_space_cop.dmm
@@ -232,7 +232,7 @@
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
 	pixel_x = 9;
 	pixel_y = -2
 	},
@@ -389,7 +389,7 @@
 	pixel_x = -7;
 	pixel_y = -7
 	},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
 	pixel_x = -7;
 	pixel_y = 4
 	},
@@ -1220,7 +1220,7 @@
 /obj/effect/decal/cleanable/oil{
 	pixel_y = 11
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -8;
 	pixel_y = 2
 	},
diff --git a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
index c20ea1aae749d..b8e9370fbe87b 100644
--- a/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
+++ b/_maps/shuttles/infiltrator/infiltrator_advanced.dmm
@@ -34,17 +34,17 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front.";
 	name = "Bottle of Tears";
 	pixel_x = 3;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -7;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
 	pixel_x = -7;
 	pixel_y = 4
 	},
@@ -665,7 +665,7 @@
 /obj/item/reagent_containers/hypospray/medipen{
 	pixel_y = -6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/cup/bottle/charcoal,
 /obj/structure/table/reinforced,
 /obj/machinery/light{
 	dir = 1
diff --git a/_maps/shuttles/infiltrator/infiltrator_basic.dmm b/_maps/shuttles/infiltrator/infiltrator_basic.dmm
index df51e6e24bafb..7f4b5c79544ef 100644
--- a/_maps/shuttles/infiltrator/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator/infiltrator_basic.dmm
@@ -283,17 +283,17 @@
 /turf/open/floor/iron/dark,
 /area/shuttle/syndicate/medical)
 "bt" = (
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = -3;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = 6;
 	pixel_y = 8
 	},
@@ -851,8 +851,8 @@
 /area/shuttle/syndicate/medical)
 "Hs" = (
 /obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker/large,
+/obj/item/reagent_containers/cup/beaker,
 /obj/item/reagent_containers/dropper,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
diff --git a/_maps/shuttles/pirate/pirate_default.dmm b/_maps/shuttles/pirate/pirate_default.dmm
index a7205fb084fdc..9a11216e64085 100644
--- a/_maps/shuttles/pirate/pirate_default.dmm
+++ b/_maps/shuttles/pirate/pirate_default.dmm
@@ -229,7 +229,7 @@
 	dir = 8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/drinks/bottle/hooch{
+/obj/item/reagent_containers/cup/glass/bottle/hooch{
 	pixel_x = 8;
 	pixel_y = 4
 	},
@@ -402,7 +402,7 @@
 	pixel_x = 8;
 	pixel_y = -4
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -9;
 	pixel_y = -7
 	},
@@ -594,7 +594,7 @@
 	pixel_x = -8;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/food/drinks/mug{
+/obj/item/reagent_containers/cup/glass/mug{
 	pixel_x = -14;
 	pixel_y = 1
 	},
@@ -870,7 +870,7 @@
 	pixel_y = 10;
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = 2;
 	pixel_x = -7
 	},
@@ -929,7 +929,7 @@
 	pixel_x = 6;
 	pixel_y = -2
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 10;
 	pixel_y = 19
 	},
@@ -2004,7 +2004,7 @@
 /obj/effect/turf_decal/weather/dirt/corner{
 	dir = 4
 	},
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/item/storage/bag/trash{
 	pixel_x = 4;
@@ -2098,40 +2098,40 @@
 /area/shuttle/pirate)
 "Wx" = (
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/drinks/bottle/moonshine{
+/obj/item/reagent_containers/cup/glass/bottle/moonshine{
 	pixel_x = 7;
 	pixel_y = -5
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -6;
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -6;
 	pixel_x = 1
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -6;
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -6;
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -6;
 	pixel_x = 1
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -8;
 	pixel_x = 8
 	},
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -10;
 	pixel_x = -3
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/reagent_containers/food/condiment/milk{
+/obj/item/reagent_containers/condiment/milk{
 	pixel_y = -8;
 	pixel_x = 8
 	},
diff --git a/_maps/shuttles/ruin/ruin_caravan_victim.dmm b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
index bc43d0d012d66..851f1bd4af8f8 100644
--- a/_maps/shuttles/ruin/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin/ruin_caravan_victim.dmm
@@ -415,21 +415,21 @@
 	locked = 0;
 	name = "fridge"
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
 	pixel_x = 3;
 	pixel_y = -3
 	},
diff --git a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
index 929f9306ab4d2..cddb5cd3f86d1 100644
--- a/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin/ruin_pirate_cutter.dmm
@@ -357,7 +357,7 @@
 /obj/item/storage/box/donkpockets{
 	pixel_x = -6
 	},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
 	pixel_x = 8;
 	pixel_y = 3
 	},
@@ -368,7 +368,7 @@
 /area/shuttle/caravan/pirate)
 "qX" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -396,11 +396,11 @@
 /area/shuttle/caravan/pirate)
 "to" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
+/obj/item/reagent_containers/cup/glass/bottle/rum{
 	pixel_x = 3;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/food/drinks/bottle/rum,
+/obj/item/reagent_containers/cup/glass/bottle/rum,
 /turf/open/floor/iron/dark,
 /area/shuttle/caravan/pirate)
 "tM" = (
diff --git a/_maps/shuttles/whiteship/whiteship_box.dmm b/_maps/shuttles/whiteship/whiteship_box.dmm
index 3978cda03d1e8..2276abbd60287 100644
--- a/_maps/shuttles/whiteship/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship/whiteship_box.dmm
@@ -45,7 +45,7 @@
 "am" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
+/obj/item/reagent_containers/cup/beaker/synthflesh,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/medbay)
@@ -250,7 +250,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/item/storage/bag/trash{
 	pixel_x = 6
@@ -1170,11 +1170,11 @@
 	pixel_x = -6;
 	pixel_y = 6
 	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 7;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = -2;
 	pixel_y = -3
 	},
@@ -1407,7 +1407,7 @@
 	pixel_x = -5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/bottle/morphine{
+/obj/item/reagent_containers/cup/bottle/morphine{
 	pixel_x = 8;
 	pixel_y = 4
 	},
@@ -1545,25 +1545,25 @@
 /obj/structure/closet/crate{
 	name = "food crate"
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 2;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 1;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 8;
 	pixel_y = -3
 	},
@@ -1718,11 +1718,11 @@
 "sz" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/glass,
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = 7;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/glass/beaker/cryoxadone{
+/obj/item/reagent_containers/cup/beaker/cryoxadone{
 	pixel_x = -6;
 	pixel_y = 6
 	},
@@ -1818,7 +1818,7 @@
 	pixel_x = 6;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = -6;
 	pixel_y = 4
 	},
@@ -1995,12 +1995,12 @@
 	locked = 0;
 	name = "fridge"
 	},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
 	pixel_x = 3;
 	pixel_y = -3
 	},
diff --git a/_maps/shuttles/whiteship/whiteship_delta.dmm b/_maps/shuttles/whiteship/whiteship_delta.dmm
index 5295c84560583..5ca8343ad2e6a 100644
--- a/_maps/shuttles/whiteship/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_delta.dmm
@@ -85,21 +85,21 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/bot_white,
 /obj/structure/closet/crate,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large,
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large,
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle,
-/obj/item/reagent_containers/glass/waterbottle{
+/obj/item/reagent_containers/cup/waterbottle,
+/obj/item/reagent_containers/cup/waterbottle{
 	pixel_x = 3;
 	pixel_y = -3
 	},
@@ -129,7 +129,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/item/storage/bag/trash{
 	pixel_x = 6
@@ -1267,10 +1267,10 @@
 "dN" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
+/obj/item/reagent_containers/cup/bottle/epinephrine{
 	pixel_x = 6
 	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
+/obj/item/reagent_containers/cup/bottle/charcoal{
 	pixel_x = -3
 	},
 /obj/item/reagent_containers/syringe,
@@ -2120,11 +2120,11 @@
 	name = "fridge"
 	},
 /obj/item/food/sausage,
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/item/food/sandwich,
 /obj/structure/spider/stickyweb,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -2225,7 +2225,7 @@
 	currenthand = list("2 of Diamonds","3 of Clubs");
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 7;
 	pixel_y = 4
 	},
diff --git a/_maps/shuttles/whiteship/whiteship_fland.dmm b/_maps/shuttles/whiteship/whiteship_fland.dmm
index 95ab48b5e2b7c..29cee5609ea4c 100644
--- a/_maps/shuttles/whiteship/whiteship_fland.dmm
+++ b/_maps/shuttles/whiteship/whiteship_fland.dmm
@@ -33,25 +33,25 @@
 /obj/structure/closet/crate{
 	name = "food crate"
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 2;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 1;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 8;
 	pixel_y = -3
 	},
@@ -328,10 +328,10 @@
 "qb" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = -4
 	},
-/obj/item/reagent_containers/glass/bucket{
+/obj/item/reagent_containers/cup/bucket{
 	pixel_x = 4
 	},
 /turf/open/floor/wood,
diff --git a/_maps/shuttles/whiteship/whiteship_meta.dmm b/_maps/shuttles/whiteship/whiteship_meta.dmm
index 8b72bbc6a3d41..464a28f46c281 100644
--- a/_maps/shuttles/whiteship/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship/whiteship_meta.dmm
@@ -218,25 +218,25 @@
 /obj/structure/closet/crate{
 	name = "food crate"
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 2;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = -2
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 1;
 	pixel_y = -3
 	},
-/obj/item/reagent_containers/glass/waterbottle/large{
+/obj/item/reagent_containers/cup/waterbottle/large{
 	pixel_x = 8;
 	pixel_y = -3
 	},
@@ -1207,11 +1207,11 @@
 "dQ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8;
 	pixel_y = 4
 	},
@@ -1293,7 +1293,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/crate/medical,
 /obj/item/storage/firstaid/fire,
-/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/cup/bottle/morphine,
 /obj/item/reagent_containers/syringe,
 /turf/open/floor/iron/dark,
 /area/shuttle/abandoned/cargo)
@@ -1345,11 +1345,11 @@
 /obj/item/knife/kitchen{
 	pixel_x = 16
 	},
-/obj/item/reagent_containers/food/condiment/sugar{
+/obj/item/reagent_containers/condiment/sugar{
 	pixel_x = -9;
 	pixel_y = 14
 	},
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -5;
 	pixel_y = 6
 	},
@@ -1723,11 +1723,11 @@
 "qi" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/food/condiment/flour{
+/obj/item/reagent_containers/condiment/flour{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/condiment/flour,
 /obj/item/food/meat/slab/synthmeat{
 	pixel_x = -3;
 	pixel_y = 3
@@ -2158,18 +2158,18 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vodka{
+/obj/item/reagent_containers/cup/glass/bottle/vodka{
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+/obj/item/reagent_containers/cup/glass/bottle/whiskey{
 	pixel_x = 16;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/gin{
+/obj/item/reagent_containers/cup/glass/bottle/gin{
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/cognac{
+/obj/item/reagent_containers/cup/glass/bottle/cognac{
 	pixel_x = 8;
 	pixel_y = 4
 	},
@@ -2206,7 +2206,7 @@
 /obj/item/shovel/spade,
 /obj/item/cultivator,
 /obj/item/plant_analyzer,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 1
@@ -2239,19 +2239,19 @@
 "Gj" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = -8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 1;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+/obj/item/reagent_containers/cup/soda_cans/cola{
 	pixel_x = 6
 	},
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2265,7 +2265,7 @@
 	pixel_x = -11;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/beer{
+/obj/item/reagent_containers/cup/glass/bottle/beer{
 	pixel_x = 6;
 	pixel_y = 14
 	},
@@ -2491,14 +2491,14 @@
 "Pb" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/bottle/vermouth{
+/obj/item/reagent_containers/cup/glass/bottle/vermouth{
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/food/drinks/bottle/tequila{
+/obj/item/reagent_containers/cup/glass/bottle/tequila{
 	pixel_x = 8;
 	pixel_y = 4
 	},
@@ -2582,7 +2582,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/rack,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/item/mop,
 /obj/item/storage/bag/trash{
 	pixel_x = 6
diff --git a/_maps/templates/hilbertshotel.dmm b/_maps/templates/hilbertshotel.dmm
index 09452a387d909..9c372f8188786 100644
--- a/_maps/templates/hilbertshotel.dmm
+++ b/_maps/templates/hilbertshotel.dmm
@@ -64,7 +64,7 @@
 	pixel_x = -5;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = 9;
 	pixel_y = 2
 	},
@@ -291,7 +291,7 @@
 /area/hilbertshotel)
 "Z" = (
 /obj/structure/table/wood/poker,
-/obj/item/reagent_containers/food/drinks/coffee{
+/obj/item/reagent_containers/cup/glass/coffee{
 	pixel_x = -6;
 	pixel_y = 2
 	},
diff --git a/_maps/templates/holodeck_asylum.dmm b/_maps/templates/holodeck_asylum.dmm
index 1168e24f0d6b5..01111577d8445 100644
--- a/_maps/templates/holodeck_asylum.dmm
+++ b/_maps/templates/holodeck_asylum.dmm
@@ -127,7 +127,7 @@
 /obj/item/reagent_containers/syringe,
 /obj/item/reagent_containers/syringe,
 /obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/glass/beaker,
+/obj/item/reagent_containers/cup/beaker,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/holofloor/white,
 /area/template_noop)
diff --git a/_maps/templates/holodeck_kitchen.dmm b/_maps/templates/holodeck_kitchen.dmm
index 8a37b15c0d56a..a5a53108b74a6 100644
--- a/_maps/templates/holodeck_kitchen.dmm
+++ b/_maps/templates/holodeck_kitchen.dmm
@@ -23,7 +23,7 @@
 /obj/structure/window{
 	dir = 1
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	list_reagents = list()
 	},
 /turf/open/floor/holofloor/white,
diff --git a/_maps/templates/holodeck_teahouse.dmm b/_maps/templates/holodeck_teahouse.dmm
index 440e69bd907e7..2502855cc318e 100644
--- a/_maps/templates/holodeck_teahouse.dmm
+++ b/_maps/templates/holodeck_teahouse.dmm
@@ -36,12 +36,12 @@
 /area/template_noop)
 "g" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	icon_state = "sakecup";
 	pixel_x = -8;
 	pixel_y = 3
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	icon_state = "sakecup";
 	pixel_x = 8;
 	pixel_y = 3
@@ -97,9 +97,9 @@
 /area/template_noop)
 "p" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
-/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
+/obj/item/reagent_containers/cup/glass/mug,
 /turf/open/floor/holofloor{
 	dir = 9;
 	icon_state = "wood"
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index e7436bfc7c1be..fbbb2fbd82f26 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -112,11 +112,11 @@
 	light_color = "#DDFFD3"
 	},
 /obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 7;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinks/bottle/wine{
+/obj/item/reagent_containers/cup/glass/bottle/wine{
 	pixel_x = -6;
 	pixel_y = 10
 	},
@@ -162,7 +162,7 @@
 /area/survivalpod)
 "x" = (
 /obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
+/obj/item/reagent_containers/cup/glass/drinkingglass{
 	pixel_x = 7;
 	pixel_y = 2
 	},
diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm
index ac53b420e236c..f41c514c9fbe6 100644
--- a/_maps/templates/shelter_3.dmm
+++ b/_maps/templates/shelter_3.dmm
@@ -42,8 +42,8 @@
 /area/survivalpod)
 "i" = (
 /obj/item/book/manual/wiki/barman_recipes,
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/item/reagent_containers/glass/rag,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/item/reagent_containers/cup/rag,
 /obj/structure/table/wood/fancy/black,
 /turf/open/floor/pod/dark,
 /area/survivalpod)
@@ -193,11 +193,11 @@
 /area/survivalpod)
 "F" = (
 /obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/condiment/peppermill{
+/obj/item/reagent_containers/condiment/peppermill{
 	pixel_x = -4;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
+/obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 4;
 	pixel_y = 4
 	},
diff --git a/_maps/templates/shelter_4.dmm b/_maps/templates/shelter_4.dmm
index 6c4bf512cbc07..5ac8f7bb92da1 100644
--- a/_maps/templates/shelter_4.dmm
+++ b/_maps/templates/shelter_4.dmm
@@ -112,7 +112,7 @@
 "aB" = (
 /obj/structure/rack,
 /obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/cup/bucket,
 /obj/machinery/light/small,
 /obj/item/paper/fluff/itemnotice,
 /turf/open/floor/pod/dark,
@@ -202,7 +202,7 @@
 /obj/structure/closet,
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/gloves/fingerless,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/machinery/light{
 	dir = 8
 	},
@@ -229,7 +229,7 @@
 /obj/structure/closet,
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/gloves/fingerless,
-/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/cup/glass/bottle/beer,
 /obj/item/pickaxe/mini,
 /obj/item/clothing/under/rank/cargo/miner/lavaland,
 /turf/open/floor/pod/light,
diff --git a/_maps/templates/warped_room.dmm b/_maps/templates/warped_room.dmm
index c8c87db0e8828..db521f2c32239 100644
--- a/_maps/templates/warped_room.dmm
+++ b/_maps/templates/warped_room.dmm
@@ -84,7 +84,7 @@
 /area/warped_room)
 "r" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle,
+/obj/item/reagent_containers/cup/glass/bottle,
 /turf/open/indestructible/hotelwood,
 /area/warped_room)
 "s" = (
@@ -100,7 +100,7 @@
 /area/warped_room)
 "u" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/cola,
+/obj/item/reagent_containers/cup/soda_cans/cola,
 /obj/item/knife/kitchen,
 /obj/item/kitchen/rollingpin,
 /turf/open/indestructible/hotelwood,
diff --git a/beestation.dme b/beestation.dme
index c80536ce36350..841de06de95d0 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -2670,13 +2670,8 @@
 #include "code\modules\fields\timestop.dm"
 #include "code\modules\fields\turf_objects.dm"
 #include "code\modules\flufftext\Dreaming.dm"
-#include "code\modules\food_and_drinks\food.dm"
 #include "code\modules\food_and_drinks\pizzabox.dm"
 #include "code\modules\food_and_drinks\plate.dm"
-#include "code\modules\food_and_drinks\drinks\drinks.dm"
-#include "code\modules\food_and_drinks\drinks\drinks\bottle.dm"
-#include "code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm"
-#include "code\modules\food_and_drinks\food\condiment.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
@@ -3712,17 +3707,22 @@
 #include "code\modules\reagents\chemistry\recipes\toxins.dm"
 #include "code\modules\reagents\reagent_containers\blood_pack.dm"
 #include "code\modules\reagents\reagent_containers\borghydro.dm"
-#include "code\modules\reagents\reagent_containers\bottle.dm"
 #include "code\modules\reagents\reagent_containers\chem_bag.dm"
 #include "code\modules\reagents\reagent_containers\chem_heirloom.dm"
+#include "code\modules\reagents\reagent_containers\condiment.dm"
 #include "code\modules\reagents\reagent_containers\dropper.dm"
-#include "code\modules\reagents\reagent_containers\glass.dm"
 #include "code\modules\reagents\reagent_containers\hypospray.dm"
 #include "code\modules\reagents\reagent_containers\medspray.dm"
 #include "code\modules\reagents\reagent_containers\patch.dm"
 #include "code\modules\reagents\reagent_containers\pill.dm"
 #include "code\modules\reagents\reagent_containers\spray.dm"
 #include "code\modules\reagents\reagent_containers\syringes.dm"
+#include "code\modules\reagents\reagent_containers\cups\_cup.dm"
+#include "code\modules\reagents\reagent_containers\cups\bottle.dm"
+#include "code\modules\reagents\reagent_containers\cups\drinkingglass.dm"
+#include "code\modules\reagents\reagent_containers\cups\drinks.dm"
+#include "code\modules\reagents\reagent_containers\cups\glassbottle.dm"
+#include "code\modules\reagents\reagent_containers\cups\soda.dm"
 #include "code\modules\recycling\conveyor.dm"
 #include "code\modules\recycling\sortingmachinery.dm"
 #include "code\modules\recycling\disposal\bin.dm"
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
index 1212051c2932a..2b5b5eae98d90 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom.dm
@@ -9,6 +9,8 @@
 #define COMSIG_PARENT_EXAMINE "atom_examine"
 /// from base of atom/get_examine_name(): (/mob, list/overrides)
 #define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name"
+///from base of atom/examine_more(): (/mob)
+#define COMSIG_PARENT_EXAMINE_MORE "atom_examine_more"
 	//Positions for overrides list
 	#define EXAMINE_POSITION_ARTICLE (1<<0)
 	#define EXAMINE_POSITION_BEFORE (1<<1)
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
index 9be7a55a20cec..a3cd583da4d6f 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
@@ -54,3 +54,8 @@
 #define COMSIG_EDIBLE_ON_COMPOST "on_compost"
 	// Used to stop food from being composted.
 	#define COMPONENT_EDIBLE_BLOCK_COMPOST 1
+
+//Drink
+
+///from base of obj/item/reagent_containers/cup/attack(): (mob/M, mob/user)
+#define COMSIG_GLASS_DRANK "glass_drank"
diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 84573363b15d6..52ab065c5ae86 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -5,8 +5,12 @@
 #define PAYCHECK_EASY 15
 #define PAYCHECK_MEDIUM 40
 #define PAYCHECK_HARD 70
-#define PAYCHECK_COMMAND_NT   20 // given from nanotrasen to heads
-#define PAYCHECK_COMMAND_DEPT 80 // given from department budget
+// given from nanotrasen to heads
+#define PAYCHECK_COMMAND_NT 20
+// given from department budget
+#define PAYCHECK_COMMAND_DEPT 80
+// Command Total
+#define PAYCHECK_COMMAND 100
 #define PAYCHECK_VIP 2000
 /*	Note: The current intention for crazy amount of money to VIP is that they can be a rich shitter
 			or be targeted by antags for their money - oh, my, being rich isn't always good.
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 71ab790799e09..2831abed7a3b2 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -234,6 +234,8 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list(
 
 #define isgun(A) (istype(A, /obj/item/gun))
 
+#define is_reagent_container(O) (istype(O, /obj/item/reagent_containers))
+
 //Assemblies
 #define isassembly(O) (istype(O, /obj/item/assembly))
 
diff --git a/code/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm
index ca2e265b1309a..897745ec8ac95 100644
--- a/code/__HELPERS/randoms.dm
+++ b/code/__HELPERS/randoms.dm
@@ -37,10 +37,11 @@
 
 ///Gets a random drink excluding the blocked type
 /proc/get_random_drink()
-	var/list/blocked = list(/obj/item/reagent_containers/food/drinks/soda_cans,
-		/obj/item/reagent_containers/food/drinks/bottle
+	var/list/blocked = list(
+		/obj/item/reagent_containers/cup/soda_cans,
+		/obj/item/reagent_containers/cup/glass/bottle
 		)
-	return pick(subtypesof(/obj/item/reagent_containers/food/drinks) - blocked)
+	return pick(subtypesof(/obj/item/reagent_containers/cup/glass) - blocked)
 
 /// Picks a string of symbols to display as the law number for hacked or ion laws
 /proc/ion_num()
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
index af65c582983ef..a5d006113a368 100644
--- a/code/__HELPERS/type_processing.dm
+++ b/code/__HELPERS/type_processing.dm
@@ -10,7 +10,7 @@
 			/obj/item/clothing/head/helmet/space = "SPESSHELMET",
 			/obj/item/bodypart = "BODYPART",
 			/obj/item/book/manual = "MANUAL",
-			/obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+			/obj/item/reagent_containers/cup/glass = "DRINK", //longest paths comes first
 			/obj/item/food = "FOOD",
 			/obj/item/reagent_containers = "REAGENT_CONTAINERS",
 			/obj/machinery/atmospherics = "ATMOS_MECH",
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 6d91a65083d92..3c7a948fdfa5b 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -341,13 +341,13 @@ GLOBAL_LIST_INIT(smoker_cigarettes, list(
 ))
 
 GLOBAL_LIST_INIT(alcoholic_bottles, list(
-	/obj/item/reagent_containers/food/drinks/bottle/ale,
-	/obj/item/reagent_containers/food/drinks/bottle/beer,
-	/obj/item/reagent_containers/food/drinks/bottle/gin,
-	/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-	/obj/item/reagent_containers/food/drinks/bottle/vodka,
-	/obj/item/reagent_containers/food/drinks/bottle/rum,
-	/obj/item/reagent_containers/food/drinks/bottle/applejack
+	/obj/item/reagent_containers/cup/glass/bottle/ale,
+	/obj/item/reagent_containers/cup/glass/bottle/beer,
+	/obj/item/reagent_containers/cup/glass/bottle/gin,
+	/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+	/obj/item/reagent_containers/cup/glass/bottle/vodka,
+	/obj/item/reagent_containers/cup/glass/bottle/rum,
+	/obj/item/reagent_containers/cup/glass/bottle/applejack
 ))
 
 GLOBAL_LIST_INIT(junkie_drugs, list(
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index a70cf8e873378..747d425ee34f2 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -72,11 +72,11 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/poster/random_official = 1,
 	/obj/item/radio/headset = 1,
 	/obj/item/radio/off = 2,
-	/obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
+	/obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1,
 	/obj/item/food/canned/peaches/maint = 1,
 	/obj/item/food/grown/citrus/orange = 1,
 	/obj/item/food/grown/flower/poppy = 10,
-	/obj/item/reagent_containers/glass/rag = 3,
+	/obj/item/reagent_containers/cup/rag = 3,
 	/obj/item/reagent_containers/pill/floorpill = 4,
 	/obj/item/reagent_containers/spray/pestspray = 1,
 	/obj/item/reagent_containers/syringe/used = 4,
@@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/weldingtool = 3,
 	/obj/item/wirecutters = 1,
 	/obj/item/wrench = 4,
-	/obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
+	/obj/item/reagent_containers/cup/glass/bottle/homemaderum = 1,
 	/obj/item/xenoartifact/maint = 1,
 	/obj/item/paper_reader = 1,
 ))
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 39b5f2570be59..28e6409f2435a 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -88,21 +88,21 @@
  * * mob/living/user - The mob hitting with this item
  * * params - Click params of this attack
  */
-/obj/item/proc/attack(mob/living/M, mob/living/user, params)
-	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user, params)
+/obj/item/proc/attack(mob/living/target_mob, mob/living/user, params)
+	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, target_mob, user, params)
 	if(signal_return & COMPONENT_CANCEL_ATTACK_CHAIN)
 		return TRUE
 	if(signal_return & COMPONENT_SKIP_ATTACK)
 		return
 
-	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user, params)
-	SEND_SIGNAL(M, COMSIG_MOB_ITEM_ATTACKBY, user, src)
+	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target_mob, user, params)
+	SEND_SIGNAL(target_mob, COMSIG_MOB_ITEM_ATTACKBY, user, src)
 
 	var/nonharmfulhit = FALSE
 
 	if(user.a_intent == INTENT_HELP && !(item_flags & ISWEAPON))
 		nonharmfulhit = TRUE
-	for(var/datum/surgery/S in M.surgeries)
+	for(var/datum/surgery/S in target_mob.surgeries)
 		if(S.failed_step)
 			nonharmfulhit = FALSE //No freebies, if you fail a surgery step you should hit your patient
 			S.failed_step = FALSE //In theory the hit should only happen once, upon failing the step
@@ -120,22 +120,22 @@
 	else if(hitsound)
 		playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0)
 
-	M.lastattacker = user.real_name
-	M.lastattackerckey = user.ckey
+	target_mob.lastattacker = user.real_name
+	target_mob.lastattackerckey = user.ckey
 
-	user.do_attack_animation(M)
+	user.do_attack_animation(target_mob)
 	var/time = world.time
 	if(nonharmfulhit)
-		M.send_item_poke_message(src, user)
+		target_mob.send_item_poke_message(src, user)
 		user.time_of_last_poke = time
 	else
 		user.record_accidental_poking()
-		M.attacked_by(src, user)
-		M.time_of_last_attack_received = time
+		target_mob.attacked_by(src, user)
+		target_mob.time_of_last_attack_received = time
 		user.time_of_last_attack_dealt = time
 		user.check_for_accidental_attack()
 
-	log_combat(user, M, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit)
+	log_combat(user, target_mob, "[nonharmfulhit ? "poked" : "attacked"]", src, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", important = !nonharmfulhit)
 	add_fingerprint(user)
 
 
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 08cef4d647255..62d52b69f8606 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -115,7 +115,7 @@ SUBSYSTEM_DEF(traumas)
 
 		"lizards"   = typecacheof(list(
 			/obj/item/toy/plush/lizard_plushie, /obj/item/food/kebab/tail,
-			/obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
+			/obj/item/organ/tail/lizard, /obj/item/reagent_containers/cup/glass/bottle/lizardwine)),
 
 		"skeletons" = typecacheof(list(
 			/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
@@ -205,7 +205,7 @@ SUBSYSTEM_DEF(traumas)
 			/obj/item/katana,
 			/obj/item/food/sashimi,
 			/obj/item/food/chawanmushi,
-			/obj/item/reagent_containers/food/drinks/bottle/sake,
+			/obj/item/reagent_containers/cup/glass/bottle/sake,
 			/obj/item/throwing_star,
 			/obj/item/clothing/head/costume/kitty/genuine,
 			/obj/item/clothing/suit/space/space_ninja,
diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm
index 26d53369ea247..8195daac3be6b 100644
--- a/code/datums/ai/monkey/monkey_controller.dm
+++ b/code/datums/ai/monkey/monkey_controller.dm
@@ -151,10 +151,10 @@ have ways of interacting with a specific mob and control it.
 	return top_force_item
 
 /datum/ai_controller/monkey/proc/IsEdible(obj/item/thing)
-	if(istype(thing, /obj/item/food))
+	if(IS_EDIBLE(thing))
 		return TRUE
-	if(istype(thing, /obj/item/reagent_containers/food/drinks/drinkingglass))
-		var/obj/item/reagent_containers/food/drinks/drinkingglass/glass = thing
+	if(istype(thing, /obj/item/reagent_containers/cup/glass/drinkingglass))
+		var/obj/item/reagent_containers/cup/glass/drinkingglass/glass = thing
 		if(glass.reagents.total_volume) // The glass has something in it, time to drink the mystery liquid!
 			return TRUE
 	return FALSE
diff --git a/code/datums/components/crafting/crafting_lists/drinks.dm b/code/datums/components/crafting/crafting_lists/drinks.dm
index 4749a97cdaff7..2b9aa8963ed3f 100644
--- a/code/datums/components/crafting/crafting_lists/drinks.dm
+++ b/code/datums/components/crafting/crafting_lists/drinks.dm
@@ -4,7 +4,7 @@
 
 /datum/crafting_recipe/lizardwine
 	name = "Lizard Wine"
-	result = /obj/item/reagent_containers/food/drinks/bottle/lizardwine
+	result = /obj/item/reagent_containers/cup/glass/bottle/lizardwine
 	time = 4 SECONDS
 	reqs = list(
 		/obj/item/organ/tail/lizard = 1,
@@ -14,20 +14,20 @@
 
 /datum/crafting_recipe/moonshinejug
 	name = "Moonshine Jug"
-	result = /obj/item/reagent_containers/food/drinks/bottle/moonshine
+	result = /obj/item/reagent_containers/cup/glass/bottle/moonshine
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/consumable/ethanol/moonshine = 100
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/hoochbottle
 	name = "Hooch Bottle"
-	result = /obj/item/reagent_containers/food/drinks/bottle/hooch
+	result = /obj/item/reagent_containers/cup/glass/bottle/hooch
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/obj/item/storage/box/papersack = 1,
 		/datum/reagent/consumable/ethanol/hooch = 100
 	)
@@ -35,50 +35,50 @@
 
 /datum/crafting_recipe/blazaambottle
 	name = "Blazaam Bottle"
-	result = /obj/item/reagent_containers/food/drinks/bottle/blazaam
+	result = /obj/item/reagent_containers/cup/glass/bottle/blazaam
 	time = 2 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/consumable/ethanol/blazaam = 100
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/champagnebottle
 	name = "Champagne Bottle"
-	result = /obj/item/reagent_containers/food/drinks/bottle/champagne
+	result = /obj/item/reagent_containers/cup/glass/bottle/champagne
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/consumable/ethanol/champagne = 100
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/trappistbottle
 	name = "Trappist Bottle"
-	result = /obj/item/reagent_containers/food/drinks/bottle/trappist
+	result = /obj/item/reagent_containers/cup/glass/bottle/trappist
 	time = 1.5 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank/small = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank/small = 1,
 		/datum/reagent/consumable/ethanol/trappist = 50
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/goldschlagerbottle
 	name = "Goldschlager Bottle"
-	result = /obj/item/reagent_containers/food/drinks/bottle/goldschlager
+	result = /obj/item/reagent_containers/cup/glass/bottle/goldschlager
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/consumable/ethanol/goldschlager = 100
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/patronbottle
 	name = "Patron Bottle"
-	result = /obj/item/reagent_containers/food/drinks/bottle/patron
+	result = /obj/item/reagent_containers/cup/glass/bottle/patron
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/consumable/ethanol/patron = 100
 	)
 	category = CAT_DRINK
@@ -87,44 +87,44 @@
 
 /datum/crafting_recipe/holybottle
 	name = "Holy Water Flask"
-	result = /obj/item/reagent_containers/food/drinks/bottle/holywater
+	result = /obj/item/reagent_containers/cup/glass/bottle/holywater
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/water/holywater = 100
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/unholybottle
 	name = "Unholy Water Flask"
-	result = /obj/item/reagent_containers/food/drinks/bottle/unholywater
+	result = /obj/item/reagent_containers/cup/glass/bottle/unholywater
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/fuel/unholywater = 100
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/nothingbottle
 	name = "Nothing Bottle"
-	result = /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+	result = /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing
 	time = 3 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/bottle/blank = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/blank = 1,
 		/datum/reagent/consumable/nothing = 100
 	)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/smallcarton
 	name = "Small Carton"
-	result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton
+	result = /obj/item/reagent_containers/cup/glass/sillycup/smallcarton
 	time = 1 SECONDS
 	reqs = list(/obj/item/stack/sheet/cardboard = 1)
 	category = CAT_DRINK
 
 /datum/crafting_recipe/honeycomb
 	name = "Honeycomb"
-	result = /obj/item/reagent_containers/food/drinks/honeycomb
+	result = /obj/item/reagent_containers/cup/glass/honeycomb
 	always_available = FALSE
 	time = 3 SECONDS
 	reqs = list(/datum/reagent/consumable/sugar = 50)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
index 08a504aad342f..ffeccbf18c8b6 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_egg.dm
@@ -43,7 +43,7 @@
 	name = "Egg bowl"
 	result = /obj/item/food/salad/eggbowl
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/boiledrice = 1,
 		/obj/item/food/boiledegg = 1,
 		/obj/item/food/grown/carrot = 1,
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
index 1d79c9f3e02e3..9f2a00e44f707 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_frozen.dm
@@ -60,7 +60,7 @@
 	name = "Flavorless snowcone"
 	result = /obj/item/food/snowcones
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15
 	)
 	subcategory = CAT_ICE
@@ -69,7 +69,7 @@
 	name = "Pineapple snowcone"
 	result = /obj/item/food/snowcones/pineapple
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/pineapplejuice = 5
 	)
@@ -79,7 +79,7 @@
 	name = "Lime snowcone"
 	result = /obj/item/food/snowcones/lime
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/limejuice = 5
 	)
@@ -89,7 +89,7 @@
 	name = "Lemon snowcone"
 	result = /obj/item/food/snowcones/lemon
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/lemonjuice = 5
 	)
@@ -99,7 +99,7 @@
 	name = "Apple snowcone"
 	result = /obj/item/food/snowcones/apple
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/applejuice = 5
 	)
@@ -109,7 +109,7 @@
 	name = "Grape snowcone"
 	result = /obj/item/food/snowcones/grape
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/berryjuice = 5
 	)
@@ -119,7 +119,7 @@
 	name = "Orange snowcone"
 	result = /obj/item/food/snowcones/orange
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/orangejuice = 5
 	)
@@ -129,7 +129,7 @@
 	name = "Bluecherry snowcone"
 	result = /obj/item/food/snowcones/blue
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/bluecherryjelly= 5
 	)
@@ -139,7 +139,7 @@
 	name = "Cherry snowcone"
 	result = /obj/item/food/snowcones/red
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/cherryjelly= 5
 	)
@@ -149,7 +149,7 @@
 	name = "Berry snowcone"
 	result = /obj/item/food/snowcones/berry
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/berryjuice = 5
 	)
@@ -159,7 +159,7 @@
 	name = "Fruit Salad snowcone"
 	result = /obj/item/food/snowcones/fruitsalad
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/water  = 5,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/orangejuice = 5,
@@ -172,7 +172,7 @@
 	name = "Mime snowcone"
 	result = /obj/item/food/snowcones/mime
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/nothing = 5
 	)
@@ -182,7 +182,7 @@
 	name = "Clown snowcone"
 	result = /obj/item/food/snowcones/clown
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/laughter = 5
 	)
@@ -192,7 +192,7 @@
 	name = "Space Cola snowcone"
 	result = /obj/item/food/snowcones/soda
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/space_cola = 5
 	)
@@ -202,7 +202,7 @@
 	name = "Space Mountain Wind snowcone"
 	result = /obj/item/food/snowcones/spacemountainwind
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/spacemountainwind = 5
 	)
@@ -212,7 +212,7 @@
 	name = "Pwrgame snowcone"
 	result = /obj/item/food/snowcones/pwrgame
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/pwr_game = 15
 	)
@@ -222,7 +222,7 @@
 	name = "Honey snowcone"
 	result = /obj/item/food/snowcones/honey
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/consumable/honey = 5
 	)
@@ -232,7 +232,7 @@
 	name = "Rainbow snowcone"
 	result = /obj/item/food/snowcones/rainbow
 	reqs = list(
-		/obj/item/reagent_containers/food/drinks/sillycup = 1,
+		/obj/item/reagent_containers/cup/glass/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
 		/datum/reagent/colorful_reagent = 1 //Harder to make
 	)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
index 0af7711c7cb0f..12113261ce161 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_meat.dm
@@ -174,7 +174,7 @@
 	name = "Rice and Pork"
 	result = /obj/item/food/salad/ricepork
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/boiledrice = 1,
 		/obj/item/food/meat/cutlet = 2
 	)
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
index 5953785747886..22bb4f42eafc0 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_misc.dm
@@ -91,9 +91,9 @@
 	reqs = list(
 		/datum/reagent/consumable/ethanol/vodka = 25,
 		/obj/item/food/grown/holymelon = 1,
-		/obj/item/reagent_containers/food/drinks/bottle/vodka = 1
+		/obj/item/reagent_containers/cup/glass/bottle/vodka = 1
 	)
-	parts = list(/obj/item/reagent_containers/food/drinks/bottle/vodka = 1)
+	parts = list(/obj/item/reagent_containers/cup/glass/bottle/vodka = 1)
 	subcategory = CAT_MISCFOOD
 
 /datum/crafting_recipe/food/honeybar
@@ -131,7 +131,7 @@
 	name = "Rice pudding"
 	result = /obj/item/food/salad/ricepudding
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/datum/reagent/consumable/milk = 5,
 		/datum/reagent/consumable/sugar = 5,
 		/obj/item/food/boiledrice = 1
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
index ab12f7d7725ae..40cc955bc89b3 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_salad.dm
@@ -5,7 +5,7 @@
 	name = "Herb salad"
 	result = /obj/item/food/salad/herbsalad
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/ambrosia/vulgaris = 3,
 		/obj/item/food/grown/apple = 1
 	)
@@ -15,7 +15,7 @@
 	name = "Aesir salad"
 	result = /obj/item/food/salad/aesirsalad
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/ambrosia/deus = 3,
 		/obj/item/food/grown/apple/gold = 1
 	)
@@ -25,7 +25,7 @@
 	name = "Valid salad"
 	result = /obj/item/food/salad/validsalad
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/ambrosia/vulgaris = 3,
 		/obj/item/food/grown/potato = 1,
 		/obj/item/food/meatball = 1
@@ -39,7 +39,7 @@
 		/datum/reagent/consumable/flour = 5,
 		/datum/reagent/consumable/sodiumchloride = 1,
 		/datum/reagent/consumable/blackpepper = 1,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/monkeycube = 1,
 		/obj/item/food/grown/banana = 1
 	)
@@ -62,7 +62,7 @@
 	name = "Fruit salad"
 	result = /obj/item/food/salad/fruit
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/apple = 1,
 		/obj/item/food/grown/grapes = 1,
 		/obj/item/food/grown/citrus/orange = 1,
@@ -75,7 +75,7 @@
 	name = "Jungle salad"
 	result = /obj/item/food/salad/jungle
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/apple = 1,
 		/obj/item/food/grown/grapes = 1,
 		/obj/item/food/grown/banana = 2,
@@ -87,7 +87,7 @@
 	name = "Citrus delight"
 	result = /obj/item/food/salad/citrusdelight
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/citrus/lime = 1,
 		/obj/item/food/grown/citrus/lemon = 1,
 		/obj/item/food/grown/citrus/orange = 1
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
index b3007f054d364..09e661f555543 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_soup.dm
@@ -6,7 +6,7 @@
 	result = /obj/item/food/soup/oatmeal
 	reqs = list(
 		/datum/reagent/consumable/milk = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/oat = 1
 	)
 	subcategory = CAT_SOUP
@@ -16,7 +16,7 @@
 	result = /obj/item/food/soup/meatball
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/meatball = 1,
 		/obj/item/food/grown/carrot = 1,
 		/obj/item/food/grown/potato = 1
@@ -28,7 +28,7 @@
 	result = /obj/item/food/soup/vegetable
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/carrot = 1,
 		/obj/item/food/grown/corn = 1,
 		/obj/item/food/grown/eggplant = 1,
@@ -41,7 +41,7 @@
 	result = /obj/item/food/soup/nettle
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/nettle = 1,
 		/obj/item/food/grown/potato = 1,
 		/obj/item/food/boiledegg = 1
@@ -52,7 +52,7 @@
 	name = "Wingfangchu"
 	result = /obj/item/food/soup/wingfangchu
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/datum/reagent/consumable/soysauce = 5,
 		/obj/item/food/meat/cutlet/xeno = 2
 	)
@@ -63,7 +63,7 @@
 	result= /obj/item/food/soup/wish
 	reqs = list(
 		/datum/reagent/water = 20,
-		/obj/item/reagent_containers/glass/bowl = 1
+		/obj/item/reagent_containers/cup/bowl = 1
 	)
 	subcategory = CAT_SOUP
 
@@ -71,7 +71,7 @@
 	name = "Hot chili"
 	result = /obj/item/food/soup/hotchili
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/meat/cutlet = 2,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/grown/tomato = 1
@@ -82,7 +82,7 @@
 	name = "Cold chili"
 	result = /obj/item/food/soup/coldchili
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/meat/cutlet = 2,
 		/obj/item/food/grown/icepepper = 1,
 		/obj/item/food/grown/tomato = 1
@@ -94,7 +94,7 @@
 	result = /obj/item/food/soup/tomato
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/tomato = 2
 	)
 	subcategory = CAT_SOUP
@@ -104,7 +104,7 @@
 	result = /obj/item/food/soup/tomato/eyeball
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/tomato = 2,
 		/obj/item/organ/eyes = 1
 	)
@@ -115,7 +115,7 @@
 	result = /obj/item/food/soup/miso
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/soydope = 2,
 		/obj/item/food/tofu = 2
 	)
@@ -126,7 +126,7 @@
 	result = /obj/item/food/soup/blood
 	reqs = list(
 		/datum/reagent/blood = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/tomato/blood = 2
 	)
 	subcategory = CAT_SOUP
@@ -137,7 +137,7 @@
 	reqs = list(
 	/datum/reagent/water = 10,
 	/datum/reagent/toxin/slimejelly = 5,
-	/obj/item/reagent_containers/glass/bowl = 1
+	/obj/item/reagent_containers/cup/bowl = 1
 	)
 	subcategory = CAT_SOUP
 
@@ -146,7 +146,7 @@
 	result = /obj/item/food/soup/clownstears
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/banana = 1,
 		/obj/item/stack/sheet/mineral/bananium = 1
 	)
@@ -157,7 +157,7 @@
 	result = /obj/item/food/soup/mystery
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/badrecipe = 1,
 		/obj/item/food/tofu = 1,
 		/obj/item/food/boiledegg = 1,
@@ -171,7 +171,7 @@
 	reqs = list(
 		/datum/reagent/consumable/milk = 5,
 		/datum/reagent/water = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/mushroom/chanterelle = 1
 	)
 	subcategory = CAT_SOUP
@@ -181,7 +181,7 @@
 	result = /obj/item/food/soup/beet
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/whitebeet = 1,
 		/obj/item/food/grown/cabbage = 1,
 	)
@@ -192,7 +192,7 @@
 	result = /obj/item/food/soup/stew
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/tomato = 1,
 		/obj/item/food/meat/cutlet = 3,
 		/obj/item/food/grown/potato = 1,
@@ -207,7 +207,7 @@
 	result = /obj/item/food/soup/spacylibertyduff
 	reqs = list(
 		/datum/reagent/consumable/ethanol/vodka = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/mushroom/libertycap = 3
 	)
 	subcategory = CAT_SOUP
@@ -217,7 +217,7 @@
 	result = /obj/item/food/soup/amanitajelly
 	reqs = list(
 		/datum/reagent/consumable/ethanol/vodka = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/mushroom/amanita = 3
 	)
 	subcategory = CAT_SOUP
@@ -228,7 +228,7 @@
 	reqs = list(
 		/datum/reagent/water = 10,
 		/datum/reagent/consumable/sugar = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/potato/sweet = 2
 	)
 	subcategory = CAT_SOUP
@@ -238,7 +238,7 @@
 	result = /obj/item/food/soup/beet/red
 	reqs = list(
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/redbeet = 1,
 		/obj/item/food/grown/cabbage = 1
 	)
@@ -248,9 +248,9 @@
 	name = "Bisque"
 	result = /obj/item/food/soup/bisque
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/datum/reagent/water = 10,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/meat/crab = 1,
 		/obj/item/food/boiledrice = 1
 	)
@@ -262,7 +262,7 @@
 	reqs = list(
 		/datum/reagent/water = 5,
 		/datum/reagent/consumable/cream = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/grown/bungofruit = 1
 	)
@@ -274,7 +274,7 @@
 	reqs = list(
 		/datum/reagent/water = 10,
 		/datum/reagent/consumable/sodiumchloride = 5,
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/grown/mushroom/jupitercup = 1
 	)
 	subcategory = CAT_SOUP
diff --git a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
index 60f0c1f093b85..d21436fc59c67 100644
--- a/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
+++ b/code/datums/components/crafting/crafting_lists/foodstuffs/recipes_spaghetti.dm
@@ -40,7 +40,7 @@
 	name = "Beef noodle"
 	result = /obj/item/food/spaghetti/beefnoodle
 	reqs = list(
-		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/spaghetti/boiledspaghetti = 1,
 		/obj/item/food/meat/cutlet = 2,
 		/obj/item/food/grown/cabbage = 1
diff --git a/code/datums/components/crafting/crafting_lists/misc.dm b/code/datums/components/crafting/crafting_lists/misc.dm
index 44c524db78190..1fde5d3a2cbbe 100644
--- a/code/datums/components/crafting/crafting_lists/misc.dm
+++ b/code/datums/components/crafting/crafting_lists/misc.dm
@@ -311,7 +311,7 @@
 
 /datum/crafting_recipe/paper_cup
 	name= "Paper Cup"
-	result = /obj/item/reagent_containers/food/drinks/sillycup
+	result = /obj/item/reagent_containers/cup/glass/sillycup
 	time = 1 SECONDS
 	tools = list(TOOL_WIRECUTTER)
 	reqs = list(/obj/item/paper = 1)
diff --git a/code/datums/components/crafting/crafting_lists/primal.dm b/code/datums/components/crafting/crafting_lists/primal.dm
index 5bbb930118f4d..8aecf2931c108 100644
--- a/code/datums/components/crafting/crafting_lists/primal.dm
+++ b/code/datums/components/crafting/crafting_lists/primal.dm
@@ -268,7 +268,7 @@
 
 /datum/crafting_recipe/mushroom_bowl
 	name = "Mushroom Bowl"
-	result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
+	result = /obj/item/reagent_containers/cup/bowl/mushroom_bowl
 	time = 3 SECONDS
 	reqs = list(/obj/item/food/grown/ash_flora/shavings = 5)
 	category = CAT_PRIMAL
diff --git a/code/datums/components/crafting/crafting_lists/robots.dm b/code/datums/components/crafting/crafting_lists/robots.dm
index 11fc03c3490ab..32d87f82c6c73 100644
--- a/code/datums/components/crafting/crafting_lists/robots.dm
+++ b/code/datums/components/crafting/crafting_lists/robots.dm
@@ -39,7 +39,7 @@
 	result = /mob/living/simple_animal/bot/cleanbot
 	time = 4 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/glass/bucket = 1,
+		/obj/item/reagent_containers/cup/bucket = 1,
 		/obj/item/assembly/prox_sensor = 1,
 		/obj/item/bodypart/r_arm/robot = 1
 		)
diff --git a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
index 59d66457b5433..af1eefd2cd594 100644
--- a/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
+++ b/code/datums/components/crafting/crafting_lists/weaponry/weapons.dm
@@ -9,9 +9,9 @@
 		/datum/reagent/fuel = 50,
 		/obj/item/stack/cable_coil = 1,
 		/obj/item/assembly/igniter = 1,
-		/obj/item/reagent_containers/food/drinks/soda_cans = 1
+		/obj/item/reagent_containers/cup/soda_cans = 1
 	)
-	parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1)
+	parts = list(/obj/item/reagent_containers/cup/soda_cans = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 	dangerous_craft = TRUE
@@ -47,13 +47,13 @@
 
 /datum/crafting_recipe/molotov
 	name = "Molotov"
-	result = /obj/item/reagent_containers/food/drinks/bottle/molotov
+	result = /obj/item/reagent_containers/cup/glass/bottle/molotov
 	time = 4 SECONDS
 	reqs = list(
-		/obj/item/reagent_containers/glass/rag = 1,
-		/obj/item/reagent_containers/food/drinks/bottle = 1
+		/obj/item/reagent_containers/cup/rag = 1,
+		/obj/item/reagent_containers/cup/glass/bottle = 1
 	)
-	parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
+	parts = list(/obj/item/reagent_containers/cup/glass/bottle = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 	dangerous_craft = TRUE
diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
index c5e2c255b9c05..32bdf25d2066e 100644
--- a/code/datums/components/food/edible.dm
+++ b/code/datums/components/food/edible.dm
@@ -324,11 +324,7 @@ Behavior that's still missing from this component that original food items had t
 		else if(fullness > (600 * (1 + eater.overeatduration / 2000)))	// The more you eat - the more you can eat
 			eater.visible_message("<span class='warning'>[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!</span>", "<span class='warning'>You cannot force any more of \the [parent] to go down your throat!</span>")
 			return
-
-
-
-
-
+			
 	else //If you're feeding it to someone else.
 		if(isbrain(eater))
 			to_chat(feeder, "<span class='warning'>[eater] doesn't seem to have a mouth!</span>")
diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm
index c839dc18d2dfb..9d809165a1d91 100644
--- a/code/datums/components/infective.dm
+++ b/code/datums/components/infective.dm
@@ -33,6 +33,8 @@
 		RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack))
 		RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(try_infect_equipped))
 		RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat))
+		if(istype(parent, /obj/item/reagent_containers/cup))
+			RegisterSignal(parent, COMSIG_GLASS_DRANK, PROC_REF(try_infect_drink))
 	else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs))
 		RegisterSignal(parent, COMSIG_GIBS_STREAK, PROC_REF(try_infect_streak))
 
@@ -43,7 +45,18 @@
 		eater.ForceContractDisease(V)
 	try_infect(feeder, BODY_ZONE_L_ARM)
 
+/datum/component/infective/proc/try_infect_drink(datum/source, mob/living/drinker, mob/living/feeder)
+	SIGNAL_HANDLER
+
+	for(var/disease in diseases)
+		drinker.ForceContractDisease(disease)
+	var/appendage_zone = feeder.held_items.Find(source)
+	appendage_zone = appendage_zone == 0 ? BODY_ZONE_CHEST : appendage_zone % 2 ? BODY_ZONE_R_ARM : BODY_ZONE_L_ARM
+	try_infect(feeder, appendage_zone)
+
 /datum/component/infective/proc/clean(datum/source, clean_types)
+	SIGNAL_HANDLER
+
 	if(clean_types & required_clean_types)
 		qdel(src)
 		return TRUE
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index aeae6ab3eced1..0b100b4000541 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -107,9 +107,9 @@
 
 /datum/component/storage/concrete/pockets/helmet/Initialize()
 	. = ..()
-	can_hold = typecacheof(list(/obj/item/reagent_containers/food/drinks/bottle/vodka,
-						/obj/item/reagent_containers/food/drinks/bottle/molotov,
-						/obj/item/reagent_containers/food/drinks/drinkingglass,
+	can_hold = typecacheof(list(/obj/item/reagent_containers/cup/glass/bottle/vodka,
+						/obj/item/reagent_containers/cup/glass/bottle/molotov,
+						/obj/item/reagent_containers/cup/glass/drinkingglass,
 						/obj/item/ammo_box/a762))
 
 /datum/component/storage/concrete/pockets/void_cloak
diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm
index cbb1f5ea64ca9..30a4fb400191b 100644
--- a/code/datums/components/udder.dm
+++ b/code/datums/components/udder.dm
@@ -48,7 +48,7 @@
 	SIGNAL_HANDLER
 
 	var/mob/living/milked = parent
-	if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/glass))
+	if(milked.stat == CONSCIOUS && istype(milking_tool, /obj/item/reagent_containers/cup))
 		udder.milk(milking_tool, user)
 		if(on_milk_callback)
 			on_milk_callback.Invoke(udder.reagents.total_volume, udder.reagents.maximum_volume)
@@ -112,10 +112,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/udder)
  * Proc called from attacking the component parent with the correct item, moves reagents into the glass basically.
  *
  * Arguments:
- * * obj/item/reagent_containers/glass/milk_holder - what we are trying to transfer the reagents to
+ * * obj/item/reagent_containers/cup/milk_holder - what we are trying to transfer the reagents to
  * * mob/user - who is trying to do this
  */
-/obj/item/udder/proc/milk(obj/item/reagent_containers/glass/milk_holder, mob/user)
+/obj/item/udder/proc/milk(obj/item/reagent_containers/cup/milk_holder, mob/user)
 	if(milk_holder.reagents.total_volume >= milk_holder.volume)
 		to_chat(user, "<span class='warning'>[milk_holder] is full.</span>")
 		return
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index f50c971df5574..984492979b8e2 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -273,7 +273,7 @@
 	cure_text = "Something that would kill off the tiny cats."
 	spread_text = "Acute"
 	disease_flags = CURABLE|CAN_CARRY|CAN_RESIST
-	cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/cocoa/hot_cocoa) //kills all the tiny cats that infected your organism
+	cures = list(/datum/reagent/consumable/cocoa, /datum/reagent/consumable/hot_cocoa) //kills all the tiny cats that infected your organism
 	cure_chance = 25
 	stage_prob = 3
 	agent = "Nano-feline Toxoplasmosis"
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 9d629931bd06d..6d83539f7fc31 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -165,11 +165,28 @@
 /datum/mood_event/sec_insulated_gloves
 	description = "<span class='warning'>I look like an Assistant...</span>"
 	mood_change = -1
+
 /datum/mood_event/burnt_wings
 	description = "<span class='boldwarning'>MY PRECIOUS WINGS!!!</span>"
 	mood_change = -10
 	timeout = 10 MINUTES
 
+/datum/mood_event/soda_spill
+	description = "Cool! That's fine, I wanted to wear that soda, not drink it..."
+	mood_change = -2
+	timeout = 1 MINUTES
+
+/datum/mood_event/observed_soda_spill
+	description = "Ahaha! It's always funny to see someone get sprayed by a can of soda."
+	mood_change = 2
+	timeout = 30 SECONDS
+
+/datum/mood_event/observed_soda_spill/add_effects(mob/spilled_mob, atom/soda_can)
+	if(!spilled_mob)
+		return
+
+	description = "Ahaha! [spilled_mob] spilled [spilled_mob.p_their()] [soda_can ? soda_can.name : "soda"] all over [spilled_mob.p_them()]self! Classic."
+
 /datum/mood_event/feline_dysmorphia
 	description = "<span class='boldwarning'>I'm so ugly. I wish I was cuter!</span>"
 	mood_change = -10
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 8151b8b548ba3..8f756088a0bd0 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -28,7 +28,7 @@
 	var/obj/item/pizzabox/pizza_to_spawn = pick(list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/vegetable)) //no pineapple pizza you monster
 	new pizza_to_spawn(toLaunch)
 	for(var/i in 1 to 6)
-		new /obj/item/reagent_containers/food/drinks/beer(toLaunch)
+		new /obj/item/reagent_containers/cup/glass/bottle/beer(toLaunch)
 	new /obj/effect/pod_landingzone(T, toLaunch)
 
 /datum/station_trait/galactic_grant
diff --git a/code/datums/traits/negative_quirk.dm b/code/datums/traits/negative_quirk.dm
index d915ed9d07681..52c9026563411 100644
--- a/code/datums/traits/negative_quirk.dm
+++ b/code/datums/traits/negative_quirk.dm
@@ -151,17 +151,17 @@
 			if(JOB_NAME_MIME)
 				heirloom_type = /obj/item/food/baguette/mime
 			if(JOB_NAME_JANITOR)
-				heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket)
+				heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/cup/bucket)
 			if(JOB_NAME_COOK)
-				heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/utility/chefhat)
+				heirloom_type = pick(/obj/item/reagent_containers/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/utility/chefhat)
 			if(JOB_NAME_BOTANIST)
-				heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie)
+				heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/cup/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie)
 			if(JOB_NAME_BARTENDER)
-				heirloom_type = pick(/obj/item/reagent_containers/glass/rag, /obj/item/clothing/head/hats/tophat, /obj/item/reagent_containers/food/drinks/shaker)
+				heirloom_type = pick(/obj/item/reagent_containers/cup/rag, /obj/item/clothing/head/hats/tophat, /obj/item/reagent_containers/cup/glass/shaker)
 			if(JOB_NAME_CURATOR)
 				heirloom_type = pick(/obj/item/pen/fountain, /obj/item/storage/pill_bottle/dice)
 			if(JOB_NAME_CHAPLAIN)
-				heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater)
+				heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/cup/glass/bottle/holywater)
 			if(JOB_NAME_ASSISTANT)
 				heirloom_type = pick(/obj/item/heirloomtoolbox, /obj/item/clothing/gloves/cut/heirloom)
 			if(JOB_NAME_BARBER)
@@ -170,7 +170,7 @@
 				heirloom_type = /obj/item/gun/magic/wand
 			//Security/Command
 			if(JOB_NAME_CAPTAIN)
-				heirloom_type = /obj/item/reagent_containers/food/drinks/flask/gold
+				heirloom_type = /obj/item/reagent_containers/cup/glass/flask/gold
 			if(JOB_NAME_HEADOFSECURITY)
 				heirloom_type = /obj/item/book/manual/wiki/security_space_law
 			if(JOB_NAME_WARDEN)
@@ -178,7 +178,7 @@
 			if(JOB_NAME_SECURITYOFFICER)
 				heirloom_type = pick(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec)
 			if(JOB_NAME_DETECTIVE)
-				heirloom_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey
+				heirloom_type = /obj/item/reagent_containers/cup/glass/bottle/whiskey
 			if(JOB_NAME_LAWYER)
 				heirloom_type = pick(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law)
 			if(JOB_NAME_BRIGPHYSICIAN)
@@ -198,7 +198,7 @@
 			if(JOB_NAME_PARAMEDIC)
 				heirloom_type = pick(/obj/item/flashlight/pen, /obj/item/sensor_device)
 			if(JOB_NAME_CHEMIST)
-				heirloom_type = /obj/item/reagent_containers/glass/chem_heirloom
+				heirloom_type = /obj/item/reagent_containers/cup/chem_heirloom
 			if(JOB_NAME_VIROLOGIST)
 				heirloom_type = /obj/item/reagent_containers/dropper
 			if(JOB_NAME_GENETICIST)
@@ -242,8 +242,8 @@
 	var/family_name = names[names.len]
 
 	heirloom.AddComponent(/datum/component/heirloom, quirk_holder, family_name)
-	if(istype(heirloom, /obj/item/reagent_containers/glass/chem_heirloom)) //Edge case for chem_heirloom. Solution to component not being present on init.
-		var/obj/item/reagent_containers/glass/chem_heirloom/H = heirloom
+	if(istype(heirloom, /obj/item/reagent_containers/cup/chem_heirloom)) //Edge case for chem_heirloom. Solution to component not being present on init.
+		var/obj/item/reagent_containers/cup/chem_heirloom/H = heirloom
 		H.update_name()
 
 /datum/quirk/family_heirloom/on_process()
@@ -623,16 +623,16 @@
 	medical_record_text = "Patient is an alcohol abuser."
 	process = TRUE
 	var/where_drink //Where the bottle spawned
-	var/drink_types = list(/obj/item/reagent_containers/food/drinks/bottle/ale,
-					/obj/item/reagent_containers/food/drinks/bottle/beer,
-					/obj/item/reagent_containers/food/drinks/bottle/gin,
-					/obj/item/reagent_containers/food/drinks/bottle/whiskey,
-					/obj/item/reagent_containers/food/drinks/bottle/vodka,
-					/obj/item/reagent_containers/food/drinks/bottle/rum,
-					/obj/item/reagent_containers/food/drinks/bottle/applejack)
+	var/drink_types = list(/obj/item/reagent_containers/cup/glass/bottle/ale,
+					/obj/item/reagent_containers/cup/glass/bottle/beer,
+					/obj/item/reagent_containers/cup/glass/bottle/gin,
+					/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+					/obj/item/reagent_containers/cup/glass/bottle/vodka,
+					/obj/item/reagent_containers/cup/glass/bottle/rum,
+					/obj/item/reagent_containers/cup/glass/bottle/applejack)
 	var/need = 0 // How much they crave alcohol at the moment
 	var/tick_number = 0 // Keeping track of how many ticks have passed between a check
-	var/obj/item/reagent_containers/food/drinks/bottle/drink_instance
+	var/obj/item/reagent_containers/cup/glass/bottle/drink_instance
 
 /datum/quirk/alcoholic/on_spawn()
 	drink_instance = read_choice_preference(/datum/preference/choiced/quirk/alcohol_type)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index f7ed53101fde0..3e597f42e9fd4 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -677,6 +677,21 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom)
 
 	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
 
+/**
+ * Called when a mob examines (shift click or verb) this atom twice (or more) within EXAMINE_MORE_WINDOW (default 1 second)
+ *
+ * This is where you can put extra information on something that may be superfluous or not important in critical gameplay
+ * moments, while allowing people to manually double-examine to take a closer look
+ *
+ * Produces a signal [COMSIG_PARENT_EXAMINE_MORE]
+ */
+/atom/proc/examine_more(mob/user)
+	SHOULD_CALL_PARENT(TRUE)
+	RETURN_TYPE(/list)
+
+	. = list()
+	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .)
+
 /**
  * Updates the appearance of the icon
  *
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 3ba465848e8c6..a61e6ce240743 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -76,7 +76,7 @@
 	efficiency = 0
 	reagents.maximum_volume = 0
 	fleshamnt = 1
-	for(var/obj/item/reagent_containers/glass/G in component_parts)
+	for(var/obj/item/reagent_containers/cup/G in component_parts)
 		reagents.maximum_volume += G.volume
 		G.reagents.trans_to(src, G.reagents.total_volume)
 	for(var/obj/item/stock_parts/scanning_module/S in component_parts)
@@ -584,7 +584,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/clonepod)
 	playsound(src,'sound/hallucinations/wail.ogg', 100, TRUE)
 
 /obj/machinery/clonepod/deconstruct(disassembled = TRUE)
-	for(var/obj/item/reagent_containers/glass/G in component_parts)
+	for(var/obj/item/reagent_containers/cup/G in component_parts)
 		reagents.trans_to(G, G.reagents.maximum_volume)
 	if(occupant)
 		var/mob/living/mob_occupant = occupant
diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm
index d13be687a01b4..6038e1d014769 100644
--- a/code/game/machinery/computer/arena.dm
+++ b/code/game/machinery/computer/arena.dm
@@ -330,7 +330,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/computer/arena)
 	var/arena_turfs = get_arena_turfs()
 	for(var/mob/living/L in GLOB.mob_living_list)
 		if(L.stat != DEAD && (get_turf(L) in arena_turfs))
-			var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/G = new(get_turf(L))
+			var/obj/item/reagent_containers/cup/glass/trophy/gold_cup/G = new(get_turf(L))
 			G.name = "[L.real_name]'s Trophy"
 
 /obj/machinery/computer/arena/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm
index bdbea0b866264..3a79d2ba755aa 100644
--- a/code/game/machinery/dish_drive.dm
+++ b/code/game/machinery/dish_drive.dm
@@ -13,8 +13,8 @@
 	var/static/list/collectable_items = list(
 		/obj/item/trash/waffles,
 		/obj/item/trash/tray,
-		/obj/item/reagent_containers/glass/bowl,
-		/obj/item/reagent_containers/food/drinks/drinkingglass,
+		/obj/item/reagent_containers/cup/bowl,
+		/obj/item/reagent_containers/cup/glass/drinkingglass,
 		/obj/item/kitchen/fork,
 		/obj/item/shard,
 		/obj/item/broken_bottle
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index db82e63c621f9..4bf206dfc2fdf 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -14,9 +14,9 @@
 	var/static/list/drip_containers = typecacheof(list(
 		/obj/item/reagent_containers/blood,
 		/obj/item/reagent_containers/chem_bag,
-		/obj/item/reagent_containers/food/drinks,
+		/obj/item/reagent_containers/cup,
 		/obj/item/food, //Fuck it. You want to stab an IV into that 100u blood tomato? Be my guest.
-		/obj/item/reagent_containers/glass
+		/obj/item/reagent_containers/cup
 		)
 	)
 	var/can_convert = TRUE // If it can be made into an anesthetic machine or not
@@ -264,7 +264,7 @@
 
 /obj/machinery/iv_drip/saline/Initialize(mapload)
 	. = ..()
-	beaker = new /obj/item/reagent_containers/glass/saline(src)
+	beaker = new /obj/item/reagent_containers/cup/saline(src)
 
 /obj/machinery/iv_drip/saline/ComponentInitialize()
 	. = ..()
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 2122eede48407..15afdf7e788e3 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -57,8 +57,8 @@
 	popup.open()
 
 /obj/machinery/limbgrower/on_deconstruction()
-	for(var/obj/item/reagent_containers/glass/G in component_parts)
-		reagents.trans_to(G, G.reagents.maximum_volume)
+	for(var/obj/item/reagent_containers/cup/our_beaker in component_parts)
+		reagents.trans_to(our_beaker, our_beaker.reagents.maximum_volume)
 	..()
 
 /obj/machinery/limbgrower/attackby(obj/item/O, mob/user, params)
@@ -155,9 +155,9 @@
 
 /obj/machinery/limbgrower/RefreshParts()
 	reagents.maximum_volume = 0
-	for(var/obj/item/reagent_containers/glass/G in component_parts)
-		reagents.maximum_volume += G.volume
-		G.reagents.trans_to(src, G.reagents.total_volume)
+	for(var/obj/item/reagent_containers/cup/our_beaker in component_parts)
+		reagents.maximum_volume += our_beaker.volume
+		our_beaker.reagents.trans_to(src, our_beaker.reagents.total_volume)
 	var/T=1.2
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
 		T -= M.rating*0.2
diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm
index 54a919f2bcdd5..4c7981427cfb5 100644
--- a/code/game/machinery/newscaster/newspaper.dm
+++ b/code/game/machinery/newscaster/newspaper.dm
@@ -29,7 +29,7 @@ I am begging someone to remake this to be more like the paper UI, it's so bad.
 	user.visible_message("<span class='suicide'>[user] is focusing intently on [src]! It looks like [user.p_theyre()] trying to commit sudoku... until [user.p_their()] eyes light up with realization!</span>")
 	user.say(";JOURNALISM IS MY CALLING! EVERYBODY APPRECIATES UNBIASED REPORTI-GLORF", forced="newspaper suicide")
 	var/mob/living/carbon/human/H = user
-	var/obj/W = new /obj/item/reagent_containers/food/drinks/bottle/whiskey(H.loc)
+	var/obj/W = new /obj/item/reagent_containers/cup/glass/bottle/whiskey(H.loc)
 	playsound(H.loc, 'sound/items/drink.ogg', rand(10,50), TRUE)
 	W.reagents.trans_to(H, W.reagents.total_volume, transfered_by = user)
 	user.visible_message("<span class='suicide'>[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!</span>")
diff --git a/code/game/machinery/sleeper.dm b/code/game/machinery/sleeper.dm
index aad043793efa0..bab45ce63be5b 100644
--- a/code/game/machinery/sleeper.dm
+++ b/code/game/machinery/sleeper.dm
@@ -100,7 +100,7 @@
 	icon_state = "[initial(icon_state)][state_open ? "-open" : ""]"
 
 /obj/machinery/sleeper/attackby(obj/item/I, mob/living/user, params)
-	if ((istype(I, /obj/item/reagent_containers/glass) \
+	if ((istype(I, /obj/item/reagent_containers/cup) \
 		|| istype(I, /obj/item/reagent_containers/chem_bag)) \
 		&& user.a_intent != INTENT_HARM)
 		if (length(inserted_vials) >= max_vials)
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index fb24f329629fb..4683a8e6e0add 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -444,12 +444,12 @@
 
 	var/list/reactants = list()
 
-	for(var/obj/item/reagent_containers/glass/G in beakers)
+	for(var/obj/item/reagent_containers/cup/G in beakers)
 		reactants += G.reagents
 
 	for(var/obj/item/slime_extract/S in beakers)
 		if(S.Uses)
-			for(var/obj/item/reagent_containers/glass/G in beakers)
+			for(var/obj/item/reagent_containers/cup/G in beakers)
 				G.reagents.trans_to(S, G.reagents.total_volume)
 
 			if(S?.reagents?.total_volume)
@@ -476,7 +476,7 @@
 			B.forceMove(drop_location())
 			beakers -= B
 		return
-	else if(istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/glass/bottle))
+	else if(istype(I, /obj/item/reagent_containers/cup/beaker) || istype(I, /obj/item/reagent_containers/cup/bottle))
 		if(beakers.len < max_beakers)
 			if(!user.transferItemToLoc(I, src))
 				return
@@ -506,7 +506,7 @@
 		if(istype(G, /obj/item/grenade/chem_grenade/adv_release))
 			time_release += 50 // A typical bomb, using basic beakers, will explode over 2-4 seconds. Using two will make the reaction last for less time, but it will be more dangerous overall.
 
-		for(var/obj/item/reagent_containers/glass/B in G)
+		for(var/obj/item/reagent_containers/cup/B in G)
 			if(beakers.len < max_beakers)
 				beakers += B
 				B.forceMove(src)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index d7e77c26c4fd7..2aa9564b3f17f 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -413,7 +413,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
 					to_chat(user, "<span class='warning'>You need more space cleaner!</span>")
 				return TRUE
 
-			else if(istype(W, /obj/item/soap) || istype(W, /obj/item/reagent_containers/glass/rag))
+			else if(istype(W, /obj/item/soap) || istype(W, /obj/item/reagent_containers/cup/rag))
 				var/cleanspeed = 50
 				if(istype(W, /obj/item/soap))
 					var/obj/item/soap/used_soap = W
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 59d70bfce96d8..ec726df449cc9 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -41,7 +41,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/decal/cleanable)
 		return TRUE
 
 /obj/effect/decal/cleanable/attackby(obj/item/W, mob/user, params)
-	if((istype(W, /obj/item/reagent_containers/glass) && !istype(W, /obj/item/reagent_containers/glass/rag)) || istype(W, /obj/item/reagent_containers/food/drinks))
+	if((istype(W, /obj/item/reagent_containers/cup) && !istype(W, /obj/item/reagent_containers/cup/rag)) || istype(W, /obj/item/reagent_containers/cup/glass))
 		if(src.reagents && W.reagents)
 			. = 1 //so the containers don't splash their content on the src while scooping.
 			if(!src.reagents.total_volume)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index ccdb8b598f528..7ab8ade9e96fc 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -521,7 +521,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/landmark/ruin)
 	if(prob(70))
 		var/bottle_count = pick(10;1, 5;2, 2;3)
 		for(var/index in 1 to bottle_count)
-			var/obj/item/reagent_containers/food/drinks/beer/almost_empty/B = new(get_turf(src))
+			var/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty/B = new(get_turf(src))
 			B.pixel_x += rand(-6, 6)
 			B.pixel_y += rand(-6, 6)
 	return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index b29a67d9a7b2b..d1d3f705241e2 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -89,7 +89,7 @@ RSF
 	switch(mode)
 		if(1)
 			to_chat(user, "Dispensing Drinking Glass...")
-			new /obj/item/reagent_containers/food/drinks/drinkingglass(T)
+			new /obj/item/reagent_containers/cup/glass/drinkingglass(T)
 			use_matter(20, user)
 		if(2)
 			to_chat(user, "Dispensing Paper Sheet...")
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index b5fde44df77be..9826d0a85276c 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -177,7 +177,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	else
 		return ..()
 
-/obj/item/clothing/mask/cigarette/proc/dip(obj/item/reagent_containers/glass/glass, mob/user, proximity)
+/obj/item/clothing/mask/cigarette/proc/dip(obj/item/reagent_containers/cup/glass, mob/user, proximity)
 	if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead)
 		return
 	if(istype(glass))	//you can dip cigarettes into beakers
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 7dd6f4283e877..f6149dafa8299 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -416,7 +416,7 @@
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 1,
 		/obj/item/stock_parts/manipulator = 1,
-		/obj/item/reagent_containers/glass/beaker = 2)
+		/obj/item/reagent_containers/cup/beaker = 2)
 
 /obj/item/circuitboard/machine/circuit_imprinter/department
 	name = "departmental circuit imprinter (Machine Board)"
@@ -451,7 +451,7 @@
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 2,
 		/obj/item/stock_parts/manipulator = 2,
-		/obj/item/reagent_containers/glass/beaker = 2)
+		/obj/item/reagent_containers/cup/beaker = 2)
 
 /obj/item/circuitboard/machine/protolathe/department
 	name = "departmental protolathe (Machine Board)"
@@ -519,7 +519,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 2,
 		/obj/item/stock_parts/manipulator = 2,
-		/obj/item/reagent_containers/glass/beaker = 2)
+		/obj/item/reagent_containers/cup/beaker = 2)
 
 /obj/item/circuitboard/machine/techfab/department
 	name = "departmental techfab (Machine Board)"
@@ -704,11 +704,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
 	build_path = /obj/machinery/chem_master
 	desc = "You can turn the \"mode selection\" dial using a screwdriver."
 	req_components = list(
-		/obj/item/reagent_containers/glass/beaker = 2,
+		/obj/item/reagent_containers/cup/beaker = 2,
 		/obj/item/stock_parts/manipulator = 1,
 		/obj/item/stack/sheet/glass = 1)
 	def_components = list(
-		/obj/item/reagent_containers/glass/beaker = /obj/item/reagent_containers/glass/beaker/large)
+		/obj/item/reagent_containers/cup/beaker = /obj/item/reagent_containers/cup/beaker/large)
 	needs_anchored = FALSE
 
 /obj/item/circuitboard/machine/chem_master/attackby(obj/item/I, mob/user, params)
@@ -735,7 +735,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
 		/obj/item/stock_parts/scanning_module = 2,
 		/obj/item/stock_parts/manipulator = 2,
 		/obj/item/stack/sheet/glass = 1,
-		/obj/item/reagent_containers/glass/beaker = 2)
+		/obj/item/reagent_containers/cup/beaker = 2)
 
 /obj/item/circuitboard/machine/clonepod/experimental
 	name = "experimental clone pod (Machine Board)"
@@ -782,7 +782,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuitboard/machine/smartfridge)
 	build_path = /obj/machinery/limbgrower
 	req_components = list(
 		/obj/item/stock_parts/manipulator = 1,
-		/obj/item/reagent_containers/glass/beaker = 2,
+		/obj/item/reagent_containers/cup/beaker = 2,
 		/obj/item/stack/sheet/glass = 1)
 
 /obj/item/circuitboard/machine/protolathe/department/medical
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index fccd2d2a0d98f..24a721c1345ee 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -210,7 +210,7 @@
 	flip_cooldown = world.time + 7
 
 //canned laughter
-/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter
+/obj/item/reagent_containers/cup/soda_cans/canned_laughter
 	name = "Canned Laughter"
 	desc = "Just looking at this makes you want to giggle."
 	icon_state = "laughter"
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index fe483c15e7822..c108bb13bf0c3 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -1267,7 +1267,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/extrapolator)
 	if(user.get_active_held_item() != src)
 		to_chat(user, "<span class='warning'>The extrapolator must be held in your active hand to work!</span>")
 		return
-	var/obj/item/reagent_containers/glass/bottle/culture_bottle = new(user.drop_location())
+	var/obj/item/reagent_containers/cup/bottle/culture_bottle = new(user.drop_location())
 	culture_bottle.name = "[disease.name] culture bottle"
 	culture_bottle.desc = "A small bottle. Contains [disease.agent] culture in synthblood medium."
 	culture_bottle.reagents.add_reagent(/datum/reagent/blood, 20, data)
diff --git a/code/game/objects/items/food/donuts.dm b/code/game/objects/items/food/donuts.dm
index cf5c9231a313c..8a454957b507c 100644
--- a/code/game/objects/items/food/donuts.dm
+++ b/code/game/objects/items/food/donuts.dm
@@ -164,7 +164,7 @@
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/sugar = 3,
-		/datum/reagent/consumable/cocoa/hot_cocoa = 3,
+		/datum/reagent/consumable/hot_cocoa = 3,
 		/datum/reagent/consumable/sprinkles = 1
 	) //the cocoa reagent is just bitter.
 	tastes = list("donut" = 4, "bitterness" = 1)
@@ -293,7 +293,7 @@
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/sugar = 3,
-		/datum/reagent/consumable/cocoa/hot_cocoa = 3,
+		/datum/reagent/consumable/hot_cocoa = 3,
 		/datum/reagent/consumable/sprinkles = 1,
 		/datum/reagent/consumable/nutriment/vitamin = 1
 	) //the coco reagent is just bitter.
@@ -413,7 +413,7 @@
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/sugar = 3,
-		/datum/reagent/consumable/cocoa/hot_cocoa = 3,
+		/datum/reagent/consumable/hot_cocoa = 3,
 		/datum/reagent/consumable/sprinkles = 1,
 		/datum/reagent/consumable/nutriment/vitamin = 1
 	) //the cocoa reagent is just bitter.
diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm
index fd0f23c9853bc..ccec83065a083 100644
--- a/code/game/objects/items/food/frozen.dm
+++ b/code/game/objects/items/food/frozen.dm
@@ -79,7 +79,7 @@
 	icon = 'icons/obj/food/frozen_treats.dmi'
 	icon_state = "flavorless_sc"
 	w_class = WEIGHT_CLASS_SMALL
-	trash_type = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups
+	trash_type = /obj/item/reagent_containers/cup/glass/sillycup //We dont eat paper cups
 	food_reagents = list(
 		/datum/reagent/water = 11 // We dont get food for water/juices
 	)
diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm
index 096ab53d80e56..43f364a22fe7c 100644
--- a/code/game/objects/items/food/salad.dm
+++ b/code/game/objects/items/food/salad.dm
@@ -2,7 +2,7 @@
 ////////////////////////////////////////////SALAD////////////////////////////////////////////
 /obj/item/food/salad
 	icon = 'icons/obj/food/soupsalad.dmi'
-	trash_type = /obj/item/reagent_containers/glass/bowl
+	trash_type = /obj/item/reagent_containers/cup/bowl
 	bite_consumption = 3
 	w_class = WEIGHT_CLASS_NORMAL
 	food_reagents = list(
@@ -144,7 +144,7 @@
 	foodtypes = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
 
 
-/obj/item/reagent_containers/glass/bowl
+/obj/item/reagent_containers/cup/bowl
 	name = "bowl"
 	desc = "A simple bowl, used for soups and salads."
 	icon = 'icons/obj/food/soupsalad.dmi'
@@ -154,7 +154,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	custom_price = PAYCHECK_EASY * 0.6
 
-/obj/item/reagent_containers/glass/bowl/Initialize(mapload)
+/obj/item/reagent_containers/cup/bowl/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/salad/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6)
 
diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm
index 7566017be65c0..e673e53bfbb8a 100644
--- a/code/game/objects/items/food/soup.dm
+++ b/code/game/objects/items/food/soup.dm
@@ -1,7 +1,7 @@
 /obj/item/food/soup
 	w_class = WEIGHT_CLASS_NORMAL
 	icon = 'icons/obj/food/soupsalad.dmi'
-	trash_type = /obj/item/reagent_containers/glass/bowl
+	trash_type = /obj/item/reagent_containers/cup/bowl
 	bite_consumption = 5
 	max_volume = 80
 	food_reagents = list(
@@ -73,7 +73,7 @@
 	name = "wing fang chu"
 	desc = "A savory dish of alien wing wang in soy."
 	icon_state = "wingfangchu"
-	trash_type = /obj/item/reagent_containers/glass/bowl
+	trash_type = /obj/item/reagent_containers/cup/bowl
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment/protein = 9,
 		/datum/reagent/consumable/soysauce = 10,
diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm
index 57873a6675487..3ad8b59a3eec4 100644
--- a/code/game/objects/items/food/spaghetti.dm
+++ b/code/game/objects/items/food/spaghetti.dm
@@ -74,7 +74,7 @@
 	name = "beef noodle"
 	desc = "Nutritious, beefy and noodly."
 	icon_state = "beefnoodle"
-	trash_type = /obj/item/reagent_containers/glass/bowl
+	trash_type = /obj/item/reagent_containers/cup/bowl
 	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3)
 	tastes = list("noodle" = 1, "meat" = 1)
 	foodtypes = GRAIN | MEAT
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 114822d13d90d..c5cbc97a890c6 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -6,9 +6,16 @@
 	w_class = WEIGHT_CLASS_SMALL
 	force = 2
 	var/stage = GRENADE_EMPTY
-	var/list/obj/item/reagent_containers/glass/beakers = list()
-	var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/waterbottle)
-	var/list/banned_containers = list(/obj/item/reagent_containers/glass/beaker/bluespace) //Containers to exclude from specific grenade subtypes
+	/// The set of reagent containers that have been added to this grenade casing.
+	var/list/obj/item/reagent_containers/cup/beakers = list()
+	/// The types of reagent containers that can be added to this grenade casing.
+	var/list/allowed_containers = list(
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
+		/obj/item/reagent_containers/cup/waterbottle
+	)
+	/// The types of reagent containers that can't be added to this grenade casing.
+	var/list/banned_containers = list(/obj/item/reagent_containers/cup/beaker/bluespace)
 	var/affected_area = 3
 	var/ignition_temp = 10 // The amount of heat added to the reagents when this grenade goes off.
 	var/threatscale = 1 // Used by advanced grenades to make them slightly more worthy.
@@ -37,7 +44,7 @@
 	if(user.can_see_reagents())
 		if(beakers.len)
 			. += "<span class='notice'>You scan the grenade and detect the following reagents:</span>"
-			for(var/obj/item/reagent_containers/glass/G in beakers)
+			for(var/obj/item/reagent_containers/cup/G in beakers)
 				for(var/datum/reagent/R in G.reagents.reagent_list)
 					. += "<span class='notice'>[R.volume] units of [R.name] in the [G.name].</span>"
 			if(beakers.len == 1)
@@ -48,7 +55,7 @@
 		if(beakers.len == 2 && beakers[1].name == beakers[2].name)
 			. += "<span class='notice'>You see two [beakers[1].name]s inside the grenade.</span>"
 		else
-			for(var/obj/item/reagent_containers/glass/G in beakers)
+			for(var/obj/item/reagent_containers/cup/G in beakers)
 				. += "<span class='notice'>You see a [G.name] inside the grenade.</span>"
 
 /obj/item/grenade/chem_grenade/attack_self(mob/user)
@@ -194,7 +201,7 @@
 		return
 
 	var/list/datum/reagents/reactants = list()
-	for(var/obj/item/reagent_containers/glass/G in beakers)
+	for(var/obj/item/reagent_containers/cup/G in beakers)
 		reactants += G.reagents
 
 	var/turf/detonation_turf = get_turf(src)
@@ -221,7 +228,11 @@
 	desc = "A custom made large grenade. Larger splash range and increased ignition temperature compared to basic grenades. Fits exotic and bluespace based containers."
 	casedesc = "This casing affects a larger area than the basic model and can fit exotic containers, including slime cores and bluespace beakers. Heats contents by 25 K upon ignition."
 	icon_state = "large_grenade"
-	allowed_containers = list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/condiment, /obj/item/reagent_containers/food/drinks)
+	allowed_containers = list(
+		/obj/item/reagent_containers/cup,
+		/obj/item/reagent_containers/condiment,
+		/obj/item/reagent_containers/cup/glass,
+	)
 	banned_containers = list()
 	affected_area = 5
 	ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
@@ -235,7 +246,7 @@
 
 	for(var/obj/item/slime_extract/S in beakers)
 		if(S.Uses)
-			for(var/obj/item/reagent_containers/glass/G in beakers)
+			for(var/obj/item/reagent_containers/cup/G in beakers)
 				G.reagents.trans_to(S, G.reagents.total_volume)
 
 			//If there is still a core (sometimes it's used up)
@@ -244,7 +255,7 @@
 
 			if(S)
 				if(S.reagents?.total_volume)
-					for(var/obj/item/reagent_containers/glass/G in beakers)
+					for(var/obj/item/reagent_containers/cup/G in beakers)
 						S.reagents.trans_to(G, S.reagents.total_volume)
 				else
 					S.forceMove(get_turf(src))
@@ -335,15 +346,15 @@
 
 /obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
 
-	B1.reagents.add_reagent(/datum/reagent/aluminium, 30)
-	B2.reagents.add_reagent(/datum/reagent/foaming_agent, 10)
-	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10)
+	beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 30)
+	beaker_two.reagents.add_reagent(/datum/reagent/foaming_agent, 10)
+	beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10)
 
-	beakers += B1
-	beakers += B2
+	beakers += beaker_one
+	beakers += beaker_two
 
 
 /obj/item/grenade/chem_grenade/smart_metal_foam
@@ -351,17 +362,18 @@
 	desc = "Used for emergency sealing of hull breaches, while keeping areas accessible."
 	stage = GRENADE_READY
 
+
 /obj/item/grenade/chem_grenade/smart_metal_foam/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
 
-	B1.reagents.add_reagent(/datum/reagent/aluminium, 75)
-	B2.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25)
-	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25)
+	beaker_one.reagents.add_reagent(/datum/reagent/aluminium, 75)
+	beaker_two.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25)
+	beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25)
 
-	beakers += B1
-	beakers += B2
+	beakers += beaker_one
+	beakers += beaker_two
 
 
 /obj/item/grenade/chem_grenade/incendiary
@@ -371,15 +383,15 @@
 
 /obj/item/grenade/chem_grenade/incendiary/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
 
-	B1.reagents.add_reagent(/datum/reagent/phosphorus, 25)
-	B2.reagents.add_reagent(/datum/reagent/stable_plasma, 25)
-	B2.reagents.add_reagent(/datum/reagent/toxin/acid, 25)
+	beaker_one.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+	beaker_two.reagents.add_reagent(/datum/reagent/stable_plasma, 25)
+	beaker_two.reagents.add_reagent(/datum/reagent/toxin/acid, 25)
 
-	beakers += B1
-	beakers += B2
+	beakers += beaker_one
+	beakers += beaker_two
 
 
 /obj/item/grenade/chem_grenade/antiweed
@@ -389,16 +401,16 @@
 
 /obj/item/grenade/chem_grenade/antiweed/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
 
-	B1.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25)
-	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
-	B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
-	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
+	beaker_one.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25)
+	beaker_one.reagents.add_reagent(/datum/reagent/potassium, 25)
+	beaker_two.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+	beaker_two.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
 
-	beakers += B1
-	beakers += B2
+	beakers += beaker_one
+	beakers += beaker_two
 
 
 /obj/item/grenade/chem_grenade/cleaner
@@ -408,15 +420,15 @@
 
 /obj/item/grenade/chem_grenade/cleaner/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src)
+	var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src)
 
-	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
-	B2.reagents.add_reagent(/datum/reagent/water, 40)
-	B2.reagents.add_reagent(/datum/reagent/space_cleaner, 10)
+	beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
+	beaker_two.reagents.add_reagent(/datum/reagent/water, 40)
+	beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner, 10)
 
-	beakers += B1
-	beakers += B2
+	beakers += beaker_one
+	beakers += beaker_two
 
 
 /obj/item/grenade/chem_grenade/ez_clean
@@ -426,15 +438,15 @@
 
 /obj/item/grenade/chem_grenade/ez_clean/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/beaker_one = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/beaker_two = new(src)
 
-	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
-	B2.reagents.add_reagent(/datum/reagent/water, 40)
-	B2.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a  t h i c c  distribution
+	beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
+	beaker_two.reagents.add_reagent(/datum/reagent/water, 40)
+	beaker_two.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a  t h i c c  distribution
 
-	beakers += B1
-	beakers += B2
+	beakers += beaker_one
+	beakers += beaker_two
 
 
 
@@ -445,8 +457,8 @@
 
 /obj/item/grenade/chem_grenade/teargas/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 60)
 	B1.reagents.add_reagent(/datum/reagent/potassium, 40)
@@ -464,8 +476,8 @@
 
 /obj/item/grenade/chem_grenade/facid/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 290)
 	B1.reagents.add_reagent(/datum/reagent/potassium, 10)
@@ -484,8 +496,8 @@
 
 /obj/item/grenade/chem_grenade/colorful/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/colorful_reagent, 25)
 	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
@@ -503,8 +515,8 @@
 
 /obj/item/grenade/chem_grenade/glitter/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/B2 = new(src)
 
 	B1.reagents.add_reagent(glitter_type, 25)
 	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
@@ -536,8 +548,8 @@
 
 /obj/item/grenade/chem_grenade/clf3/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 250)
 	B1.reagents.add_reagent(/datum/reagent/clf3, 50)
@@ -554,8 +566,8 @@
 
 /obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/cryptobiolin, 75)
 	B1.reagents.add_reagent(/datum/reagent/water, 50)
@@ -574,8 +586,8 @@
 
 /obj/item/grenade/chem_grenade/tuberculosis/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/bluespace/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/potassium, 50)
 	B1.reagents.add_reagent(/datum/reagent/phosphorus, 50)
@@ -594,8 +606,8 @@
 
 /obj/item/grenade/chem_grenade/holy/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/potassium, 100)
 	B2.reagents.add_reagent(/datum/reagent/water/holywater, 100)
@@ -610,8 +622,8 @@
 
 /obj/item/grenade/chem_grenade/ghostbuster/Initialize(mapload)
 	. = ..()
-	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/B1 = new(src)
+	var/obj/item/reagent_containers/cup/beaker/large/B2 = new(src)
 
 	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 50)
 	B1.reagents.add_reagent(/datum/reagent/water/holywater, 50)
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 5d13e9cc741e6..ae5fc7ee8189e 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -34,7 +34,7 @@
 
 /obj/item/grenade/iedcasing/CheckParts(list/parts_list)
 	..()
-	var/obj/item/reagent_containers/food/drinks/soda_cans/can = locate() in contents
+	var/obj/item/reagent_containers/cup/soda_cans/can = locate() in contents
 	if(can)
 		can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED
 		can.pixel_y = 0
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 5f94dc3f0f89d..718e93d430268 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -84,7 +84,7 @@
 	icon_state = "studentuni"
 	item_state = "studentuni"
 	body_parts_covered = ARMS|CHEST
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 
 /obj/item/storage/box/holy/sentinel
 	name = "Stone Sentinel Kit"
diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm
index c5e7248c6dd7d..7689e50de68dc 100644
--- a/code/game/objects/items/mail.dm
+++ b/code/game/objects/items/mail.dm
@@ -25,8 +25,8 @@
 
 	var/static/list/generic_goodies = list(
 		/obj/item/stack/spacecash/c10										= 22, //the lamest chance to get item, what do you expect really?
-		/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game			= 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy	= 10,
+		/obj/item/reagent_containers/cup/soda_cans/pwr_game			= 10,
+		/obj/item/reagent_containers/cup/soda_cans/monkey_energy	= 10,
 		/obj/item/food/cheesiehonkers 			= 10,
 		/obj/item/food/candy						= 10,
 		/obj/item/food/chips						= 10,
@@ -51,8 +51,8 @@
 			/obj/item/book/granter/spell/mimery_blockade,
 			/obj/item/gun/ballistic/rifle/boltaction/enchanted,
 			/obj/item/melee/classic_baton/police/telescopic,
-			/obj/item/reagent_containers/glass/bottle/random_virus/minor,
-			/obj/item/reagent_containers/glass/bottle/random_virus,
+			/obj/item/reagent_containers/cup/bottle/random_virus/minor,
+			/obj/item/reagent_containers/cup/bottle/random_virus,
 			/obj/item/gun/ballistic/revolver/nagant
 		)
 
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index aa87ec7cd0bb2..25dc5d1e95467 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -48,7 +48,7 @@
 
 	var/turf/T = get_turf(A)
 
-	if(istype(A, /obj/item/reagent_containers/glass/bucket) || istype(A, /obj/structure/janitorialcart))
+	if(istype(A, /obj/item/reagent_containers/cup/bucket) || istype(A, /obj/structure/janitorialcart))
 		return
 
 	if(T)
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 2d53fad04d176..8026df29df82a 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -931,8 +931,8 @@
 	name = "container storage apparatus"
 	desc = "A special apparatus for carrying containers without spilling the contents. It can also synthesize new beakers!"
 	icon_state = "borg_beaker_apparatus"
-	storable = list(/obj/item/reagent_containers/glass)
-	var/defaultcontainer = /obj/item/reagent_containers/glass/beaker
+	storable = list(/obj/item/reagent_containers/cup)
+	var/defaultcontainer = /obj/item/reagent_containers/cup/beaker
 
 /obj/item/borg/apparatus/container/Destroy()
 	if(stored)
@@ -944,7 +944,7 @@
 /obj/item/borg/apparatus/container/examine()
 	. = ..()
 	//apparatus/container/service means this will not always be true.
-	if(istype(stored, /obj/item/reagent_containers/glass))
+	if(istype(stored, /obj/item/reagent_containers/cup))
 		var/obj/item/reagent_containers/C = stored
 		. += "The apparatus currently has [C] secured, which contains:"
 		if(length(C.reagents.reagent_list))
@@ -962,7 +962,7 @@
 		stored.pixel_x = 0
 		stored.pixel_y = 0
 		var/mutable_appearance/stored_copy = new /mutable_appearance(stored)
-		if(istype(stored, /obj/item/reagent_containers/glass/beaker))
+		if(istype(stored, /obj/item/reagent_containers/cup/beaker))
 			arm.pixel_y = arm.pixel_y - 3
 		stored_copy.layer = FLOAT_LAYER
 		stored_copy.plane = FLOAT_PLANE
@@ -1038,24 +1038,26 @@
 /obj/item/borg/apparatus/container/service
 	name = "versatile service grasper"
 	desc = "Specially designed for carrying glasses, food and seeds. It can also synthesize glasses for drinks!"
-	storable = list(/obj/item/reagent_containers/food,
-	/obj/item/reagent_containers/glass,
+	storable = list(
+	/obj/item/food,
+	/obj/item/reagent_containers/condiment,
+	/obj/item/reagent_containers/cup,
 	/obj/item/seeds,
 	/obj/item/storage/fancy/donut_box,
 	/obj/item/storage/fancy/egg_box,
 	/obj/item/clothing/mask/cigarette,
 	/obj/item/storage/fancy/cigarettes,
-	/obj/item/reagent_containers/glass/beaker,
-	/obj/item/reagent_containers/glass/bottle,
-	/obj/item/reagent_containers/glass/bucket
+	/obj/item/reagent_containers/cup/beaker,
+	/obj/item/reagent_containers/cup/bottle,
+	/obj/item/reagent_containers/cup/bucket
 	)
-	defaultcontainer = /obj/item/reagent_containers/food/drinks/drinkingglass
+	defaultcontainer = /obj/item/reagent_containers/cup/glass/drinkingglass
 
 
 /obj/item/borg/apparatus/container/service/examine()
 	. = ..()
 	//Parent type handles this type. All other objects held are handled here.
-	if(!istype(stored, /obj/item/reagent_containers/glass))
+	if(!istype(stored, /obj/item/reagent_containers/cup))
 		. += "You are currently holding [stored]."
 		. += "<span class='notice'<i>Alt-click</i> will drop the currently stored [stored].</span>"
 
diff --git a/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm b/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm
index fcbc2b8c20551..3750b2d00d725 100644
--- a/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm
+++ b/code/game/objects/items/stacks/sheets/miscellaneous/miscellaneous_mats_recipes.dm
@@ -23,8 +23,8 @@ STACKSIZE_MACRO(/obj/item/stack/sheet/snow)
 
 GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 4 SECONDS), \
-	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/waterbottle/empty), \
-	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/waterbottle/large/empty,3), \
+	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/empty), \
+	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/large/empty,3), \
 	new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2), \
 	new /datum/stack_recipe("plastic chair", /obj/structure/chair/fancy/plastic, one_per_turf = TRUE, on_floor = TRUE, time = 2 SECONDS), \
 ))
diff --git a/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm b/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm
index 05f8ef3588094..1987c3979daae 100644
--- a/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm
+++ b/code/game/objects/items/stacks/sheets/organic/cloths_recipes.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("sheet snatcher",						/obj/item/storage/bag/sheetsnatcher, 6, time = 4 SECONDS), \
 	null, \
 	new/datum/stack_recipe("improvised gauze",						/obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
-	new/datum/stack_recipe("rag",									/obj/item/reagent_containers/glass/rag, 1, time = 1 SECONDS), \
+	new/datum/stack_recipe("rag",									/obj/item/reagent_containers/cup/rag, 1, time = 1 SECONDS), \
 	new/datum/stack_recipe("bedsheet",								/obj/item/bedsheet, 3, time = 4 SECONDS), \
 	new/datum/stack_recipe("double bedsheet",						/obj/item/bedsheet/double, 6, time = 8 SECONDS), \
 	new/datum/stack_recipe("empty sandbag",							/obj/item/emptysandbag, 4, time = 2 SECONDS), \
diff --git a/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm b/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm
index 63d119485eef0..66f69f46b99b6 100644
--- a/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm
+++ b/code/game/objects/items/stacks/sheets/organic/wood_recipes.dm
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("wooden crate",							/obj/structure/closet/crate/wooden, 6, one_per_turf = TRUE, on_floor = TRUE, time = 5 SECONDS),\
 	new/datum/stack_recipe("baseball bat",							/obj/item/melee/baseball_bat, 5, time = 1.5 SECONDS),\
 	new/datum/stack_recipe("loom",									/obj/structure/loom, 10, one_per_turf = TRUE, on_floor = TRUE, time = 1.5 SECONDS), \
-	new/datum/stack_recipe("mortar",								/obj/item/reagent_containers/glass/mortar, 3), \
+	new/datum/stack_recipe("mortar",								/obj/item/reagent_containers/cup/mortar, 3), \
 	new/datum/stack_recipe("firebrand",								/obj/item/match/firebrand, 2, time = 10 SECONDS), \
 	null, \
 	new/datum/stack_recipe_list("pews", list(
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 26c96ec713fe9..2fb6538c07ca5 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -420,7 +420,7 @@
 		/obj/item/mail,
 		/obj/item/small_delivery,
 		/obj/item/paper,
-		/obj/item/reagent_containers/food/condiment/milk,
+		/obj/item/reagent_containers/condiment/milk,
 		/obj/item/food/bread/plain
 		)
 	)
@@ -731,7 +731,7 @@
 	new /obj/item/gun/ballistic/automatic/pistol/APS(src)
 	new /obj/item/ammo_box/magazine/pistolm9mm(src)
 	new /obj/item/ammo_box/magazine/pistolm9mm(src)
-	new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src)
+	new /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka(src)
 	new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
 	new /obj/item/storage/firstaid/tactical(src)
 
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 6a9c803c2cc88..279618bf75776 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -251,7 +251,7 @@
 	STR.max_w_class = WEIGHT_CLASS_NORMAL
 	STR.max_combined_w_class = 100
 	STR.max_items = 100
-	STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb, /obj/item/disk/plantgene, /obj/item/food/seaweed_sheet))
+	STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/cup/glass/honeycomb, /obj/item/disk/plantgene, /obj/item/food/seaweed_sheet))
 
 ////////
 
@@ -429,7 +429,7 @@
 	STR.max_combined_w_class = 200
 	STR.max_items = 50
 	STR.insert_preposition = "in"
-	STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/medspray, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/waterbottle))
+	STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/medspray, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/glass/waterbottle))
 
 /*
  *  Biowaste bag (mostly for xenobiologists)
@@ -450,7 +450,7 @@
 	STR.max_combined_w_class = 200
 	STR.max_items = 25
 	STR.insert_preposition = "in"
-	STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/food/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, /obj/item/bodypart))
+	STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/food/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, /obj/item/bodypart))
 
 /obj/item/storage/bag/bio/pre_attack(atom/A, mob/living/user, params)
 	if(istype(A, /obj/item/slimecross/reproductive))
@@ -473,4 +473,4 @@
 	STR.max_items = 50
 	STR.max_w_class = WEIGHT_CLASS_SMALL
 	STR.insert_preposition = "in"
-	STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/rcd_ammo))
+	STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/cup/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/rcd_ammo))
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index e247252257742..89c5987d00d45 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -92,8 +92,8 @@
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	var/static/list/can_hold = typecacheof(list(
 		/obj/item/reagent_containers/spray,
-		/obj/item/reagent_containers/glass/beaker,//those will usually be used for fertilizer
-		/obj/item/reagent_containers/glass/bottle,//fertilizer bottles
+		/obj/item/reagent_containers/cup/beaker,//those will usually be used for fertilizer
+		/obj/item/reagent_containers/cup/bottle,//fertilizer bottles
 		/obj/item/reagent_containers/syringe,//blood samples for pod cloning
 		/obj/item/reagent_containers/dropper,//on request by forums users
 		/obj/item/plant_analyzer,
@@ -228,8 +228,8 @@
 		/obj/item/healthanalyzer,
 		/obj/item/dnainjector,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
 		/obj/item/reagent_containers/medspray,
@@ -392,7 +392,7 @@
 		/obj/item/stack/sheet/bone,
 		/obj/item/lighter,
 		/obj/item/storage/fancy/cigarettes,
-		/obj/item/reagent_containers/food/drinks/bottle,
+		/obj/item/reagent_containers/cup/glass/bottle,
 		/obj/item/stack/medical,
 		/obj/item/knife/combat/survival,
 		/obj/item/tank/internals/emergency_oxygen,
@@ -404,7 +404,8 @@
 		/obj/item/reagent_containers/pill,
 		/obj/item/storage/pill_bottle,
 		/obj/item/stack/ore,
-		/obj/item/reagent_containers/food/drinks,
+		/obj/item/reagent_containers/cup/glass,
+		/obj/item/reagent_containers/cup/glass/bottle,
 		/obj/item/organ/regenerative_core,
 		/obj/item/wormhole_jaunter,
 		/obj/item/storage/bag/plants,
@@ -516,7 +517,7 @@
 	STR.max_w_class = WEIGHT_CLASS_SMALL
 	var/static/list/can_hold = typecacheof(list(
 		/obj/item/food,
-		/obj/item/reagent_containers/food/drinks
+		/obj/item/reagent_containers/cup/glass
 		))
 	STR.can_hold = can_hold
 	var/amount = 5
@@ -524,27 +525,27 @@
 	while(contents.len <= amount)
 		rig_snacks = pick(list(
 		/obj/item/food/candy,
-		/obj/item/reagent_containers/food/drinks/dry_ramen,
+		/obj/item/food/cheesiehonkers,
+		/obj/item/food/cheesynachos,
+		/obj/item/food/cubannachos,
 		/obj/item/food/chips,
+		/obj/item/food/donkpocket,
 		/obj/item/food/sosjerky,
 		/obj/item/food/syndicake,
 		/obj/item/food/spacetwinkie,
-		/obj/item/food/cheesiehonkers,
 		/obj/item/food/nachos,
-		/obj/item/food/cheesynachos,
-		/obj/item/food/cubannachos,
 		/obj/item/food/nugget,
 		/obj/item/food/spaghetti/pastatomato,
 		/obj/item/food/rofflewaffles,
-		/obj/item/food/donkpocket,
-		/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-		/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
-		/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-		/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
-		/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-		/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-		/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
-		/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
+		/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola,
+		/obj/item/reagent_containers/cup/glass/dry_ramen,
+		/obj/item/reagent_containers/cup/soda_cans/cola,
+		/obj/item/reagent_containers/cup/soda_cans/dr_gibb,
+		/obj/item/reagent_containers/cup/soda_cans/lemon_lime,
+		/obj/item/reagent_containers/cup/soda_cans/pwr_game,
+		/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind,
+		/obj/item/reagent_containers/cup/soda_cans/space_up,
+		/obj/item/reagent_containers/cup/soda_cans/starkist,
 		))
 		new rig_snacks(src)
 
@@ -600,7 +601,7 @@
 		/obj/item/screwdriver,
 		/obj/item/lighter,
 		/obj/item/multitool,
-		/obj/item/reagent_containers/food/drinks/bottle/molotov,
+		/obj/item/reagent_containers/cup/glass/bottle/molotov,
 		/obj/item/grenade/plastic/c4,
 		/obj/item/food/grown/cherry_bomb,
 		/obj/item/food/grown/firelemon
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index d18fcc98415a5..1a60b72761a23 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -250,7 +250,7 @@
 	desc = "To be applied to the head repeatedly."
 
 /obj/item/storage/book/bible/booze/PopulateContents()
-	new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+	new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
 
 /obj/item/storage/book/bible/syndicate
 	icon_state ="ebook"
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 738f84b630de7..a9a5c923f2314 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -316,7 +316,7 @@
 
 /obj/item/storage/box/beakers/PopulateContents()
 	for(var/i in 1 to 7)
-		new /obj/item/reagent_containers/glass/beaker( src )
+		new /obj/item/reagent_containers/cup/beaker( src )
 
 /obj/item/storage/box/beakers/bluespace
 	name = "box of bluespace beakers"
@@ -324,18 +324,18 @@
 
 /obj/item/storage/box/beakers/bluespace/PopulateContents()
 	for(var/i in 1 to 7)
-		new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+		new /obj/item/reagent_containers/cup/beaker/bluespace(src)
 
 /obj/item/storage/box/beakers/variety
 	name = "beaker variety box"
 
 /obj/item/storage/box/beakers/variety/PopulateContents()
-	new /obj/item/reagent_containers/glass/beaker(src)
-	new /obj/item/reagent_containers/glass/beaker/large(src)
-	new /obj/item/reagent_containers/glass/beaker/plastic(src)
-	new /obj/item/reagent_containers/glass/beaker/meta(src)
-	new /obj/item/reagent_containers/glass/beaker/noreact(src)
-	new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+	new /obj/item/reagent_containers/cup/beaker(src)
+	new /obj/item/reagent_containers/cup/beaker/large(src)
+	new /obj/item/reagent_containers/cup/beaker/plastic(src)
+	new /obj/item/reagent_containers/cup/beaker/meta(src)
+	new /obj/item/reagent_containers/cup/beaker/noreact(src)
+	new /obj/item/reagent_containers/cup/beaker/bluespace(src)
 
 /obj/item/storage/box/medsprays
 	name = "box of medical sprayers"
@@ -503,7 +503,7 @@
 
 /obj/item/storage/box/drinkingglasses/PopulateContents()
 	for(var/i in 1 to 6)
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+		new /obj/item/reagent_containers/cup/glass/drinkingglass(src)
 
 /obj/item/storage/box/condimentbottles
 	name = "box of condiment bottles"
@@ -512,7 +512,7 @@
 
 /obj/item/storage/box/condimentbottles/PopulateContents()
 	for(var/i in 1 to 6)
-		new /obj/item/reagent_containers/food/condiment(src)
+		new /obj/item/reagent_containers/condiment(src)
 
 /obj/item/storage/box/cups
 	name = "box of paper cups"
@@ -521,7 +521,7 @@
 
 /obj/item/storage/box/cups/PopulateContents()
 	for(var/i in 1 to 7)
-		new /obj/item/reagent_containers/food/drinks/sillycup( src )
+		new /obj/item/reagent_containers/cup/glass/sillycup( src )
 
 /obj/item/storage/box/donkpockets
 
@@ -1018,7 +1018,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/food/grown/tomato(src)
 		new /obj/item/food/meatball(src)
-	new /obj/item/reagent_containers/food/drinks/bottle/wine(src)
+	new /obj/item/reagent_containers/cup/glass/bottle/wine(src)
 
 /obj/item/storage/box/ingredients/vegetarian
 	theme_name = "vegetarian"
@@ -1083,7 +1083,7 @@
 		new /obj/item/food/grown/oat(src)
 	new /obj/item/food/grown/wheat(src)
 	new /obj/item/food/grown/cocoapod(src)
-	new /obj/item/reagent_containers/honeycomb(src)
+	new /obj/item/reagent_containers/cup/glass/honeycomb(src)
 	new /obj/item/seeds/flower/poppy(src)
 
 /obj/item/storage/box/ingredients/carnivore
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 89757d2ccb506..879422c37cfcd 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -75,8 +75,8 @@
 		/obj/item/healthanalyzer,
 		/obj/item/dnainjector,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
 		/obj/item/reagent_containers/medspray,
@@ -374,8 +374,8 @@
 		/obj/item/healthanalyzer,
 		/obj/item/dnainjector,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
 		/obj/item/reagent_containers/medspray,
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index feb0e77a45678..c136caa9b76d8 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -137,7 +137,7 @@
 			new /obj/item/clothing/under/chameleon(src)
 			new /obj/item/card/id/syndicate(src)
 			new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
-			new /obj/item/reagent_containers/glass/rag(src)
+			new /obj/item/reagent_containers/cup/rag(src)
 			new /obj/item/encryptionkey/syndicate(src)
 
 		if("ninja")
@@ -188,7 +188,7 @@
 			new /obj/item/clothing/mask/rat/bee(src) // 0 tc
 			new /obj/item/storage/belt/fannypack/yellow(src) // 0 tc
 			new /obj/item/storage/box/syndie_kit/bee_grenades(src) // 15 tc
-			new /obj/item/reagent_containers/glass/bottle/beesease(src) // 10 tc?
+			new /obj/item/reagent_containers/cup/bottle/beesease(src) // 10 tc?
 			new /obj/item/gun/chem/bee(src) //priceless
 
 		if("mr_freeze")
@@ -407,19 +407,19 @@
 	STR.max_items = 14
 
 /obj/item/storage/box/syndie_kit/chemical/PopulateContents()
-	new /obj/item/reagent_containers/glass/bottle/polonium(src)
-	new /obj/item/reagent_containers/glass/bottle/venom(src)
-	new /obj/item/reagent_containers/glass/bottle/fentanyl(src)
-	new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
-	new /obj/item/reagent_containers/glass/bottle/spewium(src)
-	new /obj/item/reagent_containers/glass/bottle/cyanide(src)
-	new /obj/item/reagent_containers/glass/bottle/histamine(src)
-	new /obj/item/reagent_containers/glass/bottle/initropidril(src)
-	new /obj/item/reagent_containers/glass/bottle/pancuronium(src)
-	new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src)
-	new /obj/item/reagent_containers/glass/bottle/coniine(src)
-	new /obj/item/reagent_containers/glass/bottle/curare(src)
-	new /obj/item/reagent_containers/glass/bottle/amanitin(src)
+	new /obj/item/reagent_containers/cup/bottle/polonium(src)
+	new /obj/item/reagent_containers/cup/bottle/venom(src)
+	new /obj/item/reagent_containers/cup/bottle/fentanyl(src)
+	new /obj/item/reagent_containers/cup/bottle/formaldehyde(src)
+	new /obj/item/reagent_containers/cup/bottle/spewium(src)
+	new /obj/item/reagent_containers/cup/bottle/cyanide(src)
+	new /obj/item/reagent_containers/cup/bottle/histamine(src)
+	new /obj/item/reagent_containers/cup/bottle/initropidril(src)
+	new /obj/item/reagent_containers/cup/bottle/pancuronium(src)
+	new /obj/item/reagent_containers/cup/bottle/sodium_thiopental(src)
+	new /obj/item/reagent_containers/cup/bottle/coniine(src)
+	new /obj/item/reagent_containers/cup/bottle/curare(src)
+	new /obj/item/reagent_containers/cup/bottle/amanitin(src)
 	new /obj/item/reagent_containers/syringe(src)
 
 /obj/item/storage/box/syndie_kit/nuke
@@ -447,7 +447,7 @@
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/hypospray/medipen/tuberculosiscure(src)
 	new /obj/item/reagent_containers/syringe(src)
-	new /obj/item/reagent_containers/glass/bottle/tuberculosiscure(src)
+	new /obj/item/reagent_containers/cup/bottle/tuberculosiscure(src)
 
 /obj/item/storage/box/syndie_kit/chameleon
 	name = "chameleon kit"
@@ -502,7 +502,7 @@
 	new/obj/item/toy/crayon/rainbow(src)
 
 /obj/item/storage/box/syndie_kit/romerol/PopulateContents()
-	new /obj/item/reagent_containers/glass/bottle/romerol(src)
+	new /obj/item/reagent_containers/cup/bottle/romerol(src)
 	new /obj/item/reagent_containers/syringe(src)
 	new /obj/item/reagent_containers/dropper(src)
 
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index e9ee80ab26f54..0056cc7f57dd4 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -95,7 +95,7 @@
 			update_icon()
 
 /obj/item/toy/balloon/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/reagent_containers/glass))
+	if(istype(I, /obj/item/reagent_containers/cup))
 		if(I.reagents)
 			if(I.reagents.total_volume <= 0)
 				to_chat(user, "<span class='warning'>[I] is empty.</span>")
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index e7f1c86086950..319bb402e1890 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -184,7 +184,7 @@
 			if("red")
 				return "#ff0000"
 		return P.colour
-	else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag))
+	else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/cup/rag))
 		return canvas_color
 
 /obj/item/canvas/proc/try_rename(mob/user)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 5fa3965f476c8..0fdd01228f0de 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -15,7 +15,7 @@
 		/obj/item/clothing/accessory/waistcoat = 2,
 		/obj/item/clothing/head/soft/black = 2,
 		/obj/item/clothing/shoes/sneakers/black = 2,
-		/obj/item/reagent_containers/glass/rag = 2,
+		/obj/item/reagent_containers/cup/rag = 2,
 		/obj/item/storage/box/beanbag = 1,
 		/obj/item/clothing/suit/armor/vest/alt = 1,
 		/obj/item/circuitboard/machine/dish_drive = 1,
@@ -42,7 +42,7 @@
 		/obj/item/clothing/suit/toggle/chef = 1,
 		/obj/item/clothing/under/rank/civilian/chef = 1,
 		/obj/item/clothing/head/utility/chefhat = 1,
-		/obj/item/reagent_containers/glass/rag = 1)
+		/obj/item/reagent_containers/cup/rag = 1)
 	generate_items_inside(items_inside,src)
 
 /obj/structure/closet/jcloset
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index 15e1d8882fbae..5398d2b0d063f 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -32,8 +32,8 @@
 		new /obj/item/extrapolator(src)
 		new /obj/item/book/manual/wiki/infections(src)
 		new /obj/item/stack/sheet/mineral/plasma(src)
-		new /obj/item/reagent_containers/food/drinks/bottle/virusfood (src)
-		new /obj/item/reagent_containers/food/drinks/bottle/virusfood (src)
+		new /obj/item/reagent_containers/cup/glass/bottle/virusfood (src)
+		new /obj/item/reagent_containers/cup/glass/bottle/virusfood (src)
 	else
 		new /obj/item/gun/syringe (src)
 
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 13c1346ed278e..404a24857a6ac 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -14,5 +14,5 @@
 /obj/structure/closet/secure_closet/bar/PopulateContents()
 	..()
 	for(var/i in 1 to 10)
-		new /obj/item/reagent_containers/food/drinks/beer( src )
+		new /obj/item/reagent_containers/cup/glass/bottle/beer( src )
 	new /obj/item/etherealballdeployer(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index f7d729ba14821..f7bb92fa5d087 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -39,9 +39,9 @@
 /obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
 	..()
 	for(var/i in 1 to 3)
-		new /obj/item/reagent_containers/food/condiment/flour(src)
-	new /obj/item/reagent_containers/food/condiment/rice(src)
-	new /obj/item/reagent_containers/food/condiment/sugar(src)
+		new /obj/item/reagent_containers/condiment/flour(src)
+	new /obj/item/reagent_containers/condiment/rice(src)
+	new /obj/item/reagent_containers/condiment/sugar(src)
 
 /obj/structure/closet/secure_closet/freezer/kitchen/maintenance
 	name = "maintenance refrigerator"
@@ -51,9 +51,9 @@
 /obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
 	..()
 	for(var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/condiment/milk(src)
+		new /obj/item/reagent_containers/condiment/milk(src)
 	for(var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/condiment/soymilk(src)
+		new /obj/item/reagent_containers/condiment/soymilk(src)
 	for(var/i in 1 to 2)
 		new /obj/item/storage/fancy/egg_box(src)
 
@@ -81,9 +81,9 @@
 /obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
 	..()
 	for(var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/condiment/milk(src)
+		new /obj/item/reagent_containers/condiment/milk(src)
 	for(var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/condiment/soymilk(src)
+		new /obj/item/reagent_containers/condiment/soymilk(src)
 	for(var/i in 1 to 2)
 		new /obj/item/storage/fancy/egg_box(src)
 
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index e89ee18d1c0f6..e453101e6ee66 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -7,14 +7,14 @@
 /obj/structure/closet/secure_closet/medical1/PopulateContents()
 	..()
 	var/static/items_inside = list(
-		/obj/item/reagent_containers/glass/beaker = 2,
+		/obj/item/reagent_containers/cup/beaker = 2,
 		/obj/item/reagent_containers/dropper = 2,
 		/obj/item/storage/belt/medical = 1,
 		/obj/item/storage/box/syringes = 1,
-		/obj/item/reagent_containers/glass/bottle/toxin = 1,
-		/obj/item/reagent_containers/glass/bottle/morphine = 2,
-		/obj/item/reagent_containers/glass/bottle/epinephrine= 3,
-		/obj/item/reagent_containers/glass/bottle/charcoal = 3,
+		/obj/item/reagent_containers/cup/bottle/toxin = 1,
+		/obj/item/reagent_containers/cup/bottle/morphine = 2,
+		/obj/item/reagent_containers/cup/bottle/epinephrine= 3,
+		/obj/item/reagent_containers/cup/bottle/charcoal = 3,
 		/obj/item/storage/box/rxglasses = 1,
 		/obj/item/stack/ducts/fifty = 4,
 		/obj/item/construction/plumbing = 2,
@@ -59,12 +59,12 @@
 
 /obj/structure/closet/secure_closet/medicaldanger/PopulateContents()
 	..()
-	new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
-	new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
-	new /obj/item/reagent_containers/glass/bottle/charcoal(src)
-	new /obj/item/reagent_containers/glass/bottle/chloralhydrate(src)
-	new /obj/item/reagent_containers/glass/bottle/morphine(src)
-	new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src)
+	new /obj/item/reagent_containers/cup/bottle/formaldehyde(src)
+	new /obj/item/reagent_containers/cup/bottle/formaldehyde(src)
+	new /obj/item/reagent_containers/cup/bottle/charcoal(src)
+	new /obj/item/reagent_containers/cup/bottle/chloralhydrate(src)
+	new /obj/item/reagent_containers/cup/bottle/morphine(src)
+	new /obj/item/reagent_containers/cup/bottle/sodium_thiopental(src)
 	new /obj/item/storage/pill_bottle/epinephrine(src)
 	new /obj/item/storage/pill_bottle/charcoal(src)
 	new /obj/item/reagent_containers/syringe/calomel(src)
@@ -104,7 +104,7 @@
 	new /obj/item/storage/lockbox/medal/med(src)
 
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
-	new /obj/item/reagent_containers/food/drinks/bottle/synthflesh(src)
+	new /obj/item/reagent_containers/cup/glass/bottle/synthflesh(src)
 
 	// prioritized items
 	new /obj/item/door_remote/chief_medical_officer(src)
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index cb6ade5af2147..6663c480ded01 100644
--- a/code/game/objects/structures/crates_lockers/crates/wooden.dm
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -16,7 +16,7 @@
 /obj/structure/closet/crate/wooden/toy/PopulateContents()
 	. = ..()
 	new	/obj/item/megaphone/clown(src)
-	new	/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
+	new	/obj/item/reagent_containers/cup/soda_cans/canned_laughter(src)
 	new /obj/item/pneumatic_cannon/pie(src)
 	new /obj/item/food/pie/cream(src)
 	new /obj/item/storage/crayons(src)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 244ba8faed02a..a05ddcf0f72f6 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -325,7 +325,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32)
 
 	if(istype(O, /obj/item/stack/medical/gauze))
 		var/obj/item/stack/medical/gauze/G = O
-		new /obj/item/reagent_containers/glass/rag(src.loc)
+		new /obj/item/reagent_containers/cup/rag(src.loc)
 		to_chat(user, "<span class='notice'>You tear off a strip of gauze and make a rag.</span>")
 		G.use(1)
 		return
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index e7d93aeacb02c..24bc9b2e21f66 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -97,7 +97,7 @@
 		if("Construct Shell")
 			pickedtype += /obj/structure/constructshell
 		if("Flask of Unholy Water")
-			pickedtype += /obj/item/reagent_containers/food/drinks/bottle/unholywater
+			pickedtype += /obj/item/reagent_containers/cup/glass/bottle/unholywater
 		else
 			return
 	if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time)
diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm
index fb20d5e7a8620..1f601e6b76266 100644
--- a/code/modules/antagonists/heretic/items/eldritch_flask.dm
+++ b/code/modules/antagonists/heretic/items/eldritch_flask.dm
@@ -1,6 +1,6 @@
 // An unholy water flask, but for heretics.
 // Heals heretics, harms non-heretics. Pretty much identical.
-/obj/item/reagent_containers/glass/beaker/eldritch
+/obj/item/reagent_containers/cup/beaker/eldritch
 	name = "flask of eldritch essence"
 	desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond."
 	icon = 'icons/obj/heretic.dmi'
diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm b/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm
index 196e3c71f98aa..9d674ee44082c 100644
--- a/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_rust_ash.dm
@@ -14,7 +14,7 @@
 		/obj/structure/reagent_dispensers/watertank = 1,
 		/obj/item/shard = 1,
 	)
-	result_atoms = list(/obj/item/reagent_containers/glass/beaker/eldritch)
+	result_atoms = list(/obj/item/reagent_containers/cup/beaker/eldritch)
 	cost = 1
 	route = HERETIC_PATH_SIDE
 
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 3718dc60e7876..4e3fdb50ea5cb 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -361,7 +361,7 @@
 			if (!ispath(item, /atom))
 				// biogenerator outputs to beakers by default
 				if (initial(D.build_type) & BIOGENERATOR)
-					item = /obj/item/reagent_containers/glass/beaker/large
+					item = /obj/item/reagent_containers/cup/beaker/large
 				else
 					continue  // shouldn't happen, but just in case
 					// hint^ it does fucking happen. this was giving me so much trouble
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 83a01fa87a19c..2c46790844080 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -26,7 +26,7 @@
 	var/heat_capacity = 20000
 	var/conduction_coefficient = 0.3
 
-	var/obj/item/reagent_containers/glass/beaker = null
+	var/obj/item/reagent_containers/cup/beaker = null
 
 	var/obj/item/radio/radio
 	var/radio_key = /obj/item/encryptionkey/headset_med
@@ -317,7 +317,7 @@
 			close_machine(target)
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/reagent_containers/glass))
+	if(istype(I, /obj/item/reagent_containers/cup))
 		. = 1 //no afterattack
 		if(beaker)
 			to_chat(user, "<span class='warning'>A beaker is already loaded into [src]!</span>")
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 07f9fb9f889e9..c9a942f1f5b38 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -157,7 +157,7 @@
 	light_color = LIGHT_COLOR_PURPLE
 
 /turf/open/lava/plasma/attackby(obj/item/I, mob/user, params)
-	var/obj/item/reagent_containers/glass/C = I
+	var/obj/item/reagent_containers/cup/C = I
 	if(C.reagents.total_volume >= C.volume)
 		to_chat(user, "<span class='danger'>[C] is full.</span>")
 		return
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index 5b7445ce56b86..1b7f46ae791f0 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -70,7 +70,7 @@
 			SpeakPeace(list("Congratulations.", "By my very loose calculations you've now wasted a decent chunk of the round doing this.", "But you've seen this meme to its conclusion, and that's an experience in itself, right?"))
 		if(251)
 			SpeakPeace(list("Anyway, here.", "I can't give you anything that would impact the progression of the round.","But you've earned this at least."))
-			var/obj/item/reagent_containers/food/drinks/trophy/silver_cup/the_ride = new(get_turf(user))
+			var/obj/item/reagent_containers/cup/glass/trophy/silver_cup/the_ride = new(get_turf(user))
 			the_ride.name = "Overextending The Joke: Second Place"
 			the_ride.desc = "There's a point where this needed to stop, and we've clearly passed it."
 		if(252)
@@ -81,7 +81,7 @@
 			SpeakPeace(list("The ends exists somewhere beyond meaningful milestones.", "There will be no more messages until then.", "You disgust me."))
 		if(5643)
 			user.client.give_award(/datum/award/achievement/misc/time_waste, user)
-			var/obj/item/reagent_containers/food/drinks/trophy/gold_cup/never_ends = new(get_turf(user))
+			var/obj/item/reagent_containers/cup/glass/trophy/gold_cup/never_ends = new(get_turf(user))
 			never_ends.name = "Overextending The Joke: First Place"
 			never_ends.desc = "And so we are left alone with our regrets."
 		else
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index 5df4c2808ee77..b9b051d8b55d8 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -60,7 +60,7 @@
 	name = "Mushroom Bowl"
 	description = "Lieutenant Jeb dropped his favorite mushroom bowl. Cheer him up by shipping a new one, will you?"
 	reward = 7500 //5x mushroom shavings
-	wanted_types = list(/obj/item/reagent_containers/glass/bowl/mushroom_bowl)
+	wanted_types = list(/obj/item/reagent_containers/cup/bowl/mushroom_bowl)
 
 /datum/bounty/item/mining/inocybe_mushroom
 	name = "Mushroom Caps"
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
index ff121a6f59e00..5c967fe71fe70 100644
--- a/code/modules/cargo/bounties/science.dm
+++ b/code/modules/cargo/bounties/science.dm
@@ -39,7 +39,7 @@
 	name = "Cryostasis Beaker"
 	description = "Chemists at Central Command have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive payment."
 	reward = 10000
-	wanted_types = list(/obj/item/reagent_containers/glass/beaker/noreact)
+	wanted_types = list(/obj/item/reagent_containers/cup/beaker/noreact)
 
 /datum/bounty/item/science/diamond_drill
 	name = "Diamond Mining Drill"
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index f08aa45471a19..39a8e395c696f 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -8,7 +8,7 @@
 						/obj/item/book_of_babel,
 						/obj/item/gun/magic/hook,
 						/obj/item/wisp_lantern,
-						/obj/item/reagent_containers/glass/bottle/potion/flight,
+						/obj/item/reagent_containers/cup/bottle/potion/flight,
 						/obj/item/katana/cursed,
 						/obj/item/clothing/glasses/godeye,
 						/obj/item/melee/ghost_sword,
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 61e71bddc32d3..749e7df02665f 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -248,9 +248,9 @@
 					/obj/item/clothing/suit/utility/radiation,
 					/obj/item/geiger_counter,
 					/obj/item/geiger_counter,
-					/obj/item/reagent_containers/food/drinks/bottle/vodka,
-					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass)
+					/obj/item/reagent_containers/cup/glass/bottle/vodka,
+					/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
+					/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass)
 	crate_name = "radiation protection crate"
 	crate_type = /obj/structure/closet/crate/radiation
 
@@ -1657,10 +1657,10 @@
 	desc = "Contains four 100u cartons of synthflesh in case the cloner ran out of it."
 	cost = 1400
 	max_supply = 3
-	contains = list(/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
-					/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
-					/obj/item/reagent_containers/food/drinks/bottle/synthflesh,
-					/obj/item/reagent_containers/food/drinks/bottle/synthflesh)
+	contains = list(/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+					/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+					/obj/item/reagent_containers/cup/glass/bottle/synthflesh,
+					/obj/item/reagent_containers/cup/glass/bottle/synthflesh)
 	crate_name = "rusty freezer"
 	crate_type = /obj/structure/closet/crate/freezer
 
@@ -1724,19 +1724,19 @@
 	desc = "Contains thirteen different chemicals, for all the fun experiments you can make."
 	cost = 1000
 	max_supply = 4
-	contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen,
-					/obj/item/reagent_containers/glass/bottle/carbon,
-					/obj/item/reagent_containers/glass/bottle/nitrogen,
-					/obj/item/reagent_containers/glass/bottle/oxygen,
-					/obj/item/reagent_containers/glass/bottle/fluorine,
-					/obj/item/reagent_containers/glass/bottle/phosphorus,
-					/obj/item/reagent_containers/glass/bottle/silicon,
-					/obj/item/reagent_containers/glass/bottle/chlorine,
-					/obj/item/reagent_containers/glass/bottle/radium,
-					/obj/item/reagent_containers/glass/bottle/sacid,
-					/obj/item/reagent_containers/glass/bottle/ethanol,
-					/obj/item/reagent_containers/glass/bottle/potassium,
-					/obj/item/reagent_containers/glass/bottle/sugar,
+	contains = list(/obj/item/reagent_containers/cup/bottle/hydrogen,
+					/obj/item/reagent_containers/cup/bottle/carbon,
+					/obj/item/reagent_containers/cup/bottle/nitrogen,
+					/obj/item/reagent_containers/cup/bottle/oxygen,
+					/obj/item/reagent_containers/cup/bottle/fluorine,
+					/obj/item/reagent_containers/cup/bottle/phosphorus,
+					/obj/item/reagent_containers/cup/bottle/silicon,
+					/obj/item/reagent_containers/cup/bottle/chlorine,
+					/obj/item/reagent_containers/cup/bottle/radium,
+					/obj/item/reagent_containers/cup/bottle/sacid,
+					/obj/item/reagent_containers/cup/bottle/ethanol,
+					/obj/item/reagent_containers/cup/bottle/potassium,
+					/obj/item/reagent_containers/cup/bottle/sugar,
 					/obj/item/clothing/glasses/science,
 					/obj/item/reagent_containers/dropper,
 					/obj/item/storage/box/beakers)
@@ -1766,11 +1766,11 @@
 	desc = "Contains a little bit of everything needed to stock a medbay or to form your own."
 	cost = 2000
 	max_supply = 3
-	contains = list(/obj/item/reagent_containers/glass/bottle/charcoal,
-					/obj/item/reagent_containers/glass/bottle/epinephrine,
-					/obj/item/reagent_containers/glass/bottle/morphine,
-					/obj/item/reagent_containers/glass/bottle/toxin,
-					/obj/item/reagent_containers/glass/beaker/large,
+	contains = list(/obj/item/reagent_containers/cup/bottle/charcoal,
+					/obj/item/reagent_containers/cup/bottle/epinephrine,
+					/obj/item/reagent_containers/cup/bottle/morphine,
+					/obj/item/reagent_containers/cup/bottle/toxin,
+					/obj/item/reagent_containers/cup/beaker/large,
 					/obj/item/reagent_containers/pill/insulin,
 					/obj/item/stack/medical/gauze,
 					/obj/item/storage/box/beakers,
@@ -1827,11 +1827,11 @@
 	max_supply = 3
 	access = ACCESS_VIROLOGY
 	access_budget = ACCESS_VIROLOGY
-	contains = list(/obj/item/reagent_containers/glass/bottle/inorganic_virion,
-					/obj/item/reagent_containers/glass/bottle/necrotic_virion,
-					/obj/item/reagent_containers/glass/bottle/evolution_virion,
-					/obj/item/reagent_containers/glass/bottle/adaptation_virion,
-					/obj/item/reagent_containers/glass/bottle/aggression_virion)
+	contains = list(/obj/item/reagent_containers/cup/bottle/inorganic_virion,
+					/obj/item/reagent_containers/cup/bottle/necrotic_virion,
+					/obj/item/reagent_containers/cup/bottle/evolution_virion,
+					/obj/item/reagent_containers/cup/bottle/adaptation_virion,
+					/obj/item/reagent_containers/cup/bottle/aggression_virion)
 	crate_name = "virus sample crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
 	dangerous = TRUE
@@ -1839,7 +1839,7 @@
 /datum/supply_pack/medical/randomvirus/fill(obj/structure/closet/crate/C)
 	for(var/item in contains)
 		if(CONFIG_GET(flag/chemviro_allowed))
-			new /obj/item/reagent_containers/glass/bottle/random_virus(C)
+			new /obj/item/reagent_containers/cup/bottle/random_virus(C)
 		else
 			new item(C)
 
@@ -1851,10 +1851,10 @@
 	max_supply = 4
 	access = ACCESS_VIROLOGY
 	contains = list(/obj/item/food/monkeycube,
-					/obj/item/reagent_containers/food/drinks/bottle/virusfood,
-					/obj/item/reagent_containers/glass/bottle/mutagen,
-					/obj/item/reagent_containers/glass/bottle/formaldehyde,
-					/obj/item/reagent_containers/glass/bottle/synaptizine,
+					/obj/item/reagent_containers/cup/glass/bottle/virusfood,
+					/obj/item/reagent_containers/cup/bottle/mutagen,
+					/obj/item/reagent_containers/cup/bottle/formaldehyde,
+					/obj/item/reagent_containers/cup/bottle/synaptizine,
 					/obj/item/storage/box/beakers,
 					/obj/item/toy/figure/virologist)
 	crate_name = "Junior Epidemiology Kit"
@@ -1877,12 +1877,12 @@
 	access = ACCESS_CMO
 	access_budget = ACCESS_VIROLOGY
 	contraband = TRUE
-	contains = list(/obj/item/reagent_containers/glass/bottle/fake_gbs,
-					/obj/item/reagent_containers/glass/bottle/magnitis,
-					/obj/item/reagent_containers/glass/bottle/pierrot_throat,
-					/obj/item/reagent_containers/glass/bottle/brainrot,
-					/obj/item/reagent_containers/glass/bottle/anxiety,
-					/obj/item/reagent_containers/glass/bottle/beesease)
+	contains = list(/obj/item/reagent_containers/cup/bottle/fake_gbs,
+					/obj/item/reagent_containers/cup/bottle/magnitis,
+					/obj/item/reagent_containers/cup/bottle/pierrot_throat,
+					/obj/item/reagent_containers/cup/bottle/brainrot,
+					/obj/item/reagent_containers/cup/bottle/anxiety,
+					/obj/item/reagent_containers/cup/bottle/beesease)
 	crate_name = "virus crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
 	dangerous = TRUE
@@ -2100,9 +2100,9 @@
 	cost = 800
 	max_supply = 4
 	access_budget = ACCESS_JANITOR
-	contains = list(/obj/item/reagent_containers/glass/bucket,
-					/obj/item/reagent_containers/glass/bucket,
-					/obj/item/reagent_containers/glass/bucket,
+	contains = list(/obj/item/reagent_containers/cup/bucket,
+					/obj/item/reagent_containers/cup/bucket,
+					/obj/item/reagent_containers/cup/bucket,
 					/obj/item/mop,
 					/obj/item/pushbroom,
 					/obj/item/clothing/suit/caution,
@@ -2110,7 +2110,7 @@
 					/obj/item/clothing/suit/caution,
 					/obj/item/storage/bag/trash,
 					/obj/item/reagent_containers/spray/cleaner,
-					/obj/item/reagent_containers/glass/rag,
+					/obj/item/reagent_containers/cup/rag,
 					/obj/item/grenade/chem_grenade/cleaner,
 					/obj/item/grenade/chem_grenade/cleaner,
 					/obj/item/grenade/chem_grenade/cleaner)
@@ -2153,15 +2153,15 @@
 	cost = 1500
 	max_supply = 5
 	contains = list(/obj/item/storage/box/drinkingglasses,
-					/obj/item/reagent_containers/food/drinks/shaker,
-					/obj/item/reagent_containers/food/drinks/bottle/patron,
-					/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
-					/obj/item/reagent_containers/food/drinks/ale,
-					/obj/item/reagent_containers/food/drinks/ale,
-					/obj/item/reagent_containers/food/drinks/beer,
-					/obj/item/reagent_containers/food/drinks/beer,
-					/obj/item/reagent_containers/food/drinks/beer,
-					/obj/item/reagent_containers/food/drinks/beer,
+					/obj/item/reagent_containers/cup/glass/shaker,
+					/obj/item/reagent_containers/cup/glass/bottle/patron,
+					/obj/item/reagent_containers/cup/glass/bottle/goldschlager,
+					/obj/item/reagent_containers/cup/glass/bottle/ale,
+					/obj/item/reagent_containers/cup/glass/bottle/ale,
+					/obj/item/reagent_containers/cup/glass/bottle/beer,
+					/obj/item/reagent_containers/cup/glass/bottle/beer,
+					/obj/item/reagent_containers/cup/glass/bottle/beer,
+					/obj/item/reagent_containers/cup/glass/bottle/beer,
 					/obj/item/flashlight/glowstick,
 					/obj/item/flashlight/glowstick/red,
 					/obj/item/flashlight/glowstick/blue,
@@ -2412,15 +2412,15 @@
 	cost = 1000
 	max_supply = 4
 	access_budget = ACCESS_KITCHEN
-	contains = list(/obj/item/reagent_containers/food/condiment/flour,
-					/obj/item/reagent_containers/food/condiment/rice,
-					/obj/item/reagent_containers/food/condiment/milk,
-					/obj/item/reagent_containers/food/condiment/soymilk,
-					/obj/item/reagent_containers/food/condiment/saltshaker,
-					/obj/item/reagent_containers/food/condiment/peppermill,
+	contains = list(/obj/item/reagent_containers/condiment/flour,
+					/obj/item/reagent_containers/condiment/rice,
+					/obj/item/reagent_containers/condiment/milk,
+					/obj/item/reagent_containers/condiment/soymilk,
+					/obj/item/reagent_containers/condiment/saltshaker,
+					/obj/item/reagent_containers/condiment/peppermill,
 					/obj/item/storage/fancy/egg_box,
-					/obj/item/reagent_containers/food/condiment/enzyme,
-					/obj/item/reagent_containers/food/condiment/sugar,
+					/obj/item/reagent_containers/condiment/enzyme,
+					/obj/item/reagent_containers/condiment/sugar,
 					/obj/item/food/meat/slab/monkey,
 					/obj/item/food/grown/banana,
 					/obj/item/food/grown/banana,
@@ -2461,8 +2461,8 @@
 	access_budget = ACCESS_HYDROPONICS
 	contains = list(/obj/item/reagent_containers/spray/plantbgone,
 					/obj/item/reagent_containers/spray/plantbgone,
-					/obj/item/reagent_containers/glass/bottle/ammonia,
-					/obj/item/reagent_containers/glass/bottle/ammonia,
+					/obj/item/reagent_containers/cup/bottle/ammonia,
+					/obj/item/reagent_containers/cup/bottle/ammonia,
 					/obj/item/hatchet,
 					/obj/item/cultivator,
 					/obj/item/plant_analyzer,
@@ -2636,7 +2636,7 @@
 	crate_type = /obj/structure/closet/crate
 	contains = list(/obj/item/stack/sheet/mineral/coal/five,
 					/obj/machinery/grill/unwrenched,
-					/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
+					/obj/item/reagent_containers/cup/soda_cans/monkey_energy
 					)
 	crate_name = "grilling starter kit crate"
 
@@ -2647,7 +2647,7 @@
 	max_supply = 5
 	crate_type = /obj/structure/closet/crate
 	contains = list(/obj/item/stack/sheet/mineral/coal/ten,
-					/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
+					/obj/item/reagent_containers/cup/soda_cans/monkey_energy
 					)
 	crate_name = "grilling fuel kit crate"
 
@@ -2915,7 +2915,7 @@
 					/obj/item/storage/pill_bottle/aranesp,
 					/obj/item/storage/pill_bottle/stimulant,
 					/obj/item/toy/cards/deck/syndicate,
-					/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+					/obj/item/reagent_containers/cup/glass/bottle/absinthe,
 					/obj/item/clothing/under/syndicate/tacticool,
 					/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
 					/obj/item/storage/fancy/cigarettes/cigpack_shadyjims,
@@ -3067,7 +3067,7 @@
 					/obj/item/clothing/mask/gas/mime,
 					/obj/item/clothing/head/frenchberet,
 					/obj/item/clothing/suit/suspenders,
-					/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
+					/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing,
 					/obj/item/storage/backpack/mime)
 	crate_name = "standard costume crate"
 	crate_type = /obj/structure/closet/crate/wooden
@@ -3459,8 +3459,8 @@
 	cost = 4000
 	max_supply = 3
 	access_budget = ACCESS_CHAPEL_OFFICE
-	contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
-					/obj/item/reagent_containers/food/drinks/bottle/holywater,
+	contains = list(/obj/item/reagent_containers/cup/glass/bottle/holywater,
+					/obj/item/reagent_containers/cup/glass/bottle/holywater,
 					/obj/item/storage/book/bible/booze,
 					/obj/item/storage/book/bible/booze,
 					/obj/item/clothing/neck/crucifix/rosary,
diff --git a/code/modules/client/preferences/entries/character/quirks/alcoholic.dm b/code/modules/client/preferences/entries/character/quirks/alcoholic.dm
index 849a1e15e4096..bbaa970e6bb35 100644
--- a/code/modules/client/preferences/entries/character/quirks/alcoholic.dm
+++ b/code/modules/client/preferences/entries/character/quirks/alcoholic.dm
@@ -8,7 +8,7 @@
 /datum/preference/choiced/quirk/alcohol_type/compile_constant_data()
 	var/list/data = ..()
 	var/list/clean_names = list("Random" = "Random")
-	for(var/obj/item/reagent_containers/food/drinks/bottle/S as() in GLOB.alcoholic_bottles)
+	for(var/obj/item/reagent_containers/cup/glass/bottle/S as() in GLOB.alcoholic_bottles)
 		clean_names[S] = initial(S.name)
 	data[CHOICED_PREFERENCE_DISPLAY_NAMES] = clean_names
 	return data
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 9a98ad4a3d06f..7c7d7e996ff89 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -83,7 +83,7 @@
 
 /obj/item/clothing/head/fedora/det_hat/Initialize(mapload)
 	. = ..()
-	new /obj/item/reagent_containers/food/drinks/flask/det(src)
+	new /obj/item/reagent_containers/cup/glass/flask/det(src)
 
 /obj/item/clothing/head/fedora/det_hat/examine(mob/user)
 	. = ..()
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index bcf67ded1cdc1..7c329aa4296a0 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -275,7 +275,7 @@
 		/obj/item/storage/box/lights/mixed=1,
 		/obj/item/melee/baton/loaded=1,
 		/obj/item/mop/advanced=1,
-		/obj/item/reagent_containers/glass/bucket=1,
+		/obj/item/reagent_containers/cup/bucket=1,
 		/obj/item/grenade/clusterbuster/cleaner=1,
 		/obj/item/choice_beacon/janicart)
 
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 4c3778b87311f..a3699867c6805 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -79,7 +79,7 @@
 	suit = null
 	head = null
 	r_hand = /obj/item/mop
-	l_hand = /obj/item/reagent_containers/glass/bucket
+	l_hand = /obj/item/reagent_containers/cup/bucket
 	r_pocket = /obj/item/grenade/chem_grenade/cleaner
 	l_pocket = /obj/item/grenade/chem_grenade/cleaner
 	backpack_contents = list(/obj/item/stack/tile/iron=6)
@@ -88,7 +88,7 @@
 	if(visualsOnly)
 		return
 
-	var/obj/item/reagent_containers/glass/bucket/bucket = H.get_item_for_held_index(1)
+	var/obj/item/reagent_containers/cup/bucket/bucket = H.get_item_for_held_index(1)
 	bucket.reagents.add_reagent(/datum/reagent/water,70)
 
 /datum/outfit/laser_tag
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 2d712c3fbc15c..e98d310c06585 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -135,7 +135,7 @@ Contains:
 	icon_state = "pirate"
 	item_state = "pirate"
 	w_class = WEIGHT_CLASS_NORMAL
-	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum)
 	slowdown = 0
 	armor = list(MELEE = 30,  BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, RAD = 30, FIRE = 60, ACID = 75, STAMINA = 20, BLEED = 20)
 	strip_delay = 40
@@ -277,7 +277,7 @@ Contains:
 	icon_state = "ert_janitor"
 	item_state = "ert_janitor"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/jani
-	allowed = list(/obj/item/storage/bag/trash, /obj/item/melee/flyswatter, /obj/item/mop, /obj/item/holosign_creator/janibarrier, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/spray/chemsprayer/janitor)
+	allowed = list(/obj/item/storage/bag/trash, /obj/item/melee/flyswatter, /obj/item/mop, /obj/item/holosign_creator/janibarrier, /obj/item/reagent_containers/cup/bucket, /obj/item/reagent_containers/spray/chemsprayer/janitor)
 
 /obj/item/clothing/suit/space/eva
 	name = "EVA suit"
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index 5ba05f80d4d4f..746af2c1799d4 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -1,7 +1,7 @@
 //Chaplain Suit Subtypes
 //If any new staple chaplain items get added, put them in these lists
 /obj/item/clothing/suit/chaplainsuit
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 	icon = 'icons/obj/clothing/suits/chaplain.dmi'
 	worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
 
@@ -14,7 +14,7 @@
 	equip_delay_other = 60
 
 /obj/item/clothing/suit/hooded/chaplainsuit
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 
 //Suits
 /obj/item/clothing/suit/chaplainsuit/holidaypriest
@@ -104,7 +104,7 @@
 	item_state = "clownpriest"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
-	allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana)
+	allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/cup/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana)
 
 //The good stuff below
 
@@ -126,7 +126,7 @@
 	desc = "God wills it!"
 	icon_state = "knight_templar"
 	item_state = null
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 	slowdown = 0
 	move_sound = null
 
@@ -236,7 +236,7 @@
 	worn_icon = 'icons/mob/clothing/suits/chaplain.dmi'
 	item_state = null
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 	hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
 
 /obj/item/clothing/head/hooded/chaplain_hood
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index 3df266b753631..ad6e2eb08d999 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -18,7 +18,7 @@
 	icon_state = "pirate"
 	item_state = null
 	body_parts_covered = CHEST|GROIN|ARMS
-	allowed = list(/obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+	allowed = list(/obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum)
 
 /obj/item/clothing/suit/costume/pirate/captain
 	name = "pirate captain coat"
@@ -109,7 +109,7 @@
 	item_state = "imperium_monk"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	flags_inv = HIDESHOES|HIDEJUMPSUIT
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
 
 /obj/item/clothing/suit/costume/chickensuit
 	name = "chicken suit"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 28356c7d1a6c8..176f65d639c5e 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -16,8 +16,8 @@
 		/obj/item/reagent_containers/spray/plantbgone,
 		/obj/item/plant_analyzer,
 		/obj/item/seeds,
-		/obj/item/reagent_containers/glass/bottle,
-		/obj/item/reagent_containers/glass/beaker,
+		/obj/item/reagent_containers/cup/bottle,
+		/obj/item/reagent_containers/cup/beaker,
 		/obj/item/cultivator,
 		/obj/item/reagent_containers/spray/pestspray,
 		/obj/item/hatchet,
@@ -35,7 +35,7 @@
 	item_state = "bio_suit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
-	allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/cup/glass/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 
 //Chef
 /obj/item/clothing/suit/toggle/chef
@@ -109,7 +109,7 @@
 	worn_icon = 'icons/mob/clothing/suits/armor.dmi'
 	icon_state = "brig_phys_vest"
 	item_state = "sec_helm"//looks kinda similar, I guess
-	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/storage/firstaid, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/storage/firstaid, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 	armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 50, ACID = 50, STAMINA = 30, BLEED = 20)
 
 //Engineering
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 38daa6ea23bad..568d914a6dc66 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -17,8 +17,8 @@
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/healthanalyzer,
 		/obj/item/flashlight/pen,
-		/obj/item/reagent_containers/glass/bottle,
-		/obj/item/reagent_containers/glass/beaker,
+		/obj/item/reagent_containers/cup/bottle,
+		/obj/item/reagent_containers/cup/beaker,
 		/obj/item/reagent_containers/pill,
 		/obj/item/storage/pill_bottle,
 		/obj/item/paper,
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 1a84fe2a29d0d..7a65f42337de7 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -110,8 +110,8 @@
 		/obj/item/healthanalyzer,
 		/obj/item/paper,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
@@ -146,8 +146,8 @@
 		/obj/item/melee/classic_baton/police/telescopic,
 		/obj/item/paper,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
@@ -181,8 +181,8 @@
 		/obj/item/melee/classic_baton/police/telescopic,
 		/obj/item/paper,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
@@ -218,8 +218,8 @@
 		/obj/item/melee/classic_baton/police/telescopic,
 		/obj/item/paper,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
@@ -259,8 +259,8 @@
 		/obj/item/melee/classic_baton/police/telescopic,
 		/obj/item/paper,
 		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/glass/beaker,
-		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/syringe,
@@ -286,7 +286,7 @@
 	name = "science winter coat"
 	icon_state = "coatscience"
 	item_state = "coatscience"
-	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/police/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
 	armor = list(MELEE = 0,  BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/science
 
@@ -317,7 +317,7 @@
 	name = "hydroponics winter coat"
 	icon_state = "coathydro"
 	item_state = "coathydro"
-	allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+	allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/cup/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro
 
 /obj/item/clothing/head/hooded/winterhood/hydro
@@ -336,7 +336,7 @@
 		/obj/item/clipboard,
 		/obj/item/stamp,
 		/obj/item/export_scanner,
-		/obj/item/reagent_containers/food/drinks/bottle,
+		/obj/item/reagent_containers/cup/glass/bottle,
 		/obj/item/flashlight,
 		/obj/item/tank/internals/emergency_oxygen,
 		/obj/item/tank/internals/plasmaman,
@@ -363,7 +363,7 @@
 		/obj/item/mining_scanner,
 		/obj/item/t_scanner/adv_mining_scanner,
 		/obj/item/gun/energy/kinetic_accelerator,
-		/obj/item/reagent_containers/food/drinks/bottle,
+		/obj/item/reagent_containers/cup/glass/bottle,
 		/obj/item/flashlight,
 		/obj/item/tank/internals/emergency_oxygen,
 		/obj/item/tank/internals/plasmaman,
diff --git a/code/modules/crew_objectives/civilian_objectives.dm b/code/modules/crew_objectives/civilian_objectives.dm
index f1f83c0eec1e1..8dca445ea8442 100644
--- a/code/modules/crew_objectives/civilian_objectives.dm
+++ b/code/modules/crew_objectives/civilian_objectives.dm
@@ -233,7 +233,7 @@
 	jobs = JOB_NAME_MIME
 
 /datum/objective/crew/nothingreallymatterstome/check_completion()
-	return ..() || owner?.current?.check_contents_for(/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing)
+	return ..() || owner?.current?.check_contents_for(/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing)
 
 /datum/objective/crew/nullrod
 	explanation_text = "Don't lose your nullrod. You can still transform it into another item."
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index af4c592983fc5..3128b19658fc6 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -3,7 +3,7 @@
 	var/transfer_blood = 0
 
 
-/obj/item/reagent_containers/glass/rag
+/obj/item/reagent_containers/cup/rag
 	name = "damp rag"
 	desc = "For cleaning up messes, you suppose."
 	w_class = WEIGHT_CLASS_TINY
@@ -16,11 +16,11 @@
 	volume = 5
 	spillable = FALSE
 
-/obj/item/reagent_containers/glass/rag/suicide_act(mob/living/user)
+/obj/item/reagent_containers/cup/rag/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return OXYLOSS
 
-/obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
+/obj/item/reagent_containers/cup/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
 	. = ..()
 	if(!proximity)
 		return
diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm
index d0572e5cdd9d1..9794866998a40 100644
--- a/code/modules/events/shuttle_loan.dm
+++ b/code/modules/events/shuttle_loan.dm
@@ -156,7 +156,7 @@
 				var/turf/T
 				for(var/i in 1 to 10)
 					if(prob(15))
-						shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle)
+						shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle)
 					else if(prob(15))
 						shuttle_spawns.Add(/obj/item/reagent_containers/syringe)
 					else if(prob(25))
@@ -164,8 +164,8 @@
 					T = pick_n_take(empty_shuttle_turfs)
 					new infected_assistant(T)
 				shuttle_spawns.Add(/obj/structure/closet/crate)
-				shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/pierrot_throat)
-				shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle/magnitis)
+				shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle/pierrot_throat)
+				shuttle_spawns.Add(/obj/item/reagent_containers/cup/bottle/magnitis)
 
 			if(DEPARTMENT_RESUPPLY)
 				var/list/crate_types = list(
diff --git a/code/modules/exploration_crew/exploration_vendor.dm b/code/modules/exploration_crew/exploration_vendor.dm
index 53a3d7c3b9779..117ab4adfae4a 100644
--- a/code/modules/exploration_crew/exploration_vendor.dm
+++ b/code/modules/exploration_crew/exploration_vendor.dm
@@ -25,8 +25,8 @@
 		new /datum/data/vendor_equipment("Expanded E. Oxygen Tank",		/obj/item/tank/internals/emergency_oxygen/engi,						1000),
 		new /datum/data/vendor_equipment("Survival Knife",				/obj/item/knife/combat/survival,							1000),
 		new /datum/data/vendor_equipment("Pizza",						/obj/item/pizzabox/margherita,										200),
-		new /datum/data/vendor_equipment("Whiskey",						/obj/item/reagent_containers/food/drinks/bottle/whiskey,			1000),
-		new /datum/data/vendor_equipment("Absinthe",					/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,	1000),
+		new /datum/data/vendor_equipment("Whiskey",						/obj/item/reagent_containers/cup/glass/bottle/whiskey,			1000),
+		new /datum/data/vendor_equipment("Absinthe",					/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium,	1000),
 		new /datum/data/vendor_equipment("Cigar",						/obj/item/clothing/mask/cigarette/cigar/havana,						1500),
 		new /datum/data/vendor_equipment("Soap",						/obj/item/soap/nanotrasen,											2000),
 		new /datum/data/vendor_equipment("Laser Pointer",				/obj/item/laser_pointer,											3000),
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
deleted file mode 100644
index 1cf34945a959a..0000000000000
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ /dev/null
@@ -1,629 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// Drinks.
-////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food/drinks
-	name = "drink"
-	desc = "yummy"
-	icon = 'icons/obj/drinks.dmi'
-	icon_state = null
-	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
-	reagent_flags = OPENCONTAINER | DUNKABLE
-	var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
-	possible_transfer_amounts = list(5,10,15,20,25,30,50)
-	volume = 50
-	resistance_flags = NONE
-	var/isGlass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
-	var/beingChugged = FALSE //We don't want people downing 100u super fast with drinking glasses
-
-/obj/item/reagent_containers/food/drinks/on_reagent_change(changetype)
-	. = ..()
-	gulp_size = max(round(reagents.total_volume / 5), 5)
-
-/obj/item/reagent_containers/food/drinks/attack(mob/living/M, mob/user, def_zone)
-
-	if(!reagents || !reagents.total_volume)
-		to_chat(user, "<span class='warning'>[src] is empty!</span>")
-		return 0
-
-	if(!canconsume(M, user))
-		return 0
-
-	if (!is_drainable())
-		to_chat(user, "<span class='warning'>[src]'s lid hasn't been opened!</span>")
-		return 0
-	var/gulp_amount = gulp_size
-	if(M == user)
-		if(user.is_zone_selected(BODY_ZONE_PRECISE_MOUTH, precise_only = TRUE) && !beingChugged)
-			beingChugged = TRUE
-			user.visible_message("<span class='notice'>[user] starts chugging [src].</span>", \
-				"<span class='notice'>You start chugging [src].</span>")
-			if(!do_after(user, 3 SECONDS, target = M))
-				return
-			if(!reagents || !reagents.total_volume)
-				return
-			gulp_amount = 50
-			user.visible_message("<span class='notice'>[user] chugs [src].</span>", \
-				"<span class='notice'>You chug [src].</span>")
-			beingChugged = FALSE
-		else
-			user.visible_message("<span class='notice'>[user] swallows a gulp of [src].</span>", \
-				"<span class='notice'>You swallow a gulp of [src].</span>")
-		if(HAS_TRAIT(M, TRAIT_VORACIOUS))
-			M.changeNext_move(CLICK_CD_MELEE * 0.5) //chug! chug! chug!
-
-	else
-		M.visible_message("<span class='danger'>[user] attempts to feed [M] the contents of [src].</span>", \
-			"<span class='userdanger'>[user] attempts to feed you the contents of [src].</span>")
-		if(!do_after(user, 3 SECONDS, target = M))
-			return
-		if(!reagents || !reagents.total_volume)
-			return // The drink might be empty after the delay, such as by spam-feeding
-		M.visible_message("<span class='danger'>[user] fed [M] the contents of [src].</span>", \
-			"<span class='userdanger'>[user] fed you the contents of [src].</span>")
-		log_combat(user, M, "fed", reagents.log_list())
-
-	var/fraction = min(gulp_amount/reagents.total_volume, 1)
-	checkLiked(fraction, M)
-	reagents.reaction(M, INGEST, fraction)
-	reagents.trans_to(M, gulp_amount, transfered_by = user)
-	playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
-	return 1
-
-/obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity)
-	. = ..()
-	if(!proximity)
-		return
-
-	if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it.
-		if(!reagents.total_volume)
-			to_chat(user, "<span class='warning'>[src] is empty.</span>")
-			return
-
-		if(target.reagents.holder_full())
-			to_chat(user, "<span class='warning'>[target] is full.</span>")
-			return
-
-		var/refill = reagents.get_master_reagent_id()
-		var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
-		to_chat(user, "<span class='notice'>You transfer [trans] units of the solution to [target].</span>")
-
-		if(iscyborg(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
-			var/mob/living/silicon/robot/bro = user
-			bro.cell.use(30)
-			addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, add_reagent), refill, trans), 600)
-
-	else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
-		if (!is_refillable())
-			to_chat(user, "<span class='warning'>[src]'s tab isn't open!</span>")
-			return
-
-		if(!target.reagents.total_volume)
-			to_chat(user, "<span class='warning'>[target] is empty.</span>")
-			return
-
-		if(reagents.holder_full())
-			to_chat(user, "<span class='warning'>[src] is full.</span>")
-			return
-
-		var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user)
-		to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [target].</span>")
-
-/obj/item/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params)
-	var/hotness = I.is_hot()
-	if(hotness && reagents)
-		reagents.expose_temperature(hotness)
-		to_chat(user, "<span class='notice'>You heat [name] with [I]!</span>")
-	..()
-
-/obj/item/reagent_containers/food/drinks/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
-	. = ..()
-	if(!.) //if the bottle wasn't caught
-		smash(hit_atom, throwingdatum?.thrower, TRUE)
-
-/obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE)
-	if(!isGlass)
-		return
-	if(QDELING(src) || !target)		//Invalid loc
-		return
-	if(bartender_check(target) && ranged)
-		return
-	var/obj/item/broken_bottle/B = new (loc)
-	B.icon_state = icon_state
-	var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
-	I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
-	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
-	B.icon = I
-	B.name = "broken [name]"
-	if(prob(33))
-		var/obj/item/shard/S = new(drop_location())
-		target.Bumped(S)
-	playsound(src, "shatter", 70, 1)
-	transfer_fingerprints_to(B)
-	qdel(src)
-	target.Bumped(B)
-
-/obj/item/reagent_containers/food/drinks/bullet_act(obj/projectile/P)
-	. = ..()
-	if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
-		var/atom/T = get_turf(src)
-		smash(T)
-		return
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-/// Drinks. END
-////////////////////////////////////////////////////////////////////////////////
-
-
-/obj/item/reagent_containers/food/drinks/trophy
-	name = "pewter cup"
-	desc = "Everyone gets a trophy."
-	icon_state = "pewter_cup"
-	w_class = WEIGHT_CLASS_TINY
-	force = 1
-	throwforce = 1
-	amount_per_transfer_from_this = 5
-	custom_materials = list(/datum/material/iron=100)
-	possible_transfer_amounts = list()
-	volume = 5
-	flags_1 = CONDUCT_1
-	spillable = TRUE
-	resistance_flags = FIRE_PROOF
-	isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup
-	name = "gold cup"
-	desc = "You're winner!"
-	icon_state = "golden_cup"
-	w_class = WEIGHT_CLASS_BULKY
-	force = 14
-	throwforce = 10
-	amount_per_transfer_from_this = 20
-	custom_materials = list(/datum/material/gold=1000)
-	volume = 150
-
-/obj/item/reagent_containers/food/drinks/trophy/silver_cup
-	name = "silver cup"
-	desc = "Best loser!"
-	icon_state = "silver_cup"
-	w_class = WEIGHT_CLASS_NORMAL
-	force = 10
-	throwforce = 8
-	amount_per_transfer_from_this = 15
-	custom_materials = list(/datum/material/silver=800)
-	volume = 100
-
-
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup
-	name = "bronze cup"
-	desc = "At least you ranked!"
-	icon_state = "bronze_cup"
-	w_class = WEIGHT_CLASS_SMALL
-	force = 5
-	throwforce = 4
-	amount_per_transfer_from_this = 10
-	custom_materials = list(/datum/material/iron=400)
-	volume = 25
-
-///////////////////////////////////////////////Drinks
-//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
-//	rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50.
-//	Formatting is the same as food.
-
-/obj/item/reagent_containers/food/drinks/coffee
-	name = "Robust coffee"
-	desc = "Careful, the beverage you're about to enjoy is extremely hot."
-	icon_state = "coffee"
-	list_reagents = list(/datum/reagent/consumable/coffee = 30)
-	spillable = TRUE
-	resistance_flags = FREEZE_PROOF
-	isGlass = FALSE
-	foodtype = BREAKFAST
-
-/obj/item/reagent_containers/food/drinks/bubble_tea
-	name = "Bubble tea"
-	desc = "Refreshing! You aren't sure what those things in the bottom are."
-	icon_state = "bubble_tea"
-	list_reagents = list(/datum/reagent/consumable/bubble_tea = 50)
-	foodtype = SUGAR
-	spillable = TRUE
-	isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/ice
-	name = "ice cup"
-	desc = "Careful, cold ice, do not chew."
-	custom_price = 5
-	icon_state = "coffee"
-	list_reagents = list(/datum/reagent/consumable/ice = 30)
-	spillable = TRUE
-	isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/ice/prison
-	name = "dirty ice cup"
-	desc = "Either Nanotrasen'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"
-	item_state = "coffee"
-	spillable = TRUE
-
-/obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype)
-	if(reagents.total_volume)
-		icon_state = "tea"
-	else
-		icon_state = "tea_empty"
-
-/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/cocoa
-	name = "Dutch hot cocoa"
-	desc = "Made in Space South America."
-	list_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5)
-	foodtype = SUGAR
-	resistance_flags = FREEZE_PROOF
-	custom_price = 42
-
-/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!"
-	icon_state = "ramen"
-	list_reagents = list(
-		/datum/reagent/consumable/dry_ramen = 15,
-		/datum/reagent/consumable/sodiumchloride = 3,
-		/datum/reagent/consumable/maltodextrin = 5
-	)
-	foodtype = GRAIN
-	isGlass = FALSE
-	custom_price = 38
-
-/obj/item/reagent_containers/food/drinks/beer
-	name = "space beer"
-	desc = "Beer. In space."
-	icon_state = "beer"
-	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
-	foodtype = GRAIN | ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/beer/almost_empty
-	var/amount
-	list_reagents = null
-
-/obj/item/reagent_containers/food/drinks/beer/almost_empty/Initialize(mapload)
-	. = ..()
-	amount = rand(1,4)
-	reagents.add_reagent(/datum/reagent/consumable/ethanol/beer, amount)
-
-/obj/item/reagent_containers/food/drinks/syndicatebeer
-	name = "syndicate beer"
-	desc = "Consumed only by the finest syndicate agents. There is a round warning label stating 'Don't drink more than one in quick succession!'"
-	icon_state = "syndicatebeer"
-	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 10, /datum/reagent/medicine/antitoxin = 20)
-	foodtype = GRAIN | ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/ftliver
-	name = "Faster-Than-Liver"
-	desc = "They've gone into plaid!"
-	icon_state = "ftliver"
-	list_reagents = list(/datum/reagent/consumable/ethanol/ftliver = 30)
-	foodtype = ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/beer/light
-	name = "Carp Lite"
-	desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
-	list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30)
-
-/obj/item/reagent_containers/food/drinks/ale
-	name = "Magm-Ale"
-	desc = "A true dorf's drink of choice."
-	icon_state = "alebottle"
-	item_state = "beer"
-	list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
-	foodtype = GRAIN | ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/sillycup
-	name = "paper cup"
-	desc = "A paper water cup."
-	icon_state = "water_cup_e"
-	possible_transfer_amounts = list()
-	volume = 10
-	spillable = TRUE
-	isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/sillycup/on_reagent_change(changetype)
-	if(reagents.total_volume)
-		icon_state = "water_cup"
-	else
-		icon_state = "water_cup_e"
-
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton
-	name = "small carton"
-	desc = "A small carton, intended for holding drinks."
-	icon_state = "juicebox"
-	volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler
-
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/smash(atom/target, mob/thrower, ranged = FALSE)
-	if(bartender_check(target) && ranged)
-		return
-	var/obj/item/broken_bottle/B = new (loc)
-	B.icon_state = icon_state
-	var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
-	I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
-	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
-	B.icon = I
-	B.name = "broken [name]"
-	B.force = 0
-	B.throwforce = 0
-	B.desc = "A carton with the bottom half burst open. Might give you a papercut."
-	transfer_fingerprints_to(B)
-	qdel(src)
-	target.Bumped(B)
-
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/on_reagent_change(changetype)
-	if (reagents.reagent_list.len)
-		switch(reagents.get_master_reagent_id())
-			if(/datum/reagent/consumable/orangejuice)
-				icon_state = "orangebox"
-				name = "orange juice box"
-				desc = "A great source of vitamins. Stay healthy!"
-				foodtype = FRUIT | BREAKFAST
-			if(/datum/reagent/consumable/milk)
-				icon_state = "milkbox"
-				name = "carton of milk"
-				desc = "An excellent source of calcium for growing space explorers."
-				foodtype = DAIRY | BREAKFAST
-			if(/datum/reagent/consumable/applejuice)
-				icon_state = "juicebox"
-				name = "apple juice box"
-				desc = "Sweet apple juice. Don't be late for school!"
-				foodtype = FRUIT
-			if(/datum/reagent/consumable/grapejuice)
-				icon_state = "grapebox"
-				name = "grape juice box"
-				desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
-				foodtype = FRUIT
-			if(/datum/reagent/consumable/pineapplejuice)
-				icon_state = "pineapplebox"
-				name = "pineapple juice box"
-				desc = "Why would you even want this?"
-			if(/datum/reagent/consumable/milk/chocolate_milk)
-				icon_state = "chocolatebox"
-				name = "carton of chocolate milk"
-				desc = "Milk for cool kids!"
-				foodtype = SUGAR
-			if(/datum/reagent/consumable/ethanol/eggnog)
-				icon_state = "nog2"
-				name = "carton of eggnog"
-				desc = "For enjoying the most wonderful time of the year."
-				foodtype = MEAT
-	else
-		icon_state = "juicebox"
-		name = "small carton"
-		desc = "A small carton, intended for holding drinks."
-
-/obj/item/reagent_containers/food/drinks/honeycomb
-	name = "Honeycomb"
-	desc = "A honeycomb made by an apid. It seems to be made out of beeswax and fairly weak."
-	icon = 'icons/obj/hydroponics/harvest.dmi'
-	icon_state = "honeycomb"
-	list_reagents = list(/datum/reagent/consumable/honey = 25)
-
-/obj/item/reagent_containers/food/drinks/honeycomb/attack_self(mob/user)
-	if(!reagents.total_volume)
-		user.visible_message("<span class='warning'>[user] snaps the [src] into 2 pieces!</span>",
-		"<span class='notice'>You snap [src] in half.</span>")
-		new /obj/item/stack/sheet/wax(user.loc, 2)
-		qdel(src)
-		return
-	return ..()
-
-//////////////////////////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
-//	itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass
-//	icon states.
-
-/obj/item/reagent_containers/food/drinks/shaker
-	name = "shaker"
-	desc = "A metal shaker to mix drinks in."
-	icon_state = "shaker"
-	custom_materials = list(/datum/material/iron=1500)
-	amount_per_transfer_from_this = 10
-	volume = 100
-	isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/flask
-	name = "flask"
-	desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
-	custom_price = 30
-	icon_state = "flask"
-	custom_materials = list(/datum/material/iron=250)
-	volume = 60
-	isGlass = FALSE
-
-/obj/item/reagent_containers/food/drinks/flask/gold
-	name = "captain's flask"
-	desc = "A gold flask belonging to the captain."
-	icon_state = "flask_gold"
-	custom_materials = list(/datum/material/gold=500)
-
-/obj/item/reagent_containers/food/drinks/flask/det
-	name = "detective's flask"
-	desc = "The detective's only true friend."
-	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
-
-/obj/item/reagent_containers/food/drinks/soda_cans
-	name = "soda can"
-	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
-	reagent_flags = NONE
-	spillable = FALSE
-	isGlass = FALSE
-	custom_price = 10
-
-/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/human/H)
-	if(!reagents.total_volume)
-		H.visible_message("<span class='warning'>[H] is trying to take a big sip from [src]... The can is empty!</span>")
-		return SHAME
-	if(!is_drainable())
-		open_soda()
-		sleep(10)
-	H.visible_message("<span class='suicide'>[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!</span>")
-	playsound(H,'sound/items/drink.ogg', 80, 1)
-	reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip
-	sleep(5)
-	H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore."))
-	if(H.age >= 30)
-		H.Stun(50)
-		sleep(50)
-		playsound(H,'sound/items/drink.ogg', 80, 1)
-		H.say(pick("Another day, another dollar.", "I wonder if I should hold?", "Diversifying is for young'ns.", "Yeap, times were good back then."))
-		return MANUAL_SUICIDE_NONLETHAL
-	sleep(20) //dramatic pause
-	return TOXLOSS
-
-/obj/item/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
-	if(M == user && !src.reagents.total_volume && user.a_intent == INTENT_HARM && user.is_zone_selected(BODY_ZONE_HEAD))
-		user.visible_message("<span class='warning'>[user] crushes the can of [src] on [user.p_their()] forehead!</span>", "<span class='notice'>You crush the can of [src] on your forehead.</span>")
-		playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1)
-		var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
-		crushed_can.icon_state = icon_state
-		qdel(src)
-	..()
-
-/obj/item/reagent_containers/food/drinks/soda_cans/bullet_act(obj/projectile/P)
-	. = ..()
-	if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
-		var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
-		crushed_can.icon_state = icon_state
-		var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
-		crushed_can.throw_at(throw_target, rand(1,2), 7)
-		qdel(src)
-		return
-
-/obj/item/reagent_containers/food/drinks/soda_cans/proc/open_soda(mob/user)
-	to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
-	ENABLE_BITFIELD(reagents.flags, OPENCONTAINER)
-	playsound(src, "can_open", 50, 1)
-	spillable = TRUE
-
-/obj/item/reagent_containers/food/drinks/soda_cans/attack_self(mob/user)
-	if(!is_drainable())
-		open_soda(user)
-	return ..()
-
-/obj/item/reagent_containers/food/drinks/soda_cans/cola
-	name = "Space Cola"
-	desc = "Cola. in space."
-	icon_state = "cola"
-	list_reagents = list(/datum/reagent/consumable/space_cola = 30)
-	foodtype = SUGAR
-
-/obj/item/reagent_containers/food/drinks/soda_cans/tonic
-	name = "T-Borg's tonic water"
-	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
-	icon_state = "tonic"
-	list_reagents = list(/datum/reagent/consumable/tonic = 50)
-	foodtype = ALCOHOL
-
-/obj/item/reagent_containers/food/drinks/soda_cans/sodawater
-	name = "soda water"
-	desc = "A can of soda water. Why not make a scotch and soda?"
-	icon_state = "sodawater"
-	list_reagents = list(/datum/reagent/consumable/sodawater = 50)
-
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime
-	name = "orange soda"
-	desc = "You wanted ORANGE. It gave you Lemon Lime."
-	icon_state = "lemon-lime"
-	list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
-	foodtype = FRUIT
-
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize(mapload)
-	. = ..()
-	name = "lemon-lime soda"
-
-/obj/item/reagent_containers/food/drinks/soda_cans/space_up
-	name = "Space-Up!"
-	desc = "Tastes like a hull breach in your mouth."
-	icon_state = "space-up"
-	list_reagents = list(/datum/reagent/consumable/space_up = 30)
-	foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist
-	name = "Star-kist"
-	desc = "The taste of a star in liquid form. And, a bit of tuna...?"
-	icon_state = "starkist"
-	list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
-	foodtype = SUGAR | FRUIT | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind
-	name = "Space Mountain Wind"
-	desc = "Blows right through you like a space wind."
-	icon_state = "space_mountain_wind"
-	list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30)
-	foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
-	name = "Thirteen Loko"
-	desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
-	icon_state = "thirteen_loko"
-	list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30)
-	foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb
-	name = "Dr. Gibb"
-	desc = "A delicious mixture of 42 different flavors."
-	icon_state = "dr_gibb"
-	list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
-	foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game
-	name = "Pwr Game"
-	desc = "The only drink with the PWR that true gamers crave."
-	icon_state = "purple_can"
-	list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
-
-/obj/item/reagent_containers/food/drinks/soda_cans/shamblers
-	name = "Shambler's juice"
-	desc = "~Shake me up some of that Shambler's Juice!~"
-	icon_state = "shamblers"
-	list_reagents = list(/datum/reagent/consumable/shamblers = 30)
-	foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
-	name = "Grey Bull"
-	desc = "Grey Bull, it gives you gloves!"
-	icon_state = "energy_drink"
-	list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
-	foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
-	name = "Monkey Energy"
-	desc = "Unleash the ape!"
-	icon_state = "monkey_energy"
-	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
-	foodtype = SUGAR | JUNKFOOD
-
-/obj/item/reagent_containers/food/drinks/soda_cans/air
-	name = "canned air"
-	desc = "There is no air shortage. Do not drink."
-	icon_state = "air"
-	list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6)
diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm
deleted file mode 100644
index c56380494a4b3..0000000000000
--- a/code/modules/food_and_drinks/food.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// Food.
-////////////////////////////////////////////////////////////////////////////////
-/// Note: When adding food items with dummy parents, make sure to add
-/// the parent to the exclusion list in code/__HELPERS/unsorted.dm's
-/// get_random_food proc.
-////////////////////////////////////////////////////////////////////////////////
-
-/obj/item/reagent_containers/food
-	possible_transfer_amounts = list()
-	volume = 50	//Sets the default container amount for all food items.
-	reagent_flags = INJECTABLE
-	resistance_flags = FLAMMABLE
-	var/foodtype = NONE
-	var/last_check_time
-	var/in_container = FALSE //currently just stops "was bitten X times!" messages on canned food
-
-/obj/item/reagent_containers/food/Initialize(mapload)
-	. = ..()
-	if(!mapload)
-		pixel_x = rand(-5, 5)
-		pixel_y = rand(-5, 5)
-
-/obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M)
-	if(last_check_time + 50 < world.time)
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
-
-			if((foodtype & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
-				SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
-			last_check_time = world.time
-
-			if(!T) //if you don't have a tongue you don't taste..
-				return
-
-			if(!HAS_TRAIT(H, TRAIT_AGEUSIA))
-				if(foodtype & T.toxic_food)
-					to_chat(H,"<span class='warning'>What the hell was that thing?!</span>")
-					H.adjust_disgust(25 + 30 * fraction)
-					SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
-				else if(foodtype & T.disliked_food)
-					to_chat(H,"<span class='notice'>That didn't taste very good...</span>")
-					H.adjust_disgust(11 + 15 * fraction)
-					SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
-				else if(foodtype & T.liked_food)
-					to_chat(H,"<span class='notice'>I love this taste!</span>")
-					H.adjust_disgust(-5 + -2.5 * fraction)
-					SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
-			else
-				if(foodtype & T.toxic_food)
-					to_chat(H, "<span class='warning'>You don't feel so good...</span>")
-					H.adjust_disgust(25 + 30 * fraction)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 84bcfb5270c74..4ed9d8d7ee6a7 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -10,9 +10,9 @@ God bless America.
 
 /// Global typecache of things which should never be fried.
 GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
-	/obj/item/reagent_containers/glass,
+	/obj/item/reagent_containers/cup,
 	/obj/item/reagent_containers/syringe,
-	/obj/item/reagent_containers/food/condiment,
+	/obj/item/reagent_containers/condiment,
 	/obj/item/small_delivery,
 	/obj/item/his_grace,
 )))
diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
index a5186e45ddc8a..95e8c8d7df5b3 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
@@ -34,8 +34,8 @@
 	if(O.tool_behaviour == TOOL_WRENCH)
 		default_unfasten_wrench(user, O, 0)
 		return TRUE
-	if(istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass))
-		var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = O
+	if(istype(O, /obj/item/reagent_containers/cup/glass/drinkingglass))
+		var/obj/item/reagent_containers/cup/glass/drinkingglass/DG = O
 		if(!DG.reagents.total_volume) //glass is empty
 			qdel(DG)
 			glasses++
@@ -132,7 +132,7 @@
 			to_chat(usr, "<span class='warning'>There are no glasses left!</span>")
 			glasses = 0
 		else
-			var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = new(loc)
+			var/obj/item/reagent_containers/cup/glass/drinkingglass/DG = new(loc)
 			if(href_list["pour"])
 				reagents.trans_id_to(DG, reagents.reagent_list[text2num(href_list["pour"])]?.type, portion)
 			if(href_list["m_pour"])
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index b4a43d9308d0f..4ecb27d42b8e6 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -51,7 +51,7 @@
 	if(I.resistance_flags & INDESTRUCTIBLE)
 		to_chat(user, "<span class='warning'>You don't feel it would be wise to grill [I]...</span>")
 		return ..()
-	if(istype(I, /obj/item/reagent_containers/glass))
+	if(istype(I, /obj/item/reagent_containers/cup))
 		if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy))
 			grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)))
 			to_chat(user, "<span class='notice'>You pour the Monkey Energy in [src].</span>")
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index ac38d414529c7..1713d03236f04 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -225,7 +225,7 @@
 			to_chat(user, "<span class='warning'>You need more space cleaner!</span>")
 		return TRUE
 
-	if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/glass/rag))
+	if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/cup/rag))
 		var/cleanspeed = 50
 		if(istype(O, /obj/item/soap))
 			var/obj/item/soap/used_soap = O
@@ -331,7 +331,7 @@
 		muck()
 		return
 	for(var/obj/O in ingredients)
-		if(istype(O, /obj/item/reagent_containers/food) || istype(O, /obj/item/grown))
+		if(istype(O, /obj/item/food) || istype(O, /obj/item/grown))
 			continue
 		if(prob(min(dirty * 5, 100)))
 			start_can_fail()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 878c905287fbc..08310ad408ac1 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -398,9 +398,9 @@
 	desc = "A refrigerated storage unit for tasty tasty alcohol."
 
 /obj/machinery/smartfridge/drinks/accept_check(obj/item/O)
-	if(!istype(O, /obj/item/reagent_containers) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len)
+	if(!is_reagent_container(O) || (O.item_flags & ABSTRACT) || !O.reagents || !O.reagents.reagent_list.len)
 		return FALSE
-	if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks) || istype(O, /obj/item/reagent_containers/food/condiment))
+	if(istype(O, /obj/item/reagent_containers/cup) || istype(O, /obj/item/reagent_containers/cup/glass) || istype(O, /obj/item/reagent_containers/condiment))
 		return TRUE
 
 // ----------------------------
@@ -491,7 +491,7 @@
 		return TRUE
 	if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted
 		return FALSE
-	if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) \
+	if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/cup/bottle) || istype(O, /obj/item/reagent_containers/cup/beaker) \
 	|| istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray) || istype(O, /obj/item/reagent_containers/chem_bag))
 		return TRUE
 	return FALSE
@@ -500,8 +500,8 @@
 	initial_contents = list(
 		/obj/item/reagent_containers/pill/epinephrine = 12,
 		/obj/item/reagent_containers/pill/charcoal = 5,
-		/obj/item/reagent_containers/glass/bottle/epinephrine = 1,
-		/obj/item/reagent_containers/glass/bottle/charcoal = 1)
+		/obj/item/reagent_containers/cup/bottle/epinephrine = 1,
+		/obj/item/reagent_containers/cup/bottle/charcoal = 1)
 
 // ----------------------------
 // Virology Medical Smartfridge
@@ -513,17 +513,17 @@
 /obj/machinery/smartfridge/chemistry/virology/preloaded
 	initial_contents = list(
 		/obj/item/reagent_containers/syringe/antiviral = 4,
-		/obj/item/reagent_containers/glass/bottle/synaptizine = 1,
-		/obj/item/reagent_containers/glass/bottle/formaldehyde = 1,
-		/obj/item/reagent_containers/glass/bottle/cryostylane = 1)
+		/obj/item/reagent_containers/cup/bottle/synaptizine = 1,
+		/obj/item/reagent_containers/cup/bottle/formaldehyde = 1,
+		/obj/item/reagent_containers/cup/bottle/cryostylane = 1)
 
 /obj/machinery/smartfridge/chemistry/virology/preloaded/Initialize(mapload)
 	.=..()
 	if(CONFIG_GET(flag/allow_virologist))
-		new /obj/item/reagent_containers/glass/bottle/cold(src)
-		new /obj/item/reagent_containers/glass/bottle/flu_virion(src)
-		new	/obj/item/reagent_containers/glass/bottle/mutagen(src)
-		new /obj/item/reagent_containers/glass/bottle/plasma(src)
+		new /obj/item/reagent_containers/cup/bottle/cold(src)
+		new /obj/item/reagent_containers/cup/bottle/flu_virion(src)
+		new	/obj/item/reagent_containers/cup/bottle/mutagen(src)
+		new /obj/item/reagent_containers/cup/bottle/plasma(src)
 	else
 		desc = "A refrigerated storage unit for volatile sample storage."
 
@@ -541,7 +541,7 @@
 		symptomholder.Finalize()
 		symptomholder.Refresh()
 		var/list/data = list("viruses" = list(symptomholder))
-		var/obj/item/reagent_containers/glass/bottle/B = new
+		var/obj/item/reagent_containers/cup/bottle/B = new
 		B.name = "[symptomholder.name] culture bottle"
 		B.desc = "A small bottle. Contains [symptomholder.agent] culture in synthblood medium."
 		B.reagents.add_reagent(/datum/reagent/blood, 20, data)
@@ -550,7 +550,7 @@
 		if(!istype(disease, /datum/disease/advance))
 			var/datum/disease/target = new disease
 			var/list/data = list("viruses" = list(target))
-			var/obj/item/reagent_containers/glass/bottle/B = new
+			var/obj/item/reagent_containers/cup/bottle/B = new
 			B.name = "[target.name] culture bottle"
 			B.desc = "A small bottle. Contains [target.agent] culture in synthblood medium."
 			B.reagents.add_reagent(/datum/reagent/blood, 20, data)
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index 7978435972b18..b6dcfe91218d9 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -221,7 +221,7 @@
 	else if(is_wire_tool(I))
 		if(wires && bomb)
 			wires.interact(user)
-	else if(istype(I, /obj/item/reagent_containers/food))
+	else if(istype(I, /obj/item/reagent_containers/cup))
 		to_chat(user, "<span class='warning'>That's not a pizza!</span>")
 	..()
 
diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm
index 0d85c78f7db5c..d7a68c3567884 100644
--- a/code/modules/food_and_drinks/plate.dm
+++ b/code/modules/food_and_drinks/plate.dm
@@ -98,6 +98,6 @@
 /obj/item/plate_shard/Initialize(mapload)
 	. = ..()
 
-	AddComponent(/datum/component/caltrop, min_damage = force)
+	AddComponent(/datum/component/caltrop, _min_damage = force)
 
 	icon_state = "[base_icon_state][pick(1,variants)]"
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 1d6193b28a5b4..d91255e04de1d 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -598,6 +598,22 @@
 	required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/cocoa = 1)
 	mix_message = "The color changes as the mixture blends smoothly."
 
+/datum/chemical_reaction/hot_cocoa
+	name = "Hot Coco"
+	results = list(/datum/reagent/consumable/hot_cocoa = 6)
+	required_reagents = list(/datum/reagent/consumable/milk = 5, /datum/reagent/consumable/cocoa = 1)
+	required_temp = 320
+
+/datum/chemical_reaction/coffee
+	name = "Coffee"
+	results = list(/datum/reagent/consumable/coffee = 5)
+	required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5)
+
+/datum/chemical_reaction/tea
+	name = "Tea"
+	results = list(/datum/reagent/consumable/tea = 5)
+	required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5)
+
 /datum/chemical_reaction/eggnog
 	name = /datum/reagent/consumable/ethanol/eggnog
 	id = /datum/reagent/consumable/ethanol/eggnog
@@ -688,7 +704,7 @@
 	name = "Peppermint Patty"
 	id = /datum/reagent/consumable/ethanol/peppermint_patty
 	results = list(/datum/reagent/consumable/ethanol/peppermint_patty = 10)
-	required_reagents = list(/datum/reagent/consumable/cocoa/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1)
+	required_reagents = list(/datum/reagent/consumable/hot_cocoa = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1)
 	mix_message = "The cocoa turns mint green just as the strong scent hits your nose."
 
 /datum/chemical_reaction/alexander
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 06a36ca2fbc73..18b1c6b0c3aed 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -37,24 +37,6 @@
 	for(var/i in 1 to created_volume)
 		new /obj/item/food/chocolatebar(location)
 
-/datum/chemical_reaction/food/hot_cocoa
-	name = "Hot Cocoa"
-	id = /datum/reagent/consumable/cocoa/hot_cocoa
-	results = list(/datum/reagent/consumable/cocoa/hot_cocoa = 5)
-	required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/cocoa = 1)
-
-/datum/chemical_reaction/food/coffee
-	name = "Coffee"
-	id = /datum/reagent/consumable/coffee
-	results = list(/datum/reagent/consumable/coffee = 5)
-	required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5)
-
-/datum/chemical_reaction/food/tea
-	name = "Tea"
-	id = /datum/reagent/consumable/tea
-	results = list(/datum/reagent/consumable/tea = 5)
-	required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5)
-
 /datum/chemical_reaction/food/soysauce
 	name = "Soy Sauce"
 	id = /datum/reagent/consumable/soysauce
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index d106fd06f2c46..ddd6aee296999 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -93,7 +93,7 @@
 		if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST)
 			if(honeycombs.len < get_max_honeycomb())
 				bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
-				var/obj/item/reagent_containers/honeycomb/HC = new(src)
+				var/obj/item/reagent_containers/cup/glass/honeycomb/HC = new(src)
 				if(queen_bee.beegent)
 					HC.set_reagent(queen_bee.beegent.type)
 				honeycombs += HC
@@ -231,7 +231,7 @@
 					var/amtH = HF.honeycomb_capacity
 					var/fallen = 0
 					while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
-						var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
+						var/obj/item/reagent_containers/cup/glass/honeycomb/HC = pick_n_take(honeycombs)
 						if(HC)
 							HC.forceMove(drop_location())
 							amtH--
diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
index a2e2005f31d2f..cfb74ccecebf8 100644
--- a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
+++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
@@ -14,4 +14,4 @@
 	item_state = null
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	clothing_flags = THICKMATERIAL
-	allowed = list(/obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
+	allowed = list(/obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm
index 0256ec010822b..7986828e2cfad 100644
--- a/code/modules/hydroponics/beekeeping/honeycomb.dm
+++ b/code/modules/hydroponics/beekeeping/honeycomb.dm
@@ -1,5 +1,5 @@
 
-/obj/item/reagent_containers/honeycomb
+/obj/item/reagent_containers/cup/glass/honeycomb
 	name = "honeycomb"
 	desc = "A hexagonal mesh of honeycomb."
 	icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -13,14 +13,14 @@
 	grind_results = list()
 	var/honey_color = ""
 
-/obj/item/reagent_containers/honeycomb/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/honeycomb/Initialize(mapload)
 	. = ..()
 	pixel_x = rand(8,-8)
 	pixel_y = rand(8,-8)
 	update_icon()
 
 
-/obj/item/reagent_containers/honeycomb/update_icon()
+/obj/item/reagent_containers/cup/glass/honeycomb/update_icon()
 	cut_overlays()
 	var/mutable_appearance/honey_overlay = mutable_appearance(icon, /datum/reagent/consumable/honey)
 	if(honey_color)
@@ -29,7 +29,7 @@
 	add_overlay(honey_overlay)
 
 
-/obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent)
+/obj/item/reagent_containers/cup/glass/honeycomb/proc/set_reagent(reagent)
 	var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
 	if(istype(R))
 		name = "honeycomb ([R.name])"
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index ddf667764ba58..e96bd8f4110c6 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -10,7 +10,7 @@
 
 
 	var/processing = FALSE
-	var/obj/item/reagent_containers/glass/beaker = null
+	var/obj/item/reagent_containers/cup/beaker = null
 	var/points = 0
 	var/efficiency = 0
 	var/productivity = 0
@@ -91,7 +91,7 @@
 
 	if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O))
 		if(beaker)
-			var/obj/item/reagent_containers/glass/B = beaker
+			var/obj/item/reagent_containers/cup/B = beaker
 			B.forceMove(drop_location())
 			beaker = null
 			ui_update()
@@ -101,7 +101,7 @@
 	if(default_deconstruction_crowbar(O))
 		return
 
-	if(istype(O, /obj/item/reagent_containers/glass))
+	if(istype(O, /obj/item/reagent_containers/cup))
 		. = 1 //no afterattack
 		if(!panel_open)
 			if(beaker)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index e23f4ed6ee784..8b995fb82dafe 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -153,50 +153,50 @@
 // *************************************
 
 
-/obj/item/reagent_containers/glass/bottle/nutrient
+/obj/item/reagent_containers/cup/bottle/nutrient
 	name = "bottle of nutrient"
 	volume = 50
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(1,2,5,10,15,25,50)
 
-/obj/item/reagent_containers/glass/bottle/nutrient/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/nutrient/Initialize(mapload)
 	. = ..()
 	pixel_x = base_pixel_x + rand(-5, 5)
 	pixel_y = base_pixel_y + rand(-5, 5)
 
 
-/obj/item/reagent_containers/glass/bottle/nutrient/ez
+/obj/item/reagent_containers/cup/bottle/nutrient/ez
 	name = "bottle of E-Z-Nutrient"
 	desc = "Contains a fertilizer that causes mild mutations with each harvest."
 	list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50)
 	icon_state_preview = "bottle_eznutrient"
 
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z
+/obj/item/reagent_containers/cup/bottle/nutrient/l4z
 	name = "bottle of Left 4 Zed"
 	desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
 	list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50)
 	icon_state_preview = "bottle_left4zed"
 
-/obj/item/reagent_containers/glass/bottle/nutrient/rh
+/obj/item/reagent_containers/cup/bottle/nutrient/rh
 	name = "bottle of Robust Harvest"
 	desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
 	list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50)
 	icon_state_preview = "bottle_robustharvest"
 
-/obj/item/reagent_containers/glass/bottle/nutrient/empty
+/obj/item/reagent_containers/cup/bottle/nutrient/empty
 	name = "bottle"
 
-/obj/item/reagent_containers/glass/bottle/killer
+/obj/item/reagent_containers/cup/bottle/killer
 	volume = 50
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(1,2,5,10,15,25,50)
 
-/obj/item/reagent_containers/glass/bottle/killer/weedkiller
+/obj/item/reagent_containers/cup/bottle/killer/weedkiller
 	name = "bottle of weed killer"
 	desc = "Contains a herbicide."
 	list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 50)
 
-/obj/item/reagent_containers/glass/bottle/killer/pestkiller
+/obj/item/reagent_containers/cup/bottle/killer/pestkiller
 	name = "bottle of pest spray"
 	desc = "Contains a pesticide."
 	list_reagents = list(/datum/reagent/toxin/pestkiller = 50)
diff --git a/code/modules/jobs/job_mail.dm b/code/modules/jobs/job_mail.dm
index 3e2e6525e4a18..9a5d816947ad4 100644
--- a/code/modules/jobs/job_mail.dm
+++ b/code/modules/jobs/job_mail.dm
@@ -27,20 +27,20 @@
 /datum/job/bartender
 	mail_goodies = list(
 		/obj/item/storage/box/rubbershot = 30,
-		/obj/item/reagent_containers/glass/bottle/clownstears = 10,
+		/obj/item/reagent_containers/cup/bottle/clownstears = 10,
 		/obj/item/stack/sheet/mineral/plasma = 5,
 		/obj/item/stack/sheet/mineral/uranium = 5,
-		/obj/item/reagent_containers/food/drinks/bottle/fernet = 3,
-		/obj/item/reagent_containers/food/drinks/bottle/champagne = 3,
-		/obj/item/reagent_containers/food/drinks/bottle/trappist = 3,
+		/obj/item/reagent_containers/cup/glass/bottle/fernet = 3,
+		/obj/item/reagent_containers/cup/glass/bottle/champagne = 3,
+		/obj/item/reagent_containers/cup/glass/bottle/trappist = 3,
 	)
 
 //BOTANIST
 /datum/job/botanist
 	mail_goodies = list(
-		/obj/item/reagent_containers/glass/bottle/saltpetre = 15,
-		/obj/item/reagent_containers/glass/bottle/diethylamine = 15,
-		/obj/item/reagent_containers/glass/bottle/toxin/mutagen = 12,
+		/obj/item/reagent_containers/cup/bottle/saltpetre = 15,
+		/obj/item/reagent_containers/cup/bottle/diethylamine = 15,
+		/obj/item/reagent_containers/cup/bottle/toxin/mutagen = 12,
 		/obj/item/grenade/chem_grenade/antiweed = 10,
 		/obj/item/gun/energy/floragun = 5,
 		// These are strong, rare seeds, so use sparingly.
@@ -66,7 +66,7 @@
 		/obj/item/pen/fountain/captain = 10,
 		/obj/item/coin/plasma = 7,
 		/obj/item/storage/fancy/cigarettes/cigars/havana = 5,
-		/obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
+		/obj/item/reagent_containers/cup/glass/bottle/champagne = 5,
 		/obj/item/ammo_box/n762 = 2,
 		/obj/item/gun/ballistic/revolver/nagant = 1,
 	)
@@ -84,7 +84,7 @@
 //CHAPLAIN
 /datum/job/chaplain
 	mail_goodies = list(
-		/obj/item/reagent_containers/food/drinks/bottle/holywater = 15,
+		/obj/item/reagent_containers/cup/glass/bottle/holywater = 15,
 		/obj/item/storage/book/bible = 10,
 		/obj/item/grenade/chem_grenade/holy = 5,
 		/obj/item/toy/plush/awakenedplushie = 3,
@@ -95,11 +95,11 @@
 //CHEMIST
 /datum/job/chemist
 	mail_goodies = list(
-		/obj/item/reagent_containers/glass/bottle/flash_powder = 15,
+		/obj/item/reagent_containers/cup/bottle/flash_powder = 15,
 		/obj/item/reagent_containers/dropper = 10,
-		/obj/item/reagent_containers/glass/beaker/large = 10,
-		/obj/item/reagent_containers/glass/beaker/plastic = 10,
-		/obj/item/reagent_containers/glass/bottle/ketamine = 5,
+		/obj/item/reagent_containers/cup/beaker/large = 10,
+		/obj/item/reagent_containers/cup/beaker/plastic = 10,
+		/obj/item/reagent_containers/cup/bottle/ketamine = 5,
 	)
 
 //CHIEF ENGINEER
@@ -107,7 +107,7 @@
 	mail_goodies = list(
 		//you know. for poly
 		/obj/item/food/cracker = 15,
-		/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 15,
+		/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 15,
 		/obj/item/rcd_ammo = 10,
 		/obj/item/wrench/caravan = 3,
 		/obj/item/wirecutters/caravan = 3,
@@ -146,12 +146,12 @@
 //COOK
 /datum/job/cook
 	mail_goodies = list(
-		/obj/item/reagent_containers/glass/bottle/caramel = 20,
-		/obj/item/reagent_containers/food/condiment/flour = 20,
-		/obj/item/reagent_containers/food/condiment/rice = 20,
-		/obj/item/reagent_containers/food/condiment/enzyme = 15,
-		/obj/item/reagent_containers/food/condiment/soymilk = 15,
-		/obj/item/reagent_containers/food/condiment/milk = 15,
+		/obj/item/reagent_containers/cup/bottle/caramel = 20,
+		/obj/item/reagent_containers/condiment/flour = 20,
+		/obj/item/reagent_containers/condiment/rice = 20,
+		/obj/item/reagent_containers/condiment/enzyme = 15,
+		/obj/item/reagent_containers/condiment/soymilk = 15,
+		/obj/item/reagent_containers/condiment/milk = 15,
 		//UR SO FAT!
 		/obj/item/food/mint = 12,
 		/obj/item/storage/box/ingredients/wildcard = 10,
@@ -194,7 +194,7 @@
 	mail_goodies = list(
 		/obj/item/storage/fancy/cigarettes = 15,
 		/obj/item/ammo_box/c38 = 10,
-		/obj/item/reagent_containers/food/drinks/bottle/rum = 10,
+		/obj/item/reagent_containers/cup/glass/bottle/rum = 10,
 		/obj/item/ammo_box/c38/dumdum = 5,
 		/obj/item/ammo_box/c38/hotshot = 5,
 		/obj/item/ammo_box/c38/iceblox = 5,
@@ -306,7 +306,7 @@
 	mail_goodies = list(
 		/obj/item/healthanalyzer/advanced = 10,
 		/obj/item/storage/pill_bottle/epinephrine = 8,
-		/obj/item/reagent_containers/glass/bottle/formaldehyde = 6,
+		/obj/item/reagent_containers/cup/bottle/formaldehyde = 6,
 		/obj/effect/spawner/mail/advmedtool = 4,
 		/obj/effect/spawner/mail/organminor = 5,
 		/obj/effect/spawner/mail/organmajor = 1,
@@ -317,7 +317,7 @@
 	mail_goodies = list(
 		/obj/item/food/baguette/mime = 15,
 		/obj/item/food/cheese/wheel = 10,
-		/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 10,
+		/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing = 10,
 		/obj/item/book/mimery = 2,
 		//when you thought it could get worse...
 		/obj/item/book/granter/spell/mimery_blockade = 1,
@@ -406,7 +406,7 @@
 /datum/job/station_engineer
 	mail_goodies = list(
 		/obj/item/storage/box/lights/mixed = 15,
-		/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 15,
+		/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 15,
 		/obj/item/lightreplacer = 10,
 		/obj/item/holosign_creator/engineering = 8,
 		//An assistant can only dream of those...
@@ -420,9 +420,9 @@
 		//keep your workplace clean, please.
 		/obj/item/reagent_containers/spray/cleaner = 15,
 		/obj/item/food/monkeycube = 10,
-		/obj/item/reagent_containers/glass/bottle/formaldehyde = 10,
-		/obj/item/reagent_containers/glass/bottle/random_virus/minor = 10,
-		/obj/item/reagent_containers/glass/bottle/random_virus = 5,
+		/obj/item/reagent_containers/cup/bottle/formaldehyde = 10,
+		/obj/item/reagent_containers/cup/bottle/random_virus/minor = 10,
+		/obj/item/reagent_containers/cup/bottle/random_virus = 5,
 		/obj/item/stock_parts/scanning_module/phasic = 5,
 		//hampter.
 		/obj/item/choice_beacon/pet/hamster = 5,
@@ -436,7 +436,7 @@
 		/obj/item/clothing/ears/headphones = 10,
 		//Only on the iScream 12
 		/obj/item/clothing/under/syndicate/tacticool = 10,
-		/obj/item/reagent_containers/food/drinks/flask/gold = 10,
+		/obj/item/reagent_containers/cup/glass/flask/gold = 10,
 		/obj/item/choice_beacon/pet = 5,
 		/obj/item/storage/bag/money = 5,
 		/obj/item/coin/gold = 5,
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index a6a74bc713df7..4f9a5c62911a7 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -50,7 +50,7 @@
 	suit = /obj/item/clothing/suit/suspenders
 	backpack_contents = list(
 		/obj/item/book/mimery=1,
-		/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing=1,
+		/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing=1,
 		/obj/item/stamp/mime=1
 	)
 
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index f62fc62f87519..b29d72a80de34 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -123,9 +123,9 @@
 	var/loot = rand(1,100) //100 different crates with varying chances of spawning
 	switch(loot)
 		if(1 to 5) //5% chance
-			new /obj/item/reagent_containers/food/drinks/bottle/rum(src)
+			new /obj/item/reagent_containers/cup/glass/bottle/rum(src)
 			new /obj/item/food/grown/ambrosia/deus(src)
-			new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+			new /obj/item/reagent_containers/cup/glass/bottle/whiskey(src)
 			new /obj/item/lighter(src)
 		if(6 to 10)
 			new /obj/item/bedsheet(src)
@@ -136,7 +136,7 @@
 			new /obj/item/hatchet(src)
 			new /obj/item/crowbar(src)
 		if(11 to 15)
-			new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+			new /obj/item/reagent_containers/cup/beaker/bluespace(src)
 		if(16 to 20)
 			new /obj/item/stack/ore/diamond(src, 10)
 		if(21 to 25)
@@ -144,7 +144,7 @@
 				new /obj/item/poster/random_contraband(src)
 		if(26 to 30)
 			for(var/i in 1 to 3)
-				new /obj/item/reagent_containers/glass/beaker/noreact(src)
+				new /obj/item/reagent_containers/cup/beaker/noreact(src)
 		if(31 to 35)
 			new /obj/item/seeds/firelemon(src)
 		if(36 to 40)
@@ -235,7 +235,7 @@
 			new /obj/item/clothing/head/beret(src)
 			new /obj/item/clothing/suit/suspenders(src)
 			new /obj/item/toy/crayon/mime(src)
-			new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
+			new /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing(src)
 		if(96)
 			new /obj/item/hand_tele(src)
 		if(97)
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 1414d9a7abee0..a060e75ef0b1f 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -292,13 +292,13 @@
 
 //CRAFTING
 
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl
 	name = "mushroom bowl"
 	desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
 	icon = 'icons/obj/lavaland/ash_flora.dmi'
 	icon_state = "mushroom_bowl"
 
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl/update_icon()
+/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_icon()
 	cut_overlays()
 	if(reagents?.total_volume)
 		var/mutable_appearance/filling = mutable_appearance('icons/obj/lavaland/ash_flora.dmi', "fullbowl")
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index a60c049535526..88aa17293bc9a 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -45,8 +45,8 @@
 		/obj/item/gun/magic/hook											= 5,
 		/obj/item/book_of_babel 											= 5,
 		/obj/item/clothing/neck/necklace/memento_mori						= 5,
-		/obj/item/reagent_containers/glass/waterbottle/relic				= 5,
-		/obj/item/reagent_containers/glass/bottle/necropolis_seed			= 5,
+		/obj/item/reagent_containers/cup/glass/waterbottle/relic				= 5,
+		/obj/item/reagent_containers/cup/bottle/necropolis_seed			= 5,
 		/obj/item/borg/upgrade/modkit/lifesteal								= 5,
 		/obj/item/shared_storage/red										= 5,
 		/obj/item/staff/storm												= 5
@@ -302,13 +302,13 @@
 		qdel(src)
 
 // Relic water bottle
-/obj/item/reagent_containers/glass/waterbottle/relic
+/obj/item/reagent_containers/cup/glass/waterbottle/relic
 	name = "ancient bottle of unknown reagent"
 	desc = "A bottle of water filled with unknown liquids. It seems to be radiating some kind of energy."
 	flip_chance = 100 // FLIPP
 	list_reagents = list()
 
-/obj/item/reagent_containers/glass/waterbottle/relic/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/waterbottle/relic/Initialize(mapload)
 	var/reagents = volume
 	while(reagents)
 		var/newreagent = rand(1, min(reagents, 30))
@@ -588,16 +588,16 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/shared_storage/blue)
 
 
 //Potion of Flight
-/obj/item/reagent_containers/glass/bottle/potion
+/obj/item/reagent_containers/cup/bottle/potion
 	icon = 'icons/obj/lavaland/artefacts.dmi'
 	icon_state = "potionflask"
 
-/obj/item/reagent_containers/glass/bottle/potion/flight
+/obj/item/reagent_containers/cup/bottle/potion/flight
 	name = "strange elixir"
 	desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'."
 	list_reagents = list(/datum/reagent/flightpotion = 5)
 
-/obj/item/reagent_containers/glass/bottle/potion/update_icon()
+/obj/item/reagent_containers/cup/bottle/potion/update_icon()
 	if(reagents.total_volume)
 		icon_state = "potionflask"
 	else
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 976f4a1babf2b..f6fdc63876da6 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -210,8 +210,8 @@
 		new /datum/data/vendor_equipment("Point Transfer Card",			/obj/item/card/mining_point_card,									500),
 		new /datum/data/vendor_equipment("GAR Mesons",					/obj/item/clothing/glasses/meson/gar,								500),
 		new /datum/data/vendor_equipment("Pizza",						/obj/item/pizzabox/margherita,										200),
-		new /datum/data/vendor_equipment("Whiskey",						/obj/item/reagent_containers/food/drinks/bottle/whiskey,			100),
-		new /datum/data/vendor_equipment("Absinthe",					/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,	100),
+		new /datum/data/vendor_equipment("Whiskey",						/obj/item/reagent_containers/cup/glass/bottle/whiskey,			100),
+		new /datum/data/vendor_equipment("Absinthe",					/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium,	100),
 		new /datum/data/vendor_equipment("Cigar",						/obj/item/clothing/mask/cigarette/cigar/havana,						150),
 		new /datum/data/vendor_equipment("Soap",						/obj/item/soap/nanotrasen,											200),
 		new /datum/data/vendor_equipment("Laser Pointer",				/obj/item/laser_pointer,											300),
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 4135e320427ed..3a3cd3f151ba2 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -444,7 +444,7 @@
 		/obj/item/melee/flyswatter,
 		/obj/item/extinguisher/mini,
 		/obj/item/mop/cyborg,
-		/obj/item/reagent_containers/glass/bucket,
+		/obj/item/reagent_containers/cup/bucket,
 		/obj/item/paint/paint_remover,
 		/obj/item/lightreplacer/cyborg,
 		/obj/item/holosign_creator/janibarrier,
@@ -537,7 +537,7 @@
 
 /obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
 	..()
-	var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/food/condiment/enzyme) in basic_modules
+	var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/condiment/enzyme) in basic_modules
 	if(O)
 		O.reagents.add_reagent(/datum/reagent/consumable/enzyme, 2 * coeff)
 
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 9d3538e7f328f..de563e52cd4fa 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -281,7 +281,7 @@
 	visible_message("<span class='boldannounce'>[src] blows apart!</span>")
 	var/atom/Tsec = drop_location()
 
-	new /obj/item/reagent_containers/glass/bucket(Tsec)
+	new /obj/item/reagent_containers/cup/bucket(Tsec)
 
 	new /obj/item/assembly/prox_sensor(Tsec)
 
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index 5ed4af3b31cee..3591e458aeb59 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -83,7 +83,7 @@ GLOBAL_VAR(medibot_unique_id_gen)
 	skin = MEDBOT_SKIN_ADVANCED
 	heal_threshold = 30
 	declare_crit = TRUE
-	reagent_glass = new /obj/item/reagent_containers/glass/beaker/large/kelobic
+	reagent_glass = new /obj/item/reagent_containers/cup/beaker/large/kelobic
 
 /mob/living/simple_animal/bot/medbot/update_icon()
 	cut_overlays()
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 1b3270e5893a9..b7bd499d3fd2f 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -55,7 +55,7 @@
 /mob/living/simple_animal/bot/secbot/beepsky/explode()
 	var/atom/Tsec = drop_location()
 	new /obj/item/stock_parts/cell/potato(Tsec)
-	var/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/S = new(Tsec)
+	var/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/S = new(Tsec)
 	S.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15)
 	S.on_reagent_change(ADD_REAGENT)
 	..()
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index c44136d588143..5701f4712fb73 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -111,10 +111,10 @@
 /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/barf_food(atom/A, hard = FALSE)
 	if (stat == DEAD)
 		return
-	if(!istype(A, /obj/item/reagent_containers/food))
+	if(!istype(A, /obj/item/food))
 		return
 	var/turf/currentTurf = get_turf(src)
-	var/obj/item/reagent_containers/food/consumed = A
+	var/obj/item/food/consumed = A
 	consumed.forceMove(currentTurf)
 	var/destination = get_edge_target_turf(currentTurf, pick(GLOB.alldirs)) //Pick a random direction to toss them in
 	var/throwRange = hard ? rand(2,8) : 1
@@ -174,7 +174,7 @@
 		"vomit" = CALLBACK(src, PROC_REF(vomit_prestart), 25)), 20)
 
 /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/eat()
-	var/obj/item/reagent_containers/food/tasty = locate() in get_turf(src)
+	var/obj/item/food/tasty = locate() in get_turf(src)
 	if (tasty)
 		feed(tasty)
 
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 55816114f20c1..55c9e72cdff48 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -328,7 +328,7 @@
 			belt = null
 			backpack_contents = list()
 			if(prob(70))
-				backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/food/grown/banana = 1, /obj/item/megaphone/clown = 1, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter = 1, /obj/item/pneumatic_cannon/pie = 1))
+				backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/food/grown/banana = 1, /obj/item/megaphone/clown = 1, /obj/item/reagent_containers/cup/soda_cans/canned_laughter = 1, /obj/item/pneumatic_cannon/pie = 1))
 			if(prob(30))
 				backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pick_weight(list( 1 = 3, 2 = 2, 3 = 1)))
 			if(prob(10))
@@ -377,5 +377,5 @@
 			r_pocket = /obj/item/restraints/legcuffs/bola/cult
 			l_pocket = /obj/item/melee/cultblade/dagger
 			glasses =  /obj/item/clothing/glasses/hud/health/night/cultblind
-			backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15)
+			backpack_contents = list(/obj/item/reagent_containers/cup/glass/bottle/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15)
 	. = ..()
diff --git a/code/modules/modular_computers/file_system/programs/phys_scanner.dm b/code/modules/modular_computers/file_system/programs/phys_scanner.dm
index d98c8d71917f8..6a81c41c8b27f 100644
--- a/code/modules/modular_computers/file_system/programs/phys_scanner.dm
+++ b/code/modules/modular_computers/file_system/programs/phys_scanner.dm
@@ -46,7 +46,7 @@
 				user.visible_message("<span class='notice'>[user] analyzes [carbon]'s vitals.</span>", "<span class='notice'>You analyze [carbon]'s vitals.</span>")
 				last_record = chemscan(user, carbon, to_chat = FALSE)
 				return FALSE
-			else if(!istype(target, /obj/item/reagent_containers/pill/floorpill) && !istype(target, /obj/item/reagent_containers/glass/chem_heirloom))
+			else if(!istype(target, /obj/item/reagent_containers/pill/floorpill) && !istype(target, /obj/item/reagent_containers/cup/chem_heirloom))
 				if(!isnull(target.reagents))
 					if(target.reagents.reagent_list.len > 0)
 						var/reagents_length = target.reagents.reagent_list.len
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
index 0e70569dc52e2..a517c67c4d8b3 100644
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ b/code/modules/ninja/suit/suit_attackby.dm
@@ -4,7 +4,7 @@
 	if(U!=affecting)//Safety, in case you try doing this without wearing the suit/being the person with the suit.
 		return ..()
 
-	if(istype(I, /obj/item/reagent_containers/glass))//If it's a glass beaker.
+	if(istype(I, /obj/item/reagent_containers/cup))//If it's a glass beaker.
 		if(I.reagents.has_reagent(/datum/reagent/uranium/radium, a_transfer) && a_boost < a_maxamount)
 			I.reagents.remove_reagent(/datum/reagent/uranium/radium, a_transfer)
 			a_boost++;
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index a5872a9add45b..c77f5660f2620 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -205,7 +205,7 @@
 		user.visible_message("<span class='notice'>[user] cleans \the [src].</span>", "<span class='notice'>You clean \the [src].</span>")
 		jammed = FALSE
 		return TRUE
-	if(istype(item, /obj/item/soap) || istype(item, /obj/item/reagent_containers/glass/rag))
+	if(istype(item, /obj/item/soap) || istype(item, /obj/item/reagent_containers/cup/rag))
 		var/cleanspeed = 50
 		if(istype(item, /obj/item/soap))
 			var/obj/item/soap/used_soap = item
@@ -432,7 +432,7 @@
 		return "[state_prefix]_cash"
 	if(istype(item, /obj/item/card))
 		return "[state_prefix]_id"
-	if(istype(item, /obj/item/reagent_containers/food))
+	if (istype(item, /obj/item/food))
 		return "[state_prefix]_food"
 	if(istype(item, /obj/item/throwing_star))
 		return "[state_prefix]_star"
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 23505e0d756c8..901dae2967aa7 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -78,7 +78,7 @@
 
 /obj/machinery/chem_master/RefreshParts()
 	reagents.maximum_volume = 0
-	for(var/obj/item/reagent_containers/glass/beaker/B in component_parts)
+	for(var/obj/item/reagent_containers/cup/beaker/B in component_parts)
 		reagents.maximum_volume += B.reagents.maximum_volume
 
 /obj/machinery/chem_master/ex_act(severity, target)
@@ -445,9 +445,9 @@
 						reagents.trans_to(P, vol_each, transfered_by = usr)
 					. = TRUE
 				if("bottle")
-					var/obj/item/reagent_containers/glass/bottle/P
+					var/obj/item/reagent_containers/cup/bottle/P
 					for(var/i in 1 to amount)
-						P = new/obj/item/reagent_containers/glass/bottle(drop_location())
+						P = new/obj/item/reagent_containers/cup/bottle(drop_location())
 						P.name = trim("[name] bottle")
 						P.label_name = trim(name)
 						adjust_item_drop_location(P)
@@ -463,9 +463,9 @@
 						reagents.trans_to(P, vol_each, transfered_by = usr)
 					. = TRUE
 				if("condimentPack")
-					var/obj/item/reagent_containers/food/condiment/pack/P
+					var/obj/item/reagent_containers/condiment/pack/P
 					for(var/i in 1 to amount)
-						P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
+						P = new/obj/item/reagent_containers/condiment/pack(drop_location())
 						P.originalname = name
 						P.name = trim("[name] pack")
 						P.label_name = trim(name)
@@ -473,9 +473,9 @@
 						reagents.trans_to(P, vol_each, transfered_by = usr)
 					. = TRUE
 				if("condimentBottle")
-					var/obj/item/reagent_containers/food/condiment/P
+					var/obj/item/reagent_containers/condiment/P
 					for(var/i in 1 to amount)
-						P = new/obj/item/reagent_containers/food/condiment(drop_location())
+						P = new/obj/item/reagent_containers/condiment(drop_location())
 						if (style)
 							apply_condi_style(P, style)
 						P.renamedByPlayer = TRUE
@@ -579,11 +579,11 @@
 			"frostoil" = list("icon_state" = "coldsauce", "icon_empty" = "", "name" = "coldsauce bottle", "desc" = "Leaves the tongue numb from its passage."),
 			"mayonnaise" = list("icon_state" = "mayonnaise", "icon_empty" = "", "name" = "mayonnaise bottle", "desc" = "An oily condiment made from egg yolks."),
 			"ketchup" = list("icon_state" = "ketchup", "icon_empty" = "", "name" = "ketchup bottle", "desc" = "A tomato slurry in a tall plastic bottle. Somehow still vaguely American."),
-			"blackpepper" = list("icon_state" = "peppermillsmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."),
-			"sodiumchloride" = list("icon_state" = "saltshakersmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."),
+			"blackpepper" = list("icon_state" = "peppermillsmall", "item_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."),
+			"sodiumchloride" = list("icon_state" = "saltshakersmall", "item_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."),
 			"milk" = list("icon_state" = "milk", "icon_empty" = "", "name" = "space milk", "desc" = "It's milk. White and nutritious goodness!"),
 			"soymilk" = list("icon_state" = "soymilk", "icon_empty" = "", "name" = "soy milk", "desc" = "It's soy milk. White and nutritious goodness!"),
-			"soysauce" = list("icon_state" = "soysauce", "inhand_icon_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."),
+			"soysauce" = list("icon_state" = "soysauce", "item_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."),
 			"bbqsauce" = list("icon_state" = "bbqsauce", "icon_empty" = "", "name" = "bbq sauce bottle", "desc" = "Hand wipes not included."),
 			"oliveoil" = list("icon_state" = "oliveoil", "icon_empty" = "", "name" = "olive oil bottle", "desc" = "A delicious oil made from olives."),
 			"cooking_oil" = list("icon_state" = "cooking_oil", "icon_empty" = "", "name" = "cooking oil bottle", "desc" = "A cooking oil for deep frying."),
@@ -633,7 +633,7 @@
   * * container - condiment bottle that gets style applied to it
   * * style - assoc list, must probably one from [/obj/machinery/chem_master/proc/get_condi_styles]
   */
-/obj/machinery/chem_master/proc/apply_condi_style(obj/item/reagent_containers/food/condiment/container, list/style)
+/obj/machinery/chem_master/proc/apply_condi_style(obj/item/reagent_containers/condiment/container, list/style)
 	container.name = style["name"]
 	container.desc = style["desc"]
 	container.icon_state = style["icon_state"]
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index 88a2060870adf..f0a6b97a0a6fa 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -58,7 +58,7 @@
 		if("makecup")
 			if(beaker)
 				return
-			beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+			beaker = new /obj/item/reagent_containers/cup/beaker/bluespace(src)
 			visible_message("<span class='notice'>[src] dispenses a bluespace beaker.</span>")
 			. = TRUE
 		if("amount")
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 504a8c0f002fa..a526058e5270a 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -222,7 +222,7 @@
 			new_disease.dormant = FALSE
 			new_disease.Refresh()
 			var/list/data = list("viruses" = list(new_disease))
-			var/obj/item/reagent_containers/glass/bottle/culture_bottle = new(drop_location())
+			var/obj/item/reagent_containers/cup/bottle/culture_bottle = new(drop_location())
 			culture_bottle.name = "[new_disease.name] culture bottle"
 			culture_bottle.desc = "A small bottle. Contains [new_disease.agent] culture in synthblood medium."
 			culture_bottle.reagents.add_reagent(/datum/reagent/blood, 20, data)
@@ -237,7 +237,7 @@
 				return
 			var/id = params["index"]
 			var/datum/disease/disease = SSdisease.archive_diseases[id]
-			var/obj/item/reagent_containers/glass/bottle/vaccine_bottle = new(drop_location())
+			var/obj/item/reagent_containers/cup/bottle/vaccine_bottle = new(drop_location())
 			vaccine_bottle.name = "[disease.name] vaccine bottle"
 			vaccine_bottle.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id))
 			var/turf/source_turf = get_turf(src)
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index fd8c83a09d5ea..e954d56382520 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -31,7 +31,7 @@
 	if(!typecache_to_take)
 		typecache_to_take = typecacheof(/obj/item/food/grown)
 	holdingitems = list()
-	beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
+	beaker = new /obj/item/reagent_containers/cup/beaker/large(src)
 	beaker.desc += " May contain blended dust. Don't breathe this in!"
 
 /obj/machinery/reagentgrinder/constructed/Initialize(mapload)
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 0e8b74875a4bc..1adcace891a97 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -901,6 +901,26 @@
 	glass_name = "glass of chocolate milk"
 	glass_desc = "Brown and delicious goodness!"
 
+/datum/reagent/consumable/hot_cocoa
+	name = "Hot Coco"
+	description = "Made with love! And coco beans."
+	nutriment_factor = 4 * REAGENTS_METABOLISM
+	color = "#403010" // rgb: 64, 48, 16
+	taste_description = "creamy chocolate"
+	glass_icon_state = "chocolateglass"
+	glass_name = "glass of hot coco"
+	glass_desc = "A favorite winter drink to warm you up."
+	chem_flags = CHEMICAL_RNG_BOTANY
+
+/datum/reagent/consumable/hot_cocoa/on_mob_life(mob/living/carbon/M)
+	M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+	if(M.getBruteLoss() && prob(20))
+		M.heal_bodypart_damage(1,0, 0)
+		. = 1
+	if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
+		holder.remove_reagent(/datum/reagent/consumable/capsaicin, 2)
+	..()
+
 /datum/reagent/consumable/menthol
 	name = "Menthol"
 	description = "Alleviates coughing symptoms one might have."
@@ -964,6 +984,21 @@
 	M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
 	..()
 
+/datum/reagent/consumable/sol_dry
+	name = "Sol Dry"
+	description = "A soothing, mellow drink made from ginger."
+	color = "#f7d26a"
+	quality = DRINK_NICE
+	taste_description = "sweet ginger spice"
+	glass_icon_state = "soldry"
+	glass_name = "Sol Dry"
+	glass_desc = "A soothing, mellow drink made from ginger."
+	chem_flags = CHEMICAL_RNG_BOTANY | CHEMICAL_GOAL_BARTENDER_SERVING
+
+/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M)
+	M.adjust_disgust(-5)
+	..()
+
 /datum/reagent/consumable/red_queen
 	name = "Red Queen"
 	description = "DRINK ME."
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 2451329f80abe..345901695efff 100755
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -372,24 +372,6 @@
 		to_chat(M, "<span class='warning'>Your insides revolt at the presence of lethal chocolate!</span>")
 		M.vomit(20)
 
-
-
-/datum/reagent/consumable/cocoa/hot_cocoa
-	name = "Hot Chocolate"
-	description = "Made with love! And cocoa beans."
-	reagent_state = LIQUID
-	nutriment_factor = 3 * REAGENTS_METABOLISM
-	color = "#403010" // rgb: 64, 48, 16
-	chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN | CHEMICAL_RNG_BOTANY
-	taste_description = "creamy chocolate"
-	glass_icon_state  = "chocolateglass"
-	glass_name = "glass of chocolate"
-	glass_desc = "Tasty."
-
-/datum/reagent/consumable/cocoa/hot_cocoa/on_mob_life(mob/living/carbon/M)
-	M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
-	..()
-
 /datum/reagent/drug/mushroomhallucinogen
 	name = "Mushroom Hallucinogen"
 	description = "A strong hallucinogenic drug derived from certain species of mushroom."
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 7a29f2621d69f..6fca3dfe74e6f 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -673,5 +673,5 @@
 	required_container = /obj/item/slime_extract/rainbow
 
 /datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder)
-	new /obj/item/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom))
+	new /obj/item/reagent_containers/cup/bottle/potion/flight(get_turf(holder.my_atom))
 	..()
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 97516887556a5..f2998e7f8de6b 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -64,10 +64,49 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers)
 				balloon_alert(user, "Transferring [amount_per_transfer_from_this]u.")
 				return
 
-/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/attack(mob/living/target_mob, mob/living/user, params)
 	if(user.a_intent == INTENT_HARM)
 		return ..()
 
+/// Tries to splash the target. Used on both right-click and normal click when in combat mode.
+/obj/item/reagent_containers/proc/try_splash(mob/user, atom/target)
+	if (!spillable)
+		return FALSE
+
+	if (!reagents?.total_volume)
+		return FALSE
+
+	var/punctuation = ismob(target) ? "!" : "."
+
+	var/reagent_text
+	user.visible_message(
+		"<span class='danger'>[user] splashes the contents of [src] onto [target][punctuation]</span>",
+		"<span class='danger'>You splash the contents of [src] onto [target][punctuation]</span>",
+		ignored_mobs = target,
+	)
+
+	if (ismob(target))
+		var/mob/target_mob = target
+		target_mob.show_message(
+			"<span class='userdanger'>[user] splash the contents of [src] onto you!</span>",
+			MSG_VISUAL,
+			"<span class='userdanger'>You feel drenched!</span>",
+		)
+
+	for(var/datum/reagent/reagent as anything in reagents.reagent_list)
+		reagent_text += "[reagent] ([num2text(reagent.volume)]),"
+
+	var/mob/thrown_by = thrownby?.resolve()
+	if(isturf(target) && reagents.reagent_list.len && thrown_by)
+		log_combat(thrown_by, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
+		message_admins("[ADMIN_LOOKUPFLW(thrown_by)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
+
+	reagents.reaction(target, TOUCH)
+	log_combat(user, target, "splashed", reagent_text)
+	reagents.clear_reagents()
+
+	return TRUE
+
 /obj/item/reagent_containers/proc/canconsume(mob/eater, mob/user)
 	if(!iscarbon(eater))
 		return FALSE
@@ -103,8 +142,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers)
 	if(target.CanPass(src, get_dir(target, src)) && thrown_by && HAS_TRAIT(thrown_by, TRAIT_BOOZE_SLIDER))
 		. = TRUE
 
-/obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE)
-	if(!reagents || !reagents.total_volume || !spillable)
+/obj/item/reagent_containers/proc/SplashReagents(atom/target, thrown = FALSE, override_spillable = FALSE)
+	if(!reagents || !reagents.total_volume || (!spillable && !override_spillable))
 		return
 	var/mob/thrown_by = thrownby?.resolve()
 
diff --git a/code/modules/reagents/reagent_containers/chem_heirloom.dm b/code/modules/reagents/reagent_containers/chem_heirloom.dm
index 74ee6f208ab60..d016764561812 100644
--- a/code/modules/reagents/reagent_containers/chem_heirloom.dm
+++ b/code/modules/reagents/reagent_containers/chem_heirloom.dm
@@ -1,7 +1,7 @@
 //Chemist's heirloom
 #define CHEM_H_VOL 100
 
-/obj/item/reagent_containers/glass/chem_heirloom
+/obj/item/reagent_containers/cup/chem_heirloom
 	volume = CHEM_H_VOL //Set this to 0 in init. Doing otherwise breaks add_reagent
 	spillable = FALSE
 	reagent_flags = NONE
@@ -12,9 +12,9 @@
 	var/datum/reagent/rand_cont //Reagent of choice
 	var/datum/callback/roundend_callback
 
-CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
+CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/cup/chem_heirloom)
 
-/obj/item/reagent_containers/glass/chem_heirloom/Initialize(mapload, vol)
+/obj/item/reagent_containers/cup/chem_heirloom/Initialize(mapload, vol)
 	..()
 	volume = 0
 	update_icon()
@@ -22,7 +22,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
 	SSticker.OnRoundend(roundend_callback)
 	update_name() //Negative.dm will call this again if it adds the heirloom component.
 
-/obj/item/reagent_containers/glass/chem_heirloom/examine(mob/living/carbon/user)
+/obj/item/reagent_containers/cup/chem_heirloom/examine(mob/living/carbon/user)
 	//Add, then remove, reagent contents for examine.
 	. = ..() //This makes the text out of order, but it's hardly noticeable
 	if(!locked)
@@ -32,14 +32,14 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
 		smartguy = TRUE
 	. += "It contains:\n100 units of [smartguy ? initial(rand_cont.name) : "various reagents"]" //Luckily science goggles say nothing if there's no reagents
 
-/obj/item/reagent_containers/glass/chem_heirloom/update_name() //This has to be done after init, since the heirloom component is added after.
+/obj/item/reagent_containers/cup/chem_heirloom/update_name() //This has to be done after init, since the heirloom component is added after.
 	. = ..()
 	rand_cont = get_random_reagent_id(CHEMICAL_RNG_FUN)
 	name ="hard locked bottle of [initial(rand_cont.name)]"
 	var/datum/component/heirloom/H = GetComponent(/datum/component/heirloom)
 	desc = H ? "[ishuman(H.owner) ? "The [H.family_name]" : "[H.owner.name]'s"] family's long-cherished wish is to open this bottle and get its chemical outside. Can you make that wish come true?" : "A hard locked bottle of [initial(rand_cont.name)]."
 
-/obj/item/reagent_containers/glass/chem_heirloom/proc/unlock()
+/obj/item/reagent_containers/cup/chem_heirloom/proc/unlock()
 	if(!locked) //A little bird said this would be an issue if a goober-min tried to call this twice.
 		return
 	if(isliving(loc))
@@ -55,7 +55,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/reagent_containers/glass/chem_heirloom)
 	reagent_flags = OPENCONTAINER
 	reagents.add_reagent(rand_cont, volume) //Add reagents
 
-/obj/item/reagent_containers/glass/chem_heirloom/Destroy()
+/obj/item/reagent_containers/cup/chem_heirloom/Destroy()
 	. = ..()
 	LAZYREMOVE(SSticker.round_end_events, roundend_callback)
 	roundend_callback = null
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm
similarity index 86%
rename from code/modules/food_and_drinks/food/condiment.dm
rename to code/modules/reagents/reagent_containers/condiment.dm
index 5fcad32579aad..b9f22c89e4e8f 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/condiment.dm
@@ -5,7 +5,7 @@
 //	to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code.
 
 //Food items that aren't eaten normally and leave an empty container behind.
-/obj/item/reagent_containers/food/condiment
+/obj/item/reagent_containers/condiment
 	name = "condiment bottle"
 	desc = "Just your average condiment bottle."
 	icon = 'icons/obj/food/containers.dmi'
@@ -23,7 +23,7 @@
 	/// Holder for original icon_state value if it was overwritten by icon_emty to change back to
 	var/icon_preempty
 
-/obj/item/reagent_containers/food/condiment/update_icon_state()
+/obj/item/reagent_containers/condiment/update_icon_state()
 	. = ..()
 	if (reagents.reagent_list.len)
 		if (icon_preempty)
@@ -34,11 +34,11 @@
 			icon_preempty = icon_state
 			icon_state = icon_empty
 
-/obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user)
+/obj/item/reagent_containers/condiment/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is trying to eat the entire [src]! It looks like [user.p_they()] forgot how food works!</span>")
 	return OXYLOSS
 
-/obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/condiment/attack(mob/M, mob/user, def_zone)
 
 	if(!reagents || !reagents.total_volume)
 		to_chat(user, "<span class='warning'>None of [src] left, oh no!</span>")
@@ -67,7 +67,7 @@
 	playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 	return 1
 
-/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/afterattack(obj/target, mob/user , proximity)
 	. = ..()
 	if(!proximity)
 		return
@@ -95,14 +95,14 @@
 		var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
 		to_chat(user, "<span class='notice'>You transfer [trans] units of the condiment to [target].</span>")
 
-/obj/item/reagent_containers/food/condiment/enzyme
+/obj/item/reagent_containers/condiment/enzyme
 	name = "universal enzyme"
 	desc = "Used in cooking various dishes."
 	icon_state = "enzyme"
 	list_reagents = list(/datum/reagent/consumable/enzyme = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/enzyme/examine(mob/user)
+/obj/item/reagent_containers/condiment/enzyme/examine(mob/user)
 	. = ..()
 	var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cheesewheel]
 	var/milk_required = recipe.required_reagents[/datum/reagent/consumable/milk]
@@ -110,7 +110,7 @@
 	. += "<span class='notice'>[milk_required] milk, [enzyme_required] enzyme and you got cheese.</span>"
 	. += "<span class='warning'>Remember, the enzyme isn't used up, so return it to the bottle, dingus!</span>"
 
-/obj/item/reagent_containers/food/condiment/sugar
+/obj/item/reagent_containers/condiment/sugar
 	name = "sugar sack"
 	desc = "Tasty spacey sugar!"
 	icon_state = "sugar"
@@ -120,7 +120,7 @@
 	list_reagents = list(/datum/reagent/consumable/sugar = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/sugar/examine(mob/user)
+/obj/item/reagent_containers/condiment/sugar/examine(mob/user)
 	. = ..()
 	var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter]
 	var/flour_required = recipe.required_reagents[/datum/reagent/consumable/flour]
@@ -128,7 +128,7 @@
 	var/sugar_required = recipe.required_reagents[/datum/reagent/consumable/sugar]
 	. += "<span class='notice'>[flour_required] flour, [eggyolk_required] egg yolk (or soy milk), [sugar_required] sugar makes cake dough. You can make pie dough from it.</span>"
 
-/obj/item/reagent_containers/food/condiment/saltshaker		//Separate from above since it's a small shaker rather then
+/obj/item/reagent_containers/condiment/saltshaker		//Separate from above since it's a small shaker rather then
 	name = "salt shaker"											//	a large one.
 	desc = "Salt. From space oceans, presumably."
 	icon_state = "saltshakersmall"
@@ -140,7 +140,7 @@
 	list_reagents = list(/datum/reagent/consumable/sodiumchloride = 20)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/living/user)
+/obj/item/reagent_containers/condiment/saltshaker/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	var/newname = "[name]"
 	name = "[user.name]"
@@ -149,7 +149,7 @@
 	desc = "Salt. From dead crew, presumably."
 	return (TOXLOSS)
 
-/obj/item/reagent_containers/food/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
+/obj/item/reagent_containers/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
 	. = ..()
 	if(!proximity)
 		return
@@ -162,7 +162,7 @@
 		new/obj/effect/decal/cleanable/food/salt(target)
 		return
 
-/obj/item/reagent_containers/food/condiment/peppermill
+/obj/item/reagent_containers/condiment/peppermill
 	name = "pepper mill"
 	desc = "Often used to flavor food or make people sneeze."
 	icon_state = "peppermillsmall"
@@ -174,7 +174,7 @@
 	list_reagents = list(/datum/reagent/consumable/blackpepper = 20)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/milk
+/obj/item/reagent_containers/condiment/milk
 	name = "space milk"
 	desc = "It's milk. White and nutritious goodness!"
 	icon_state = "milk"
@@ -184,7 +184,7 @@
 	list_reagents = list(/datum/reagent/consumable/milk = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/milk/examine(mob/user)
+/obj/item/reagent_containers/condiment/milk/examine(mob/user)
 	. = ..()
 	var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cheesewheel]
 	var/milk_required = recipe.required_reagents[/datum/reagent/consumable/milk]
@@ -192,7 +192,7 @@
 	. += "<span class='notice'>[milk_required] milk, [enzyme_required] enzyme and you got cheese.</span>"
 	. += "<span class='warning'>Remember, the enzyme isn't used up, so return it to the bottle, dingus!</span>"
 
-/obj/item/reagent_containers/food/condiment/flour
+/obj/item/reagent_containers/condiment/flour
 	name = "flour sack"
 	desc = "A big bag of flour. Good for baking!"
 	icon_state = "flour"
@@ -202,7 +202,7 @@
 	list_reagents = list(/datum/reagent/consumable/flour = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/flour/examine(mob/user)
+/obj/item/reagent_containers/condiment/flour/examine(mob/user)
 	. = ..()
 	var/datum/chemical_reaction/recipe_dough = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/dough]
 	var/datum/chemical_reaction/recipe_cakebatter = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter]
@@ -215,7 +215,7 @@
 	. += "<span class='notice'>[dough_flour_required] flour, [dough_water_required] water makes normal dough. You can make flat dough from it.</span>"
 	. += "<span class='notice'>[cakebatter_flour_required] flour, [cakebatter_eggyolk_required] egg yolk (or soy milk), [cakebatter_sugar_required] sugar makes cake dough. You can make pie dough from it.</span>"
 
-/obj/item/reagent_containers/food/condiment/soymilk
+/obj/item/reagent_containers/condiment/soymilk
 	name = "soy milk"
 	desc = "It's soy milk. White and nutritious goodness!"
 	icon_state = "soymilk"
@@ -225,7 +225,7 @@
 	list_reagents = list(/datum/reagent/consumable/soymilk = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/rice
+/obj/item/reagent_containers/condiment/rice
 	name = "rice sack"
 	desc = "A big bag of rice. Good for cooking!"
 	icon_state = "rice"
@@ -240,27 +240,27 @@
 	name = "cornmeal box"
 	desc = "A big box of cornmeal. Great for southern style cooking."
 	icon_state = "cornmeal"
-	inhand_icon_state = "carton"
-	lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi'
+	item_state = "carton"
+	lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
 	list_reagents = list(/datum/reagent/consumable/cornmeal = 30)
 	fill_icon_thresholds = null
 */
 
-/obj/item/reagent_containers/food/condiment/bbqsauce
+/obj/item/reagent_containers/condiment/bbqsauce
 	name = "bbq sauce"
 	desc = "Hand wipes not included."
 	icon_state = "bbqsauce"
 	list_reagents = list(/datum/reagent/consumable/bbqsauce = 50)
 
-/obj/item/reagent_containers/food/condiment/soysauce
+/obj/item/reagent_containers/condiment/soysauce
 	name = "soy sauce"
 	desc = "A salty soy-based flavoring."
 	icon_state = "soysauce"
 	list_reagents = list(/datum/reagent/consumable/soysauce = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/mayonnaise
+/obj/item/reagent_containers/condiment/mayonnaise
 	name = "mayonnaise"
 	desc = "An oily condiment made from egg yolks."
 	icon_state = "mayonnaise"
@@ -276,7 +276,7 @@
 	fill_icon_thresholds = null
 */
 
-/obj/item/reagent_containers/food/condiment/cooking_oil
+/obj/item/reagent_containers/condiment/cooking_oil
 	name = "cooking oil"
 	desc = "For all your deep-frying needs."
 	icon_state = "cooking_oil"
@@ -306,21 +306,21 @@
 	fill_icon_thresholds = null
 */
 
-/obj/item/reagent_containers/food/condiment/cherryjelly
+/obj/item/reagent_containers/condiment/cherryjelly
 	name = "cherry jelly"
 	desc = "A jar of super-sweet cherry jelly."
 	icon_state = "cherryjelly"
 	list_reagents = list(/datum/reagent/consumable/cherryjelly = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/honey
+/obj/item/reagent_containers/condiment/honey
 	name = "honey"
 	desc = "A jar of sweet and viscous honey."
 	icon_state = "honey"
 	list_reagents = list(/datum/reagent/consumable/honey = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/ketchup
+/obj/item/reagent_containers/condiment/ketchup
 	name = "ketchup"
 	// At time of writing, "ketchup" mechanically, is just ground tomatoes,
 	// rather than // tomatoes plus vinegar plus sugar.
@@ -329,13 +329,13 @@
 	list_reagents = list(/datum/reagent/consumable/ketchup = 50)
 	fill_icon_thresholds = null
 
-/obj/item/reagent_containers/food/condiment/hotsauce
+/obj/item/reagent_containers/condiment/hotsauce
 	name = "hotsauce bottle"
 	desc= "You can almost TASTE the stomach ulcers!"
 	icon_state = "hotsauce"
 	list_reagents = list(/datum/reagent/consumable/capsaicin = 50)
 
-/obj/item/reagent_containers/food/condiment/coldsauce
+/obj/item/reagent_containers/condiment/coldsauce
 	name = "coldsauce bottle"
 	desc= "Leaves the tongue numb from its passage."
 	icon_state = "coldsauce"
@@ -343,7 +343,7 @@
 
 //Food packs. To easily apply deadly toxi... delicious sauces to your food!
 
-/obj/item/reagent_containers/food/condiment/pack
+/obj/item/reagent_containers/condiment/pack
 	name = "condiment pack"
 	desc = "A small plastic pack with condiments to put on your food."
 	icon_state = "condi_empty"
@@ -372,13 +372,13 @@
 	/// Can't use initial(name) for this. This stores the name set by condimasters.
 	var/originalname = "condiment"
 
-/obj/item/reagent_containers/food/condiment/pack/update_icon()
+/obj/item/reagent_containers/condiment/pack/update_icon()
 	return
 
-/obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
+/obj/item/reagent_containers/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
 	return
 
-/obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/pack/afterattack(obj/target, mob/user , proximity)
 	if(!proximity)
 		return
 
@@ -399,7 +399,7 @@
 			return
 	. = ..()
 
-/obj/item/reagent_containers/food/condiment/pack/on_reagent_change(changetype)
+/obj/item/reagent_containers/condiment/pack/on_reagent_change(changetype)
 	if(reagents.reagent_list.len > 0)
 		var/main_reagent = reagents.get_master_reagent_id()
 		if(main_reagent in possible_states)
@@ -414,23 +414,23 @@
 		desc = "A small condiment pack. It is empty."
 
 //Ketchup
-/obj/item/reagent_containers/food/condiment/pack/ketchup
+/obj/item/reagent_containers/condiment/pack/ketchup
 	name = "ketchup pack"
 	originalname = "ketchup"
 	list_reagents = list(/datum/reagent/consumable/ketchup = 10)
 
 //Hot sauce
-/obj/item/reagent_containers/food/condiment/pack/hotsauce
+/obj/item/reagent_containers/condiment/pack/hotsauce
 	name = "hotsauce pack"
 	originalname = "hotsauce"
 	list_reagents = list(/datum/reagent/consumable/capsaicin = 10)
 
-/obj/item/reagent_containers/food/condiment/pack/astrotame
+/obj/item/reagent_containers/condiment/pack/astrotame
 	name = "astrotame pack"
 	originalname = "astrotame"
 	list_reagents = list(/datum/reagent/consumable/astrotame = 5)
 
-/obj/item/reagent_containers/food/condiment/pack/bbqsauce
+/obj/item/reagent_containers/condiment/pack/bbqsauce
 	name = "bbq sauce pack"
 	originalname = "bbq sauce"
 	list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
old mode 100755
new mode 100644
similarity index 64%
rename from code/modules/reagents/reagent_containers/glass.dm
rename to code/modules/reagents/reagent_containers/cups/_cup.dm
index b55cbae95bfa5..dbfcb2515d70a
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -1,5 +1,4 @@
-
-/obj/item/reagent_containers/glass
+/obj/item/reagent_containers/cup
 	name = "glass"
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
@@ -9,8 +8,59 @@
 	spillable = TRUE
 	resistance_flags = ACID_PROOF
 
-/obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
-	if(!canconsume(M, user))
+	lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
+
+	///Like Edible's food type, what kind of drink is this?
+	var/drink_type = NONE
+	///The last time we have checked for taste.
+	var/last_check_time
+	///How much we drink at once, shot glasses drink more.
+	var/gulp_size = 5
+	///Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it.
+	var/isGlass = FALSE
+
+/obj/item/reagent_containers/cup/examine(mob/user)
+	. = ..()
+	if(drink_type)
+		var/list/types = bitfield_to_list(drink_type, FOOD_FLAGS)
+		. += "<span class='notice'>It is [LOWER_TEXT(english_list(types))].</span>"
+
+/obj/item/reagent_containers/cup/proc/checkLiked(fraction, mob/M)
+	if(last_check_time + 50 >= world.time)
+		return
+	if(!ishuman(M))
+		return
+	var/mob/living/carbon/human/H = M
+	var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
+
+	if((drink_type & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST)
+		SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
+	last_check_time = world.time
+
+	if(!T) //if you don't have a tongue you don't taste..
+		return
+
+	if(HAS_TRAIT(H, TRAIT_AGEUSIA))
+		if(drink_type & T.toxic_food)
+			to_chat(H, "<span class='warning'>You don't feel so good...</span>")
+			H.adjust_disgust(25 + 30 * fraction)
+	else
+		if(drink_type & T.toxic_food)
+			to_chat(H, "<span class='warning'>What the hell was that thing?!</span>")
+			H.adjust_disgust(25 + 30 * fraction)
+			SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
+		else if(drink_type & T.disliked_food)
+			to_chat(H, "<span class='notice'>That didn't taste very good...</span>")
+			H.adjust_disgust(11 + 15 * fraction)
+			SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
+		else if(drink_type & T.liked_food)
+			to_chat(H, "<span class='notice'>I love this taste!</span>")
+			H.adjust_disgust(-5 + -2.5 * fraction)
+			SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
+
+/obj/item/reagent_containers/cup/attack(mob/living/target_mob, mob/living/user, obj/target)
+	if(!canconsume(target_mob, user))
 		return
 
 	if(!spillable)
@@ -20,40 +70,45 @@
 		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 		return
 
-	if(istype(M))
-		if(user.a_intent == INTENT_HARM)
-			var/R
-			M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
-							"<span class='userdanger'>[user] splashes the contents of [src] onto you!</span>")
-			if(reagents)
-				for(var/datum/reagent/A in reagents.reagent_list)
-					R += "[A] ([num2text(A.volume)]),"
-
-			if(isturf(target) && reagents.reagent_list.len && thrownby)
-				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
-				message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
-			reagents.reaction(M, TOUCH)
-			log_combat(user, M, "splashed", R)
-			reagents.clear_reagents()
-		else
-			if(M != user)
-				M.visible_message("<span class='danger'>[user] attempts to feed [M] something from [src].</span>", \
-						"<span class='userdanger'>[user] attempts to feed you something from [src].</span>")
-				if(!do_after(user, 3 SECONDS, target = M))
-					return
-				if(!reagents || !reagents.total_volume)
-					return // The drink might be empty after the delay, such as by spam-feeding
-				M.visible_message("<span class='danger'>[user] feeds [M] something from [src].</span>", \
-						"<span class='userdanger'>[user] feeds you something from [src].</span>")
-				log_combat(user, M, "fed", reagents.log_list())
-			else
-				to_chat(user, "<span class='notice'>You swallow a gulp of [src].</span>")
-			var/fraction = min(5/reagents.total_volume, 1)
-			reagents.reaction(M, INGEST, fraction)
-			addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5), 5)
-			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
-
-/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
+	if(!istype(target_mob))
+		return
+
+	if(user.a_intent == INTENT_HARM)
+		//Early terminate, move to afterattack where we splash
+		return
+
+	if(target_mob != user)
+		target_mob.visible_message("<span class='danger'>[user] attempts to feed [target_mob] something from [src].</span>", \
+				"<span class='userdanger'>[user] attempts to feed you something from [src].</span>")
+		if(!do_after(user, 3 SECONDS, target = target_mob))
+			return
+		if(!reagents || !reagents.total_volume)
+			return // The drink might be empty after the delay, such as by spam-feeding
+		target_mob.visible_message("<span class='danger'>[user] feeds [target_mob] something from [src].</span>", \
+				"<span class='userdanger'>[user] feeds you something from [src].</span>")
+		log_combat(user, target_mob, "fed", reagents.log_list())
+	else
+		to_chat(user, "<span class='notice'>You swallow a gulp of [src].</span>")
+
+	SEND_SIGNAL(src, COMSIG_GLASS_DRANK, target_mob, user)
+	var/fraction = min(gulp_size/reagents.total_volume, 1)
+	reagents.trans_to(target_mob, gulp_size, transfered_by = user, method = INGEST)
+	checkLiked(fraction, target_mob)
+	playsound(target_mob.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
+	if(!iscarbon(target_mob))
+		return
+	var/mob/living/carbon/carbon_drinker = target_mob
+	var/list/diseases = carbon_drinker.get_static_viruses()
+	if(!LAZYLEN(diseases))
+		return
+	var/list/datum/disease/diseases_to_add = list()
+	for(var/datum/disease/malady as anything in diseases)
+		if(malady.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS)
+			diseases_to_add += malady
+	if(LAZYLEN(diseases_to_add))
+		AddComponent(/datum/component/infective, diseases_to_add)
+
+/obj/item/reagent_containers/cup/afterattack(obj/target, mob/living/user, proximity)
 	. = ..()
 	if((!proximity) || !check_allowed_items(target,target_self=1))
 		return
@@ -92,44 +147,47 @@
 			reagents.reaction(target, TOUCH)
 			reagents.clear_reagents()
 
-/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
-	var/hotness = I.is_hot()
+/obj/item/reagent_containers/cup/attackby(obj/item/attacking_item, mob/user, params)
+	var/hotness = attacking_item.is_hot()
 	if(hotness && reagents)
 		reagents.expose_temperature(hotness)
-		to_chat(user, "<span class='notice'>You heat [name] with [I]!</span>")
-
-	if(istype(I, /obj/item/food/egg)) //breaking eggs
-		var/obj/item/food/egg/E = I
-		if(reagents)
-			if(reagents.total_volume >= reagents.maximum_volume)
-				to_chat(user, "<span class='notice'>[src] is full.</span>")
-			else
-				to_chat(user, "<span class='notice'>You break [E] in [src].</span>")
-				E.reagents.trans_to(src, E.reagents.total_volume, transfered_by = user)
-				qdel(E)
+		to_chat(user, "<span class='notice'>You heat [name] with [attacking_item]!</span>")
+		return
+
+	if(istype(attacking_item, /obj/item/food/egg)) //breaking eggs
+		var/obj/item/food/egg/attacking_egg = attacking_item
+		if(!reagents)
 			return
-	..()
+		if(reagents.total_volume >= reagents.maximum_volume)
+			to_chat(user, "<span class='notice'>[src] is full.</span>")
+		else
+			to_chat(user, "<span class='notice'>You break [attacking_egg] in [src].</span>")
+			attacking_egg.reagents.trans_to(src, attacking_egg.reagents.total_volume, transfered_by = user)
+			qdel(attacking_egg)
+		return
+
+	return ..()
 
 
-/obj/item/reagent_containers/glass/beaker
+/obj/item/reagent_containers/cup/beaker
 	name = "beaker"
 	desc = "A beaker. It can hold up to 50 units."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker"
 	item_state = "beaker"
+	worn_icon_state = "beaker"
 	custom_materials = list(/datum/material/glass=500)
 	fill_icon_thresholds = list(1, 10, 20, 40, 60, 80, 100)
 	label_icon = "label_beaker"
 
-/obj/item/reagent_containers/glass/beaker/Initialize(mapload)
+/obj/item/reagent_containers/cup/beaker/Initialize(mapload)
 	. = ..()
-	update_icon()
-
+	update_appearance()
 
-/obj/item/reagent_containers/glass/beaker/get_part_rating()
+/obj/item/reagent_containers/cup/beaker/get_part_rating()
 	return reagents.maximum_volume
 
-/obj/item/reagent_containers/glass/beaker/jar
+/obj/item/reagent_containers/cup/beaker/jar
 	name = "honey jar"
 	desc = "A jar for honey. It can hold up to 50 units of sweet delight."
 	icon = 'icons/obj/chemical.dmi'
@@ -138,7 +196,7 @@
 	fill_icon_thresholds = null
 	label_icon = null
 
-/obj/item/reagent_containers/glass/beaker/large
+/obj/item/reagent_containers/cup/beaker/large
 	name = "large beaker"
 	desc = "A large beaker. Can hold up to 100 units."
 	icon_state = "beakerlarge"
@@ -148,7 +206,7 @@
 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
 	label_icon = "label_beakerlarge"
 
-/obj/item/reagent_containers/glass/beaker/plastic
+/obj/item/reagent_containers/cup/beaker/plastic
 	name = "x-large beaker"
 	desc = "An extra-large beaker. Can hold up to 120 units."
 	icon_state = "beakerwhite"
@@ -158,7 +216,7 @@
 	possible_transfer_amounts = list(5,10,15,20,25,30,60,120)
 	label_icon = "label_beakerlarge"
 
-/obj/item/reagent_containers/glass/beaker/meta
+/obj/item/reagent_containers/cup/beaker/meta
 	name = "metamaterial beaker"
 	desc = "A large beaker. Can hold up to 180 units."
 	icon_state = "beakergold"
@@ -169,7 +227,7 @@
 	fill_icon_thresholds = list(1, 10, 25, 35, 50, 60, 80, 100)
 	label_icon = "label_beakerlarge"
 
-/obj/item/reagent_containers/glass/beaker/noreact
+/obj/item/reagent_containers/cup/beaker/noreact
 	name = "cryostasis beaker"
 	desc = "A cryostasis beaker that allows for chemical storage without \
 		reactions. Can hold up to 50 units."
@@ -182,7 +240,7 @@
 	fill_icon_thresholds = null
 	label_icon = null
 
-/obj/item/reagent_containers/glass/beaker/bluespace
+/obj/item/reagent_containers/cup/beaker/bluespace
 	name = "bluespace beaker"
 	desc = "A bluespace beaker, powered by experimental bluespace technology \
 		and Element Cuban combined with the Compound Pete. Can hold up to \
@@ -196,39 +254,39 @@
 	fill_icon_thresholds = null
 	label_icon = "label_beakerlarge"
 
-/obj/item/reagent_containers/glass/beaker/cryoxadone
+/obj/item/reagent_containers/cup/beaker/cryoxadone
 	list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
 
-/obj/item/reagent_containers/glass/beaker/sulfuric
+/obj/item/reagent_containers/cup/beaker/sulfuric
 	list_reagents = list(/datum/reagent/toxin/acid = 50)
 
-/obj/item/reagent_containers/glass/beaker/slime
+/obj/item/reagent_containers/cup/beaker/slime
 	list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
 
-/obj/item/reagent_containers/glass/beaker/large/styptic
+/obj/item/reagent_containers/cup/beaker/large/styptic
 	name = "styptic reserve tank"
 	list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
 
-/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
+/obj/item/reagent_containers/cup/beaker/large/silver_sulfadiazine
 	name = "silver sulfadiazine reserve tank"
 	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
 
-/obj/item/reagent_containers/glass/beaker/large/charcoal
+/obj/item/reagent_containers/cup/beaker/large/charcoal
 	name = "charcoal reserve tank"
 	list_reagents = list(/datum/reagent/medicine/charcoal = 50)
 
-/obj/item/reagent_containers/glass/beaker/large/epinephrine
+/obj/item/reagent_containers/cup/beaker/large/epinephrine
 	name = "epinephrine reserve tank"
 	list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
 
-/obj/item/reagent_containers/glass/beaker/large/kelobic
+/obj/item/reagent_containers/cup/beaker/large/kelobic
 	name = "kelotane-bicaridine reserve tank"
 	list_reagents = list(/datum/reagent/medicine/kelotane = 50, /datum/reagent/medicine/bicaridine = 50)
 
-/obj/item/reagent_containers/glass/beaker/synthflesh
+/obj/item/reagent_containers/cup/beaker/synthflesh
 	list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
 
-/obj/item/reagent_containers/glass/bucket
+/obj/item/reagent_containers/cup/bucket
 	name = "bucket"
 	desc = "It's a bucket."
 	icon = 'icons/obj/janitor.dmi'
@@ -257,7 +315,7 @@
 		ITEM_SLOT_DEX_STORAGE
 	)
 
-/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
+/obj/item/reagent_containers/cup/bucket/attackby(obj/O, mob/user, params)
 	if(istype(O, /obj/item/mop))
 		if(reagents.total_volume < 1)
 			to_chat(user, "<span class='warning'>[src] is out of water!</span>")
@@ -265,16 +323,18 @@
 			reagents.trans_to(O, 5, transfered_by = user)
 			to_chat(user, "<span class='notice'>You wet [O] in [src].</span>")
 			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+		return
 	else if(isprox(O))
 		to_chat(user, "<span class='notice'>You add [O] to [src].</span>")
 		qdel(O)
 		qdel(src)
 		user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
-	else
-		..()
+		return
 
-/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
-	..()
+	return ..()
+
+/obj/item/reagent_containers/cup/bucket/equipped(mob/user, slot)
+	. = ..()
 	if (slot == ITEM_SLOT_HEAD)
 		if(reagents.total_volume)
 			to_chat(user, "<span class='userdanger'>[src]'s contents spill all over you!</span>")
@@ -282,11 +342,11 @@
 			reagents.clear_reagents()
 		reagents.flags = NONE
 
-/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
+/obj/item/reagent_containers/cup/bucket/dropped(mob/user)
 	..()
 	reagents.flags = initial(reagent_flags)
 
-/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
+/obj/item/reagent_containers/cup/bucket/equip_to_best_slot(mob/M)
 	if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
 		var/index = slot_equipment_priority.Find(ITEM_SLOT_HEAD)
 		slot_equipment_priority.Remove(ITEM_SLOT_HEAD)
@@ -295,7 +355,7 @@
 		return
 	return ..()
 
-/obj/item/reagent_containers/glass/waterbottle
+/obj/item/reagent_containers/cup/waterbottle
 	name = "bottle of water"
 	desc = "A bottle of water filled at an old Earth bottling facility."
 	icon = 'icons/obj/drinks.dmi'
@@ -314,19 +374,19 @@
 	var/mutable_appearance/cap_overlay
 	var/flip_chance = 10
 
-/obj/item/reagent_containers/glass/waterbottle/Initialize(mapload)
+/obj/item/reagent_containers/cup/waterbottle/Initialize(mapload)
 	. = ..()
 	cap_overlay = mutable_appearance(icon, cap_icon_state)
 	if(cap_on)
 		spillable = FALSE
 		update_icon()
 
-/obj/item/reagent_containers/glass/waterbottle/update_overlays()
+/obj/item/reagent_containers/cup/waterbottle/update_overlays()
 	. = ..()
 	if(cap_on)
 		. += cap_overlay
 
-/obj/item/reagent_containers/glass/waterbottle/examine(mob/user)
+/obj/item/reagent_containers/cup/waterbottle/examine(mob/user)
 	. = ..()
 	if(cap_lost)
 		. += "<span class='notice'>The cap seems to be missing.</span>"
@@ -335,7 +395,7 @@
 	else
 		. += "<span class='notice'>The cap has been taken off. Alt-click to put a cap on.</span>"
 
-/obj/item/reagent_containers/glass/waterbottle/AltClick(mob/user)
+/obj/item/reagent_containers/cup/waterbottle/AltClick(mob/user)
 	if(!user.canUseTopic(src, BE_CLOSE))
 		return
 	if(cap_lost)
@@ -358,35 +418,35 @@
 		to_chat(user, "<span class='notice'>You put the cap on [src].</span>")
 	update_icon()
 
-/obj/item/reagent_containers/glass/waterbottle/is_refillable()
+/obj/item/reagent_containers/cup/waterbottle/is_refillable()
 	if(cap_on)
 		return FALSE
 	. = ..()
 
-/obj/item/reagent_containers/glass/waterbottle/is_drainable()
+/obj/item/reagent_containers/cup/waterbottle/is_drainable()
 	if(cap_on)
 		return FALSE
 	. = ..()
 
-/obj/item/reagent_containers/glass/waterbottle/attack(mob/M, mob/user, obj/target)
+/obj/item/reagent_containers/cup/waterbottle/attack(mob/M, mob/user, obj/target)
 	if(cap_on && reagents.total_volume && istype(M))
 		to_chat(user, "<span class='warning'>You must remove the cap before you can do that!</span>")
 		return
 	. = ..()
 
-/obj/item/reagent_containers/glass/waterbottle/afterattack(obj/target, mob/user, proximity)
+/obj/item/reagent_containers/cup/waterbottle/afterattack(obj/target, mob/user, proximity)
 	if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && user.a_intent == INTENT_HARM)))
 		to_chat(user, "<span class='warning'>You must remove the cap before you can do that!</span>")
 		return
 
-	else if(istype(target, /obj/item/reagent_containers/glass/waterbottle))
-		var/obj/item/reagent_containers/glass/waterbottle/WB = target
+	else if(istype(target, /obj/item/reagent_containers/cup/waterbottle))
+		var/obj/item/reagent_containers/cup/waterbottle/WB = target
 		if(WB.cap_on)
 			to_chat(user, "<span class='warning'>[WB] has a cap firmly twisted on!</span>")
 	. = ..()
 
 // heehoo bottle flipping
-/obj/item/reagent_containers/glass/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/cup/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	. = ..()
 	if(cap_on && reagents.total_volume)
 		if(prob(flip_chance)) // landed upright
@@ -396,15 +456,15 @@
 		else // landed on it's side
 			animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0)
 
-/obj/item/reagent_containers/glass/waterbottle/pickup(mob/user)
+/obj/item/reagent_containers/cup/waterbottle/pickup(mob/user)
 	..()
 	animate(src, transform = null, time = 1, loop = 0)
 
-/obj/item/reagent_containers/glass/waterbottle/empty
+/obj/item/reagent_containers/cup/waterbottle/empty
 	list_reagents = list()
 	cap_on = FALSE
 
-/obj/item/reagent_containers/glass/waterbottle/large
+/obj/item/reagent_containers/cup/waterbottle/large
 	desc = "A fresh commercial-sized bottle of water."
 	icon_state = "largebottle"
 	custom_materials = list(/datum/material/glass=0)
@@ -414,7 +474,7 @@
 	cap_icon_state = "bottle_cap"
 	icon_state_preview = "waterbottle_large"
 
-/obj/item/reagent_containers/glass/waterbottle/large/empty
+/obj/item/reagent_containers/cup/waterbottle/large/empty
 	list_reagents = list()
 	cap_on = FALSE
 
@@ -425,7 +485,7 @@
 	icon_state = "pestle"
 	force = 7
 
-/obj/item/reagent_containers/glass/mortar
+/obj/item/reagent_containers/cup/mortar
 	name = "mortar"
 	desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item."
 	icon_state = "mortar"
@@ -437,7 +497,7 @@
 	spillable = TRUE
 	var/obj/item/grinded
 
-/obj/item/reagent_containers/glass/mortar/AltClick(mob/user)
+/obj/item/reagent_containers/cup/mortar/AltClick(mob/user)
 	if(!user.canUseTopic(src, BE_CLOSE))
 		return
 	if(grinded)
@@ -445,7 +505,7 @@
 		grinded = null
 		to_chat(user, "You eject the item inside.")
 
-/obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user)
+/obj/item/reagent_containers/cup/mortar/attackby(obj/item/I, mob/living/carbon/human/user)
 	..()
 	if(istype(I,/obj/item/pestle))
 		if(grinded)
@@ -487,12 +547,12 @@
 		return
 	to_chat(user, "<span class='danger'>You can't grind this!</span>")
 
-/obj/item/reagent_containers/glass/saline
+/obj/item/reagent_containers/cup/saline
 	name = "saline canister"
 	volume = 5000
 	list_reagents = list(/datum/reagent/medicine/salglu_solution = 5000)
 
-/obj/item/reagent_containers/glass/saline/Moved(atom/OldLoc, Dir)
+/obj/item/reagent_containers/cup/saline/Moved(atom/OldLoc, Dir)
 	if (loc && !istype(loc, /obj/machinery/iv_drip/saline))
 		qdel(src)
 		return
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
similarity index 76%
rename from code/modules/reagents/reagent_containers/bottle.dm
rename to code/modules/reagents/reagent_containers/cups/bottle.dm
index b472573497d63..e63aba15744f2 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -1,75 +1,76 @@
-//Not to be confused with /obj/item/reagent_containers/food/drinks/bottle
+//Not to be confused with /obj/item/reagent_containers/cup/glass/bottle
 
-/obj/item/reagent_containers/glass/bottle
+/obj/item/reagent_containers/cup/bottle
 	name = "bottle"
 	desc = "A small bottle."
 	icon_state = "bottle"
+	fill_icon_state = "bottle"
 	item_state = "atoxinbottle"
 	possible_transfer_amounts = list(5,10,15,25,30)
 	volume = 30
 	fill_icon_thresholds = list(1, 10, 20, 40, 60, 80, 100)
 	label_icon = "label_bottle"
 
-/obj/item/reagent_containers/glass/bottle/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/Initialize(mapload)
 	. = ..()
 	if(!icon_state)
 		icon_state = "bottle"
-	update_icon()
+	update_appearance()
 
-/obj/item/reagent_containers/glass/bottle/epinephrine
+/obj/item/reagent_containers/cup/bottle/epinephrine
 	name = "epinephrine bottle"
 	label_name = "epinephrine"
 	desc = "A small bottle. Contains epinephrine - used to stabilize patients."
 	list_reagents = list(/datum/reagent/medicine/epinephrine = 30)
 	icon_state_preview = "bottle_epinephrine"
 
-/obj/item/reagent_containers/glass/bottle/tricordrazine
+/obj/item/reagent_containers/cup/bottle/tricordrazine
 	name = "tricordrazine bottle"
 	label_name = "tricordrazine"
 	desc = "A small bottle of tricordrazine. Used to aid in patient recovery."
 	list_reagents = list(/datum/reagent/medicine/tricordrazine = 30)
 	icon_state_preview = "bottle_tricordrazine"
 
-/obj/item/reagent_containers/glass/bottle/spaceacillin
+/obj/item/reagent_containers/cup/bottle/spaceacillin
 	name = "spaceacillin bottle"
 	label_name = "spaceacillin"
 	desc = "A small bottle of spaceacillin. Used to cure some diseases."
 	list_reagents = list(/datum/reagent/medicine/spaceacillin = 30)
 	icon_state_preview = "bottle_spaceacillin"
 
-/obj/item/reagent_containers/glass/bottle/antitoxin
+/obj/item/reagent_containers/cup/bottle/antitoxin
 	name = "antitoxin bottle"
 	label_name = "antitoxin"
 	desc = "A small bottle of anti-toxin. Used to treat toxin damage."
 	list_reagents = list(/datum/reagent/medicine/antitoxin = 30)
 
-/obj/item/reagent_containers/glass/bottle/toxin/mutagen
+/obj/item/reagent_containers/cup/bottle/toxin/mutagen
 	name = "mutagen toxin bottle"
 	label_name = "mutagen toxin"
 	desc = "A small bottle of mutagen toxins. Do not drink, Might cause unpredictable mutations."
 	list_reagents = list(/datum/reagent/toxin/mutagen = 30)
 	icon_state_preview = "bottle_mutagen"
 
-/obj/item/reagent_containers/glass/bottle/toxin
+/obj/item/reagent_containers/cup/bottle/toxin
 	name = "toxin bottle"
 	label_name = "toxin"
 	desc = "A small bottle of toxins. Do not drink, it is poisonous."
 	list_reagents = list(/datum/reagent/toxin = 30)
 	icon_state_preview = "bottle_toxin"
 
-/obj/item/reagent_containers/glass/bottle/cyanide
+/obj/item/reagent_containers/cup/bottle/cyanide
 	name = "cyanide bottle"
 	label_name = "cyanide"
 	desc = "A small bottle of cyanide. Bitter almonds?"
 	list_reagents = list(/datum/reagent/toxin/cyanide = 30)
 
-/obj/item/reagent_containers/glass/bottle/spewium
+/obj/item/reagent_containers/cup/bottle/spewium
 	name = "spewium bottle"
 	label_name = "spewium"
 	desc = "A small bottle of spewium."
 	list_reagents = list(/datum/reagent/toxin/spewium = 30)
 
-/obj/item/reagent_containers/glass/bottle/morphine
+/obj/item/reagent_containers/cup/bottle/morphine
 	name = "morphine bottle"
 	label_name = "morphine"
 	desc = "A small bottle of morphine."
@@ -77,76 +78,87 @@
 	list_reagents = list(/datum/reagent/medicine/morphine = 30)
 	icon_state_preview = "bottle_morphine"
 
-/obj/item/reagent_containers/glass/bottle/chloralhydrate
+/obj/item/reagent_containers/cup/bottle/chloralhydrate
 	name = "chloral hydrate bottle"
 	label_name = "chloral hydrate"
 	desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
 	list_reagents = list(/datum/reagent/toxin/chloralhydrate = 30)
 	icon_state_preview = "bottle_chloralhydrate"
 
-/obj/item/reagent_containers/glass/bottle/mannitol
+/obj/item/reagent_containers/cup/bottle/mannitol
 	name = "mannitol bottle"
 	label_name = "mannitol"
 	desc = "A small bottle of Mannitol. Useful for healing brain damage."
 	list_reagents = list(/datum/reagent/medicine/mannitol = 30)
 
-/obj/item/reagent_containers/glass/bottle/charcoal
+/obj/item/reagent_containers/cup/bottle/charcoal
 	name = "charcoal bottle"
 	label_name = "charcoal"
 	desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
 	list_reagents = list(/datum/reagent/medicine/charcoal = 30)
 	icon_state_preview = "bottle_charcoal"
 
-/obj/item/reagent_containers/glass/bottle/mutagen
+/obj/item/reagent_containers/cup/bottle/phlogiston
+	name = "Phlogiston bottle"
+	desc = "A small bottle of Phlogiston, that will set you on fire if used."
+	volume = 50
+	list_reagents = list(/datum/reagent/phlogiston = 30)
+
+/obj/item/reagent_containers/cup/bottle/calomel
+	name = "calomel bottle"
+	desc = "A small bottle of calomel, which quickly purges all chemicals from the patient. Causes toxin damage if the patient is not heavily injured."
+	list_reagents = list(/datum/reagent/medicine/calomel = 30)
+
+/obj/item/reagent_containers/cup/bottle/mutagen
 	name = "unstable mutagen bottle"
 	label_name = "unstable mutagen"
 	desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
 	list_reagents = list(/datum/reagent/toxin/mutagen = 30)
 
-/obj/item/reagent_containers/glass/bottle/plasma
+/obj/item/reagent_containers/cup/bottle/plasma
 	name = "liquid plasma bottle"
 	label_name = "liquid plasma"
 	desc = "A small bottle of liquid plasma. Extremely toxic and reacts with micro-organisms inside blood."
 	list_reagents = list(/datum/reagent/toxin/plasma = 30)
 
-/obj/item/reagent_containers/glass/bottle/synaptizine
+/obj/item/reagent_containers/cup/bottle/synaptizine
 	name = "synaptizine bottle"
 	label_name = "synaptizine"
 	desc = "A small bottle of synaptizine."
 	list_reagents = list(/datum/reagent/medicine/synaptizine = 30)
 
-/obj/item/reagent_containers/glass/bottle/formaldehyde
+/obj/item/reagent_containers/cup/bottle/formaldehyde
 	name = "formaldehyde bottle"
 	label_name = "formaldehyde"
 	desc = "A small bottle of formaldehyde."
 	list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
 
-/obj/item/reagent_containers/glass/bottle/cryostylane
+/obj/item/reagent_containers/cup/bottle/cryostylane
 	name = "cryostylane bottle"
 	label_name = "cryostylane"
 	desc = "A small bottle of cryostylane. It feels cold to the touch."
 	list_reagents = list(/datum/reagent/cryostylane = 30)
 
-/obj/item/reagent_containers/glass/bottle/ammonia
+/obj/item/reagent_containers/cup/bottle/ammonia
 	name = "ammonia bottle"
 	label_name = "ammonia"
 	desc = "A small bottle of ammonia."
 	list_reagents = list(/datum/reagent/ammonia = 30)
 	icon_state_preview = "bottle_ammonia"
 
-/obj/item/reagent_containers/glass/bottle/diethylamine
+/obj/item/reagent_containers/cup/bottle/diethylamine
 	name = "diethylamine bottle"
 	label_name = "diethylamine"
 	desc = "A small bottle of diethylamine."
 	list_reagents = list(/datum/reagent/diethylamine = 30)
 
-/obj/item/reagent_containers/glass/bottle/facid
+/obj/item/reagent_containers/cup/bottle/facid
 	name = "Fluorosulfuric Acid bottle"
 	label_name = "Fluorosulfuric Acid"
 	desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
 	list_reagents = list(/datum/reagent/toxin/acid/fluacid = 30)
 
-/obj/item/reagent_containers/glass/bottle/adminordrazine
+/obj/item/reagent_containers/cup/bottle/adminordrazine
 	name = "Adminordrazine bottle"
 	label_name = "Adminordrazine"
 	desc = "A small bottle. Contains the liquid essence of the gods."
@@ -155,221 +167,221 @@
 	list_reagents = list(/datum/reagent/medicine/adminordrazine = 30)
 	label_icon = null
 
-/obj/item/reagent_containers/glass/bottle/viralbase
+/obj/item/reagent_containers/cup/bottle/viralbase
 	name = "Highly potent Viral Base bottle"
 	label_name = "Highly potent Viral Base"
 	desc = "A small bottle. Contains a trace amount of a substance found by scientists that can be used to create extremely advanced diseases once exposed to uranium."
 	list_reagents = list(/datum/reagent/consumable/virus_food/viralbase = 1)
 
-/obj/item/reagent_containers/glass/bottle/capsaicin
+/obj/item/reagent_containers/cup/bottle/capsaicin
 	name = "Capsaicin bottle"
 	label_name = "Capsaicin"
 	desc = "A small bottle. Contains hot sauce."
 	list_reagents = list(/datum/reagent/consumable/capsaicin = 30)
 
-/obj/item/reagent_containers/glass/bottle/frostoil
+/obj/item/reagent_containers/cup/bottle/frostoil
 	name = "Frost Oil bottle"
 	label_name = "Frost Oil"
 	desc = "A small bottle. Contains cold sauce."
 	list_reagents = list(/datum/reagent/consumable/frostoil = 30)
 
-/obj/item/reagent_containers/glass/bottle/traitor
+/obj/item/reagent_containers/cup/bottle/traitor
 	name = "syndicate bottle"
 	label_name = "syndicate"
 	desc = "A small bottle. Contains a random nasty chemical."
 	icon = 'icons/obj/chemical.dmi'
 	var/extra_reagent = null
 
-/obj/item/reagent_containers/glass/bottle/traitor/Initialize(mapload)
+/obj/item/reagent_containers/cup/bottle/traitor/Initialize(mapload)
 	. = ..()
 	extra_reagent = pick(/datum/reagent/toxin/polonium, /datum/reagent/toxin/histamine, /datum/reagent/toxin/formaldehyde, /datum/reagent/toxin/venom, /datum/reagent/toxin/fentanyl, /datum/reagent/toxin/cyanide)
 	reagents.add_reagent(extra_reagent, 3)
 
-/obj/item/reagent_containers/glass/bottle/polonium
+/obj/item/reagent_containers/cup/bottle/polonium
 	name = "polonium bottle"
 	label_name = "polonium"
 	desc = "A small bottle. Contains Polonium."
 	list_reagents = list(/datum/reagent/toxin/polonium = 30)
 
-/obj/item/reagent_containers/glass/bottle/magillitis
+/obj/item/reagent_containers/cup/bottle/magillitis
 	name = "magillitis bottle"
 	label_name = "magillitis"
 	desc = "A small bottle. Contains a serum known only as 'magillitis'."
 	list_reagents = list(/datum/reagent/magillitis = 5)
 
-/obj/item/reagent_containers/glass/bottle/venom
+/obj/item/reagent_containers/cup/bottle/venom
 	name = "venom bottle"
 	label_name = "venom"
 	desc = "A small bottle. Contains Venom."
 	list_reagents = list(/datum/reagent/toxin/venom = 30)
 
-/obj/item/reagent_containers/glass/bottle/fentanyl
+/obj/item/reagent_containers/cup/bottle/fentanyl
 	name = "fentanyl bottle"
 	label_name = "fentanyl"
 	desc = "A small bottle. Contains Fentanyl."
 	list_reagents = list(/datum/reagent/toxin/fentanyl = 30)
 
-/obj/item/reagent_containers/glass/bottle/formaldehyde
+/obj/item/reagent_containers/cup/bottle/formaldehyde
 	name = "formaldehyde bottle"
 	label_name = "formaldehyde"
 	desc = "A small bottle. Contains Formaldehyde."
 	list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
 	icon_state_preview = "bottle_formaldehyde"
 
-/obj/item/reagent_containers/glass/bottle/initropidril
+/obj/item/reagent_containers/cup/bottle/initropidril
 	name = "initropidril bottle"
 	label_name = "initropidril"
 	desc = "A small bottle. Contains initropidril."
 	list_reagents = list(/datum/reagent/toxin/initropidril = 30)
 
-/obj/item/reagent_containers/glass/bottle/pancuronium
+/obj/item/reagent_containers/cup/bottle/pancuronium
 	name = "pancuronium bottle"
 	label_name = "pancuronium"
 	desc = "A small bottle. Contains pancuronium."
 	list_reagents = list(/datum/reagent/toxin/pancuronium = 30)
 
-/obj/item/reagent_containers/glass/bottle/sodium_thiopental
+/obj/item/reagent_containers/cup/bottle/sodium_thiopental
 	name = "sodium thiopental bottle"
 	label_name = "sodium thiopental"
 	desc = "A small bottle. Contains sodium thiopental."
 	list_reagents = list(/datum/reagent/toxin/sodium_thiopental = 30)
 
-/obj/item/reagent_containers/glass/bottle/coniine
+/obj/item/reagent_containers/cup/bottle/coniine
 	name = "coniine bottle"
 	label_name = "coniine"
 	desc = "A small bottle. Contains coniine."
 	list_reagents = list(/datum/reagent/toxin/coniine = 30)
 
-/obj/item/reagent_containers/glass/bottle/curare
+/obj/item/reagent_containers/cup/bottle/curare
 	name = "curare bottle"
 	label_name = "curare"
 	desc = "A small bottle. Contains curare."
 	list_reagents = list(/datum/reagent/toxin/curare = 30)
 
-/obj/item/reagent_containers/glass/bottle/amanitin
+/obj/item/reagent_containers/cup/bottle/amanitin
 	name = "amanitin bottle"
 	label_name = "amanitin"
 	desc = "A small bottle. Contains amanitin."
 	list_reagents = list(/datum/reagent/toxin/amanitin = 30)
 
-/obj/item/reagent_containers/glass/bottle/histamine
+/obj/item/reagent_containers/cup/bottle/histamine
 	name = "histamine bottle"
 	label_name = "histamine"
 	desc = "A small bottle. Contains Histamine."
 	list_reagents = list(/datum/reagent/toxin/histamine = 30)
 
-/obj/item/reagent_containers/glass/bottle/diphenhydramine
+/obj/item/reagent_containers/cup/bottle/diphenhydramine
 	name = "antihistamine bottle"
 	label_name = "antihistamine"
 	desc = "A small bottle of diphenhydramine."
 	list_reagents = list(/datum/reagent/medicine/diphenhydramine = 30)
 
-/obj/item/reagent_containers/glass/bottle/potass_iodide
+/obj/item/reagent_containers/cup/bottle/potass_iodide
 	name = "anti-radiation bottle"
 	label_name = "anti-radiation"
 	desc = "A small bottle of potassium iodide."
 	list_reagents = list(/datum/reagent/medicine/potass_iodide = 30)
 
-/obj/item/reagent_containers/glass/bottle/salglu_solution
+/obj/item/reagent_containers/cup/bottle/salglu_solution
 	name = "saline-glucose bottle"
 	label_name = "saline-glucose"
 	desc = "A small bottle of saline-glucose solution. Useful for patients lacking in blood volume."
 	list_reagents = list(/datum/reagent/medicine/salglu_solution = 30)
 	icon_state_preview = "bottle_salineglucose"
 
-/obj/item/reagent_containers/glass/bottle/atropine
+/obj/item/reagent_containers/cup/bottle/atropine
 	name = "atropine bottle"
 	label_name = "atropine"
 	desc = "A small bottle of atropine."
 	list_reagents = list(/datum/reagent/medicine/atropine = 30)
 
-/obj/item/reagent_containers/glass/bottle/romerol
+/obj/item/reagent_containers/cup/bottle/romerol
 	name = "romerol bottle"
 	label_name = "romerol"
 	desc = "A small bottle of Romerol. The REAL zombie powder."
 	list_reagents = list(/datum/reagent/romerol = 30)
 
-/obj/item/reagent_containers/glass/bottle/random_virus/minor //for mail only...yet
+/obj/item/reagent_containers/cup/bottle/random_virus/minor //for mail only...yet
 	name = "Minor experimental disease culture bottle"
 	label_name = "Minor experimental disease culture"
 	desc = "A small bottle. Contains a weak version of an untested viral culture in synthblood medium."
 	spawned_disease = /datum/disease/advance/random/minor
 
-/obj/item/reagent_containers/glass/bottle/random_virus
+/obj/item/reagent_containers/cup/bottle/random_virus
 	name = "Experimental disease culture bottle"
 	label_name = "Experimental disease culture"
 	desc = "A small bottle. Contains an untested viral culture in synthblood medium."
 	spawned_disease = /datum/disease/advance/random
 	icon_state_preview = "bottle_virusblood"
 
-/obj/item/reagent_containers/glass/bottle/pierrot_throat
+/obj/item/reagent_containers/cup/bottle/pierrot_throat
 	name = "Pierrot's Throat culture bottle"
 	label_name = "Pierrot's Throat culture"
 	desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
 	spawned_disease = /datum/disease/pierrot_throat
 
-/obj/item/reagent_containers/glass/bottle/cold
+/obj/item/reagent_containers/cup/bottle/cold
 	name = "Rhinovirus culture bottle"
 	label_name = "Rhinovirus culture"
 	desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
 	spawned_disease = /datum/disease/advance/cold
 
-/obj/item/reagent_containers/glass/bottle/flu_virion
+/obj/item/reagent_containers/cup/bottle/flu_virion
 	name = "Flu virion culture bottle"
 	label_name = "Flu virion culture"
 	desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
 	spawned_disease = /datum/disease/advance/flu
 
-/obj/item/reagent_containers/glass/bottle/inorganic_virion
+/obj/item/reagent_containers/cup/bottle/inorganic_virion
 	name = "Inorganic Biology virion culture bottle"
 	label_name = "Inorganic Biology virion culture"
 	desc = "A small bottle. Contains a benign virion culture capable of infecting inorganic organisms in synthblood medium."
 	spawned_disease = /datum/disease/advance/inorganic
 
-/obj/item/reagent_containers/glass/bottle/necrotic_virion
+/obj/item/reagent_containers/cup/bottle/necrotic_virion
 	name = "Necrotic Adaptation culture bottle"
 	label_name = "Necrotic Adaptation virion culture"
 	desc = "A small bottle. Contains a benign virion culture capable of metabolizing in deceased organisms in synthblood medium."
 	spawned_disease = /datum/disease/advance/necrotic
 
-/obj/item/reagent_containers/glass/bottle/evolution_virion
+/obj/item/reagent_containers/cup/bottle/evolution_virion
 	name = "Viral Evolutionary Acceleration virion culture bottle"
 	label_name = "Viral Evolutionary Acceleration virion culture"
 	desc = "A small bottle. Contains a benign, mutative virion culture in synthblood medium."
 	spawned_disease = /datum/disease/advance/evolution
 
-/obj/item/reagent_containers/glass/bottle/adaptation_virion
+/obj/item/reagent_containers/cup/bottle/adaptation_virion
 	name = "Viral Evolutionary Adaptation virion culture bottle"
 	label_name = "Viral Evolutionary Adaptation virion culture"
 	desc = "A small bottle. Contains a benign, resilient virion culture in synthblood medium."
 	spawned_disease = /datum/disease/advance/adaptation
 
-/obj/item/reagent_containers/glass/bottle/aggression_virion
+/obj/item/reagent_containers/cup/bottle/aggression_virion
 	name = "Viral Aggressive Metabolism virion culture bottle"
 	label_name = "Viral Aggressive Metabolism  virion culture"
 	desc = "A small bottle. Contains a benign, aggressive virion culture in synthblood medium."
 	spawned_disease = /datum/disease/advance/aggression
 
-/obj/item/reagent_containers/glass/bottle/retrovirus
+/obj/item/reagent_containers/cup/bottle/retrovirus
 	name = "Retrovirus culture bottle"
 	label_name = "Retrovirus culture"
 	desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
 	spawned_disease = /datum/disease/dna_retrovirus
 
-/obj/item/reagent_containers/glass/bottle/gbs
+/obj/item/reagent_containers/cup/bottle/gbs
 	name = "GBS culture bottle"
 	label_name = "GBS culture"
 	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
 	amount_per_transfer_from_this = 5
 	spawned_disease = /datum/disease/gbs
 
-/obj/item/reagent_containers/glass/bottle/fake_gbs
+/obj/item/reagent_containers/cup/bottle/fake_gbs
 	name = "GBS culture bottle"
 	label_name = "GBS culture"
 	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
 	spawned_disease = /datum/disease/fake_gbs
 
-/obj/item/reagent_containers/glass/bottle/brainrot
+/obj/item/reagent_containers/cup/bottle/brainrot
 	name = "Brainrot culture bottle"
 	label_name = "Brainrot culture"
 	desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
@@ -377,49 +389,49 @@
 	spawned_disease = /datum/disease/brainrot
 	label_icon = null
 
-/obj/item/reagent_containers/glass/bottle/magnitis
+/obj/item/reagent_containers/cup/bottle/magnitis
 	name = "Magnitis culture bottle"
 	label_name = "Magnitis culture"
 	desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
 	spawned_disease = /datum/disease/magnitis
 
-/obj/item/reagent_containers/glass/bottle/wizarditis
+/obj/item/reagent_containers/cup/bottle/wizarditis
 	name = "Wizarditis culture bottle"
 	label_name = "Wizarditis culture"
 	desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
 	spawned_disease = /datum/disease/wizarditis
 
-/obj/item/reagent_containers/glass/bottle/anxiety
+/obj/item/reagent_containers/cup/bottle/anxiety
 	name = "Severe Anxiety culture bottle"
 	label_name = "Severe Anxiety culture"
 	desc = "A small bottle. Contains a sample of Lepidopticides."
 	spawned_disease = /datum/disease/anxiety
 
-/obj/item/reagent_containers/glass/bottle/beesease
+/obj/item/reagent_containers/cup/bottle/beesease
 	name = "Beesease culture bottle"
 	label_name = "Beesease culture"
 	desc = "A small bottle. Contains a sample of invasive Apidae."
 	spawned_disease = /datum/disease/beesease
 
-/obj/item/reagent_containers/glass/bottle/fluspanish
+/obj/item/reagent_containers/cup/bottle/fluspanish
 	name = "Spanish flu culture bottle"
 	label_name = "Spanish flu culture"
 	desc = "A small bottle. Contains a sample of Inquisitius."
 	spawned_disease = /datum/disease/fluspanish
 
-/obj/item/reagent_containers/glass/bottle/tuberculosis
+/obj/item/reagent_containers/cup/bottle/tuberculosis
 	name = "Fungal Tuberculosis culture bottle"
 	label_name = "Fungal Tuberculosis culture"
 	desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus."
 	spawned_disease = /datum/disease/tuberculosis
 
-/obj/item/reagent_containers/glass/bottle/tuberculosiscure
+/obj/item/reagent_containers/cup/bottle/tuberculosiscure
 	name = "BVAK bottle"
 	label_name = "BVAK"
 	desc = "A small bottle containing Bio Virus Antidote Kit."
 	list_reagents = list(/datum/reagent/medicine/atropine = 5, /datum/reagent/medicine/epinephrine = 5, /datum/reagent/medicine/salbutamol = 10, /datum/reagent/medicine/spaceacillin = 10)
 
-/obj/item/reagent_containers/glass/bottle/necropolis_seed
+/obj/item/reagent_containers/cup/bottle/necropolis_seed
 	name = "bowl of blood"
 	label_name = "blood"
 	desc = "A clay bowl containing a fledgling Necropolis, preserved in blood. A robust virologist may be able to unlock its full potential..."
@@ -427,19 +439,19 @@
 	spawned_disease = /datum/disease/advance/random/necropolis
 	label_icon = null
 
-/obj/item/reagent_containers/glass/bottle/felinid
+/obj/item/reagent_containers/cup/bottle/felinid
 	name = "Nano-Feline Assimilative Toxoplasmosis culture bottle"
 	label_name = "Nano-Feline Assimilative Toxoplasmosis culture"
 	desc = "A small bottle. Contains a sample of nano-feline toxoplasma in synthblood medium."
 	spawned_disease = /datum/disease/transformation/felinid/contagious
 
-/obj/item/reagent_containers/glass/bottle/advanced_felinid
+/obj/item/reagent_containers/cup/bottle/advanced_felinid
 	name = "Feline Hysteria culture bottle"
 	label_name = "Feline Hysteria culture"
 	desc = "A small bottle. Contains a sample of a dangerous A.R.C. experimental disease"
 	spawned_disease = /datum/disease/advance/feline_hysteria
 
-/obj/item/reagent_containers/glass/bottle/psyphoza
+/obj/item/reagent_containers/cup/bottle/psyphoza
 	name = "Acute Fungal Infection culture bottle"
 	label_name = "Acute Fungal Infection culture"
 	desc = "A small bottle. Contains a sample of an agressive fungal species in synthblood medium."
@@ -447,159 +459,159 @@
 
 //Oldstation.dmm chemical storage bottles
 
-/obj/item/reagent_containers/glass/bottle/hydrogen
+/obj/item/reagent_containers/cup/bottle/hydrogen
 	name = "hydrogen bottle"
 	label_name = "hydrogen"
 	list_reagents = list(/datum/reagent/hydrogen = 30)
 
-/obj/item/reagent_containers/glass/bottle/lithium
+/obj/item/reagent_containers/cup/bottle/lithium
 	name = "lithium bottle"
 	label_name = "lithium"
 	list_reagents = list(/datum/reagent/lithium = 30)
 
-/obj/item/reagent_containers/glass/bottle/carbon
+/obj/item/reagent_containers/cup/bottle/carbon
 	name = "carbon bottle"
 	label_name = "carbon"
 	list_reagents = list(/datum/reagent/carbon = 30)
 
-/obj/item/reagent_containers/glass/bottle/nitrogen
+/obj/item/reagent_containers/cup/bottle/nitrogen
 	name = "nitrogen bottle"
 	label_name = "nitrogen"
 	list_reagents = list(/datum/reagent/nitrogen = 30)
 
-/obj/item/reagent_containers/glass/bottle/oxygen
+/obj/item/reagent_containers/cup/bottle/oxygen
 	name = "oxygen bottle"
 	label_name = "oxygen"
 	list_reagents = list(/datum/reagent/oxygen = 30)
 
-/obj/item/reagent_containers/glass/bottle/fluorine
+/obj/item/reagent_containers/cup/bottle/fluorine
 	name = "fluorine bottle"
 	label_name = "fluorine"
 	list_reagents = list(/datum/reagent/fluorine = 30)
 
-/obj/item/reagent_containers/glass/bottle/sodium
+/obj/item/reagent_containers/cup/bottle/sodium
 	name = "sodium bottle"
 	label_name = "sodium"
 	list_reagents = list(/datum/reagent/sodium = 30)
 
-/obj/item/reagent_containers/glass/bottle/aluminium
+/obj/item/reagent_containers/cup/bottle/aluminium
 	name = "aluminium bottle"
 	label_name = "aluminium"
 	list_reagents = list(/datum/reagent/aluminium = 30)
 
-/obj/item/reagent_containers/glass/bottle/silicon
+/obj/item/reagent_containers/cup/bottle/silicon
 	name = "silicon bottle"
 	label_name = "silicon"
 	list_reagents = list(/datum/reagent/silicon = 30)
 
-/obj/item/reagent_containers/glass/bottle/phosphorus
+/obj/item/reagent_containers/cup/bottle/phosphorus
 	name = "phosphorus bottle"
 	label_name = "phosphorus"
 	list_reagents = list(/datum/reagent/phosphorus = 30)
 
-/obj/item/reagent_containers/glass/bottle/sulfur
+/obj/item/reagent_containers/cup/bottle/sulfur
 	name = "sulfur bottle"
 	label_name = "sulfur"
 	list_reagents = list(/datum/reagent/sulfur = 30)
 
-/obj/item/reagent_containers/glass/bottle/chlorine
+/obj/item/reagent_containers/cup/bottle/chlorine
 	name = "chlorine bottle"
 	label_name = "chlorine"
 	list_reagents = list(/datum/reagent/chlorine = 30)
 
-/obj/item/reagent_containers/glass/bottle/potassium
+/obj/item/reagent_containers/cup/bottle/potassium
 	name = "potassium bottle"
 	label_name = "potassium"
 	list_reagents = list(/datum/reagent/potassium = 30)
 
-/obj/item/reagent_containers/glass/bottle/iron
+/obj/item/reagent_containers/cup/bottle/iron
 	name = "iron bottle"
 	label_name = "iron"
 	list_reagents = list(/datum/reagent/iron = 30)
 
-/obj/item/reagent_containers/glass/bottle/copper
+/obj/item/reagent_containers/cup/bottle/copper
 	name = "copper bottle"
 	label_name = "copper"
 	list_reagents = list(/datum/reagent/copper = 30)
 
-/obj/item/reagent_containers/glass/bottle/mercury
+/obj/item/reagent_containers/cup/bottle/mercury
 	name = "mercury bottle"
 	label_name = "mercury"
 	list_reagents = list(/datum/reagent/mercury = 30)
 
-/obj/item/reagent_containers/glass/bottle/radium
+/obj/item/reagent_containers/cup/bottle/radium
 	name = "radium bottle"
 	label_name = "radium"
 	list_reagents = list(/datum/reagent/uranium/radium = 30)
 
-/obj/item/reagent_containers/glass/bottle/water
+/obj/item/reagent_containers/cup/bottle/water
 	name = "water bottle"
 	label_name = "water"
 	list_reagents = list(/datum/reagent/water = 30)
 
-/obj/item/reagent_containers/glass/bottle/ethanol
+/obj/item/reagent_containers/cup/bottle/ethanol
 	name = "ethanol bottle"
 	label_name = "ethanol"
 	list_reagents = list(/datum/reagent/consumable/ethanol = 30)
 	icon_state_preview = "bottle_ethanol"
 
-/obj/item/reagent_containers/glass/bottle/sugar
+/obj/item/reagent_containers/cup/bottle/sugar
 	name = "sugar bottle"
 	label_name = "sugar"
 	list_reagents = list(/datum/reagent/consumable/sugar = 30)
 
-/obj/item/reagent_containers/glass/bottle/sacid
+/obj/item/reagent_containers/cup/bottle/sacid
 	name = "sulfuric acid bottle"
 	label_name = "sulfuric acid"
 	list_reagents = list(/datum/reagent/toxin/acid = 30)
 
-/obj/item/reagent_containers/glass/bottle/welding_fuel
+/obj/item/reagent_containers/cup/bottle/welding_fuel
 	name = "welding fuel bottle"
 	label_name = "welding fuel"
 	list_reagents = list(/datum/reagent/fuel = 30)
 
-/obj/item/reagent_containers/glass/bottle/silver
+/obj/item/reagent_containers/cup/bottle/silver
 	name = "silver bottle"
 	label_name = "silver"
 	list_reagents = list(/datum/reagent/silver = 30)
 
-/obj/item/reagent_containers/glass/bottle/iodine
+/obj/item/reagent_containers/cup/bottle/iodine
 	name = "iodine bottle"
 	label_name = "iodine"
 	list_reagents = list(/datum/reagent/iodine = 30)
 
-/obj/item/reagent_containers/glass/bottle/bromine
+/obj/item/reagent_containers/cup/bottle/bromine
 	name = "bromine bottle"
 	label_name = "bromine"
 	list_reagents = list(/datum/reagent/bromine = 30)
 
 // Bottles for mail goodies.
 
-/obj/item/reagent_containers/glass/bottle/clownstears
+/obj/item/reagent_containers/cup/bottle/clownstears
 	name = "bottle of distilled clown misery"
 	label_name = "distilled clown misery"
 	desc = "A small bottle. Contains a mythical liquid used by sublime bartenders; made from the unhappiness of clowns."
 	list_reagents = list(/datum/reagent/consumable/clownstears = 30)
 
-/obj/item/reagent_containers/glass/bottle/saltpetre
+/obj/item/reagent_containers/cup/bottle/saltpetre
 	name = "saltpetre bottle"
 	label_name = "saltpetre"
 	desc = "A small bottle. Contains saltpetre."
 	list_reagents = list(/datum/reagent/saltpetre = 30)
 
-/obj/item/reagent_containers/glass/bottle/flash_powder
+/obj/item/reagent_containers/cup/bottle/flash_powder
 	name = "flash powder bottle"
 	label_name = "flash powder"
 	desc = "A small bottle. Contains flash powder."
 	list_reagents = list(/datum/reagent/flash_powder = 30)
 
-/obj/item/reagent_containers/glass/bottle/caramel
+/obj/item/reagent_containers/cup/bottle/caramel
 	name = "bottle of caramel"
 	label_name = "caramel"
 	desc = "A bottle containing caramalized sugar, also known as caramel. Do not lick."
 	list_reagents = list(/datum/reagent/consumable/caramel = 30)
 
-/obj/item/reagent_containers/glass/bottle/ketamine
+/obj/item/reagent_containers/cup/bottle/ketamine
 	name = "ketamine bottle"
 	label_name = "ketamine"
 	desc = "A small bottle. Contains ketamine, why?"
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
similarity index 58%
rename from code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
rename to code/modules/reagents/reagent_containers/cups/drinkingglass.dm
index c14efb097464b..692bef27ff80d 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
@@ -1,6 +1,4 @@
-
-
-/obj/item/reagent_containers/food/drinks/drinkingglass
+/obj/item/reagent_containers/cup/glass/drinkingglass
 	name = "drinking glass"
 	desc = "Your standard drinking glass."
 	custom_price = 5
@@ -15,7 +13,7 @@
 	drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
 	pickup_sound =  'sound/items/handling/drinkglass_pickup.ogg'
 
-/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
+/obj/item/reagent_containers/cup/glass/drinkingglass/on_reagent_change(changetype)
 	cut_overlays()
 	if(reagents.reagent_list.len)
 		var/datum/reagent/R = reagents.get_master_reagent()
@@ -39,7 +37,7 @@
 //  You can only mix the ported-over drinks in shot glasses for now (they'll mix in a shaker, but the sprite won't change for glasses). //
 //  This is on a case-by-case basis, and you can even make a separate sprite for shot glasses if you want. //
 
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass
 	name = "shot glass"
 	desc = "A shot glass - the universal symbol for bad decisions."
 	custom_price = 5
@@ -50,7 +48,7 @@
 	volume = 15
 	custom_materials = list(/datum/material/glass=100)
 
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
+/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/on_reagent_change(changetype)
 	cut_overlays()
 
 	gulp_size = max(round(reagents.total_volume / 15), 15)
@@ -75,57 +73,21 @@
 		desc = "A shot glass - the universal symbol for bad decisions."
 		return
 
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/Initialize(mapload)
 	. = ..()
 	on_reagent_change(ADD_REAGENT)
 
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda
 	name = "Soda Water"
 	list_reagents = list(/datum/reagent/consumable/sodawater = 50)
 	icon_state_preview = "glass_clear"
 
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola
 	name = "Space Cola"
 	list_reagents = list(/datum/reagent/consumable/space_cola = 50)
 	icon_state_preview = "glass_brown"
 
-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
+/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
 	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
 	icon_state_preview = "nuka_colaglass"
-
-/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/food/egg)) //breaking eggs
-		var/obj/item/food/egg/E = I
-		if(reagents)
-			if(reagents.total_volume >= reagents.maximum_volume)
-				to_chat(user, "<span class='notice'>[src] is full.</span>")
-			else
-				to_chat(user, "<span class='notice'>You break [E] in [src].</span>")
-				reagents.add_reagent(/datum/reagent/consumable/eggyolk, 5)
-				qdel(E)
-			return
-	else
-		..()
-
-/obj/item/reagent_containers/food/drinks/drinkingglass/attack(obj/target, mob/user)
-	if(user.a_intent == INTENT_HARM && ismob(target) && target.reagents && reagents.total_volume)
-		target.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
-						"<span class='userdanger'>[user] splashes the contents of [src] onto you!</span>")
-		log_combat(user, target, "splashed", src)
-		reagents.reaction(target, TOUCH)
-		reagents.clear_reagents()
-		return
-	..()
-
-/obj/item/reagent_containers/food/drinks/drinkingglass/afterattack(obj/target, mob/user, proximity)
-	. = ..()
-	if((!proximity) || !check_allowed_items(target,target_self=1))
-		return
-
-	else if(reagents.total_volume && user.a_intent == INTENT_HARM)
-		user.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
-							"<span class='notice'>You splash the contents of [src] onto [target].</span>")
-		reagents.reaction(target, TOUCH)
-		reagents.clear_reagents()
-		return
diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm
new file mode 100644
index 0000000000000..f5b50d8473a31
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/cups/drinks.dm
@@ -0,0 +1,501 @@
+////////////////////////////////////////////////////////////////////////////////
+/// Drinks.
+////////////////////////////////////////////////////////////////////////////////
+/obj/item/reagent_containers/cup/glass
+	name = "drink"
+	desc = "yummy"
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = null
+	possible_transfer_amounts = list(5,10,15,20,25,30,50)
+	resistance_flags = NONE
+
+	isGlass = TRUE
+
+
+/obj/item/reagent_containers/cup/glass/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+	. = ..()
+	if(!.) //if the bottle wasn't caught
+		smash(hit_atom, throwingdatum?.thrower, TRUE)
+
+/obj/item/reagent_containers/cup/glass/proc/smash(atom/target, mob/thrower, ranged = FALSE)
+	if(!isGlass)
+		return
+	if(QDELING(src) || !target) //Invalid loc
+		return
+	if(bartender_check(target) && ranged)
+		return
+	SplashReagents(target, ranged, override_spillable = TRUE)
+	var/obj/item/broken_bottle/B = new (loc)
+	B.mimic_broken(src, target)
+	qdel(src)
+	target.Bumped(B)
+
+/obj/item/reagent_containers/cup/glass/bullet_act(obj/projectile/P)
+	. = ..()
+	if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
+		var/atom/T = get_turf(src)
+		smash(T)
+
+
+/obj/item/reagent_containers/cup/glass/trophy
+	name = "pewter cup"
+	desc = "Everyone gets a trophy."
+	icon_state = "pewter_cup"
+	w_class = WEIGHT_CLASS_TINY
+	force = 1
+	throwforce = 1
+	amount_per_transfer_from_this = 5
+	custom_materials = list(/datum/material/iron=100)
+	possible_transfer_amounts = list(5)
+	volume = 5
+	flags_1 = CONDUCT_1
+	spillable = TRUE
+	resistance_flags = FIRE_PROOF
+	isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup
+	name = "gold cup"
+	desc = "You're winner!"
+	icon_state = "golden_cup"
+	w_class = WEIGHT_CLASS_BULKY
+	force = 14
+	throwforce = 10
+	amount_per_transfer_from_this = 20
+	custom_materials = list(/datum/material/gold=1000)
+	volume = 150
+
+/obj/item/reagent_containers/cup/glass/trophy/silver_cup
+	name = "silver cup"
+	desc = "Best loser!"
+	icon_state = "silver_cup"
+	w_class = WEIGHT_CLASS_NORMAL
+	force = 10
+	throwforce = 8
+	amount_per_transfer_from_this = 15
+	custom_materials = list(/datum/material/silver=800)
+	volume = 100
+
+
+/obj/item/reagent_containers/cup/glass/trophy/bronze_cup
+	name = "bronze cup"
+	desc = "At least you ranked!"
+	icon_state = "bronze_cup"
+	w_class = WEIGHT_CLASS_SMALL
+	force = 5
+	throwforce = 4
+	amount_per_transfer_from_this = 10
+	custom_materials = list(/datum/material/iron=400)
+	volume = 25
+
+///////////////////////////////////////////////Drinks
+//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
+// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50.
+// Formatting is the same as food.
+
+/obj/item/reagent_containers/cup/glass/coffee
+	name = "robust coffee"
+	desc = "Careful, the beverage you're about to enjoy is extremely hot."
+	icon_state = "coffee"
+	list_reagents = list(/datum/reagent/consumable/coffee = 30)
+	spillable = TRUE
+	resistance_flags = FREEZE_PROOF
+	isGlass = FALSE
+	drink_type = BREAKFAST
+
+/obj/item/reagent_containers/cup/glass/bubble_tea
+	name = "Bubble tea"
+	desc = "Refreshing! You aren't sure what those things in the bottom are."
+	icon_state = "bubble_tea"
+	list_reagents = list(/datum/reagent/consumable/bubble_tea = 50)
+	drink_type = SUGAR
+	spillable = TRUE
+	isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/ice
+	name = "ice cup"
+	desc = "Careful, cold ice, do not chew."
+	custom_price = PAYCHECK_EASY * 0.6
+	icon_state = "icecup"
+	list_reagents = list(/datum/reagent/consumable/ice = 30)
+	spillable = TRUE
+	isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/ice/prison
+	name = "dirty ice cup"
+	desc = "Either Nanotrasen'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/cup/glass/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"
+	item_state = "coffee"
+	spillable = TRUE
+
+/obj/item/reagent_containers/cup/glass/mug/update_icon_state()
+	icon_state = reagents.total_volume ? "tea" : "tea_empty"
+	return ..()
+
+/obj/item/reagent_containers/cup/glass/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/cup/glass/mug/cocoa
+	name = "Dutch hot coco"
+	desc = "Made in Space South America."
+	list_reagents = list(/datum/reagent/consumable/hot_cocoa = 15, /datum/reagent/consumable/sugar = 5)
+	drink_type = SUGAR
+	resistance_flags = FREEZE_PROOF
+	custom_price = PAYCHECK_MEDIUM * 1.2
+
+
+/obj/item/reagent_containers/cup/glass/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!"
+	icon_state = "ramen"
+	list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3)
+	drink_type = GRAIN
+	isGlass = FALSE
+	custom_price = PAYCHECK_MEDIUM * 0.9
+
+/obj/item/reagent_containers/cup/glass/waterbottle
+	name = "bottle of water"
+	desc = "A bottle of water filled at an old Earth bottling facility."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "smallbottle"
+	item_state = "bottle"
+	list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
+	custom_materials = list(/datum/material/plastic=1000)
+	volume = 50
+	amount_per_transfer_from_this = 10
+	fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90)
+	isGlass = FALSE
+	// The 2 bottles have separate cap overlay icons because if the bottle falls over while bottle flipping the cap stays fucked on the moved overlay
+	var/cap_icon_state = "bottle_cap_small"
+	var/cap_on = TRUE
+	var/cap_lost = FALSE
+	var/mutable_appearance/cap_overlay
+	var/flip_chance = 10
+	custom_price = PAYCHECK_EASY * 0.8
+
+/obj/item/reagent_containers/cup/glass/waterbottle/Initialize(mapload)
+	. = ..()
+	cap_overlay = mutable_appearance(icon, cap_icon_state)
+	if(cap_on)
+		spillable = FALSE
+		update_appearance()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/update_overlays()
+	. = ..()
+	if(cap_on)
+		. += cap_overlay
+
+/obj/item/reagent_containers/cup/glass/waterbottle/examine(mob/user)
+	. = ..()
+	if(cap_lost)
+		. += "<span class='notice'>The cap seems to be missing.</span>"
+	else if(cap_on)
+		. += "<span class='notice'>The cap is firmly on to prevent spilling. Alt-click to remove the cap.</span>"
+	else
+		. += "<span class='notice'>The cap has been taken off. Alt-click to put a cap on.</span>"
+
+/obj/item/reagent_containers/cup/glass/waterbottle/AltClick(mob/user)
+	. = ..()
+	if(cap_lost)
+		to_chat(user, "<span class='warning'>The cap seems to be missing! Where did it go?</span>")
+		return
+
+	var/fumbled = HAS_TRAIT(user, TRAIT_CLUMSY) && prob(5)
+	if(cap_on || fumbled)
+		cap_on = FALSE
+		spillable = TRUE
+		animate(src, transform = null, time = 2, loop = 0)
+		if(fumbled)
+			to_chat(user, "<span class='warning'>You fumble with [src]'s cap! The cap falls onto the ground and simply vanishes. Where the hell did it go?</span>")
+			cap_lost = TRUE
+		else
+			to_chat(user, "<span class='notice'>You remove the cap from [src].</span>")
+	else
+		cap_on = TRUE
+		spillable = FALSE
+		to_chat(user, "<span class='notice'>You put the cap on [src].</span>")
+	update_appearance()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/is_refillable()
+	if(cap_on)
+		return FALSE
+	return ..()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/is_drainable()
+	if(cap_on)
+		return FALSE
+	return ..()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/attack(mob/target, mob/living/user, def_zone)
+	if(!target)
+		return
+
+	if(cap_on && reagents.total_volume && istype(target))
+		to_chat(user, "<span class='warning'>You must remove the cap before you can do that!</span>")
+		return
+
+	return ..()
+
+/obj/item/reagent_containers/cup/glass/waterbottle/afterattack(obj/target, mob/living/user, proximity)
+	if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && !user.a_intent == INTENT_HARM)))
+		to_chat(user, "<span class='warning'>You must remove the cap before you can do that!</span>")
+		return
+
+	else if(istype(target, /obj/item/reagent_containers/cup/glass/waterbottle))
+		var/obj/item/reagent_containers/cup/glass/waterbottle/other_bottle = target
+		if(other_bottle.cap_on)
+			to_chat(user, "<span class='warning'>[other_bottle] has a cap firmly twisted on!</span>")
+			return
+
+	return ..()
+
+// heehoo bottle flipping
+/obj/item/reagent_containers/cup/glass/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+	. = ..()
+	if(QDELETED(src))
+		return
+	if(!cap_on || !reagents.total_volume)
+		return
+	if(prob(flip_chance)) // landed upright
+		src.visible_message("<span class='notice'>[src] lands upright!</span>")
+		if(throwingdatum.thrower)
+			var/mob/living/living_thrower = throwingdatum.thrower
+			SEND_SIGNAL(living_thrower, COMSIG_ADD_MOOD_EVENT, "bottle_flip", /datum/mood_event/bottle_flip)
+	else // landed on it's side
+		animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0)
+
+/obj/item/reagent_containers/cup/glass/waterbottle/pickup(mob/user)
+	. = ..()
+	animate(src, transform = null, time = 1, loop = 0)
+
+/obj/item/reagent_containers/cup/glass/waterbottle/empty
+	list_reagents = list()
+	cap_on = FALSE
+
+/obj/item/reagent_containers/cup/glass/waterbottle/large
+	desc = "A fresh commercial-sized bottle of water."
+	icon_state = "largebottle"
+	custom_materials = list(/datum/material/plastic=3000)
+	list_reagents = list(/datum/reagent/water = 100)
+	volume = 100
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+	cap_icon_state = "bottle_cap"
+
+/obj/item/reagent_containers/cup/glass/waterbottle/large/empty
+	list_reagents = list()
+	cap_on = FALSE
+
+// Admin spawn
+/obj/item/reagent_containers/cup/glass/waterbottle/relic
+	name = "mysterious bottle"
+	desc = "A bottle quite similar to a water bottle, but with some words scribbled on with a marker. It seems to be radiating some kind of energy."
+	flip_chance = 100 // FLIPP
+
+/obj/item/reagent_containers/cup/glass/waterbottle/relic/Initialize(mapload)
+	var/reagent_id = get_random_reagent_id()
+	var/datum/reagent/random_reagent = new reagent_id
+	list_reagents = list(random_reagent.type = 50)
+	. = ..()
+	desc += "<span class='notice'>The writing reads '[random_reagent.name]'.</span>"
+	update_appearance()
+
+
+/obj/item/reagent_containers/cup/glass/sillycup
+	name = "paper cup"
+	desc = "A paper water cup."
+	icon_state = "water_cup_e"
+	possible_transfer_amounts = list(10)
+	volume = 10
+	spillable = TRUE
+	isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/sillycup/update_icon_state()
+	icon_state = reagents.total_volume ? "water_cup" : "water_cup_e"
+	return ..()
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton
+	name = "small carton"
+	desc = "A small carton, intended for holding drinks."
+	icon_state = "juicebox"
+	volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler
+
+/// Reagent container icon updates, especially this one, are complete jank. I will need to rework them after this is merged.
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/on_reagent_change(datum/reagents/holder, ...)
+	. = ..()
+	if(!length(reagents.reagent_list))
+		drink_type = NONE /// Why are drink types on the _container_? TODO: move these to the reagents //im waiting
+		return
+
+	switch(reagents.get_master_reagent_id())
+		if(/datum/reagent/consumable/orangejuice)
+			drink_type = FRUIT | BREAKFAST
+		if(/datum/reagent/consumable/milk)
+			drink_type = DAIRY | BREAKFAST
+		if(/datum/reagent/consumable/applejuice)
+			drink_type = FRUIT
+		if(/datum/reagent/consumable/grapejuice)
+			drink_type = FRUIT
+		if(/datum/reagent/consumable/pineapplejuice)
+			drink_type = FRUIT | PINEAPPLE
+		if(/datum/reagent/consumable/milk/chocolate_milk)
+			drink_type = SUGAR
+		if(/datum/reagent/consumable/ethanol/eggnog)
+			drink_type = MEAT
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_name(updates)
+	. = ..()
+	if(!length(reagents.reagent_list))
+		name = "small carton"
+		return
+
+	switch(reagents.get_master_reagent_id())
+		if(/datum/reagent/consumable/orangejuice)
+			name = "orange juice box"
+		if(/datum/reagent/consumable/milk)
+			name = "carton of milk"
+		if(/datum/reagent/consumable/applejuice)
+			name = "apple juice box"
+		if(/datum/reagent/consumable/grapejuice)
+			name = "grape juice box"
+		if(/datum/reagent/consumable/pineapplejuice)
+			name = "pineapple juice box"
+		if(/datum/reagent/consumable/milk/chocolate_milk)
+			name = "carton of chocolate milk"
+		if(/datum/reagent/consumable/ethanol/eggnog)
+			name = "carton of eggnog"
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_desc(updates)
+	. = ..()
+	if(!length(reagents.reagent_list))
+		desc = "A small carton, intended for holding drinks."
+		return
+
+	switch(reagents.get_master_reagent_id())
+		if(/datum/reagent/consumable/orangejuice)
+			desc = "A great source of vitamins. Stay healthy!"
+		if(/datum/reagent/consumable/milk)
+			desc = "An excellent source of calcium for growing space explorers."
+		if(/datum/reagent/consumable/applejuice)
+			desc = "Sweet apple juice. Don't be late for school!"
+		if(/datum/reagent/consumable/grapejuice)
+			desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
+		if(/datum/reagent/consumable/pineapplejuice)
+			desc = "Why would you even want this?"
+		if(/datum/reagent/consumable/milk/chocolate_milk)
+			desc = "Milk for cool kids!"
+		if(/datum/reagent/consumable/ethanol/eggnog)
+			desc = "For enjoying the most wonderful time of the year."
+
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/update_icon_state()
+	. = ..()
+	if(!length(reagents.reagent_list))
+		icon_state = "juicebox"
+		return
+
+	switch(reagents.get_master_reagent_id()) // Thanks to update_name not existing we need to do this whole switch twice
+		if(/datum/reagent/consumable/orangejuice)
+			icon_state = "orangebox"
+		if(/datum/reagent/consumable/milk)
+			icon_state = "milkbox"
+		if(/datum/reagent/consumable/applejuice)
+			icon_state = "juicebox"
+		if(/datum/reagent/consumable/grapejuice)
+			icon_state = "grapebox"
+		if(/datum/reagent/consumable/pineapplejuice)
+			icon_state = "pineapplebox"
+		if(/datum/reagent/consumable/milk/chocolate_milk)
+			icon_state = "chocolatebox"
+		if(/datum/reagent/consumable/ethanol/eggnog)
+			icon_state = "nog2"
+		else
+			icon_state = "juicebox"
+
+/obj/item/reagent_containers/cup/glass/sillycup/smallcarton/smash(atom/target, mob/thrower, ranged = FALSE)
+	if(bartender_check(target) && ranged)
+		return
+	SplashReagents(target, ranged, override_spillable = TRUE)
+	var/obj/item/broken_bottle/bottle_shard = new (loc)
+	bottle_shard.mimic_broken(src, target)
+	qdel(src)
+	target.Bumped(bottle_shard)
+
+/obj/item/reagent_containers/cup/glass/colocup
+	name = "colo cup"
+	desc = "A cheap, mass produced style of cup, typically used at parties. They never seem to come out red, for some reason..."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "colocup"
+	item_state = "colocup"
+	custom_materials = list(/datum/material/plastic = 1000)
+	possible_transfer_amounts = list(5, 10, 15, 20)
+	volume = 20
+	amount_per_transfer_from_this = 5
+	isGlass = FALSE
+	/// Allows the lean sprite to display upon crafting
+	var/random_sprite = TRUE
+
+/obj/item/reagent_containers/cup/glass/colocup/Initialize(mapload)
+	. = ..()
+	pixel_x = rand(-4,4)
+	pixel_y = rand(-4,4)
+	if(!random_sprite)
+		return
+	icon_state = "colocup[rand(0, 6)]"
+	if(icon_state == "colocup6")
+		desc = "A cheap, mass produced style of cup, typically used at parties. Woah, this one is in red! What the hell?"
+
+//////////////////////////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
+// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass
+// icon states.
+
+/obj/item/reagent_containers/cup/glass/shaker
+	name = "shaker"
+	desc = "A metal shaker to mix drinks in."
+	icon_state = "shaker"
+	custom_materials = list(/datum/material/iron=1500)
+	amount_per_transfer_from_this = 10
+	volume = 100
+	isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/shaker/Initialize(mapload)
+	. = ..()
+	if(prob(10))
+		name = "\improper Nanotrasen 20th Anniversary Shaker"
+		desc += " It has an emblazoned Nanotrasen logo on it."
+		icon_state = "shaker_n"
+
+/obj/item/reagent_containers/cup/glass/flask
+	name = "flask"
+	desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
+	custom_price = PAYCHECK_COMMAND * 2
+	icon_state = "flask"
+	custom_materials = list(/datum/material/iron=250)
+	volume = 60
+	isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/flask/gold
+	name = "captain's flask"
+	desc = "A gold flask belonging to the captain."
+	icon_state = "flask_gold"
+	custom_materials = list(/datum/material/gold=500)
+
+/obj/item/reagent_containers/cup/glass/flask/det
+	name = "detective's flask"
+	desc = "The detective's only true friend."
+	icon_state = "detflask"
+	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30)
+
+/obj/item/reagent_containers/cup/glass/britcup
+	name = "cup"
+	desc = "A cup with the british flag emblazoned on it."
+	icon_state = "britcup"
+	volume = 30
+	spillable = TRUE
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
similarity index 60%
rename from code/modules/food_and_drinks/drinks/drinks/bottle.dm
rename to code/modules/reagents/reagent_containers/cups/glassbottle.dm
index 7da7d67eaa45c..f8f00ac416a61 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -1,64 +1,61 @@
-
+#define BOTTLE_KNOCKDOWN_DEFAULT_DURATION (1.3 SECONDS)
 
 ///////////////////////////////////////////////Alchohol bottles! -Agouri //////////////////////////
 //Functionally identical to regular drinks. The only difference is that the default bottle size is 100. - Darem
 //Bottles now knockdown and break when smashed on people's heads. - Giacom
 
-/obj/item/reagent_containers/food/drinks/bottle
+/obj/item/reagent_containers/cup/glass/bottle
+	name = "glass bottle"
+	desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
+	icon_state = "glassbottle"
+	worn_icon_state = "bottle"
+	fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
+	custom_price = PAYCHECK_MEDIUM * 1.1
 	amount_per_transfer_from_this = 10
 	volume = 100
+	force = 15 //Smashing bottles over someone's head hurts.
 	throwforce = 15
 	item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
-	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
-	isGlass = TRUE
-	foodtype = ALCOHOL
+	var/broken_item_state = "broken_beer"
+	lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
+	drink_type = ALCOHOL
 	item_flags = ISWEAPON
 	///Directly relates to the 'knockdown' duration. Lowered by armor (i.e. helmets)
-	var/bottle_knockdown_duration = 1.3 SECONDS
+	var/bottle_knockdown_duration = BOTTLE_KNOCKDOWN_DEFAULT_DURATION
+
+/obj/item/reagent_containers/cup/glass/bottle/small
+	name = "small glass bottle"
+	desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
+	icon_state = "glassbottlesmall"
+	volume = 50
+	custom_price = PAYCHECK_MEDIUM * 0.9
 
-/obj/item/reagent_containers/food/drinks/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE)
-	//Creates a shattering noise and replaces the bottle with a broken_bottle
+/obj/item/reagent_containers/cup/glass/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE)
 	if(bartender_check(target) && ranged)
 		return
-	var/obj/item/broken_bottle/B = new (loc)
+	SplashReagents(target, ranged, override_spillable = TRUE)
+	var/obj/item/broken_bottle/B = new(loc)
 	if(!ranged && thrower)
 		thrower.put_in_hands(B)
-	B.icon_state = icon_state
-
-	var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
-	I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
-	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
-	B.icon = I
-
-	if(isGlass)
-		if(prob(33))
-			var/obj/item/shard/S = new(drop_location())
-			target.Bumped(S)
-		playsound(src, "shatter", 70, 1)
-	else
-		B.force = 0
-		B.throwforce = 0
-		B.desc = "A carton with the bottom half burst open. Might give you a papercut."
-	B.name = "broken [name]"
-	transfer_fingerprints_to(B)
+	B.mimic_broken(src, target)
 
 	qdel(src)
 	target.Bumped(B)
 
-/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
+/obj/item/reagent_containers/cup/glass/bottle/try_splash(mob/living/user, atom/target)
 
-	if(!target)
-		return
+	if(!target || !isliving(target))
+		return ..()
 
-	if(user.a_intent != INTENT_HARM || !isGlass)
+	if(!isGlass)
 		return ..()
 
 	if(HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm [target]!</span>")
-		return
+		return FALSE
 
-	force = 15 //Smashing bottles over someoen's head hurts.
+	var/mob/living/living_target = target
 
 	var/armor_block = 0 //Get the target's armor values for normal attack damage.
 	var/armor_duration = 0 //The more force the bottle has, the longer the duration.
@@ -71,34 +68,29 @@
 
 		var/mob/living/carbon/human/H = target
 		var/headarmor = 0 // Target's head armor
-		armor_block = H.run_armor_check(target_zone, MELEE,"","",armour_penetration) // For normal attack damage
+		armor_block = H.run_armor_check(target_zone, MELEE, "", "", armour_penetration) // For normal attack damage
 
 		//If they have a hat/helmet and the user is targeting their head.
 		if(istype(H.head, /obj/item/clothing/head) && target_zone == BODY_ZONE_HEAD)
-			headarmor = H.head.armor.melee
-		else
-			headarmor = 0
-
+			headarmor = H.head.get_armor_rating(MELEE)
 		//Calculate the knockdown duration for the target.
 		armor_duration = (bottle_knockdown_duration - headarmor) + force
 
 	else
 		//Only humans can have armor, right?
-		armor_block = target.run_armor_check(target_zone, MELEE)
+		armor_block = living_target.run_armor_check(target_zone, MELEE)
 		if(target_zone == BODY_ZONE_HEAD)
 			armor_duration = bottle_knockdown_duration + force
-
 	//Apply the damage!
 	armor_block = min(90,armor_block)
-	target.apply_damage(force, BRUTE, target_zone, armor_block)
+	living_target.apply_damage(force, BRUTE, target_zone, armor_block)
 
 	// You are going to knock someone down for longer if they are not wearing a helmet.
 	var/head_attack_message = ""
-	if(target_zone == BODY_ZONE_HEAD && istype(target, /mob/living/carbon/))
+	if(target_zone == BODY_ZONE_HEAD && iscarbon(target))
 		head_attack_message = " on the head"
-		//Knock down the target for the duration that we calculated and divide it by 5.
 		if(armor_duration)
-			target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN)
+			living_target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN)
 
 	//Display an attack message.
 	if(target != user)
@@ -111,13 +103,10 @@
 	//Attack logs
 	log_combat(user, target, "attacked", src)
 
-	//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
-	SplashReagents(target)
-
 	//Finally, smash the bottle. This kills (del) the bottle.
 	smash(target, user)
 
-	return
+	return TRUE
 
 //Keeping this here for now, I'll ask if I should keep it here.
 /obj/item/broken_bottle
@@ -130,7 +119,9 @@
 	throw_speed = 3
 	throw_range = 5
 	w_class = WEIGHT_CLASS_TINY
-	item_state = "beer"
+	item_state = "broken_beer"
+	lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi'
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb_continuous = list("stabs", "slashes", "attacks")
 	attack_verb_simple = list("stab", "slash", "attack")
@@ -140,121 +131,175 @@
 
 /obj/item/broken_bottle/Initialize(mapload)
 	. = ..()
+	AddComponent(/datum/component/caltrop, _min_damage = force)
 	AddComponent(/datum/component/butchering, 200, 55)
 
-/obj/item/reagent_containers/food/drinks/bottle/gin
+/// Mimics the appearance and properties of the passed in bottle.
+/// Takes the broken bottle to mimic, and the thing the bottle was broken agaisnt as args
+/obj/item/broken_bottle/proc/mimic_broken(obj/item/reagent_containers/cup/glass/to_mimic, atom/target)
+	icon_state = to_mimic.icon_state
+	var/icon/drink_icon = new('icons/obj/drinks.dmi', icon_state)
+	drink_icon.Blend(broken_outline, ICON_OVERLAY, rand(5), 1)
+	drink_icon.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
+	icon = drink_icon
+
+	if(istype(to_mimic, /obj/item/reagent_containers/cup/glass/bottle/juice))
+		force = 0
+		throwforce = 0
+		desc = "A carton with the bottom half burst open. Might give you a papercut."
+	else
+		if(prob(33))
+			var/obj/item/shard/stab_with = new(to_mimic.drop_location())
+			target.Bumped(stab_with)
+		playsound(src, "shatter", 70, TRUE)
+	name = "broken [to_mimic.name]"
+	to_mimic.transfer_fingerprints_to(src)
+
+/obj/item/reagent_containers/cup/glass/bottle/beer
+	name = "space beer"
+	desc = "Beer. In space."
+	icon_state = "beer"
+	volume = 30
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
+	drink_type = GRAIN | ALCOHOL
+	custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 1)
+
+/obj/item/reagent_containers/cup/glass/bottle/beer/syndicate
+	name = "syndicate beer"
+	desc = "Consumed only by the finest syndicate agents. There is a round warning label stating 'Don't drink more than one in quick succession!'"
+	icon_state = "syndicatebeer"
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 10, /datum/reagent/medicine/antitoxin = 20)
+
+/obj/item/reagent_containers/cup/glass/bottle/beer/light
+	name = "Carp Lite"
+	desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30)
+
+/obj/item/reagent_containers/cup/glass/bottle/ale
+	name = "Magm-Ale"
+	desc = "A true dorf's drink of choice."
+	icon_state = "alebottle"
+	volume = 30
+	list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
+	drink_type = GRAIN | ALCOHOL
+	custom_price = PAYCHECK_MEDIUM
+
+/obj/item/reagent_containers/cup/glass/bottle/gin
 	name = "Griffeater gin"
 	desc = "A bottle of high quality gin, produced in the New London Space Station."
 	icon_state = "ginbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/gin = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/whiskey
+/obj/item/reagent_containers/cup/glass/bottle/whiskey
 	name = "Uncle Git's special reserve"
 	desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
 	icon_state = "whiskeybottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/vodka
+/obj/item/reagent_containers/cup/glass/bottle/vodka
 	name = "Tunguska triple distilled"
 	desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
 	icon_state = "vodkabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
+/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka
 	name = "Badminka vodka"
 	desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
 	icon_state = "badminka"
 	list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/tequila
+/obj/item/reagent_containers/cup/glass/bottle/tequila
 	name = "Caccavo guaranteed quality tequila"
 	desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
 	icon_state = "tequilabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/tequila = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing
 	name = "bottle of nothing"
 	desc = "A bottle filled with nothing."
 	icon_state = "bottleofnothing"
 	list_reagents = list(/datum/reagent/consumable/nothing = 100)
-	foodtype = NONE
+	drink_type = NONE
 
-/obj/item/reagent_containers/food/drinks/bottle/patron
+/obj/item/reagent_containers/cup/glass/bottle/patron
 	name = "Wrapp Artiste Patron"
 	desc = "Silver laced tequila, served in space night clubs across the galaxy."
 	icon_state = "patronbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/rum
+/obj/item/reagent_containers/cup/glass/bottle/rum
 	name = "Captain Pete's Cuban spiced rum"
 	desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
 	icon_state = "rumbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/holywater
+/obj/item/reagent_containers/cup/glass/bottle/holywater
 	name = "flask of holy water"
 	desc = "A flask of the chaplain's holy water."
 	icon_state = "holyflask"
 	list_reagents = list(/datum/reagent/water/holywater = 100)
-	foodtype = NONE
+	drink_type = NONE
 
-/obj/item/reagent_containers/food/drinks/bottle/unholywater
+/obj/item/reagent_containers/cup/glass/bottle/unholywater
 	name = "flask of unholy water"
 	desc = "Toxic to nonbelievers, reinvigorating to the faithful."
 	icon_state = "holyflask"
 	list_reagents = list(/datum/reagent/fuel/unholywater = 100)
-	foodtype = NONE
+	drink_type = NONE
 
-/obj/item/reagent_containers/food/drinks/bottle/hellwater
+/obj/item/reagent_containers/cup/glass/bottle/hellwater
 	name = "flask of holy water?"
 	desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
-	icon_state = "holyflask"
 	list_reagents = list(/datum/reagent/hellwater = 100)
-	foodtype = NONE
 
-/obj/item/reagent_containers/food/drinks/bottle/vermouth
+/obj/item/reagent_containers/cup/glass/bottle/vermouth
 	name = "Goldeneye vermouth"
 	desc = "Sweet, sweet dryness~"
 	icon_state = "vermouthbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/kahlua
+/obj/item/reagent_containers/cup/glass/bottle/kahlua
 	name = "Robert Robust's coffee liqueur"
 	desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK."
 	icon_state = "kahluabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100)
-	foodtype = VEGETABLES
+	drink_type = VEGETABLES
 
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager
+/obj/item/reagent_containers/cup/glass/bottle/goldschlager
 	name = "College Girl goldschlager"
 	desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
 	icon_state = "goldschlagerbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/goldschlager = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/cognac
+/obj/item/reagent_containers/cup/glass/bottle/cognac
 	name = "Chateau de Baton premium cognac"
 	desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
 	icon_state = "cognacbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/wine
+/obj/item/reagent_containers/cup/glass/bottle/wine
 	name = "Doublebeard's bearded special wine"
 	desc = "A faint aura of unease and asspainery surrounds the bottle."
 	icon_state = "winebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100)
-	foodtype = FRUIT | ALCOHOL
+	drink_type = FRUIT | ALCOHOL
+
+//Vintage wine code goes here
 
-/obj/item/reagent_containers/food/drinks/bottle/absinthe
+/obj/item/reagent_containers/cup/glass/bottle/absinthe
 	name = "extra-strong absinthe"
-	desc = "An strong alcoholic drink brewed and distributed by"
+	desc = "A strong alcoholic drink brewed and distributed by"
 	icon_state = "absinthebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/Initialize(mapload)
 	. = ..()
 	redact()
 
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/proc/redact()
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/proc/redact()
 	// There was a large fight in the coderbus about a player reference
 	// in absinthe. Ergo, this is why the name generation is now so
 	// complicated. Judge us kindly.
@@ -268,9 +313,14 @@
 			fullname = "Ash and Asher"
 		if("Generic")
 			fullname = "Nanotrasen Cheap Imitations"
-	var/removals = list("\[REDACTED\]", "\[EXPLETIVE DELETED\]",
-		"\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]",
-		"\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]")
+	var/removals = list(
+		"\[REDACTED\]",
+		"\[EXPLETIVE DELETED\]",
+		"\[EXPUNGED\]",
+		"\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]",
+		"\[MOVE ALONG CITIZEN\]",
+		"\[NOTHING TO SEE HERE\]",
+	)
 	var/chance = 50
 
 	if(prob(chance))
@@ -289,41 +339,41 @@
 	desc = "[desc] [fullname] Inc."
 
 
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium
 	name = "Gwyn's premium absinthe"
 	desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs."
 	icon_state = "absinthepremium"
 
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium/redact()
+/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium/redact()
 	return
 
-/obj/item/reagent_containers/food/drinks/bottle/lizardwine
+/obj/item/reagent_containers/cup/glass/bottle/lizardwine
 	name = "bottle of lizard wine"
 	desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff."
 	icon_state = "lizardwine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100)
-	foodtype = FRUIT | ALCOHOL
+	drink_type = FRUIT | ALCOHOL
 
-/obj/item/reagent_containers/food/drinks/bottle/hcider
+/obj/item/reagent_containers/cup/glass/bottle/hcider
 	name = "Jian Hard Cider"
 	desc = "Apple juice for adults."
 	icon_state = "hcider"
 	volume = 50
 	list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50)
 
-/obj/item/reagent_containers/food/drinks/bottle/grappa
-	name = "Phillipes well-aged Grappa"
+/obj/item/reagent_containers/cup/glass/bottle/grappa
+	name = "Phillipe's well-aged Grappa"
 	desc = "Bottle of Grappa."
 	icon_state = "grappabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/sake
+/obj/item/reagent_containers/cup/glass/bottle/sake
 	name = "Ryo's traditional sake"
 	desc = "Sweet as can be, and burns like fire going down."
 	icon_state = "sakebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize(mapload)
+/obj/item/reagent_containers/cup/glass/bottle/sake/Initialize(mapload)
 	. = ..()
 	if(prob(10))
 		name = "Fluffy Tail Sake"
@@ -334,227 +384,142 @@
 		desc += " Awoo."
 		icon_state = "sakebottle_i"
 
-/obj/item/reagent_containers/food/drinks/bottle/fernet
+/obj/item/reagent_containers/cup/glass/bottle/fernet
 	name = "Fernet Bronca"
 	desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
 	icon_state = "fernetbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/beer
-	name = "Space Beer"
-	desc = "Beer. In space. In a bigger bottle."
-	icon_state = "beer"
-	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/ale
-	name = "Magm-Ale"
-	desc = "A true dorf's drink of choice, now in a MANLY bottle."
-	icon_state = "alebottle"
-	list_reagents = list(/datum/reagent/consumable/ethanol/ale = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/homemaderum
+/obj/item/reagent_containers/cup/glass/bottle/homemaderum
 	name = "Cookie's Homemade Rum"
 	desc = "Brewed all the way back on Space Station 3. Might tell you where those basket-hats of fruit keep coming from."
 	icon_state = "moonshinebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/rum = 95, /datum/reagent/drug/mushroomhallucinogen = 5)
 
-//////////////////////////JUICES AND STUFF ///////////////////////
-
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice
-	name = "orange juice"
-	desc = "Full of vitamins and deliciousness!"
-	custom_price = 10
-	icon_state = "orangejuice"
-	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	isGlass = FALSE
-	list_reagents = list(/datum/reagent/consumable/orangejuice = 100)
-	foodtype = FRUIT | BREAKFAST
-
-/obj/item/reagent_containers/food/drinks/bottle/cream
-	name = "milk cream"
-	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
-	custom_price = 10
-	icon_state = "cream"
-	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	isGlass = FALSE
-	list_reagents = list(/datum/reagent/consumable/cream = 100)
-	foodtype = DAIRY
-
-/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
-	name = "tomato juice"
-	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
-	custom_price = 10
-	icon_state = "tomatojuice"
-	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	isGlass = FALSE
-	list_reagents = list(/datum/reagent/consumable/tomatojuice = 100)
-	foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/drinks/bottle/limejuice
-	name = "lime juice"
-	desc = "Sweet-sour goodness."
-	custom_price = 10
-	icon_state = "limejuice"
-	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	isGlass = FALSE
-	list_reagents = list(/datum/reagent/consumable/limejuice = 100)
-	foodtype = FRUIT
-
-/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
-	name = "pineapple juice"
-	desc = "Extremely tart, yellow juice."
-	custom_price = 10
-	icon_state = "pineapplejuice"
-	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	isGlass = FALSE
-	list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100)
-	foodtype = FRUIT | PINEAPPLE
-
-/obj/item/reagent_containers/food/drinks/bottle/menthol
-	name = "menthol"
-	desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
-	custom_price = 10
-	icon_state = "mentholbox"
-	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	isGlass = FALSE
-	list_reagents = list(/datum/reagent/consumable/menthol = 100)
-
-/obj/item/reagent_containers/food/drinks/bottle/grenadine
+/obj/item/reagent_containers/cup/glass/bottle/grenadine
 	name = "Jester Grenadine"
 	desc = "Contains 0% real cherries!"
-	custom_price = 10
+	custom_price = PAYCHECK_MEDIUM
 	icon_state = "grenadine"
-	isGlass = TRUE
 	list_reagents = list(/datum/reagent/consumable/grenadine = 100)
-	foodtype = FRUIT
+	drink_type = FRUIT
 
-/obj/item/reagent_containers/food/drinks/bottle/synthflesh
+/obj/item/reagent_containers/cup/glass/bottle/synthflesh
 	name = "carton of synthflesh"
 	desc = "A No-Name carton of synthflesh. It seems moldy. And it seems that YOUR INCOMPETENT ASS IS THE ONLY FUCKING REASON THIS THING EVEN EXISTS!!!!"
-	custom_price = 10
 	icon_state = "synthflesh"
 	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
 	list_reagents = list(/datum/reagent/medicine/synthflesh = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/virusfood
+/obj/item/reagent_containers/cup/glass/bottle/virusfood
 	name = "carton of virus food"
 	desc = "A carton of ready-mixed virus food. Do not drink."
-	custom_price = 10
 	icon_state = "virusfood"
 	item_state = "carton"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
 	list_reagents = list(/datum/reagent/consumable/virus_food = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/applejack
+/obj/item/reagent_containers/cup/glass/bottle/applejack
 	name = "Buckin' Bronco's Applejack"
 	desc = "Kicks like a horse, tastes like an apple!"
-	custom_price = 10
+	custom_price = PAYCHECK_MEDIUM
 	icon_state = "applejack_bottle"
-	isGlass = TRUE
 	list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
-	foodtype = FRUIT
+	drink_type = FRUIT
 
-/obj/item/reagent_containers/food/drinks/bottle/champagne
+/obj/item/reagent_containers/cup/glass/bottle/champagne
 	name = "Eau d' Dandy Brut Champagne"
 	desc = "Finely sourced from only the most pretentious French vineyards."
-	custom_premium_price = 200
 	icon_state = "champagne_bottle"
-	isGlass = TRUE
+	base_icon_state = "champagne_bottle"
+	reagent_flags = TRANSPARENT
+	spillable = FALSE
 	list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/blazaam
+/obj/item/reagent_containers/cup/glass/bottle/blazaam
 	name = "Ginbad's Blazaam"
 	desc = "You feel like you should give the bottle a good rub before opening."
 	icon_state = "blazaambottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/trappist
+/obj/item/reagent_containers/cup/glass/bottle/trappist
 	name = "Mont de Requin Trappistes Bleu"
 	desc = "Brewed in space-Belgium. Fancy!"
-	custom_premium_price = 50
 	icon_state = "trappistbottle"
 	volume = 50
 	list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
 
-/obj/item/reagent_containers/food/drinks/bottle/hooch
+/obj/item/reagent_containers/cup/glass/bottle/hooch
 	name = "hooch bottle"
 	desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag."
 	icon_state = "hoochbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/moonshine
+/obj/item/reagent_containers/cup/glass/bottle/moonshine
 	name = "moonshine jug"
-	desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle."
+	desc = "It is said that the ancient Appalachians used these stoneware jugs to capture lightning in a bottle."
 	icon_state = "moonshinebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only.
+/obj/item/reagent_containers/cup/glass/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only.
 	name = "glass bottle"
 	desc = "This blank bottle is unyieldingly anonymous, offering no clues to it's contents."
 	icon_state = "glassbottle"
 	fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
 
-/obj/item/reagent_containers/food/drinks/bottle/blank/update_icon()
+/obj/item/reagent_containers/cup/glass/bottle/blank/update_icon()
 	..()
 	add_overlay("[initial(icon_state)]shine")
 
-/obj/item/reagent_containers/food/drinks/bottle/blank/small
+/obj/item/reagent_containers/cup/glass/bottle/blank/small
 	name = "small glass bottle"
 	desc = "This small bottle is unyieldingly anonymous, offering no clues to it's contents."
 	icon_state = "glassbottlesmall"
 	volume = 50
 
 ////////////////////////// MOLOTOV ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/molotov
+/obj/item/reagent_containers/cup/glass/bottle/molotov
 	name = "molotov cocktail"
 	desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss."
 	icon_state = "vodkabottle"
 	list_reagents = list()
-	var/list/accelerants = list(	/datum/reagent/consumable/ethanol, /datum/reagent/fuel, /datum/reagent/clf3, /datum/reagent/phlogiston,
-							/datum/reagent/napalm, /datum/reagent/hellwater, /datum/reagent/toxin/plasma, /datum/reagent/toxin/spore_burning)
-	var/active = 0
-
-/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list)
+	var/active = FALSE
+	var/list/accelerants = list(
+		/datum/reagent/consumable/ethanol,
+		/datum/reagent/fuel,
+		/datum/reagent/clf3,
+		/datum/reagent/phlogiston,
+		/datum/reagent/napalm,
+		/datum/reagent/hellwater,
+		/datum/reagent/toxin/plasma,
+		/datum/reagent/toxin/spore_burning
+	)
+
+/obj/item/reagent_containers/cup/glass/bottle/molotov/CheckParts(list/parts_list)
 	..()
-	var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
+	var/obj/item/reagent_containers/cup/glass/bottle/B = locate() in contents
 	if(B)
 		icon_state = B.icon_state
-		B.reagents.copy_to(src,100)
-		if(!B.isGlass)
+		B.reagents.copy_to(src, 100)
+		if(istype(B, /obj/item/reagent_containers/cup/glass/bottle/juice))
 			desc += " You're not sure if making this out of a carton was the brightest idea."
 			isGlass = FALSE
 	return
 
-/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/cup/glass/bottle/molotov/smash(atom/target, mob/thrower, ranged = FALSE)
 	var/firestarter = 0
-	for(var/datum/reagent/R in reagents.reagent_list)
-		for(var/A in accelerants)
-			if(istype(R,A))
+	for(var/datum/reagent/contained_reagent in reagents.reagent_list)
+		for(var/accelerant_type in accelerants)
+			if(istype(contained_reagent, accelerant_type))
 				firestarter = 1
 				break
 	if(firestarter && active)
-		hit_atom.fire_act()
-		new /obj/effect/hotspot(get_turf(hit_atom))
+		target.fire_act()
+		new /obj/effect/hotspot(get_turf(target))
 	..()
 
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/cup/glass/bottle/molotov/attackby(obj/item/I, mob/user, params)
 	if(I.is_hot() && !active)
 		active = TRUE
 		log_bomber(user, "has primed a", src, "for detonation")
@@ -562,25 +527,79 @@
 		to_chat(user, "<span class='info'>You light [src] on fire.</span>")
 		add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
 		if(!isGlass)
-			spawn(50)
-				if(active)
-					var/counter
-					var/target = src.loc
-					for(counter = 0, counter<2, counter++)
-						if(istype(target, /obj/item/storage))
-							var/obj/item/storage/S = target
-							target = S.loc
-					if(istype(target, /atom))
-						var/atom/A = target
-						SplashReagents(A)
-						A.fire_act()
-					qdel(src)
-
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user)
+			addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS)
+
+/obj/item/reagent_containers/cup/glass/bottle/molotov/proc/explode()
+	if(!active)
+		return
+	if(get_turf(src))
+		var/atom/target = loc
+		for(var/i in 1 to 2)
+			if(istype(target, /obj/item/storage))
+				target = target.loc
+		SplashReagents(target, override_spillable = TRUE)
+		target.fire_act()
+	qdel(src)
+
+/obj/item/reagent_containers/cup/glass/bottle/molotov/attack_self(mob/user)
 	if(active)
 		if(!isGlass)
 			to_chat(user, "<span class='danger'>The flame's spread too far on it!</span>")
 			return
 		to_chat(user, "<span class='info'>You snuff out the flame on [src].</span>")
 		cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
-		active = 0
+		active = FALSE
+		return
+	return ..()
+
+/**
+ * Cartons
+ * Subtype of glass that don't break, and share a common carton hand state.
+ * Meant to be a subtype for use in Molotovs
+ */
+/obj/item/reagent_containers/cup/glass/bottle/juice
+	custom_price = PAYCHECK_MEDIUM
+	item_state = "carton"
+	isGlass = FALSE
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice
+	name = "orange juice"
+	desc = "Full of vitamins and deliciousness!"
+	icon_state = "orangejuice"
+	list_reagents = list(/datum/reagent/consumable/orangejuice = 100)
+	drink_type = FRUIT | BREAKFAST
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream
+	name = "milk cream"
+	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
+	icon_state = "cream"
+	list_reagents = list(/datum/reagent/consumable/cream = 100)
+	drink_type = DAIRY
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice
+	name = "tomato juice"
+	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
+	icon_state = "tomatojuice"
+	list_reagents = list(/datum/reagent/consumable/tomatojuice = 100)
+	drink_type = VEGETABLES
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice
+	name = "lime juice"
+	desc = "Sweet-sour goodness."
+	icon_state = "limejuice"
+	list_reagents = list(/datum/reagent/consumable/limejuice = 100)
+	drink_type = FRUIT
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice
+	name = "pineapple juice"
+	desc = "Extremely tart, yellow juice."
+	icon_state = "pineapplejuice"
+	list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100)
+	drink_type = FRUIT | PINEAPPLE
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/menthol
+	name = "menthol"
+	desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
+	list_reagents = list(/datum/reagent/consumable/menthol = 100)
+
+#undef BOTTLE_KNOCKDOWN_DEFAULT_DURATION
diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm
new file mode 100644
index 0000000000000..d70f97dd16eb4
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/cups/soda.dm
@@ -0,0 +1,248 @@
+
+//////////////////////////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
+#define SODA_FIZZINESS_THROWN 15
+/// How much fizziness is added to the can of soda by shaking it, in percentage points
+#define SODA_FIZZINESS_SHAKE 5
+
+/obj/item/reagent_containers/cup/soda_cans
+	name = "soda can"
+	icon = 'icons/obj/drinks.dmi'
+	reagent_flags = NONE
+	spillable = FALSE
+	custom_price = PAYCHECK_MEDIUM * 0.9
+	obj_flags = CAN_BE_HIT
+	possible_transfer_amounts = list(5, 10, 15, 25, 30)
+	volume = 30
+	throwforce = 12 // set to 0 upon being opened. Have you ever been domed by a soda can? Those things fucking hurt
+	/// If the can hasn't been opened yet, this is the measure of how fizzed up it is from being shaken or thrown around. When opened, this is rolled as a percentage chance to burst
+	var/fizziness = 0
+
+/obj/item/reagent_containers/cup/soda_cans/random/Initialize(mapload)
+	..()
+	var/T = pick(subtypesof(/obj/item/reagent_containers/cup/soda_cans) - /obj/item/reagent_containers/cup/soda_cans/random)
+	new T(loc)
+	return INITIALIZE_HINT_QDEL
+
+/obj/item/reagent_containers/cup/soda_cans/suicide_act(mob/living/carbon/human/H)
+	if(!reagents.total_volume)
+		H.visible_message("<span class='warning'>[H] is trying to take a big sip from [src]... The can is empty!</span>")
+		return SHAME
+	if(!is_drainable())
+		open_soda()
+		sleep(10)
+	H.visible_message("<span class='suicide'>[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!</span>")
+	playsound(H,'sound/items/drink.ogg', 80, TRUE)
+	reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip
+	sleep(5)
+	H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old-fashioned singularity engines anymore."))
+	if(H.age >= 30)
+		H.Stun(50)
+		sleep(50)
+		playsound(H,'sound/items/drink.ogg', 80, TRUE)
+		H.say(pick("Another day, another dollar.", "I wonder if I should hold?", "Diversifying is for young'ns.", "Yeap, times were good back then."))
+		return MANUAL_SUICIDE_NONLETHAL
+	sleep(20) //dramatic pause
+	return TOXLOSS
+
+/obj/item/reagent_containers/cup/soda_cans/attack(mob/M, mob/user)
+	if(iscarbon(M) && !reagents.total_volume && user.a_intent == INTENT_HARM && user.is_zone_selected(BODY_ZONE_HEAD))
+		if(M == user)
+			user.visible_message("<span class='warning'>[user] crushes the can of [src] on [user.p_their()] forehead!</span>", "<span class='notice'>You crush the can of [src] on your forehead.</span>")
+		else
+			user.visible_message("<span class='warning'>[user] crushes the can of [src] on [M]'s forehead!</span>", "<span class='notice'>You crush the can of [src] on [M]'s forehead.</span>")
+		playsound(M,'sound/weapons/pierce.ogg', rand(10,50), TRUE)
+		var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(M.loc)
+		crushed_can.icon_state = icon_state
+		qdel(src)
+		return TRUE
+	return ..()
+
+/obj/item/reagent_containers/cup/soda_cans/bullet_act(obj/projectile/P)
+	. = ..()
+	if(!(P.nodamage) && P.damage_type == BRUTE && !QDELETED(src))
+		var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
+		crushed_can.icon_state = icon_state
+		var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
+		crushed_can.throw_at(throw_target, rand(1,2), 7)
+		qdel(src)
+		return
+
+/obj/item/reagent_containers/cup/soda_cans/proc/open_soda(mob/user)
+	if(prob(fizziness))
+		user.visible_message("<span class='danger'>[user] opens [src], and is suddenly sprayed by the fizzing contents!</span>", "<span class='danger'>You pull back the tab of [src], and are suddenly sprayed with a torrent of liquid! Ahhh!!</span>")
+		burst_soda(user)
+		return
+	to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
+	reagents.flags |= OPENCONTAINER
+	playsound(src, "can_open", 50, TRUE)
+	spillable = TRUE
+	throwforce = 0
+
+/**
+ * Burst the soda open on someone. Fun! Opens and empties the soda can, but does not crush it.
+ *
+ * Arguments:
+ * * target - Who's getting covered in soda
+ * * hide_message - Stops the generic fizzing message, so you can do your own
+ */
+/obj/item/reagent_containers/cup/soda_cans/proc/burst_soda(atom/target, hide_message = FALSE)
+	if(!target)
+		return
+
+	if(ismob(target))
+		var/mob/living/target_mob = target
+		SEND_SIGNAL(target_mob, COMSIG_ADD_MOOD_EVENT, "soda_spill", /datum/mood_event/soda_spill, src)
+		for(var/mob/living/iter_mob in view(src, 7))
+			if(iter_mob != target)
+				SEND_SIGNAL(iter_mob, COMSIG_ADD_MOOD_EVENT, "observed_soda_spill", /datum/mood_event/observed_soda_spill, target, src)
+
+	playsound(src, 'sound/effects/can_pop.ogg', 80, TRUE)
+	if(!hide_message)
+		visible_message("<span class='danger'>[src] spills over, fizzing its contents all over [target]!</span>")
+	spillable = TRUE
+	reagents.flags |= OPENCONTAINER
+	reagents.reaction(target, TOUCH)
+	reagents.clear_reagents()
+	throwforce = 0
+
+/obj/item/reagent_containers/cup/soda_cans/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+	. = ..()
+	if(. || spillable || !reagents.total_volume) // if it was caught, already opened, or has nothing in it
+		return
+
+	fizziness += SODA_FIZZINESS_THROWN
+	if(!prob(fizziness))
+		return
+
+	burst_soda(hit_atom, hide_message = TRUE)
+	visible_message("<span class='danger'>[src]'s impact with [hit_atom] causes it to rupture, spilling everywhere!</span>")
+	var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
+	crushed_can.icon_state = icon_state
+	moveToNullspace()
+	QDEL_IN(src, 1 SECONDS) // give it a second so it can still be logged for the throw impact
+
+/obj/item/reagent_containers/cup/soda_cans/attack_self(mob/user)
+	if(!is_drainable())
+		open_soda(user)
+		return
+	return ..()
+
+/obj/item/reagent_containers/cup/soda_cans/examine_more(mob/user)
+	. = ..()
+	if(!in_range(user, src))
+		return
+	if(fizziness > 30 && prob(fizziness * 2))
+		. += "<span class='notice'><i>You examine [src] closer, and note the following...</i></span>"
+		. += "\t["<span class='warning'>You get a menacing aura of fizziness from it...</span>"]"
+
+#undef SODA_FIZZINESS_THROWN
+#undef SODA_FIZZINESS_SHAKE
+
+/obj/item/reagent_containers/cup/soda_cans/cola
+	name = "Space Cola"
+	desc = "Cola. in space."
+	icon_state = "cola"
+	list_reagents = list(/datum/reagent/consumable/space_cola = 30)
+	drink_type = SUGAR
+
+/obj/item/reagent_containers/cup/soda_cans/tonic
+	name = "T-Borg's tonic water"
+	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+	icon_state = "tonic"
+	list_reagents = list(/datum/reagent/consumable/tonic = 50)
+	drink_type = ALCOHOL
+
+/obj/item/reagent_containers/cup/soda_cans/sodawater
+	name = "soda water"
+	desc = "A can of soda water. Why not make a scotch and soda?"
+	icon_state = "sodawater"
+	list_reagents = list(/datum/reagent/consumable/sodawater = 50)
+
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime
+	name = "orange soda"
+	desc = "You wanted ORANGE. It gave you Lemon Lime."
+	icon_state = "lemon-lime"
+	list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
+	drink_type = FRUIT
+
+/obj/item/reagent_containers/cup/soda_cans/lemon_lime/Initialize(mapload)
+	. = ..()
+	name = "lemon-lime soda"
+
+/obj/item/reagent_containers/cup/soda_cans/sol_dry
+	name = "Sol Dry"
+	desc = "Maybe this will help your tummy feel better. Maybe not."
+	icon_state = "sol_dry"
+	list_reagents = list(/datum/reagent/consumable/sol_dry = 30)
+	drink_type = SUGAR
+
+/obj/item/reagent_containers/cup/soda_cans/space_up
+	name = "Space-Up!"
+	desc = "Tastes like a hull breach in your mouth."
+	icon_state = "space-up"
+	list_reagents = list(/datum/reagent/consumable/space_up = 30)
+	drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/starkist
+	name = "Star-kist"
+	desc = "The taste of a star in liquid form. And, a bit of tuna...?"
+	icon_state = "starkist"
+	list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
+	drink_type = SUGAR | FRUIT | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind
+	name = "Space Mountain Wind"
+	desc = "Blows right through you like a space wind."
+	icon_state = "space_mountain_wind"
+	list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30)
+	drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/thirteenloko
+	name = "Thirteen Loko"
+	desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
+	icon_state = "thirteen_loko"
+	list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30)
+	drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/dr_gibb
+	name = "Dr. Gibb"
+	desc = "A delicious mixture of 42 different flavors."
+	icon_state = "dr_gibb"
+	list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
+	drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/pwr_game
+	name = "Pwr Game"
+	desc = "The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to."
+	icon_state = "purple_can"
+	list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
+
+/obj/item/reagent_containers/cup/soda_cans/shamblers
+	name = "Shambler's juice"
+	desc = "~Shake me up some of that Shambler's Juice!~"
+	icon_state = "shamblers"
+	list_reagents = list(/datum/reagent/consumable/shamblers = 30)
+	drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/grey_bull
+	name = "Grey Bull"
+	desc = "Grey Bull, it gives you gloves!"
+	icon_state = "energy_drink"
+	list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
+	drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/monkey_energy
+	name = "Monkey Energy"
+	desc = "Unleash the ape!"
+	icon_state = "monkey_energy"
+	item_state = "monkey_energy"
+	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
+	drink_type = SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/cup/soda_cans/air
+	name = "canned air"
+	desc = "There is no air shortage. Do not drink."
+	icon_state = "air"
+	list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 0221fce1e147f..fd1e798805540 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -268,7 +268,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/peppertank, 30)
 		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))
+	var/obj/item/reagent_containers/cup/glass/sillycup/S = new(get_turf(src))
 	user.put_in_hands(S)
 	paper_cups--
 
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 2243e49db7577..fed0d9be41574 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -7,7 +7,7 @@
 	id = "bucket"
 	build_type = AUTOLATHE | PROTOLATHE
 	materials = list(/datum/material/iron = 200)
-	build_path = /obj/item/reagent_containers/glass/bucket
+	build_path = /obj/item/reagent_containers/cup/bucket
 	category = list("initial","Tools","Tool Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
@@ -390,7 +390,7 @@
 	id = "bowl"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/glass = 500)
-	build_path = /obj/item/reagent_containers/glass/bowl
+	build_path = /obj/item/reagent_containers/cup/bowl
 	category = list("initial","Dinnerware")
 
 /datum/design/drinking_glass
@@ -398,7 +398,7 @@
 	id = "drinking_glass"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/glass = 500)
-	build_path = /obj/item/reagent_containers/food/drinks/drinkingglass
+	build_path = /obj/item/reagent_containers/cup/glass/drinkingglass
 	category = list("initial","Dinnerware")
 
 /datum/design/shot_glass
@@ -406,7 +406,7 @@
 	id = "shot_glass"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/glass = 100)
-	build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+	build_path = /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass
 	category = list("initial","Dinnerware")
 
 /datum/design/shaker
@@ -414,7 +414,7 @@
 	id = "shaker"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/iron = 1500)
-	build_path = /obj/item/reagent_containers/food/drinks/shaker
+	build_path = /obj/item/reagent_containers/cup/glass/shaker
 	category = list("initial","Dinnerware")
 
 /datum/design/cultivator
@@ -538,7 +538,7 @@
 	id = "beaker"
 	build_type = AUTOLATHE | PROTOLATHE
 	materials = list(/datum/material/glass = 500)
-	build_path = /obj/item/reagent_containers/glass/beaker
+	build_path = /obj/item/reagent_containers/cup/beaker
 	category = list("initial", "Medical", "Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE
 
@@ -547,7 +547,7 @@
 	id = "large_beaker"
 	build_type = AUTOLATHE | PROTOLATHE
 	materials = list(/datum/material/glass = 2500)
-	build_path = /obj/item/reagent_containers/glass/beaker/large
+	build_path = /obj/item/reagent_containers/cup/beaker/large
 	category = list("initial", "Medical", "Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE
 
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index f41cad1fba302..c2afe25e57c91 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -23,7 +23,7 @@
 	id = "milk_carton"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 100)
-	build_path = /obj/item/reagent_containers/food/condiment/milk
+	build_path = /obj/item/reagent_containers/condiment/milk
 	category = list("initial","Food")
 
 /datum/design/cream_carton
@@ -31,7 +31,7 @@
 	id = "cream_carton"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 300)
-	build_path = /obj/item/reagent_containers/food/drinks/bottle/cream
+	build_path = /obj/item/reagent_containers/cup/glass/bottle/juice/cream
 	category = list("initial","Food")
 
 /datum/design/black_pepper
@@ -47,7 +47,7 @@
 	id = "pepper_mill"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 50)
-	build_path = /obj/item/reagent_containers/food/condiment/peppermill
+	build_path = /obj/item/reagent_containers/condiment/peppermill
 	make_reagents = list()
 	category = list("initial","Food")
 
@@ -65,14 +65,14 @@
 	id = "flour_sack"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 150)
-	build_path = /obj/item/reagent_containers/food/condiment/flour
+	build_path = /obj/item/reagent_containers/condiment/flour
 	category = list("initial","Food")
 /datum/design/sugar_sack
 	name = "Sugar Sack"
 	id = "sugar_sack"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 200)
-	build_path = /obj/item/reagent_containers/food/condiment/sugar
+	build_path = /obj/item/reagent_containers/condiment/sugar
 	category = list("initial","Food")
 
 /datum/design/monkey_cube
@@ -88,7 +88,7 @@
 	id = "ez_nut"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 10)
-	build_path = /obj/item/reagent_containers/glass/bottle/nutrient/ez
+	build_path = /obj/item/reagent_containers/cup/bottle/nutrient/ez
 	category = list("initial","Botany Chemicals")
 
 /datum/design/l4z_nut
@@ -96,7 +96,7 @@
 	id = "l4z_nut"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 20)
-	build_path = /obj/item/reagent_containers/glass/bottle/nutrient/l4z
+	build_path = /obj/item/reagent_containers/cup/bottle/nutrient/l4z
 	category = list("initial","Botany Chemicals")
 
 /datum/design/rh_nut
@@ -104,7 +104,7 @@
 	id = "rh_nut"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 25)
-	build_path = /obj/item/reagent_containers/glass/bottle/nutrient/rh
+	build_path = /obj/item/reagent_containers/cup/bottle/nutrient/rh
 	category = list("initial","Botany Chemicals")
 
 /datum/design/weed_killer
@@ -112,7 +112,7 @@
 	id = "weed_killer"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 50)
-	build_path = /obj/item/reagent_containers/glass/bottle/killer/weedkiller
+	build_path = /obj/item/reagent_containers/cup/bottle/killer/weedkiller
 	category = list("initial","Botany Chemicals")
 
 /datum/design/pest_spray
@@ -120,7 +120,7 @@
 	id = "pest_spray"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 50)
-	build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller
+	build_path = /obj/item/reagent_containers/cup/bottle/killer/pestkiller
 	category = list("initial","Botany Chemicals")
 
 /datum/design/botany_bottle
@@ -128,7 +128,7 @@
 	id = "botany_bottle"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 5)
-	build_path = /obj/item/reagent_containers/glass/bottle/nutrient/empty
+	build_path = /obj/item/reagent_containers/cup/bottle/nutrient/empty
 	category = list("initial", "Botany Chemicals")
 
 /datum/design/cloth
@@ -216,7 +216,7 @@
 	id = "soy_milk_carton"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass = 100)
-	build_path = /obj/item/reagent_containers/food/condiment/soymilk
+	build_path = /obj/item/reagent_containers/condiment/soymilk
 	category = list("initial","Food")
 
 /datum/design/seaweed_sheet
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index fb92bc2cbda16..b204d1c7e712d 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -30,7 +30,7 @@
 	id = "bluespacebeaker"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/glass = 5000, /datum/material/plasma = 3000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000)
-	build_path = /obj/item/reagent_containers/glass/beaker/bluespace
+	build_path = /obj/item/reagent_containers/cup/beaker/bluespace
 	category = list("Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
 
@@ -40,7 +40,7 @@
 	id = "splitbeaker"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/iron = 3000)
-	build_path = /obj/item/reagent_containers/glass/beaker/noreact
+	build_path = /obj/item/reagent_containers/cup/beaker/noreact
 	category = list("Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
@@ -50,7 +50,7 @@
 	build_type = PROTOLATHE
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 	materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000)
-	build_path = /obj/item/reagent_containers/glass/beaker/plastic
+	build_path = /obj/item/reagent_containers/cup/beaker/plastic
 	category = list("Medical Designs")
 
 /datum/design/meta_beaker
@@ -59,7 +59,7 @@
 	build_type = PROTOLATHE
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 	materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000, /datum/material/gold = 1000, /datum/material/titanium = 1000)
-	build_path = /obj/item/reagent_containers/glass/beaker/meta
+	build_path = /obj/item/reagent_containers/cup/beaker/meta
 	category = list("Medical Designs")
 
 /datum/design/blood_pack
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 29346083d02dc..a462f5d0cdb6f 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -275,7 +275,7 @@
 	efficiency_coeff = 1
 	if(reagents)		//If reagents/materials aren't initialized, don't bother, we'll be doing this again after reagents init anyways.
 		reagents.maximum_volume = 0
-		for(var/obj/item/reagent_containers/glass/G in component_parts)
+		for(var/obj/item/reagent_containers/cup/G in component_parts)
 			reagents.maximum_volume += G.volume
 			G.reagents.trans_to(src, G.reagents.total_volume)
 	if(materials)
@@ -294,7 +294,7 @@
 
 //we eject the materials upon deconstruction.
 /obj/machinery/rnd/production/on_deconstruction()
-	for(var/obj/item/reagent_containers/glass/G in component_parts)
+	for(var/obj/item/reagent_containers/cup/G in component_parts)
 		reagents.trans_to(G, G.reagents.maximum_volume)
 	return ..()
 
diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm
index ab787839b0cb7..2eb76203360ba 100644
--- a/code/modules/research/xenobiology/crossbreeding/_structures.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm
@@ -476,10 +476,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cerulean_slime_crystal)
 	if(blood_amt < 10)
 		return ..()
 
-	if(!istype(I, /obj/item/reagent_containers/glass/beaker))
+	if(!istype(I, /obj/item/reagent_containers/cup/beaker))
 		return ..()
 
-	var/obj/item/reagent_containers/glass/beaker/item_beaker = I
+	var/obj/item/reagent_containers/cup/beaker/item_beaker = I
 
 	if(!item_beaker.is_refillable() || (item_beaker.reagents.total_volume + 10 > item_beaker.reagents.maximum_volume))
 		return ..()
diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
index df939dd57e34c..0ba4f2b5d30fa 100644
--- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm
+++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
@@ -17,7 +17,7 @@
 					/obj/item/grenade/chem_grenade/pyro = 5,
 					/obj/item/grenade/chem_grenade/cryo = 5,
 					/obj/item/grenade/chem_grenade/adv_release = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/holywater = 1)
+					/obj/item/reagent_containers/cup/glass/bottle/holywater = 1)
 	product_slogans = "It's not pyromania if you're getting paid!;You smell that? Plasma, son. Nothing else in the world smells like that.;I love the smell of Plasma in the morning."
 	resistance_flags = FIRE_PROOF
 
diff --git a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm
index 9ae0a323336fa..06d4cdba82252 100644
--- a/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm
+++ b/code/modules/shuttle/super_cruise/orbital_poi_generator/ruin_generator/mapping.dm
@@ -52,14 +52,14 @@
 		/obj/item/reagent_containers/medspray/sterilizine = 1,
 		/obj/item/reagent_containers/medspray/silver_sulf = 1,
 		/obj/item/reagent_containers/medspray/styptic = 1,
-		/obj/item/reagent_containers/food/drinks/bottle/synthflesh = 1,
+		/obj/item/reagent_containers/cup/glass/bottle/synthflesh = 1,
 		/obj/item/clothing/glasses/hud/health/sunglasses = 1,
 		/obj/item/surgical_drapes = 1,
 		/obj/item/stack/medical/bruise_pack = 1,
 		/obj/item/stack/medical/ointment = 1,
 		/obj/item/stack/medical/gauze = 1,
-		/obj/item/reagent_containers/glass/bottle/epinephrine = 1,
-		/obj/item/reagent_containers/glass/bottle/charcoal = 1,
+		/obj/item/reagent_containers/cup/bottle/epinephrine = 1,
+		/obj/item/reagent_containers/cup/bottle/charcoal = 1,
 		/obj/item/storage/pill_bottle/floorpill/full = 1,
 		/obj/item/storage/pill_bottle/antirad = 1,
 		/obj/item/clothing/neck/stethoscope = 1,
@@ -139,8 +139,8 @@
 		/obj/item/clothing/suit/armor/vest = 2,
 		/obj/item/clothing/suit/armor/bulletproof = 1,
 		/obj/item/storage/secure/briefcase = 1,
-		/obj/item/reagent_containers/glass/rag = 1,
-		/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1,
+		/obj/item/reagent_containers/cup/rag = 1,
+		/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1,
 		/obj/item/grenade/flashbang = 2,
 		/obj/item/grenade/chem_grenade/teargas = 1,
 		/obj/item/reagent_containers/peppercloud_deployer = 1,
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index e7eb5897f2d0e..1706046bbeed9 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -2379,7 +2379,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
 	name = "Spanish Flu Culture"
 	desc = "A bottle of cursed blood, full of angry spirits which will burn all the heretics with the fires of hell. \
 			At least, that's what the label says"
-	item = /obj/item/reagent_containers/glass/bottle/fluspanish
+	item = /obj/item/reagent_containers/cup/bottle/fluspanish
 	cost = 12
 	restricted_roles = list(JOB_NAME_CHAPLAIN, JOB_NAME_VIROLOGIST)
 
@@ -2387,7 +2387,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
 	name = "Retrovirus Culture Bottle"
 	desc = "A bottle of contagious DNA bugs, which will manually rearrange the DNA of hosts. \
 			At least, that's what the label says."
-	item = /obj/item/reagent_containers/glass/bottle/retrovirus
+	item = /obj/item/reagent_containers/cup/bottle/retrovirus
 	cost = 12
 	restricted_roles = list(JOB_NAME_VIROLOGIST, JOB_NAME_GENETICIST)
 
@@ -2395,7 +2395,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
 	name = "Anxiety Culture Bottle"
 	desc = "A bottle of contagious anxiety-inducing virus. \
 			At least, that's what the label says"
-	item = /obj/item/reagent_containers/glass/bottle/anxiety
+	item = /obj/item/reagent_containers/cup/bottle/anxiety
 	cost = 4
 	restricted_roles = list(JOB_NAME_VIROLOGIST)
 
@@ -2576,7 +2576,7 @@ GLOBAL_LIST_INIT(illegal_tech_blacklist, typecacheof(list(
 	name = "Syndicate Beer"
 	desc = "Syndicate brand 'beer' designed to flush toxins out of your system. \
 			Warning: Do not consume more than one!"
-	item = /obj/item/reagent_containers/food/drinks/syndicatebeer
+	item = /obj/item/reagent_containers/cup/glass/bottle/beer/syndicate
 	cost = 4
 	illegal_tech = FALSE
 
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 0016925aeb80c..2238d3280d9d2 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -3,43 +3,43 @@
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
 	icon_state = "boozeomat"
 	icon_deny = "boozeomat-deny"
-	products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
-					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
-					/obj/item/reagent_containers/food/drinks/flask = 3,
-					/obj/item/reagent_containers/food/drinks/ice = 10,
-					/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
-					/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
-					/obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
-					/obj/item/reagent_containers/food/drinks/bottle/cream = 4,
-					/obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,
-					/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
-					/obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15,
-					/obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
-					/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
-					/obj/item/reagent_containers/food/drinks/ale = 6,
-					/obj/item/reagent_containers/food/drinks/beer = 6,
-					/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/vodka = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/vermouth = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/rum = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/wine = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/cognac = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/kahlua = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/hcider = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/sake = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/applejack = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/blank = 15,
-					/obj/item/reagent_containers/food/drinks/bottle/blank/small = 15
+	products = list(/obj/item/reagent_containers/cup/glass/drinkingglass = 30,
+					/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12,
+					/obj/item/reagent_containers/cup/glass/flask = 3,
+					/obj/item/reagent_containers/cup/glass/ice = 10,
+					/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4,
+					/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4,
+					/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4,
+					/obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4,
+					/obj/item/reagent_containers/cup/soda_cans/cola = 8,
+					/obj/item/reagent_containers/cup/soda_cans/tonic = 8,
+					/obj/item/reagent_containers/cup/soda_cans/sodawater = 15,
+					/obj/item/reagent_containers/cup/glass/bottle/grenadine = 4,
+					/obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4,
+					/obj/item/reagent_containers/cup/glass/bottle/ale = 6,
+					/obj/item/reagent_containers/cup/glass/bottle/beer = 6,
+					/obj/item/reagent_containers/cup/glass/bottle/gin = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/whiskey = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/tequila = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/vodka = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/vermouth = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/rum = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/wine = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/cognac = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/kahlua = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/hcider = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/absinthe = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/grappa = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/sake = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/applejack = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/blank = 15,
+					/obj/item/reagent_containers/cup/glass/bottle/blank/small = 15
 					)
-	contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12,
-					/obj/item/reagent_containers/food/drinks/bottle/fernet = 5)
-	premium = list(/obj/item/reagent_containers/glass/bottle/ethanol = 4,
-					/obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
-					/obj/item/reagent_containers/food/drinks/bottle/trappist = 5)
+	contraband = list(/obj/item/reagent_containers/cup/glass/mug/tea = 12,
+					/obj/item/reagent_containers/cup/glass/bottle/fernet = 5)
+	premium = list(/obj/item/reagent_containers/cup/bottle/ethanol = 4,
+					/obj/item/reagent_containers/cup/glass/bottle/champagne = 5,
+					/obj/item/reagent_containers/cup/glass/bottle/trappist = 5)
 
 	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
 	product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
@@ -63,24 +63,24 @@
 
 /obj/machinery/vending/boozeomat/maint //abandoned bar on randomaints usually
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This one is kinda run down, almost forgotten down here..."
-	products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
-			/obj/item/reagent_containers/food/drinks/bottle/absinthe = 1,
-			/obj/item/reagent_containers/food/drinks/bottle/limejuice = 1,
-			/obj/item/reagent_containers/food/drinks/bottle/cream = 1,
-			/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1,
-			/obj/item/reagent_containers/food/drinks/drinkingglass = 10,
-			/obj/item/reagent_containers/food/drinks/ice = 3,
-			/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6,
-			/obj/item/reagent_containers/food/drinks/flask = 1)
+	products = list(/obj/item/reagent_containers/cup/glass/bottle/whiskey = 1,
+			/obj/item/reagent_containers/cup/glass/bottle/absinthe = 1,
+			/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 1,
+			/obj/item/reagent_containers/cup/glass/bottle/juice/cream = 1,
+			/obj/item/reagent_containers/cup/soda_cans/tonic = 1,
+			/obj/item/reagent_containers/cup/glass/drinkingglass = 10,
+			/obj/item/reagent_containers/cup/glass/ice = 3,
+			/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 6,
+			/obj/item/reagent_containers/cup/glass/flask = 1)
 	req_access = null
 
 /obj/machinery/vending/boozeomat/captain//Captain's quarters variant
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This one has less items, yet more fit for a captain."
-	products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1,
-					/obj/item/reagent_containers/food/drinks/bottle/wine = 1,
-					/obj/item/reagent_containers/food/drinks/ale = 1,
-					/obj/item/reagent_containers/food/drinks/drinkingglass = 6,
-					/obj/item/reagent_containers/food/drinks/ice = 1,
-					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
+	products = list(/obj/item/reagent_containers/cup/glass/bottle/rum = 1,
+					/obj/item/reagent_containers/cup/glass/bottle/wine = 1,
+					/obj/item/reagent_containers/cup/glass/bottle/ale = 1,
+					/obj/item/reagent_containers/cup/glass/drinkingglass = 6,
+					/obj/item/reagent_containers/cup/glass/ice = 1,
+					/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 4);
 	req_access = list(ACCESS_CAPTAIN)
 
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index b02d84427ae75..6020237fba089 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -4,11 +4,11 @@
 	product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
 	icon_state = "coffee"
 	icon_vend = "coffee-vend"
-	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/cocoa = 3,
-					/obj/item/reagent_containers/food/drinks/bubble_tea = 4)
-	contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
+	products = list(/obj/item/reagent_containers/cup/glass/coffee = 6,
+					/obj/item/reagent_containers/cup/glass/mug/tea = 6,
+					/obj/item/reagent_containers/cup/glass/mug/cocoa = 3,
+					/obj/item/reagent_containers/cup/glass/bubble_tea = 4)
+	contraband = list(/obj/item/reagent_containers/cup/glass/ice = 12)
 	refill_canister = /obj/item/vending_refill/coffee
 	default_price = 10
 	extra_price = 25
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 46b0afdf71c31..b1957e387f4c1 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -5,20 +5,20 @@
 	icon_state = "Cola_Machine"
 	product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
 	product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
-	products = list(/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
-					/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
-					/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
-					/obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
-					/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
-					/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
-					/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
-					/obj/item/reagent_containers/glass/waterbottle = 10)
-	contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
-						/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
-	premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
-		           /obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
-		           /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1,
-		           /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1)
+	products = list(/obj/item/reagent_containers/cup/soda_cans/cola = 10,
+					/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
+					/obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
+					/obj/item/reagent_containers/cup/soda_cans/starkist = 10,
+					/obj/item/reagent_containers/cup/soda_cans/space_up = 10,
+					/obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
+					/obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
+					/obj/item/reagent_containers/cup/glass/waterbottle = 10)
+	contraband = list(/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6,
+						/obj/item/reagent_containers/cup/soda_cans/shamblers = 6)
+	premium = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
+		           /obj/item/reagent_containers/cup/soda_cans/air = 1,
+		           /obj/item/reagent_containers/cup/soda_cans/monkey_energy = 1,
+		           /obj/item/reagent_containers/cup/soda_cans/grey_bull = 1)
 	refill_canister = /obj/item/vending_refill/cola
 	default_price = 5
 	extra_price = 60
@@ -80,14 +80,14 @@
 	desc = "~Shake me up some of that Shambler's Juice!~"
 	icon_state = "shamblers_juice"
 	products = list(
-		/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10
+		/obj/item/reagent_containers/cup/soda_cans/cola = 10,
+		/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
+		/obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
+		/obj/item/reagent_containers/cup/soda_cans/starkist = 10,
+		/obj/item/reagent_containers/cup/soda_cans/space_up = 10,
+		/obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
+		/obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
+		/obj/item/reagent_containers/cup/soda_cans/shamblers = 10
 		)
 	product_slogans = "~Shake me up some of that Shambler's Juice!~"
 	product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp."
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 287b36fd3e716..f534dbc99f6ed 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -5,14 +5,14 @@
 	icon_state = "dinnerware"
 	products = list(
 		/obj/item/storage/bag/tray = 8,
-		/obj/item/reagent_containers/glass/bowl = 20,
+		/obj/item/reagent_containers/cup/bowl = 20,
 		/obj/item/kitchen/fork = 6,
-		/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
-		/obj/item/reagent_containers/food/condiment/pack/ketchup = 5,
-		/obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
-		/obj/item/reagent_containers/food/condiment/pack/astrotame = 5,
-		/obj/item/reagent_containers/food/condiment/saltshaker = 5,
-		/obj/item/reagent_containers/food/condiment/peppermill = 5,
+		/obj/item/reagent_containers/cup/glass/drinkingglass = 8,
+		/obj/item/reagent_containers/condiment/pack/ketchup = 5,
+		/obj/item/reagent_containers/condiment/pack/hotsauce = 5,
+		/obj/item/reagent_containers/condiment/pack/astrotame = 5,
+		/obj/item/reagent_containers/condiment/saltshaker = 5,
+		/obj/item/reagent_containers/condiment/peppermill = 5,
 		/obj/item/clothing/suit/apron/chef = 2,
 		/obj/item/kitchen/rollingpin = 2,
 		/obj/item/knife/kitchen = 2,
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 9175f244939b7..fe317ec612061 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -8,7 +8,7 @@
 	products = list(/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light
 					/obj/item/food/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
 					/obj/item/food/fries = 5, //Whose broad stripes and bright stars through the perilous fight
-					/obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
+					/obj/item/reagent_containers/cup/glass/bottle/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
 					/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
 					/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
 					/obj/item/gun/ballistic/automatic/pistol/m1911 = 2,
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
index 8cc38fc040920..7392cebfe599b 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -13,7 +13,7 @@
 					/obj/item/clothing/suit/wizrobe/yellow = 1,
 					/obj/item/clothing/shoes/sandal/magic = 1,
 					/obj/item/staff = 2)
-	contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1)	//No one can get to the machine to hack it anyways; for the lulz - Microwave
+	contraband = list(/obj/item/reagent_containers/cup/bottle/wizarditis = 1)	//No one can get to the machine to hack it anyways; for the lulz - Microwave
 	armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50, STAMINA = 0, BLEED = 0)
 	resistance_flags = FIRE_PROOF
 	default_price = 25
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 4931af82685c1..f8ba4d5332202 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -9,22 +9,22 @@
 					/obj/item/reagent_containers/dropper = 3,
 					/obj/item/reagent_containers/medspray = 6,
 					/obj/item/storage/pill_bottle = 6,
-					/obj/item/reagent_containers/glass/bottle = 10,
+					/obj/item/reagent_containers/cup/bottle = 10,
 					/obj/item/reagent_containers/spray/cleaner = 1,
 					/obj/item/stack/medical/gauze = 8,
 					/obj/item/reagent_containers/hypospray/medipen = 8,
 					/obj/item/reagent_containers/hypospray/medipen/dexalin = 8,
-					/obj/item/reagent_containers/glass/bottle/epinephrine = 4,
-					/obj/item/reagent_containers/glass/bottle/charcoal = 4,
-					/obj/item/reagent_containers/glass/bottle/salglu_solution = 4,
-					/obj/item/reagent_containers/glass/bottle/tricordrazine = 1,
-					/obj/item/reagent_containers/glass/bottle/spaceacillin = 1,
-					/obj/item/reagent_containers/glass/bottle/morphine = 2,
-					/obj/item/reagent_containers/glass/bottle/toxin = 4,
+					/obj/item/reagent_containers/cup/bottle/epinephrine = 4,
+					/obj/item/reagent_containers/cup/bottle/charcoal = 4,
+					/obj/item/reagent_containers/cup/bottle/salglu_solution = 4,
+					/obj/item/reagent_containers/cup/bottle/tricordrazine = 1,
+					/obj/item/reagent_containers/cup/bottle/spaceacillin = 1,
+					/obj/item/reagent_containers/cup/bottle/morphine = 2,
+					/obj/item/reagent_containers/cup/bottle/toxin = 4,
 					/obj/item/reagent_containers/medspray/sterilizine = 4)
-	contraband = list(/obj/item/reagent_containers/glass/bottle/chloralhydrate = 1,
+	contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1,
 						/obj/item/storage/box/hug/medical = 1,
-						/obj/item/reagent_containers/glass/bottle/random_virus = 1)
+						/obj/item/reagent_containers/cup/bottle/random_virus = 1)
 	premium = list(/obj/item/storage/firstaid/regular = 3,
 				   /obj/item/storage/belt/medical = 3,
 				   /obj/item/sensor_device = 2,
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 45d13c763715e..aaa9597a4b248 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -8,11 +8,11 @@
 					/obj/item/stack/medical/gauze = 4,
 					/obj/item/reagent_containers/hypospray/medipen = 3,
 					/obj/item/reagent_containers/hypospray/medipen/dexalin = 3,
-					/obj/item/reagent_containers/glass/bottle/epinephrine = 2,
-					/obj/item/reagent_containers/glass/bottle/charcoal = 2,
+					/obj/item/reagent_containers/cup/bottle/epinephrine = 2,
+					/obj/item/reagent_containers/cup/bottle/charcoal = 2,
 					/obj/item/reagent_containers/medspray/sterilizine = 3)
-	contraband = list(/obj/item/reagent_containers/glass/bottle/toxin = 1,
-						/obj/item/reagent_containers/glass/bottle/morphine = 1)
+	contraband = list(/obj/item/reagent_containers/cup/bottle/toxin = 1,
+						/obj/item/reagent_containers/cup/bottle/morphine = 1)
 	armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50, STAMINA = 0, BLEED = 0)
 	resistance_flags = FIRE_PROOF
 	refill_canister = /obj/item/vending_refill/wallmed
diff --git a/code/modules/vending/mining.dm b/code/modules/vending/mining.dm
index 34f54180393da..80ae04361ab79 100644
--- a/code/modules/vending/mining.dm
+++ b/code/modules/vending/mining.dm
@@ -7,8 +7,8 @@
 	products = list(/obj/item/food/donkpocket/warm = 8,
 					/obj/item/food/salad/herbsalad = 6,
 					/obj/item/food/canned/beans = 4,
-					/obj/item/reagent_containers/glass/waterbottle/large = 10)
-	contraband = list(/obj/item/reagent_containers/food/drinks/coffee = 10,
+					/obj/item/reagent_containers/cup/glass/waterbottle/large = 10)
+	contraband = list(/obj/item/reagent_containers/cup/glass/coffee = 10,
 						/obj/item/food/chips = 6,
 						/obj/item/food/icecreamsandwich = 6)
 	refill_canister = /obj/item/vending_refill/mining
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 2c4ab4845f433..9856eb5036c4a 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -6,17 +6,17 @@
 	icon_state = "nutri"
 	icon_deny = "nutri-deny"
 	light_mask = "nutri-light-mask"
-	products = list(/obj/item/reagent_containers/glass/bottle/nutrient/ez = 30,
-					/obj/item/reagent_containers/glass/bottle/nutrient/l4z = 20,
-					/obj/item/reagent_containers/glass/bottle/nutrient/rh = 10,
+	products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez = 30,
+					/obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20,
+					/obj/item/reagent_containers/cup/bottle/nutrient/rh = 10,
 					/obj/item/reagent_containers/spray/pestspray = 20,
 					/obj/item/reagent_containers/syringe = 5,
 					/obj/item/storage/bag/plants = 5,
 					/obj/item/cultivator = 3,
 					/obj/item/shovel/spade = 3,
 					/obj/item/plant_analyzer = 4)
-	contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
-						/obj/item/reagent_containers/glass/bottle/diethylamine = 5)
+	contraband = list(/obj/item/reagent_containers/cup/bottle/ammonia = 10,
+						/obj/item/reagent_containers/cup/bottle/diethylamine = 5)
 	refill_canister = /obj/item/vending_refill/hydronutrients
 	default_price = 10
 	extra_price = 50
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 319dccb0ec710..d34c56945c970 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -11,7 +11,7 @@
 					/obj/item/food/chips = 6,
 					/obj/item/food/sosjerky = 6,
 					/obj/item/food/no_raisin = 6,
-					/obj/item/reagent_containers/food/drinks/dry_ramen = 3,
+					/obj/item/reagent_containers/cup/glass/dry_ramen = 3,
 					/obj/item/food/energybar = 6)
 	contraband = list(/obj/item/food/syndicake = 6,
 					/obj/item/food/swirl_lollipop = 2)
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index 92c59260c1184..f38b9eba0fc88 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -4,8 +4,8 @@
 	icon_state = "sovietsoda"
 	light_mask = "soviet-light-mask"
 	product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
-	products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30)
-	contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20)
+	products = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda = 30)
+	contraband = list(/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola = 20)
 	refill_canister = /obj/item/vending_refill/sovietsoda
 	resistance_flags = FIRE_PROOF
 	default_price = 1
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index 8bbc0b17b5f47..b66068ab0d050 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -6,10 +6,10 @@
 	icon_state = "sustenance"
 	light_mask = "snack-light-mask"
 	products = list(/obj/item/food/tofu/prison = 24,
-					/obj/item/reagent_containers/food/drinks/ice/prison = 12,
+					/obj/item/reagent_containers/cup/glass/ice/prison = 12,
 					/obj/item/food/candy_corn/prison = 6)
 	contraband = list(/obj/item/knife/kitchen = 6,
-						/obj/item/reagent_containers/food/drinks/coffee = 12,
+						/obj/item/reagent_containers/cup/glass/coffee = 12,
 						/obj/item/tank/internals/emergency_oxygen = 6,
 						/obj/item/clothing/mask/breath = 6)
 	refill_canister = /obj/item/vending_refill/sustenance
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 1e810e04b5928..c1cfd17d79391 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -310,7 +310,7 @@
 		/obj/item/clothing/suit/apron/purple_bartender = 2,
 		/obj/item/clothing/head/soft/black = 2,
 		/obj/item/clothing/shoes/sneakers/black = 2,
-		/obj/item/reagent_containers/glass/rag = 2,
+		/obj/item/reagent_containers/cup/rag = 2,
 		/obj/item/storage/box/beanbag = 1,
 		/obj/item/clothing/suit/armor/vest/alt = 1,
 		/obj/item/circuitboard/machine/dish_drive = 1,
@@ -348,7 +348,7 @@
 					/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
 					/obj/item/clothing/under/rank/civilian/altchef = 1,
 					/obj/item/clothing/head/utility/chefhat = 3,
-					/obj/item/reagent_containers/glass/rag = 1,
+					/obj/item/reagent_containers/cup/rag = 1,
 					/obj/item/clothing/suit/hooded/wintercoat = 2)
 	refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
 	dept_req_for_free = ACCOUNT_SRV_BITFLAG
@@ -547,23 +547,25 @@
 	icon_state = "detdrobe"
 	product_ads = "Apply your brilliant deductive methods in style!"
 	vend_reply = "Thank you for using the DetDrobe!"
-	products = list(/obj/item/clothing/under/rank/security/detective = 2,
-					/obj/item/clothing/under/rank/security/detective/skirt = 2,
-					/obj/item/clothing/shoes/sneakers/brown = 2,
-					/obj/item/clothing/suit/jacket/det_suit = 2,
-					/obj/item/clothing/suit/hooded/wintercoat/detective = 2,
-					/obj/item/clothing/head/fedora/det_hat = 2,
-					/obj/item/clothing/under/rank/security/detective/grey = 2,
-					/obj/item/clothing/under/rank/security/detective/grey/skirt = 2,
-					/obj/item/clothing/accessory/waistcoat = 2,
-					/obj/item/clothing/shoes/laceup = 2,
-					/obj/item/clothing/suit/jacket/det_suit/dark = 1,
-					/obj/item/clothing/suit/jacket/det_suit/noir = 1,
-					/obj/item/clothing/head/fedora/det_hat/noir = 2,
-					/obj/item/clothing/gloves/color/black = 2,
-					/obj/item/clothing/gloves/color/latex = 2,
-					/obj/item/reagent_containers/food/drinks/flask/det = 2,
-					/obj/item/storage/fancy/cigarettes = 5)
+	products = list(
+		/obj/item/clothing/under/rank/security/detective = 2,
+		/obj/item/clothing/under/rank/security/detective/skirt = 2,
+		/obj/item/clothing/shoes/sneakers/brown = 2,
+		/obj/item/clothing/suit/jacket/det_suit = 2,
+		/obj/item/clothing/suit/hooded/wintercoat/detective = 2,
+		/obj/item/clothing/head/fedora/det_hat = 2,
+		/obj/item/clothing/under/rank/security/detective/grey = 2,
+		/obj/item/clothing/under/rank/security/detective/grey/skirt = 2,
+		/obj/item/clothing/accessory/waistcoat = 2,
+		/obj/item/clothing/shoes/laceup = 2,
+		/obj/item/clothing/suit/jacket/det_suit/dark = 1,
+		/obj/item/clothing/suit/jacket/det_suit/noir = 1,
+		/obj/item/clothing/head/fedora/det_hat/noir = 2,
+		/obj/item/clothing/gloves/color/black = 2,
+		/obj/item/clothing/gloves/color/latex = 2,
+		/obj/item/reagent_containers/cup/glass/flask/det = 2,
+		/obj/item/storage/fancy/cigarettes = 5
+	)
 	premium = list(/obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/armor/vest/det_suit = 1)
 	refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe
 	extra_price = 350
diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm
index 3495bb2a7b839..9d40bb6204c60 100644
--- a/code/modules/wiremod/core/component_printer.dm
+++ b/code/modules/wiremod/core/component_printer.dm
@@ -45,7 +45,7 @@
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 2,
 		/obj/item/stock_parts/manipulator = 2,
-		/obj/item/reagent_containers/glass/beaker = 2, //this doesn't make any sense, yet i wasn't allowed to fix it.
+		/obj/item/reagent_containers/cup/beaker = 2, //this doesn't make any sense, yet i wasn't allowed to fix it.
 	)
 
 /// Module duplicator, allows you to save and recreate module components.
@@ -268,5 +268,5 @@
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 2,
 		/obj/item/stock_parts/manipulator = 2,
-		/obj/item/reagent_containers/glass/beaker = 2,
+		/obj/item/reagent_containers/cup/beaker = 2,
 	)
diff --git a/icons/mob/inhands/misc/drinks_lefthand.dmi b/icons/mob/inhands/misc/drinks_lefthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..c4fb929d5270afd277d88a497d7cd6dada42a497
GIT binary patch
literal 1875
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

literal 0
HcmV?d00001

diff --git a/icons/mob/inhands/misc/drinks_righthand.dmi b/icons/mob/inhands/misc/drinks_righthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..4f01313df37193df4ebb03280c907600fc63f2a0
GIT binary patch
literal 1253
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fj-_z$e5NNY9)(^YrP{=NK3o
z7#RNlKlAyV)qw*C($mx3I@1_pv}dNBNi&}L|BUhfG~@sO{~Mn%Hcm5cckTSo!0=$<
zqyIKG|4&W*|NH+;ph5qE+Kr9RFwFd)_WwVFvGM<zXBhsUVd(AU{-4G$(~*5<8iT(X
z%in*$H$<^A82?|te*J_A6MzZ>0|Vc^d&g`Zp;fuo;LL5GS!X6roapQ8d;k9ZWYJID
zK$96ug8YIR9G=}s19E;<g+!FNq!uR^WfqiV=I1dmRLq$h?3i`fK)~kodV!OsoTam}
z^;H)>nNZ_+;@h=2o%dXsvgZ5O-*LL!op~{rEv+qbM(peBmv8@E)jz$suvuWD=l&Om
z->nP~HoK(yX^(yg`;D?szKbFnS;9@NcWZ?-E1sL@w3prbK+oxRjiTh`Er;iOB_68s
zTxvD#MdiAHcjiwMKd)|=Z!S;B^0v%-X~4lCdEE9ni%WjC0dv2K*hwD`Uq2sVpYG79
zR~>R*7<!fce*2<$4<FmIwTBst?wq`R_%4HE#(PUf(Lc$dnM-2y=YL<k`H;MaX!nkz
z*>VfbmTc8KdF@w;ZC&jZb?Iqei$wUY1~M=(z4LT&45^s&_HJablA%QFLykoXN?Pxl
zth07+IP>9u{p|;5T0_-j{k2wluBn?J?LW7~PAR5Es|S<}7#K2E^@e3DTS)~3-THNG
z%k9}oMVs&T>2EBticTt8eYsP=@W#8YgYU|kCVjeQ&Zw^7*s1$~MMb0V#uWAkoTpT`
z=~gn#TM)wpHVQ<TgueUz^UiDO%dg*doSYk{zwgMU_wTz--mSCWcSP~~-<o${eGhPY
z1SD}=Fmigyls#drXe#Q=4VP<B*O(4Bgu!>}?>f8hzmD;+RVNkY8+7Pz<oV8j<jKK*
z2G~sb1~KKW0}fMU`uHACuIg0%{$04oQmXUd#lR+^+ut@y*nF$CchD`gn8;o*X~B^)
zt@#a?SycHJ8yi+UySXGL>Ga>fEN~|+kSw}?{(0Q}8K1ko4J#`P<>Heh`_+?*jO30_
zx0n;(d2scuzwA?Ps9jI`aBH*Y&LfJTP}+F+1oIBhfJX(I{0D@mc;{UI#9-sN6K-gV
z$<C>Zw|@<HX4GA}bNBSc-^(?lygnODU3|G+M7MROo!!dwcC}S&y4kkW0K=p1SIlm0
z?O#7)tQqzm4GPsy`m}V_BX6DcjLa3j7m})1-@PV&HM&VC`T#@FmK#O<3J+`*T)TB2
z#Dk+O_`v7o^1n6V-ubXUrzXSm;<fuZIo_GOLPPgv+sE9ijZeROv0>UH7Mq{PSsq1q
z37a&q=<;peDKP8&BkMa%Y!en8HH-i8{oDDRhqo79dpNC@!Tase+4_&I=X_EBuCiP3
z_xF8U=0EHH#koS3b(XI9qnC4a#k|Xd-fLX^GrN4d|K`fOr`MFjoNys!|FuPj9aWe9
z+$$!_tD$+Wz+wvfhI4Myr=)M4#J(Zw=yVZ{1O`qot}8znU-ZB8{P*B5u)tan`Hw;B
Vl4U_}WmXEvBu`gAmvv4FO#om~FeLy0

literal 0
HcmV?d00001

diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index a661d7cf28b264865fbcdcd832260b1b531feeee..a014f15f1ffed8de534d6366ee9e51550a08c06b 100644
GIT binary patch
delta 91916
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

literal 93529
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%0DxjAljgx;`A8Mvs+$FyF19k1#5<1Z^)y2
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

diff --git a/sound/effects/can_pop.ogg b/sound/effects/can_pop.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..ba9d21bf50ea82409a742b5e7aba48f4b5daed55
GIT binary patch
literal 20919
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
Dakphl

literal 0
HcmV?d00001

diff --git a/sound/effects/can_shake.ogg b/sound/effects/can_shake.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..51d53c51ae8ebd396b66370b9973cb328602f929
GIT binary patch
literal 18518
zcmafaWmp_bv+ykL?hqunySqCCS=@rV27&|$?!g^`yAwP>g1fsWxD(t0e4Cu}zW3f=
zUq8M5)Rc91byZKzOs}eyl?DI>{9BG?{{fttv1dV~AP*;3QyaHGD3Da;Ka>DI&|jbh
zr20qlzvYkQABr420|%Pm%l|4Lq5o0C2%+lOI9s!*x>}Lj+n8$oRZcEX&cVjc!N$SH
zNlvHg;ArFQYT;(#_>TUMW)SQ@qOT<+wLpLv08qIRFvt|S;RRz5NxUK4B9R!kJ0_G+
z!VDzgP|_cvc8jAZ%#{e&r~5b=2L}EKgo%6N1V@S^Py|y8>m&rx3PYf9ehALy4-P}(
zKaDiMHH0dT@G5wVjSnSghwqLgSejo41A^Np4@Q@0$q1_ChcHud%e@JL<KHI<?q;Hk
z4D4lV!3&1rri%{TW*eLhLY4^62$JW%BMP<>_r&|B4=QoFxF9(3L4sfzamWbZ_*-y-
zN5o5sf*JS`$b!ka%yEG@0Laa!i_E7(!XT<g0tNv9Lre{4z=dQeo@A(w1Q`KU7xs^J
z5g>eWk%e-x+j0q1x(U>O>uy9j(@6c_%JElR4glV$p-8*n!2gvq2LOazzQ`h-$Rg{=
zz3^Cs;Lu7aAOHYhAl-0DY6!_DNlj>i7n&Sa{#Vscu^{{_4zVG|w2fsMTsRvvA>7|}
zfD9u5Gm@=0;6FwVAW%TdN37!C$lA))MaxjA<A0SU*XWgy8QIFem*qA-w422~4uSHs
zbWt)Oe0y2Fxw=UIK(uvUlNk(ua4zEqCRv#M5QwJAD=s6Z5dy(h*~Dfj)<Gb-RxkBT
z#XmT=KdSyVhkXYmS=fIrOFLRqGAH{WkZS+IdKSiiS^o0<H8NzrVi=(@Z&&FNruVGL
zWiU;NI1a>b_t_AMg0dtIr}nK2lLQc`lU>vmX#X)d6d;B`5rU&G_n*czoFbIKb(p>+
zH&B70tTaEGV}z+;^lu|@T-ksoh{E2BA<0<PtFGa|J+EVT%D<Np^hHb0uBuU8fxak7
z9qF(A$RW0ufFm@IQ~RUYG@QO9%N2>C^dEDQ|5+LUP`x0T!hH2V^_*k^lUfZ6QkiEs
zxMwt^!R{6dDek(>zWR$HhPS?Jkb39-Rwu<m_y5#?rVfd3a)`74GZFfJ0=H5AeX1mk
z|4b9Ipnx-u>|cMAucuO+rW%`OQoZC-#THh>k)GiKPvIJ>@j9sSSj=!6YVa6>wH&ll
z9Q2#qS5hrjZhbfYS2cwHJ4Gx25J;e;Pk2qAu*DZkB`;<@$N-4J{fWrPO}f}Ez62`y
z1ZtZEE3cH&^o)b_9ES40EC9wImOmx3*fX-sGqTh(c0WA9Iz6SdEQ4{l__(e5=>J!d
z|2jAo0KB7;b)}M3r;=8O0Dr9;fbz$>Bt7g@(ymM+(_H_|aSB@)Vo>dO|7;rnE&u?a
z4AtU{Opz#KQO~I}gEg4v)TQS%!2iFZJj11o4KXa@pMagza~rKnjTPUoOdX^v%w167
z-z{7ir3=j3!(cZ{8&GGLMCnfv4^D!G7!3wcgTxj4AbT%~>$v<OmGn42!>gixe%Z2u
zSv7^aVm(2Hq9#qdtt`mpFkO+JV#TW>O}p|sh!6k|`61^`#^Hj*Z~)*ViaHW~NRsI|
z{a&2<F#j%zX(WG1mf1KzU3StiKW%m*7JU)ql725MX<U9cD{)$$4&oo*K#-pV9hbQ@
zfI$oVa3)bs<Wk0=R>qcA#W7sKmYz%I8sp+t(*!HyD9>qvb@7zJDb&iG%E~xk4Qy#J
zE?6T)8Qf?w!R4@|30}hk&ox=--}q{$xUX?4Fa5cMP~9PyhD{D@ssB|4UeE-u@Ia{C
zYVQoyz!tg?%^rrj3t;VeUx?;84do?VFgOLgG-m-$aW{SkUehvMS^(?L`>xD~7|;85
zmzK9V4p&!K)K@;%vplw)93{!mDE%4GoRk_^S-a6e!`(q2TY3Q(JeMM^;SSN_YwT{Z
zv>-L*E)7n$_|s*wh2eV(?PiFG1K7iN<DH>ls=J|%rT%TmjJvyGvc-nBh3>6|;lRB6
z#;wv!lk&ox`wZB9W8Qry-C^YpBIXWG2{DH7Erk5^a$LjDQ3JcLB^eq+#PA)Bd6zpK
zg=!qkRz&J+C{biPYncpJc-lIZ)7;ngi6wvXhH}k(ae(MsduM2z>b_=u)b>UbY^ZIq
zbPLwL@r4ZH=Z)_M0eImSV)D?rl<c>+zD1|V$>63C$O!h*91L~*w)TH_a=dfbhsf5A
zc2*0uySxh(fy6u<2>?JT(LslVRw4kKFaSYtmZXw+I8G2`E1(aKQ|~1R9_6PebW@k0
zFAGsuk0J<)<ENo^Q&FJHD|(}#m=`=RL0=c5u4i90m!TKM9Xzc^SJe1MA*!s1NZ*cI
zCR%(jD=~qewkYW@VU(XCI|#CcLN+=*Ci*@dep>3FSOs{Bq67sc>LLP3hPvb=QwU*E
z&%U)U&5f?8FG0bcx=2S~iNA@!E%s06w0}D<YE)OZOLkL-sIov)V1TGnP+*6Q3Ze>4
zLII*mLjf`>Q%3qZ9R=Guh$=<)`8VoO5Q3rtJ4BUZ-OjwYHFF`B869;$o>_HOBatNi
zKb_CvnN@ZC>72ShK_TW(=P|92?NFs|Cqu8YwQteRq4he$ZL+LUPeZBo&!}2qb=^)o
zf+is|?|Y*VUDc?kAI%^3Z|9MX5LI?{HxL3um7)T76M<bU_f3Xg1%zN{Teq9xcE-ND
zsA0$5OkfA;Ll2^Acis$=CPAY?wg;M|kC3>B`V;ps6bkHcdE(*hdxcyG?7LY>k?ecq
zh3f3PB*E$&d*n$8>VF`0q@uzEb-TPIb#>b+NZdpHiF;x$YCL#I*ir*=NPvkm$;gF}
z8W(uUgK6keYKjXIS+D+LAkpVA@(;${eeEv~*xk_ZR!WT<;=m9G7luedFuFIsGn#)f
zO(DiyU~LE{#bQIp@DERuyFP)|+#igCK5wZ0g8SNS$XkAaX2+wpv&Zgp!2tmH1p^P{
zLJ@1p^3f9^GyNSEByoeRt+*UT5C-H{T7;pl0NEP}oFQomTOJAyQ9TwA4)Illc*rd>
zCh5<8@()y$g!SLt?0>Sf{{z7ScdC5Ao#<jNeI1`z9t9&P0HX98K~b73iU1-#cQij-
zUQ!aoQg5T#5sC_D^%RrcFcjp=8W&9~vx45JD^&FnnL&JNUazulK0^@Vw|I7y{EH+C
zHq8AxZsQ%daq4#L^LlP)9jWuCmE3!)K^Wa%aLlS(Z+`fk(KqSYjS1h82fwMC({uav
zCz*_5zg-Rb1xYXsqWSkogMWR8e+vNbgP;Maz!=U-s%+d?IQ&1eML-0|F-#!~oCS$P
z$h0BcB#@gk9ku#j9GV0IwfTQ=MM=^B@F5l@CH%_=$s;)Sav`!1oVvnaS%g2(!GCe|
ze=^&@RC?<FLPfzC3Uq(?AhyMjfHePF`9HXX|Kilu|AT`p)xUg6>hh2jl!OoBss!S+
zgkZe41&H{h0e}5h3;=L?wKO8K#Yfq#$|w-nOUon_=tJ2hhslfSHIOJmDBL0`pz`{(
z6#F1Ib_^H*0b&9+u{Uhc016t02)sD0nDZA%b}L~XD#yhH69%6QV6x)^R5WzkP+}o{
z(#w6Y?+AYcvYZNFNMHnF^lk!3a^Joq@(P`Y(yso1$<9}Y|NBe=S$%W>7=XpVoFb74
z?T3>M8-SOCWW$g$2z-MFzEMC)NpXe6=hc0m`gsn*f+Q*b78n?qzYxR^0T`HnA8Zu<
zA^v%=`GZG=gCb>mJwQWAMa{s%#Kg+L#LUddIx^Pzb%dRXl8TCgobok0`)KD-=R{X~
z`v@i5szg$nClC(sfT~w?-!Yila2&a$i|>$geALos2T^WJ0$BU@Zpw}@N+yON;6Z%=
zDvr=h4)!gMPBur81x0k0gJXG#K~et@nG?#2S3ZiPmvskmj(71o{1I5h=K6=A`H#s1
zt)C>VI$pp<#n(}z;l!=8*RW}u%>_7XbDXoRlq=0I&+HqHyy>7hKdztrSbGQc4Q!-e
zUyX8FVb#=ZVT)4Pvp;*ZR8&fi9ArnSSaN<Md{!>f#(Cp~+JOOA=b$eb(|cHzmB%?m
z`Od%EN-><0G+lIC{{CvElDRKI9})CuBXgOPf-+-YRzWAm0f?bv>#PJU=Pu`Jxn6r0
zh*bL_XHiBYo<rve8UrX(3@m-G#K?h3FDPw}wBh-vN~RN9t?wJd1D#Yb#z!5uP`}6N
zj0*ArB2a)OqCw@p_M*MB)}rDXtwD(${ndukS_Zm1G>S6W?RGd63`7t8$2k<?d@T}P
z;k)Dlxnmx6*TVHBU+nrd=-=b7Pw$|UK=xF>5KaacIa2qi7e0LT6?J?ySoFKoGSo{w
zpg>$7F^LNbMeU8x9+_B(3l&fnFUDi)Co6a;ykp^CvD77cM{3b-9}$&x%dkmR@*sWe
z1>sg5I)NXAsdf7%9;B;l@@4#y%-^8X+i|RK;pU^`Yr_68UdB+yUkz0}px-LyLyv$o
z=$QRSGahA#E^=%CmYSylUJTyX$gY<`zpV=@<3nR`Y8Ik00Hez6!+8%><L}OR6Tblj
z;a8<o&veH5HZ;T^WWNX@Z7GPj^zT^swsQ~Ub-9AJr8J4VR0RoiBsWxG<Ok9}FlWG@
z-prupxcSuk3g+gEgdC49d?LSmhPo0H%XkC?KuiE9OBw_IYmMKjE6tfCs_-!y<_tGH
zOGmi_bGNY;c>3S6k+)?^sZRX^I0CHT7ELq;;k$}YF$W~8-D)O;Y@eJ-1`d8+zqkMC
z^!*Zv#}j}VQCH`_|1&+N04wj9tNZ2P{H*AEyA}(MBhJqB^MD!4fwRrq5(|lvASf6$
zd-fL)SD6jmw?nAXXJP(PK_*|t5`)BaR^sd*)`l~Y7F>XLR=7Yr9EzG>5nQH7z-ji0
zEwm1Ez?YNE$|s&AZi`a7L0PLgD9uKXSJD>KJfq$lURRW$HqXXA9Y=0%401JXAmB8q
zjw_sWx0GKYKCr{(QAb=tHI?4Yn-5&Hu(2{@Y~1-Aj=o+k&A2C6*&@+=>y`6GpkQdr
z_GC%CRAfu(#|=LLz2>LixI5u3s&l8Rypb7;*s>wB77ban=D3pc)mqu>s*Il$MaHgR
zEQB3BXS+Jqpx)Pyr|)d<xasdcom1dgcpiN0yIPv|PtWa?y!;M5;Z2Wa`NnNx=mu`L
z@=K8g)pk*5c?fraW>nVb0G9IDd;8s#FGpu+D#%uVh!<`@ei~048`A_MAXbg%ivT06
ztlAS8X@Uy`obSw^C}MqVfe8|HxJ;J3|7~(mW}%AxiRU>JL+Og408{LP=t`ZY)%|vG
zMW9Vq?-zDMVY9oWGc_*$v)uwaueZzj>4HK{wuA-d^PXPIXh&CVvDr!FTB?y^gM753
z)bC~C$vb7Qy{qY-^yyz$ozjI1IY`99cg7U1wpZ6`H`ohitbWG$@q4wt2L1S!nS8r2
z_f&0}iKZWga)oCo&IiuW#yohR>1CbXUshJj0}w$BSr?;mB4$%MbCVaGm2zCc(P>RM
zPES`sk^Vl4|Ndp+ifbUI0}Z>G+2=jOrBiTW?*fRoNc>SzXM}*sDldH>O6^lb(p{LC
z3P+fm>|Q$S(W#@yOPE5K=A6;>oy6?D=Zvx`#b%)*S?1@%lSGi*6GAB-44(HPHsUPz
zP5p{{lS<@r)0R8T#uQRe5^jNSLYe&~_V91vT>pR-d#fh*>(f>J2xq#zjrR5$i@d-m
zN^NbXNjg>Sr1fr~^FXTatw}oY`!f@I#en!;DR*!#F-PdzcT@6EI}@*E?LP-sE~|7I
z3n!ksBwk(XjB9G2@Mq)Z+<v-f!f6U><)hiz9^03vUFb|Z5uV`b*nqNXBxr2^UDH^Y
za8)6@sVNnJejRo6%bVg2KAY6-9h>{m6TSU}rCs?P6#vR|j(2b79MQ_pA({=7eHrN1
zr8Top9<#=b`WBoSU<NsLnhHv;>7{{Bu}IrrrIdHKJg`Ft`3|k25MeLA>*IOB2IlEL
zFKY!j!UAcp2E=nII3*d0B9M~YV-1igSL3Lns_Xn5>w}%wKGX=4J@pDmA5{|8Tx2qy
zNUijo)n(P!Pdm%u`2(*jmb^BMH5*T5LoGVaPwIlASId*$FcL<vaW)^W7lSlIV%j5~
ze*b!fs91K2eEVZ*W8)3Q>$RERqNSd><Da|ihz_=&XXhHL4>kNBs+A<uSA>uIp1hw#
zwq}qK>OUXuej(Xe4pSmqq(l>1TQE1MQ~N}SO*jqiL4j|It55zI2FJC6*ao!;og{uJ
z|BbVu1Z`wD`dNs9mTTg%h3Mqw8AS`j;>(jaf7{fF*_(xrJC4vo8mB=leH~!NI5_&N
zsmlBAp`ekUqa(Y`DK`nUc`Euv8;YA(GI&}wJ#fS%@{Le1H}6%mO<>seE-BN|=sGc2
zN$mIa1rBE3i`Ta<zLRH~!3*kzW`hAT0Ds#K9a8Noxf;xD-GK?4$ZG6R26x@Ei7TlE
zt%!B>ZwLY0KN^hP&1e}b_eEt^q4e$S?tVW#mFi*rP6U{gmjouC%_+q(zIpX3Z*0<$
zP^><V@5b@XEq&4VY@A{ek~R5$P&2bdP7Y=5T5r4W;dMZN6)%wTT@{bKnL<T~N_mN;
z*bfi~kiYR(=@T9F=~)JSX<PK6U3T0_6{)|g+yO}Bb@3yQwWVnYK)+8J5U;*W82rSt
zR~*eH$#3p}?_lzx!I71tXX`<aLn_3Y>^bVa?vG3w!!&cdk5t=A!u3^L75T38D8jiy
zx#6|C=Id8L@(M-uEA}?D^GDb*CeQjKsiL=O96k)0d7Roa+0R~n{JfYsU8Po(tvnao
zhihw9I*iByttd$3O)$VQE+96Mjdhiv%YjQ+|4lQ2iy-27&FF5|`T6~zqhD35;MuSA
zb}#&cr_We$j;9LI!hB-Xq*dm#wm){#U#>N^8HcJiO;r<RvhpJh*gSMyd?$#li=fi7
zMv8{Hm9I=g^1TLAGt@4>5LmvXKS;#$;+by+^(~{{(3GZ&S8=d9DI4h!`lGYv&Rab-
zxQ5#n$!qrXtn;CrT`0h=7^9gr+@+n2hGydUx{;O5;2$Q>r(CR!@Sa2oYpcLN?sgvT
z{mce+((kkbqo9Bnuq{yz#pF8_!Nf_<nL!vri8q})U#*5QQ>RP`{7q*X(3=PLD?*QI
ztek>t)(xiBLn#UNV`8U9WT7e1h(4!U@>T#MJX!oL5gsKM#5%34v~*(Qs?z>VEX|S!
zSP{!2PAZ10_<~iZyn_=xlo=+dXk|REl?8q!o|vlmJ)2O?sIHPMk400zaiQ_`E0VwW
z$XGf+xkZ2?cnq@CrtGA1r}cy0@9xtRsdhaP<z*VhpDR4rqUCsj%MlY$%-^(sJ`tCj
zLK7FiIz27UwJMGuaD}37IGa0d@>E>N8W;63NA>FO5wdVC$sqR0b!Hw+r~z-k<M|-E
zQTH%3;8=_4<^Z-3s$(NwTo3c4;JNhL^RcPYn@^TF-%td1025@f4g|aY!(=vZ85R8m
z+M}n%$}^uirsiR=t@x|UJ})V<(l4a8#=b7%CaQJ!OSHz~2(r<bDYbEb%pa`TFQsV9
zoa(ZLjg4Yl3yrkQHh<HjR^WfDDf*#<xt)1so(Z&0A5sQdf=8Ns0@GUWE-e<=h3R2^
z%;_}ckfeKK$@mmgtMe3V)_SlI+q!HVZTRSabar$HF8<2g=stBcn2>D$v2~8qEPUO|
zfSr~$*LQ&3cwJ5B^M~d~QO`){_BA7m$3r@V-Hn@!5cF7PqoA3H>X^)wyzon*muFdh
z{j?LwYw~y;-4p1F&j^vIA=x}=dX=zTCQ0_-$=Nr<y|dd*3{5v_Jm|lB)#=8RbiB)`
zyKd9TxH%~#6UjRY*q`sVrBV9<XHUotUDc6bx3wo9zn(oO8U<zt@&F{9GeY)Q>d*SU
z-(jcR)*>NosVk!f!OwraXd;Z?K4;6fIfX?hu;|K9M+#+g>g`79XZ<~=DyQ$Qb0GD%
zIru&A-OJP4+nt!pco+uW`F87CD@_Q~HjKb}5I>v<U42yTP~Hpcap)m(s8Kn+EZLs;
z{6V3LOWAF@M(4?pyR+EfdT-(J)mZ%6Ak<AIm8puG%Fy^~pUVuhWhJhIm!}60sU(a^
zg{1IQ!EUGgm>_5ddOba)h?bpW3aHV#A&oQCSeULSpX9Whrc3&EOyZI)?i1Clx?og4
zD`<bzNrIJ-UqjZNUS3x=QU`B-v_vF)Tk`QPU7LcG^eIu6nL^*NW)xPmpB*zjO!wL;
z2fy=`MP#F$OT^YgeBIUvgJL45VcmdC=o=T}kc60+6YihqFs|>>t}O@$_@gw`QCvbE
z+8deR(9#`t>?l6{9#KU~rC-ek<<YBU;xu+C6e?qdcL|cj9BVB%SIELvh?NgOiHt~B
z<9p!($NtBtHWn)nMbI(Iap^RasMKn;4<8uhuWsJ)Z^rE0V!QaHwB3uIvlrvsxdki>
z9_2M3Xoh5ElJO~<u~?*D8+mM+;lAj6+)C{)ExnqGlzqRx{N?%UKrZiF`6;Uye2chQ
z?c&R^@*U#t-fWx*YXr|3wdd})I*P&wd|BsHA9)v8$llRBZF{!D9B<5)KkA8pCqNC0
z`@on<mTVe~id6(^9~S+vGMjFLXCT*DfI+Q5L)s2&a|jIrZfPl~FO{yU;{~C~L)Ddv
zsA~OQsEB>gm#0t5UFyd%D%Zvaqdi7*P&2(Z3}$ew`a|Cs6?fUReN}Jloc_^zKB+T|
zh&^$9RWjH4%WwJl0IBsRBhI-?uXCk}Y22fGpTpqAUj%DTfK@C~l1mp2c{@@!wi!gR
z@?qC@uRo0q=4C*%mpXYV@ceH7E|dLgH4VdkaBc~?1Am~?U1Zw(=z3e>dxAl;lvk;0
z`Ap$J&Udu~JbBayof_OAEymxFD5!k<9=cG;H9F_DqDk|^q^z7y;eq$DG5E#gn7iz3
zfI-x4Tyi~=?|wy<XO`VKAl~DZjVQ@Hhq)ESavKppzA>2JE%23-rd(5I9%+B$8#F~j
zx9dEcgGo8tK@5A;7EcQVF4qLU)9aJ&E#KMRd&&XKyfCu_a6Y`ldclCLsI78VMAk{o
z8@#~=<($+Z?C8!#n%B|l(UJoqUH#tD2s`gHl&fSbQkf;p?9LV%o4e0EzxA84mS4x*
z5i85X%*~rYOGC3k0o30lNA1Y9q%aFwnYDX!cjsKL45Rhv8$nFkaCua|0msoWfEF}?
zaaVQ>*>TRhG6^~y<2F&hn>drJ7FSFLWzm`24_$}$9>71Z8pNXi=T!qV1bnvo{7ZtB
zm6c_ntFOQ3Th}Nx#cK)*%GXRxjMS9W6fDftR8&+<EDS7+OiWB{Oq8r_Y!DnR1j)$3
zI1V9FQ&TaqO))KGkzYY`#YzXxat2^*BlJ!TH`d%ShPqc6sMh12s-&RLR<WKNSZ#pM
z8WiscnKYULY<|Ey2hO?yUdO$WewgcR!Yos6nR^DK%<*1MP)|OOIVWnmFJ1~BB$#+i
z8YFK|;NQTNS$&J(&%6Jjc~RGVa<Wr>x`3}0phMkGwr8Zfs645*pC47Z{|KT|Rf>B8
zEaDgfehtW3YS;Fs7T2cyvhKbpO^do~`2707%ptP0;WECaRk>0JXw%)HmQHMOpv#54
z8cEp~kR$K;Nv%nQw>W|<RcoTiXQ@Rfe`LduH_#_qVmGn$7T<@iYo7SUdy9d?h0zsV
z#Fb;7bPQbinNg_ct@+OSJNoaZix+$3t;_{zA3~UXkezB>qZn?%5fuK8uxFfMz;A9<
z3h6!}INoKywEfu0qoBriPVEy$?!GN8*v(&C^KK0<_ec0(dK#j^crcH*;ZD9ot$FE=
zgX0;m9;{ZyGQhm^qJHa~<0VGKUz$G0WKpZXhGzrvYcG<9J_deueGSC5kJM4Csf3O#
zv`UE^&U*_<BUDp`&*Nbpr=Mc|=bX`>tndpQTU;B;neqxhk2^Sba;wTTWMwp)TBy`*
z$n+c|F+Gu6&ZEK=UTB;ng*U<tMaS^<=m;e(n@90UhYbplX7W7RiViQ@Z>=}D+q{q@
zavoY&^*QMIwfD>sq)yw};reI21jctReRE)y(xus{tk#wrY9~vpA}kiWB}GY^sz${t
zcna0`bs<PB%ja;epn1O@1v^$CMTnqt*_Fc^Z?_}9xIQT*X*o2hMuAJm>yeJDS4enZ
z_I%L!cofB=WvJ-?y(qdwnT$ZhPc9c#Mf>@b_~d6Vh1&cqZ%W##s!=c=Q}N!`d!Y<=
zLX0YLMD1&xnd;xLF!02Bg}zrBlV@Y8O|*xfhPHq8xDLdjh|f0qG&rkt!+d_hr2*Tk
zWU<B8CT#M_Ds><`&GEGn?f$AEJ>^^arJogk%yYeVSmVT4Wj2*)n38|8*>vrIERD6z
zl2-6Z+DI`(Ikz>P9M|$$kW7A>QX6YZGDvEIDRfv4jmb`*=XFkMFJoO#(}%_i7)Hb?
zr%x?eKF+yans#lLN*~rs9?_>&>dEP#ERH5B44GWO_1Kv;Xj_9H_#_0_71%68RkB|_
z3xpUIW{qZ?CQUVKeLgn!s}#<mHydFHu%$D$R$bOafHy`eB9iPJ$@-MU&FFL^|7+LN
zP1nEB+bg`vfy7-T)ZJ<WIXSA8YOziS%dc#xt#=_fb=p;K!<Fk}Kekn!q_r39^8r;`
zZ}cu4R(<~&tzb`R9rLc25hEcY2d9}rK2*cT;i9|nlg-|HemrAsxDA2o(haV<4!=Os
zVsKkXmNneW?@#l7T<3mYTST+l69Q#+7T8Z|q*XRL(2K*G)-7*FWD&v^9m?9$x6wvS
z7>g}J7i81TM8D<Zmc9bRxn~Z6%XOgpFufiS&GC?ji6^n*KHZ8yaffuK=6zK|S&h2&
zIrp3Bkn<G5%6O$>73ISv-6fCEM}4@nT2JkkY*8a5v;#R#VgrMjuTN?gK=q-E)z*?;
zsNsZSzwo2lS0%)F*x~H<h;*vPgy4(!Bd75+2hXCHyn8GXL;S_>-HSOD&;>t>JI}i?
z-e-jot{tO*&#HpLM1--+i$&U$eT*KLB4Rq1tWi-IQ9g&h%|2)KrXOp{ZR?%EkJr+n
z=`_r~TbY}iYv6l4T*_YjxbskX*Hnt?i1<|yh%!8LZO$s8E!^IMcazOUI(@g~fhu~o
zY>~UXE4UqdZ=j<Xmtv@|s1s`io3pgN*E*^nh`PG*$_{<%?d*jRS`>^@KNp*s)W>wU
zSG@Hy!V_OQw%4BznzD8$bF%yh7h0l~r24M0Ni|RyWk%9?mJgrYM}?NxG~+jyWTd}E
zD2;eNrrc%=YW>h$?ENWr7Vx%g!N!7`B~59zDX>i+`$!tqN#S#WDSh-&NyCR{I@d}H
zymKaQH4qat#kg6xh17g;dR4-?P&-2tzI=hmBFb}ufX_`OaUP+h+GDE@T(@$4op60F
z5BfV!BD}Ij#df%-fTW?s3nYO2Rf6}&(b1%cNGLlDxiA=Ciw-9C?8_`p%s$>V71igV
z9f8i-X-6{QC3Vv7AbX0aTlDEFtBg%gAq-JQe@fgRXE#6U^n;Z=%&J=QDc@<~csJhB
zFm|d$m|fa6Uo3Tu{3LQ%`5?mgZByw7{mT0E3V9ltuEO5roWB1L?u71F#E~gV)0YZo
zjB}WIqYj@(osG&Z6C^{-oXXzrOC<an7Qrv?jp8dSj?YYVe%j5>^hKm_tTX-aI)~M-
z@*ND<64AsuJR34FN&G9M=`CfZb3O_^NSQFEd6k}!(S}?g{jdi~X~it~F>|*N2!sX<
zt}j!HDxR1t2z{T_eqH;zA>0y!lxC8uCgnGL^+1r11f5T5hu2E9$R3KFycR!yw+1vV
zFQG9_G}vnkUkgJA!vW9t^I`Vqo^EQcKj_fh7&qnZzGlNSjS*RP3m);nhyx}!=Y?gv
z%Rw6WO8GQ9cJxiWWpT1tRPy?RXdd%lKvF<}`;uQ4Gm@W!TU9s4J`Y<trv?VD^b_b<
zM)rh62#Fj4;DVMaXu_on9BFE|#8?|QYCBEi_%%C(i!y|VbPp{TqzTo@;@0XS>0oo;
zXqn9N=>u|*Z^}~#i8>n^$>kjD7LHFW-IY|M+IMeJvUDj%q#s?CM5_9k*lJsDixd5G
z&7WRX#TaDKV-;RFokiyy09OhFSxZe_UFmtPKvo#7$BUWW=Zhj$tM+;##Rb+gnAS!0
zj0HE{?{6C5a3mW9>(l}Y0WlEW(z`EKUCtq&sAtC5xQB}IUQbe7t@DJS11Pfe**|?B
zD)3=I0q?D<sikn7INC~=CCf<~xvk!Au2ty*+hUE<;r>7%Am#=gtLd+5i=0B3MH|V+
zw`4fS$Zxn7QH6>Nx)Lds5_wpu&BX-h%p{i2qp9U5vosvMqxAa1GH!{u(SM8Sk`;5_
zlthYHGl(zOp-$nGA*}iNV15yJP0FACEd1apg=qQUHp6y0t~T2RBU$$8BRV8gff_tW
zpTB;8DSK4qlY7K3d%u2&O%*@vvWQE{OiGJ5<}FMEO)^5HX#$T9V19cYFf&7p+bW@^
zQQ@S^_?^jDmyE#?tFJs+0T5Dklzjl<V0?qB^|IjPEVIQ$A?D4xzYi0&kwt^%y4DMa
z1E_RK5@X=RFo9A(pkvyO*($XBUeK%C_4Ck4IYx1I2#xeJ6qi1>!zG{u3a|xqZCfYF
z^wq}{(tV{S%fh)G>V8JneAWfQaOv}CrhkW*LsGv6VmOXd`Dbb+baKu)j_Po2)2LlF
zOi~(%4#>P{eBW1ql-5j2rF;X_0WsEZiEF-gj$ZL!+^%jT6eF7V)K1`(x7@!1o5*1F
zTmRYCIYBAo*Dhz!g`fb2Z$<6%NF%)I^hUu|XZ3;=bDq&s$Z4cy(-S9#3(OvXl(EP5
zI=mb#aD{R=u8*E&KX)hG<nqO9`N5#*G;GT*^fk)b^cfe)Mj@j22%OM{R6-0$j|m4B
z@J6~brp~j_bb@|Qn5TQY<F3K7Te<(PQA<I?wv%2+Qs^f*mgyPtr6wQ;WaUwl5n9Za
z<8*S;B64)&e0Z4LHBjxV!2CwLDBk4>%=J^uGfFf78z_bI%xhMQY@xfDI2t;=aTw-*
z2qG05v*Qlzx!<|0WK8V_xC~VXf5YeE1PH@V^5`t&>4u#9YkipKr<ginHr|SVyEf04
znDYVkwZ#VPD<QDwq{RRMxd29%$#+bXn4FI!oRi6J(d;ZI#rJwOuE|3N181x=v6o@-
zpcX5dS6qr30q<BF09rYo6V3>%?!`0FPTDMqMs0aRag3VWHQTJ%RIp;$Ht!xk03!<&
z^>Q_r)CmLJKy4Lo1lIeZMtx$PFq?;y@P)}4Rxf}=EkX`-2}**hZ3EP8U0YK0V$O_B
zSBHaqwbr5AXRLR$uW*)WNGjc2SER06;HWhGQY=Kp=m8&H=h6pIXXK>!+R5BH&wxYY
ztxTt8L;dGW!5wV9wjN#P*IpI&0F$DoYdAVNB3>3i+EZf5_gaNSnAhheSqC5XWK{lT
zOKri|=kZYLz4d3dJ=%V95EEE7E$|tn3AKn4cVtk-qL$ctw-A*49bLKgCR27Ol=mUT
ztBWx#bled2G6tli?MdR4A-fy`2HlOQ9SLmho$x+%E*an|sM^f7<4>@aKeLExJ&IO2
zTOk2V+7wAr=wi@+KJO_JVfS#?mD;p?5be6r*DXKT7oFDB8@+(z(zb<hEJObWWrB{~
zvScNwK`+6#F|}AzIZb&=hf|h_+V%FTlNrRMYsU5qfB{vC{1_4`3C=Lz`Kj}yGgg9<
zGS;T@;E$(?r4I<{=4m2&1CYI&2ys>2wr-Q-HKA1UW%NPuOU}g6DeNZ!a|Ee1EHv5|
z;0+K^40HO)qS4KT%8!Nb*rUon`TPY=QFwaA09t9KCE)?EiE9f;&TJzdR%sA$?+8vc
z^8dyE^*RGryCkmkem!gx@6}Wt3YVfDmQ^6Zk5WM*9=T*-{w32m|5_<1jG=LnYu8_;
zxqyu4N@VZ!ltF7vsw{!FFCAo{(HW}IP8MI6i;`>T-O{1xwpY^`Ghp{SA+Dvug$xe!
z*FcryXyc%1Jz9dzD;P8kY~UI4L1?rS5gysyQpqb4i_U48(?K4piPg?0Bed0iCwx8A
zr?s^wqrFugQP@lwlFfDy`jMpREr*e7_?lV~6=WGzG+eq9KS+MO=A8F<>Dz)*%=}p>
zhO6w&r`^bYBC0avYjY-zc?gmyV>ZNJNQ=qo9MDDTDh$`W-Hqar>FAVvE5K=5^Qg}=
z-YDYOHvLphXb;o=kRoFJ>WPuZ2>z=q)AYDvj)?$sTx<Hb#LUapdjG?QR!;VvpbDc4
zuFKHM3<W<xN!fy=7`Pp%BgYi0QlQ3>#hVz4{!)BubJUEbsul7fN@+?DiV3_#^bW%p
z7zEYA;20NNy99<K@1WMx3a}cqBI^h9<BFchON}`KKR*4`*VZ+GdGjm97nQ#zb|AaM
z=4j?5zV6P_ZKW8Oh--!=a1mY%8W6)Zd0w|dzkia(!nv_^@mq&A5VO3qmcd=;1GvBq
zAAi7`PzKBa?VjhA4@kXRbe#+xr^15;59=n6R5dy34bYnUKZCJ-0R+%7Y}$qR!e<*C
z{`VaG>$I^I4BD01cbYx0`XC_<dzwvXx*$!MA6{u?K9UmI?2aABvBvK=qmmgb9zMjh
zFDmUm-%6!;^5AfRJ7dPC{r)}~<A)yL>=18GD%tD%#BCs56fR~vla_!J36Ub0a~?_<
z^>){ImLnP?#SPNRbd_`UL4Y3Te44nGDt3W9C7i_>+DB9>(}xXPiu>3*p$*O+WB<90
zz0HRZ;_Akmq58FnMALeN5Pp#OSL6L1NecPqUqej%eT9sT%D6ITM^An_GP_1u-YRb{
zFWAjJa|aot=h=#e7~P>f{TYAE=yh88-{Y%GPk-%|rBA=*IAw&%tCRV)t*cL;#Xs@G
zw@KZ8QMKL+D%C?uT^*XFN~uP}ypvVUXGAw>xQ*F5+SxWo9C=T(aDi<GULx2IL(8IO
zAwALt@!w<QVjKVS3gpjOjESFLrHJ}^J4dM~DX18k2YcEEyT6aL^>z<;b`A{;i$vl!
zjP$dyAX@u}>4evDH?*Ge+e5!@NQ#4{L{6&6wyUkmAAOgT_@ziIc3XM5So%o0%_ULz
ztW`e37x@MjjNX~-A8WPArzCwpo2^!KRkm24f=%?>W0z~MU7{*x*;+}&{wA-jh9jd?
z`$$+WyIla+{yVz<BzLI8b>HMC<F8c5ht}*QDetzS*^M$hXmM8bTO15IuqhWpV=?QY
z?KVd!l9C0K@8j%Qygaj39>Yo-*-Azgy(9@K=}gz1F6$Amcg#Cmaic!%WZ(f>K)~CX
zX+(1xZkl1KkFP+08HwT-Fz-@%NVG2V-WNTG)SJ<2N=_BaCSC-`zH2pljStgAn<ENb
z*M$DZzbbLm37Bbx^tm5C+!N~Mo3;wh>xIRcG3BbAdAZcA&xp7Ud@YuP)xg}+AQ|Iz
z7A&q>Y;*@fk=)&U5Z*AlY`RGvc8EQ}w6NCiEYW`T{o%=)-HQG_Q`3z{MxWzyaZ6an
z32QIxHsy_{j(%$$)4>3|n7+{}SvM5r&=EkYSG1-1<0Kcl<UllE3F@%z)RH$Ik^YcP
z7DXbQ<a-Lf5Wg`RjdbEeS5HP(PR)JX^9dzKMZBym*tTMEzjrK~>h~Fnmal%S!aGVY
zxtqu9&m^RRy=5ObnAacD?1mGLC9`vWO3!4m#Hb#nk0t-IWoK(BjxP4M?tEGYAL4NE
z=)q85og4bNGT8`ESOt@Yj5K>PT@cCcMu^v>Zgi`Td_37gJaS_4vi+K#k)DS)6&%86
zI3i-pGrJ&D3Vl=BIF=Qk59mM+4^X~_^##^iNA+YhO|q*)<ZYb!=X=T*>IY-S=bLxG
zTptDFrk)9l9ENhSOr3qUb8cTP7a~$Syi{;%nl1MFQsG>)aE#I%GUxYE{eW^+ub!W>
zg28-VdasC6{GH&jPpR-o-QYP(iKQUC+u|Mc@_={sqjF4Td9q%Jek4PbmaBPu(IdCP
z=Gt>2opueFUVX`!I&t)*5~o8!k7K!B(x*&jKEL1^DfugHg<Q86tpV@MjlV*hYX8fz
z3-2As96%YtYloVHh8(XVqR$)cA!v&5`0_qPi_c%_`gD0TS$M{a9>7ti*DTtA7Xtyd
z-;|ZnjUq746=d}<4!x~4kEq`8l&|aI;|$PKY(J5@!*Rg?-RCv@1*PdU5qu4Z^|K*s
zyRdULAe<RJLwP>{3UvGtrg;VB&|X5JrtXwsYq=?<@r1yAz1m3)i)jv5a?uYU2KZP^
zI&b6LQ7I#Y1O!}s-IVL2Kh1kg{2DHEx^XLr{2c?}j6}Ub^@JQG30MzUgY#+pO>yKc
zzG1h%-6-2h^p*e}x1H?RRB67Tq+<3b;<7w!R5Ord4~1yi`SSF>hStg0@YZdGjm*?O
zS}b6Zvj7K4qPFqOVO{4qX3x~(=_S~+xH`d>|6ZfD%)vU@*z5QHT*j-Hvgc}^S7_Ji
zVI&IWM^*>gX6I;REF{NS5e#c2q)Pm+X}7kiMNndmiNHUVkj(9M&Q^)_B5e0ItETEJ
z_a{mj`^?Aj?Ww+Opqd)MY@m6VT^&6)wnH&Ud|WFWKZj*c#gBCC$Iu}RS!)!GxGOR>
zxMvhK`$Y*dKA?NaxnE;q0FfdW%OdRn&c<U|t#R5;q>MdTT0v9osZ-&};<d)Ni%+EN
zS)F$BrwfVKnRZ`=oiab5t2kfBk#mOyV&(TPUk>4R2e#5yvy#E$C)qH*)A`i$Lo6=V
zVp_o&a~tD|$E~q~eS$Pz_EZ{Owi>bU!QP%!@?!xMKerE_?dtX2RPPkk7r%F(5c!c@
z>im(~NXamn6|^eQ9U*6I{Md7JmZz?_11Hw17zq2|@&utdZ|r*u@P0_ONO5VytaT4A
zBF&h_0?(1j$>PIC@Byb2Cxvrb<F3kZlc?Ue-Ew*AD0tJo*HP=AYON1Dd~vP1R%8_h
zb{dxVYH=rEv1Vj_z8EtZk2{y0pEkAoWG^+q7jhlAL2+j)$G%k33*21|AbAr+A4BP=
z;dTeP#qcZhwvVG=U0&@xnYx&Fm_%jm)o0zQcz==eQDHyrM(qJ5P2b*#JASx8XtuFJ
zeURtJ@4t~UK)#}!Pwds^v>Lu`gbh%`AJ*B8InNKnYKnyNTS@LnBAAb3+k8oH>yI}z
zx{4e;&KekIyWI>Sq?R|4U*Psk%ke=_ywLF<xm$SJ{mmikrjfCb!uQHJr;=B@NTAO2
zbg8km1TQ1{uCSIV$ZW>K(88Q+@4)X>4P(+lphZE4JVv~(gKx=lbWSfzFt*>K<!=)=
zbE*vf)swT>gYe+GZ+wNW>(_bFamt=D`L|jJarw$kdPClpOUl0<XHZr#3v$9==$Ajw
z@vHB?D?M)STBh`1yq0<DFNK$JcZ{aUZRe|k%|Q+=!-tU%2zg2L3Rp)=h#gu6(I2Fz
zCt#YtffEt_l)%O6u+F>eANzh`hgC#gN#Mg=Z6!+O`TTvmUcgXIr^+EITGX|XV9xX)
zb8@i#rsKvDfky7MLUWUA!mo9?7yst&IsQ>@r;Ug!#09CuW%LW$P{|dmqf5J#046Dc
zGn!h*DHoaBv8YaW|Gu|)7oHE8-B#&GeeRTsj^o!N%@UnK++)>Wp$29FuyAovQ#742
z*6;{CbuNix{Mtkt%RX$*N*_H1>Zb!J<h2RvYfICd)TWLVpu<W=jRz}@q<Jpeu+vR{
zLT%)F{CbwMSKx#Nnbl!r8)a&A^Yugl{_y9o2KAL&JDK$6Qf%nZUI}OCg!i6@I^jGk
zt5<$XqD>N!6lsfRx8oP7j^UK7uha5Mb+95@yE}6Hwm(&$bFamM-_Pbd#&s-2ASDc;
z24NO|gx*Y(uXy6F%X7_zmQfQ=yf3{#*TEzY-L9CEX>^WRLop!N_8&l}!XEo^v@R5Z
zW)w-?@!dj5!RvsI`3ocP4dopa$8jIs65+>_WFWWM3$3TMxAcRgtIu_CC7pVsR*svR
ze)H6!>d5@q;&f;5wXRfPk*|ktT|atLivZTc$P8|ASa&u^b&UJzw?p}9&)iraYuolP
zx4k12>KGAAnbu8WA{z(R<9y0`S8dEm^yFl*XIbCRC-|?4LX?Q^q1$vHd)<@DJ5q}E
zbu)STx2H&2)Xh}XRX?kXWEGuL6Q^!UGS#s&Y8^q{TXudm)8{;(wjy=0_bI)G^IMYY
zBmc1gSl?Ea$Q*sCYZ^y!AcP!u(s$B+{!E<07wVRJCYo7<IkHUN!${l};wDrnqIeqJ
z{cBa;m1|~FwbJkBQvpMe)YpQz@CDX;<r(Aqr_vt?R*#`AwwK)~@XJaUTh}=1ml$Tx
ziDE)kp7-5v_1^LHX&b0qwtC$xg3B5@eniHaopOA05gqe)cq;GJNgg@tj>?p|pf9X|
zI?=e-$+8e*v5rnQ<+XHRz09D5ZCtaW8BGG#`7AW(;os6IoS4)AKokvB)Tk1+@*vhC
zCSY>LnoMAqIUp2LB1pfwsIKqh?HV(!t-<@<pDb&W_7lFPG{vF>j#W{3+2>h!(5lf7
zqMXZ8<4u#W7W*-Q`9drv{a^T*<GH;ZSSm|-g@;xM8B5~nu?#8JSd}-00-@EuhN|Tn
zOVk`CxNg5)nI5wJb-YXDdHklJm=sB(ZyAX&^AKZhgS2__S)68@b&A7$3uJ$T$$kal
z9A}<kR;zG4uZ7nRItjg6Z^3C$JjFoy)g-!R7&f;ics0c+L7A5tZG=-mUg}~zM)-!^
zOsm1v{)1KJ2xge59@{4hZ98Y#cSeJ?4fAU9R7VE)<@FbuP3yg_u-7ISHbR`;!|a)k
zV;<jVbMo&m+Je*1$L4XS-Ooxo&u`z3wTe_15@S}>A+)2G7`)$culyPj$V|04G#0$n
z?1>;Na=K~xxYlWT;-ldkK}~d<NTOc*bvoS|nRs`b@?-jKa4}qBR)^KWZ|e~|{YokL
z3?zUQ!J-4Fzi@Y2AT$k<O{tiP0ZV4Cqe+-Lw7|EQrAK@By5bD2uYEnrXiWmR7Ji$s
ziCUUHzSm)U{04iKwb4#yaZnL1oNtMnUOzL?X$&tWyj!7*_fWC?YTTRb7d0rzdKE)M
z&v1%%8%z2`VD?5vsJH5)vUx(D;lm<}>mHL-l;CSZ&(gDN=`}+c)4&w>gX?voO*6~m
zS)3j(!qN5RY#pV*aD$~W&ZwT_Vp}s|iKp>BWBdp5?QOg?YyZyQ`^76-k(m!VwWOX@
zZDCBlz@!6fdsI<QVvdba2_1VHy68<;%`#Opwo!AZDLyrybW5P;%ul+t>Zc>{TX8hs
zhg8P-vp^06-jzwHsgoK~k{1!i-MJAaRQu36!cus>bT2b7Hly8(jlh}jFUtExX~v3X
zzMV!*%!M`y($`hJr-MUDJ!n4cOX^K0{z-yuqjG*baW+b+zOo%Vz@?Q0>2TZi3Pu_3
z7+E%n^0FqjyQUsFw09JgaIkx<4O-XovY);#;W6*C4wWs47#{!Ii??F}1rN3C-YPVf
zf~Ar)WmxWPP0`y?r>o}!#dT8=(d7!u4+LsYvqmwd8Mb*om`bPC)4J5?UNR4Nwsfy!
z52vjpy4~bU)@8Wzo%fWfHRsuoy+lyERr!VA#B<ATA<znacAFN6z>JYE=Fev|$=z+@
zM65noj*w^M;Kjo3nd{D;U1d%x(K1>e*P2gu_8#1py*k8;ug#?S!hbfW!5raC5Gg~$
z#d=rI-%7-t*fP)43i4~-_AL+4dln0Ef(5LJ&9RXwIXR2tV26=_AK?Qc$9!fx>8lQC
zmy2;wN7{WV_v`MrD%Gyo*#>fDm6W^sVrDn`=qSHT<U?JE^n@J_N7Ug-8~ycu(AzLb
zJjO*12{DHZ_pi6pR{R={svn1=IFsQBMKBjVmHpmZ4stS*3XESRjjGN`6TiVr@aI_f
z(7uq<x|1hao6oktJ)lf17rj2aN%W>!&3vVj$v4#)ajeR$;^JgkN{oSO+vVUDK}~U+
znpg`0Z=m>j;()gX@u`%)_!}bE9{MbMthLvs#4i=7DPSZStITESN4eOU`7IS%^?@~#
z%)QPSdH5J=HXqFn7$)5m7$V3uQoRlEvf)Jc`9#z3mZlxN{VHO@pNbUc`Oj;uC8ljZ
zT=WZRzfICCv6NlGo_UV{8pe-nTUy}bc_~#t<Pq5+Z5+0xU*fHmEjs%Z!zWqG{;Vj1
z!;V~}{bq>PC|747qsY2BX(p>%bJa>;q4NqMVjt7SsXVp%OO<5{-R~dKEmYB}psaZh
z6!kpRT^{EBgvn|E;1d9qDq9lK)4|v+jtMhSnbXQMqEFRiMHW8p%uHxM`t3QS(x!dr
z*GUgE|B9WSRU76$ab=*scYq-1!y+`LePv-5sg57k>hSq09>EPOG{mx(Fgf{*rJi*$
z<xU8}&yma{d87sJ^pa=LNU;Ogs?U&~gXqIO^MN9<>oSV3Yq`9u7{P(^dwM@R(ymY?
z#-P1><u2qPRNr6%dWBb)-#ZB(T7B`Brkd<T9;4hoI;2X|mzH?vx<8Ad{yk{{<AeJ5
zpCZ7YKXpL<&jOS`7v*77P%^U&b-jkPW9{uN?VX(sNvmQ8fxkf*7~kMbn$HipAZKbt
zJsatNODusmFq(Rq&>#ov?XjSR05~We=x3D!vaN(}DcVs>E0@$S7Y_Pp8b5^<;7|q(
zB;bQ;mieVMh`yPJ?qpm2@_H<<Y`n^KOrCA@_|BPWW321rM+1gUVg$CO8ob~h0G2o+
zXq*>LNAO%JOXusPQnax5Yh6RL9ygh_*{KI_<+unGTwFRB+O)qk7Fb<Ca@fnKalw*p
z<#qEM|I(<oasJ%+gE(Q%nW1o41&tE~@lJ<MdwqRuj}lbj0`?aonV2hey(jxw)9J+B
zONvrAf-xTD7I#d;-s}AQmd`hlu|C?#DZMR@&Cu&l)#wYhD_Zt7AXm@A6%7ZCt$GLe
zE5x%PY=+T`H@TSDX4k%bb?+)foz`B**fxpCWCk<s8+CbE7nmk-O6;GG^7Tp1xFN`T
znB;oX`f*oUCfXEhV7}_6sU#Tsb;KjD)hpE$j_C3JOD*LOHDLd_Tp`4Zv~NhQ*JgmS
z9*?szSb$T80fG7roMA??UOZKDql0Lt=z7t>Wd@;2J8ev=L8|H|ruN24!)%#h@U{F@
z<vYw?+oZc-`Pc;zs=7^n^=*v-<AuEi{HLVhr6#Q6>k1pp<Dr2r(=VD)+ftG~rhBHT
zqysq?8XPuFuO|GMHekCEg&J>1MRHyEU=+W(f0&ItMd`At&?jGj?w!FK3nFeUOb=&1
z$vQrR<#4h)8j62(0R0y6>o$92R>4AmA~?#idwsauqA;C@fj1W%9ks9*_3#=rD-Z!)
zl3TIXMvVXi_^tE?=g!QkeSNPpwejW1+r`s+&j@x^h~($k2Y?X}q`I>S1qm_{neVaZ
zbXK`vEjLj5yYwI2aE6F~9H}TMP#0@H7K#9VKo^QL08XA2WJV6j#ltHVk8b{GJe%(q
zvV*&Xa!RAbtTs~m%Hkih35l$}wDrO}Vt<t4Tzk>xSN-tpCwyCWJA>9ZPErT8-#Db1
z^bsS8XAJAY=&-RfXI{h)osu>=ij>;eHcKSd-AGrf8s%MP;eOM140^Sd8OSTbz1M=#
z{xY<wrfh?<#$cN+t!%cS-$SUZ?=KTwnH&{bmqx(IAOkOPb;{s#7;u@g(qXgkv0S}(
z8#wu?>@3HxNm=_qV9DZQFlJLy=X_UM0HwN&Z)wCE?VS4EyF!Is!6j1pz?Ji)V=G|~
zD8``gHaV2vF>|M<Z_d$--fP++ve5}3zucmll=bONjZ}Xq94EDuqYy-lzDjb?Gw~9R
zz?vX%3j8#exRfEXQ=)~KS|(-uSt+YYnQFv_+fmpMjkCJO$C9D`v63)5i&4!=|Fgrg
zlf0_WD|v41t=^gIJ?3f?ntg&f{XkqqzBi1@WDV<M*R<T(WM0=hP87)<Gsl<DG}JuJ
z+nKdFcd6cir)6ZJ9c!QYU@MCh4q#7|cNGzg1r*U*?@wy4G~<O4<(Keyc*#J1@3(y`
z=E1gHKUM~kGYV;$g)^i3u_a-Mt@NHkq<Z35SKYeLe)=1m9g;ki&Rt=3bdSb2`DO+!
zm7?B<?yQWWDU7ir-4E@DVp&<1B+?l)RxsNBzW|*CV*3*3K3$zl3dL6Z%s%w|2Fzu&
z>L)U4v3Q~^H7?LWGs+qo(R=H-C&#fwX@@e&3r>dh0?BS_ORk<+39awM%kAv(V>+6s
z-~E_@SW#K&5Zqeoriiceek5dpMtGcRp_MIV2szZa0p54SE!8as0Pnr?*nmz+ZzN!$
zXT}KaWH~UKPKh~}w5#iyip^@I@2raoGN^A&>RzEtUSg7s7$y45iGgYZqGO-vCeag^
zq4-ENS!hm55=8J$o}z$LgR+b%M9>9;s_C&HQQ5y;Auf!}&u13#+O&NM{T7c2R=p&A
zl@BI5@wD>-HLlo<v;1;p1=_Rq_vSk|F%0909yT_KA=a|dhH2h>axMEe*UHjqx%faJ
z`(5h`;fm;n7e00*lOMSnE`a-}M?k${j(Ii`20)TCLrJnAnAOD|CXrur5_iw(g(J+b
zlJp6pH+>^zGRjbD@f|d}UOf$@*7xM9-~BBMO2{;a6)?px8722)d;nWKYetEgpz!Ye
z{Hf;zB%UNyHRE9shx-)_BdRO!2bga^Y77~k=Su4PfR_F2*QT8=&=Wa$UaqvSttG83
zDVCSnI{p&PBbi*qOjr^iTI*6}A*>noed9s(L>rAw-^8?@pGJELes+Xqs-Ok{`x5~n
z51n&tcgr9xOQy+`5tKk#*VmNaBwyL#*Xdt6`m)zAp!4}Z&c>XwX@wT$&#`W>7JM>@
za&i?V0n_1eXt=<laOf~;1R{ATN_}!<{C)vce)cDG>_UdfNEc@e9bDxpGH$XIM~i9I
z#<4Nw)sD2+1agZfF77)+dyQnUMUR29$LE`RdDp@NN7#@0UCP}&_50yG2q}<(l=4OH
z7Z1tH1=yXf=@IW6*zdfHdyydgtau(~6m#1K+>ItdV)%5hVGd$sv<(}ehs<bF21){x
z#kQHsY}vyXdTVLArglvm^~w2;7Y#zZbbmX-*0b>m^5JY9;w`9=%c|q~;i~B4v){AY
zdF?KWrp)A^oW)WJ`vx+3CrlDS$P|6b&D@!Bd_w;@BYs4)g-+-!BO*gUMknO8<+V58
zkELV*><{A@aiWck0ojeJ$^8%IbN|%k?Y-qXdtBmn6ix0g*A*RYdjH%u;(klX7JeTe
zB-Eg5K88$}^ushzaN^9pospKT(^y2#4P?fcvY2JS(j{Aeav02R_Prs&cYF63y|^Yf
z22;Q>u6;U!ozfDz$amHZY?_G2tX>5t!4>3*t=n!1edt$+z3Y?I5BUPN@#SnZC4g^>
zJkE0Rvc*UXB3Fy5`{o)`ZC^l`JFrPI!ROM4RcWM+nOx{>>IFHZvO#(cnPF#uf6D-q
zxb?HCRPgaIm+X6qg_-U6XQ^BdeM*!=t9$_dmAqUo_l^J>K+cSYrgI1e0MEy|fF~W%
zTl*ij{}_MMT}<Ma3At=@D8EdIAv^k%7QczDM+S+lCypirFdDJ1mT=sJ=9Yi@ywSSY
zmmlKf9P@ske((rZS+GJy?W!-??wMwyY@zf&kY<#T+7(+yF)fNR92PyZ=M^qI3!TY_
Wus0l%j6@)LIXSme)VMP`OaMGomtd^`

literal 0
HcmV?d00001

diff --git a/tools/UpdatePaths/Scripts/11701_drinks_refactor.txt b/tools/UpdatePaths/Scripts/11701_drinks_refactor.txt
new file mode 100644
index 0000000000000..ca5e80081807b
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/11701_drinks_refactor.txt
@@ -0,0 +1,25 @@
+# Glasses to cups
+/obj/item/reagent_containers/cup/@SUBTYPES : /obj/item/reagent_containers/cup/@SUBTYPES {@OLD}
+
+# Foods
+/obj/item/reagent_containers/food/drinks/@SUBTYPES : /obj/item/reagent_containers/cup/glass/@SUBTYPES {@OLD}
+/obj/item/reagent_containers/condiment/@SUBTYPES : /obj/item/reagent_containers/condiment/@SUBTYPES {@OLD}
+
+# Sodas
+/obj/item/reagent_containers/cup/glass/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD}
+/obj/item/reagent_containers/cup/soda_cans/@SUBTYPES : /obj/item/reagent_containers/cup/soda_cans/@SUBTYPES {@OLD}
+
+# Juices
+/obj/item/reagent_containers/food/drinks/glass/bottle/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD}
+/obj/item/reagent_containers/food/drinks/glass/bottle/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD}
+/obj/item/reagent_containers/food/drinks/glass/bottle/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD}
+/obj/item/reagent_containers/food/drinks/glass/bottle/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD}
+/obj/item/reagent_containers/food/drinks/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD}
+/obj/item/reagent_containers/food/drinks/glass/bottle/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD}
+
+/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice : /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/juice/cream : /obj/item/reagent_containers/cup/glass/bottle/juice/cream {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/pineapplejuice : /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice {@OLD}
+/obj/item/reagent_containers/cup/glass/bottle/juice/menthol : /obj/item/reagent_containers/cup/glass/bottle/juice/menthol {@OLD}

From 4b04fb2578f3fa49152ba8f452dede2617530428 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Fri, 18 Oct 2024 14:51:49 -0500
Subject: [PATCH 11/14] Automatic changelog generation for PR #11701 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-11701.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-11701.yml

diff --git a/html/changelogs/AutoChangeLog-pr-11701.yml b/html/changelogs/AutoChangeLog-pr-11701.yml
new file mode 100644
index 0000000000000..9837f38fc3888
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11701.yml
@@ -0,0 +1,17 @@
+author: rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend
+delete-after: true
+changes:
+  - refactor: repaths drinks and reagent containers to a centralized file. Food reagent_containers
+      no longer exist.
+  - bugfix: fixed a few outlying food checks that still expected reagent_containers
+  - bugfix: fixed caltrop bug with plates
+  - bugfix: hot chocolate no longer spontaneously becomes chocolate milk when put
+      in a different container
+  - code_imp: moves hot chocolate, tea, coffee "food" recipes to drink recipes
+  - tweak: hot chocolate now inherits milk's healing (its made from milk, get it?)
+  - tweak: caltrop now applies to broken bottles
+  - tweak: drinking from used glasses can now pass diseases, same as food. Bartenders!
+      Clean your glasses!
+  - tweak: adds soda shaking. Shaking/throwing a soda around before opening may make
+      it erupt when opened.
+  - rscadd: soda shaking noises

From f0a32e0a38136acd98a416c59b4734c086f7a373 Mon Sep 17 00:00:00 2001
From: ktlwjec <122807629+ktlwjec0@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:44:04 +0100
Subject: [PATCH 12/14] broken grilles drop rods (#11688)

---
 code/game/objects/structures/grille.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 23cdc4cc5c25e..b9326d3200972 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -288,7 +288,7 @@
 		rods_amount = 1
 		rods_broken = FALSE
 		var/drop_loc = drop_location()
-		var/obj/R = new rods_type(drop_loc, rods_broken)
+		var/obj/R = new rods_type(drop_loc, rods_amount)
 		if(QDELETED(R)) // the rods merged with something on the tile
 			R = locate(rods_type) in drop_loc
 		if(R)

From f89719e85c22f6a099790888be92f8700fee9a6a Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Fri, 18 Oct 2024 15:06:13 -0500
Subject: [PATCH 13/14] Automatic changelog generation for PR #11688 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-11688.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-11688.yml

diff --git a/html/changelogs/AutoChangeLog-pr-11688.yml b/html/changelogs/AutoChangeLog-pr-11688.yml
new file mode 100644
index 0000000000000..a1e2e2d4312e0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11688.yml
@@ -0,0 +1,4 @@
+author: ktlwjec
+delete-after: true
+changes:
+  - bugfix: Breaking grilles no longer drop invisible rods.

From b5dfa88be31270ea1f16cd0a6c6fe50bbdb01fd0 Mon Sep 17 00:00:00 2001
From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:03:22 +0000
Subject: [PATCH 14/14] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 19 +++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 18 ++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-11688.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-11701.yml | 17 -----------------
 4 files changed, 37 insertions(+), 21 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11688.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-11701.yml

diff --git a/html/changelog.html b/html/changelog.html
index a0b2af2cea53e..4c1b8089ef563 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,25 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">18 October 2024</h2>
+			<h3 class="author">ktlwjec updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Breaking grilles no longer drop invisible rods.</li>
+			</ul>
+			<h3 class="author">rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="refactor">repaths drinks and reagent containers to a centralized file. Food reagent_containers no longer exist.</li>
+				<li class="bugfix">fixed a few outlying food checks that still expected reagent_containers</li>
+				<li class="bugfix">fixed caltrop bug with plates</li>
+				<li class="bugfix">hot chocolate no longer spontaneously becomes chocolate milk when put in a different container</li>
+				<li class="code_imp">moves hot chocolate, tea, coffee "food" recipes to drink recipes</li>
+				<li class="tweak">hot chocolate now inherits milk's healing (its made from milk, get it?)</li>
+				<li class="tweak">caltrop now applies to broken bottles</li>
+				<li class="tweak">drinking from used glasses can now pass diseases, same as food. Bartenders! Clean your glasses!</li>
+				<li class="tweak">adds soda shaking. Shaking/throwing a soda around before opening may make it erupt when opened.</li>
+				<li class="rscadd">soda shaking noises</li>
+			</ul>
+
 			<h2 class="date">16 October 2024</h2>
 			<h3 class="author">BeeLover66 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 90b806a3ff51d..5c4a2ad684f52 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -44632,3 +44632,21 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   BeeLover66:
   - bugfix: Radio channels no longer always default to common when no encryption key
       is installed
+2024-10-18:
+  ktlwjec:
+  - bugfix: Breaking grilles no longer drop invisible rods.
+  rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend:
+  - refactor: repaths drinks and reagent containers to a centralized file. Food reagent_containers
+      no longer exist.
+  - bugfix: fixed a few outlying food checks that still expected reagent_containers
+  - bugfix: fixed caltrop bug with plates
+  - bugfix: hot chocolate no longer spontaneously becomes chocolate milk when put
+      in a different container
+  - code_imp: moves hot chocolate, tea, coffee "food" recipes to drink recipes
+  - tweak: hot chocolate now inherits milk's healing (its made from milk, get it?)
+  - tweak: caltrop now applies to broken bottles
+  - tweak: drinking from used glasses can now pass diseases, same as food. Bartenders!
+      Clean your glasses!
+  - tweak: adds soda shaking. Shaking/throwing a soda around before opening may make
+      it erupt when opened.
+  - rscadd: soda shaking noises
diff --git a/html/changelogs/AutoChangeLog-pr-11688.yml b/html/changelogs/AutoChangeLog-pr-11688.yml
deleted file mode 100644
index a1e2e2d4312e0..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-11688.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: ktlwjec
-delete-after: true
-changes:
-  - bugfix: Breaking grilles no longer drop invisible rods.
diff --git a/html/changelogs/AutoChangeLog-pr-11701.yml b/html/changelogs/AutoChangeLog-pr-11701.yml
deleted file mode 100644
index 9837f38fc3888..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-11701.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-author: rkz, Ryll/Shaps, LemonInTheDark, Couls, JohnFulpWillard, OnlineGirlfriend
-delete-after: true
-changes:
-  - refactor: repaths drinks and reagent containers to a centralized file. Food reagent_containers
-      no longer exist.
-  - bugfix: fixed a few outlying food checks that still expected reagent_containers
-  - bugfix: fixed caltrop bug with plates
-  - bugfix: hot chocolate no longer spontaneously becomes chocolate milk when put
-      in a different container
-  - code_imp: moves hot chocolate, tea, coffee "food" recipes to drink recipes
-  - tweak: hot chocolate now inherits milk's healing (its made from milk, get it?)
-  - tweak: caltrop now applies to broken bottles
-  - tweak: drinking from used glasses can now pass diseases, same as food. Bartenders!
-      Clean your glasses!
-  - tweak: adds soda shaking. Shaking/throwing a soda around before opening may make
-      it erupt when opened.
-  - rscadd: soda shaking noises