diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index c7c7dd90c26..d4bbc78e3d0 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -384,14 +384,15 @@
 /turf/simulated/floor/pod/light,
 /area/ruin/powered/beach)
 "ry" = (
-/obj/structure/table,
 /obj/item/storage/toolbox/mechanical,
 /obj/item/storage/box/lights/mixed,
 /obj/item/stack/cable_coil,
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/item/storage/box/donkpockets,
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/spray/spraytan,
+/obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/plating,
 /area/ruin/powered/beach)
 "rC" = (
@@ -400,11 +401,20 @@
 /area/ruin/powered/beach)
 "rX" = (
 /obj/item/tank/internals/oxygen,
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 12
+	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/beach)
 "sq" = (
 /turf/simulated/floor/plating,
 /area/ruin/powered/beach)
+"sJ" = (
+/obj/structure/flora/ausbushes/stalkybush,
+/obj/item/fish_eggs/babycarp,
+/turf/simulated/floor/beach/water,
+/area/ruin/powered/beach)
 "tq" = (
 /obj/structure/table/wood,
 /obj/item/clothing/glasses/sunglasses/big{
@@ -413,6 +423,11 @@
 /obj/item/clothing/glasses/sunglasses/big,
 /turf/simulated/floor/wood,
 /area/ruin/powered/beach)
+"tG" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/vending/crittercare/free,
+/turf/simulated/floor/plasteel,
+/area/ruin/powered/beach)
 "uA" = (
 /obj/item/radio/beacon,
 /turf/simulated/floor/beach/sand,
@@ -433,6 +448,7 @@
 /obj/effect/turf_decal/stripes/asteroid/line{
 	dir = 1
 	},
+/obj/item/fish_eggs/babycarp,
 /turf/simulated/floor/plasteel,
 /area/ruin/powered/beach)
 "wf" = (
@@ -485,9 +501,20 @@
 /area/ruin/powered/beach)
 "zM" = (
 /obj/structure/table,
-/obj/item/storage/box/beakers,
-/obj/item/reagent_containers/spray/spraytan,
-/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/box/donkpockets{
+	pixel_x = -5;
+	pixel_y = 13
+	},
+/obj/item/storage/firstaid/aquatic_kit/full{
+	pixel_x = 7;
+	pixel_y = 14
+	},
+/obj/item/storage/box/beakers{
+	pixel_x = -5
+	},
+/obj/item/storage/box/drinkingglasses{
+	pixel_x = 8
+	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/beach)
 "Bl" = (
@@ -572,6 +599,14 @@
 	},
 /turf/simulated/floor/beach/sand,
 /area/ruin/powered/beach)
+"Rx" = (
+/obj/structure/closet/secure_closet/freezer/meat/open,
+/obj/item/reagent_containers/food/snacks/meat/humanoid/monkey,
+/obj/item/reagent_containers/food/snacks/meat/humanoid/monkey,
+/obj/item/reagent_containers/food/snacks/meat/humanoid/monkey,
+/obj/item/reagent_containers/food/snacks/meat/humanoid/monkey,
+/turf/simulated/floor/wood,
+/area/ruin/powered/beach)
 "SA" = (
 /obj/structure/urinal{
 	pixel_y = 28
@@ -603,7 +638,12 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/powered/beach)
 "TS" = (
-/obj/structure/closet/secure_closet/freezer/meat,
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/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,
 /turf/simulated/floor/wood,
 /area/ruin/powered/beach)
 "UU" = (
@@ -630,6 +670,12 @@
 	},
 /turf/simulated/floor/pod,
 /area/ruin/powered/beach)
+"XO" = (
+/obj/machinery/fishtank/wall{
+	opacity = 1
+	},
+/turf/simulated/floor/plating,
+/area/ruin/powered/beach)
 "YN" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/machinery/vending/snack/free,
@@ -1158,7 +1204,7 @@ Ml
 zz
 oN
 Ml
-Ml
+XO
 NQ
 Ml
 UU
@@ -1218,7 +1264,7 @@ Ml
 qf
 Ky
 ZW
-TS
+Rx
 TS
 Ml
 gg
@@ -1279,7 +1325,7 @@ vu
 Ek
 KX
 YN
-gg
+tG
 gg
 gg
 gg
@@ -1356,7 +1402,7 @@ bT
 bU
 bU
 bU
-bV
+sJ
 bU
 bW
 "}
diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm
index f40bb88ce3a..76e45f74f42 100644
--- a/_maps/map_files/RandomZLevels/academy.dmm
+++ b/_maps/map_files/RandomZLevels/academy.dmm
@@ -18,7 +18,9 @@
 /area/awaymission/academy/classrooms)
 "ag" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/snacks/jellyburger/slime,
+/obj/item/reagent_containers/food/snacks/jellyburger/slime{
+	antable = 0
+	},
 /turf/simulated/floor/grass,
 /area/awaymission/academy/academygate)
 "ai" = (
@@ -1453,7 +1455,9 @@
 /area/awaymission/academy/classrooms)
 "gh" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/snacks/grown/bluecherries,
