diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
index 481e2cdf855..d995872cf0b 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
@@ -156,7 +156,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/skyrat/interdynefob/halls)
 "aB" = (
-/obj/machinery/vending/imported/tizirian,
+/obj/machinery/vending/imported/tiziran,
 /obj/effect/turf_decal/tile/bar/opposingcorners{
 	dir = 8
 	},
@@ -11243,8 +11243,8 @@
 "Xx" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder{
-	pixel_y = 4;
-	pixel_x = 7
+	pixel_x = 7;
+	pixel_y = 4
 	},
 /obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east,
 /obj/effect/turf_decal/siding/dark{
@@ -11368,8 +11368,8 @@
 /obj/structure/cable,
 /obj/structure/table/reinforced,
 /obj/machinery/reagentgrinder{
-	pixel_y = 4;
-	pixel_x = -8
+	pixel_x = -8;
+	pixel_y = 4
 	},
 /obj/item/storage/box/beakers{
 	pixel_x = 8;
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
index 041a425c6d0..98b9cdd0d9e 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
@@ -1390,8 +1390,8 @@
 	pixel_y = -9
 	},
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = -7;
-	pixel_x = 10
+	pixel_x = 10;
+	pixel_y = -7
 	},
 /obj/machinery/button/door{
 	id = "HotelRoom5";
@@ -1550,12 +1550,12 @@
 	pixel_x = -7
 	},
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = 9;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 9
 	},
 /obj/item/reagent_containers/cup/glass/mug/nanotrasen{
-	pixel_y = 10;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 10
 	},
 /obj/machinery/button/door{
 	id = "HotelRoom3";
@@ -1589,8 +1589,8 @@
 "ii" = (
 /obj/structure/sink/directional/east,
 /obj/structure/mirror{
-	pixel_y = -3;
-	pixel_x = -31
+	pixel_x = -31;
+	pixel_y = -3
 	},
 /turf/open/indestructible/hoteltile,
 /area/ruin/space/has_grav/hotel/guestroom/room_3)
@@ -2846,8 +2846,8 @@
 /obj/item/bedsheet/random/double,
 /obj/machinery/button/curtain{
 	id = "HotelRoom2Curtains";
-	pixel_y = 1;
-	pixel_x = 22
+	pixel_x = 22;
+	pixel_y = 1
 	},
 /turf/open/floor/carpet/neon/simple/pink/nodots,
 /area/ruin/space/has_grav/hotel/guestroom/room_2)
@@ -3096,8 +3096,8 @@
 /area/ruin/space/has_grav/hotel/guestroom/room_1)
 "pc" = (
 /mob/living/basic/bat{
-	name = "Fronk";
-	desc = "Fronk's the beloved space bat of the space hotel, if found make sure to return him!"
+	desc = "Fronk's the beloved space bat of the space hotel, if found make sure to return him!";
+	name = "Fronk"
 	},
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/hotel/workroom)
@@ -4023,8 +4023,8 @@
 	pixel_y = 12
 	},
 /obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled{
-	pixel_y = 9;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 9
 	},
 /obj/machinery/light{
 	dir = 8
@@ -4707,15 +4707,15 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/table/wood,
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = 9;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 9
 	},
 /obj/item/coffee_cartridge/decaf{
 	pixel_x = -7
 	},
 /obj/item/reagent_containers/cup/glass/mug/nanotrasen{
-	pixel_y = 10;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 10
 	},
 /turf/open/floor/carpet/neon/simple/pink/nodots,
 /area/ruin/space/has_grav/hotel/guestroom/room_2)
@@ -5423,7 +5423,7 @@
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/hotel)
 "ET" = (
-/obj/machinery/vending/imported/tizirian,
+/obj/machinery/vending/imported/tiziran,
 /obj/effect/turf_decal/siding/dark{
 	dir = 1
 	},
@@ -6528,8 +6528,8 @@
 	pixel_x = -7
 	},
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = 9;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 9
 	},
 /turf/open/floor/wood/large,
 /area/ruin/space/has_grav/hotel/guestroom/room_4)
@@ -6575,8 +6575,8 @@
 	pixel_y = -9
 	},
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = -7;
-	pixel_x = 10
+	pixel_x = 10;
+	pixel_y = -7
 	},
 /obj/machinery/button/door{
 	id = "HotelRoom6";
@@ -8015,8 +8015,8 @@
 	pixel_y = -9
 	},
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = -7;
-	pixel_x = 10
+	pixel_x = 10;
+	pixel_y = -7
 	},
 /turf/open/floor/carpet/neon/simple/white/nodots,
 /area/ruin/space/has_grav/hotel/guestroom)
diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm
index b4552b0b626..555e13087e0 100644
--- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm
+++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm
@@ -70,8 +70,8 @@
 "aeG" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters/indestructible{
-	name = "Nanotrasen Consultant's Shutters";
-	id = "ntrep_shutters"
+	id = "ntrep_shutters";
+	name = "Nanotrasen Consultant's Shutters"
 	},
 /turf/open/floor/plating,
 /area/centcom/interlink)
@@ -3376,9 +3376,9 @@
 	dir = 10
 	},
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
-	name = "Bar Shutter Control";
 	id = "il_bar";
+	name = "Bar Shutter Control";
+	pixel_y = -8;
 	req_access = list("bar")
 	},
 /turf/open/floor/iron/dark,
@@ -4309,8 +4309,8 @@
 "bae" = (
 /obj/structure/table,
 /obj/machinery/computer/libraryconsole{
-	pixel_y = 6;
-	dir = 1
+	dir = 1;
+	pixel_y = 6
 	},
 /turf/open/floor/iron,
 /area/centcom/interlink)
