diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 3c1c116de3..2777fc1f75 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -612,7 +612,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	name = "shock throwing star"
 	desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm."
 	throwforce = 5
-	embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 20, "jostle_pain_mult" = 3)
+	embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3)
 
 /obj/item/throwing_star/toy
 	name = "toy throwing star"
diff --git a/code/modules/ninja/outfit.dm b/code/modules/ninja/outfit.dm
index 21c2acf147..a6faa9a3d5 100644
--- a/code/modules/ninja/outfit.dm
+++ b/code/modules/ninja/outfit.dm
@@ -9,8 +9,9 @@
 	shoes = /obj/item/clothing/shoes/space_ninja
 	gloves = /obj/item/clothing/gloves/space_ninja
 	l_pocket = /obj/item/grenade/plastic/c4/ninja
+	r_pocket = /obj/item/hypospray/mkii/CMO/combat
 	suit_store = /obj/item/tank/internals/oxygen
-	internals_slot = ITEM_SLOT_SUITSTORE
+	internals_slot = SLOT_S_STORE
 	belt = /obj/item/energy_katana
 	implants = list(/obj/item/implant/explosive)
 
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
index fca5b4caff..35d69563b6 100644
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
+++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
@@ -30,7 +30,6 @@
 	ninja.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")
 	a_boost = FALSE
 	to_chat(ninja, "<span class='notice'>You have used the adrenaline boost.</span>")
-	s_coold = 6
 	addtimer(CALLBACK(src, .proc/ninjaboost_after), 70)
 
 /**
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm
index 51167b0e0d..041fe88710 100644
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm
+++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm
@@ -68,9 +68,6 @@ GLOBAL_LIST_INIT(ninja_deinitialize_messages, list(
 			if(!lock_suit(ninja))//To lock the suit onto wearer.
 				s_busy = FALSE
 				return
-		if (NINJA_ICON_GENERATE_PHASE)
-			lockIcons(ninja)//Check for icons.
-			ninja.regenerate_icons()
 		if (NINJA_COMPLETE_PHASE - 1)
 			message += "<B>[DisplayEnergy(cell.charge)]</B>."
 		if (NINJA_COMPLETE_PHASE)
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 259eb60446..6dc2c5dda6 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -174,10 +174,10 @@
 	affecting = null
 	REMOVE_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT)
 	slowdown = 1
-	icon_state = "s-ninja"
+	icon_state = "ninja_new"
 	if(n_hood)//Should be attached, might not be attached.
 		REMOVE_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
-		n_hood.icon_state = "s-ninja"
+		n_hood.icon_state = "ninja_newcowl"
 	if(n_shoes)
 		REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
 		n_shoes.slowdown++
@@ -189,7 +189,7 @@
 
 		REMOVE_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT)
 	if(n_mask)
-		n_mask.icon_state = "s-ninja"
+		n_mask.icon_state = "ninja_new"
 
 /**
   * Proc used to delete all the attachments and itself.