diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm
index 0889b5c738cb..88b6c96650b5 100644
--- a/code/datums/components/uplink.dm
+++ b/code/datums/components/uplink.dm
@@ -4,6 +4,9 @@ GLOBAL_LIST_EMPTY(uplinks)
 #define NT_ERT_TROOPER 1
 #define NT_ERT_MEDIC 2
 #define NT_ERT_ENGINEER 3
+#define NT_ERT_COMMANDER 4	//dripstation edit
+#define NT_ERT_SECURITY_SPECIALIST 5	//dripstation edit
+#define NT_SPY 6	//dripstation edit
 /**
  * Uplinks
  *
@@ -184,8 +187,18 @@ GLOBAL_LIST_EMPTY(uplinks)
 						continue
 			if(istype(I, /datum/uplink_item/nt))
 				var/datum/uplink_item/nt/M = I
+				/*
 				if(nt_uplink_type != null && M.required_ert_uplink != null && nt_uplink_type != M.required_ert_uplink) //Different roles in ERT uplinks have different equipment avaliable
 					continue
+				*/
+				if(nt_uplink_type != null && M.required_ert_uplink != null)
+					var/is_inaccessible = TRUE
+					for(var/uptype in M.required_ert_uplink)
+						if(uptype == nt_uplink_type || debug)
+							is_inaccessible = FALSE
+							break
+					if(is_inaccessible)
+						continue
 			cat["items"] += list(list(
 				"name" = I.name,
 				"cost" = I.manufacturer && user.mind.is_employee(I.manufacturer) ? CEILING(I.cost * 0.8, 1) : I.cost,
@@ -376,3 +389,9 @@ GLOBAL_LIST_EMPTY(uplinks)
 	nt_uplink_type = NT_ERT_MEDIC
 /datum/component/uplink/nanotrasen/engineer
 	nt_uplink_type = NT_ERT_ENGINEER
+/datum/component/uplink/nanotrasen/commander
+	nt_uplink_type = NT_ERT_COMMANDER
+/datum/component/uplink/nanotrasen/security
+	nt_uplink_type = NT_ERT_SECURITY_SPECIALIST
+/datum/component/uplink/nanotrasen/security
+	nt_uplink_type = NT_SPY
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 2b3817fb2986..b8dce59dac93 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -10,6 +10,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 			continue
 		if(I.include_uplinks.len && !(uplink_type in I.include_uplinks))
 			continue
+		if(I.exclude_uplinks.len && (uplink_type in I.exclude_uplinks))	//dripstation edit
+			continue													//dripstation edit
 		if(I.include_modes.len)
 			if(!gamemode && SSticker.mode && !(SSticker.mode.type in I.include_modes))
 				continue
@@ -97,6 +99,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	var/cant_discount = FALSE
 	var/limited_stock = -1 //Setting this above zero limits how many times this item can be bought by the same traitor in a round, -1 is unlimited
 	var/list/include_uplinks = list("Uplink") // Uplink types this is in
+	var/list/exclude_uplinks = list() // Uplink types disallow this item from
 	var/list/include_modes = list() // Game modes to allow this item in.
 	var/list/exclude_modes = list() // Game modes to disallow this item from.
 	var/list/restricted_roles = list() //If this uplink item is only available to certain roles. Roles are dependent on the frequency chip or stored ID.
@@ -651,6 +654,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 /datum/uplink_item/stealthy_weapons
 	category = "Stealthy Weapons"
 
+/* Dripstation edit
 /datum/uplink_item/stealthy_weapons/combatglovesplus
 	name = "Combat Gloves Plus"
 	desc = "A pair of gloves that are fireproof and shock resistant, however unlike the regular Combat Gloves this one uses nanotechnology \
@@ -659,6 +663,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 5
 	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
 	surplus = 0
+*/
 
 /datum/uplink_item/stealthy_weapons/cqc
 	name = "CQC Manual"
@@ -2891,6 +2896,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cant_discount = TRUE //no i dont want amber erts with tasers thanks
 	var/required_ert_uplink = null //Do we need a specific uplink? Defaults to universal.
 
+/* Dripstation edit
 /datum/uplink_item/nt/energy_weps
 	category = "Energy Weapons"
 
@@ -3540,3 +3546,4 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	desc = "Omnizine infused gummy bears. Grape flavor. Chew throughly!"
 	item = /obj/item/storage/pill_bottle/gummies/omnizine
 	cost = 1
+*/
diff --git a/modular_dripstation/code/game/objects/items/weaponry.dm b/modular_dripstation/code/game/objects/items/weaponry.dm
index 91238c65a751..5207fa45abd1 100644
--- a/modular_dripstation/code/game/objects/items/weaponry.dm
+++ b/modular_dripstation/code/game/objects/items/weaponry.dm
@@ -262,6 +262,48 @@
 	new /obj/item/melee/sabre/syndie(src)
 	update_appearance(UPDATE_ICON)
 
+/obj/item/storage/belt/sabre/cane
+	name = "cane"
+	desc = "A cane used by a true gentleman. Or a clown."
+	icon = 'icons/obj/weapons/misc.dmi'
+	icon_state = "canesheath"
+	item_state = "stick"
+	lefthand_file = 'modular_dripstation/icons/mob/inhands/melee_lefthand.dmi'
+	righthand_file = 'modular_dripstation/icons/mob/inhands/melee_righthand.dmi'
+	icon = 'modular_dripstation/icons/obj/weapons/blades.dmi'
+	force = 5
+	throwforce = 5
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
+
+/obj/item/storage/belt/sabre/cane/Initialize(mapload)
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 1
+	STR.rustle_sound = FALSE
+	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.set_holdable(list(
+		/obj/item/melee/sabre/cane
+		))
+
+
+/obj/item/storage/belt/sabre/cane/PopulateContents()
+	new /obj/item/melee/sabre/cane(src)
+	update_appearance(UPDATE_ICON)
+
+/obj/item/melee/sabre/cane
+	name = "\improper stealth blade"
+	desc = "An elegant plastitanium combat ready stealth blade, its edge isn`t that robust, but capable of hurting badly."
+	icon = 'modular_dripstation/icons/obj/weapons/blades.dmi'
+	lefthand_file = 'modular_dripstation/icons/mob/inhands/melee_lefthand.dmi'
+	righthand_file = 'modular_dripstation/icons/mob/inhands/melee_righthand.dmi'
+	icon_state = "sabre"
+	force = 20
+	block_chance = 50
+	armour_penetration = 20
+	wound_bonus = -20
+	bare_wound_bonus = 30
+
 /obj/item/melee/ntrep_cane
 	name = "\improper NanoTrasen Representative`s cane"
 	desc = "A compact yet robust personal defense weapon."
diff --git a/modular_dripstation/code/modules/clothing/combatrig.dm b/modular_dripstation/code/modules/clothing/combatrig.dm
index f3dce14b488e..4bd5ae264afb 100644
--- a/modular_dripstation/code/modules/clothing/combatrig.dm
+++ b/modular_dripstation/code/modules/clothing/combatrig.dm
@@ -1244,6 +1244,33 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/sbo/commsoff
 
 
+//////Merc suit designes//////
+//////Standart merk rig//////
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/merk
+	name = "merk RIG helmet"
+	desc = "An austere tactical helmet used by paramilitary groups across human space."
+	icon_state = "freemerk_helm"
+	hardsuit_type = "freemerk"
+	light_range = 6
+	armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 25, BOMB = 50, BIO = 100, RAD = 50, FIRE = 75, ACID = 90, WOUND = 25, ELECTRIC = 100)
+	heat_protection = HEAD
+	toggled_for_heat_protecting = FALSE
+	light_color = LIGHT_COLOR_DEFAULT
+
+/obj/item/clothing/suit/space/hardsuit/syndi/merk
+	name = "merk RIG"
+	desc = "An austere RIG used by paramilitary groups across human space."
+	icon_state = "freemerk_rig"
+	hardsuit_type = "freemerk"
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/merk
+	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/tank/jetpack/oxygen/harness)
+	armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 25, BOMB = 50, BIO = 100, RAD = 50, FIRE = 75, ACID = 90, WOUND = 25, ELECTRIC = 100)
+	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	lightweight = 0
+	toggled_for_heat_protecting = FALSE
+	combat_slowdown = 0
+
+
 //////Military suit designes//////
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/military
 	name = "military RIG helmet"