@@ -4730,8 +4730,8 @@
 /area/centcom/holding/cafedorms)
 "bVH" = (
 /obj/machinery/door/poddoor/shutters/window/indestructible{
-	name = "Windowed Interlink Access Shutters";
-	id = "interlink_hall"
+	id = "interlink_hall";
+	name = "Windowed Interlink Access Shutters"
 	},
 /obj/effect/turf_decal/caution/stand_clear,
 /turf/open/floor/iron,
@@ -4746,9 +4746,9 @@
 /area/centcom/interlink)
 "bWy" = (
 /obj/machinery/button/door/directional/east{
-	pixel_y = -8;
 	id = "arr_hall_lookout";
 	name = "Lookout Shutters Control";
+	pixel_y = -8;
 	req_access = list("command")
 	},
 /turf/open/floor/iron/dark,
@@ -4780,11 +4780,11 @@
 	},
 /obj/item/kirbyplants/random,
 /obj/machinery/button/door/directional/south{
-	pixel_x = -8;
+	id = "room4";
 	name = "Door Lock";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	id = "room4"
+	pixel_x = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -5062,8 +5062,8 @@
 "cMs" = (
 /obj/structure/table/wood,
 /obj/item/stamp/centcom{
-	pixel_y = 10;
-	pixel_x = -8
+	pixel_x = -8;
+	pixel_y = 10
 	},
 /obj/item/stamp{
 	pixel_y = 10
@@ -5407,8 +5407,8 @@
 /area/centcom/interlink)
 "dFF" = (
 /obj/structure/sign/directions/security{
-	pixel_y = -8;
-	dir = 8
+	dir = 8;
+	pixel_y = -8
 	},
 /obj/structure/sign/directions/medical,
 /obj/structure/sign/directions/arrival{
@@ -5473,8 +5473,8 @@
 /area/cruiser_dock)
 "dPd" = (
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Interlink Locker Room";
-	dir = 4
+	dir = 4;
+	name = "Interlink Locker Room"
 	},
 /turf/open/floor/iron,
 /area/centcom/interlink)
@@ -5661,9 +5661,9 @@
 /obj/effect/turf_decal/trimline/blue/filled/line,
 /obj/machinery/vending/imported{
 	default_price = 0;
+	extended_inventory = 1;
 	extra_price = 0;
-	fair_market_price = 0;
-	extended_inventory = 1
+	fair_market_price = 0
 	},
 /turf/open/indestructible/hoteltile{
 	icon_state = "floor"
@@ -5778,10 +5778,10 @@
 	dir = 1
 	},
 /obj/machinery/button/door/directional/south{
-	normaldoorcontrol = 1;
-	specialfunctions = 4;
+	id = "stall1";
 	name = "Door Lock";
-	id = "stall1"
+	normaldoorcontrol = 1;
+	specialfunctions = 4
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron/dark,
@@ -5803,8 +5803,8 @@
 	pixel_y = 5
 	},
 /obj/item/folder/yellow{
-	pixel_y = 3;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 3
 	},
 /obj/item/stamp{
 	pixel_x = 8;
@@ -5992,8 +5992,8 @@
 	pixel_y = 6
 	},
 /obj/item/paper/crumpled{
-	pixel_y = -4;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = -4
 	},
 /obj/item/paper/crumpled,
 /obj/effect/turf_decal/tile/green/opposingcorners,
@@ -6032,8 +6032,8 @@
 /area/centcom/interlink)
 "fua" = (
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Interlink Longue";
-	dir = 8
+	dir = 8;
+	name = "Interlink Longue"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -6280,8 +6280,8 @@
 /area/centcom/holding/cafepark)
 "gfW" = (
 /obj/structure/sign/directions/security{
-	pixel_y = -8;
-	dir = 8
+	dir = 8;
+	pixel_y = -8
 	},
 /obj/structure/sign/directions/medical,
 /obj/structure/sign/directions/arrival{
@@ -6321,8 +6321,8 @@
 "gjK" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/poddoor/shutters/indestructible{
-	name = "Interlink Bar Shutters";
-	id = "il_bar"
+	id = "il_bar";
+	name = "Interlink Bar Shutters"
 	},
 /turf/open/floor/iron/dark,
 /area/centcom/interlink)
@@ -6427,11 +6427,11 @@
 	dir = 8
 	},
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
-	name = "Door Lock";
 	id = "room5";
-	specialfunctions = 4;
-	normaldoorcontrol = 1
+	name = "Door Lock";
+	normaldoorcontrol = 1;
+	pixel_y = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -6511,8 +6511,8 @@
 	name = "Jim Norton's Quebecois Coffee table"
 	},
 /obj/item/reagent_containers/condiment/sugar{
-	pixel_y = 4;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 4
 	},
 /obj/item/reagent_containers/condiment/sugar{
 	pixel_y = 4
@@ -6887,8 +6887,8 @@
 	pixel_y = 7
 	},
 /obj/item/folder/blue{
-	pixel_y = -2;
-	pixel_x = -9
+	pixel_x = -9;
+	pixel_y = -2
 	},
 /obj/item/pen/blue{
 	pixel_x = 3;
@@ -7172,8 +7172,8 @@
 /area/centcom/holding/cafepark)
 "iwK" = (
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Interlink Cafe";
-	dir = 4
+	dir = 4;
+	name = "Interlink Cafe"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -7415,8 +7415,8 @@
 "iZr" = (
 /obj/structure/table/wood,
 /obj/machinery/reagentgrinder{
-	pixel_y = 8;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 8
 	},
 /obj/structure/sign/poster/contraband/pwr_game/directional/north,
 /obj/item/reagent_containers/cup/soda_cans/skyrat/welding_fizz{
@@ -7499,9 +7499,9 @@
 /area/centcom/interlink)
 "jnu" = (
 /obj/machinery/button/door/directional/east{
-	pixel_y = -8;
 	id = "interlink_hall2";
 	name = "Arrivals Hall Shutter Control";
+	pixel_y = -8;
 	req_access = list("security")
 	},
 /obj/structure/closet/crate/bin,
@@ -7521,9 +7521,9 @@
 	},
 /obj/machinery/light/cold/directional/east,
 /obj/machinery/button/door/directional/east{
-	pixel_y = 8;
 	id = "arriv_hall";
 	name = "Arrivals Access Shutter Control";
+	pixel_y = 8;
 	req_access = list("security")
 	},
 /obj/effect/turf_decal/tile/red/opposingcorners,
@@ -7673,8 +7673,8 @@
 	pixel_y = -8
 	},
 /obj/structure/sign/directions/dorms{
-	pixel_y = 8;
-	dir = 4
+	dir = 4;
+	pixel_y = 8
 	},
 /turf/closed/indestructible/riveted,
 /area/centcom/interlink)
