diff --git a/code/datums/uplink/devices and tools.dm b/code/datums/uplink/devices and tools.dm
index 2e8f06d62c5..c49011d12f9 100644
--- a/code/datums/uplink/devices and tools.dm	
+++ b/code/datums/uplink/devices and tools.dm	
@@ -13,7 +13,7 @@
 	name = "Operations Funding"
 	item_cost = 2
 	path = /obj/item/weapon/storage/secure/briefcase/money
-	desc = "A briefcase with 10,000 untraceable thalers for funding your sneaky activities."
+	desc = "A briefcase with 10,000 untraceable credits for funding your sneaky activities."
 
 /datum/uplink_item/item/tools/clerical
 	name = "Morphic Clerical Kit"
diff --git a/code/datums/uplink/highly visible and dangerous weapons.dm b/code/datums/uplink/highly visible and dangerous weapons.dm
index 2858cebad44..0abcaf91eed 100644
--- a/code/datums/uplink/highly visible and dangerous weapons.dm	
+++ b/code/datums/uplink/highly visible and dangerous weapons.dm	
@@ -23,6 +23,11 @@
 	name = "Energy Sword"
 	item_cost = 8
 	path = /obj/item/weapon/melee/energy/sword
+	
+/datum/uplink_item/item/visible_weapons/hammer
+	name = "Kneebreaker Hammer"
+	item_cost = 10
+	path = /obj/item/weapon/melee/hammer
 
 /datum/uplink_item/item/visible_weapons/g9mm
 	name = "Silenced 9mm"
diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm
index d930508125d..3c832303d96 100644
--- a/code/game/antagonist/outsider/raider.dm
+++ b/code/game/antagonist/outsider/raider.dm
@@ -65,6 +65,7 @@ var/datum/antagonist/raider/raiders
 
 	var/list/raider_guns = list(
 		/obj/item/weapon/gun/energy/rifle/laser,
+		/obj/item/weapon/gun/energy/rifle/laser/xray,
 		/obj/item/weapon/gun/energy/retro,
 		/obj/item/weapon/gun/energy/xray,
 		/obj/item/weapon/gun/energy/mindflayer,
@@ -81,6 +82,7 @@ var/datum/antagonist/raider/raiders
 		/obj/item/weapon/gun/projectile/automatic/wt550,
 		/obj/item/weapon/gun/projectile/automatic/rifle/sts35,
 		/obj/item/weapon/gun/projectile/automatic/tommygun,
+		/obj/item/weapon/gun/projectile/automatic/x9,
 		/obj/item/weapon/gun/projectile/silenced,
 		/obj/item/weapon/gun/projectile/shotgun/pump,
 		/obj/item/weapon/gun/projectile/shotgun/pump/combat,
@@ -91,6 +93,7 @@ var/datum/antagonist/raider/raiders
 		/obj/item/weapon/gun/projectile/colt,
 		/obj/item/weapon/gun/projectile/sec,
 		/obj/item/weapon/gun/projectile/pistol,
+		/obj/item/weapon/gun/projectile/deagle,
 		/obj/item/weapon/gun/projectile/revolver,
 		/obj/item/weapon/gun/projectile/revolver/deckard,
 		/obj/item/weapon/gun/projectile/revolver/derringer,
diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 8c5e7725c6d..1edb61deb61 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -9,10 +9,9 @@ VOX HEIST ROUNDTYPE
 	required_players = 15
 	required_enemies = 4
 	round_description = "An unidentified bluespace signature has slipped past the Icarus and is approaching the station!"
-	extended_round_description = "The Company's majority control of phoron in Nyx has marked the \
-		station to be a highly valuable target for many competing organizations and individuals. Being a \
-		colony of sizable population and considerable wealth causes it to often be the target of various \
-		attempts of robbery, fraud and other malicious actions."
+	extended_round_description = "The galaxy is a place full of dangers, even the inner colonies are not free of such scourges. \
+	Raiders and pirates are a well-know threat in the inhabited space, and places such as space stations are easy targets \
+	for their greedy plans."
 	end_on_antag_death = 1
 	antag_tags = list(MODE_RAIDER)
 
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index ff3290db431..69c112ab5da 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -7,10 +7,9 @@ var/list/nuke_disks = list()
 /datum/game_mode/nuclear
 	name = "Mercenary"
 	round_description = "A mercenary strike force is approaching the station!"
-	extended_round_description = "The Company's majority control of phoron in Nyx has marked the \
-		station to be a highly valuable target for many competing organizations and individuals. Being a \
-		colony of sizable population and considerable wealth causes it to often be the target of various \
-		attempts of robbery, fraud and other malicious actions."
+	extended_round_description = "NanoTrasen's wealth and success created several enemies over the years \
+		and many seek to undermine them using illegal ways. Their crown jewel research stations are not safe from those \
+		malicious activities."
 	config_tag = "mercenary"
 	required_players = 15
 	required_enemies = 1
@@ -23,7 +22,8 @@ var/list/nuke_disks = list()
 //delete all nuke disks not on a station zlevel
 /datum/game_mode/nuclear/proc/check_nuke_disks()
 	for(var/obj/item/weapon/disk/nuclear/N in nuke_disks)
-		if(isNotStationLevel(N.z)) qdel(N)
+		var/turf/T = get_turf(N)
+		if(isNotStationLevel(T.z)) qdel(N)
 
 //checks if L has a nuke disk on their person
 /datum/game_mode/nuclear/proc/check_mob(mob/living/L)
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 9a67cdc94a8..e7c5ae506b3 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -1,7 +1,7 @@
 /datum/game_mode/traitor
 	name = "traitor"
 	round_description = "There is a foreign agent or traitor on the station. Do not let the traitor succeed!"
-	extended_round_description = "The Company's monopolistic control over the phoron supplies of Nyx has marked the \
+	extended_round_description = "The Company's monopolistic control over the phoron supplies of Tau Ceti has marked the \
 		station to be a highly valuable target for many competing organizations and individuals. The varied pasts \
 		and experiences of your coworkers have left them susceptible to the vices and temptations of humanity. \
 		Is the station the safe self-contained workplace you once thought it was, or has it become a playground \
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 5c3992c6e4b..ccbae49934c 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -333,7 +333,7 @@ var/global/datum/controller/occupations/job_master
 						else
 							permitted = 1
 
-						if(G.whitelisted && !is_alien_whitelisted(H, G.whitelisted))
+						if(G.whitelisted && (G.whitelisted != H.species.name || !is_alien_whitelisted(H, G.whitelisted)))
 							permitted = 0
 
 						if(!permitted)
diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm
index d2109ec5f19..041507153ae 100644
--- a/code/game/machinery/supplybeacon.dm
+++ b/code/game/machinery/supplybeacon.dm
@@ -2,7 +2,7 @@
 /obj/item/supply_beacon
 	name = "inactive supply beacon"
 	icon = 'icons/obj/supplybeacon.dmi'
-	desc = "An inactive, hacked supply beacon stamped with the Nyx Rapid Fabrication logo. Good for one (1) ballistic supply pod shipment."
+	desc = "An inactive, hacked supply beacon stamped with the Tau Ceti Rapid Fabrication logo. Good for one (1) ballistic supply pod shipment."
 	icon_state = "beacon"
 	var/deploy_path = /obj/machinery/power/supply_beacon
 	var/deploy_time = 30
@@ -114,6 +114,6 @@
 		var/drop_x = src.x-2
 		var/drop_y = src.y-2
 		var/drop_z = src.z
-		command_announcement.Announce("Nyx Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage")
+		command_announcement.Announce("Tau Ceti Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage")
 		spawn(rand(100,300))
 			new /datum/random_map/droppod/supply(null, drop_x, drop_y, drop_z, supplied_drop = drop_type) // Splat.
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 5d269b3d186..91863be8ad4 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -496,10 +496,12 @@
 				/obj/item/weapon/melee/chainsword,\
 				/obj/item/weapon/melee/baton/stunrod,\
 				/obj/item/weapon/material/harpoon,\
-				/obj/item/weapon/material/scythe,\
 				/obj/item/weapon/material/twohanded/spear/plasteel,\
 				/obj/item/weapon/material/sword/trench,\
-				/obj/item/weapon/material/sword/rapier)
+				/obj/item/weapon/material/sword/rapier,\
+				/obj/item/weapon/melee/hammer,\
+				/obj/item/weapon/material/twohanded/fireaxe,\
+				/obj/item/weapon/melee/classic_baton)
 
 /obj/random/coin
 	name = "random coin"