diff --git a/modular_dripstation/code/modules/paperwork/pen.dm b/modular_dripstation/code/modules/paperwork/pen.dm
index f79bf637c651..20b2cefa0ca0 100644
--- a/modular_dripstation/code/modules/paperwork/pen.dm
+++ b/modular_dripstation/code/modules/paperwork/pen.dm
@@ -136,3 +136,22 @@
 		item_state = initial(item_state)
 		lefthand_file = initial(lefthand_file)
 		righthand_file = initial(righthand_file)
+
+/obj/item/pen/red/edagger/nt
+	desc = "It's a normal black ink pen."
+	icon_state = "pen"
+	item_state = "pen"
+	colour = "black"
+
+/obj/item/pen/red/edagger/nt/update_icon()
+	. = ..()
+	if(on)
+		icon_state = "eknife"
+		item_state = "eknife"
+		lefthand_file = 'modular_dripstation/icons/mob/inhands/melee_lefthand.dmi'
+		righthand_file = 'modular_dripstation/icons/mob/inhands/melee_righthand.dmi'
+	else
+		icon_state = initial(icon_state) //looks like a normal pen when off.
+		item_state = initial(item_state)
+		lefthand_file = initial(lefthand_file)
+		righthand_file = initial(righthand_file)
\ No newline at end of file
diff --git a/modular_dripstation/code/modules/projectiles/guns/energy/special.dm b/modular_dripstation/code/modules/projectiles/guns/energy/special.dm
index 1f3e4655444b..93dd2f927e35 100644
--- a/modular_dripstation/code/modules/projectiles/guns/energy/special.dm
+++ b/modular_dripstation/code/modules/projectiles/guns/energy/special.dm
@@ -15,6 +15,9 @@
 	ammo_x_offset = 2
 	charge_sections = 2
 
+/obj/item/gun/energy/ionrifle/pistol/stealth
+	desc = "Ion Projector is a compact ion pistol, built for personal defense."
+
 /obj/item/gun/energy/ionrifle/cybersun
 	name = "compact ion rifle"
 	desc = "The CS-I7 Prototype Ion Projector is a compact ion rifle, built to be very ergonomic and deadly efficient."