+/obj/item/reagent_containers/food/snacks/grown/bluecherries{
+	antable = 0
+	},
 /turf/simulated/floor/grass,
 /area/awaymission/academy/academygate)
 "gi" = (
@@ -3609,7 +3613,9 @@
 /area/awaymission/academy/classrooms)
 "uy" = (
 /obj/structure/disposalpipe/segment,
-/obj/item/reagent_containers/food/snacks/cheesewedge,
+/obj/item/reagent_containers/food/snacks/cheesewedge{
+	antable = 0
+	},
 /turf/simulated/floor/indestructible/carpet,
 /area/awaymission/academy/academyaft)
 "uA" = (
@@ -3655,7 +3661,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
-/obj/item/reagent_containers/food/snacks/cheesewedge,
+/obj/item/reagent_containers/food/snacks/cheesewedge{
+	antable = 0
+	},
 /turf/simulated/floor/indestructible/carpet,
 /area/awaymission/academy/academyaft)
 "uZ" = (
@@ -4393,13 +4401,6 @@
 	icon_state = "cafeteria"
 	},
 /area/awaymission/academy/academyaft)
-"CA" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
-/obj/item/reagent_containers/food/snacks/cheesewedge,
-/turf/simulated/floor/indestructible/carpet,
-/area/awaymission/academy/academyaft)
 "CG" = (
 /obj/structure/chair/sofa{
 	dir = 8
@@ -4686,7 +4687,9 @@
 /area/awaymission/academy)
 "Fx" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
+/obj/item/reagent_containers/food/snacks/grown/citrus/orange{
+	antable = 0
+	},
 /turf/simulated/floor/grass,
 /area/awaymission/academy/academygate)
 "FA" = (
@@ -5219,7 +5222,9 @@
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/academyaft)
 "KX" = (
-/obj/item/reagent_containers/food/snacks/cheesewedge,
+/obj/item/reagent_containers/food/snacks/cheesewedge{
+	antable = 0
+	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/indestructible/carpet,
 /area/awaymission/academy/academyaft)
@@ -5379,7 +5384,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/obj/item/reagent_containers/food/snacks/cheesewedge,
+/obj/item/reagent_containers/food/snacks/cheesewedge{
+	antable = 0
+	},
 /turf/simulated/floor/indestructible/carpet,
 /area/awaymission/academy/academyaft)
 "MH" = (
@@ -6253,7 +6260,9 @@
 /obj/structure/disposalpipe/segment{
 	invisibility = 101
 	},
-/obj/item/reagent_containers/food/snacks/cheesewedge,
+/obj/item/reagent_containers/food/snacks/cheesewedge{
+	antable = 0
+	},
 /turf/simulated/floor/indestructible/carpet,
 /area/awaymission/academy/academyaft)
 "Vc" = (
@@ -17066,11 +17075,11 @@ HJ
 US
 US
 US
-US
 uy
 uy
 uy
-CA
+uy
+KD
 Zo
 US
 US
@@ -17195,13 +17204,13 @@ YQ
 Zo
 US
 US
-US
+uy
 uy
 uy
 uy
 uy
 MB
-uY
+HJ
 ra
 ra
 ra
@@ -17324,7 +17333,7 @@ rW
 YQ
 HJ
 US
-US
+uy
 uy
 uy
 uy
@@ -17332,7 +17341,7 @@ uy
 MB
 uY
 Vb
-Vb
+ra
 ra
 ra
 ra
@@ -17453,7 +17462,7 @@ rW
 rW
 YQ
 Zo
-US
+uy
 uy
 uy
 uy
@@ -17463,7 +17472,7 @@ uY
 uy
 uy
 uy
-uy
+US
 US
 US
 US
@@ -17583,7 +17592,7 @@ ip
 rW
 YQ
 HJ
-US
+uy
 uy
 uy
 uy
@@ -17594,7 +17603,7 @@ uy
 uy
 uy
 uy
-uy
+US
 US
 US
 US
@@ -17713,7 +17722,7 @@ ip
 rW
 YQ
 Zo
-US
+uy
 uy
 uy
 MB
@@ -17725,7 +17734,7 @@ uy
 uy
 uy
 uy
-uy
+US
 US
 US
 TG
@@ -17844,7 +17853,7 @@ rW
 YQ
 HJ
 US
-US
+uy
 MB
 uY
 Vb
@@ -17856,7 +17865,7 @@ Vb
 Vb
 Vb
 Vb
-Vb
+ra
 ra
 KD
 YQ
@@ -17975,8 +17984,7 @@ YQ
 Zo
 US
 TG
-HJ
-uy
+uY
 uy
 uy
 uy
@@ -17988,6 +17996,7 @@ uy
 uy
 uy
 uy
+US
 TG
 YQ
 Uu
@@ -18106,7 +18115,6 @@ UC
 TG
 HJ
 US
-US
 uy
 uy
 uy
@@ -18118,7 +18126,8 @@ uy
 uy
 uy
 uy
-CA
+uy
+KD
 YQ
 Uu
 Ra
@@ -18235,7 +18244,6 @@ YQ
 HJ
 JM
 US
-US
 uy
 uy
 uy
@@ -18248,6 +18256,7 @@ uy
 uy
 uy
 uy
+US
 TG
 YQ
 Uu
@@ -18364,7 +18373,6 @@ rW
 YQ
 Zo
 US
-US
 uy
 uy
 uy
@@ -18378,6 +18386,7 @@ uy
 uy
 uy
 US
+US
 KD
 YQ
 Uu
@@ -18493,7 +18502,6 @@ sq
 rW
 YQ
 HJ
-US
 uy
 uy
 uy
@@ -18508,6 +18516,7 @@ uy
 uy
 US
 US
+US
 TG
 YQ
 Uu
@@ -18623,7 +18632,6 @@ ip
 rW
 YQ
 Zo
-US
 uy
 uy
 uy
@@ -18638,6 +18646,7 @@ uy
 US
 US
 US
+US
 KD
 YQ
 Uu
@@ -18753,7 +18762,6 @@ ip
 rW
 YQ
 HJ
-US
 uy
 uy
 uy
@@ -18768,6 +18776,7 @@ US
 US
 US
 US
+US
 TG
 YQ
 Uu
@@ -18884,7 +18893,6 @@ rW
 YQ
 Zo
 US
-US
 uy
 uy
 uy
@@ -18898,6 +18906,7 @@ US
 US
 US
 US
+US
 KD
 YQ
 Uu
@@ -19015,7 +19024,6 @@ YQ
 HJ
 US
 US
-US
 uy
 uy
 uy
@@ -19028,6 +19036,7 @@ US
 US
 US
 US
+US
 TG
 YQ
 Uu
@@ -19146,8 +19155,7 @@ Zo
 US
 US
 US
-US
-KX
+uy
 KX
 KX
 KX
@@ -19158,6 +19166,7 @@ US
 US
 US
 US
+US
 KD
 YQ
 Uu
diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm
index 34edd8c6ac7..79306a95151 100644
--- a/_maps/map_files/celestation/celestation.dmm
+++ b/_maps/map_files/celestation/celestation.dmm
@@ -833,8 +833,6 @@
 	dir = 5
 	},
 /obj/structure/closet/secure_closet/hos,