@@ -7683,8 +7683,8 @@
 	dir = 4
 	},
 /obj/structure/chair/sofa/bench/right{
-	greyscale_colors = "#AA8A61";
-	dir = 1
+	dir = 1;
+	greyscale_colors = "#AA8A61"
 	},
 /obj/machinery/light/warm/directional/south,
 /turf/open/floor/wood,
@@ -7763,8 +7763,8 @@
 "jUm" = (
 /obj/structure/table,
 /obj/item/storage/fancy/donut_box{
-	pixel_y = 10;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 10
 	},
 /obj/item/storage/fancy/donut_box{
 	pixel_x = -4;
@@ -7806,9 +7806,9 @@
 /obj/effect/turf_decal/trimline/blue/filled/line,
 /obj/machinery/vending/imported/mothic{
 	default_price = 0;
+	extended_inventory = 1;
 	extra_price = 0;
-	fair_market_price = 0;
-	extended_inventory = 1
+	fair_market_price = 0
 	},
 /turf/open/indestructible/hoteltile{
 	icon_state = "floor"
@@ -7850,9 +7850,9 @@
 /area/centcom/interlink)
 "khC" = (
 /obj/machinery/button/door/directional/north{
-	pixel_x = -8;
-	name = "Kitchen Shutter Control";
 	id = "il_kitchen";
+	name = "Kitchen Shutter Control";
+	pixel_x = -8;
 	req_access = list("kitchen")
 	},
 /turf/open/floor/iron/cafeteria,
@@ -7876,8 +7876,8 @@
 	height = 50;
 	json_key = "emergency";
 	name = "CentCom Emergency Shuttle Dock";
-	width = 50;
-	shuttle_id = "emergency_away"
+	shuttle_id = "emergency_away";
+	width = 50
 	},
 /turf/open/space/basic,
 /area/space)
@@ -7941,8 +7941,8 @@
 "kqK" = (
 /obj/structure/table/wood,
 /obj/machinery/fax{
-	pixel_y = 5;
-	fax_name = "Interlink Meeting Room"
+	fax_name = "Interlink Meeting Room";
+	pixel_y = 5
 	},
 /obj/effect/turf_decal/siding/dark{
 	dir = 4
@@ -8506,9 +8506,9 @@
 /obj/effect/turf_decal/trimline/blue/filled/line,
 /obj/machinery/vending/imported/yangyu{
 	default_price = 0;
+	extended_inventory = 1;
 	extra_price = 0;
-	fair_market_price = 0;
-	extended_inventory = 1
+	fair_market_price = 0
 	},
 /turf/open/indestructible/hoteltile{
 	icon_state = "floor"
@@ -8599,8 +8599,8 @@
 	name = "Coffee Counter"
 	},
 /obj/item/reagent_containers/cup/glass/coffee_cup{
-	pixel_y = 12;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 12
 	},
 /obj/item/reagent_containers/cup/glass/coffee_cup{
 	pixel_y = 4
@@ -8694,11 +8694,11 @@
 	dir = 8
 	},
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
-	name = "Door Lock";
 	id = "room8";
-	specialfunctions = 4;
-	normaldoorcontrol = 1
+	name = "Door Lock";
+	normaldoorcontrol = 1;
+	pixel_y = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -8909,11 +8909,11 @@
 	},
 /obj/item/kirbyplants/random,
 /obj/machinery/button/door/directional/south{
-	pixel_x = -8;
+	id = "room3";
 	name = "Door Lock";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	id = "room3"
+	pixel_x = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -9156,9 +9156,9 @@
 "nHC" = (
 /obj/machinery/photocopier,
 /obj/machinery/button/door/directional/south{
-	pixel_x = 8;
 	id = "bs_shutters";
 	name = "Privacy Shutter Comtrol";
+	pixel_x = 8;
 	req_access = list("command")
 	},
 /obj/effect/turf_decal/bot,
@@ -9224,8 +9224,8 @@
 	pixel_y = 8
 	},
 /obj/item/folder/blue{
-	pixel_y = 5;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 5
 	},
 /obj/item/folder/yellow,
 /obj/item/stamp{
@@ -9439,11 +9439,11 @@
 	},
 /obj/item/kirbyplants/random,
 /obj/machinery/button/door/directional/south{
-	pixel_x = -8;
+	id = "room1";
 	name = "Door Lock";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	id = "room1"
+	pixel_x = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -9676,15 +9676,15 @@
 "oYa" = (
 /obj/structure/chair/office,
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
-	name = "Evac Hall Shutter Control";
 	id = "interlink_hall";
+	name = "Evac Hall Shutter Control";
+	pixel_y = -8;
 	req_access = list("security")
 	},
 /obj/machinery/button/door/directional/west{
-	pixel_y = 8;
-	name = "Evac Access Shutter Control";
 	id = "evac_hall";
+	name = "Evac Access Shutter Control";
+	pixel_y = 8;
 	req_access = list("security")
 	},
 /obj/machinery/light/cold/directional/west,
@@ -9921,9 +9921,9 @@
 	name = "Administrative Offices"
 	},
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
 	id = "evac_hall_lookout";
 	name = "Lookout Shutters Control";
+	pixel_y = -8;
 	req_access = list("command")
 	},
 /obj/effect/turf_decal/trimline/dark_green/corner{
@@ -10064,8 +10064,8 @@
 	height = 13;
 	name = "tram dock";
 	roundstart_template = /datum/map_template/shuttle/arrivals_skyrat;
-	width = 5;
-	shuttle_id = "arrivals_shuttle"
+	shuttle_id = "arrivals_shuttle";
+	width = 5
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -10152,10 +10152,10 @@
 	dir = 1
 	},
 /obj/machinery/button/door/directional/south{
-	normaldoorcontrol = 1;
-	specialfunctions = 4;
+	id = "stall2";
 	name = "Door Lock";
-	id = "stall2"
+	normaldoorcontrol = 1;
+	specialfunctions = 4
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron/dark,
@@ -10181,9 +10181,9 @@
 "pVh" = (
 /obj/machinery/photocopier,
 /obj/machinery/button/door/directional/north{
-	pixel_x = 8;
-	name = "Privacy Shutter Comtrol";
 	id = "ntrep_shutters";
+	name = "Privacy Shutter Comtrol";
+	pixel_x = 8;
 	req_access = list("command")
 	},
 /obj/effect/turf_decal/bot,
@@ -10198,9 +10198,9 @@
 /area/centcom/interlink)
 "pXn" = (
 /obj/machinery/button/door/directional/east{
-	pixel_y = -8;
 	id = "evac_hall_lookout";
 	name = "Lookout Shutters Control";
+	pixel_y = -8;
 	req_access = list("command")
 	},
 /turf/open/floor/iron/dark,
@@ -10572,8 +10572,8 @@
 	dir = 8
 	},
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Interlink Cafe";
-	dir = 4
+	dir = 4;
+	name = "Interlink Cafe"
 	},
 /turf/open/floor/wood/parquet,
 /area/centcom/interlink)
@@ -10652,8 +10652,8 @@
 "rbo" = (
 /obj/structure/table,
 /obj/machinery/microwave{
-	pixel_y = 7;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 7
 	},
 /turf/open/floor/iron/cafeteria,
 /area/centcom/interlink)
@@ -10680,9 +10680,9 @@
 	dir = 8;
 	dwidth = 17;
 	height = 13;
-	shuttle_id = "goldeneye_cruiser_dock";
 	name = "Goldeneye Satellite Dock";
 	roundstart_template = /datum/map_template/shuttle/goldeneye_cruiser;
+	shuttle_id = "goldeneye_cruiser_dock";
 	width = 27
 	},
 /turf/open/floor/plating,
