diff --git a/aurorastation.dme b/aurorastation.dme
index 60cd85127b8..3e6b18afda8 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -342,6 +342,8 @@
 #include "code\datums\uplink\announcements.dm"
 #include "code\datums\uplink\badassery.dm"
 #include "code\datums\uplink\devices and tools.dm"
+#include "code\datums\uplink\exosuit.dm"
+#include "code\datums\uplink\exosuit_equipment.dm"
 #include "code\datums\uplink\gear loadout.dm"
 #include "code\datums\uplink\grenades.dm"
 #include "code\datums\uplink\hardsuit_modules.dm"
diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm
index c9c44da444c..c7c80e961c0 100644
--- a/code/datums/uplink/ammunition.dm
+++ b/code/datums/uplink/ammunition.dm
@@ -6,31 +6,61 @@
 	category = /datum/uplink_category/ammunition
 
 /datum/uplink_item/item/ammo/mc9mm
-	name = "9mm"
+	name = "9mm Magazine"
 	item_cost = 1
 	path = /obj/item/ammo_magazine/mc9mm
+	desc = "Contains ten rounds of 9mm bullets."
 
 /datum/uplink_item/item/ammo/darts
-	name = "Darts"
+	name = "Chemical Darts"
 	item_cost = 1
 	path = /obj/item/ammo_magazine/chemdart
+	desc = "Contains five chemical darts for use with a dart gun."
 
-/datum/uplink_item/item/ammo/tommygunmag
-	name = "Tommygun Magazine (.45)"
+/datum/uplink_item/item/ammo/fourty_five
+	name = ".45 Pistol Magazine"
 	item_cost = 2
-	path = /obj/item/ammo_magazine/tommymag
+	path = /obj/item/ammo_magazine/c45m
+	desc = "Contains seven rounds of .45 bullets."
+
+/datum/uplink_item/item/ammo/submachinegundrum
+	name = "Submachine Gun Drum Magazine (.45)"
+	item_cost = 6
+	path = /obj/item/ammo_magazine/submachinedrum
+	desc = "Contains fifty rounds of .45 bullets, for use with the vintage submachine gun."
+
+/datum/uplink_item/item/ammo/submachinegunmag
+	name = "Submachine Gun Magazine (.45)"
+	item_cost = 4
+	path = /obj/item/ammo_magazine/submachinemag
+	desc = "Contains twenty rounds of .45 bullets, for use with the vintage submachine gun."
 
 /datum/uplink_item/item/ammo/a357
-	name = ".357"
+	name = ".357 Speedloader"
 	item_cost = 2
 	path = /obj/item/ammo_magazine/a357
-
-/datum/uplink_item/item/ammo/tommygundrum
-	name = "Tommygun Drum Magazine (.45)"
-	item_cost = 4
-	path = /obj/item/ammo_magazine/tommydrum
+	desc = "Contains eight rounds of .357 bullets."
 
 /datum/uplink_item/item/ammo/sniperammo
-	name = "14.5mm"
-	item_cost = 4
+	name = "14.5mm box"
+	item_cost = 8
 	path = /obj/item/storage/box/sniperammo
+	desc = "Contains seven rounds of 14.5mm bullets, for use with the anti-materiel rifle."
+
+/datum/uplink_item/item/ammo/shotgun_shells
+	name = "Box of Shells"
+	item_cost = 5
+	path = /obj/item/storage/box/shotgunshells
+	desc = "Contains eight shotgun buckshot shells."
+
+/datum/uplink_item/item/ammo/plasma_mag
+	name = "Plasma Shotgun Magazine"
+	item_cost = 5
+	path = /obj/item/ammo_magazine/plasma
+	desc = "Contains ten plasma cells."
+
+/datum/uplink_item/item/ammo/rifle_mag
+	name = "7.62mm clip"
+	item_cost = 4
+	path = /obj/item/ammo_magazine/boltaction
+	desc = "Contains five rounds of 7.62mm bullets."
\ No newline at end of file
diff --git a/code/datums/uplink/devices and tools.dm b/code/datums/uplink/devices and tools.dm
index 3ed045bf855..ecb1a34fe59 100644
--- a/code/datums/uplink/devices and tools.dm	
+++ b/code/datums/uplink/devices and tools.dm	
@@ -8,6 +8,13 @@
 	name = "Fully Loaded Toolbox"
 	item_cost = 2
 	path = /obj/item/storage/toolbox/syndicate
