two hours for aesthetics

code/modules/events/space_ninja.dm

@@ -48,4 +48,4 @@
 	random_human_options.real_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]"
 	random_human_options.copy_to(new_ninja)
 	new_ninja.dna.update_dna_identity()
-	return new_ninja
+	return new_ninja

code/modules/ninja/suit/gloves.dm

@@ -11,8 +11,8 @@
 /obj/item/clothing/gloves/space_ninja
 	desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance."
 	name = "ninja gloves"
-	icon_state = "black"
-	item_state = "ninja_new"
+	icon_state = "s-ninja"
+	item_state = "s-ninja"
 	siemens_coefficient = 0
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT

code/modules/ninja/suit/head.dm

@@ -9,8 +9,8 @@
 /obj/item/clothing/head/helmet/space/space_ninja
 	desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear."
 	name = "ninja hood"
-	icon_state = "ninja_newcowl"
-	item_state = "ninja_newcowl"
+	icon_state = "s-ninja"
+	item_state = "s-ninja_mask"
 	armor = list(MELEE = 40, BULLET = 30, LASER = 20,ENERGY = 15, BOMB = 30, BIO = 30, RAD = 25, FIRE = 100, ACID = 100)
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	blockTracking = TRUE//Roughly the only unique thing about this helmet.

code/modules/ninja/suit/mask.dm

@@ -9,8 +9,8 @@
 /obj/item/clothing/mask/gas/space_ninja
 	name = "ninja mask"
 	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
-	icon_state = "ninja_new"
-	item_state = "ninja_new"
+	icon_state = "s-ninja"
+	item_state = "s-ninja_mask"
 	strip_delay = 120
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	modifies_speech = TRUE

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

@@ -7,6 +7,7 @@
 	desc = "Inject a secret chemical that will counteract all movement-impairing effect."
 	button_icon_state = "adrenal"
 	icon_icon = 'icons/obj/implants.dmi'
+	required_mobility_flags = NONE
 
 /**
  * Proc called to activate space ninja's adrenaline.

code/modules/ninja/suit/ninja_equipment_actions/ninja_glove_toggle.dm

@@ -1,7 +1,7 @@
 /datum/action/item_action/toggle_glove
 	name = "Toggle interaction"
 	desc = "Switch between normal interaction and drain mode."
-	button_icon_state = "ninja_new"
+	button_icon_state = "s-ninjan"
 	icon_icon = 'icons/obj/clothing/gloves.dmi'
 
 /**

code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm

@@ -72,6 +72,7 @@ GLOBAL_LIST_INIT(ninja_deinitialize_messages, list(
 			message += "<B>[DisplayEnergy(cell.charge)]</B>."
 		if (NINJA_COMPLETE_PHASE)
 			message += "[ninja.real_name]."
+			ninja.regenerate_icons()
 			s_initialized = TRUE
 			s_busy = FALSE
 

code/modules/ninja/suit/suit.dm

@@ -11,8 +11,8 @@
 /obj/item/clothing/suit/space/space_ninja
 	name = "ninja suit"
 	desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
-	icon_state = "ninja_new"
-	item_state = "ninja_new"
+	icon_state = "s-ninja"
+	item_state = "s-ninja_suit"
 	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/stock_parts/cell)
 	slowdown = 1
 	resistance_flags = LAVA_PROOF | ACID_PROOF
@@ -149,6 +149,7 @@
 	affecting = ninja
 	ADD_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT) //colons make me go all |=
 	slowdown = 0
+	icon_state = "s-ninjan"
 	n_hood = ninja.head
 	ADD_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
 	n_shoes = ninja.shoes
@@ -156,12 +157,15 @@
 	n_shoes.slowdown--
 	n_gloves = ninja.gloves
 	ADD_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
+	n_gloves.icon_state = "s-ninjan"
+	n_gloves.item_state = "s-ninjan"
 	n_mask = ninja.wear_mask
+	n_mask.icon_state = "s-ninjan"
+	n_mask.item_state = "s-ninjan"
 
 	ADD_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT)
 	return TRUE
 
-
 /**
   * Proc called to unlock all the gear off space ninja's body.
   *
@@ -174,22 +178,24 @@
 	affecting = null
 	REMOVE_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT)
 	slowdown = 1
-	icon_state = "ninja_new"
+	icon_state = "s-ninja"
 	if(n_hood)//Should be attached, might not be attached.
 		REMOVE_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
-		n_hood.icon_state = "ninja_newcowl"
+		n_hood.icon_state = "s-ninja"
 	if(n_shoes)
 		REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
 		n_shoes.slowdown++
 	if(n_gloves)
-		n_gloves.icon_state = "black"
+		n_gloves.icon_state = "s-ninja"
+		n_gloves.item_state = "s-ninja"
 		REMOVE_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
 		n_gloves.candrain = FALSE
 		n_gloves.draining = FALSE
+	if(n_mask)
+		n_mask.icon_state = "s-ninja"
+		n_mask.item_state = "s-ninja"
 
 		REMOVE_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT)
-	if(n_mask)
-		n_mask.icon_state = "ninja_new"
 
 /**
   * Proc used to delete all the attachments and itself.