@@ -10693,8 +10693,8 @@
 	pixel_y = 7
 	},
 /obj/item/folder/yellow{
-	pixel_y = 3;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 3
 	},
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /turf/open/floor/iron/dark,
@@ -10719,11 +10719,11 @@
 	dir = 8
 	},
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
-	name = "Door Lock";
 	id = "room7";
-	specialfunctions = 4;
-	normaldoorcontrol = 1
+	name = "Door Lock";
+	normaldoorcontrol = 1;
+	pixel_y = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -10771,8 +10771,8 @@
 /area/centcom/holding/cafe)
 "rAe" = (
 /obj/structure/chair/sofa/bench/left{
-	greyscale_colors = "#AA8A61";
-	dir = 1
+	dir = 1;
+	greyscale_colors = "#AA8A61"
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -10797,8 +10797,8 @@
 /area/centcom/interlink)
 "rGI" = (
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Interlink Aux Garden";
-	dir = 4
+	dir = 4;
+	name = "Interlink Aux Garden"
 	},
 /obj/effect/turf_decal/siding/white{
 	dir = 4
@@ -11019,8 +11019,8 @@
 	dir = 1
 	},
 /obj/structure/sign/directions/dorms{
-	pixel_y = 8;
-	dir = 4
+	dir = 4;
+	pixel_y = 8
 	},
 /turf/closed/indestructible/riveted,
 /area/centcom/interlink)
@@ -11461,8 +11461,8 @@
 "tdP" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters/indestructible{
-	name = "BlueShields Shutters";
-	id = "bs_shutters"
+	id = "bs_shutters";
+	name = "BlueShields Shutters"
 	},
 /turf/open/floor/plating,
 /area/centcom/interlink)
@@ -11725,11 +11725,11 @@
 	},
 /obj/effect/turf_decal/trimline/blue/filled/line,
 /obj/machinery/light,