+	desc = "A suspiciously painted toolbox, filled with most of the odds and ends a good-for-nothing traitor would need."
+
+/datum/uplink_item/item/tools/toolbelt
+	name = "Fully Loaded Tool-belt"
+	item_cost = 3
+	path = /obj/item/storage/belt/utility/very_full
+	desc = "A fully loaded tool-belt even Nanotrasen's top Chief Engineer would be proud to wear."
 
 /datum/uplink_item/item/tools/money
 	name = "Operations Funding"
@@ -34,23 +41,27 @@
 
 /datum/uplink_item/item/tools/plastique
 	name = "C-4 (Destroys walls)"
-	item_cost = 4
+	item_cost = 3
 	path = /obj/item/plastique
+	desc = "A single block of C4, enough to breach any wall."
 
 /datum/uplink_item/item/tools/heavy_vest
 	name = "Heavy Armor Kit"
 	item_cost = 4
 	path = /obj/item/storage/box/syndie_kit/armor
+	desc = "A heavy armour set consisting of a vest and a helmet. Not EVA capable."
 
 /datum/uplink_item/item/tools/encryptionkey_radio
 	name = "Encrypted Radio Channel Key"
 	item_cost = 4
 	path = /obj/item/device/encryptionkey/syndicate
+	desc = "An encryption key for use in a headset, intercepts all frequencies and grants access to a secure syndicate frequency."
 
 /datum/uplink_item/item/tools/encryptionkey_binary
 	name = "Binary Translator Key"
 	item_cost = 5
 	path = /obj/item/device/encryptionkey/binary
+	desc = "An encryption key for use in a headset, capable of intercepting stationbound binary communications."
 
 /datum/uplink_item/item/tools/emag
 	name = "Cryptographic Sequencer"
@@ -98,6 +109,7 @@
 	name = "Hacked Supply Beacon (DANGER!)"
 	item_cost = 14
 	path = /obj/item/supply_beacon
+	desc = "A hacked supply beacon that will call in a random supply pod when deployed and activated. Steer clear of the area afterwards."
 
 /datum/uplink_item/item/tools/advancedpinpointer
 	name = "Advanced pinpointer"
@@ -138,3 +150,37 @@
 	path = /obj/item/device/suit_cooling_unit/improved
 	desc = "A suit cooling unit with a high capacity power cell."
 