@@ -535,7 +537,8 @@
 				/obj/item/weapon/gun/energy/toxgun,\
 				/obj/item/weapon/gun/energy/vaurca/gatlinglaser,\
 				/obj/item/weapon/gun/energy/vaurca/blaster,\
-				/obj/item/weapon/gun/energy/crossbow/largecrossbow)
+				/obj/item/weapon/gun/energy/crossbow/largecrossbow,\
+				/obj/item/weapon/gun/energy/rifle/laser/xray)
 
 /obj/random/colored_jumpsuit
 	name = "random colored jumpsuit"
diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm
index 9f3486dd33b..56041b074b7 100644
--- a/code/modules/client/preference_setup/general/04_equipment.dm
+++ b/code/modules/client/preference_setup/general/04_equipment.dm
@@ -94,15 +94,15 @@
 	return pref.gender == MALE ? socks_m : socks_f
 
 /datum/category_item/player_setup_item/general/equipment/proc/valid_gear_choices(var/max_cost)
-	var/list/valid_gear_choices = list()
+	. = list()
+	var/mob/preference_mob = preference_mob()
 	for(var/gear_name in gear_datums)
 		var/datum/gear/G = gear_datums[gear_name]
-		if(G.whitelisted && !is_alien_whitelisted(preference_mob(), G.whitelisted))
+		if(G.whitelisted && !is_alien_whitelisted(preference_mob, G.whitelisted))
 			continue
 		if(max_cost && G.cost > max_cost)
 			continue
-		valid_gear_choices += gear_name
-	return valid_gear_choices
+		. += gear_name
 
 /datum/category_item/player_setup_item/general/equipment/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["change_underwear"])
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 9468e4c01ea..8ef5b61b750 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -184,7 +184,7 @@
 			msg += "<span class='warning'>[T.He] [T.is] twitching ever so slightly.</span>\n"
 
 	//splints
-	for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
+	for(var/organ in list("l_leg","r_leg","l_arm","r_arm","l_hand","r_hand","r_foot","l_foot"))
 		var/obj/item/organ/external/o = get_organ(organ)
 		if(o && o.status & ORGAN_SPLINTED)
 			msg += "<span class='warning'>[T.He] [T.has] a splint on [T.his] [o.name]!</span>\n"
diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm
index 629706272fa..3f711b0604c 100644
--- a/code/modules/mob/living/carbon/human/stripping.dm
+++ b/code/modules/mob/living/carbon/human/stripping.dm
@@ -123,7 +123,7 @@
 
 	if(can_reach_splints)
 		var/removed_splint
-		for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
+		for(var/organ in list("l_leg","r_leg","l_arm","r_arm","l_hand","r_hand","r_foot","l_foot"))
 			var/obj/item/organ/external/o = get_organ(organ)
 			if (o && o.status & ORGAN_SPLINTED)
 				var/obj/item/W = new /obj/item/stack/medical/splint(get_turf(src), 1)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 106a5fc6f2f..432d81985ad 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -483,6 +483,14 @@ datum/design/circuit/telepad
 	build_path = /obj/item/weapon/implantcase/freedom
 	sort_string = "MFAAB"
 