-/obj/machinery/vending/imported/tizirian{
+/obj/machinery/vending/imported/tiziran{
 	default_price = 0;
+	extended_inventory = 1;
 	extra_price = 0;
-	fair_market_price = 0;
-	extended_inventory = 1
+	fair_market_price = 0
 	},
 /turf/open/indestructible/hoteltile{
 	icon_state = "floor"
@@ -11828,15 +11828,15 @@
 "ucr" = (
 /obj/structure/chair/office,
 /obj/machinery/button/door/directional/east{
-	pixel_y = -8;
 	id = "interlink_hall";
 	name = "Evac Hall Shutter Control";
+	pixel_y = -8;
 	req_access = list("security")
 	},
 /obj/machinery/button/door/directional/east{
-	pixel_y = 8;
 	id = "evac_hall";
 	name = "Evac Access Shutter Control";
+	pixel_y = 8;
 	req_access = list("security")
 	},
 /obj/machinery/light/cold/directional/east,
@@ -11922,8 +11922,8 @@
 /area/centcom/holding/cafe)
 "uji" = (
 /obj/machinery/door/poddoor/shutters/window/indestructible{
-	name = "Windowed Interlink Access Shutters";
-	id = "interlink_hall2"
+	id = "interlink_hall2";
+	name = "Windowed Interlink Access Shutters"
 	},
 /obj/effect/turf_decal/caution/stand_clear,
 /turf/open/floor/iron,
@@ -12042,11 +12042,11 @@
 	},
 /obj/item/kirbyplants/random,
 /obj/machinery/button/door/directional/south{
-	pixel_x = -8;
+	id = "room2";
 	name = "Door Lock";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	id = "room2"
+	pixel_x = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -12067,8 +12067,8 @@
 "uFG" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/poddoor/shutters/indestructible{
-	name = "Interlink Kitchen Shutters";
-	id = "il_kitchen"
+	id = "il_kitchen";
+	name = "Interlink Kitchen Shutters"
 	},
 /turf/open/floor/iron/cafeteria,
 /area/centcom/interlink)
@@ -12082,8 +12082,8 @@
 "uGU" = (
 /obj/structure/table,
 /obj/machinery/microwave{
-	pixel_y = 6;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 6
 	},
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /turf/open/floor/iron/dark,
@@ -12204,16 +12204,16 @@
 	pixel_y = -1
 	},
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = 8;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 8
 	},
 /obj/item/coffee_cartridge/fancy{
-	pixel_y = 3;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 3
 	},
 /obj/item/reagent_containers/cup/coffeepot{
-	pixel_y = 20;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 20
 	},
 /obj/machinery/light/cold/directional/west,
 /turf/open/floor/iron/dark/textured_large,
@@ -12352,11 +12352,11 @@
 	dir = 8
 	},
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
-	name = "Door Lock";
 	id = "room6";
-	specialfunctions = 4;
-	normaldoorcontrol = 1
+	name = "Door Lock";
+	normaldoorcontrol = 1;
+	pixel_y = -8;
+	specialfunctions = 4
 	},
 /turf/open/floor/wood,
 /area/centcom/interlink)
@@ -12453,9 +12453,9 @@
 /area/centcom/interlink)
 "vLt" = (
 /obj/structure/closet/crate/cardboard/tiziran,
-/obj/item/storage/box/foodpack/tiziria/roll,
-/obj/item/storage/box/foodpack/tiziria/roll,
-/obj/item/storage/box/foodpack/tiziria/stir_fry,
+/obj/item/storage/box/foodpack/tizira/roll,
+/obj/item/storage/box/foodpack/tizira/roll,
+/obj/item/storage/box/foodpack/tizira/stir_fry,
 /obj/item/storage/box/tiziran_meats,
 /turf/open/floor/iron/dark/textured_large,
 /area/cruiser_dock)
@@ -12464,8 +12464,8 @@
 /area/centcom/interlink)
 "vLY" = (
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Interlink Bar";
-	dir = 4
+	dir = 4;
+	name = "Interlink Bar"
 	},
 /obj/effect/turf_decal/trimline/green/corner{
 	dir = 8
@@ -12483,8 +12483,8 @@
 /area/centcom/holding/cafepark)
 "vRf" = (
 /obj/machinery/door/airlock/multi_tile/glass{
-	name = "Interlink Garden";
-	dir = 4
+	dir = 4;
+	name = "Interlink Garden"
 	},
 /obj/effect/turf_decal/trimline/green/arrow_ccw,
 /obj/effect/turf_decal/siding/white{
@@ -12711,8 +12711,8 @@
 	pixel_y = 2
 	},
 /obj/item/pen{
-	pixel_y = 10;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 10
 	},
 /turf/open/floor/carpet/executive,
 /area/centcom/interlink)
