diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 76bfabd7587..e4c2aaa07ee 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -53,17 +53,17 @@
 	item_state = "knife"
 	w_class = 3
 	slot_flags = SLOT_BELT
-	
-/obj/item/weapon/material/sword/trench/IsShield()
+
+/obj/item/weapon/material/sword/trench/handle_shield()
 	return 0
-	
+
 /obj/item/weapon/material/sword/sabre
 	name = "sabre"
 	desc = "A sharp curved backsword."
 	icon_state = "sabre"
 	item_state = "katana"
 	slot_flags = SLOT_BELT
-	
+
 /obj/item/weapon/material/sword/axe
 	name = "battle axe"
 	desc = "A one handed battle axe, still a deadly weapon."
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index ba5f53955b9..75a207136c1 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -63,7 +63,7 @@
 	throw_speed = 5
 	throw_range = 10
 	w_class = 5
-	flags = CONDUCT | NOSHIELD | NOBLOODY
+	flags = CONDUCT | NOBLOODY
 	origin_tech = "combat=6;phorontech=4;materials=7;syndicate=4"
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
 	sharp = 1
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 5c1bf12bbef..553ae37ac4f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -690,12 +690,12 @@ var/global/list/robot_modules = list(
 	JC.install()//This install function will setup the actual jetpack which functions
 
 	return
-
+/*
 /obj/item/weapon/robot_module/combat
 	src.modules -= id
 	id = null
 	return ..()
-
+*/
 /obj/item/weapon/robot_module/security/combat
 	name = "combat robot module"
 	channels = list("Security" = 1)
diff --git a/code/modules/organs/organ_alien.dm b/code/modules/organs/organ_alien.dm
index a92f4aa66bf..a248455e16f 100644
--- a/code/modules/organs/organ_alien.dm
+++ b/code/modules/organs/organ_alien.dm
@@ -429,40 +429,3 @@
     icon_state = "tracheae"
 /obj/item/organ/vaurca/tracheae/removed()
 	return */
-
-// Skeleton limbs.
-/obj/item/organ/external/chest/skeleton
-	name = "rib cage"
-
-/obj/item/organ/external/groin/skeleton
-	name = "pelvis"
-	vital = 0
-
-/obj/item/organ/external/arm/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/arm/right/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/leg/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/leg/right/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/foot/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/foot/right/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/hand/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/hand/right/skeleton
-	dislocated = -1
-
-/obj/item/organ/external/head/skeleton
-	name = "skull"
-	dislocated = -1
-	vital = 0
diff --git a/code/modules/organs/subtypes/xenos.dm b/code/modules/organs/subtypes/xenos.dm
index f1049da61ea..c4c9bf35625 100644
--- a/code/modules/organs/subtypes/xenos.dm
+++ b/code/modules/organs/subtypes/xenos.dm
@@ -67,3 +67,40 @@
 		if(H.mind && H.species.get_bodytype() != "Xenomorph")
 			H << "<span class='alium'>You feel a sense of pressure as a vast intelligence meshes with your thoughts...</span>"
 			xenomorphs.add_antagonist_mind(H.mind,1, xenomorphs.faction_role_text, xenomorphs.faction_welcome)
+
+// Skeleton limbs.
+/obj/item/organ/external/chest/skeleton
+	name = "rib cage"
+
+/obj/item/organ/external/groin/skeleton
+	name = "pelvis"
+	vital = 0
+
+/obj/item/organ/external/arm/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/arm/right/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/leg/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/leg/right/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/foot/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/foot/right/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/hand/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/hand/right/skeleton
+	dislocated = -1
+
+/obj/item/organ/external/head/skeleton
+	name = "skull"
+	dislocated = -1
+	vital = 0
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index b485f85371d..4a7c58c90a0 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -134,7 +134,7 @@
 	mag_type = MAGAZINE
 	caliber = "10mm"
 	matter = list(DEFAULT_WALL_MATERIAL = 1500)
-	ammo_type = /obj/item/ammo_casing/a10mm
+	ammo_type = /obj/item/ammo_casing/t40
 	max_ammo = 20
 	multiple_sprites = 1
 
diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm
index 218701797fe..01ef39c96cd 100644
--- a/code/modules/projectiles/guns/energy/rifle.dm
+++ b/code/modules/projectiles/guns/energy/rifle.dm
@@ -25,7 +25,6 @@
 		)
 
     //action button for wielding