+/datum/design/item/implant/loyalty
+	name = "loyalty"
+	id = "implant_loyal"
+	req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
+	build_path = /obj/item/weapon/implantcase/loyalty
+	sort_string = "MFAAC"
+
 /datum/design/item/weapon/AssembleDesignName()
 	..()
 	name = "Weapon prototype ([item_name])"
@@ -508,14 +516,6 @@ datum/design/circuit/telepad
 	build_path = /obj/item/weapon/gun/energy/gun/nuclear
 	sort_string = "TAAAB"
 
-/datum/design/item/weapon/lasercannon
-	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
-	id = "lasercannon"
-	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, "diamond" = 2000)
-	build_path = /obj/item/weapon/gun/energy/lasercannon
-	sort_string = "TAAAC"
-
 /datum/design/item/weapon/phoronpistol
 	id = "ppistol"
 	req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
@@ -589,6 +589,121 @@ datum/design/circuit/telepad
 	build_path = /obj/item/weapon/gun/energy/floragun
 	sort_string = "TBAAA"
 
+datum/design/item/weapon/eglaive
+	id = "eglaive"
+	name = "energy glaive"
+	desc = "A Li'idra designed hardlight glaive reverse-engineered from schematics found amongst raider wreckages."
+	req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4,TECH_POWER = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 18750, "phoron" = 3000, "silver" = 7500)
+	build_path = /obj/item/weapon/melee/energy/glaive
+	sort_string = "TVAAA"
+
+datum/design/item/weapon/gatlinglaser
+	id = "gatlinglaser"
+	name = "gatling laser"
+	desc = "A higly sophisticated rapid-fire laser weapon."
+	req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 5, TECH_MATERIAL = 6, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 18750, "glass" = 7500, "phoron" = 7500, "silver" = 7500, "diamond" = 3000)
+	build_path = /obj/item/weapon/gun/energy/vaurca/gatlinglaser
+	sort_string = "TVBAA"
+
+datum/design/item/weapon/railgun
+	id = "railgun"
+	name = "railgun"
+	desc = "An advanced rifle that magnetically propels hyperdense rods at breakneck speeds to devastating effect."
+	req_tech = list(TECH_COMBAT = 8, TECH_PHORON = 2, TECH_MATERIAL = 7, TECH_MAGNET = 4, TECH_POWER = 5, TECH_ILLEGAL = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 75000, "glass" = 18750, "phoron" = 11250, "gold" = 7500, "silver" = 7500)
+	build_path = /obj/item/weapon/gun/projectile/automatic/railgun
+	sort_string = "TVCAA"
+
+datum/design/item/weapon/zorablaster
+	id = "zorablaster"
+	name = "zo'ra blaster"
+	desc = "A personal defense weapon reverse-engineered from schematics aboard Titan Prime."
+	req_tech = list(TECH_COMBAT = 2, TECH_PHORON = 4, TECH_MATERIAL = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, "glass" = 2000, "phoron" = 6000)
+	build_path = /obj/item/weapon/gun/energy/vaurca/blaster
+	sort_string = "TVDAA"
+
+datum/design/item/weapon/lawgiver
+	name = "Lawgiver"
+	desc = "A highly advanced firearm for the modern police force. It has multiple voice-activated firing modes."
+	id = "lawgiver"
+	req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_BLUESPACE = 5, TECH_MATERIAL = 7)
+	build_type = PROTOLATHE
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1000, "uranium" = 1000, "phoron" = 1000, "diamond" = 3000)
+	build_path = /obj/item/weapon/gun/energy/lawgiver
+	sort_string = "TVEAA"
+
+datum/design/item/forcegloves
+ 	name = "Force Gloves"
+ 	desc = "These gloves bend gravity and bluespace, dampening inertia and augmenting the wearer's melee capabilities."
+ 	id = "forcegloves"
+ 	req_tech = list(TECH_COMBAT = 3, TECH_BLUESPACE = 3, TECH_ENGINEERING = 3, TECH_MAGNET = 3)
+ 	build_type = PROTOLATHE
+ 	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+ 	build_path = /obj/item/clothing/gloves/force/basic
+ 	category = "Weapons"
+ 	sort_string = "TVFAA"
+
+datum/design/item/ebow
+ 	name = "Energy Crossbow"
+ 	desc = "A weapon favoured by infiltration teams."
+ 	id = "ebow"
+ 	req_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 3, TECH_MATERIAL = 5, TECH_ILLEGAL = 3, TECH_BIO = 4)
+ 	build_type = PROTOLATHE
+ 	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "uranium" = 1000, "silver" = 1000)
+ 	build_path = /obj/item/weapon/gun/energy/crossbow/largecrossbow
+ 	category = "Weapons"
+ 	sort_string = "TVGAA"
+
+datum/design/item/eshield
+ 	name = "Energy Shield"
+ 	desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
+ 	id = "eshield"
+ 	req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4, TECH_ILLEGAL = 4)
+ 	build_type = PROTOLATHE
+ 	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 3000, "phoron" = 1000)
+ 	build_path = /obj/item/weapon/shield/energy
+ 	category = "Weapons"
+ 	sort_string = "TVHAA"
+
+datum/design/item/weapon/lasshotgun
+	id = "laser_shotgun"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1500, "uranium" = 500, "diamond" = 500)
+	build_path = /obj/item/weapon/gun/energy/laser/shotgun
+	sort_string = "TVIAA"
+
+datum/design/item/weapon/lasercannon
+	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
+	id = "lasercannon"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, "diamond" = 2000)
+	build_path = /obj/item/weapon/gun/energy/rifle/laser/heavy
+	sort_string = "TVJAA"
+
+datum/design/item/weapon/decloner
+	id = "decloner"
+	req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
+	materials = list("gold" = 5000,"uranium" = 10000)
+	build_path = /obj/item/weapon/gun/energy/decloner
+	sort_string = "TVKAA"
+
+datum/design/item/weapon/mousegun
+	id = "mousegun"
+	req_tech = list(TECH_MATERIAL = 1, TECH_BIO = 4, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "uranium" = 500)
+	build_path = /obj/item/weapon/gun/energy/mousegun
+	sort_string = "TVLAA"
+
+datum/design/item/weapon/beegun
+	id = "beegun"
+	req_tech = list(TECH_MATERIAL = 6, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 6, TECH_MAGNET = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "silver" = 500, "diamond" = 3000)
+	build_path = /obj/item/weapon/gun/energy/beegun
+	sort_string = "TVMAA"
+
 /datum/design/item/stock_part/subspace_ansible
 	id = "s-ansible"
 	req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