-/obj/item/megaphone,
-/obj/item/reagent_containers/food/drinks/flask/barflask,
 /obj/item/spacepod_equipment/key{
 	id = 100000
 	},
@@ -2969,9 +2967,7 @@
 /turf/simulated/floor/engine/hull/ceiling,
 /area/mine/unexplored/cere/orbiting)
 "ayE" = (
-/obj/machinery/computer/prisoner{
-	req_access = list(2)
-	},
+/obj/machinery/computer/brigcells,
 /turf/simulated/floor/wood/fancy/light,
 /area/security/hos)
 "ayK" = (
@@ -7799,14 +7795,11 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/item/radio/intercom{
-	pixel_y = -28
-	},
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_x = -32
+/obj/item/radio/intercom{
+	pixel_x = -28
 	},
 /turf/simulated/floor/wood/fancy/light{
 	color = "gray"
@@ -11831,6 +11824,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/storage)
+"bGn" = (
+/obj/structure/chair/office/dark{
+	dir = 4
+	},
+/turf/simulated/floor/wood/fancy/light,
+/area/security/hos)
 "bGt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -13759,6 +13758,10 @@
 	name = "Labor Camp Monitoring";
 	network = list("Labor Camp")
 	},
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -26
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkred"
@@ -27391,11 +27394,6 @@
 /turf/simulated/wall/r_wall/coated,
 /area/engine/supermatter)
 "dNS" = (
-/obj/structure/sign/atmosplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в работе с Фаррагусом, а также полной адаптации Стацнии под нужды НаноТрейзен. Благодарим вас за труд, SQUEEK!. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо Для Старшего Рабочего Команды Архитекторов Фаррагуса.";
-	pixel_x = 32
-	},
 /obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellowcorners"
@@ -31042,6 +31040,12 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
 /turf/simulated/floor/carpet/royalblack,
 /area/crew_quarters/bar)
 "eBF" = (
@@ -35180,7 +35184,6 @@
 	},
 /area/engine/mechanic_workshop/hangar)
 "fsW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
@@ -35192,7 +35195,12 @@
 	name = "Bar Junction";
 	sortType = 19
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -44571,11 +44579,6 @@
 /turf/simulated/floor/carpet/arcade,
 /area/crew_quarters/dorms)
 "hes" = (
-/obj/structure/sign/goldenplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в работе с Фаррагусом, а также полной адаптации Стацнии под нужды НаноТрейзен. Благодарим вас за труд, BeebBeebBoob. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо Для Бригадира Команды Архитекторов Фаррагуса.";
-	pixel_x = -32
-	},
 /obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -52276,12 +52279,10 @@
 /turf/simulated/floor/plating,
 /area/security/prisonlockers)
 "iEd" = (
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Bridge";
-	departmentType = 5;
-	name = "Bridge Requests Console";
-	pixel_y = 30
+/obj/structure/sign/beautyplaque{
+	pixel_y = 32;
+	name = "Благодарственное Письмо Для Бригадира Команды Архитекторов Селестии";
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в области инженерного менеджмента, а также успешное проектирование Селестии по всем стандартам НаноТрейзен. Благодарим вас за труд, Saad_f603. Слава НаноТрейзен!"
 	},
 /turf/simulated/floor/carpet/black,
 /area/bridge)