-	icon_action_button = "action_blank"
 	action_button_name = "Wield rifle"
 
 /obj/item/weapon/gun/energy/rifle/can_wield()
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 9d295c7dd7d..6a2738a1d00 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -197,7 +197,6 @@
 		list(name="spray", burst=20, burst_delay = 1, move_delay = 5, fire_delay = 30, dispersion = list(0.0, 1.25, 1.5, 1.75, 2.0, 2.25, 2.5, 2.75, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.0, 3.25)),
 		)
 
-	icon_action_button = "action_blank"
 	action_button_name = "Wield gatling laser"
 
 /obj/item/weapon/gun/energy/vaurca/gatlinglaser/can_wield()
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 4812f885cfd..da0184e662b 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -45,8 +45,8 @@
 	slot_flags = SLOT_BELT|SLOT_BACK
 	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/a12mm
-	allowed_magazines = list(/obj/item/ammo_magazine/a12mm)
+	magazine_type = /obj/item/ammo_magazine/a10mm
+	allowed_magazines = list(/obj/item/ammo_magazine/a10mm)
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 
diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm
index 7c8b498429e..a6bc8fa1de4 100644
--- a/code/modules/projectiles/guns/projectile/boltaction.dm
+++ b/code/modules/projectiles/guns/projectile/boltaction.dm
@@ -15,7 +15,6 @@
 	force = 10
 	var/recentpump = 0
 
-	icon_action_button = "action_blank"
 	action_button_name = "Wield rifle"
 
 /obj/item/weapon/gun/projectile/boltaction/can_wield()
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 10273f3828d..0e33e5465a7 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -200,7 +200,6 @@
 
 	var/global/list/ammo_types = list(
 		/obj/item/ammo_casing/a357              = ".357",
-		/obj/item/ammo_casing/a10mm             = "10mm",
 		/obj/item/ammo_casing/shotgun           = "12 gauge",
 		/obj/item/ammo_casing/shotgun           = "12 gauge",
 		/obj/item/ammo_casing/shotgun/pellet    = "12 gauge",
diff --git a/code/modules/projectiles/guns/projectile/svd.dm b/code/modules/projectiles/guns/projectile/svd.dm
index 2930acd2a1f..8cbfc3d719f 100644
--- a/code/modules/projectiles/guns/projectile/svd.dm
+++ b/code/modules/projectiles/guns/projectile/svd.dm
@@ -23,7 +23,6 @@
 	accuracy_wielded = 0
 
 	//action button for wielding
-	icon_action_button = "action_blank"
 	action_button_name = "Wield rifle"
 
 /obj/item/weapon/gun/projectile/dragunov/update_icon()
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index cdcad7d6f22..d20b395b75a 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1470,14 +1470,12 @@ datum/design/item/weapon/lasshotgun
 	materials = list("$metal" = 5000, "$glass" = 1500, "$uranium" = 500, "$diamond" = 500)
 	reliability_base = 76
 	build_path = /obj/item/weapon/gun/energy/laser/shotgun
-	locked = 1
 
 datum/design/item/weapon/stunrevolver
 	id = "stunrevolver"
 	req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2)
 	materials = list("$metal" = 4000)
 	build_path = /obj/item/weapon/gun/energy/stunrevolver
-	locked = 1
 
 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."
@@ -1485,14 +1483,12 @@ datum/design/item/weapon/lasercannon
 	req_tech = list("combat" = 4, "materials" = 3, "powerstorage" = 3)
 	materials = list("$metal" = 10000, "$glass" = 1000, "$diamond" = 2000)
 	build_path = /obj/item/weapon/gun/energy/rifle/laser/heavy
-	locked = 1
 
 datum/design/item/weapon/decloner
 	id = "decloner"
 	req_tech = list("combat" = 8, "materials" = 7, "biotech" = 5, "powerstorage" = 6)
 	materials = list("$gold" = 5000,"$uranium" = 10000)
 	build_path = /obj/item/weapon/gun/energy/decloner
-	locked = 1
 
 
 /datum/design/circuit/tcom/receiver
@@ -1539,7 +1535,7 @@ datum/design/item/weapon/decloner
 	build_path = /obj/item/weapon/circuitboard/ntnet_relay
 	sort_string = "WAAAA"
 // #TODO-MERGE: Add in large crossbow and temperature gun.
-	
+
 /datum/design/circuit/aicore
 	name = "AI core"
 	id = "aicore"
@@ -1648,7 +1644,6 @@ datum/design/item/forcegloves
  	build_type = PROTOLATHE
  	materials = list("$metal" = 4000)
  	build_path = "/obj/item/clothing/gloves/force/basic"
- 	locked = 1
  	category = "Weapons"
 
 /////////////////////////////////////////