@@ -12739,8 +12739,8 @@
 /area/centcom/interlink)
 "wyF" = (
 /obj/structure/sign/directions/security{
-	pixel_y = -8;
-	dir = 8
+	dir = 8;
+	pixel_y = -8
 	},
 /obj/structure/sign/directions/medical{
 	dir = 8
@@ -13270,16 +13270,16 @@
 /area/centcom/interlink)
 "xVv" = (
 /obj/machinery/button/door/directional/west{
-	pixel_y = -8;
-	name = "Arrivals Hall Shutter Control";
 	id = "interlink_hall2";
+	name = "Arrivals Hall Shutter Control";
+	pixel_y = -8;
 	req_access = list("security")
 	},
 /obj/machinery/light/cold/directional/west,
 /obj/machinery/button/door/directional/west{
-	pixel_y = 8;
-	name = "Arrivals Access Shutter Control";
 	id = "arriv_hall";
+	name = "Arrivals Access Shutter Control";
+	pixel_y = 8;
 	req_access = list("security")
 	},
 /obj/effect/turf_decal/tile/red/opposingcorners,
@@ -13288,10 +13288,10 @@
 "xVV" = (
 /obj/machinery/recharge_station,
 /obj/machinery/button/door/directional/south{
-	normaldoorcontrol = 1;
-	specialfunctions = 4;
+	id = "stall3";
 	name = "Door Lock";
-	id = "stall3"
+	normaldoorcontrol = 1;
+	specialfunctions = 4
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron/dark,
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index 9f329d2b791..fbbf5d37021 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -658,7 +658,7 @@
 		/obj/machinery/vending/imported = "NT Sustenance Supplier", //SKYRAT EDIT ADDITION
 		/obj/machinery/vending/imported/yangyu = "Fudobenda", //SKYRAT EDIT ADDITION
 		/obj/machinery/vending/imported/mothic = "Nomad Fleet Ration Chit Exchange", //SKYRAT EDIT ADDITION
-		/obj/machinery/vending/imported/tizirian = "Tizirian Imported Delicacies",) //SKYRAT EDIT ADDITION
+		/obj/machinery/vending/imported/tiziran = "Tiziran Imported Delicacies",) //SKYRAT EDIT ADDITION
 
 /obj/item/circuitboard/machine/vendor/screwdriver_act(mob/living/user, obj/item/tool)
 	var/static/list/display_vending_names_paths
diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm b/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm
index b4ed2db1098..9a9a34a34c8 100644
--- a/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm
+++ b/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm
@@ -66,24 +66,24 @@
 	name = "\improper Ration Type M - Fueljack's Feast"
 	main_course = /obj/item/food/vendor_tray_meal/fueljack
 
-/obj/item/storage/box/foodpack/tiziria
-	name = "\improper Tiziria Imports Pack - Moonfish Nizaya"
-	desc = "A dull, metal foil package with the colors of the tizirian flag striped across it, as well as a stamp of legitimate origin from the Tizirian exports office."
+/obj/item/storage/box/foodpack/tizira
+	name = "\improper Tizira Imports Pack - Moonfish Nizaya"
+	desc = "A dull, metal foil package with the colors of the Tiziran flag striped across it, as well as a stamp of legitimate origin from the Tiziran exports office."
 	icon_state = "foodpack_tizira_big"
 	main_course = /obj/item/food/vendor_tray_meal/moonfish_nizaya
-	side_item = /obj/effect/spawner/random/vendor_meal_sides/tiziria
+	side_item = /obj/effect/spawner/random/vendor_meal_sides/tizira
 	condiment_pack = /obj/item/reagent_containers/condiment/pack/bbqsauce
-	custom_price = PAYCHECK_CREW * 2 //Tizirian imports are a bit more expensive
+	custom_price = PAYCHECK_CREW * 2 //Tiziran imports are a bit more expensive
 
-/obj/item/storage/box/foodpack/tiziria/examine_more(mob/user)
+/obj/item/storage/box/foodpack/tizira/examine_more(mob/user)
 	. = ..()
 	. += span_notice("<b>Now that you look at it, the origin stamp appears to be a poor imitation of the real thing!</b>")
 	return .
 
-/obj/item/storage/box/foodpack/tiziria/roll
-	name = "\improper Tiziria Imports Pack - Emperor Roll"
+/obj/item/storage/box/foodpack/tizira/roll
+	name = "\improper Tizira Imports Pack - Emperor Roll"
 	main_course = /obj/item/food/vendor_tray_meal/emperor_roll
 
-/obj/item/storage/box/foodpack/tiziria/stir_fry
-	name = "\improper Tiziria Imports Pack - Mushroom Stirfry"
+/obj/item/storage/box/foodpack/tizira/stir_fry
+	name = "\improper Tizira Imports Pack - Mushroom Stirfry"
 	main_course = /obj/item/food/vendor_tray_meal/mushroom_fry
diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm
index ed966102f15..011b494936e 100644
--- a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm
+++ b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm
@@ -1,5 +1,7 @@
 // Packaged whole meals and sides for the 'meals' tab of vendors
 
+/* TRASH */
+
 /obj/item/trash/empty_food_tray
 	name = "empty plastic food tray"
 	desc = "The condensation and what you can only hope are the leftovers of food make this a bit hard to reuse."
@@ -23,8 +25,14 @@
 /obj/item/trash/empty_side_pack/moth
 	icon_state = "foodpack_moth_trash"
 
-/obj/item/trash/empty_side_pack/tiziria
-	icon_state = "foodpack_tiziria_trash"
+/obj/item/trash/empty_side_pack/tizira
+	icon_state = "foodpack_tizira_trash"
+	
+/* MEALS */
+	
+/*
+*	NT Meals
+*/
 
 /obj/item/food/vendor_tray_meal
 	name = "\improper NT-Meal: Steak and Macaroni"
@@ -67,6 +75,10 @@
 	food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/capsaicin = 10)
 	tastes = list("bread" = 2, "chicken?" = 2, "overwhelming spice" = 2, "laziness" = 1)
 	foodtypes = MEAT | GRAIN | DAIRY
+	
+/*
+*	Yangyu Meals
+*/
 
 /obj/item/food/vendor_tray_meal/ramen
 	name = "\improper Meinkosu: Homestyle Noodles"
@@ -89,6 +101,10 @@
 	tastes = list("cheap beef" = 1, "rice" = 3, "laziness" = 1)
 	foodtypes = GRAIN | MEAT
 
+/*
+*	Mothic Meals
+*/
+
 /obj/item/food/vendor_tray_meal/pesto_pizza
 	name = "\improper Main Course - Type M: Pesto Pizza"
 	desc = "A rectangular pizza with a suspiciously bright green pesto in place of the standard tomato sauce."
@@ -109,32 +125,42 @@
 	icon_state = "foodtray_fuel_jacks_meal"
 	tastes = list("potato" = 2, "cabbage" = 2, "cheese?" = 2, "laziness" = 1)
 	foodtypes = DAIRY | VEGETABLES
+	
+/*
+*	Tiziran Meals
+*/
 
 /obj/item/food/vendor_tray_meal/moonfish_nizaya
-	name = "\improper Tiziria Imports: Moonfish and Nizaya"
+	name = "\improper Tizira Imports: Moonfish and Nizaya"
 	desc = "An almost synthetic looking cut of moonfish, paired with an equal helping of nizaya pasta."
 	icon_state = "foodtray_moonfish_nizaya"
 	tastes = list("fish?" = 2, "cheap noodles" = 2, "laziness" = 1)
 	foodtypes = VEGETABLES | NUTS | SEAFOOD
 
 /obj/item/food/vendor_tray_meal/emperor_roll
-	name = "\improper Tiziria Imports: Emperor Roll"
+	name = "\improper Tizira Imports: Emperor Roll"
 	desc = "A pretty sad looking emperor roll, if you can even call it that; it seems caviar wasn't in the budget."
 	icon_state = "foodtray_emperor_roll"
 	tastes = list("bread" = 2, "cheese?" = 2, "liver?" = 2, "laziness" = 1)
-	foodtypes = VEGETABLES | NUTS | DAIRY | MEAT | GORE
+	foodtypes = VEGETABLES | NUTS | MEAT | GORE
 
 /obj/item/food/vendor_tray_meal/mushroom_fry
-	name = "\improper Tiziria Imports: Mushroom Stirfry"
+	name = "\improper Tizira Imports: Mushroom Stirfry"
 	desc = "A mix of what was likely mushrooms too low quality to be used in making actual food, lightly fried and tossed in a plastic container together."
 	icon_state = "foodtray_shroom_fry"
 	tastes = list("mushroom" = 4, "becoming rich" = 1, "laziness" = 1)
 	foodtypes = VEGETABLES
 
+/* SIDES */
+
 /obj/effect/spawner/random/vendor_meal_sides
 	name = "random side spawner"
 	desc = "I hope I get one that actually matches my meal."
 	icon_state = "loot"
+	
+/*
+*	NT Sides
+*/
 
 /obj/effect/spawner/random/vendor_meal_sides/nt
 	name = "random nt side spawner"
@@ -169,6 +195,10 @@
 	desc = "A small stack of tough flatbread, and a small spread of cheese for each."
 	tastes = list("tough bread" = 2, "cheese" = 2)
 	foodtypes = GRAIN | DAIRY
+	
+/*
+*	Yangyu Sides
+*/
 
 /obj/effect/spawner/random/vendor_meal_sides/yangyu
 	name = "random yangyu side spawner"
@@ -204,6 +234,10 @@
 	trash_type = /obj/item/trash/empty_side_pack/yangyu
 	tastes = list("vinegar" = 4)
 	foodtypes = VEGETABLES
+	
+/*
+*	Mothic Sides
+*/
 
 /obj/effect/spawner/random/vendor_meal_sides/moth
 	name = "random mothic side spawner"
@@ -239,11 +273,15 @@
 	trash_type = /obj/item/trash/empty_side_pack/moth
 	tastes = list("seeds" = 2, "char" = 2)
 	foodtypes = NUTS
+	
+/*
+*	Tiziran Sides
+*/
 
-/obj/effect/spawner/random/vendor_meal_sides/tiziria
-	name = "random tizirian side spawner"
+/obj/effect/spawner/random/vendor_meal_sides/tizira
+	name = "random tiziran side spawner"
 
-/obj/effect/spawner/random/vendor_meal_sides/tiziria/Initialize(mapload)
+/obj/effect/spawner/random/vendor_meal_sides/tizira/Initialize(mapload)
 	loot = list(
 		/obj/item/food/vendor_tray_meal/side/root_crackers,
 		/obj/item/food/vendor_tray_meal/side/korta_brittle,
@@ -252,25 +290,25 @@
 	. = ..()
 
 /obj/item/food/vendor_tray_meal/side/root_crackers
-	name = "\improper Tiziria Imports: Rootbread Crackers and Pate"
+	name = "\improper Tizira Imports: Rootbread Crackers and Pate"
 	desc = "A small stack of rootbread crackers, with a small spread of meat pate for each."
-	icon_state = "foodpack_tiziria"
-	trash_type = /obj/item/trash/empty_side_pack/tiziria
+	icon_state = "foodpack_tizira"
+	trash_type = /obj/item/trash/empty_side_pack/tizira
 	tastes = list("tough rootbread" = 2, "pate" = 2)
 	foodtypes = VEGETABLES | NUTS | MEAT
 
 /obj/item/food/vendor_tray_meal/side/korta_brittle
-	name = "\improper Tiziria Imports: Korta Brittle"
+	name = "\improper Tizira Imports: Korta Brittle"
 	desc = "A perfectly rectangular portion of unsweetened korta brittle."
-	icon_state = "foodpack_tiziria"
-	trash_type = /obj/item/trash/empty_side_pack/tiziria
+	icon_state = "foodpack_tizira"
+	trash_type = /obj/item/trash/empty_side_pack/tizira
 	tastes = list("peppery heat" = 2)
 	foodtypes = NUTS
 
 /obj/item/food/vendor_tray_meal/side/crispy_headcheese
-	name = "\improper Tiziria Imports: Crisped Headcheese"
+	name = "\improper Tizira Imports: Crisped Headcheese"
 	desc = "A processed looking block of breaded headcheese."
-	icon_state = "foodpack_tiziria"
-	trash_type = /obj/item/trash/empty_side_pack/tiziria
+	icon_state = "foodpack_tizira"
+	trash_type = /obj/item/trash/empty_side_pack/tizira
 	tastes = list("cheese" = 1, "oil" = 1)
 	foodtypes = MEAT | VEGETABLES | NUTS | GORE
diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm b/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm
index 0ca9cecb174..38de344ec4d 100644
--- a/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm
+++ b/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm
@@ -22,7 +22,7 @@
 	custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)
 
 /*
-*	"Yangyu" Snacks
+*	Yangyu Snacks
 */
 
 /obj/item/reagent_containers/cup/glass/dry_ramen/prepared
@@ -231,7 +231,7 @@
 	return .
 
 /*
-*	Lizard Snacks
+*	Tiziran Snacks
 */
 
 /obj/item/food/vendor_snacks/lizard_bag
@@ -242,7 +242,7 @@
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/caramel = 2)
 	tastes = list("savouriness" = 1, "sweetness" = 1)
 	foodtypes = SUGAR | VEGETABLES
