commit

code/datums/action.dm

@@ -172,6 +172,7 @@
 
 /datum/action/item_action/rcl
 	name = "Change Cable Color"
+	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "rcl_rainbow"
 
 /datum/action/item_action/startchainsaw
@@ -405,27 +406,24 @@
 /datum/action/item_action/initialize_ninja_suit
 	name = "Toggle ninja suit"
 
-/datum/action/item_action/ninjajaunt
-	name = "Phase Jaunt (10E)"
-	desc = "Utilizes the internal VOID-shift device to rapidly transit in direction facing."
-	icon_icon = 'icons/mob/actions/actions_items.dmi'
-	button_icon_state = "ninja_phase"
-
 /datum/action/item_action/ninjasmoke
 	name = "Smoke Bomb"
 	desc = "Blind your enemies momentarily with a well-placed smoke bomb."
 	button_icon_state = "smoke"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 
 /datum/action/item_action/ninjaboost
-	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_CONSCIOUS
+	check_flags = NONE
 	name = "Adrenaline Boost"
 	desc = "Inject a secret chemical that will counteract all movement-impairing effect."
 	button_icon_state = "repulse"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 
 /datum/action/item_action/ninjapulse
 	name = "EM Burst (25E)"
 	desc = "Disable any nearby technology with a electro-magnetic pulse."
 	button_icon_state = "emp"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 
 /datum/action/item_action/ninjastar
 	name = "Create Throwing Stars (1E)"
@@ -448,8 +446,8 @@
 /datum/action/item_action/ninja_stealth
 	name = "Toggle Stealth"
 	desc = "Toggles stealth mode on and off."
-	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "ninja_cloak"
+	icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
 
 /datum/action/item_action/toggle_glove
 	name = "Toggle interaction"
@@ -491,7 +489,7 @@
 	S.action = src
 	name = S.name
 	desc = S.desc
-	button_icon = S.action_icon
+	icon_icon = S.action_icon
 	button_icon_state = S.action_icon_state
 	background_icon_state = S.action_background_icon_state
 	button.name = name

code/datums/antagonists/ninja.dm

@@ -41,7 +41,6 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/space_ninja(H), slot_wear_mask)
 	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses)
 	H.equip_to_slot_or_del(EK, slot_belt)
-	H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), slot_r_store)
 	H.equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(H), slot_l_store)
 	H.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen(H), slot_s_store)
 	H.equip_to_slot_or_del(new /obj/item/tank/jetpack/carbondioxide(H), slot_back)