@@ -54853,9 +54854,7 @@
 	},
 /area/security/medbay)
 "jbZ" = (
-/obj/machinery/computer/secure_data{
-	dir = 1
-	},
+/obj/machinery/computer/secure_data,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -59177,8 +59176,12 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/machinery/alarm{
-	pixel_y = 26
+/obj/machinery/requests_console{
+	announcementConsole = 1;
+	department = "Bridge";
+	departmentType = 5;
+	name = "Bridge Requests Console";
+	pixel_y = 30
 	},
 /turf/simulated/floor/carpet/black,
 /area/bridge)
@@ -80254,12 +80257,6 @@
 	},
 /turf/simulated/floor/glass,
 /area/hallway/primary/central)
-"odp" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/space/openspace,
-/area/space)
 "odx" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -80538,12 +80535,6 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/locker)
-"ogP" = (
-/obj/machinery/computer/card/minor/hos{
-	dir = 1
-	},
-/turf/simulated/floor/wood/fancy/light,
-/area/security/hos)
 "ogS" = (
 /obj/effect/spawner/random_spawners/blood_20,
 /obj/effect/decal/cleanable/dirt,
@@ -81355,6 +81346,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/wood/fancy/light{
 	color = "gray"
 	},
@@ -97412,7 +97409,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/item/clothing/glasses/welding,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -103005,6 +103001,12 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "neutral"
@@ -105565,6 +105567,12 @@
 	name = "Bar";
 	req_access = list(25)
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/bar)
 "sXp" = (
@@ -119595,7 +119603,6 @@
 	pixel_y = -3;
 	req_access = list(2)
 	},
-/obj/item/paper/monitorkey,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -219760,7 +219767,7 @@ eab
 liR
 xAa
 liR
-dJF
+bGn
 rWS
 qQo
 pNG
@@ -220016,7 +220023,7 @@ rWS
 oAE
 cVf
 dkU
-ogP
+dJF
 ayE
 rWS
 buS
@@ -220275,7 +220282,7 @@ rWS
 cgG
 rWS
 rWS
-iIO
+rWS
 qQo
 pNG
 mWc
@@ -227315,7 +227322,7 @@ dFy
 dFy
 dFy
 qdY
-odp
+soY
 qdY
 dFy
 dFy
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index 0d7974b5da1..51832c4f6cd 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -27637,8 +27637,8 @@
 /area/maintenance/disposal/west)
 "dNS" = (
 /obj/structure/sign/atmosplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в работе с Фаррагусом, а также полной адаптации Стацнии под нужды НаноТрейзен. Благодарим вас за труд, SQUEEK!. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо Для Старшего Рабочего Команды Архитекторов Фаррагуса.";
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в работе с Фаррагусом, а также полную адаптацию станции под стандарты НаноТрейзен. Благодарим вас за труд, SQUEEK!. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо Для Старшего Рабочего Команды Архитекторов Фаррагуса";
 	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
@@ -38068,8 +38068,8 @@
 /area/maintenance/port2)
 "hes" = (
 /obj/structure/sign/goldenplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в работе с Фаррагусом, а также полной адаптации Стацнии под нужды НаноТрейзен. Благодарим вас за труд, BeebBeebBoob. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо Для Бригадира Команды Архитекторов Фаррагуса.";
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в работе с Фаррагусом, а также полную адаптацию станции под нужды НаноТрейзен. Благодарим вас за труд, BeebBeebBoob. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо Для Бригадира Команды Архитекторов Фаррагуса";
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
@@ -94227,8 +94227,6 @@
 "xiZ" = (
 /obj/effect/decal/warning_stripes/northeast,
 /obj/structure/closet/secure_closet/hos,
-/obj/item/megaphone,
-/obj/item/reagent_containers/food/drinks/flask/barflask,
 /obj/item/spacepod_equipment/key{
 	id = 100000
 	},
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 226646e4ceb..ff398cc0b12 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -10741,7 +10741,6 @@
 	pixel_y = 1
 	},
 /obj/item/book/manual/sop_legal,
-/obj/item/megaphone,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
diff --git a/_maps/map_files/event/Station/delta_old.dmm b/_maps/map_files/event/Station/delta_old.dmm
index b8b80724412..5614a2ca427 100644
--- a/_maps/map_files/event/Station/delta_old.dmm
+++ b/_maps/map_files/event/Station/delta_old.dmm
@@ -6,14 +6,6 @@
 /obj/effect/landmark/event/carpspawn,
 /turf/space,
 /area/space)
-"aah" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/item/balltoy,
-/turf/simulated/floor/plating,
-/area/security/customs)
 "aam" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -10195,15 +10187,6 @@
 	icon_state = "neutralfull"
 	},
 /area/crew_quarters/locker)