-	custom_price = PAYCHECK_LOWER * 1.4 //Tizirian imports are a bit more expensive overall
+	custom_price = PAYCHECK_LOWER * 1.4 //Tiziran imports are a bit more expensive overall
 
 /obj/item/food/vendor_snacks/lizard_bag/make_leave_trash()
 	AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_POPABLE)
@@ -257,13 +257,13 @@
 	custom_price = PAYCHECK_LOWER * 1.6
 
 /obj/item/trash/vendor_trash/lizard_bag
-	name = "empty tizirian snack bag"
-	desc = "All that money importing tizirian snacks just to end at this?"
-	icon_state = "tiziria_bag_trash"
+	name = "empty tiziran snack bag"
+	desc = "All that money importing tiziran snacks just to end at this?"
+	icon_state = "tizira_bag_trash"
 
 /obj/item/food/vendor_snacks/lizard_box
-	name = "tizirian dumplings"
-	desc = "A three pack of tizirian style dumplings, not actually stuffed with anything."
+	name = "tiziran dumplings"
+	desc = "A three pack of tiziran style dumplings, not actually stuffed with anything."
 	icon_state = "dumpling"
 	trash_type = /obj/item/trash/vendor_trash/lizard_box
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3)
@@ -281,13 +281,13 @@
 	custom_price = PAYCHECK_LOWER *1.8
 
 /obj/item/trash/vendor_trash/lizard_box