diff --git a/modular_dripstation/code/modules/uplink/ntia_uplink.dm b/modular_dripstation/code/modules/uplink/ntia_uplink.dm
new file mode 100644
index 000000000000..1ee005a1de86
--- /dev/null
+++ b/modular_dripstation/code/modules/uplink/ntia_uplink.dm
@@ -0,0 +1,483 @@
+////////////NT Internal Affairs Agent/////////////
+
+
+////////////Nanotrasen & Nonsyndicate Production/////////////
+/datum/uplink_item/dangerous/mini_egun
+	name = "Spec Ops Miniature E-Gun"
+	desc = "Visually standart energy gun. Has three modes, overcharged combat energy projectiles and specops battery onboard."
+	item = /obj/item/gun/energy/e_gun/mini/specops
+	cost = 4
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/iongun
+	name = "Ion pistol"
+	desc = "The NT-I3 Prototype Ion Projector is a compact ion pistol, built for personal defense. \
+	The serial number of this gun has been erased."
+	item = /obj/item/gun/energy/ionrifle/pistol/stealth
+	cost = 3
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/revolver
+	name = "Mateba Revolver"
+	desc = "A brutally simple retro, high-powered autorevolver that fires .44 Magnum rounds and has 6 chambers."
+	item = /obj/item/gun/ballistic/revolver/mateba
+	cost = 10
+	surplus = 0
+	illegal_tech = FALSE
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/revolverammo
+	name = ".44 Speed Loader"
+	desc = "A .44 speed loader. This speed loader contain six .44 rounds each; usable with the Mateba revolver."
+	item = /obj/item/ammo_box/m44
+	cost = 1
+	surplus = 0
+	illegal_tech = FALSE
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/hardlightbow
+	name = "Hardlight Bow"
+	desc = "A modern bow that can fabricate hardlight arrows, designed for silent takedowns of targets."
+	item = /obj/item/gun/ballistic/bow/energy/ntia
+	cost = 6
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/obj/item/gun/ballistic/bow/energy/ntia
+	mag_type = /obj/item/ammo_box/magazine/internal/bow/energy/ntia
+	zoomable = TRUE
+	zoom_amt = 10
+	zoom_out_amt = 5
+	pin = /obj/item/firing_pin/implant/centcom_mindshield
+	fire_sound = null
+	draw_sound = null
+	can_fold = TRUE
+
+/obj/item/ammo_box/magazine/internal/bow/energy/ntia
+	selectable_types = list(/obj/item/ammo_casing/reusable/arrow/energy, /obj/item/ammo_casing/reusable/arrow/energy/disabler, /obj/item/ammo_casing/reusable/arrow/energy/xray)
+
+/datum/uplink_item/dangerous/esword
+	name = "Energy Sword"
+	desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
+			pocketed when inactive."
+	item = /obj/item/melee/transforming/energy/sword/saber
+	cost = 8
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/canesword
+	name = "Cane blade"
+	desc = "Stored in sheath that looks like a cane. Elegant, but not so stealth and effective. It`s capable of hurting unarmored targets badly."
+	item = /obj/item/storage/belt/sabre/cane
+	cost = 2
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/eknife
+	name = "Energy Knife"
+	desc = "A knife made of energy that looks and functions as a pen when off."
+	item = /obj/item/pen/red/edagger/nt
+	cost = 2
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/militechmantisblade
+	name = "H.E.P.H.A.E.S.T.U.S. Mantis Blades"
+	desc = "One H.E.P.H.A.E.S.T.U.S. Mantis blade implant able to be retracted inside your body at will for easy storage and concealing. Two blades can be used at once."
+	item = /obj/item/autosurgeon/nt_mantis/stealth
+	cost = 5
+	surplus = 0
+	illegal_tech = FALSE
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/obj/item/autosurgeon/nt_mantis/stealth
+	starting_organ = /obj/item/organ/cyberimp/arm/nt_mantis/stealth
+
+/obj/item/organ/cyberimp/arm/nt_mantis/stealth
+	desc = "Stealth mosification of H.E.P.H.A.E.S.T.U.S. retractable arm-blade implant. Wielding two will let you double-attack."
+	syndicate_implant = TRUE
+
+/datum/uplink_item/stealthy_weapons/combatglovesplus
+	name = "Combat Gloves Plus"
+	desc = "A pair of gloves that are fireproof and shock resistant, however unlike the regular Combat Gloves this one uses nanotechnology \
+			to learn the abilities of krav maga to the wearer."
+	item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
+	cost = 5
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/implants/ntradio
+	name = "Internal Nanotrasen Radio Implant"
+	desc = "An implant injected into the body, allowing the use of an internal Centcom radio. \
+			Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
+	item = /obj/item/storage/box/syndie_kit/imp_ntiaa_radio
+	cost = 4
+	surplus = 0
+	illegal_tech = FALSE
+	manufacturer = /datum/corporation/nanotrasen
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/obj/item/storage/box/syndie_kit/imp_ntiaa_radio
+	real_name = "implant box"
+	illustration = "implant"
+
+/obj/item/storage/box/syndie_kit/imp_ntiaa_radio/PopulateContents()
+	new /obj/item/implanter/radio/ntiaa(src)
+
+/obj/item/implanter/radio/ntiaa
+	name = "implanter"
+	imp_type = /obj/item/implant/radio/ntiaa
+
+/obj/item/implant/radio/ntiaa
+	desc = "Are you there God? It's me, Internal Affairs Agent."
+	radio_key = /obj/item/encryptionkey/headset_cent
+	subspace_transmission = TRUE
+
+/datum/uplink_item/implants/reviver
+	name = "Reviver Implant"
+	desc = "This implant will attempt to revive and heal you if you are critically injured. Comes with an autosurgeon."
+	item = /obj/item/autosurgeon/reviver/stealth
+	manufacturer = /datum/corporation/nanotrasen
+	cost = 8
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/obj/item/autosurgeon/reviver/stealth
+	starting_organ = /obj/item/organ/cyberimp/chest/reviver/stealth
+
+/obj/item/organ/cyberimp/chest/reviver/stealth
+	syndicate_implant = TRUE
+
+/datum/uplink_item/explosives/nt_minibomb
+	name = "Nanotrasen Minibomb"
+	desc = "The minibomb is a grenade with a five-second fuse. Upon detonation, it will create a small hull breach \
+			in addition to dealing high amounts of damage to nearby personnel."
+	item = /obj/item/grenade/syndieminibomb/nt
+	manufacturer = /datum/corporation/nanotrasen
+	cost = 6
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/obj/item/grenade/syndieminibomb/nt
+	desc = "A nanotrasen manufactured explosive used to sow destruction and chaos."
+	icon = 'modular_dripstation/icons/obj/weapons/grenade.dmi'
+	icon_state = "nanotrasen"
+
+/datum/uplink_item/explosives/teargas
+	name = "Teargas Grenade"
+	desc = "A teargas grenades."
+	item = /obj/item/grenade/chem_grenade/teargas
+	cost = 1
+	surplus = 0
+	illegal_tech = FALSE
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/variag
+	name = "Varyag Militech Forsing Tool"
+	desc = "Smash stuff. Pry open doors. Kill enemies."
+	item = /obj/item/melee/emergency_forcing_tool/varyag
+	cost = 6
+	surplus = 0
+	illegal_tech = FALSE
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/nt_bodybag
+	name = "Nanotrasen Bluespace Transport Bag"
+	desc = "A folded bluespace body bag designed for the storage and transportation."
+	item = /obj/item/bodybag/bluespace
+	cost = 1
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/suits/oldspacesuit
+	name = "Old Style Spacesuit"
+	desc = "A box of modern spacesuit disguised into \"Old Style\"."
+	item = /datum/market_item/clothing/full_spacesuit_set
+	cost = 1
+	surplus = 0
+	illegal_tech = FALSE
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/obj/item/storage/box/full_spacesuit_set
+	name = "Spacesuit Box"
+	desc = "It has no logo on it."
+
+/obj/item/storage/box/full_spacesuit_set/PopulateContents()
+	new /obj/item/clothing/suit/space(src)
+	new /obj/item/clothing/head/helmet/space(src)
+
+/datum/uplink_item/suits/mercrig
+	name = "Merk RIG"
+	desc = "The feared suit of a free mercenary unit. Toggling the suit in and out of \
+			combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
+			Additionally the suit is collapsible, making it small enough to fit within a backpack."
+	item = /obj/item/clothing/suit/space/hardsuit/syndi/merk
+	cost = 8
+	surplus = 0
+	illegal_tech = FALSE
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+////////////Syndicate stuff/////////////
+/datum/uplink_item/dangerous/throwingweapons/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/sword/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/backstab/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/bostaff/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/powerfist/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/dangerous/watergun/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/cqc/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/dart_pistol/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/derringer/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/origami_kit/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/traitor_chem_bottle/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/sleepy_pen/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_weapons/suppressor/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/explosives/c4/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/explosives/ntx4
+	name = "Composition X-4"
+	desc = "A variety of plastic explosive with a stronger explosive charge. It is both safer to use and is capable of breaching even the most secure areas."
+	item = /obj/item/grenade/plastic/x4
+	cost = 3
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/explosives/detomatix/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+	restricted = FALSE
+
+/datum/uplink_item/explosives/door_charge/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/explosives/trap_disk/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/agent_card/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/shadowcloak/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/syndireverse/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/chameleon/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/chameleon_proj/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/syndigaloshes/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/emplight/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/mulligan/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/smugglersatchel/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/stealthy_tools/armorpolish/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/cutouts/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/binary/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/briefcase_launchpad/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/camera_bug/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/frame/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/failsafe/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/tactical_gloves/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/stimpack/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/thermal/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/holo_sight/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/vert_grip/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/laser_sight/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/device_tools/mechpilotguide/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/implants/antistun/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/implants/freedom/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/implants/stealthimplant/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
+
+/datum/uplink_item/implants/storage/nt
+	surplus = 0
+	include_uplinks = list("NTUplink")
+	restricted_roles = list(NT_SPY)
\ No newline at end of file
diff --git a/modular_dripstation/code/modules/uplink/uplink_items.dm b/modular_dripstation/code/modules/uplink/uplink_items.dm
index dd6060ff1027..6b4f0e1550fd 100644
--- a/modular_dripstation/code/modules/uplink/uplink_items.dm
+++ b/modular_dripstation/code/modules/uplink/uplink_items.dm
@@ -20,7 +20,6 @@
 	manufacturer = /datum/corporation/traitor/waffleco
 	item = /obj/item/clothing/suit/space/hardsuit/syndi/bloodred/waffle
 	cost = 6
