diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm
index 0519fffe024..ab73e033b33 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general.dm
@@ -107,8 +107,16 @@
 	coffeecups["NKA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nka
 	coffeecups["PRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra
 	coffeecups["DPRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra
-	coffeecups["sedantis coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis
+	coffeecups["Sedantis coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis
+	coffeecups["CoC coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/coc
+	coffeecups["Eridani coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/eridani
+	coffeecups["Elyra coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/elyra
+	coffeecups["Hegemony coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony
+	coffeecups["Jargon coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon
 	coffeecups["NT coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt
+	coffeecups["Hephaestus coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht
+	coffeecups["Idris coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris
+	coffeecups["Zeng-Hu coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng
 	coffeecups["TCFL coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl
 	coffeecups["#1 coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one
 	coffeecups["#1 monkey coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/puni
diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm
index 2b9128a0d21..e11b4c8076f 100644
--- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm
+++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm
@@ -58,6 +58,31 @@
 	desc = "A metal coffee cup bearing the flag of Sedantis."
 	icon_state = "coffeecup_sedantis"
 
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/coc
+	name = "\improper CoC coffee cup"
+	desc = "A metallic coffee cup proudly bearing the flag of the Coalition of Colonies."
+	icon_state = "coffeecup_coc"
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/eridani
+	name = "\improper Eridani coffee cup"
+	desc = "An expensive coffee cup bearing the flag of the Eridani Federation."
+	icon_state = "coffeecup_eridani"
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/elyra
+	name = "\improper Elyra coffee cup"
+	desc = "A coffee cup bearing the flag of the Republic of Elyra."
+	icon_state = "coffeecup_elyra"
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony
+	name = "\improper Hegemony coffee cup"
+	desc = "A coffee cup bearing the flag of the Izweski Hegemony."
+	icon_state = "coffeecup_hegemony"
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon
+	name = "\improper Jargon coffee cup"
+	desc = "A purple coffee cup emblazoned with the flag of the Jargon Federation."
+	icon_state = "coffeecup_jarg"
+
 // Organisations
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt
 	name = "\improper NT coffee cup"
@@ -69,6 +94,21 @@
 	desc = "A coffee cup with the TCFL emblem emblazoned on it."
 	icon_state = "coffeecup_tcfl"
 
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht
+	name = "\improper Hephaestus coffee cup"
+	desc = "A strong coffee cup with the hephaestus logo emblazoned on it."
+	icon_state = "coffeecup_hepht"
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris
+	name = "\improper Idris coffee cup"
+	desc = "An Idris Incorporated coffee cup."
+	icon_state = "coffeecup_idris"
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng
+	name = "\improper Zeng-Hu coffee cup"
+	desc = "A coffee cup bearing the Zeng-Hu logo."
+	icon_state = "coffeecup_zeng"
+
 // Symbols, markings
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one
 	name = "#1 coffee cup"
diff --git a/html/changelogs/CoffeeCupsAgain.yml b/html/changelogs/CoffeeCupsAgain.yml
new file mode 100644
index 00000000000..e78c8b72439
--- /dev/null
+++ b/html/changelogs/CoffeeCupsAgain.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf & Bunkyb
+
+delete-after: True
+
+changes:
+  - rscadd: "Added several new coffee cups: CoC, Eridani, Elyra, Hegemony, Jargon, Hepht, Idris & Zeng."
diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi
index 4b45c035ffa..4b4dc73cd13 100644
Binary files a/icons/obj/drink_glasses/coffecup.dmi and b/icons/obj/drink_glasses/coffecup.dmi differ