diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index d63a68046ae..f25f6e234d6 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -379,8 +379,4 @@
 	if (weedlevel < 1)	// You don't want to see these icons if the value is small
 		holder.icon_state = ""
 		return
-	holder.icon_state = "hudweed[RoundPlantBar(weedlevel/10)]"
-
-/obj/structure/beebox/proc/plant_hud_set_honey()
-	var/image/holder = hud_list[PLANT_HONEY_HUD]
-	holder.icon_state = "hudhoney[honeycombs.len]"
\ No newline at end of file
+	holder.icon_state = "hudweed[RoundPlantBar(weedlevel/10)]"
\ No newline at end of file
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index d8f128d2a5a..817f002f014 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -37,9 +37,6 @@
 	icon_state = "beebox"
 	anchored = 1
 	density = 1
-
-//	hud_possible = list (PLANT_HONEY_HUD)
-
 	var/mob/living/simple_animal/hostile/poison/bees/queen/queen_bee = null
 	var/list/bees = list() //bees owned by the box, not those inside it
 	var/list/honeycombs = list()
@@ -51,10 +48,6 @@
 	..()
 	processing_objects.Add(src)
 
-/*	var/datum/atom_hud/data/hydroponic/hydro_hud = huds[DATA_HUD_HYDROPONIC]
-	hydro_hud.add_to_hud(src)
-	plant_hud_set_honey()
-*/
 
 /obj/structure/beebox/Destroy()
 	processing_objects.Remove(src)
@@ -258,4 +251,4 @@
 					if(!user.put_in_active_hand(QB))
 						QB.forceMove(get_turf(src))
 					visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
-					queen_bee = null
+					queen_bee = null
\ No newline at end of file
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index 8a056d3e67d..0f23b2a6532 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -21,6 +21,16 @@
 	build_path = /obj/item/clothing/glasses/hud/health
 	category = list("Equipment")
 
+/datum/design/health_hud_night
+	name = "Night Vision Health Scanner HUD"
+	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
+	id = "health_hud_night"
+	req_tech = list("biotech" = 4, "magnets" = 5)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250)
+	build_path = /obj/item/clothing/glasses/hud/health/night
+	category = list("Equipment")
+
 /datum/design/magboots
 	name = "Magnetic Boots"
 	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
@@ -41,14 +51,14 @@
 	build_path = /obj/item/clothing/glasses/night
 	category = list("Equipment")
 
-/datum/design/health_hud_night
-	name = "Night Vision Health Scanner HUD"
-	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
-	id = "health_hud_night"
-	req_tech = list("biotech" = 4, "magnets" = 5)
+/datum/design/security_hud
+	name = "Security HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
+	id = "security_hud"
+	req_tech = list("magnets" = 3, "combat" = 2)
 	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250)
-	build_path = /obj/item/clothing/glasses/hud/health/night
+	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+	build_path = /obj/item/clothing/glasses/hud/security
 	category = list("Equipment")
 
 /datum/design/security_hud_night
@@ -61,16 +71,6 @@
 	build_path = /obj/item/clothing/glasses/hud/security/night
 	category = list("Equipment")
 
-/datum/design/nvgmesons
-	name = "Night Vision Optical Meson Scanners"
-	desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
-	id = "nvgmesons"
-	req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4)
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000)
-	build_path = /obj/item/clothing/glasses/meson/night
-	category = list("Equipment")
-
 /datum/design/mesons
 	name = "Optical Meson Scanners"
 	desc = "Used for seeing walls, floors, and stuff through anything."
@@ -81,14 +81,14 @@
 	build_path = /obj/item/clothing/glasses/meson
 	category = list("Equipment")
 
-/datum/design/security_hud
-	name = "Security HUD"
-	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
-	id = "security_hud"
-	req_tech = list("magnets" = 3, "combat" = 2)
+/datum/design/nvgmesons
+	name = "Night Vision Optical Meson Scanners"
+	desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
+	id = "nvgmesons"
+	req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4)
 	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
-	build_path = /obj/item/clothing/glasses/hud/security
+	materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000)
+	build_path = /obj/item/clothing/glasses/meson/night
 	category = list("Equipment")
 
 /datum/design/air_horn
@@ -170,3 +170,23 @@
 	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 300)
 	build_path = /obj/item/clothing/glasses/hud/diagnostic/night
 	category = list("Equipment")