-	exclude_modes = list()
 
 /datum/uplink_item/suits/hardsuit/winter
 	name = "White Gorlex RIG"
@@ -202,6 +201,8 @@
 
 
 ///////NT///////////
+/datum/uplink_item/nt
+
 /datum/uplink_item/nt/hardsuit/standard
 	name = "ERT RIG"
 	desc = "Trully NT Marine."
@@ -213,28 +214,28 @@
 	desc = "Show them who's boss."
 	item = /obj/item/clothing/suit/space/hardsuit/syndi/military/ert/com
 	cost = 5
-	restricted_roles = list("Emergency Response Commander")
+	required_ert_uplink = list(NT_ERT_COMMANDER)
 
 /datum/uplink_item/nt/hardsuit/sec
 	name = "ERT Security RIG"
 	desc = "Make them fear the long arm of law."
 	item = /obj/item/clothing/suit/space/hardsuit/syndi/military/ert/sec
 	cost = 5
-	required_ert_uplink = NT_ERT_TROOPER
+	required_ert_uplink = list(NT_ERT_TROOPER)
 
 /datum/uplink_item/nt/hardsuit/engi
 	name = "ERT Engineering RIG"
 	desc = "HOW DID YOU DELAMINATE THE SM 5 MINUTES IN?"
 	item = /obj/item/clothing/suit/space/hardsuit/syndi/military/ert/engi
 	cost = 5
-	required_ert_uplink = NT_ERT_ENGINEER
+	required_ert_uplink = list(NT_ERT_ENGINEER)
 
 /datum/uplink_item/nt/hardsuit/med
 	name = "ERT Medical RIG"
 	desc = "Dying is illegal."
 	item = /obj/item/clothing/suit/space/hardsuit/syndi/military/ert/med
 	cost = 5
-	required_ert_uplink = NT_ERT_MEDIC
+	required_ert_uplink = list(NT_ERT_MEDIC)
 
 /datum/uplink_item/nt/hardsuit/ds
 	name = "SWAT MKV Deathsquad"
@@ -256,4 +257,628 @@
 			Slowly recharges, but incredibly robust."
 	item = /obj/item/module/shield/nt
 	cost = 30