@@ -638,15 +753,24 @@ datum/design/circuit/telepad
 	build_path = /obj/item/weapon/stock_parts/subspace/transmitter
 	sort_string = "UAAAG"
 
-/datum/design/item/light_replacer
-	name = "Light replacer"
-	desc = "A device to automatically replace lights. Refill with working lightbulbs."
-	id = "light_replacer"
+datum/design/item/advanced_light_replacer
+	name = "Advanced Light Replacer"
+	desc = "A specialised light replacer which stores more lights, refills faster from boxes, and sucks up broken bulbs."
+	id = "advanced_light_replacer"
 	req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 1500, "silver" = 150, "glass" = 3000)
-	build_path = /obj/item/device/lightreplacer
+	materials = list(DEFAULT_WALL_MATERIAL = 500)
+	build_path =/obj/item/device/lightreplacer/advanced
 	sort_string = "VAAAH"
 
+datum/design/item/experimental_welder
+	name = "Experimental Welding Tool"
+	desc = "A scientifically-enhanced welding tool that uses fuel-producing microbes to gradually replenish its fuel supply"
+	id = "experimental_welder"
+	req_tech = list(ENGINEERING = 4, TECH_MATERIAL = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 500)
+	build_path =/obj/item/weapon/weldingtool/experimental
+	sort_string = "VABAJ"
+
 /datum/design/item/paicard
 	name = "'pAI', personal artificial intelligence device"
 	id = "paicard"
