diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 92c4fd732a8..c572710e85a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,17 +3,19 @@
 
 ## Описание
 
-<!-- Опишите, что делает ваш ПР. Документировать каждую деталь не требуется, просто укажите основные изменения. -->
+<!-- Опишите, что делает ваш Pull request. Документировать каждую деталь не требуется, просто укажите основные изменения. -->
 
-## Ссылка на предложение/Причина создания ПР
+## Причина создания ПР / Почему это хорошо для игры
 
-<!-- Здесь оставьте ссылку на сообщение в #отчеты-по-предложениям, чтобы подтвердить, что ваше предложение одобрено. Либо укажите, почему этот ПР должен пройти без предложки. -->
-<!-- Пример ссылки: https://discord.com/channels/617003227182792704/755125334097133628/ID-сообщения -->
+<!-- Здесь можно оставить ссылку на сообщение в #отчеты-по-предложениям, чтобы подтвердить, что предложение обсуждалось внутри Discord-сообщества. -->
+<!-- Если отчёта нет, то укажите, почему это изменение положительно влияет на игру. -->
+<!-- В случае исправления бага, укажите ссылку на канал в #баг-репорты-v2 или issue в репозитории. В ином случае, опишите баг и ступени для его воспроизведения. -->
+<!-- Пример ссылки в Discord-сообщество : https://discord.com/channels/617003227182792704/755125334097133628/ID-сообщения -->
 
 ## Демонстрация изменений
 
-<!-- Здесь вы можете показать изменения внешне, к примеру новые спрайты, звуки или изменения карты. Или написать, что именно изменилось для игроков. Этот пункт полностью опционален и его можно удалить. -->
+<!-- В случае наличия изменений, влияющих на игровую часть, опишите их здесь. В случае их отсутствия, этот пункт можно удалить -->
 
 ## Тесты
 
-<!-- Как вы тестировали свой код. Ревьюеру будет проще, если он будет знать какие действия вы совершали, проверяя свой ПР. -->
+<!-- Здесь необходимо описать шаги, которые предпринимались для тестирования изменения. Этот пункт обязателен, без него Pull request будет рассматриваться дольше. -->
diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
index 5fe1e3dbb3c..a05ad5b52fd 100644
--- a/_maps/map_files/nova/nova.dmm
+++ b/_maps/map_files/nova/nova.dmm
@@ -3200,9 +3200,6 @@
 	pixel_y = -22;
 	req_access = list(39)
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -3211,6 +3208,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whitegreen"
@@ -4108,7 +4108,6 @@
 	},
 /obj/machinery/power/apc{
 	dir = 4;
-	name = "east bump";
 	pixel_x = 26
 	},
 /turf/simulated/floor/plasteel{
@@ -5320,6 +5319,18 @@
 	icon_state = "purple"
 	},
 /area/hallway/primary/fore)
+"aNX" = (
+/obj/structure/window/reinforced,
+/obj/item/flag/nt,
+/obj/structure/sign/beautyplaque{
+	pixel_y = 32;
+	name = "Благодарственное Письмо от Главного Инженера станции Нова";
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Saad603. Слава НаноТрейзен!"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/bridge)
 "aOb" = (
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/clothing/under/syndicate/blackops_civ,
@@ -12516,7 +12527,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "bNL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13773,6 +13784,10 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/primary/central/north)
+"bWi" = (
+/obj/structure/flora/ausbushes/leafybush,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "bWj" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable{
@@ -14722,7 +14737,7 @@
 	dir = 4;
 	icon_state = "darkredcorners"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "cdq" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -16295,7 +16310,7 @@
 "cpJ" = (
 /obj/machinery/computer/security,
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "cpN" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/flare{
@@ -17522,7 +17537,9 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced,
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/twohanded/required/kirbyplants{
+	layer = 3.1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -24063,6 +24080,10 @@
 	},
 /turf/simulated/floor/carpet,
 /area/medical/psych)
+"dxq" = (
+/obj/structure/flora/ausbushes/grassybush,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "dxv" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -26030,6 +26051,13 @@
 /area/security/interrogation)
 "dNe" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/safe/floor,
+/obj/item/reagent_containers/food/condiment/cheesesauce,
+/obj/item/reagent_containers/food/condiment/garlicsauce,
+/obj/item/reagent_containers/food/condiment/diablosauce,
+/obj/item/reagent_containers/food/condiment/mushroomsauce,
+/obj/item/reagent_containers/food/condiment/herbs,
+/obj/item/reagent_containers/food/condiment/soysauce,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -26659,6 +26687,7 @@
 	dir = 1;
 	pixel_y = -25
 	},
+/obj/item/reagent_containers/spray/pestspray,
 /turf/simulated/floor/grass,
 /area/maintenance/garden)
 "dRw" = (
@@ -29860,7 +29889,7 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "eoV" = (
 /obj/machinery/porta_turret{
 	dir = 8
@@ -29870,9 +29899,6 @@
 	},
 /area/turret_protected/ai_upload)
 "eoY" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
@@ -29887,6 +29913,9 @@
 	name = "Janitor";
 	sortType = 22
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -32740,11 +32769,16 @@
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/toilet)
 "eKM" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_y = 28;
+	pixel_x = 28
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "eLa" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/ywflowers,
@@ -33311,7 +33345,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "eOZ" = (
 /obj/machinery/power/tesla_coil,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -36160,9 +36194,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -36173,6 +36204,9 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/glass,
 /area/crew_quarters/locker)
 "flc" = (
@@ -36746,6 +36780,18 @@
 	icon_state = "whitebluefull"
 	},
 /area/medical/surgery/south)
+"fps" = (
+/obj/structure/window/reinforced,
+/obj/item/flag/nt,
+/obj/structure/sign/tajarplaque{
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. Особая благодарность за помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Daeberdir. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо от Главного Инженера станции Нова";
+	pixel_y = 32
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/bridge)
 "fpt" = (
 /obj/item/radio/intercom{
 	pixel_x = 28
@@ -37200,16 +37246,13 @@
 "fsy" = (
 /obj/effect/decal/cleanable/vomit,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc{
-	name = "south bump";
-	pixel_y = -26
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
 /obj/structure/cable{
+	d1 = 4;
 	d2 = 8;
-	icon_state = "0-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/disposal)
@@ -38122,6 +38165,7 @@
 	},
 /area/medical/genetics)
 "fzn" = (
+/obj/structure/flora/ausbushes/ppflowers,
 /obj/item/storage/bag/plants/portaseeder,
 /turf/simulated/floor/grass,
 /area/maintenance/garden)
@@ -39863,6 +39907,7 @@
 	dir = 4
 	},
 /obj/machinery/hologram/holopad,
+/obj/effect/decal/warning_stripes/blue/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -41668,6 +41713,11 @@
 	},
 /turf/simulated/floor/wood/dark,
 /area/ntrep)
+"fZu" = (
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "fZz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/drip{
@@ -42524,7 +42574,7 @@
 	dir = 6;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "gfP" = (
 /turf/simulated/openspace,
 /area/quartermaster/delivery)
@@ -43010,7 +43060,7 @@
 	dir = 9;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "gjB" = (
 /obj/structure/table/reinforced,
 /obj/item/taperecorder,
@@ -43262,6 +43312,12 @@
 	},
 /turf/simulated/floor/glass,
 /area/crew_quarters/chief)
+"gkR" = (
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkredcorners"
+	},
+/area/tcommsat/server)
 "gkT" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8;
@@ -43556,11 +43612,13 @@
 	tag_airpump = "ai_pump";
 	tag_chamber_sensor = "ai_sensor";
 	tag_exterior_door = "ai_outer";
-	tag_interior_door = "ai_inner"
+	tag_interior_door = "ai_inner";
+	pixel_y = -3
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "ai_sensor";
-	pixel_x = -28
+	pixel_x = 28;
+	pixel_y = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -43876,9 +43934,6 @@
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
 "gpy" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/structure/cable{
@@ -43888,6 +43943,11 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/glass,
 /area/crew_quarters/locker)
 "gpI" = (
@@ -44238,23 +44298,22 @@
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "robotics_solar_airlock";
 	layer = 3.3;
-	pixel_y = -25;
+	pixel_y = -30;
 	req_access = list(13);
 	tag_airpump = "robotics_solar_pump";
 	tag_chamber_sensor = "robotics_solar_sensor";
 	tag_exterior_door = "robotics_solar_outer";
 	tag_interior_door = "robotics_solar_inner"
 	},
-/obj/machinery/airlock_sensor{
-	id_tag = "robotics_solar_sensor";
-	layer = 3.3;
-	pixel_x = 12;
-	pixel_y = -25
-	},
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/machinery/airlock_sensor{
+	id_tag = "robotics_solar_sensor";
+	layer = 3.3;
+	pixel_y = -23
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/portsolar)
 "gsB" = (
@@ -44952,7 +45011,12 @@
 /area/maintenance/fore)
 "gxY" = (
 /obj/structure/window/reinforced,
-/obj/structure/statue/gold/hop{
+/obj/structure/sign/goldenplaque{
+	pixel_y = 32;
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Zhojaba. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо от Главного Инженера станции Нова"
+	},
+/obj/structure/statue/gold/hos{
 	pixel_y = 7
 	},
 /turf/simulated/floor/plasteel{
@@ -45578,10 +45642,6 @@
 	req_access = list(1);
 	color = "red"
 	},
-/obj/item/clothing/suit/armor/riot,
-/obj/item/shield/riot,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/head/helmet/riot,
 /obj/structure/window/reinforced{
 	color = "red"
 	},
@@ -45593,6 +45653,10 @@
 	color = "red";
 	dir = 4
 	},
+/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/riot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -45647,7 +45711,7 @@
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "red"
+	dir = 1
 	},
 /area/security/seceqstorage)
 "gFc" = (
@@ -49030,7 +49094,7 @@
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "aisole_sensor";
-	pixel_y = -28
+	pixel_y = 35
 	},
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	frequency = 1379;
@@ -49572,7 +49636,9 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/twohanded/required/kirbyplants{
+	layer = 3.1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -50348,7 +50414,7 @@
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "engineering_west_sensor";
-	pixel_y = 7;
+	pixel_y = 3;
 	pixel_x = 25
 	},
 /turf/simulated/floor/plasteel{
@@ -51812,6 +51878,9 @@
 	icon_state = "darkblue"
 	},
 /area/chapel/main)
+"hBC" = (
+/turf/simulated/wall/r_wall,
+/area/tcommsat/server)
 "hBG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -52140,6 +52209,10 @@
 /obj/structure/table,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular{
+	pixel_x = 2;
+	pixel_y = 2
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -53392,7 +53465,7 @@
 	pixel_x = 28
 	},
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "hQr" = (
 /obj/structure/cable,
 /obj/machinery/power/apc{
@@ -55751,9 +55824,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/secpost)
 "ihz" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -55763,6 +55833,9 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -59454,9 +59527,7 @@
 "iJH" = (
 /obj/structure/cable,
 /obj/machinery/power/apc{
-	cell_type = 5000;
-	name = "south bump Important Area";
-	pixel_y = -24
+	pixel_y = -26
 	},
 /turf/simulated/floor/redgrid,
 /area/aisat/aihallway)
@@ -60102,7 +60173,9 @@
 /area/quartermaster/qm)
 "iOP" = (
 /obj/structure/window/reinforced,
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/twohanded/required/kirbyplants{
+	layer = 3.1
+	},
 /obj/machinery/light{
 	dir = 1;
 	in_use = 1
@@ -62000,6 +62073,7 @@
 	dir = 10
 	},
 /obj/machinery/hologram/holopad,
+/obj/effect/decal/warning_stripes/blue/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -63205,8 +63279,8 @@
 /area/hallway/primary/central/ne)
 "jmY" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "redfull";
-	tag = "icon-redfull (NORTHWEST)"
+	dir = 8;
+	icon_state = "redcorner"
 	},
 /area/security/seceqstorage)
 "jna" = (
@@ -63711,6 +63785,9 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/disposal)
 "jqP" = (
@@ -66041,18 +66118,20 @@
 	},
 /area/atmos/control)
 "jIQ" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "jIT" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -67681,6 +67760,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