-	cant_discount = TRUE
\ No newline at end of file
+	cant_discount = TRUE
+
+/datum/uplink_item/nt/gear/combatglovesplus
+	name = "Combat Gloves Plus"
+	desc = "A pair of gloves that are fireproof and shock resistant, however unlike the regular Combat Gloves this one uses nanotechnology \
+			to learn the abilities of krav maga to the wearer."
+	item = /obj/item/clothing/gloves/krav_maga/combatglovesplus
+	cost = 5
+
+/datum/uplink_item/nt/energy_weps
+	category = "Energy Weapons"
+
+/datum/uplink_item/nt/energy_weps/egun
+	name = "Energy Gun"
+	desc = "A standard energy gun with disable and laser modes equipped."
+	item = /obj/item/gun/energy/e_gun
+	cost = 3
+	limited_stock = 2 //One for you and a friend, no infinite guns though
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/energy_weps/tac_egun
+	name = "Tactical Energy Gun"
+	desc = "A military-grade augmented energy gun, fitted with a tasing mode."
+	item = /obj/item/gun/energy/e_gun/stun
+	cost = 20
+	limited_stock = 1
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/energy_weps/mini_egun
+	name = "Miniature Energy Gun"
+	desc = "A smaller model of the standard energy gun that holds much less charge."
+	item = /obj/item/gun/energy/e_gun/mini
+	cost = 1
+	limited_stock = 1
+
+/datum/uplink_item/nt/energy_weps/specops_mini_egun
+	name = "Spec Ops Miniature E-Gun"
+	desc = "Visually standart energy gun. Has three modes, overcharged combat energy projectiles and specops battery onboard."
+	item = /obj/item/gun/energy/e_gun/mini/specops
+	cost = 4
+
+/datum/uplink_item/nt/energy_weps/iongun
+	name = "Ion pistol"
+	desc = "The NT-I3 Prototype Ion Projector is a compact ion pistol, built for personal defense."
+	item = /obj/item/gun/energy/ionrifle/pistol
+	cost = 3
+
+/datum/uplink_item/nt/energy_weps/laserrifle
+	name = "Laser Rifle"
+	desc = "An abnormality in energy weaponry. Chambers a laser magazine which can be recharged externally."
+	item = /obj/item/gun/ballistic/automatic/laser
+	cost = 8
+	limited_stock = 1
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/energy_weps/m1911
+	name = "M1911-P"
+	desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers."
+	item = /obj/item/gun/energy/pulse/pistol/m1911
+	cost = 35
+	required_ert_uplink = list(NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/energy_weps/pulsecarbine
+	name = "Pulse Carbine"
+	desc = "A severely lethal energy carbine that fires additionaly fires pulse rounds. Must be recharged instead of reloaded."
+	item = /obj/item/gun/energy/pulse/carbine
+	cost = 45
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_COMMANDER) //Medics and engies can buy pulse pistols
+
+/datum/uplink_item/nt/energy_weps/pulsepistol
+	name = "Pulse Pistol"
+	desc = "A severely lethal but compact version of the Pulse Carbine design. Holds significantly less charge. \
+			Must be recharged instead of reloaded."
+	item = /obj/item/gun/energy/pulse/pistol
+	cost = 35
+
+/datum/uplink_item/nt/energy_weps/hardlightbow
+	name = "HL-P1 Multipurpose Combat Bow"
+	desc = "An expensive hardlight bow designed by Nanotrasen and often sold to the SIC's espionage branch. Capable of firing disabler, energy, pulse, and taser bolts."
+	item = /obj/item/gun/ballistic/bow/energy/ert
+	cost = 75 //Doesn't need to be recharged but also fires once every now and then instead of being spammable
+
+/datum/uplink_item/nt/ball_weps
+	category = "Ballistic Weapons"
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/ball_weps/boarder
+	name = "NT-ARG 'Boarder' Rifle"
+	desc = "A heavy-damage 3-round burst assault rifle. Chambered in 5.56mm."
+	item = /obj/item/gun/ballistic/automatic/ar
+	cost = 18
+	limited_stock = 1
+
+/datum/uplink_item/nt/ball_weps/lwtdmr
+	name = "LWT-650 DMR"
+	desc = "A designated marksman rifle that deals hefty damage. Chambered in .308."
+	item = /obj/item/gun/ballistic/automatic/lwt650
+	cost = 10
+	limited_stock = 1
+
+/datum/uplink_item/nt/ball_weps/saber
+	name = "NT-SABR 'Saber' SMG"
+	desc = "A low-damage 3-round burst SMG. Chambered in 9mm."
+	item = /obj/item/gun/ballistic/automatic/proto/unrestricted
+	cost = 7
+
+/datum/uplink_item/nt/ball_weps/wtcarbine
+	name = "WT-550 Automatic Carbine"
+	desc = "A classic 2-round burst carbine with a number of ammo options. Chambered in 4.6x30mm."
+	item = /obj/item/gun/ballistic/automatic/wt550
+	cost = 5
+	required_ert_uplink = list(NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/ball_weps/m1911
+	name = "M1911"
+	desc = "A classic .45 sidearm with a small magazine capacity."
+	item = /obj/item/gun/ballistic/automatic/pistol/m1911
+	cost = 3
+	required_ert_uplink = list()
+
+/datum/uplink_item/nt/ammo
+	category = "Ammunition"
+
+/datum/uplink_item/nt/ammo/recharger
+	name = "Weapon Recharger"
+	desc = "Standard issue energy weapon recharger. Must be anchored in an APC-powered area."
+	item = /obj/machinery/recharger
+	cost = 2
+
+/datum/uplink_item/nt/ammo/powerpack
+	name = "Power Pack"
+	desc = "An additional 20-round laser magazine; suitable for use with the laser rifle."
+	item = /obj/item/ammo_box/magazine/recharge
+	cost = 5
+
+/datum/uplink_item/nt/ammo/arg
+	name = "5.56mm Magazine"
+	desc = "An additional 30-round 5.56mm magazine; suitable for use with the NT-ARG."
+	item = /obj/item/ammo_box/magazine/r556
+	cost = 4
+
+/datum/uplink_item/nt/ammo/arg/ap
+	name = "5.56 AP Magazine"
+	desc = "An alternative 30-round 5.56 magazine loaded with armor-piercing rounds; suitable for use with the NT-ARG."
+	item = /obj/item/ammo_box/magazine/r556/ap
+	cost = 6
+
+/datum/uplink_item/nt/ammo/arg/inc
+	name = "5.56 Incendiary Magazine"
+	desc = "An alternative 30-round 5.56 magazine loaded with incendiary rounds; suitable for use with the NT-ARG."
+	item = /obj/item/ammo_box/magazine/r556/inc
+
+/datum/uplink_item/nt/ammo/arg/rubber
+	name = "5.56 Rubber Magazine"
+	desc = "An alternative 30-round 5.56 magazine loaded with less-lethal rounds; suitable for use with the NT-ARG."
+	item = /obj/item/ammo_box/magazine/r556/rubber
+
+/datum/uplink_item/nt/ammo/lwt
+	name = ".308 Magazine"
+	desc = "An additional 15-round .308 magazine; suitable for use with the LWT-650."
+	item = /obj/item/ammo_box/magazine/m308
+	cost = 2
+
+/datum/uplink_item/nt/ammo/lwt/penetrator
+	name = ".308 Penetrator Magazine"
+	desc = "An alternative 15-round .308 penetrator magazine; suitable for use with the LWT-650. \
+			These rounds do less damage but puncture bodies and body armor alike."
+	item = /obj/item/ammo_box/magazine/m308/pen
+	cost = 4
+
+/datum/uplink_item/nt/ammo/lwt/laser
+	name = ".308 Heavy Laser Magazine"
+	desc = "An alternative 15-round .308 heavy laser magazine; suitable for use with the LWT-650. \
+			These rounds fire heavy lasers which do much more than a standard laser. The magazine is rechargable like the laser rifle's."
+	item = /obj/item/ammo_box/magazine/m308/laser
+	cost = 7
+
+/datum/uplink_item/nt/ammo/m45ammo
+	name = ".45 Handgun Magazine"
+	desc = "An additional 8-round .45 magazine; suitable for use with the M1911."
+	item = /obj/item/ammo_box/magazine/m45
+	cost = 2
+
+/datum/uplink_item/nt/ammo/saberammo
+	name = "9mm Magazine"
+	desc = "An additional 21-round 9mm magazine; suitable for use with the Saber SMG."
+	item = /obj/item/ammo_box/magazine/smgm9mm
+	cost = 1
+
+/datum/uplink_item/nt/ammo/saberammo/ap
+	name = "9mm AP Magazine"
+	desc = "An additional 21-round 9mm magazine loaded with armor-piercing rounds; suitable for use with the Saber SMG."
+	item = /obj/item/ammo_box/magazine/smgm9mm/ap
+	cost = 2
+
+/datum/uplink_item/nt/ammo/saberammo/inc
+	name = "9mm Incendiary Magazine"
+	desc = "An additional 21-round 9mm magazine loaded with incendiary rounds; suitable for use with the Saber SMG."
+	item = /obj/item/ammo_box/magazine/smgm9mm/inc
+
+/datum/uplink_item/nt/ammo/wt
+	name = "4.6x30mm Magazine"
+	desc = "An additional 20-round 4.6x30mm magazine; suitable for use with the WT-550."
+	item = /obj/item/ammo_box/magazine/wt550m9
+	cost = 2
+
+/datum/uplink_item/nt/ammo/wt/ap
+	name = "4.6x30mm AP Magazine"
+	desc = "An additional 20-round 4.6x30mm magazine loaded with armor-piercing rounds; suitable for use with the WT-550."
+	item = /obj/item/ammo_box/magazine/wt550m9/wtap
+	cost = 4
+
+/datum/uplink_item/nt/ammo/wt/ic
+	name = "4.6x30mm Incendiary Magazine"
+	desc = "An additional 20-round 4.6x30mm magazine loaded with incendiary rounds; suitable for use with the WT-550."
+	item = /obj/item/ammo_box/magazine/wt550m9/wtic
+	cost = 4
+
+/datum/uplink_item/nt/ammo/wt/r
+	name = "4.6x30mm Rubber Shot Magazine"
+	desc = "An additional 20-round 4.6x30mm magazine loaded with less-lethal rounds; suitable for use with the WT-550."
+	item = /obj/item/ammo_box/magazine/wt550m9/wtr
+	cost = 1
+
+/datum/uplink_item/nt/mech
+	category = "Exosuits"
+	required_ert_uplink = list(NT_ERT_ENGINEER)
+
+/datum/uplink_item/nt/mech/marauder
+	name = "Marauder exosuit"
+	desc = "A heavy-duty exosuit for when the going gets tough. Armed with three smoke bombs, and capable of mounting four pieces of equipment."
+	item = /obj/mecha/combat/marauder
+	cost = 12
+
+/datum/uplink_item/nt/mech/seraph
+	name = "Seraph exosuit"
+	desc = "An ultra-heavy exosuit designed for destroying armies. Faster, tougher, and stronger than it's Marauder cousin."
+	item = /obj/mecha/combat/marauder/seraph/unloaded
+	cost = 30
+
+/datum/uplink_item/nt/mech/laser
+	name = "CH-PS Laser"
+	desc = "A mounted laser cannon. Fires standard lasers."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
+	cost = 2
+
+/datum/uplink_item/nt/mech/hades
+	name = "FNX-99 Carbine"
+	desc = "A mounted incendiary cannon. Fires bullets that do little damage, but light targets on fire."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
+	cost = 4
+
+/datum/uplink_item/nt/mech/scattershot
+	name = "LBX AC 10"
+	desc = "A mounted shotgun. Fires a larger variant of buckshot, making it devastating at close range."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
+	cost = 4
+
+/datum/uplink_item/nt/mech/lmg
+	name = "Ultra AC 2"
+	desc = "A mounted machine gun, fires in three round bursts."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
+	cost = 4
+
+/datum/uplink_item/nt/mech/missile_launcher
+	name = "SRM-8"
+	desc = "A mounted missile rack."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
+	cost = 4
+
+/datum/uplink_item/nt/mech/pulse
+	name = "eZ-13"
+	desc = "A mounted heavy pulse cannon capable of firing heavy pulses, which can destroy multiple walls at once as well as decimating soft targets."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
+	cost = 10
+
+/datum/uplink_item/nt/mech/droid
+	name = "Repair droid"
+	desc = "A repair droid that will patch up most damage to a mech. Consumes a lot of power in the process."
+	item = /obj/item/mecha_parts/mecha_equipment/repair_droid
+	cost = 2
+
+/datum/uplink_item/nt/mech/tesla
+	name = "Tesla relay"
+	desc = "A remote, passive recharger for mechs. Very, very slow."
+	item = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
+	cost = 1
+
+/datum/uplink_item/nt/mech/hadesammo
+	name = "FNX-99 Ammunition"
+	desc = "An ammo box for the FNX-99 carbine."
+	item = /obj/item/mecha_ammo/incendiary
+	cost = 1
+
+/datum/uplink_item/nt/mech/scattershotammo
+	name = "LBX AC 10 Ammunition"
+	desc = "An ammo box for the LBX AC 10."
+	item = /obj/item/mecha_ammo/scattershot
+	cost = 1
+
+/datum/uplink_item/nt/mech/ultrammo
+	name = "Ultra AC 2 Ammunition"
+	desc = "An ammo box for the Ultra AC 2"
+	item = /obj/item/mecha_ammo/lmg
+	cost = 1
+
+/datum/uplink_item/nt/mech/missiles
+	name = "SRM-8 Missiles"
+	desc = "Additional missiles for the SRM-8 missile launcher."
+	item = /obj/item/mecha_ammo/missiles_he
+	cost = 1
+
+/datum/uplink_item/nt/cqc
+	category = "Close Quarters Combat"
+
+/datum/uplink_item/nt/cqc/cknife
+	name = "Combat Knife"
+	desc = "A less flashy but surprisingly robust pocket knife."
+	item = /obj/item/kitchen/knife/combat
+	cost = 1
+
+/datum/uplink_item/nt/cqc/edagger
+	name = "Energy Knife"
+	desc = "A knife made of energy that looks and functions as a pen when off."
+	item = /obj/item/pen/red/edagger/nt
+	cost = 2
+
+/datum/uplink_item/nt/cqc/edagger
+	name = "Bibration Blade"
+	desc = "A blade with an edge that vibrates rapidly, enabling it to easily cut through armor and flesh alike."
+	item = /obj/item/melee/transforming/vib_blade
+	cost = 4
+
+/datum/uplink_item/nt/cqc/esword
+	name = "Energy Sword"
+	desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
+			pocketed when inactive."
+	item = /obj/item/melee/transforming/energy/sword/saber
+	cost = 8
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/cqc/eshield
+	name = "Energy Shield"
+	desc = "A shield that blocks all energy projectiles but is useless against physical attacks."
+	item = /obj/item/shield/energy
+	cost = 16
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/cqc/mantisblade
+	name = "H.E.P.H.A.E.S.T.U.S. Mantis Blades"
+	desc = "A pair of retractable arm-blade implants. Activating both will let you double-attack."
+	item = /obj/item/storage/briefcase/nt_mantis
+	cost = 10
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/cqc/stealthmantisblade
+	name = "H.E.P.H.A.E.S.T.U.S. Mantis Blade (stealth)"
+	desc = "One H.E.P.H.A.E.S.T.U.S. Mantis blade implant able to be retracted inside your body at will for easy storage and concealing. Two blades can be used at once."
+	item = /obj/item/autosurgeon/nt_mantis/stealth
+	cost = 6
+	required_ert_uplink = list(NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/cqc/cqc
+	name = "CQC Manual"
+	desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
+	item = /obj/item/book/granter/martial/cqc
+	cost = 13
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/cqc/teleshield
+	name = "Telescopic Shield"
+	desc = "A foldable shield that blocks attacks when active but can break."
+	item = /obj/item/shield/riot/tele
+	cost = 3
+	required_ert_uplink = list(NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/cqc/stunbaton
+	name = "Stun Baton"
+	desc = "A robust charged baton that will swiftly take down most criminals."
+	item = /obj/item/melee/baton/loaded
+	cost = 1
+	required_ert_uplink = list(NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/cqc/telebaton
+	name = "Telescopic Baton"
+	desc = "A foldable baton that doesn't run on charge. Takes more hits to down, but swings faster."
+	item = /obj/item/melee/classic_baton/telescopic
+	cost = 1 //Engies and medics can buy these, like normal ERTs!
+
+/datum/uplink_item/nt/cqc/flash
+	name = "Flash"
+	desc = "A bright flashing device that can disable silicons and blind humans."
+	item = /obj/item/assembly/flash
+	cost = 1
+
+/datum/uplink_item/nt/support
+	category = "Support"
+
+/datum/uplink_item/nt/support/c4
+	name = "Composition C-4"
+	desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, disrupt equipment, or connect \
+			an assembly to it in order to alter the way it detonates. It can be attached to almost all objects and has a modifiable timer with a \
+			minimum setting of 10 seconds."
+	item = /obj/item/grenade/plastic/c4
+	cost = 1
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/x4
+	name = "Composition X-4"
+	desc = "A variety of plastic explosive with a stronger explosive charge. It is both safer to use and is capable of breaching even the most secure areas."
+	item = /obj/item/grenade/plastic/x4
+	cost = 3
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/medkit
+	name = "Medic Kit"
+	desc = "A station-standard medical kit. Stocked with sutures, regenerative mesh, medical gauze, \
+			a health analyzer, and an epinephrine pen."
+	item = /obj/item/storage/firstaid/regular
+	cost = 1
+
+/datum/uplink_item/nt/support/advmedkit
+	name = "Tactical Combat Medic Kit"
+	desc = "Included is a combat stimulant injector \
+			for rapid healing, a medical night vision HUD for quick identification of injured personnel, \
+			and other supplies helpful for a field medic."
+	item = /obj/item/storage/firstaid/tactical
+	cost = 4
+	required_ert_uplink = list(NT_ERT_MEDIC, NT_ERT_COMMANDER) //Only real medics get the good stuff
+
+/datum/uplink_item/nt/support/healermech
+	name = "Healer Nanite Serum"
+	desc = "An auto-injector full of reverse-engineered syndicate healing nanites. These will quickly repair most damage on a patient, pre-filled with fifteen doses."
+	item = /obj/item/reagent_containers/autoinjector/combat/healermech
+	cost = 8
+	required_ert_uplink = list(NT_ERT_MEDIC, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/resurrectormech
+	name = "Resurrector Nanite Serum"
+	desc = "A single-use superdose of nanites capable of fully repairing a body, including replacing lost organs and limbs and restoring blood volume. Will do nothing to a living person."
+	item = /obj/item/reagent_containers/autoinjector/medipen/resurrector
+	cost = 8
+	required_ert_uplink = list(NT_ERT_MEDIC, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/medbeam
+	name = "Medbeam Gun"
+	desc = "A wonder of Nanotrasen engineering, the Medbeam gun, or Medi-Gun enables a medic to keep his fellow \
+			officers in the fight, even while under fire. Don't cross the streams!"
+	item = /obj/item/gun/medbeam
+	cost = 7
+	limited_stock = 1
+
+/datum/uplink_item/nt/support/toolbelt
+	name = "Full Toolbelt"
+	desc = "Comes pre-stocked with every engineering tool you'll ever need."
+	item = /obj/item/storage/belt/utility/full/engi
+	cost = 1
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/advanced_toolbelt
+	name = "Advanced toolbelt"
+	desc = "A toolbelt filled with advanced tools, for when you need to work quickly."
+	item = /obj/item/storage/belt/utility/chief/full/ert
+	cost = 5
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/rcd
+	name = "Rapid Construction Device"
+	desc = "Standard RCD that can repair or destroy structures very quickly. Holds up to 160 matter units."
+	item = /obj/item/construction/rcd/loaded
+	cost = 2
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/combatrcd
+	name = "Industrial RCD"
+	desc = "Heavy combat RCD that holds up to 500 matter units."
+	item = /obj/item/construction/rcd/combat
+	cost = 5
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/advancedrcd
+	name = "Advanced RCD"
+	desc = "An RCD with improved capacity, although slightly less than an industrial RCD. However, it can construct and deconstruct from range."
+	item = /obj/item/construction/rcd/arcd
+	cost = 10
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/rcdammo
+	name = "Compressed Matter Cartridge"
+	desc = "Highly compressed matter that restores 160 matter units on an RCD."
+	item = /obj/item/rcd_ammo
+	cost = 1
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/support/foamnades
+	name = "Box of Smart Metal Foam Grenades"
+	desc = "A box of 7 smart metal foam grenades to patch hull breaches with."
+	item = /obj/item/storage/box/smart_metal_foam
+	cost = 1
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/hardsuit
+	category = "Armor & Hardsuits"
+
+/datum/uplink_item/nt/hardsuit/armor
+	name = "Armor Vest"
+	desc = "A standard issue security armor vest."
+	item = /obj/item/clothing/suit/armor/vest
+	cost = 1
+
+/datum/uplink_item/nt/hardsuit/helmet
+	name = "Helmet"
+	desc = "A standard issue security helmet. Can have a seclite attached."
+	item = /obj/item/clothing/head/helmet
+	cost = 1
+
+/datum/uplink_item/nt/hardsuit/bulletvest
+	name = "Bulletproof Armor Vest"
+	desc = "An armor vest that is extremely robust against ballistics but weak to everything else."
+	item = /obj/item/clothing/suit/armor/bulletproof
+	cost = 1
+
+/datum/uplink_item/nt/hardsuit/bullethelmet
+	name = "Bulletproof Helmet"
+	desc = "A helmet that is extremely robust against ballistics but weak to everything else."
+	item = /obj/item/clothing/head/helmet
+	cost = 1
+
+/datum/uplink_item/nt/hardsuit/riotvest
+	name = "Riot Suit"
+	desc = "A bulky suit that protects you against melee attacks but not much else."
+	item = /obj/item/clothing/suit/armor/riot
+	cost = 1
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/hardsuit/riothelmet
+	name = "Riot Helmet"
+	desc = "A helmet that protects you against melee attacks but not much else."
+	item = /obj/item/clothing/head/helmet/riot
+	cost = 1
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear
+	category = "Other Gear"
+
+/datum/uplink_item/nt/gear/secbelt
+	name = "Stocked Security Belt"
+	desc = "Standard issue security gear, all in a stylish belt."
+	item = /obj/item/storage/belt/security/full
+	cost = 2
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear/flashbangs
+	name = "Box of Flashbangs"
+	desc = "A box of 7 flashbangs to make the crew hate you."
+	item = /obj/item/storage/box/flashbangs
+	cost = 2
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear/handcuffs
+	name = "Box of Handcuffs"
+	desc = "A box of 7 pairs of handcuffs to keep prisoners in line."
+	item = /obj/item/storage/box/handcuffs
+	cost = 1
+	required_ert_uplink = list(NT_ERT_TROOPER, NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear/bowman
+	name = "Bowman Headset"
+	desc = "A headset specially crafted to protect your ears from any damage, including flashbangs."
+	item = /obj/item/radio/headset/headset_cent/bowman
+	cost = 1
+
+/datum/uplink_item/nt/gear/sechud
+	name = "Security HUDglasses"
+	desc = "A pair of sunglasses fitted with a security HUD."
+	item = /obj/item/clothing/glasses/hud/security/sunglasses
+	cost = 1
+	required_ert_uplink = list(NT_ERT_SECURITY_SPECIALIST, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear/medhud
+	name = "Medical HUDglasses"
+	desc = "A pair of sunglasses fitted with a medical HUD."
+	item = /obj/item/clothing/glasses/hud/health/sunglasses
+	cost = 1
+	required_ert_uplink = list(NT_ERT_MEDIC, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear/mesonhud
+	name = "Meson Sunglasses"
+	desc = "A pair of sunglasses fitted with meson technology."
+	item = /obj/item/clothing/glasses/meson/sunglasses
+	cost = 1
+	required_ert_uplink = list(NT_ERT_ENGINEER, NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear/thermalhud
+	name = "Optical Thermal Scanner"
+	desc = "A pair of goggles that provide thermal scanning vision through walls."
+	item = /obj/item/clothing/glasses/thermal
+	cost = 4
+
+/datum/uplink_item/nt/gear/dsmask
+	name = "MK.II SWAT mask"
+	desc = "A strange mask that encrypts your voice so that only others wearing the mask can understand you, \
+			but you won't be able to understand anyone who isn't wearing the mask. \
+			Why would anyone spend this much on a mask?"
+	item = /obj/item/clothing/mask/gas/sechailer/swat/encrypted
+	cost = 10
+
+/datum/uplink_item/nt/gear/ntstamp
+	name = "CentCom Official Stamp"
+	desc = "To let them know you're the real deal."
+	item = /obj/item/stamp/cent
+	cost = 1
+	required_ert_uplink = list(NT_ERT_COMMANDER)
+
+/datum/uplink_item/nt/gear/ntposters
+	name = "Box of Posters"
+	desc = "A box of Nanotrasen-approved posters to boost crew morale."
+	item = /obj/item/storage/box/official_posters
+	cost = 1
+
+/datum/uplink_item/nt/gear/syndiebears
+	name = "Omnizine Gummy Bears"
+	desc = "Omnizine infused gummy bears. Grape flavor. Chew throughly!"
+	item = /obj/item/storage/pill_bottle/gummies/omnizine
+	cost = 1
\ No newline at end of file
diff --git a/modular_dripstation/icons/mob/inhands/melee_lefthand.dmi b/modular_dripstation/icons/mob/inhands/melee_lefthand.dmi
index 9064b91633ec..9c046da1f4d8 100644
Binary files a/modular_dripstation/icons/mob/inhands/melee_lefthand.dmi and b/modular_dripstation/icons/mob/inhands/melee_lefthand.dmi differ
diff --git a/modular_dripstation/icons/mob/inhands/melee_righthand.dmi b/modular_dripstation/icons/mob/inhands/melee_righthand.dmi
index b1f4fccc3ed2..96bd54949150 100644
Binary files a/modular_dripstation/icons/mob/inhands/melee_righthand.dmi and b/modular_dripstation/icons/mob/inhands/melee_righthand.dmi differ
diff --git a/modular_dripstation/icons/obj/bureaucracy.dmi b/modular_dripstation/icons/obj/bureaucracy.dmi
index 303d79ec2f40..a2a927d93990 100644
Binary files a/modular_dripstation/icons/obj/bureaucracy.dmi and b/modular_dripstation/icons/obj/bureaucracy.dmi differ
diff --git a/modular_dripstation/icons/obj/clothing/hats.dmi b/modular_dripstation/icons/obj/clothing/hats.dmi
index b8dd08f79eb2..24c744652950 100644
Binary files a/modular_dripstation/icons/obj/clothing/hats.dmi and b/modular_dripstation/icons/obj/clothing/hats.dmi differ
diff --git a/modular_dripstation/icons/obj/clothing/suits.dmi b/modular_dripstation/icons/obj/clothing/suits.dmi
index cd1ad95775b1..ecb3cca1b135 100644
Binary files a/modular_dripstation/icons/obj/clothing/suits.dmi and b/modular_dripstation/icons/obj/clothing/suits.dmi differ
diff --git a/modular_dripstation/icons/obj/weapons/blades.dmi b/modular_dripstation/icons/obj/weapons/blades.dmi
index b777a1f97c96..152b9d2bcef5 100644
Binary files a/modular_dripstation/icons/obj/weapons/blades.dmi and b/modular_dripstation/icons/obj/weapons/blades.dmi differ
diff --git a/modular_dripstation/icons/obj/weapons/misc.dmi b/modular_dripstation/icons/obj/weapons/misc.dmi
index b94a1247fec0..d2bddfb4688b 100644
Binary files a/modular_dripstation/icons/obj/weapons/misc.dmi and b/modular_dripstation/icons/obj/weapons/misc.dmi differ
diff --git a/modular_dripstation/includes.dm b/modular_dripstation/includes.dm
index 10796af827ca..07e4aa469080 100644
--- a/modular_dripstation/includes.dm
+++ b/modular_dripstation/includes.dm
@@ -421,6 +421,7 @@
 #include "code\modules\surgery\surgery_step.dm"
 #include "code\modules\surgery\organs\autosurgeon.dm"
 #include "code\modules\surgery\tools.dm"
+#include "code\modules\uplink\ntia_uplink.dm"
 #include "code\modules\uplink\uplink_devices.dm"
 #include "code\modules\uplink\uplink_items.dm"
 #include "code\modules\vending\_vending.dm"
diff --git a/yogstation/code/modules/uplink/uplink_item.dm b/yogstation/code/modules/uplink/uplink_item.dm
index 3cd64748de4d..7f8d2e6d5579 100644
--- a/yogstation/code/modules/uplink/uplink_item.dm
+++ b/yogstation/code/modules/uplink/uplink_item.dm
@@ -59,6 +59,7 @@
 	exclude_modes = list(/datum/game_mode/nuclear)
 
 
+/* Dripstation edit
 /datum/uplink_item/device_tools/arm
 	name = "Additional Arm"
 	desc = "An additional arm, automatically added to your body upon purchase, allows you to use more items at once"
@@ -72,6 +73,7 @@
 	var/limbs = user.held_items.len
 	user.change_number_of_hands(limbs+1)
 	to_chat(user, "You feel more dexterous")
+*/
 
 /datum/uplink_item/explosives/trap_disk
 	name = "Syndicate Trapped Disk"