Merge branch 'master' into w_class

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

code/game/objects/items/stacks/medical.dm

@@ -125,7 +125,7 @@
 	desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds."
 	stop_bleeding = 900
 
-/obj/item/stack/medical/gauze/cyborg/
+/obj/item/stack/medical/gauze/cyborg
 	materials = list()
 	is_cyborg = 1
 	cost = 250

code/game/objects/items/stacks/rods.dm

@@ -66,7 +66,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
 	else
 		return ..()
 
-/obj/item/stack/rods/cyborg/
+/obj/item/stack/rods/cyborg
 	materials = list()
 	is_cyborg = 1
 	cost = 250