+"jVi" = (
+/obj/structure/flora/ausbushes/lavendergrass,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "jVl" = (
 /obj/machinery/conveyor_switch/oneway{
 	id = "QMLoad";
@@ -68647,7 +68730,7 @@
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "kdy" = (
 /obj/machinery/computer/secure_data{
 	dir = 8
@@ -69397,6 +69480,10 @@
 	slowdown = -0.3
 	},
 /area/hallway/primary/central)
+"kjI" = (
+/obj/structure/flora/ausbushes/ywflowers,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "kjL" = (
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -71438,10 +71525,10 @@
 /area/maintenance/fsmaint)
 "kAy" = (
 /obj/effect/decal/warning_stripes/east,
-/obj/machinery/flasher/portable,
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
+/obj/machinery/flasher/portable,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -71709,6 +71796,12 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/securehallway)
+"kCy" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkredcorners"
+	},
+/area/tcommsat/server)
 "kCC" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
@@ -75179,6 +75272,15 @@
 	},
 /turf/simulated/floor/greengrid,
 /area/security/nuke_storage)
+"ldG" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/hallway/secondary/entry/commercial)
 "ldJ" = (
 /obj/structure/barricade/security,
 /obj/effect/decal/cleanable/dirt,
@@ -80860,6 +80962,7 @@
 /area/maintenance/trading)
 "lYj" = (
 /obj/machinery/hologram/holopad,
+/obj/effect/decal/warning_stripes/blue/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -81238,6 +81341,9 @@
 /obj/item/radio/intercom{
 	pixel_x = -28
 	},
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "mbz" = (
@@ -82211,6 +82317,32 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/toxins/server)
+"mhj" = (
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/window/reinforced{
+	color = "red"
+	},
+/obj/structure/window/reinforced{
+	color = "red";
+	dir = 1
+	},
+/obj/machinery/door/window{
+	name = "Secure Armory";
+	req_access = list(1);
+	color = "red"
+	},
+/obj/item/clothing/shoes/jackboots/armored,
+/obj/item/clothing/shoes/jackboots/armored,
+/obj/item/clothing/shoes/jackboots/armored,
+/obj/item/clothing/shoes/jackboots/armored,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmory)
 "mht" = (
 /obj/item/pod_parts/core,
 /obj/item/circuitboard/mecha/pod,
@@ -83481,6 +83613,15 @@
 /area/maintenance/fpmaint)
 "mry" = (
 /obj/structure/closet/crate/engineering,
+/obj/item/stack/sheet/metal{
+	amount = 50
+	},
+/obj/item/stack/sheet/metal{
+	amount = 50
+	},
+/obj/item/stack/sheet/glass{
+	amount = 50
+	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
@@ -87688,6 +87829,18 @@
 /obj/machinery/door/airlock/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
+"mXr" = (
+/obj/structure/window/reinforced,
+/obj/item/flag/nt,
+/obj/structure/sign/atmosplaque{
+	pixel_y = 32;
+	desc = "Важное Уточнение! Главный Инженер пожелал оставаться анонимным, поэтому, обойдёмся прозвищем. За выдающиеся успехи в области инженерного менеджмента, а также успешное проектирование станции Нова по всем стандартам НаноТрейзен. Благодарим вас за труд, PiroMage. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо Для Главного Инженера Команды Архитекторов Станции Нова"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/bridge)
 "mXt" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
@@ -87752,10 +87905,6 @@
 	layer = 2.9
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
-/obj/item/clothing/suit/armor/riot,
-/obj/item/shield/riot,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/head/helmet/riot,
 /obj/structure/window/reinforced{
 	color = "red"
 	},
@@ -87773,6 +87922,10 @@
 	req_access = list(1);
 	color = "red"
 	},
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -88283,19 +88436,6 @@
 	},
 /area/security/processing)
 "nbu" = (
-/obj/item/ammo_box/magazine/enforcer/lethal{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/ammo_box/magazine/enforcer/lethal,
-/obj/item/ammo_box/magazine/enforcer/lethal{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/ammo_box/magazine/enforcer/lethal{
-	pixel_x = -6;
-	pixel_y = 6
-	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /obj/structure/rack{
 	dir = 8;
@@ -88313,6 +88453,24 @@
 	req_access = list(1);
 	color = "red"
 	},
+/obj/item/ammo_box/c9mm,
+/obj/item/ammo_box/c9mm{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/ammo_box/magazine/enforcer/lethal{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/ammo_box/magazine/enforcer/lethal,
+/obj/item/ammo_box/magazine/enforcer/lethal{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/ammo_box/magazine/enforcer/lethal{
+	pixel_x = -6;
+	pixel_y = 6
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -89789,8 +89947,8 @@
 	frequency = 1379;
 	master_tag = "ex";
 	name = "interior access button";
-	pixel_x = 21;
-	pixel_y = -21
+	pixel_x = 25;
+	pixel_y = -25
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
@@ -89812,6 +89970,22 @@
 	icon_state = "whitegreen"
 	},
 /area/medical/virology/lab)
+"nms" = (
+/obj/structure/safe/floor,
+/obj/item/seeds/wheat/meat,
+/obj/item/gun/energy/floragun{
+	selfcharge = 0;
+	emagged = 1;
+	name = "old floral somatoray";
+	can_charge = 1;
+	cell_type = /obj/item/stock_parts/cell/degraded;
+	ammo_type = list(/obj/item/ammo_casing/energy/flora/beta,/obj/item/ammo_casing/energy/flora/gamma);
+	current_skin = "oldflora";
+	description_info = "Это энергетическое оружие. Имеет 2 режима стрельбы: бета и гамма. Бета изменяет геном растений. Гамма ускоряет рост растений. Чтобы перезарядить это оружие, используйте устройство для подзарядки оружия.";
+	desc = "Старый ботанический инструмент, испускающий контролируемое излучение, вызывающее мутации в клетках растений, не имеет самозарядки. Чтобы перезарядить это оружие, используйте устройство для подзарядки оружия."
+	},
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "nmx" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -90930,7 +91104,7 @@
 	dir = 9;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "nvU" = (
 /obj/machinery/vending/wallmed{
 	pixel_x = 26;
@@ -91021,6 +91195,22 @@
 	icon_state = "dark"
 	},
 /area/atmos)
+"nwG" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/girder/reinforced,
+/turf/simulated/floor/plating,
+/area/maintenance/maintcentral)
 "nwN" = (
 /obj/structure/chair/sofa/corner{
 	dir = 4
@@ -92321,6 +92511,15 @@
 	icon_state = "white"
 	},
 /area/toxins/explab)
+"nFO" = (
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = 30
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "yellow"
+	},
+/area/engineering/break_room)
 "nFR" = (
 /obj/structure/chair/sofa/right,
 /obj/machinery/light{
@@ -93253,7 +93452,9 @@
 /area/quartermaster/miningdock)
 "nMX" = (
 /obj/effect/decal/warning_stripes/east,
-/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/item/videocam,
+/obj/item/videocam,
+/obj/structure/closet/crate,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -95612,11 +95813,17 @@
 	tag_chamber_sensor = "sw_maint2_sensor";
 	tag_exterior_door = "sw_maint2_outer";
 	tag_interior_door = "sw_maint2_inner";
-	pixel_x = 25
+	pixel_x = 25;
+	pixel_y = -2
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/airlock_sensor{
+	id_tag = "sw_maint2_sensor";
+	pixel_y = 5;
+	pixel_x = 25
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "ofE" = (
@@ -97466,6 +97673,37 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/plasteel/freezer,
 /area/crew_quarters/heads/hop)
+"ovd" = (
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/window/reinforced{
+	color = "red"
+	},
+/obj/structure/window/reinforced{
+	color = "red";
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	color = "red";
+	dir = 4
+	},
+/obj/machinery/door/window{
+	dir = 8;
+	name = "Secure Armory";
+	req_access = list(1);
+	color = "red"
+	},
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmory)
 "ovn" = (
 /obj/structure/table/reinforced,
 /obj/item/clipboard,
@@ -98479,7 +98717,7 @@
 /turf/simulated/floor/carpet/royalblack,
 /area/ntrep)
 "oDB" = (
-/obj/item/reagent_containers/spray/pestspray,
+/obj/structure/flora/ausbushes/sunnybush,
 /turf/simulated/floor/grass,
 /area/maintenance/garden)
 "oDL" = (
@@ -98620,7 +98858,7 @@
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "aisolw_sensor";
-	pixel_y = -28
+	pixel_y = 35
 	},
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	frequency = 1379;
@@ -98656,6 +98894,15 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/secondary/entry/lounge)
+"oEP" = (
+/obj/structure/chair/comfy/brown{
+	dir = 1
+	},
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = -30
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "oET" = (
 /obj/effect/decal/warning_stripes/northeast,
 /turf/simulated/floor/plasteel{
@@ -99616,7 +99863,6 @@
 	layer = 2.9
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
-/obj/item/clothing/suit/armor/bulletproof,
 /obj/machinery/door/window{
 	name = "Secure Armory";
 	req_access = list(1);
@@ -99629,7 +99875,9 @@
 	color = "red";
 	dir = 1
 	},
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/head/helmet/alt,
+/obj/item/clothing/head/helmet/alt,
+/obj/item/clothing/head/helmet/alt,
 /obj/item/clothing/head/helmet/alt,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -100057,6 +100305,10 @@
 	icon_state = "darkred"
 	},
 /area/bridge)
+"oPt" = (
+/obj/structure/flora/ausbushes/ywflowers/hell,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "oPu" = (
 /obj/structure/chair/comfy/brown,
 /turf/simulated/floor/wood,
@@ -104149,9 +104401,6 @@
 "ptU" = (
 /obj/item/storage/fancy/donut_box,
 /obj/structure/table/wood/fancy/purple,
-/obj/item/radio/intercom{
-	pixel_y = -28
-	},
 /turf/simulated/floor/carpet/purple,
 /area/crew_quarters/captain)
 "ptW" = (
@@ -104639,7 +104888,7 @@
 	dir = 10;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "pxI" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -104976,9 +105225,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
 "pzK" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/turretid/stun{
 	control_area = "AI Satellite Antechamber";
 	name = "AI Antechamber Turret Control";
@@ -104997,7 +105243,7 @@
 	dir = 10;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "pzY" = (
 /obj/effect/decal/warning_stripes/south,
 /obj/item/radio/intercom{
@@ -106039,7 +106285,7 @@
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "station_ai_sensor";
-	pixel_y = -10;
+	pixel_y = 7;
 	pixel_x = 57
 	},
 /turf/simulated/floor/plasteel{
@@ -107874,6 +108120,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "pVm" = (
@@ -108047,6 +108296,15 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/plating,
 /area/maintenance/brig)
+"pWd" = (
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = 30
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkred"
+	},
+/area/security/permahallway)
 "pWf" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -108529,6 +108787,11 @@
 "pYS" = (
 /obj/structure/window/reinforced,
 /obj/item/flag/nt,
+/obj/structure/sign/tajarplaque{
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Den10g. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо от Главного Инженера станции Нова";
+	pixel_y = 32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -110582,7 +110845,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "qqq" = (
 /obj/structure/chair/comfy/teal{
 	dir = 8
@@ -111531,6 +111794,18 @@
 	slowdown = -0.3
 	},
 /area/hallway/primary/port/south)
+"qwG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc{
+	dir = 1;
+	pixel_y = 26
+	},
+/obj/structure/cable{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/disposal)
 "qwI" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
@@ -111817,7 +112092,7 @@
 	icon_state = "1-4"
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -112348,6 +112623,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/hologram/holopad,
+/obj/effect/decal/warning_stripes/blue/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -112467,7 +112743,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredcorners"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "qDk" = (
 /obj/machinery/optable,
 /obj/machinery/shower{
@@ -112732,6 +113008,13 @@
 	dir = 1
 	},
 /area/hallway/primary/central/second/east)
+"qFi" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/disposal)
 "qFu" = (
 /obj/machinery/door/firedoor,
 /obj/effect/decal/warning_stripes/yellow,
@@ -113702,9 +113985,10 @@
 	},
 /area/quartermaster/miningstorage)
 "qNY" = (
-/obj/structure/girder/reinforced,
-/turf/simulated/floor/plating,
-/area/maintenance/maintcentral)
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/tcommsat/server)
 "qOc" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -114449,7 +114733,7 @@
 	dir = 5;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "qSA" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access = list(12)
@@ -114692,6 +114976,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/disposal)
 "qUp" = (
@@ -116377,9 +116666,6 @@
 	},
 /area/aisat/aihallway)
 "riR" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
@@ -116396,6 +116682,9 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/glass,
 /area/crew_quarters/locker)
 "riV" = (
@@ -117866,7 +118155,7 @@
 /obj/effect/decal/cleanable/dust,
 /obj/item/radio/intercom{
 	name = "north station intercom (General)";
-	pixel_y = 28
+	pixel_y = 24
 	},
 /obj/machinery/light/small{
 	dir = 1
@@ -122411,7 +122700,7 @@
 	},
 /obj/item/storage/belt/utility,
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "saQ" = (
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -122685,7 +122974,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "scp" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -123150,7 +123439,6 @@
 	layer = 2.9
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
-/obj/item/clothing/suit/armor/bulletproof,
 /obj/structure/window/reinforced{
 	color = "red"
 	},
@@ -123163,8 +123451,10 @@
 	req_access = list(1);
 	color = "red"
 	},
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/head/helmet/alt,
+/obj/item/clothing/suit/armor/bulletproof,
+/obj/item/clothing/suit/armor/bulletproof,
+/obj/item/clothing/suit/armor/bulletproof,
+/obj/item/clothing/suit/armor/bulletproof,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -123929,7 +124219,7 @@
 /obj/machinery/airlock_sensor{
 	id_tag = "solar_xeno_sensor";
 	layer = 3.3;
-	pixel_y = 36
+	pixel_y = 33
 	},
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -125025,7 +125315,7 @@
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "solar_tool_airlock";
 	layer = 3.3;
-	pixel_y = 25;
+	pixel_y = 26;
 	req_access = list(13);
 	tag_airpump = "solar_tool_pump";
 	tag_chamber_sensor = "solar_tool_sensor";
@@ -125035,7 +125325,7 @@
 /obj/machinery/airlock_sensor{
 	id_tag = "solar_tool_sensor";
 	layer = 3.3;
-	pixel_y = 32
+	pixel_y = 33
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /obj/structure/cable{
@@ -127169,7 +127459,9 @@
 /area/maintenance/casino)
 "sKl" = (
 /obj/structure/window/reinforced,
-/obj/item/twohanded/required/kirbyplants,
+/obj/item/twohanded/required/kirbyplants{
+	layer = 3.1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -127993,9 +128285,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -128006,6 +128295,11 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/glass,
 /area/crew_quarters/locker)
 "sRy" = (
@@ -128960,7 +129254,7 @@
 	dir = 4;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "sXx" = (
 /obj/structure/rack{
 	dir = 8;
@@ -130171,9 +130465,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -130184,6 +130475,11 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/glass,
 /area/crew_quarters/locker)
 "tfx" = (
@@ -131434,6 +131730,32 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/secondary/entry/lounge)
+"tpw" = (
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/window/reinforced{
+	color = "red"
+	},
+/obj/structure/window/reinforced{
+	color = "red";
+	dir = 1
+	},
+/obj/machinery/door/window{
+	name = "Secure Armory";
+	req_access = list(1);
+	color = "red"
+	},
+/obj/item/clothing/gloves/color/black/ballistic,
+/obj/item/clothing/gloves/color/black/ballistic,
+/obj/item/clothing/gloves/color/black/ballistic,
+/obj/item/clothing/gloves/color/black/ballistic,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmory)
 "tpz" = (
 /obj/effect/decal/warning_stripes/south,
 /obj/structure/sign/poster/official/space_a{
@@ -131872,6 +132194,11 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/food/condiment/tomatosauce,
+/obj/item/reagent_containers/food/condiment/herbs,
+/obj/item/reagent_containers/food/snacks/grown/tomato,
+/obj/item/reagent_containers/food/snacks/grown/tomato,
+/obj/item/reagent_containers/food/snacks/grown/tomato,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -135099,9 +135426,6 @@
 /turf/simulated/wall/r_wall,
 /area/quartermaster/delivery)
 "tPu" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -135114,6 +135438,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/carpet/purple,
 /area/janitor)
 "tPz" = (
@@ -137359,7 +137686,7 @@
 /obj/machinery/airlock_sensor{
 	id_tag = "port5_sensor";
 	pixel_x = 25;
-	pixel_y = 5
+	pixel_y = 3
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
@@ -137436,10 +137763,6 @@
 /turf/simulated/floor/plasteel/dark,
 /area/maintenance/starboardaux)
 "ufB" = (
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_y = -28
-	},
 /obj/structure/showcase{
 	density = 0;
 	dir = 1;
@@ -137448,11 +137771,19 @@
 	name = "Cyborg Statue"
 	},
 /obj/machinery/light,
+/obj/machinery/power/apc{
+	cell_type = 5000;
+	name = "south bump Important Area";
+	pixel_y = -24
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "ufI" = (
 /obj/machinery/power/apc{
 	dir = 4;
@@ -141226,6 +141557,37 @@
 	icon_state = "whitehall"
 	},
 /area/toxins/xenobiology)
+"uJX" = (
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/window/reinforced{
+	color = "red"
+	},
+/obj/structure/window/reinforced{
+	color = "red";
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	color = "red";
+	dir = 4
+	},
+/obj/machinery/door/window{
+	dir = 8;
+	name = "Secure Armory";
+	req_access = list(1);
+	color = "red"
+	},
+/obj/item/shield/riot,
+/obj/item/shield/riot,
+/obj/item/shield/riot,
+/obj/item/shield/riot,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmory)
 "uJY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -142222,9 +142584,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -142238,6 +142597,9 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/glass,
 /area/crew_quarters/locker)
 "uSo" = (
@@ -143794,6 +144156,15 @@
 	},
 /turf/simulated/floor/engine,
 /area/engineering/supermatter)
+"vdg" = (
+/obj/structure/chair/comfy/purp{
+	dir = 4
+	},
+/obj/item/radio/intercom{
+	pixel_y = -28
+	},
+/turf/simulated/floor/carpet/purple,
+/area/crew_quarters/captain)
 "vdh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -144787,6 +145158,7 @@
 	},
 /area/hydroponics)
 "vlM" = (
+/obj/structure/flora/ausbushes/lavendergrass,
 /obj/item/hatchet,
 /obj/effect/spawner/random_spawners/rodent,
 /turf/simulated/floor/grass,
@@ -145879,11 +146251,14 @@
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "ex_sensor";
-	pixel_y = -24
+	pixel_y = 35
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
+/obj/structure/sign/vacuum{
+	pixel_y = -32
+	},
 /turf/simulated/floor/engine/insulated,
 /area/maintenance/apmaint)
 "vvH" = (
@@ -146424,7 +146799,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "red"
+	icon_state = "redcorner"
 	},
 /area/security/seceqstorage)
 "vzX" = (
@@ -146463,6 +146838,11 @@
 	icon_state = "neutralfull"
 	},
 /area/atmos)
+"vAn" = (
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/flora/ausbushes/fernybush,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "vAs" = (
 /obj/machinery/status_display{
 	pixel_y = -32
@@ -147269,7 +147649,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredfull"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "vHo" = (
 /obj/machinery/power/supermatter_shard{
 	anchored = 1;
@@ -148122,7 +148502,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "vNO" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -148464,16 +148844,8 @@
 /area/hallway/primary/command/east)
 "vQd" = (
 /obj/machinery/message_server,
-/obj/machinery/power/apc{
-	cell_type = 5000;
-	name = "south bump Important Area";
-	pixel_y = -24
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "vQh" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -149510,7 +149882,7 @@
 /obj/machinery/airlock_sensor{
 	id_tag = "engineering_east_sensor";
 	pixel_x = -25;
-	pixel_y = 10
+	pixel_y = 7
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -150183,7 +150555,7 @@
 	},
 /obj/machinery/tcomms/core/station,
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "wcH" = (
 /turf/simulated/wall/r_wall,
 /area/medical/research/restroom)
@@ -152320,9 +152692,6 @@
 	},
 /area/atmos)
 "wrT" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/junction/reversed{
 	dir = 2
 	},
@@ -152335,6 +152704,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -152620,7 +152992,7 @@
 	network = list("Minisat","SS13")
 	},
 /turf/simulated/floor/redgrid,
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "wtT" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Broom Closet"
@@ -154916,7 +155288,7 @@
 	dir = 8;
 	icon_state = "darkred"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "wNu" = (
 /obj/machinery/light{
 	dir = 1;
@@ -158871,6 +159243,14 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/grenade/chem_grenade/teargas{
+	pixel_y = -6;
+	pixel_x = 6
+	},
+/obj/item/grenade/chem_grenade/teargas{
+	pixel_y = -3;
+	pixel_x = 3
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -159436,11 +159816,6 @@
 /area/security/securearmory)
 "xwA" = (
 /obj/effect/decal/warning_stripes/west,
-/obj/item/storage/box/flashbangs{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/storage/box/flashbangs,
 /obj/item/storage/box/handcuffs{
 	pixel_x = -3;
 	pixel_y = 3
@@ -159450,6 +159825,11 @@
 	name = "Brig storage crate"
 	},
 /obj/machinery/light,
+/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/flashbangs{
+	pixel_x = 3;
+	pixel_y = -3
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -159759,7 +160139,19 @@
 	},
 /obj/machinery/light,
 /obj/structure/table,
-/obj/item/storage/firstaid/regular,
+/obj/item/stack/sheet/metal{
+	amount = 50;
+	pixel_x = -2;
+	pixel_y = -2
+	},
+/obj/item/stack/sheet/metal{
+	amount = 50
+	},
+/obj/item/stack/sheet/rglass{
+	amount = 50;
+	pixel_x = 2;
+	pixel_y = 2
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -160188,9 +160580,12 @@
 /area/toxins/mixing)
 "xBF" = (
 /obj/structure/window/reinforced,
-/obj/structure/statue/gold/hos{
-	pixel_y = 7
+/obj/structure/sign/goldenplaque{
+	pixel_y = 32;
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Aeterna0. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо от Главного Инженера станции Нова"
 	},
+/obj/structure/statue/gold/ce,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -160518,7 +160913,7 @@
 	id_tag = "port4_sensor";
 	layer = 3.3;
 	pixel_x = 25;
-	pixel_y = 5
+	pixel_y = 7
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -161032,7 +161427,7 @@
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "arrival_south_sensor";
-	pixel_y = 24
+	pixel_y = 34
 	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "arrival_south_airlock";
@@ -161040,7 +161435,11 @@
 	tag_chamber_sensor = "arrival_south_sensor";
 	tag_exterior_door = "arrival_south_outer";
 	tag_interior_door = "arrival_south_inner";
-	pixel_y = -25
+	pixel_y = 27
+	},
+/obj/structure/sign/vacuum{
+	icon_state = "space1";
+	pixel_y = -32
 	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
@@ -161551,7 +161950,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/tcommsat/chamber)
+/area/tcommsat/server)
 "xMp" = (
 /obj/structure/railing/corner{
 	dir = 4
@@ -163603,7 +164002,7 @@
 /obj/machinery/airlock_sensor{
 	id_tag = "atmos_tank_sensor";
 	pixel_x = 57;
-	pixel_y = 8
+	pixel_y = 7
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/engineering/controlroom)
@@ -164868,6 +165267,10 @@
 	icon_state = "white"
 	},
 /area/medical/ward)
+"yjj" = (
+/obj/structure/flora/ausbushes/reedbush,
+/turf/simulated/floor/grass,
+/area/maintenance/garden)
 "yjl" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -182034,7 +182437,7 @@ dFQ
 dFQ
 dFQ
 ocY
-mWj
+pWd
 eCk
 fAb
 wlg
@@ -185393,7 +185796,7 @@ hKl
 jOC
 irs
 son
-pSU
+oEP
 jOC
 oak
 pPo
@@ -187106,7 +187509,7 @@ pMY
 lrf
 hkd
 lNx
-pGm
+ldG
 oax
 kbL
 vXb
@@ -205497,8 +205900,8 @@ mMy
 lON
 dvj
 pWK
-jll
-jll
+qwG
+qFi
 jqO
 jll
 iIW
@@ -216218,7 +216621,7 @@ cxn
 hRb
 hRb
 ibo
-jKe
+nFO
 fti
 kcL
 gVE
@@ -246288,8 +246691,8 @@ ajW
 xoL
 oMu
 sfk
-sfk
-sfk
+mhj
+tpw
 bhh
 fvn
 gHq
@@ -246312,7 +246715,7 @@ vbS
 gKt
 xmI
 dWi
-mct
+jmY
 aDA
 xAy
 vmF
@@ -246570,7 +246973,7 @@ cTX
 egQ
 ldl
 gEV
-jmY
+mct
 xbz
 cIK
 jHI
@@ -246801,8 +247204,8 @@ xoL
 ajW
 xoL
 gEx
-mYe
-mYe
+ovd
+uJX
 mYe
 qtN
 tIW
@@ -259107,7 +259510,7 @@ lbB
 hCH
 hHJ
 brM
-pYS
+aNX
 ihk
 fGh
 boP
@@ -259924,7 +260327,7 @@ fvL
 bkc
 bkc
 bkc
-bkc
+fvL
 bkc
 bkc
 bkc
@@ -260635,7 +261038,7 @@ fvL
 fvL
 hKA
 kCp
-jZN
+nwG
 kCp
 uMw
 ppW
@@ -261662,7 +262065,7 @@ kCp
 kGY
 hKA
 nxY
-qNY
+kCp
 hJs
 uMw
 daU
@@ -263733,7 +264136,7 @@ woE
 mmc
 wsA
 qCF
-pYS
+fps
 ihk
 fGh
 qEA
@@ -263988,7 +264391,7 @@ aFR
 ges
 npi
 rsU
-rsU
+vdg
 qCF
 iOP
 ihk
@@ -264036,7 +264439,7 @@ fvL
 bkc
 bkc
 bkc
-bkc
+fvL
 bkc
 bkc
 bkc
@@ -264761,7 +265164,7 @@ lpY
 snI
 skE
 qCF
-pYS
+mXr
 ihk
 kjR
 mpH
@@ -267155,7 +267558,7 @@ jFL
 baa
 cCD
 foY
-qWo
+fZu
 hlb
 jhW
 bGG
@@ -267414,7 +267817,7 @@ nlt
 eJB
 qWo
 nzv
-qWo
+kjI
 eYr
 iik
 mze
@@ -267670,7 +268073,7 @@ qHX
 fSw
 lLh
 cgD
-qWo
+dxq
 oOi
 qeC
 blB
@@ -267926,8 +268329,8 @@ jFL
 cYx
 hmS
 wsH
-qWo
-qWo
+oPt
+nms
 qWo
 oDB
 bGG
@@ -268440,10 +268843,10 @@ hfp
 mze
 mze
 dUM
+vAn
 qWo
 qWo
-qWo
-qWo
+bWi
 bGG
 nBL
 eQH
@@ -268954,9 +269357,9 @@ xia
 mze
 mze
 bGG
+yjj
 qWo
-qWo
-qWo
+jVi
 jhW
 qQn
 bnw
@@ -287719,13 +288122,13 @@ iqK
 iqK
 iqK
 iqK
-hPs
-hPs
-hPs
-hPs
-hPs
-hPs
-hPs
+hBC
+hBC
+hBC
+hBC
+hBC
+hBC
+hBC
 mRg
 mRg
 mRg
@@ -287976,13 +288379,13 @@ nUo
 blK
 wCX
 qBf
-hPs
-hPs
+hBC
+hBC
 kdv
 wMZ
 saL
-hPs
-hPs
+hBC
+hBC
 uht
 uht
 vEb
@@ -288233,13 +288636,13 @@ vOX
 bJz
 lhf
 hNL
-hPs
+hBC
 eoO
 nvR
-dqM
+qNY
 pxG
 vQd
-hPs
+hBC
 lrh
 mfy
 bTQ
@@ -288490,13 +288893,13 @@ jWS
 mKl
 mKl
 rlg
-hPs
+hBC
 gjA
-dbP
+kCy
 bNE
-uYu
+gkR
 pzK
-hPs
+hBC
 lvm
 lvm
 grM
@@ -289004,13 +289407,13 @@ jWS
 mKl
 mKl
 gBH
-hPs
+hBC
 qSz
 cdo
 eOV
 qDg
 ufB
-hPs
+hBC
 uTE
 uTE
 mVF
@@ -289261,13 +289664,13 @@ nrj
 oWE
 rzI
 cxX
-hPs
+hBC
 cpJ
 eKM
-dqM
+qNY
 gfK
 wcF
-hPs
+hBC
 nBI
 vwV
 aPT
@@ -289518,13 +289921,13 @@ cBD
 iJU
 wCX
 gke
-hPs
-hPs
+hBC
+hBC
 hQp
 sXu
 wtP
-hPs
-hPs
+hBC
+hBC
 uht
 uht
 hgi
@@ -289775,13 +290178,13 @@ iqK
 iqK
 iqK
 iqK
-hPs
-hPs
-hPs
-hPs
-hPs
-hPs
-hPs
+hBC
+hBC
+hBC
+hBC
+hBC
+hBC
+hBC
 mRg
 mRg
 mRg
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index e124d06c5f9..19fe3703a74 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -13,6 +13,7 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
 	var/announcement_type = "Оповещение"
 	var/admin_announcement = 0 // Admin announcements are received regardless of being in range of a radio, unless you're in the lobby to prevent metagaming
 	var/language = LANGUAGE_GALACTIC_COMMON
+	var/beannounced = TRUE
 
 /datum/announcement/New(var/do_log = 0, var/new_sound = null, var/do_newscast = 0)
 	sound = new_sound
@@ -47,6 +48,8 @@ GLOBAL_DATUM_INIT(event_announcement, /datum/announcement/priority/command/event
 /datum/announcement/proc/Announce(message as text, new_title = "", new_sound = null, do_newscast = newscast, msg_sanitized = 0, from, msg_language)
 	if(!message)
 		return
+	if(!beannounced)
+		return
 
 	var/message_title = new_title ? new_title : title
 	var/message_sound = new_sound ? sound(new_sound) : sound
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index d377bf1a6c0..6ad447c1326 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -36,7 +36,7 @@
 
 	uniform = /obj/item/clothing/under/rank/head_of_security
 	suit = /obj/item/clothing/suit/armor/hos
-	gloves = /obj/item/clothing/gloves/color/black/hos
+	gloves = /obj/item/clothing/gloves/combat/swat
 	shoes = /obj/item/clothing/shoes/jackboots
 	head = /obj/item/clothing/head/HoS
 	l_ear = /obj/item/radio/headset/heads/hos/alt
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 824b8276251..950f74dd3f0 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -30,7 +30,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 
 /datum/job/captain/announce(mob/living/carbon/human/H)
 	. = ..()
-	GLOB.captain_announcement.Announce("Экипажу станции, капитан [H.real_name] взошел на борт!")
+	GLOB.captain_announcement.Announce("Экипажу станции, капитан [H.real_name] взош[genderize_ru(H.gender, "ёл", "ла", "ло", "ли")] на борт!")
 
 /datum/outfit/job/captain
 	name = "Captain"
@@ -207,7 +207,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 	jobtype = /datum/job/blueshield
 	uniform = /obj/item/clothing/under/rank/blueshield
 	suit = /obj/item/clothing/suit/armor/vest/blueshield
-	gloves = /obj/item/clothing/gloves/combat
+	gloves = /obj/item/clothing/gloves/combat/swat
 	shoes = /obj/item/clothing/shoes/jackboots
 	l_ear = /obj/item/radio/headset/heads/blueshield/alt
 	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 16a34ff3a41..00bdf0a6cab 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -83,7 +83,7 @@
 	supervisors = "the quartermaster"
 	department_head = list(JOB_TITLE_QUARTERMASTER)
 	selection_color = "#e2dbc8"
-	access = list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+	access = list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
 	alt_titles = list("Spelunker")
 	outfit = /datum/outfit/job/mining
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index d9c36e05b3d..f67520c13a8 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -174,6 +174,7 @@
 	new /obj/item/sensor_device/advanced/command(src)
 	new /obj/item/storage/garmentbag/blueshield(src)
 	new /obj/item/storage/belt/security/webbing(src)
+	new /obj/item/reagent_containers/spray/cleaner/tactical(src)
 
 /obj/structure/closet/secure_closet/ntrep
 	name = "\improper Nanotrasen Representative's locker"
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index f3836a1beb4..e39c59128bf 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -222,6 +222,11 @@
 	desc = "A dead and stuffed Diona nymph, mounted on a board."
 	icon_state = "kidanplaque"
 
+/obj/structure/sign/tajarplaque
+	name = "Tajaran wall plaque"
+	desc = "A nice tajaran photo, mounted on a board."
+	icon_state = "tajarplaque"
+
 /obj/structure/sign/mech
 	name = "\improper mech painting"
 	desc = "A painting of a mech"
diff --git a/code/modules/antagonists/space_ninja/suit/gloves.dm b/code/modules/antagonists/space_ninja/suit/gloves.dm
index 5bcba84e211..3665e1ddfe4 100644
--- a/code/modules/antagonists/space_ninja/suit/gloves.dm
+++ b/code/modules/antagonists/space_ninja/suit/gloves.dm
@@ -22,6 +22,7 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	strip_delay = 120
+	permeability_coefficient = 1
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 20,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 100, "fire" = 100, "acid" = 100)
 	///Ниндзя украл ваше бельё ( ͡° ͜ʖ ͡°)
diff --git a/code/modules/antagonists/space_ninja/suit/head.dm b/code/modules/antagonists/space_ninja/suit/head.dm
index 54a949b3417..38f6e5850d9 100644
--- a/code/modules/antagonists/space_ninja/suit/head.dm
+++ b/code/modules/antagonists/space_ninja/suit/head.dm
@@ -19,6 +19,7 @@
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 20,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 100, "fire" = 100, "acid" = 100)
 	blockTracking = TRUE //Roughly the only unique thing about this helmet.
 	strip_delay = 12
+	permeability_coefficient = 1
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /**
diff --git a/code/modules/antagonists/space_ninja/suit/mask.dm b/code/modules/antagonists/space_ninja/suit/mask.dm
index 968b86ec024..3631dfd312f 100644
--- a/code/modules/antagonists/space_ninja/suit/mask.dm
+++ b/code/modules/antagonists/space_ninja/suit/mask.dm
@@ -15,6 +15,7 @@
 	icon_state = "ninja_mask_classic_thermals"
 	item_state = "ninja_mask_classic_thermals"
 	strip_delay = 120
+	permeability_coefficient = 1
 	flags_inv = HIDEHEADSETS|HIDEGLASSES|HIDENAME
 	flags_cover = MASKCOVERSEYES	//We don't need to cover mouth
 	clothing_flags = BLOCK_GAS_SMOKE_EFFECT|AIRTIGHT|BLOCK_CAPSAICIN
diff --git a/code/modules/antagonists/space_ninja/suit/shoes.dm b/code/modules/antagonists/space_ninja/suit/shoes.dm
index 75d1aeda567..fd4b0e55a1a 100644
--- a/code/modules/antagonists/space_ninja/suit/shoes.dm
+++ b/code/modules/antagonists/space_ninja/suit/shoes.dm
@@ -21,7 +21,7 @@
 	min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
 	heat_protection = FEET
 	max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
-	permeability_coefficient = 0.01
+	permeability_coefficient = 1
 	strip_delay = 120
 	slowdown = 0
 	clothing_traits = list(TRAIT_NEGATES_GRAVITY, TRAIT_NO_SLIP_WATER)
diff --git a/code/modules/antagonists/space_ninja/suit/suit.dm b/code/modules/antagonists/space_ninja/suit/suit.dm
index bef1639f685..5511f7813ee 100644
--- a/code/modules/antagonists/space_ninja/suit/suit.dm
+++ b/code/modules/antagonists/space_ninja/suit/suit.dm
@@ -21,6 +21,7 @@
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 20,"energy" = 30, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
 	strip_delay = 12
+	permeability_coefficient = 1
 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
 	flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
 	flags_inv_transparent = HIDEGLOVES|HIDEJUMPSUIT
diff --git a/code/modules/antagonists/space_ninja/suit/uniform.dm b/code/modules/antagonists/space_ninja/suit/uniform.dm
index 208f1bf6f71..5926b74af21 100644
--- a/code/modules/antagonists/space_ninja/suit/uniform.dm
+++ b/code/modules/antagonists/space_ninja/suit/uniform.dm
@@ -7,6 +7,7 @@
 	icon_state = "ninja_under"
 	item_state = "ninja_under"
 	item_color = "ninja_under"
+	permeability_coefficient = 1
 	resistance_flags = NONE
 	sensor_mode = SENSOR_OFF //Hey who's this guy on the Spider Clan Shuttle??
 	random_sensor = FALSE
diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm
index 699d651fe52..a5d99260b3a 100644
--- a/code/modules/client/preference/loadout/loadout_donor.dm
+++ b/code/modules/client/preference/loadout/loadout_donor.dm
@@ -265,6 +265,70 @@
 	..()
 	gear_tweaks += new /datum/gear_tweak/color(parent = src)
 
+/datum/gear/donor/heart_meson
+	display_name = "Heart Meson Glasses"
+	path = /obj/item/clothing/glasses/meson/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CHIEF, JOB_TITLE_ENGINEER, JOB_TITLE_ATMOSTECH, JOB_TITLE_MECHANIC, JOB_TITLE_QUARTERMASTER, JOB_TITLE_MINER, JOB_TITLE_CAPTAIN, JOB_TITLE_ENGINEER_TRAINEE)
+
+/datum/gear/donor/heart_science
+	display_name = "Heart Science Glasses"
+	path = /obj/item/clothing/glasses/science/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_SCIENTIST, JOB_TITLE_ROBOTICIST, JOB_TITLE_RD, JOB_TITLE_GENETICIST, JOB_TITLE_CHEMIST, JOB_TITLE_SCIENTIST_STUDENT)
+
+/datum/gear/donor/heart_health
+	display_name = "Heart Medical Glasses"
+	path = /obj/item/clothing/glasses/hud/health/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_CMO, JOB_TITLE_INTERN, JOB_TITLE_PARAMEDIC, JOB_TITLE_VIROLOGIST, JOB_TITLE_BLUESHIELD, JOB_TITLE_PSYCHIATRIST, JOB_TITLE_DOCTOR, JOB_TITLE_CORONER)
+
+/datum/gear/donor/heart_diagnostic
+	display_name = "Heart Diagnostic Glasses"
+	path = /obj/item/clothing/glasses/hud/diagnostic/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_RD, JOB_TITLE_ROBOTICIST)
+
+/datum/gear/donor/heart_security
+	display_name = "Heart Security Glasses"
+	path = /obj/item/clothing/glasses/hud/security/sunglasses/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_DETECTIVE, JOB_TITLE_PILOT, JOB_TITLE_HOS, JOB_TITLE_WARDEN, JOB_TITLE_BLUESHIELD, JOB_TITLE_JUDGE, JOB_TITLE_OFFICER)
+
+/datum/gear/donor/heartsec_read
+	display_name = "Heart Security Glasses"
+	path = /obj/item/clothing/glasses/hud/security/sunglasses/heart/read_only
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_LAWYER)
+
+/datum/gear/donor/heart_hydroponic
+	display_name = "Heart Hydroponic Glasses"
+	path = /obj/item/clothing/glasses/hud/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_BOTANIST)
+
+/datum/gear/donor/heart_skills
+	display_name = "Heart Skills Glasses"
+	path = /obj/item/clothing/glasses/hud/skills/heart
+	donator_tier = 4
+	cost = 2
+	slot = ITEM_SLOT_EYES
+	allowed_roles = list(JOB_TITLE_CAPTAIN, JOB_TITLE_REPRESENTATIVE, JOB_TITLE_BLUESHIELD, JOB_TITLE_HOP)
+
 /datum/gear/donor/night_dress
 	display_name = "night dress, select"
 	description = "A classic night dress."
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 4aa7b0db32f..a1567ef30b7 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -113,6 +113,12 @@
 	flash_protect = FLASH_PROTECTION_FLASH
 	tint = 1
 
+/obj/item/clothing/glasses/meson/heart
+	name = "\improper Heart Meson Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_meson"
+	item_state = "heart_meson"
+
 /obj/item/clothing/glasses/meson/night
 	name = "Night Vision Optical Meson Scanner"
 	desc = "An Optical Meson Scanner fitted with an amplified visible light spectrum overlay, providing greater visual clarity in darkness."
@@ -186,6 +192,12 @@
 	see_in_dark = 8
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
 
+/obj/item/clothing/glasses/science/heart
+	name = "\improper Heart Science Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_science"
+	item_state = "heart_science"
+
 /obj/item/clothing/glasses/janitor
 	name = "Janitorial Goggles"
 	desc = "These'll keep the soap out of your eyes."
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 921b8684f85..de7194f995e 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -82,6 +82,12 @@ MEDICAL
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/health/heart
+	name = "\improper Heart Medical Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_med"
+	item_state = "heart_med"
+
 /obj/item/clothing/glasses/hud/health/patch
 	name = "\improper Medical HUD Eyepatch"
 	desc = "A heads-up eyepatch that scans the humans in view and provides accurate data about their health status."
@@ -161,6 +167,12 @@ DIAGNOSTIC
 	item_state = "diaghudpatch"
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/diagnostic/heart
+	name = "\improper Heart Diagnostic Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_diagnostic"
+	item_state = "heart_diagnostic"
+
 /obj/item/clothing/glasses/hud/diagnostic/night
 	name = "\improper Night Vision Diagnostic HUD"
 	desc = "A robotics diagnostic HUD fitted with a light amplifier."
@@ -262,6 +274,15 @@ SECURITY
 		SPECIES_STOK = 'icons/mob/clothing/species/monkey/eyes.dmi'
 	)
 
+/obj/item/clothing/glasses/hud/security/sunglasses/heart
+	name = "\improper Heart Security Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_sec"
+	item_state = "heart_sec"
+
+/obj/item/clothing/glasses/hud/security/sunglasses/heart/read_only
+	examine_extensions = EXAMINE_HUD_SECURITY_READ
+
 /obj/item/clothing/glasses/hud/security/sunglasses/tacticool
 	name = "security tactical glasses"
 	desc = "Ballistic glasses with a security HUD. Gives you tacticool protection and selfish increase. The elastic band allows it to be worn over a helmet."
@@ -358,6 +379,12 @@ HYDROPONIC
 	item_state = "hydrohudpatch"
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/heart
+	name = "\improper Heart Hydroponic Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_hydro"
+	item_state = "heart_hydro"
+
 /obj/item/clothing/glasses/hud/hydroponic/night
 	name = "\improper Night Vision Hydroponic HUD"
 	desc = "A hydroponic HUD fitted with a light amplifier."
@@ -421,6 +448,12 @@ SKILLS
 	item_state = "skillhudpatch"
 	prescription_upgradable = FALSE
 
+/obj/item/clothing/glasses/hud/skills/heart
+	name = "\improper Heart Skills Glasses"
+	desc = "Модные очки в форме сердечек с встроенным ИЛС под рабочие нужды."
+	icon_state = "heart_skill"
+	item_state = "heart_skill"
+
 /obj/item/clothing/glasses/hud/skills/sunglasses
 	name = "skills sunglasses"
 	desc = "Sunglasses with a build-in skills HUD, showing the employment history of nearby NT crew members."
diff --git a/code/modules/map_fluff/nova.dm b/code/modules/map_fluff/nova.dm
index d015b53c620..d1086be98a8 100644
--- a/code/modules/map_fluff/nova.dm
+++ b/code/modules/map_fluff/nova.dm
@@ -15,5 +15,4 @@
 	company_name  = "Nanotrasen"
 	company_short = "NT"
 	starsys_name  = "Epsilon Eridani"
-	admin_only = TRUE
-	webmap_url = null //Nanomap and webmap will be added later.
+	webmap_url = "https://webmap.affectedarc07.co.uk/maps/ss1984/nova/"
diff --git a/code/modules/mob/living/simple_animal/friendly/animals_named.dm b/code/modules/mob/living/simple_animal/friendly/animals_named.dm
index 67c95e0edfa..a8b8f873064 100644
--- a/code/modules/mob/living/simple_animal/friendly/animals_named.dm
+++ b/code/modules/mob/living/simple_animal/friendly/animals_named.dm
@@ -55,6 +55,7 @@
 /mob/living/simple_animal/pet/cat/white/Penny
 	name = "Копейка"
 	desc = "Любит таскать монетки и мелкие предметы. Успевайте прятать их!"
+	icon_state = "penny"
 	unique_pet = TRUE
 	gold_core_spawnable = NO_SPAWN
 	resting = TRUE
@@ -62,6 +63,7 @@
 /mob/living/simple_animal/pet/cat/birman/Crusher
 	name = "Бедокур"	//Не цель для воров
 	desc = "Любит крушить всё что не прикручено. Нужно вовремя прибираться."
+	icon_state = "crusher"
 	unique_pet = TRUE
 	gold_core_spawnable = NO_SPAWN
 	resting = TRUE
diff --git a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
index 6b6963cfa98..37da87aca6b 100644
--- a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
+++ b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
@@ -104,32 +104,32 @@
 /datum/sprite_accessory/hair/ipc/hesphiastos_alt_pink
 	name = "Pink Hesphiastos Screen"
 	icon_state = "pink_hesp_alt"
-	models_allowed = list("Industrial Revolution")
+	models_allowed = list("Titan Enforcer")
 
 /datum/sprite_accessory/hair/ipc/hesphiastos_alt_orange
 	name = "Orange Hesphiastos Screen"
 	icon_state = "orange_hesp_alt"
-	models_allowed = list("Industrial Revolution")
+	models_allowed = list("Titan Enforcer")
 
 /datum/sprite_accessory/hair/ipc/hesphiastos_alt_goggle
 	name = "Goggles Hesphiastos Screen"
 	icon_state = "goggles_hesp_alt"
-	models_allowed = list("Industrial Revolution")
+	models_allowed = list("Titan Enforcer")
 
 /datum/sprite_accessory/hair/ipc/hesphiastos_alt_scroll
 	name = "Scrolling Hesphiastos Screen"
 	icon_state = "scroll_hesp_alt"
-	models_allowed = list("Industrial Revolution")
+	models_allowed = list("Titan Enforcer")
 
 /datum/sprite_accessory/hair/ipc/hesphiastos_alt_rgb
 	name = "RGB Hesphiastos Screen"
 	icon_state = "rgb_hesp_alt"
-	models_allowed = list("Industrial Revolution")
+	models_allowed = list("Titan Enforcer")
 
 /datum/sprite_accessory/hair/ipc/hesphiastos_alt_rainbow
 	name = "Rainbow Hesphiastos Screen"
 	icon_state = "rainbow_hesp_alt"
-	models_allowed = list("Industrial Revolution")
+	models_allowed = list("Titan Enforcer")
 
 //Fluff
 /datum/sprite_accessory/hair/ipc/fluff
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index cda28a116c5..8617697874b 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -413,3 +413,8 @@
 	name = "emitter gun power cell"
 	maxcharge = 2200
 	chargerate = 100
+
+/obj/item/stock_parts/cell/degraded
+	name = "degraded power cell"
+	maxcharge = 750
+	chargerate = 25
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 9870fe45a68..fb79d30f12e 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -68,9 +68,18 @@
 	ammo_x_offset = 1
 	can_charge = FALSE
 	selfcharge = TRUE
+	var/emagged = FALSE
 
 /obj/item/gun/energy/floragun/emag_act(mob/user)
 	. = ..()
+
+	if(emagged)
+		return
+
+	if(user)
+		balloon_alert(user, "протоколы защиты сняты!")
+
+	emagged = TRUE
 	ammo_type = list(/obj/item/ammo_casing/energy/flora/alpha/emag, /obj/item/ammo_casing/energy/flora/beta, /obj/item/ammo_casing/energy/flora/gamma)
 	update_ammo_types()
 
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 9f70f5374ee..127c1c113ec 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -135,6 +135,12 @@
 /obj/item/reagent_containers/spray/cleaner/medical/empty
     list_reagents = list()
 
+/obj/item/reagent_containers/spray/cleaner/tactical
+    name = "Tactical cleaner"
+    desc = "Бутылочка из прочнейшего тёмно-синего пластика, распылитель чёрного цвета украшен тактическим снаряжением, разработана уборочно-силовыми структурами Нанотрейзен для ЗАЧИСТКИ и контроля грязи в помещениях."
+    icon_state = "cleaner_tactical"
+    item_state = "cleaner_tactical"
+
 /obj/item/reagent_containers/spray/blue_cleaner
     name = "bluespace cleaner"
     desc = "A spray with an increased storage of reagents, or it's not that simple...."
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
index a81bb67f4cc..51663306455 100644
Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index a4ce834cfae..88b6f5bd058 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi
index 60a461bc9f1..be1c5fb2feb 100644
Binary files a/icons/mob/clothing/species/drask/eyes.dmi and b/icons/mob/clothing/species/drask/eyes.dmi differ
diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi
index 06aff6f9fc6..f11289d5700 100644
Binary files a/icons/mob/clothing/species/grey/eyes.dmi and b/icons/mob/clothing/species/grey/eyes.dmi differ
diff --git a/icons/mob/clothing/species/monkey/eyes.dmi b/icons/mob/clothing/species/monkey/eyes.dmi
index e93142f8d2d..c9fcd0ea96b 100644
Binary files a/icons/mob/clothing/species/monkey/eyes.dmi and b/icons/mob/clothing/species/monkey/eyes.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 52633664fcb..5f35327a3f3 100755
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index f5d66841c1d..004891ea390 100755
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/mobs_lefthand.dmi b/icons/mob/inhands/mobs_lefthand.dmi
index d3703b56297..efc6a7c8aaf 100644
Binary files a/icons/mob/inhands/mobs_lefthand.dmi and b/icons/mob/inhands/mobs_lefthand.dmi differ
diff --git a/icons/mob/inhands/mobs_righthand.dmi b/icons/mob/inhands/mobs_righthand.dmi
index be4a567b689..16df4461689 100644
Binary files a/icons/mob/inhands/mobs_righthand.dmi and b/icons/mob/inhands/mobs_righthand.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 174e2a4ad1c..8c295e91da4 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index a6072426b39..2552e6f9aae 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index f97f776b592..b9cee7e6acf 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/weapons/energy.dmi b/icons/obj/weapons/energy.dmi
index 459a68a74cc..76045167bac 100644
Binary files a/icons/obj/weapons/energy.dmi and b/icons/obj/weapons/energy.dmi differ