+/datum/uplink_item/item/tools/keypad
+	name = "Keypad Mag-Lock"
+	item_cost = 4
+	path = /obj/item/device/magnetic_lock/keypad
+	desc = "A maglock that requires the user to enter a passcode to lock and then later unlock."
+
+/datum/uplink_item/item/tools/personal_ai
+	name = "Personal AI"
+	item_cost = 2
+	path = /obj/item/device/paicard
+	desc = "An unmodified personal AI that can assist you in your ventures."
+
+/datum/uplink_item/item/tools/pin_extractor
+	name = "Firing Pin Extractor"
+	item_cost = 2
+	path = /obj/item/device/pin_extractor
+	desc = "An extractor tool capable of extracting firing pins from most firearms."
+
+/datum/uplink_item/item/tools/radio_jammer
+	name = "Radio Jammer"
+	item_cost = 5
+	path = /obj/item/device/radiojammer
+	desc = "A small jammer that can fit inside a pocket. Capable of disrupting nearby radios and hivenet transmitters."
+
+/datum/uplink_item/item/tools/jetpack
+	name = "Jetpack"
+	item_cost = 5
+	path = /obj/item/tank/jetpack/oxygen
+
+/datum/uplink_item/item/tools/electropack
+	name = "Electropack"
+	item_cost = 6
+	path = /obj/item/device/radio/electropack
+	desc = "A backpack wired with electrodes. Sync up with a signaller, attach to an unwilling host and pulse the signal to shock them."
diff --git a/code/datums/uplink/exosuit.dm b/code/datums/uplink/exosuit.dm
new file mode 100644
index 00000000000..54a58e58ba0
--- /dev/null
+++ b/code/datums/uplink/exosuit.dm
@@ -0,0 +1,26 @@
+/datum/uplink_item/item/exosuit
+	category = /datum/uplink_category/exosuit
+
+/datum/uplink_item/item/exosuit/combat
+	name = "Combat Exosuit Dropper"
+	desc = "A device that can be used to drop in a combat exosuit. Can only be used outside station areas, unless emagged, which is hazardous."
+	item_cost = 40
+	path = /obj/item/device/orbital_dropper/mecha/combat
+
+/datum/uplink_item/item/exosuit/heavy
+	name = "Heavy Exosuit Dropper"
+	desc = "A device that can be used to drop in a heavy exosuit. Can only be used outside station areas, unless emagged, which is hazardous."
+	item_cost = 35
+	path = /obj/item/device/orbital_dropper/mecha/heavy
+
+/datum/uplink_item/item/exosuit/light
+	name = "Light Exosuit Dropper"
+	desc = "A device that can be used to drop in a light exosuit. Can only be used outside station areas, unless emagged, which is hazardous."
+	item_cost = 25
+	path = /obj/item/device/orbital_dropper/mecha
+
+/datum/uplink_item/item/exosuit/powerloader
+	name = "Powerloader Exosuit Dropper"
+	desc = "A device that can be used to drop in a powerloader exosuit. Can only be used outside station areas, unless emagged, which is hazardous."
+	item_cost = 20
+	path = /obj/item/device/orbital_dropper/mecha/powerloader
\ No newline at end of file
diff --git a/code/datums/uplink/exosuit_equipment.dm b/code/datums/uplink/exosuit_equipment.dm
new file mode 100644
index 00000000000..0f7d8478f19
--- /dev/null
+++ b/code/datums/uplink/exosuit_equipment.dm
@@ -0,0 +1,80 @@
+/datum/uplink_item/item/exosuit_equipment
+	category = /datum/uplink_category/exosuit_equipment
+
+// COMBAT //
+
+/datum/uplink_item/item/exosuit_equipment/mounted_gun
+	name = "Mounted Electrolaser Carbine"
+	desc = "A dual fire mode electrolaser system connected to the exosuit's targetting system."
+	item_cost = 8
+	path = /obj/item/mecha_equipment/mounted_system/taser
+
+/datum/uplink_item/item/exosuit_equipment/mounted_gun/ion
+	name = "Mounted Ion Rifle"
+	desc = "An exosuit-mounted ion rifle. Handle with care."
+	item_cost = 12
+	path = /obj/item/mecha_equipment/mounted_system/taser/ion
+
+/datum/uplink_item/item/exosuit_equipment/mounted_gun/laser
+	name = "Mounted Laser Rifle"
+	desc = "An exosuit-mounted laser rifle. Handle with care."
+	item_cost = 10
+	path = /obj/item/mecha_equipment/mounted_system/taser/laser
+
+/datum/uplink_item/item/exosuit_equipment/mounted_gun/smg
+	name = "Mounted Machine Gun"
+	desc = "An exosuit-mounted automatic weapon. Handle with care."
+	item_cost = 10
+	path = /obj/item/mecha_equipment/mounted_system/taser/smg
+
+/datum/uplink_item/item/exosuit_equipment/mounted_launcher
+	name = "Mounted Missile Rack"
+	desc = "An SRM-8 missile rack loaded with explosive missiles."
+	item_cost = 20
+	path = /obj/item/mecha_equipment/mounted_system/missile
+
+// UTILITY //
+
+/datum/uplink_item/item/exosuit_equipment/mounted_tool
+	name = "Mounted RFD-C"
+	desc = "A RFD, modified to construct walls and floors. This one can be mounted on an exosuit."
+	item_cost = 12
+	path = /obj/item/mecha_equipment/mounted_system/rfd
+
+/datum/uplink_item/item/exosuit_equipment/mounted_tool/clamp
+	name = "Mounted Clamp"
+	desc = "A large, heavy industrial cargo loading clamp."
+	item_cost = 4
+	path = /obj/item/mecha_equipment/clamp
+
+/datum/uplink_item/item/exosuit_equipment/mounted_tool/catapult
+	name = "Mounted Gravitational Catapult"
+	desc = "An exosuit-mounted gravitational catapult."
+	item_cost = 10
+	path = /obj/item/mecha_equipment/catapult
+
+/datum/uplink_item/item/exosuit_equipment/mounted_tool/drill
+	name = "Mounted Drill"
+	desc = "An exosuit-mounted drill."
+	item_cost = 6
+	path = /obj/item/mecha_equipment/drill
+
+/datum/uplink_item/item/exosuit_equipment/mounted_tool/passenger
+	name = "Mounted Passenger Compartment"
+	desc = "An exosuit-mounted passenger compartment."
+	item_cost = 4
+	path = /obj/item/mecha_equipment/sleeper/passenger_compartment
+
+// MEDICAL //
+
+/datum/uplink_item/item/exosuit_equipment/mounted_medical
+	name = "Mounted Sleeper"
+	desc = "An exosuit-mounted sleeper designed to maintain patients stabilized on their way to medical facilities."
+	item_cost = 8
+	path = /obj/item/mecha_equipment/sleeper
+
+/datum/uplink_item/item/exosuit_equipment/mounted_medical/drone
+	name = "Mounted Crisis Dronebay"
+	desc = "A small shoulder-mounted dronebay containing a rapid response drone capable of moderately stabilizing a patient near the exosuit."
+	item_cost = 8
+	path = /obj/item/mecha_equipment/crisis_drone
\ No newline at end of file
diff --git a/code/datums/uplink/grenades.dm b/code/datums/uplink/grenades.dm
index be9ab497baf..9681923c9c6 100644
--- a/code/datums/uplink/grenades.dm
+++ b/code/datums/uplink/grenades.dm
@@ -5,27 +5,36 @@
 	category = /datum/uplink_category/grenades
 	
 /datum/uplink_item/item/grenades/manhack
