Fixes

code/datums/uplink_item.dm

@@ -521,7 +521,7 @@ var/list/uplink_items = list()
 /datum/uplink_item/device_tools/cipherkey
 	name = "Syndicate Encryption Key"
 	desc = "A key, that when inserted into a radio headset, allows you to listen to all station department channels as well as talk on an encrypted Syndicate channel."
-	item = /obj/item/device/encryptionkey/syndicate/hacked
+	item = /obj/item/device/encryptionkey/syndicate
 	cost = 5
 
 /datum/uplink_item/device_tools/hacked_module

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -21,13 +21,6 @@
 	origin_tech = "syndicate=3"
 	syndie = 1 //Signifies that it de-crypts Syndicate transmissions
 
-/obj/item/device/encryptionkey/syndicate/hacked
-	name = "Standard Encryption Key"
-	desc = "An encryption key for a radio headset. Has no special codes in it. Looks more sophisticated than usual."
-	channels = list("Command" = 0, "Security" = 0, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0, "Syndicate" = 1)
-	origin_tech = "syndicate=3"
-	syndie = 1
-
 /obj/item/device/encryptionkey/binary
 	name = "binary translator key"
 	desc = "An encryption key for a radio headset. To access the binary channel, use :b."

code/game/turfs/simulated/walls_reinforced.dm

@@ -13,6 +13,7 @@
 	var/d_state = 0
 
 /turf/simulated/wall/r_wall/attack_hand(mob/user as mob)
+	user.changeNext_move(CLICK_CD_MELEE)
 	if (HULK in user.mutations)
 		if (prob(10) || rotting)
 			usr << text("\blue You smash through the wall.")
@@ -34,7 +35,7 @@
 
 
 /turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob, params)
-
+	user.changeNext_move(CLICK_CD_MELEE)
 	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 		user << "<span class='warning'>You don't have the dexterity to do this!</span>"
 		return
@@ -286,7 +287,7 @@
 	else if( istype(W,/obj/item/apc_frame) )
 		var/obj/item/apc_frame/AH = W
 		AH.try_build(src)
-		
+
 	else if(istype(W,/obj/item/newscaster_frame))
 		var/obj/item/newscaster_frame/AH = W
 		AH.try_build(src)

code/modules/research/designs/mechfabricator_designs.dm

@@ -849,7 +849,8 @@
 	build_type = MECHFAB
 	req_tech = list("combat" = 4, "syndicate" = 3)
 	build_path = /obj/item/borg/upgrade/syndicate
-	category = "Cyborg Upgrade Modules"
+	materials = list("$metal"=10000,"$glass"=15000,"$diamond" = 10000)
+	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
 
 /datum/design/borg_upgrade_jetpack

code/modules/research/designs/medical_designs.dm

@@ -75,6 +75,7 @@
 	req_tech = list("programming" = 2, "biotech" = 3)
 	build_type = PROTOLATHE | MECHFAB
 	materials = list("$metal" = 1000, "$glass" = 500)
+	construction_time = 75
 	reliability_base = 76
 	build_path = /obj/item/device/mmi
 	category = list("Misc","Medical")
@@ -107,6 +108,7 @@
 	req_tech = list("programming" = 2, "biotech" = 4)
 	build_type = PROTOLATHE | MECHFAB
 	materials = list("$metal" = 1200, "$glass" = 500)
+	construction_time = 75
 	reliability_base = 74
 	build_path = /obj/item/device/mmi/radio_enabled
 	category = list("Misc","Medical")
@@ -139,6 +141,7 @@
 	req_tech = list("magnets" = 3, "combat" = 2)
 	build_type = MECHFAB
 	materials = list("$metal" = 750, "$glass" = 750)
+	construction_time = 100
 	reliability_base = 76
 	build_path = /obj/item/device/flash/synthetic
 	category = list("Misc")

code/modules/research/designs/power_designs.dm

@@ -9,6 +9,7 @@
 	req_tech = list("powerstorage" = 1)
 	build_type = PROTOLATHE | AUTOLATHE | MECHFAB
 	materials = list("$metal" = 700, "$glass" = 50)
+	construction_time=100
 	build_path = /obj/item/weapon/stock_parts/cell
 	category = list("Misc","Power")
 
@@ -19,9 +20,10 @@
 	req_tech = list("powerstorage" = 2)
 	build_type = PROTOLATHE | AUTOLATHE | MECHFAB
 	materials = list("$metal" = 700, "$glass" = 60)
+	construction_time=100
 	build_path = /obj/item/weapon/stock_parts/cell/high
 	category = list("Misc","Power")
-	
+
 /datum/design/hyper_cell
 	name = "Hyper-Capacity Power Cell"
 	desc = "A power cell that holds 30000 units of energy"
@@ -30,9 +32,10 @@
 	reliability_base = 70
 	build_type = PROTOLATHE | MECHFAB
 	materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70)
+	construction_time=100
 	build_path = /obj/item/weapon/stock_parts/cell/hyper
 	category = list("Misc","Power")
-	
+
 /datum/design/super_cell
 	name = "Super-Capacity Power Cell"
 	desc = "A power cell that holds 20000 units of energy"
@@ -41,9 +44,10 @@
 	reliability_base = 75
 	build_type = PROTOLATHE | MECHFAB
 	materials = list("$metal" = 700, "$glass" = 70)
+	construction_time=100
 	build_path = /obj/item/weapon/stock_parts/cell/super
 	category = list("Misc","Power")
-	
+
 /datum/design/pacman
 	name = "Machine Board (PACMAN-type Generator)"
 	desc = "The circuit board that for a PACMAN-type portable generator."
@@ -54,7 +58,7 @@
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/pacman
 	category = list("Engineering Machinery")
-	
+
 /datum/design/mrspacman
 	name = "Machine Board (MRSPACMAN-type Generator)"
 	desc = "The circuit board that for a MRSPACMAN-type portable generator."