+
+/datum/design/hydroponic_hud
+	name = "Hydroponic HUD"
+	desc = "A HUD used to analyze the health and status of plants growing in hydro trays and soil."
+	id = "hydroponic_hud"
+	req_tech = list("magnets" = 3, "biotech" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/clothing/glasses/hud/hydroponic
+	category = list("Equipment")
+
+/datum/design/hydroponic_hud_night
+	name = "Night Vision Hydroponic HUD"
+	desc = "A HUD used to analyze the health and status of plants growing in low-light environments."
+	id = "hydroponic_hud_night"
+	req_tech = list("magnets" = 5, "biotech" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 200)
+	build_path = /obj/item/clothing/glasses/hud/hydroponic/night
+	category = list("Equipment")
\ No newline at end of file
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 49a50c2a839..91f4aa1e374 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 043f4208d45..89ddaa6cc8f 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1392,7 +1392,6 @@
 #include "code\modules\mining\laborcamp\laborstacker.dm"
 #include "code\modules\mob\abilities.dm"
 #include "code\modules\mob\death.dm"
-#include "code\modules\mob\emote.dm"
 #include "code\modules\mob\hear_say.dm"
 #include "code\modules\mob\holder.dm"
 #include "code\modules\mob\inventory.dm"
@@ -1444,7 +1443,6 @@
 #include "code\modules\mob\living\carbon\alien\login.dm"
 #include "code\modules\mob\living\carbon\alien\logout.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\empress.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\inventory.dm"
@@ -1456,7 +1454,6 @@
 #include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm"
 #include "code\modules\mob\living\carbon\alien\larva\death.dm"
-#include "code\modules\mob\living\carbon\alien\larva\emote.dm"
 #include "code\modules\mob\living\carbon\alien\larva\inventory.dm"
 #include "code\modules\mob\living\carbon\alien\larva\larva.dm"
 #include "code\modules\mob\living\carbon\alien\larva\life.dm"
@@ -1467,7 +1464,6 @@
 #include "code\modules\mob\living\carbon\brain\brain.dm"
 #include "code\modules\mob\living\carbon\brain\brain_item.dm"
 #include "code\modules\mob\living\carbon\brain\death.dm"
-#include "code\modules\mob\living\carbon\brain\emote.dm"
 #include "code\modules\mob\living\carbon\brain\life.dm"
 #include "code\modules\mob\living\carbon\brain\login.dm"
 #include "code\modules\mob\living\carbon\brain\MMI.dm"
@@ -1476,7 +1472,6 @@
 #include "code\modules\mob\living\carbon\human\appearance.dm"
 #include "code\modules\mob\living\carbon\human\body_accessories.dm"
 #include "code\modules\mob\living\carbon\human\death.dm"
-#include "code\modules\mob\living\carbon\human\emote.dm"
 #include "code\modules\mob\living\carbon\human\examine.dm"
 #include "code\modules\mob\living\carbon\human\human.dm"
 #include "code\modules\mob\living\carbon\human\human_attackalien.dm"
@@ -1507,7 +1502,6 @@
 #include "code\modules\mob\living\carbon\human\species\species.dm"
 #include "code\modules\mob\living\carbon\human\species\station.dm"
 #include "code\modules\mob\living\carbon\slime\death.dm"
-#include "code\modules\mob\living\carbon\slime\emote.dm"
 #include "code\modules\mob\living\carbon\slime\examine.dm"
 #include "code\modules\mob\living\carbon\slime\life.dm"
 #include "code\modules\mob\living\carbon\slime\powers.dm"
@@ -1516,7 +1510,6 @@
 #include "code\modules\mob\living\carbon\slime\subtypes.dm"
 #include "code\modules\mob\living\carbon\slime\update_icons.dm"
 #include "code\modules\mob\living\silicon\death.dm"
-#include "code\modules\mob\living\silicon\emote.dm"
 #include "code\modules\mob\living\silicon\laws.dm"
 #include "code\modules\mob\living\silicon\login.dm"
 #include "code\modules\mob\living\silicon\say.dm"
@@ -1539,7 +1532,6 @@
 #include "code\modules\mob\living\silicon\decoy\decoy.dm"
 #include "code\modules\mob\living\silicon\decoy\life.dm"
 #include "code\modules\mob\living\silicon\pai\death.dm"
-#include "code\modules\mob\living\silicon\pai\emote.dm"
 #include "code\modules\mob\living\silicon\pai\examine.dm"
 #include "code\modules\mob\living\silicon\pai\life.dm"
 #include "code\modules\mob\living\silicon\pai\pai.dm"
@@ -1550,7 +1542,6 @@
 #include "code\modules\mob\living\silicon\pai\software_modules.dm"
 #include "code\modules\mob\living\silicon\robot\component.dm"
 #include "code\modules\mob\living\silicon\robot\death.dm"
-#include "code\modules\mob\living\silicon\robot\emote.dm"
 #include "code\modules\mob\living\silicon\robot\examine.dm"
 #include "code\modules\mob\living\silicon\robot\inventory.dm"
 #include "code\modules\mob\living\silicon\robot\laws.dm"
@@ -1583,7 +1574,6 @@
 #include "code\modules\mob\living\simple_animal\bot\cleanbot.dm"
 #include "code\modules\mob\living\simple_animal\bot\construction.dm"
 #include "code\modules\mob\living\simple_animal\bot\ed209bot.dm"
-#include "code\modules\mob\living\simple_animal\bot\emote.dm"
 #include "code\modules\mob\living\simple_animal\bot\floorbot.dm"
 #include "code\modules\mob\living\simple_animal\bot\medbot.dm"
 #include "code\modules\mob\living\simple_animal\bot\mulebot.dm"