-	name = "Manhack Delivery Grenade"
+	name = "Viscerator Delivery Grenade"
 	item_cost = 3
 	path = /obj/item/grenade/spawnergrenade/manhacks
+	desc = "A grenade that deploys five viscerator combat drones. Deadly in numbers, will not attack you or your allies."
 
 /datum/uplink_item/item/grenades/anti_photon
 	name = "5xPhoton Disruption Grenades"
 	item_cost = 4
 	path = /obj/item/storage/box/anti_photons
+	desc = "A box of five grenades that cause total darkness in the area they explode in. Circumvented by vision altering headgear. Useful for get-aways."
 
 /datum/uplink_item/item/grenades/smoke
 	name = "5xSmoke Grenades"
 	item_cost = 4
 	path = /obj/item/storage/box/smokes
+	desc = "A box of five grenades that deploy smoke in the thrown area. Targets hidden in smoke are much harder to hit with ranged weaponry."
 
 /datum/uplink_item/item/grenades/emp
 	name = "5xEMP Grenades"
 	item_cost = 6
 	path = /obj/item/storage/box/emps
+	desc = "A box of five grenades that cause a risky EMP explosion, capable of toggling headsets off, permanently destroying IPC units and draining a stationbound completely."
 	
 /datum/uplink_item/item/grenades/frag
 	name = "5xFrag Grenades"
 	item_cost = 12
 	path = /obj/item/storage/box/frags
 