-"bwx" = (
-/obj/machinery/door/poddoor/preopen{
-	id_tag = "Brig_lockdown";
-	name = "Brig Lockdown"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "red"
-	},
-/area/security/main)
 "bwy" = (
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -47591,10 +47574,6 @@
 "fMt" = (
 /turf/simulated/wall/r_wall,
 /area/maintenance/starboardsolar)
-"fMu" = (
-/obj/structure/closet/secure_closet/pilot_sniper,
-/turf/space,
-/area/space)
 "fMD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -60415,8 +60394,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/closet/secure_closet/hos,
-/obj/item/megaphone,
-/obj/item/reagent_containers/food/drinks/flask/barflask,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -65205,15 +65182,15 @@
 	c_tag = "HoS Bedroom";
 	network = list("SS13","Security")
 	},
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/speedloader/a357{
 	pixel_x = -9;
 	pixel_y = 9
 	},
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/speedloader/a357{
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/ammo_box/a357,
+/obj/item/ammo_box/speedloader/a357,
 /obj/item/clothing/accessory/holster,
 /obj/structure/safe{
 	known_by = list("hos")
@@ -123042,7 +123019,7 @@ aaa
 aaa
 aaa
 aaa
-fMu
+aaa
 aaa
 aaa
 aaa
@@ -167915,7 +167892,7 @@ tzh
 pYG
 vQG
 tMU
-aah
+jTh
 dle
 ttw
 pcp
@@ -171004,7 +170981,7 @@ xFL
 syB
 mIk
 hvr
-bwx
+uEq
 eVO
 uFp
 iGw
diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm
index 8bb280e3429..fe493719a95 100644
--- a/_maps/map_files/generic/CentComm.dmm
+++ b/_maps/map_files/generic/CentComm.dmm
@@ -6025,7 +6025,6 @@
 	layer = 5;
 	locked = 1
 	},
-/obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/door_control/secure{
 	id = "CC_supply_internal";
 	name = "Supply External Shutters";
@@ -14381,7 +14380,6 @@
 	layer = 5;
 	locked = 1
 	},
-/obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellowalt"
 	},
@@ -34033,7 +34031,10 @@
 	req_access = list(114);
 	pixel_x = -24
 	},
-/turf/simulated/wall/indestructible/reinforced,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkyellowalt"
+	},
 /area/centcom/supply)
 "pLm" = (
 /obj/machinery/light{
@@ -35552,7 +35553,6 @@
 	layer = 5;
 	locked = 1
 	},
-/obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellowalt"
 	},
@@ -50769,7 +50769,6 @@
 	layer = 5;
 	locked = 1
 	},
-/obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/door_control/secure{
 	id = "CC_supply_external";
 	name = "Supply Internal Shutters";
@@ -104393,7 +104392,7 @@ rgL
 coX
 rLT
 mpv
-hTD
+mTv
 fAg
 fAg
 fAg
@@ -104650,7 +104649,7 @@ fqL
 eiV
 mMp
 aWp
-cFn
+wRu
 gvy
 hHu
 mzs
diff --git a/_maps/map_files/generic/syndicatebase.dmm b/_maps/map_files/generic/syndicatebase.dmm
index 73d118a8912..dccbb330eb1 100644
--- a/_maps/map_files/generic/syndicatebase.dmm
+++ b/_maps/map_files/generic/syndicatebase.dmm
@@ -16661,7 +16661,7 @@
 /area/syndicate/unpowered/syndicate_space_base/dormitories/cabin1)
 "oIK" = (
 /obj/structure/table/wood,
-/obj/item/toy/plushie/orange_fox/grump,
+/obj/item/toy/plushie/black_fox,
 /turf/simulated/floor/wood,
 /area/syndicate/unpowered/syndicate_space_base/dormitories/cabin1)
 "oJk" = (
@@ -20821,14 +20821,6 @@
 	icon_state = "dark"
 	},
 /area/syndicate/unpowered/syndicate_space_base/rnd/genetics)
