Ninja katanas are now immune to acid

code/modules/ninja/energy_katana.dm

@@ -6,6 +6,7 @@
 	force = 40
 	throwforce = 20
 	armour_penetration = 50
+	unacidable = 1
 	var/datum/effect_system/spark_spread/spark_system
 
 /obj/item/weapon/katana/energy/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
@@ -37,7 +38,7 @@
 /obj/item/weapon/katana/energy/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0)
 	if(!istype(user))
 		return
-	loc = get_turf(src)
+	forceMove(get_turf(user))
 
 	if(doSpark)
 		spark_system.start()
@@ -50,7 +51,6 @@
 	else if(user.equip_to_slot_if_possible(src, slot_belt, 0, 1, 1))
 		msg = "Your Energy Katana teleports back to you, sheathing itself as it does so!</span>"
 	else
-		loc = get_turf(user)
 		msg = "Your Energy Katana teleports to your location!"
 
 	if(caught)

code/modules/ninja/suit/gloves.dm

@@ -31,6 +31,7 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	strip_delay = 120
+	unacidable = 1
 	var/draining = 0
 	var/candrain = 0
 	var/mindrain = 200

code/modules/ninja/suit/mask.dm

@@ -16,3 +16,4 @@ Contents:
 	icon_state = "s-ninja"
 	item_state = "s-ninja_mask"
 	strip_delay = 120
+	unacidable = 1