Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367

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

@@ -320,11 +320,12 @@
 		M.update_inv_hands()
 
 /obj/item/melee/transforming/energy/sword/cx/AltClick(mob/living/user)
+	. = ..()
 	if(!in_range(src, user))	//Basic checks to prevent abuse
 		return
 	if(user.incapacitated() || !istype(user))
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-		return
+		return TRUE
 
 	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
 		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
@@ -332,6 +333,7 @@
 			light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
 		update_icon()
 		update_light()
+	return TRUE
 
 /obj/item/melee/transforming/energy/sword/cx/examine(mob/user)
 	. = ..()

code/game/objects/items/melee/misc.dm

@@ -79,17 +79,17 @@
 		final_block_chance = 0 //Don't bring a sword to a gunfight
 	return ..()
 
-/obj/item/melee/sabre/on_exit_storage(obj/item/storage/S)
-	..()
-	var/obj/item/storage/belt/sabre/B = S
+/obj/item/melee/sabre/on_exit_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/B = S.parent
 	if(istype(B))
 		playsound(B, 'sound/items/unsheath.ogg', 25, 1)
-
-/obj/item/melee/sabre/on_enter_storage(obj/item/storage/S)
 	..()
-	var/obj/item/storage/belt/sabre/B = S
+
+/obj/item/melee/sabre/on_enter_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/B = S.parent
 	if(istype(B))
 		playsound(B, 'sound/items/sheath.ogg', 25, 1)
+	..()
 
 /obj/item/melee/sabre/get_belt_overlay()
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "sabre")

code/game/objects/items/melee/transforming.dm

@@ -23,8 +23,8 @@
 	else
 		if(attack_verb_off.len)
 			attack_verb = attack_verb_off
-	if(get_sharpness())
-		AddComponent(/datum/component/butchering, 50, 100, 0, hitsound, !active)
+	if(sharpness)
+		AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
 
 /obj/item/melee/transforming/attack_self(mob/living/carbon/user)
 	if(transform_weapon(user))
@@ -65,13 +65,6 @@
 		icon_state = initial(icon_state)
 		w_class = initial(w_class)
 		total_mass = initial(total_mass)
-	if(get_sharpness())
-		var/datum/component/butchering/BT = LoadComponent(/datum/component/butchering)
-		BT.butchering_enabled = TRUE
-	else
-		var/datum/component/butchering/BT = GetComponent(/datum/component/butchering)
-		if(BT)
-			BT.butchering_enabled = FALSE
 	transform_messages(user, supress_message_text)
 	add_fingerprint(user)
 	return TRUE