From a0afddfa951c11470591175e2608970d00b18f6e Mon Sep 17 00:00:00 2001
From: JaySparrow <jay624871@gmail.com>
Date: Wed, 9 Sep 2020 01:46:05 -0500
Subject: [PATCH] Ninja Nerf

Emp 25 > 40
Ninja Star 1 > 10
Teleport 3 sec > 10 sec
No more capture objectives
Changed an instance of Nanotrasen to Kinaris.
---
 code/datums/actions/ninja.dm                          | 4 ++--
 code/modules/antagonists/ninja/ninja.dm               | 6 ++++--
 code/modules/ninja/energy_katana.dm                   | 2 +-
 code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm | 2 +-
 code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm   | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/datums/actions/ninja.dm b/code/datums/actions/ninja.dm
index b6550783..92266336 100644
--- a/code/datums/actions/ninja.dm
+++ b/code/datums/actions/ninja.dm
@@ -15,13 +15,13 @@
 	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 
 /datum/action/item_action/ninjapulse
-	name = "EM Burst (25E)"
+	name = "EM Burst (40E)"
 	desc = "Disable any nearby technology with an 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)"
+	name = "Create Throwing Stars (10E)"
 	desc = "Creates some throwing stars"
 	button_icon_state = "throwingstar"
 	icon_icon = 'icons/obj/items_and_weapons.dmi'
diff --git a/code/modules/antagonists/ninja/ninja.dm b/code/modules/antagonists/ninja/ninja.dm
index a8bce90f..9c10121d 100644
--- a/code/modules/antagonists/ninja/ninja.dm
+++ b/code/modules/antagonists/ninja/ninja.dm
@@ -27,7 +27,7 @@
 /datum/antagonist/ninja/proc/addMemories()
 	antag_memory += "I am an elite mercenary assassin of the mighty Spider Clan. A <font color='red'><B>SPACE NINJA</B></font>!<br>"
 	antag_memory += "Surprise is my weapon. Shadows are my armor. Without them, I am nothing. (//initialize your suit by clicking the initialize UI button, to use abilities like stealth)!<br>"
-	antag_memory += "Officially, [helping_station?"Nanotrasen":"The Syndicate"] are my employer.<br>"
+	antag_memory += "Officially, [helping_station?"Kinaris":"The Syndicate"] are my employer.<br>"
 
 /datum/antagonist/ninja/proc/addObjectives(quantity = 6)
 	var/list/possible_targets = list()
@@ -39,7 +39,7 @@
 				else if(M.assigned_role in GLOB.command_positions)
 					possible_targets[M] = 1						//good-guy
 
-	var/list/possible_objectives = list(1,2,3,4)
+	var/list/possible_objectives = list(1,2,3)
 
 	while(objectives.len < quantity)
 		switch(pick_n_take(possible_objectives))
@@ -73,6 +73,7 @@
 					O.target = M
 					O.explanation_text = "Protect \the [M.current.real_name], the [M.assigned_role], from harm."
 					objectives += O
+			/*
 			if(4)	//debrain/capture
 				if(!possible_targets.len)	continue
 				var/selected = rand(1,possible_targets.len)
@@ -91,6 +92,7 @@
 					O.owner = owner
 					O.gen_amount_goal()
 					objectives += O
+			*/
 			else
 				break
 	var/datum/objective/O = new /datum/objective/survive()
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 97c41faf..31bccb7d 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -102,5 +102,5 @@
 /datum/action/innate/dash/ninja
 	current_charges = 3
 	max_charges = 3
-	charge_rate = 30
+	charge_rate = 100
 	recharge_sound = null
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm
index ea96c1cd..49b0cb89 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm
@@ -3,7 +3,7 @@
 //Disables nearby tech equipment.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse()
 
-	if(!ninjacost(250,N_STEALTH_CANCEL))
+	if(!ninjacost(400,N_STEALTH_CANCEL))
 		var/mob/living/carbon/human/H = affecting
 		playsound(H.loc, 'sound/effects/empulse.ogg', 60, 2)
 		empulse(H, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm
index 31ac62d9..760078e7 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm
@@ -2,7 +2,7 @@
 
 //Creates a throwing star
 /obj/item/clothing/suit/space/space_ninja/proc/ninjastar()
-	if(!ninjacost(10))
+	if(!ninjacost(100))
 		var/mob/living/carbon/human/H = affecting
 		var/obj/item/throwing_star/ninja/N = new(H)
 		if(H.put_in_hands(N))