diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/_maps/map_files/triumph/triumph-04-deck4.dmm
index 251adbf8b06..c2fe7c1af94 100644
--- a/_maps/map_files/triumph/triumph-04-deck4.dmm
+++ b/_maps/map_files/triumph/triumph-04-deck4.dmm
@@ -780,10 +780,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "aFu" = (
 /obj/effect/shuttle_landmark/automatic/station_dockpoint1,
@@ -1452,6 +1451,9 @@
 "bbp" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/structure/anomaly_container,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/cargo)
 "bbx" = (
@@ -3839,7 +3841,7 @@
 "cEr" = (
 /obj/machinery/portable_atmospherics/powered/scrubber,
 /obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "cEx" = (
 /obj/item/radio/intercom{
@@ -4861,9 +4863,6 @@
 	req_one_access = list(19,43,67);
 	specialfunctions = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10
-	},
 /turf/simulated/floor/tiled,
 /area/shuttle/excursion/general)
 "dxa" = (
@@ -4974,12 +4973,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/triumph/station/stairs_one)
 "dBB" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 1
-	},
 /obj/structure/shuttle/engine/heater{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
 /area/shuttle/excursion/general)
 "dBL" = (
@@ -5245,7 +5244,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "dKL" = (
 /obj/machinery/power/apc{
@@ -7827,7 +7827,8 @@
 	pixel_y = -24
 	},
 /obj/machinery/light,
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/manifold/hidden,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "fsz" = (
 /obj/machinery/hologram/holopad,
@@ -9589,7 +9590,11 @@
 /obj/structure/closet/hydrant{
 	pixel_y = 32
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/binary/pump{
+	dir = 4;
+	name = "secondary fuel pump"
+	},
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "gQL" = (
 /obj/machinery/portable_atmospherics/canister/air/airlock,
@@ -12777,7 +12782,7 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "iSk" = (
 /obj/effect/floor_decal/steeldecal/steel_decals9{
@@ -13656,7 +13661,8 @@
 /obj/machinery/recharger/wallcharger{
 	pixel_x = -24
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "jxs" = (
 /obj/structure/cable/green{
@@ -14645,6 +14651,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/visitor)
+"khB" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
+/turf/simulated/shuttle/wall/voidcraft/blue,
+/area/shuttle/excursion/general)
 "kim" = (
 /obj/structure/table/woodentable,
 /obj/item/storage/box/glasses/meta,
@@ -16341,19 +16354,14 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/aft)
 "ltW" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/binary/pump/on{
-	dir = 1;
-	name = "main fuel pump"
-	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "ltY" = (
 /obj/structure/cable/green{
@@ -17093,15 +17101,10 @@
 /turf/simulated/floor/wood,
 /area/library)
 "lTt" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/mech_recharger,
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/tank/phoron{
+	dir = 8
 	},
-/obj/mecha/working/hoverpod{
-	maxhealth = 300
-	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "lTz" = (
 /obj/structure/cable/green{
@@ -19323,10 +19326,11 @@
 /turf/simulated/floor/tiled,
 /area/bridge/hallway)
 "ntt" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "ntB" = (
 /turf/simulated/wall/r_wall,
@@ -19706,14 +19710,6 @@
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
-"nGw" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/machinery/mech_recharger,
-/obj/mecha/working/hoverpod{
-	maxhealth = 300
-	},
-/turf/simulated/floor/tiled,
-/area/shuttle/excursion/cargo)
 "nGR" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/techfloor,
@@ -22274,12 +22270,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
-"pra" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 5
-	},
-/turf/simulated/shuttle/wall/voidcraft/blue,
-/area/shuttle/excursion/general)
 "prc" = (
 /obj/effect/floor_decal/spline/fancy{
 	dir = 5
@@ -22545,7 +22535,7 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "pBe" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -24146,10 +24136,8 @@
 	dir = 1;
 	pixel_y = -23
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
-/turf/simulated/floor/tiled,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "qzc" = (
 /obj/structure/cable/green{
@@ -24928,11 +24916,12 @@
 /turf/simulated/floor/tiled/white,
 /area/security/forensics)
 "qXa" = (
+/obj/effect/floor_decal/industrial/outline/red,
 /obj/machinery/atmospherics/portables_connector{
+	dir = 4;
 	name = "Engine Fuel Port"
 	},
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "qXb" = (
 /turf/simulated/wall/r_wall,
@@ -26130,6 +26119,15 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ai_upload)
+"rFX" = (
+/obj/structure/closet/hydrant{
+	pixel_y = 32
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cargo)
 "rGn" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -26160,7 +26158,8 @@
 /obj/machinery/autolathe{
 	hacked = 1
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "rGX" = (
 /obj/machinery/door/firedoor/glass,
@@ -26757,10 +26756,11 @@
 /turf/simulated/floor,
 /area/shuttle/civvie/general)
 "sfl" = (
-/obj/machinery/atmospherics/binary/pump{
-	name = "secondary fuel pump"
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "sfo" = (
 /turf/simulated/floor/tiled/old_cargo/gray,
@@ -28131,8 +28131,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
 	},
-/obj/machinery/meter,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "taH" = (
 /obj/machinery/light{
@@ -29188,15 +29187,13 @@
 /turf/simulated/floor/wood,
 /area/lawoffice)
 "tWp" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
 /obj/structure/cable/cyan{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "tWS" = (
 /obj/machinery/hologram/holopad,
@@ -31915,12 +31912,9 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/aft)
 "vIe" = (
-/obj/machinery/atmospherics/pipe/tank/phoron{
-	dir = 4;
-	volume = 30000
-	},
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled,
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "vIh" = (
 /turf/simulated/floor/carpet/sblucarpet,
@@ -32751,6 +32745,13 @@
 	},
 /turf/simulated/floor/grass,
 /area/hydroponics/garden)
+"wem" = (
+/obj/machinery/door/airlock/voidcraft/vertical,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/shuttle/excursion/cargo)
 "wer" = (
 /obj/machinery/firealarm{
 	layer = 3.3;
@@ -34357,7 +34358,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/civilian_hallway_mid)
 "xnp" = (
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/binary/pump/on{
+	dir = 8;
+	name = "main fuel pump"
+	},
+/turf/simulated/floor/plating,
 /area/shuttle/excursion/cargo)
 "xnz" = (
 /obj/machinery/button/remote/blast_door{
@@ -39947,8 +39952,8 @@ xnp
 fzX
 hYe
 dwl
-pra
-jED
+hYe
+wem
 jED
 hYe
 uKG
@@ -40084,12 +40089,12 @@ dls
 mAF
 ifm
 hYe
-gQk
+rFX
 fse
 aDO
 xsI
 xsI
-aDO
+hYe
 bbp
 lEt
 hYe
@@ -40227,11 +40232,11 @@ mAF
 xsI
 hYe
 lTt
-nGw
+lTt
 aDO
 xsI
 xsI
-aDO
+hYe
 bbp
 dZg
 hYe
@@ -40374,7 +40379,7 @@ hjI
 xsI
 xsI
 dBB
-mmQ
+khB
 mmQ
 gxZ
 oJL
diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm
index 4a9ebe1124b..5c7cb490390 100644
--- a/code/datums/outfits/misc.dm
+++ b/code/datums/outfits/misc.dm
@@ -54,8 +54,10 @@
 /decl/hierarchy/outfit/merchant/vox //This needs to be updated.
 	name = "Nebula Gas Merchant - Vox"
 	shoes = /obj/item/clothing/shoes/boots/jackboots/toeless
+	back = /obj/item/tank/vox
 	uniform = /obj/item/clothing/under/vox/vox_robes
 	suit = /obj/item/clothing/suit/armor/vox_scrap
+	mask = /obj/item/clothing/mask/breath
 
 /decl/hierarchy/outfit/zaddat
 	name = "Zaddat Suit"
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index c9173d6d4ab..41626e20748 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -536,3 +536,45 @@
 	desc = "The fancy utility-belt holding the tools, cuffs and gadgets of the Go Go ERT-Rangers. The belt buckle is not real phoron, but it is still surprisingly comfortable to wear."
 	icon = 'icons/obj/clothing/ranger.dmi'
 	icon_state = "ranger_belt"
+
+/obj/item/storage/belt/dualholster
+	name = "dual holster gunbelt"
+	desc = "Belts like these were popular on old Earth, but were largely supplanted by modular holsters. This gunbelt is too bulky to be comfortably anchored to clothes without support."
+	icon_state = "dual_holster"
+	max_w_class = ITEMSIZE_NORMAL
+	can_hold = list(
+		/obj/item/gun/energy/alien,
+		/obj/item/gun/energy/captain,
+		/obj/item/gun/energy/crossbow,
+		/obj/item/gun/energy/decloner,
+		/obj/item/gun/energy/floragun,
+		/obj/item/gun/energy/gun,
+		/obj/item/gun/energy/gun/nuclear,
+		/obj/item/gun/energy/ionrifle/pistol,
+		/obj/item/gun/energy/lasertag,
+		/obj/item/gun/energy/netgun,
+		/obj/item/gun/energy/phasegun/pistol,
+		/obj/item/gun/energy/pulse_rifle/M1911,
+		/obj/item/gun/energy/retro,
+		/obj/item/gun/energy/service,
+		/obj/item/gun/energy/stunrevolver,
+		/obj/item/gun/energy/taser,
+		/obj/item/gun/energy/toxgun,
+		/obj/item/gun/energy/zip,
+		/obj/item/gun/projectile/colt,
+		/obj/item/gun/projectile/contender,
+		/obj/item/gun/projectile/dartgun,
+		/obj/item/gun/projectile/deagle,
+		/obj/item/gun/projectile/derringer,
+		/obj/item/gun/projectile/gyropistol,
+		/obj/item/gun/projectile/luger,
+		/obj/item/gun/projectile/r9,
+		/obj/item/gun/projectile/revolver,
+		/obj/item/gun/projectile/sec,
+		/obj/item/gun/projectile/shotgun/doublebarrel/sawn,
+		/obj/item/gun/projectile/shotgun/flare,
+		/obj/item/gun/projectile/silenced,
+		/obj/item/gun/projectile/p92x,
+		/obj/item/gun/projectile/pistol,
+		/obj/item/gun/projectile/pirate
+		)
diff --git a/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm b/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm
index 7f39daafcab..c315b795b0e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_event_rewards.dm
@@ -14,6 +14,6 @@
 /datum/gear/event_reward/gameboy
 	sort_category = "Event Rewards"
 	cost = 0
-	display_name = "A handheld gaming device from a time long past."
+	display_name = "Game Boy"
 	path = /obj/item/instrument/gameboy
 	ckeywhitelist = list("jaybird1")
diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm
index 8e3a5cfc2f8..9668a7168e0 100644
--- a/code/modules/instruments/instruments/item.dm
+++ b/code/modules/instruments/instruments/item.dm
@@ -320,6 +320,7 @@
 	return instruments
 */
 
+//Event Reward item.
 /obj/item/instrument/gameboy
 	name = "gameboy"
 	desc = "A bright teal Gameboy Color. This one has a copy of LSDJ slotted into the back. /There's also initals scratched crudely into the lower left hand corner spelling TAS./"
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index 7bf12984826..ddfc372cf9b 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 9593a308d96..e071a96536b 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm b/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm
index 14c0c22b880..a4708708c2b 100644
--- a/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm
+++ b/maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm
@@ -197,6 +197,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/triumph_away/tradeport/commons)
+"bc" = (
+/obj/structure/largecrate{
+	name = "large crate - PRODUCT"
+	},
+/turf/simulated/floor/tiled/old_tile/red,
+/area/triumph_away/tradeport/commhall)
 "bd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -1334,6 +1340,10 @@
 	},
 /turf/simulated/floor/tiled/old_tile/beige,
 /area/triumph_away/tradeport/safari)
+"hr" = (
+/obj/structure/table/steel_reinforced,
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "hx" = (
 /obj/machinery/door/firedoor/multi_tile{
 	req_one_access = list(160)
@@ -1411,6 +1421,12 @@
 	},
 /turf/simulated/floor/tiled/old_tile/blue,
 /area/triumph_away/tradeport/spine)
+"hZ" = (
+/obj/structure/largecrate{
+	name = "large crate - PRODUCT"
+	},
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "ia" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/paper_bin{
@@ -1774,6 +1790,10 @@
 	},
 /turf/simulated/floor/carpet/blue,
 /area/triumph_away/tradeport/commons)
+"jA" = (
+/obj/structure/table/rack/shelf/steel,
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "jC" = (
 /obj/structure/railing,
 /obj/structure/railing{
@@ -2580,6 +2600,11 @@
 /obj/structure/railing,
 /turf/simulated/mineral/floor/vacuum,
 /area/space)
+"nP" = (
+/obj/structure/table/steel_reinforced,
+/obj/item/gun/projectile/shotgun/doublebarrel,
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "nS" = (
 /obj/structure/railing{
 	dir = 8
@@ -2852,7 +2877,7 @@
 	dir = 4
 	},
 /obj/structure/statue/silver/janitor{
-	desc = "This statue commemorates Jim for employee of the month.";
+	desc = "This statue commemorates Farnsworth, the legendary Nebula Gas janitor. Even posthumously, Farnsworth retains the longest consecutive run of employee of the month awards.";
 	name = "Employee of the Month"
 	},
 /turf/simulated/floor/tiled/old_cargo/beige,
@@ -3442,6 +3467,9 @@
 	},
 /turf/simulated/floor/carpet/blue,
 /area/triumph_away/tradeport/commons)
+"sC" = (
+/turf/simulated/floor/tiled/old_tile/red,
+/area/triumph_away/tradeport/commhall)
 "sD" = (
 /obj/structure/railing{
 	dir = 8
@@ -3513,6 +3541,12 @@
 	},
 /turf/simulated/floor/tiled/neutral,
 /area/triumph_away/tradeport/commons)
+"sX" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "sY" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -3679,7 +3713,7 @@
 	frequency = 8018;
 	id = "pumptwo";
 	name = "Pump Two";
-	target_pressure = 1500
+	target_pressure = 15000
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/airless,
@@ -4061,7 +4095,8 @@
 	dir = 8;
 	frequency = 8018;
 	id = "pumpthree";
-	name = "Pump Three"
+	name = "Pump Three";
+	target_pressure = 15000
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/airless,
@@ -4569,6 +4604,12 @@
 	},
 /turf/space,
 /area/triumph_away/tradeport/space)
+"yb" = (
+/obj/structure/largecrate{
+	name = "large crate - SUNDRIES and COMPONENTS"
+	},
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "yc" = (
 /obj/machinery/power/apc/alarms_hidden{
 	pixel_y = -28;
@@ -5049,6 +5090,12 @@
 /obj/structure/catwalk,
 /turf/simulated/mineral/floor/vacuum,
 /area/space)
+"AK" = (
+/obj/machinery/holosign/bar{
+	id = "cyndisign"
+	},
+/turf/simulated/wall/r_wall,
+/area/triumph_away/tradeport/commhall)
 "AM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/yellow{
@@ -5326,6 +5373,15 @@
 	},
 /turf/simulated/floor/tiled/old_tile/red,
 /area/triumph_away/tradeport)
+"BL" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/largecrate{
+	name = "large crate - SUNDRIES and COMPONENTS"
+	},
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "BO" = (
 /obj/machinery/atmospherics/binary/pump/on{
 	dir = 4
@@ -5683,10 +5739,10 @@
 /obj/machinery/door/firedoor{
 	req_one_access = list(160)
 	},
-/obj/machinery/door/airlock/external/glass{
+/obj/machinery/door/airlock/uranium{
 	icon_state = "door_locked";
 	locked = 1;
-	name = "C&K's - Under Construction"
+	name = "C&K's - Coming Soon!"
 	},
 /turf/simulated/floor/airless,
 /area/triumph_away/tradeport/commhall)
@@ -5954,6 +6010,12 @@
 	},
 /turf/simulated/floor/tiled/steel,
 /area/triumph_away/tradeport)
+"EM" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/old_tile/yellow,
+/area/triumph_away/tradeport/safari)
 "ES" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -5969,6 +6031,10 @@
 	},
 /turf/simulated/floor/tiled/neutral,
 /area/triumph_away/tradeport/commons)
+"EU" = (
+/obj/machinery/light/flicker,
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "EY" = (
 /obj/structure/table/glass,
 /obj/item/reagent_containers/food/snacks/milosoup,
@@ -6151,6 +6217,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/old_tile/red,
 /area/triumph_away/tradeport)
+"FZ" = (
+/obj/structure/stasis_cage,
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/old_tile/beige,
+/area/triumph_away/tradeport/safari)
 "Ga" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -6469,7 +6543,8 @@
 	dir = 8;
 	frequency = 8018;
 	id = "pumpfive";
-	name = "Pump Five"
+	name = "Pump Five";
+	target_pressure = 15000
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/airless,
@@ -7080,6 +7155,12 @@
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/tiled/white,
 /area/triumph_away/tradeport/commons)
+"Lh" = (
+/obj/structure/largecrate{
+	name = "large crate - SUNDRIES and COMPONENTS"
+	},
+/turf/simulated/floor/tiled/old_tile/red,
+/area/triumph_away/tradeport/commhall)
 "Li" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -7455,6 +7536,12 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/old_tile/red,
 /area/triumph_away/tradeport/spine)
+"Na" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/old_tile/red,
+/area/triumph_away/tradeport/commhall)
 "Nc" = (
 /obj/structure/transit_tube/station{
 	automatic_launch_time = 40
@@ -7627,7 +7714,8 @@
 	dir = 4;
 	frequency = 8018;
 	id = "pumpfour";
-	name = "Pump Four"
+	name = "Pump Four";
+	target_pressure = 15000
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/airless,
@@ -7806,14 +7894,10 @@
 	},
 /turf/simulated/floor/tiled/old_tile/blue,
 /area/triumph_away/tradeport)
-"OB" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/stasis_cage,
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled/old_tile/yellow,
-/area/triumph_away/tradeport/safari)
+"OF" = (
+/obj/structure/barricade,
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "OH" = (
 /obj/machinery/door/window/westleft{
 	name = "Storefront";
@@ -8547,7 +8631,7 @@
 	frequency = 8018;
 	id = "pumpone";
 	name = "Pump One";
-	target_pressure = 1500
+	target_pressure = 15000
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/airless,
@@ -9537,6 +9621,12 @@
 	},
 /turf/simulated/floor/tiled/old_tile/purple,
 /area/triumph_away/tradeport)
+"Xb" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "Xj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -9551,12 +9641,6 @@
 	},
 /turf/simulated/floor/tiled/old_tile/red,
 /area/triumph_away/tradeport/spine)
-"Xk" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/old_tile/beige,
-/area/triumph_away/tradeport/safari)
 "Xp" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -9750,6 +9834,10 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/triumph_away/tradeport/facility)
+"Ys" = (
+/obj/structure/table,
+/turf/simulated/floor/plating,
+/area/triumph_away/tradeport/commhall)
 "Yt" = (
 /obj/structure/table/marble,
 /obj/machinery/chemical_dispenser/bar_alc/full{
@@ -9872,7 +9960,8 @@
 	dir = 4;
 	frequency = 8018;
 	id = "pumpsix";
-	name = "Pump Six"
+	name = "Pump Six";
+	target_pressure = 15000
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/airless,
@@ -17175,17 +17264,17 @@ Gg
 Gg
 hl
 hl
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 YG
 YG
 YG
@@ -17317,19 +17406,19 @@ GV
 Tm
 Tm
 hl
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+Na
+GV
+GV
+GV
+GV
+sX
+GV
+hl
+hZ
+GV
+hl
+hl
+hl
 YG
 YG
 YG
@@ -17459,21 +17548,21 @@ Tm
 Tm
 Of
 hl
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+GV
+GV
+GV
+Ys
+GV
+sC
+GV
+GV
+GV
+GV
+hZ
+hZ
+hl
+hl
+hl
 YG
 YG
 YG
@@ -17601,22 +17690,22 @@ oc
 ux
 Oi
 hl
-kh
-kh
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+hr
+nP
+Ys
+GV
+GV
+sC
+GV
+hl
+GV
+GV
+GV
+GV
+GV
+GV
+hl
+hl
 YG
 YG
 YG
@@ -17743,22 +17832,22 @@ Dw
 Tm
 Tm
 hl
-kh
-kh
-YG
-kh
-kh
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+GV
+sC
+sC
+sC
+GV
+GV
+sC
+hl
+GV
+sC
+sC
+GV
+GV
+GV
+GV
+hl
 YG
 YG
 YG
@@ -17885,22 +17974,22 @@ ZH
 Tm
 GV
 DH
-kh
-kh
-kh
-kh
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+GV
+GV
+sC
+GV
+GV
+GV
+GV
+OF
+GV
+GV
+GV
+GV
+GV
+hZ
+EU
+hl
 YG
 YG
 YG
@@ -18026,23 +18115,23 @@ Tm
 Pu
 Tm
 GV
+AK
+GV
+GV
+GV
+sC
+sC
+sC
+Ys
+hl
+GV
+GV
+GV
+GV
+yb
+yb
+hZ
 hl
-kh
-kh
-kh
-kh
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
 YG
 YG
 YG
@@ -18169,22 +18258,22 @@ Fi
 RO
 dh
 hl
-kh
-kh
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+GV
+GV
+GV
+GV
+GV
+GV
+GV
+hl
+GV
+GV
+GV
+GV
+sC
+sC
+hl
+hl
 YG
 YG
 YG
@@ -18299,33 +18388,33 @@ aU
 tl
 lt
 OT
-qs
+EM
 Ru
 qs
 Ru
 qs
-Ru
+FZ
 hl
 VO
 Pu
 Tm
 Of
 hl
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+GV
+sC
+sC
+sC
+GV
+GV
+Lh
+OF
+GV
+GV
+hZ
+bc
+hl
+hl
+hl
 YG
 YG
 YG
@@ -18441,31 +18530,31 @@ oD
 kW
 oS
 oS
-Xk
-Ah
-Cf
-Ah
-Cf
-OB
+oS
+oS
+oS
+oS
+oS
+oS
 hl
 Tm
 Pu
 Tm
 Tm
 hl
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+Xb
+GV
+jA
+jA
+jA
+BL
+Lh
+hl
+GV
+hZ
+hl
+hl
+hl
 YG
 YG
 YG
@@ -18582,30 +18671,30 @@ tl
 tl
 tl
 GS
-oS
-oS
-oS
-oS
-oS
-oS
-oS
+YG
+YG
+YG
+YG
+YG
+YG
+YG
 hl
 Tm
 Pu
 Tm
 Tm
 hl
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
-YG
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
+hl
 YG
 YG
 YG