-"rRZ" = (
-/obj/effect/spawner/random_spawners/syndicate/turret/grenade{
-	active_power_usage = 1000;
-	idle_power_usage = 200;
-	use_power = 1
-	},
-/turf/simulated/mineral/silver,
-/area/ruin/unpowered)
 "rSi" = (
 /obj/structure/rack{
 	dir = 8;
@@ -22080,8 +22072,8 @@
 	dir = 1;
 	pixel_y = -24
 	},
-/obj/item/toy/plushie/orange_fox/grump{
-	pixel_y = 10
+/obj/item/toy/plushie/coffee_fox{
+	desc = "Extremely soft toy, sewn by a truly professional artist who loves his job. There is a tag with the inscription \"Fur...\" hanging on the paw."
 	},
 /obj/item/storage/toolbox/syndicate,
 /turf/simulated/floor/carpet/black,
@@ -46479,7 +46471,7 @@ mEC
 mEC
 mEC
 mEC
-rRZ
+xiM
 pdd
 pdd
 pdd
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index bf4b3bd9df8..2a11feb5d67 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -5,8 +5,6 @@
 /obj/item/grenade/chem_grenade
 	name = "grenade casing"
 	desc = "A do it yourself grenade casing!"
-	icon_state = "chemg"
-	item_state = "flashbang"
 	var/bomb_state = "chembomb"
 	var/payload_name = null // used for spawned grenades
 	w_class = WEIGHT_CLASS_SMALL
@@ -31,7 +29,7 @@
 	create_reagents(1000)
 	if(payload_name)
 		payload_name += " " // formatting, ignore me
-	update_icon()
+	update_appearance(UPDATE_ICON|UPDATE_NAME)
 	var/static/list/loc_connections = list(
 		COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
 	)
@@ -62,58 +60,81 @@
 	if(nadeassembly)
 		icon = 'icons/obj/assemblies/new_assemblies.dmi'
 		icon_state = bomb_state
-		var/obj/item/assembly/A = get_trigger()
-		if(stage != READY)
-			name = "bomb casing[label]"
-		else
-			if(!A)
-				name = "[payload_name]de-fused bomb[label]" // this should not actually happen
-			else
-				name = payload_name + A.bomb_name + label // time bombs, remote mines, etc
-	else
-		icon = 'icons/obj/weapons/grenade.dmi'
-		icon_state = initial(icon_state)
-		switch(stage)
-			if(EMPTY)
-				name = "grenade casing[label]"
-			if(WIRED)
-				icon_state += "_ass"
-				name = "grenade casing[label]"
-			if(READY)
-				if(active)
-					icon_state += "_active"
-				else
-					icon_state += "_locked"
-				name = payload_name + "grenade" + label
+		return
 
+	icon = initial(icon)
+
+	switch(stage)
+		if(EMPTY)
+			icon_state = "[initial(icon_state)]_unlocked"
+		if(WIRED)
+			icon_state = "[initial(icon_state)]_ass"
+		if(READY)
+			icon_state = "[initial(icon_state)][active ? "_active" : null]"
+
+
+/obj/item/grenade/chem_grenade/update_overlays()
+	. = ..()
 	underlays.Cut()
+
 	if(nadeassembly)
 		underlays += "[nadeassembly.a_left.icon_state]_left"
 		for(var/O in nadeassembly.a_left.attached_overlays)
 			underlays += "[O]_l"
+
 		underlays += "[nadeassembly.a_right.icon_state]_right"
 		for(var/O in nadeassembly.a_right.attached_overlays)
 			underlays += "[O]_r"
 
 
+/obj/item/grenade/chem_grenade/update_name(updates)
+	. = ..()
+
+	if(nadeassembly)
+		if(stage != READY)
+			name = "bomb casing[label]"
+
+		else
+			var/obj/item/assembly/A = get_trigger()
+			if(!A)
+				name = "[payload_name]de-fused bomb[label]" // this should not actually happen
+			else
+				name = payload_name + A.bomb_name + label // time bombs, remote mines, etc
+
+		return .
+
+	switch(stage)
+		if(EMPTY)
+			name = "grenade casing[label]"
+		if(WIRED)
+			name = "grenade casing[label]"
+		if(READY)
+			name = payload_name + "grenade" + label
+
+
 /obj/item/grenade/chem_grenade/attack_self(mob/user)
-	if(stage == READY &&  !active)
-		if(nadeassembly)
-			nadeassembly.attack_self(user)
-			update_icon(UPDATE_ICON_STATE)
-		else if(clown_check(user))
-			// This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing.  You could spam the admins with it.
-			investigate_log("[key_name_log(usr)] has primed a [name] for detonation [contained].", INVESTIGATE_BOMB)
-			add_attack_logs(user, src, "has primed (contained [contained])", ATKLOG_FEW)
-			to_chat(user, "<span class='warning'>You prime the [name]! [det_time / 10] second\s!</span>")
-			playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
-			active = 1
-			update_icon()
-			if(iscarbon(user))
-				var/mob/living/carbon/C = user
-				C.throw_mode_on()
-			spawn(det_time)
-				prime(user)
+	if(active || stage != READY)
+		return
+
+	if(nadeassembly)
+		nadeassembly.attack_self(user)
+		update_appearance(UPDATE_ICON)
+
+	else if(clown_check(user))
+		// This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing.  You could spam the admins with it.
+		investigate_log("[key_name_log(usr)] has primed a [name] for detonation [contained].", INVESTIGATE_BOMB)
+		add_attack_logs(user, src, "has primed (contained [contained])", ATKLOG_FEW)
+		to_chat(user, span_warning("You prime the [name]! [det_time / 10] second\s!"))
+		playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, TRUE)
+		active = TRUE
+		update_appearance(UPDATE_ICON_STATE)
+
+		if(iscarbon(user))
+			var/mob/living/carbon/C = user
+			C.throw_mode_on()
+
+		addtimer(CALLBACK(src, PROC_REF(prime), user), det_time)
+
 
 /obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	var/obj/item/projectile/P = hitby
@@ -128,14 +149,16 @@
 	if(istype(I, /obj/item/hand_labeler))
 		add_fingerprint(user)
 		var/obj/item/hand_labeler/labeler = I
+
 		if(length(labeler.label))
 			label = " ([labeler.label])"
-			update_icon(UPDATE_ICON_STATE)
+			update_appearance(UPDATE_NAME)
 			to_chat(user, span_notice("You apply new label to [src]."))
 			playsound(user.loc, 'sound/items/handling/component_pickup.ogg', 20, TRUE)
 			return ATTACK_CHAIN_PROCEED_SUCCESS|ATTACK_CHAIN_NO_AFTERATTACK
+
 		label = null
-		update_icon(UPDATE_ICON_STATE)
+		update_appearance(UPDATE_NAME)
 		to_chat(user, span_notice("You remove the label from [src]."))
 		playsound(user.loc, 'sound/items/handling/component_pickup.ogg', 20, TRUE)
 		return ATTACK_CHAIN_PROCEED_SUCCESS|ATTACK_CHAIN_NO_AFTERATTACK
@@ -176,7 +199,7 @@
 				assemblyattacher = user.ckey
 				stage = WIRED
 				to_chat(user, span_notice("You have added [nadeassembly] to [src]."))
-				update_icon(UPDATE_ICON_STATE)
+				update_appearance(UPDATE_ICON|UPDATE_NAME)
 				return ATTACK_CHAIN_BLOCKED_ALL
 
 			if(iscoil(I))
@@ -186,7 +209,7 @@
 					to_chat(user, span_warning("You need more cable length."))
 					return ATTACK_CHAIN_PROCEED
 				stage = WIRED
-				update_icon(UPDATE_ICON_STATE)
+				update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
 				to_chat(user, span_notice("You rig [src]."))
 				return ATTACK_CHAIN_PROCEED_SUCCESS
 
@@ -201,7 +224,7 @@
 		return .
 	to_chat(user, span_notice("You unlock the assembly."))
 	stage = WIRED
-	update_icon(UPDATE_ICON_STATE)
+	update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
 
 
 /obj/item/grenade/chem_grenade/wrench_act(mob/living/user, obj/item/I)
@@ -226,7 +249,7 @@
 		for(var/obj/item/beaker as anything in beakers)
 			beaker.forceMove(drop_loc)
 		beakers = list()
-	update_icon(UPDATE_ICON_STATE)
+	update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
 
 
 /obj/item/grenade/chem_grenade/screwdriver_act(mob/living/user, obj/item/I)
@@ -253,7 +276,7 @@
 			to_chat(user, span_notice("You lock the assembly."))
 			playsound(loc, prime_sound, 25, TRUE, -3)
 			stage = READY
-			update_icon(UPDATE_ICON_STATE)
+			update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
 			contained = ""
 			cores = "" // clear them out so no recursive logging by accidentally
 			for(var/obj/item/thing as anything in beakers)
@@ -344,7 +367,7 @@
 				container.forceMove(source_turf)
 			beakers = list()
 		stage = EMPTY
-		update_icon(UPDATE_ICON_STATE)
+		update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
 		return
 
 	if(nadeassembly)
@@ -371,7 +394,7 @@
 		nadeassembly.master = src
 		nadeassembly.update_icon()
 		stage = READY
-		update_icon()
+		update_appearance(UPDATE_ICON|UPDATE_NAME)
 
 
 //Large chem grenades accept slime cores and use the appropriately.
@@ -495,7 +518,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 
 /obj/item/grenade/chem_grenade/firefighting
@@ -516,7 +538,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 /obj/item/grenade/chem_grenade/incendiary
 	payload_name = "incendiary"
@@ -536,7 +557,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 
 /obj/item/grenade/chem_grenade/antiweed
@@ -560,7 +580,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 
 /obj/item/grenade/chem_grenade/cleaner
@@ -582,7 +601,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 
 /obj/item/grenade/chem_grenade/teargas
@@ -606,7 +624,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 /obj/item/grenade/chem_grenade/facid
 	payload_name = "acid smoke"
@@ -627,7 +644,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 /obj/item/grenade/chem_grenade/saringas
 	payload_name = "sarin gas"
@@ -648,7 +664,6 @@
 
 	beakers += B1
 	beakers += B2
-	update_icon(UPDATE_ICON_STATE)
 
 #undef EMPTY
 #undef WIRED
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 189b95a81e7..8e27a202b85 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -3,7 +3,7 @@
 	desc = "A hand held grenade, with an adjustable timer."
 	w_class = WEIGHT_CLASS_SMALL
 	icon = 'icons/obj/weapons/grenade.dmi'
-	icon_state = "grenade"
+	icon_state = "chemg"
 	item_state = "flashbang"
 	belt_icon = "grenade"
 	throw_speed = 4
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index be7b072a6f1..f3836a1beb4 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -212,6 +212,11 @@
 	desc = "This plaque commemorates the fall of the Atmos ZAS division. For all the charred, dizzy, and brittle men who have died in its horrible hands."
 	icon_state = "atmosplaque"
 
+/obj/structure/sign/beautyplaque
+	name = "The Most Beautiful Woman Award for Beauty"
+	desc = "Don't think, feel! It's like pointing your finger at the singularity. Don't concentrate on your finger, or you'll miss this divine beauty."
+	icon_state = "beautyplaque"
+
 /obj/structure/sign/kidanplaque
 	name = "Kidan wall trophy"
 	desc = "A dead and stuffed Diona nymph, mounted on a board."
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 57b9981fe5b..f1c925c29d9 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -12,8 +12,7 @@
 /mob/living/simple_animal/hostile/poison/bees
 	name = "bee"
 	desc = "Buzzy buzzy bee, stingy sti- Ouch!"
-	icon_state = ""
-	icon_living = ""
+	icon_state = "bee"
 	icon = 'icons/mob/bees.dmi'
 	gender = FEMALE
 	speak_emote = list("buzzes")
@@ -32,6 +31,7 @@
 	obj_damage = 0
 	environment_smash = 0
 	mouse_opacity = MOUSE_OPACITY_OPAQUE
+	blocks_emissive = EMISSIVE_BLOCK_UNIQUE
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
 	density = FALSE
 	mob_size = MOB_SIZE_TINY
@@ -48,7 +48,6 @@
 	var/idle = 0
 	var/isqueen = FALSE
 	var/bee_syndicate = FALSE
-	var/icon_base = "bee"
 	var/static/list/bee_icons = list()
 	var/static/beehometypecache = typecacheof(/obj/structure/beebox)
 	var/static/hydroponicstypecache = typecacheof(/obj/machinery/hydroponics)
@@ -58,7 +57,7 @@
 
 /mob/living/simple_animal/hostile/poison/bees/Initialize(mapload)
 	. = ..()
-	generate_bee_visuals()
+	regenerate_icons()
 	AddComponent(/datum/component/swarming)
 	AddElement(/datum/element/simple_flying)
 
@@ -93,38 +92,26 @@
 		. += movable
 
 
-// All bee sprites are made up of overlays. They do not have any special sprite overlays for items placed on them, such as collars, so this proc is unneeded.
 /mob/living/simple_animal/hostile/poison/bees/regenerate_icons()
-	return
-
-/mob/living/simple_animal/hostile/poison/bees/proc/generate_bee_visuals()
-	cut_overlays()
+	..()
 
 	var/col = BEE_DEFAULT_COLOUR
 	if(beegent && beegent.color)
 		col = beegent.color
 
-	var/image/base
-	if(!bee_icons["[icon_base]_base"])
-		bee_icons["[icon_base]_base"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[icon_base]_base")
-	base = bee_icons["[icon_base]_base"]
-	add_overlay(base)
-
 	var/image/greyscale
-	if(!bee_icons["[icon_base]_grey_[col]"])
-		bee_icons["[icon_base]_grey_[col]"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[icon_base]_grey")
-	greyscale = bee_icons["[icon_base]_grey_[col]"]
+	if(!bee_icons["[initial(icon_state)]_grey_[col]"])
+		bee_icons["[initial(icon_state)]_grey_[col]"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[initial(icon_state)]_grey")
+	greyscale = bee_icons["[initial(icon_state)]_grey_[col]"]
 	greyscale.color = col
 	add_overlay(greyscale)
 
 	var/image/wings
-	if(!bee_icons["[icon_base]_wings"])
-		bee_icons["[icon_base]_wings"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[icon_base]_wings")
-	wings = bee_icons["[icon_base]_wings"]
+	if(!bee_icons["[initial(icon_state)]_wings"])
+		bee_icons["[initial(icon_state)]_wings"] = image(icon = 'icons/mob/bees.dmi', icon_state = "[initial(icon_state)]_wings")
+	wings = bee_icons["[initial(icon_state)]_wings"]
 	add_overlay(wings)
 
-	if(blocks_emissive)
-		add_overlay(get_emissive_block())
 
 //We don't attack beekeepers/people dressed as bees/wryns //Todo: bee costume
 /mob/living/simple_animal/hostile/poison/bees/CanAttack(atom/the_target)
@@ -177,7 +164,7 @@
 	if(istype(R))
 		beegent = R
 		name = "[initial(name)] ([R.name])"
-		generate_bee_visuals()
+		regenerate_icons()
 
 /mob/living/simple_animal/hostile/poison/bees/proc/pollinate(obj/machinery/hydroponics/Hydro)
 	if(!istype(Hydro) || !Hydro.myseed || Hydro.dead || Hydro.recent_bee_visit || Hydro.lid_closed)
@@ -234,7 +221,7 @@
 /mob/living/simple_animal/hostile/poison/bees/queen
  	name = "queen bee"
  	desc = "She's the queen of bees, BZZ BZZ"
- 	icon_base = "queen"
+ 	icon_state = "queen"
  	isqueen = TRUE
 
 
diff --git a/icons/mob/bees.dmi b/icons/mob/bees.dmi
index 5d9bfea48b6..1d7ddc70ef0 100644
Binary files a/icons/mob/bees.dmi and b/icons/mob/bees.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index c45a4abd792..a6072426b39 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/weapons/grenade.dmi b/icons/obj/weapons/grenade.dmi
index 8b01242a9e2..9370f9bf72a 100644
Binary files a/icons/obj/weapons/grenade.dmi and b/icons/obj/weapons/grenade.dmi differ