+/datum/uplink_item/item/grenades/cardox
+	name = "5xCardox Grenades"
+	item_cost = 8
+	path = /obj/item/storage/box/cardox
+	desc = "A box of five grenades that deploy cardox smoke in the thrown area. This smoke is incredibly toxic, especially to vaurca. It can also clear K'ois outbreaks with ease."
\ No newline at end of file
diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm
index d387c6f74b3..16de28a9f5d 100644
--- a/code/datums/uplink/highly visible and dangerous weapons.dm	
+++ b/code/datums/uplink/highly visible and dangerous weapons.dm	
@@ -29,11 +29,6 @@
 	item_cost = 8
 	path = /obj/item/storage/box/syndie_kit/g9mm
 
-/datum/uplink_item/item/visible_weapons/exolaser
-	name = "Exosuit Mounted Laser"
-	item_cost = 8
-	path = /obj/item/mecha_equipment/mounted_system/taser/laser
-
 /datum/uplink_item/item/visible_weapons/hammer
 	name = "Kneebreaker Hammer"
 	item_cost = 5
@@ -45,7 +40,7 @@
 	path = /obj/item/gun/projectile/revolver
 
 /datum/uplink_item/item/visible_weapons/submachinegun
-	name = "Tommy Gun"
+	name = "Vintage Submachine Gun"
 	item_cost = 14
 	path = /obj/item/gun/projectile/automatic/tommygun
 
@@ -109,12 +104,27 @@
 	item_cost = 2
 	path = /obj/item/material/star
 
+/datum/uplink_item/item/visible_weapons/plasma_shotty
+	name = "Plasma Shotgun"
+	item_cost = 15
+	path = /obj/item/gun/projectile/plasma
+
 /datum/uplink_item/item/visible_weapons/icelance
 	name = "Icelance Rifle"
 	item_cost = 6
 	path = /obj/item/gun/energy/rifle/icelance
 
+/datum/uplink_item/item/visible_weapons/boltaction
+	name = "Bolt-Action Rifle"
+	item_cost = 8
+	path = /obj/item/gun/projectile/shotgun/pump/rifle
+
+/datum/uplink_item/item/visible_weapons/colt
+	name = "Vintage .45 Pistol"
+	item_cost = 6
+	path = /obj/item/gun/projectile/colt
+
 /datum/uplink_item/item/visible_weapons/custom_ka
 	name = "Kinetic Laser Assembly"
 	item_cost = 12
-	path = /obj/item/gun/custom_ka/frame01/illegal
+	path = /obj/item/gun/custom_ka/frame01/illegal
\ No newline at end of file
diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm
index 3d62e5b4031..4fd9acc6b09 100644
--- a/code/datums/uplink/medical.dm
+++ b/code/datums/uplink/medical.dm
@@ -29,5 +29,7 @@
 	item_cost = 6
 	path = /obj/item/storage/box/syndie_kit/stimulants
 
-
-
+/datum/uplink_item/item/medical/firstaid
+	name = "Standard First-Aid Kit"
+	item_cost = 6
+	path = /obj/item/storage/firstaid/regular
\ No newline at end of file
diff --git a/code/datums/uplink/revolution.dm b/code/datums/uplink/revolution.dm
index 965ac304510..a17710d649c 100644
--- a/code/datums/uplink/revolution.dm
+++ b/code/datums/uplink/revolution.dm
@@ -7,12 +7,6 @@
 	item_cost = 45
 	path = /obj/item/device/orbital_dropper/armory/syndicate
 
-/datum/uplink_item/item/revolution/mecha
-	name = "Mecha Dropper"
-	desc = "A device that can be used to drop in a combat exosuit. Can only be used outside station areas, unless emagged, which is hazardous."
-	item_cost = 40
-	path = /obj/item/device/orbital_dropper/mecha
-
 /datum/uplink_item/item/revolution/implants
 	name = "Box of Aggression Implants"
 	desc = "A box containing implants that will make their owners increasingly aggressive."
