Merge upstream

code/game/objects/items/weapons/implants/implant_chem.dm

@@ -57,7 +57,7 @@
 
 /obj/item/weapon/implantcase/chem/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W,/obj/item/weapon/reagent_containers/syringe) && imp)
-		W.afterattack(imp, user, params)
+		W.afterattack(imp, user, TRUE, params)
 		return TRUE
 	else
 		return ..()

code/game/objects/items/weapons/melee/energy.dm

@@ -238,9 +238,6 @@
 	icon_state_on = "cutlass1"
 	light_color = "#ff0000"
 
-/obj/item/weapon/melee/energy/sword/pirate/New()
-	return
-
 /obj/item/weapon/melee/energy/blade
 	name = "energy blade"
 	desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."