-	name = "empty tizirian snack box"
-	desc = "Tiziria, contributing to the space plastic crisis since 2530."
-	icon_state = "tiziria_box_trash"
+	name = "empty tiziran snack box"
+	desc = "Tizira, contributing to the space plastic crisis since 2530."
+	icon_state = "tizira_box_trash"
 
 /obj/item/reagent_containers/cup/glass/waterbottle/tea/mushroom
 	name = "bottle of mushroom tea"
-	desc = "A bottle of somewhat bitter mushroom tea, a favorite of the Tizirian empire."
+	desc = "A bottle of somewhat bitter mushroom tea, a favorite of the Tiziran empire."
 	icon_state = "tea_bottle_grey"
 	list_reagents = list(/datum/reagent/consumable/mushroom_tea = 40)
 	custom_price = PAYCHECK_LOWER * 2
diff --git a/modular_skyrat/modules/imported_vendors/code/vendors.dm b/modular_skyrat/modules/imported_vendors/code/vendors.dm
index 007afeabb62..f4504dd041c 100644
--- a/modular_skyrat/modules/imported_vendors/code/vendors.dm
+++ b/modular_skyrat/modules/imported_vendors/code/vendors.dm
@@ -3,7 +3,7 @@
 		/obj/machinery/vending/imported,
 		/obj/machinery/vending/imported/yangyu,
 		/obj/machinery/vending/imported/mothic,
-		/obj/machinery/vending/imported/tizirian,
+		/obj/machinery/vending/imported/tiziran,
 	)
 
 /obj/effect/spawner/random/vending/colavend //These can serve both snacks AND drinks so its kinda both of them?
@@ -11,7 +11,7 @@
 		/obj/machinery/vending/imported,
 		/obj/machinery/vending/imported/yangyu,
 		/obj/machinery/vending/imported/mothic,
-		/obj/machinery/vending/imported/tizirian,
+		/obj/machinery/vending/imported/tiziran,
 	)
 
 /datum/supply_pack/vending/imported/fill(obj/structure/closet/crate/target_crate)
@@ -173,11 +173,11 @@
 /obj/item/vending_refill/snack/imported/mothic
 	machine_name = "Nomad Fleet Ration Chit Exchange"
 
-/obj/machinery/vending/imported/tizirian
-	name = "Tizirian Imported Delicacies"
-	desc = "A vendor serving a fine collection of what is very likely knock-offs of popular Tizirian brands."
-	icon_state = "tiziria_food"
-	light_mask = "tiziria_food-light-mask"
+/obj/machinery/vending/imported/tiziran
+	name = "Tiziran Imported Delicacies"
+	desc = "A vendor serving a fine collection of what is very likely knock-offs of popular Tiziran brands."
+	icon_state = "tizira_food"
+	light_mask = "tizira_food-light-mask"
 	light_color = LIGHT_COLOR_FIRE
 	product_slogans = "Real imports from the capital itself, we promise!;Rare selections of salt water catch!;Moonfish glaze included with all meat options!"
 	product_categories = list(
@@ -199,9 +199,9 @@
 			"name" = "Meals",
 			"icon" = "pizza-slice",
 			"products" = list(
-				/obj/item/storage/box/foodpack/tiziria = 6,
-				/obj/item/storage/box/foodpack/tiziria/roll = 6,
-				/obj/item/storage/box/foodpack/tiziria/stir_fry = 6,
+				/obj/item/storage/box/foodpack/tizira = 6,
+				/obj/item/storage/box/foodpack/tizira/roll = 6,
+				/obj/item/storage/box/foodpack/tizira/stir_fry = 6,
 				/obj/item/food/vendor_tray_meal/side/root_crackers = 6,
 				/obj/item/food/vendor_tray_meal/side/korta_brittle = 6,
 				/obj/item/food/vendor_tray_meal/side/crispy_headcheese = 6,
@@ -209,7 +209,7 @@
 		),
 	)
 
-	refill_canister = /obj/item/vending_refill/snack/imported/tizirian
+	refill_canister = /obj/item/vending_refill/snack/imported/tiziran
 	initial_language_holder = /datum/language_holder/draconic_vendor
 
 /datum/language_holder/draconic_vendor
@@ -220,5 +220,5 @@
 		/datum/language/draconic = list(LANGUAGE_ATOM),
 		)
 
-/obj/item/vending_refill/snack/imported/tizirian
-	machine_name = "Tizirian Imported Delicacies"
+/obj/item/vending_refill/snack/imported/tiziran
+	machine_name = "Tiziran Imported Delicacies"
diff --git a/modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi b/modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi
index 1ee0339b50e..4249a5f4f0a 100644
Binary files a/modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi and b/modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi differ
diff --git a/modular_skyrat/modules/imported_vendors/icons/imported_vendors.dmi b/modular_skyrat/modules/imported_vendors/icons/imported_vendors.dmi
index 4cda06be3f2..d26e14e5a38 100644
Binary files a/modular_skyrat/modules/imported_vendors/icons/imported_vendors.dmi and b/modular_skyrat/modules/imported_vendors/icons/imported_vendors.dmi differ