@@ -1490,32 +1614,6 @@ CIRCUITS BELOW
 	build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster
 	sort_string = "PAAAF"
 
-datum/design/item/weapon/lasshotgun
-	id = "laser_shotgun"
-	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1500, "uranium" = 500, "diamond" = 500)
-	build_path = /obj/item/weapon/gun/energy/laser/shotgun
-
-datum/design/item/weapon/stunrevolver
-	id = "stunrevolver"
-	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000)
-	build_path = /obj/item/weapon/gun/energy/stunrevolver
-
-datum/design/item/weapon/lasercannon
-	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
-	id = "lasercannon"
-	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, "diamond" = 2000)
-	build_path = /obj/item/weapon/gun/energy/rifle/laser/heavy
-
-datum/design/item/weapon/decloner
-	id = "decloner"
-	req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
-	materials = list("gold" = 5000,"uranium" = 10000)
-	build_path = /obj/item/weapon/gun/energy/decloner
-
-
 /datum/design/circuit/tcom/receiver
 	name = "subspace receiver"
 	id = "tcom-receiver"
@@ -1567,24 +1665,6 @@ datum/design/item/weapon/decloner
 	build_path = /obj/item/weapon/circuitboard/aicore
 	sort_string = "XAAAA"
 
-datum/design/item/weapon/mousegun
-	id = "mousegun"
-	req_tech = list(TECH_MATERIAL = 1, TECH_BIO = 4, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "uranium" = 500)
-	build_path = /obj/item/weapon/gun/energy/mousegun
-
-datum/design/item/weapon/beegun
-	id = "beegun"
-	req_tech = list(TECH_MATERIAL = 6, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 6, TECH_MAGNET = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "silver" = 500, "diamond" = 3000)
-	build_path = /obj/item/weapon/gun/energy/beegun
-
-datum/design/item/weapon/large_grenade
-	id = "large_Grenade"
-	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000)
-	build_path = /obj/item/weapon/grenade/chem_grenade/large
-
 /datum/design/aimodule
 	build_type = IMPRINTER
 	materials = list("glass" = 2000, "gold" = 100)
@@ -1616,79 +1696,6 @@ datum/design/item/weapon/large_grenade
 	build_path = /obj/item/weapon/aiModule/protectStation
 	sort_string = "XABAC"
 