diff --git a/code/datums/uplink/stealthy and inconspicuous weapons.dm b/code/datums/uplink/stealthy and inconspicuous weapons.dm
index 8ae2dbd187d..f8b5049e594 100644
--- a/code/datums/uplink/stealthy and inconspicuous weapons.dm	
+++ b/code/datums/uplink/stealthy and inconspicuous weapons.dm	
@@ -37,10 +37,10 @@
 
 /datum/uplink_item/item/stealthy_weapons/concealed_cane
 	name = "Concealed Cane Sword"
-	item_cost = 9
+	item_cost = 7
 	path = /obj/item/cane/concealed
 
 /datum/uplink_item/item/stealthy_weapons/sleepy_ring
 	name = "Sleepy Ring"
-	item_cost = 7
+	item_cost = 6
 	path = /obj/item/clothing/ring/reagent/sleepy
diff --git a/code/datums/uplink/uplink_categories.dm b/code/datums/uplink/uplink_categories.dm
index 20360fc5edf..a9b2ada61f3 100644
--- a/code/datums/uplink/uplink_categories.dm
+++ b/code/datums/uplink/uplink_categories.dm
@@ -53,6 +53,12 @@
 /datum/uplink_category/badassery
 	name = "Badassery"
 
+/datum/uplink_category/exosuit
+	name = "Exosuit"
+
+/datum/uplink_category/exosuit_equipment
+	name = "Exosuit Equipment"
+
 /datum/uplink_category/telecrystals
 	name = "Telecrystals"
 
diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm
index 659f753b240..b584d376744 100644
--- a/code/game/machinery/autolathe_datums.dm
+++ b/code/game/machinery/autolathe_datums.dm
@@ -487,9 +487,9 @@
 	hidden = 1
 	category = "Arms and Ammunition"
 
-/datum/autolathe/recipe/tommy_mag
-	name = "tommygun magazine (.45)"
-	path = /obj/item/ammo_magazine/tommymag
+/datum/autolathe/recipe/submachine_mag
+	name = "submachinegun magazine (.45)"
+	path = /obj/item/ammo_magazine/submachinemag
 	hidden = 1
 	category = "Arms and Ammunition"
 
diff --git a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm
index 9dcde9567c1..087b6518c42 100644
--- a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm
+++ b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm
@@ -20,6 +20,15 @@
 
 	map = new /datum/map_template/mecha
 
+/obj/item/device/orbital_dropper/mecha/heavy
+	map = new /datum/map_template/mecha/heavy
+
+/obj/item/device/orbital_dropper/mecha/combat
+	map = new /datum/map_template/mecha/combat
+
+/obj/item/device/orbital_dropper/mecha/powerloader
+	map = new /datum/map_template/mecha/powerloader
+
 /obj/item/device/orbital_dropper/armory
 	name = "armory dropper"
 	desc = "A device used to paint a target, which will then promptly orbitally drop the requested items. Who's ready to raise hell?"
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index b4f4304684b..5c43dad69c0 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -40,7 +40,7 @@
 	return
 
 /obj/item/grenade/spawnergrenade/manhacks
-	name = "manhack delivery grenade"
+	name = "viscerator delivery grenade"
 	desc = "It is set to detonate in 5 seconds. It will unleash a swarm of deadly manhack robots that will attack everyone but you and your allies."
 	spawner_type = /mob/living/simple_animal/hostile/viscerator
 	deliveryamt = 5 //Five seems a bit much, but we'll keep it as-is.
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index f6d47954d88..fd2874ad104 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -70,6 +70,17 @@
 		/obj/item/powerdrill = 1
 	)
 
