Merge pull request #20384 from ChangelingRain/dontforgetthewayshepushedthewaterinsidewadingthroughthespiritslikeafloodonthefloor

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/head.dm

@@ -8,4 +8,5 @@
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
 	strip_delay = 12
 	unacidable = 1
-	blockTracking = 1//Roughly the only unique thing about this helmet.
+	blockTracking = 1//Roughly the only unique thing about this helmet.
+	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR

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

code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm

@@ -23,5 +23,6 @@
 			reagents.trans_id_to(H, "radium", a_transfer)
 			H << "<span class='danger'>You are beginning to feel the after-effect of the injection.</span>"
 		a_boost--
+		H << "<span class='notice'>There are <B>[a_boost]</B> adrenaline boosts remaining.</span>"
 		s_coold = 3
 	return

code/modules/ninja/suit/shoes.dm

@@ -6,6 +6,7 @@
 	item_state = "secshoes"
 	permeability_coefficient = 0.01
 	flags = NOSLIP
+	unacidable = 1
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	strip_delay = 120
 	cold_protection = FEET