-datum/design/item/weapon/eglaive
-	id = "eglaive"
-	name = "energy glaive"
-	desc = "A Li'idra designed hardlight glaive reverse-engineered from schematics found amongst raider wreckages."
-	req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4,TECH_POWER = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 18750, "phoron" = 3000, "silver" = 7500)
-	build_path = /obj/item/weapon/melee/energy/glaive
-
-datum/design/item/weapon/gatlinglaser
-	id = "gatlinglaser"
-	name = "gatling laser"
-	desc = "A higly sophisticated rapid-fire laser weapon."
-	req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 5, TECH_MATERIAL = 6, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 18750, "glass" = 7500, "phoron" = 7500, "silver" = 7500, "diamond" = 3000)
-	build_path = /obj/item/weapon/gun/energy/vaurca/gatlinglaser
-
-datum/design/item/weapon/railgun
-	id = "railgun"
-	name = "railgun"
-	desc = "An advanced rifle that magnetically propels hyperdense rods at breakneck speeds to devastating effect."
-	req_tech = list(TECH_COMBAT = 8, TECH_PHORON = 2, TECH_MATERIAL = 7, TECH_MAGNET = 4, TECH_POWER = 5, TECH_ILLEGAL = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 75000, "glass" = 18750, "phoron" = 11250, "gold" = 7500, "silver" = 7500)
-	build_path = /obj/item/weapon/gun/projectile/automatic/railgun
-
-datum/design/item/weapon/zorablaster
-	id = "zorablaster"
-	name = "zo'ra blaster"
-	desc = "A personal defense weapon reverse-engineered from schematics aboard Titan Prime."
-	req_tech = list(TECH_COMBAT = 2, TECH_PHORON = 4, TECH_MATERIAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000, "glass" = 2000, "phoron" = 6000)
-	build_path = /obj/item/weapon/gun/energy/vaurca/blaster
-
-datum/design/item/weapon/lawgiver
-	name = "Lawgiver"
-	desc = "A highly advanced firearm for the modern police force. It has multiple voice-activated firing modes."
-	id = "lawgiver"
-	req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_BLUESPACE = 5, TECH_MATERIAL = 7)
-	build_type = PROTOLATHE
-	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1000, "uranium" = 1000, "phoron" = 1000, "diamond" = 3000)
-	build_path = /obj/item/weapon/gun/energy/lawgiver
-
-/*This is all the station gets for producable force gloves. It's a high-risk item and thus considered contraband
-outside of RnD without paperwork with the RD's stamp on it. */
-datum/design/item/forcegloves
- 	name = "Force Gloves"
- 	desc = "These gloves bend gravity and bluespace, dampening inertia and augmenting the wearer's melee capabilities."
- 	id = "forcegloves"
- 	req_tech = list(TECH_COMBAT = 3, TECH_BLUESPACE = 3, TECH_ENGINEERING = 3, TECH_MAGNET = 3)
- 	build_type = PROTOLATHE
- 	materials = list(DEFAULT_WALL_MATERIAL = 4000)
- 	build_path = /obj/item/clothing/gloves/force/basic
- 	category = "Weapons"
-
-datum/design/item/ebow
- 	name = "Energy Crossbow"
- 	desc = "A weapon favoured by infiltration teams."
- 	id = "ebow"
- 	req_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 3, TECH_MATERIAL = 5, TECH_ILLEGAL = 3, TECH_BIO = 4)
- 	build_type = PROTOLATHE
- 	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "uranium" = 1000, "silver" = 1000)
- 	build_path = /obj/item/weapon/gun/energy/crossbow/largecrossbow
- 	category = "Weapons"
-
-datum/design/item/eshield
- 	name = "Energy Shield"
- 	desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
- 	id = "eshield"
- 	req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4, TECH_ILLEGAL = 4)
- 	build_type = PROTOLATHE
- 	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 3000, "phoron" = 1000)
- 	build_path = /obj/item/weapon/shield/energy
- 	category = "Weapons"
-
 /////////////////////////////////////////
 /////////////////Mining//////////////////
 /////////////////////////////////////////
@@ -1866,26 +1873,3 @@ datum/design/item/weapon/mining/AssembleDesignName()
 	id = "cart_captain"
 	build_path = /obj/item/weapon/cartridge/captain
 	sort_string = "VBAAO"
-
-/datum/design/item/implant/loyalty
-	name = "loyalty"
-	id = "implant_loyal"
-	req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
-	build_path = /obj/item/weapon/implantcase/loyalty
-
-datum/design/item/advanced_light_replacer
-	name = "Advanced Light Replacer"
-	desc = "A specialised light replacer which stores more lights, refills faster from boxes, and sucks up broken bulbs."
-	id = "advanced_light_replacer"
-	req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 500)
-	build_path =/obj/item/device/lightreplacer/advanced
-
-datum/design/item/experimental_welder
-	name = "Experimental Welding Tool"
-	desc = "A scientifically-enhanced welding tool that uses fuel-producing microbes to gradually replenish its fuel supply"
-	id = "experimental_welder"
-	req_tech = list(ENGINEERING = 4, TECH_MATERIAL = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 500)
-	build_path =/obj/item/weapon/weldingtool/experimental