More bay merge fixes (#1243)

- Fixes #1227 
- Fixes #1236 
- Re-add lamarr.
- Fix bootknife thing
- Fix a couple of things related to borgs
- Re-add our tator items
- Adding back all the hardsuit modules back to robotics
- Fixing a couple of missing sprites, like fireaxe cabinet
- Fixed missing computer sprites when no power

code/datums/uplink/ammunition.dm

@@ -10,10 +10,15 @@
 	item_cost = 1
 	path = /obj/item/ammo_magazine/mc9mm
 
-/datum/uplink_item/item/ammo/a10mm
-	name = "10mm"
-	item_cost = 1
-	path = /obj/item/ammo_magazine/a10mm
+/datum/uplink_item/item/ammo/tommygunmag
+	name = "Tommygun Magazine (.45)"
+	item_cost = 2
+	path = /obj/item/ammo_magazine/tommymag
+
+/datum/uplink_item/item/ammo/tommygundrum
+	name = "Tommygun Drum Magazine (.45)"
+	item_cost = 4
+	path = /obj/item/ammo_magazine/tommydrum
 
 /datum/uplink_item/item/ammo/darts
 	name = "Darts"
@@ -25,11 +30,6 @@
 	item_cost = 2
 	path = /obj/item/ammo_magazine/a357
 
-/datum/uplink_item/item/ammo/a762
-	name = "7.62mm"
-	item_cost = 3
-	path = /obj/item/ammo_magazine/a762
-
 /datum/uplink_item/item/ammo/sniperammo
 	name = "14.5mm"
 	item_cost = 4

code/datums/uplink/grenades.dm

@@ -18,3 +18,8 @@
 	name = "5xEMP Grenades"
 	item_cost = 6
 	path = /obj/item/weapon/storage/box/emps
+
+/datum/uplink_item/item/grenades/manhack
+	name = "Manhack Delivery Grenade"
+	item_cost = 3
+	path = /obj/item/weapon/grenade/spawnergrenade/manhacks

code/datums/uplink/highly visible and dangerous weapons.dm

@@ -14,6 +14,11 @@
 	item_cost = 6
 	path = /obj/item/weapon/gun/energy/crossbow
 
+/datum/uplink_item/item/visible_weapons/forcegloves
+	name = "Force Gloves"
+	item_cost = 8
+	path = /obj/item/clothing/gloves/force/syndicate
+
 /datum/uplink_item/item/visible_weapons/energy_sword
 	name = "Energy Sword"
 	item_cost = 8
@@ -34,16 +39,10 @@
 	item_cost = 12
 	path = /obj/item/weapon/gun/projectile/revolver
 
-//These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear.
 /datum/uplink_item/item/visible_weapons/submachinegun
-	name = "Submachine Gun"
-	item_cost = 12
-	path = /obj/item/weapon/gun/projectile/automatic/c20r
-
-/datum/uplink_item/item/visible_weapons/assaultrifle
-	name = "Assault Rifle"
+	name = "Tommy Gun"
 	item_cost = 14
-	path = /obj/item/weapon/gun/projectile/automatic/rifle/sts35
+	path = /obj/item/weapon/gun/projectile/automatic/tommygun
 
 /datum/uplink_item/item/visible_weapons/heavysniper
 	name = "Anti-materiel Rifle"

code/datums/uplink/medical.dm

@@ -18,3 +18,8 @@
 	name = "Combat medical kit"
 	item_cost = 12
 	path = /obj/item/weapon/storage/firstaid/combat
+
+/datum/uplink_item/item/medical/combathypo
+	name = "Combat hypospray"
+	item_cost = 6
+	path = /obj/item/weapon/reagent_containers/hypospray/combat

code/datums/uplink/stealthy and inconspicuous weapons.dm

@@ -16,7 +16,7 @@
 
 /datum/uplink_item/item/stealthy_weapons/concealed_cane
 	name = "Concealed Cane Sword"
-	item_cost = 2
+	item_cost = 9
 	path = /obj/item/weapon/cane/concealed
 
 /datum/uplink_item/item/stealthy_weapons/random_toxin