+/obj/item/storage/belt/utility/very_full
+	starts_with = list(
+		/obj/item/weldingtool/largetank = 1,
+		/obj/item/crowbar = 1,
+		/obj/item/wirecutters = 1,
+		/obj/item/stack/cable_coil/random = 1,
+		/obj/item/powerdrill = 1,
+		/obj/item/device/multitool = 1,
+		/obj/item/device/radio = 1
+	)
+
 
 /obj/item/storage/belt/utility/atmostech
 	starts_with = list(
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 0c59394e960..7a91f120782 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -316,6 +316,12 @@
 	icon_state = "flashbang"
 	starts_with = list(/obj/item/grenade/frag = 5)
 
+/obj/item/storage/box/cardox
+	name = "box of cardox grenades"
+	desc = "A box containing 5 experimental cardox grenades."
+	icon_state = "flashbang"
+	starts_with = list(/obj/item/grenade/chem_grenade/large/phoroncleaner = 5)
+
 /obj/item/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."
diff --git a/code/modules/heavy_vehicle/equipment/medical.dm b/code/modules/heavy_vehicle/equipment/medical.dm
index 31ae03f440a..627d432e5b3 100644
--- a/code/modules/heavy_vehicle/equipment/medical.dm
+++ b/code/modules/heavy_vehicle/equipment/medical.dm
@@ -1,6 +1,6 @@
 /obj/item/mecha_equipment/sleeper
 	name = "\improper exosuit sleeper"
-	desc = "An exosuit-mounted sleeper designed to mantain patients stabilized on their way to medical facilities."
+	desc = "An exosuit-mounted sleeper designed to maintain patients stabilized on their way to medical facilities."
 	icon_state = "mech_sleeper"
 	restricted_hardpoints = list(HARDPOINT_BACK)
 	restricted_software = list(MECH_SOFTWARE_MEDICAL)
diff --git a/code/modules/heavy_vehicle/premade/combat.dm b/code/modules/heavy_vehicle/premade/combat.dm
index ab48f0b666c..06a9e49a40f 100644
--- a/code/modules/heavy_vehicle/premade/combat.dm
+++ b/code/modules/heavy_vehicle/premade/combat.dm
@@ -21,8 +21,9 @@
 
 /mob/living/heavy_vehicle/premade/combat/spawn_mech_equipment()
 	..()
-	install_system(new /obj/item/mecha_equipment/mounted_system/taser(src), HARDPOINT_LEFT_HAND)
+	install_system(new /obj/item/mecha_equipment/mounted_system/blaster(src), HARDPOINT_LEFT_HAND)
 	install_system(new /obj/item/mecha_equipment/mounted_system/taser/ion(src), HARDPOINT_RIGHT_HAND)
+	install_system(new /obj/item/mecha_equipment/mounted_system/grenadetear(src), HARDPOINT_RIGHT_SHOULDER)
 
 /obj/item/mech_component/manipulators/combat
 	name = "combat arms"
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index bb0beb17383..13b61c6732e 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -1,7 +1,4 @@
 /obj/item/ammo_magazine/a357
-	//name = "ammo box (.357)"
-	//desc = "A box of .357 ammo"
-	//icon_state = "357"
 	name = "speed loader (.357)"
 	icon_state = "T38"
 	caliber = "357"
@@ -300,7 +297,7 @@
 /obj/item/ammo_magazine/c45uzi/empty
 	initial_ammo = 0
 
-/obj/item/ammo_magazine/tommymag
+/obj/item/ammo_magazine/submachinemag
 	name = "magazine (.45)"
 	icon_state = "tommy-mag"
 	mag_type = MAGAZINE
@@ -309,10 +306,10 @@
 	caliber = ".45"
 	max_ammo = 20
 
-/obj/item/ammo_magazine/tommymag/empty
+/obj/item/ammo_magazine/submachinemag/empty
 	initial_ammo = 0
 
-/obj/item/ammo_magazine/tommydrum
+/obj/item/ammo_magazine/submachinedrum
 	name = "drum magazine (.45)"
 	icon_state = "tommy-drum"
 	w_class = 3 // Bulky ammo doesn't fit in your pockets!
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index f08b2f35f27..d52044c02e2 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -325,8 +325,8 @@
 	slot_flags = SLOT_BELT
 	ammo_type = /obj/item/ammo_casing/c45
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/tommymag
-	allowed_magazines = list(/obj/item/ammo_magazine/tommymag, /obj/item/ammo_magazine/tommydrum)
+	magazine_type = /obj/item/ammo_magazine/submachinemag
+	allowed_magazines = list(/obj/item/ammo_magazine/submachinemag, /obj/item/ammo_magazine/submachinedrum)
 	fire_sound = 'sound/weapons/tommygun_shoot.ogg'
 
 /obj/item/gun/projectile/automatic/tommygun/update_icon()
diff --git a/html/changelogs/geeves - tatorrifle.yml b/html/changelogs/geeves - tatorrifle.yml
new file mode 100644
index 00000000000..582856bece5
--- /dev/null
+++ b/html/changelogs/geeves - tatorrifle.yml	
@@ -0,0 +1,11 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added a bunch of descriptions to the traitor uplink so you can be more sure of what you're buying."
+  - rscadd: "Added various new weapons, tools, and kits to the traitor uplink."
+  - tweak: "Various traitor items have had their cost tweaked to bring them into a tighter balance."
+  - tweak: "The Tommygun is now know as the Vintage Sub-Machine gun everywhere."
+  - tweak: "Manhacks are now called Viscerators everywhere."
+  - rscadd: "Exosuit droppers and their equipment have both been given their own uplink catagories."
\ No newline at end of file
diff --git a/maps/templates/orbital/heavy-mecha.dmm b/maps/templates/orbital/heavy-mecha.dmm
new file mode 100644
index 00000000000..c135a3ef3dc
--- /dev/null
+++ b/maps/templates/orbital/heavy-mecha.dmm
@@ -0,0 +1,5 @@
+"a" = (/mob/living/heavy_vehicle/premade/heavy,/turf/simulated/floor/reinforced/airless,/area/security/armoury)
+
+(1,1,1) = {"
+a
+"}
diff --git a/maps/templates/orbital/light-mecha.dmm b/maps/templates/orbital/light-mecha.dmm
new file mode 100644
index 00000000000..3eb5c44c15c
--- /dev/null
+++ b/maps/templates/orbital/light-mecha.dmm
@@ -0,0 +1,5 @@
+"a" = (/mob/living/heavy_vehicle/premade/light,/turf/simulated/floor/reinforced/airless,/area/security/armoury)
+
+(1,1,1) = {"
+a
+"}
diff --git a/maps/templates/orbital/orbital_templates.dm b/maps/templates/orbital/orbital_templates.dm
index 1a79bbfc569..ca222329246 100644
--- a/maps/templates/orbital/orbital_templates.dm
+++ b/maps/templates/orbital/orbital_templates.dm
@@ -1,11 +1,23 @@
 /datum/map_template/mecha
-	name = "Mecha Drop"
+	name = "Light Mecha Drop"
+	mappath = 'maps/templates/orbital/light-mecha.dmm'
+
+/datum/map_template/mecha/heavy
+	name = "Heavy Mecha Drop"
+	mappath = 'maps/templates/orbital/heavy-mecha.dmm'
+
+/datum/map_template/mecha/combat
+	name = "Combat Mecha Drop"
 	mappath = 'maps/templates/orbital/combat-mecha.dmm'
 
+/datum/map_template/mecha/powerloader
+	name = "Powerloader Mecha Drop"
+	mappath = 'maps/templates/orbital/powerloader-mecha.dmm'
+
 /datum/map_template/armory
 	name = "Armory Drop"
 	mappath = 'maps/templates/orbital/mini-armory.dmm'
 
 /datum/map_template/drill
 	name = "Drill Drop"
-	mappath = 'maps/templates/orbital/drill.dmm'
+	mappath = 'maps/templates/orbital/drill.dmm'
\ No newline at end of file
diff --git a/maps/templates/orbital/powerloader-mecha.dmm b/maps/templates/orbital/powerloader-mecha.dmm
new file mode 100644
index 00000000000..7f11267a5e5
--- /dev/null
+++ b/maps/templates/orbital/powerloader-mecha.dmm
@@ -0,0 +1,5 @@
+"a" = (/mob/living/heavy_vehicle/premade/ripley,/turf/simulated/floor/reinforced/airless,/area/security/armoury)
+
+(1,1,1) = {"
+a
+"}