Merge pull request #15191 from keronshb/ninjaadjustment

Puts the ninja status back into the status window and restores the energy charge meter.

code/modules/mob/living/carbon/human/human.dm

@@ -83,6 +83,33 @@
 			. += "Chemical Storage: [changeling.chem_charges]/[changeling.chem_storage]"
 			. += "Absorbed DNA: [changeling.absorbedcount]"
 
+	//NINJACODE
+	if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)) //Only display if actually a ninja.
+		var/obj/item/clothing/suit/space/space_ninja/SN = wear_suit
+		. += "SpiderOS Status: [SN.s_initialized ? "Initialized" : "Disabled"]"
+		. += "Current Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]"
+		if(SN.s_initialized)
+			//Suit gear
+			. += "Energy Charge: [round(SN.cell.charge/100)]%"
+			//Ninja status
+			. += "Fingerprints: [md5(dna.uni_identity)]"
+			. += "Unique Identity: [dna.unique_enzymes]"
+			. += "Overall Status: [stat > 1 ? "dead" : "[health]% healthy"]"
+			. += "Nutrition Status: [nutrition]"
+			. += "Oxygen Loss: [getOxyLoss()]"
+			. += "Toxin Levels: [getToxLoss()]"
+			. += "Burn Severity: [getFireLoss()]"
+			. += "Brute Trauma: [getBruteLoss()]"
+			. += "Radiation Levels: [radiation] rad"
+			. += "Body Temperature: [bodytemperature-T0C] degrees C ([bodytemperature*1.8-459.67] degrees F)"
+
+			//Diseases
+			if(length(diseases))
+				. += "Viruses:"
+				for(var/thing in diseases)
+					var/datum/disease/D = thing
+					. += "* [D.name], Type: [D.spread_text], Stage: [D.stage]/[D.max_stages], Possible Cure: [D.cure_text]"
+
 /mob/living/carbon/human/show_inv(mob/user)
 	user.set_machine(src)
 	var/has_breathable_mask = istype(wear_mask, /obj/item/clothing/mask)

code/modules/ninja/__ninjaDefines.dm

@@ -15,7 +15,6 @@
 
 //Defines for the suit's unique abilities
 #define IS_NINJA_SUIT_INITIALIZATION(action) (istype(action, /datum/action/item_action/initialize_ninja_suit))
-#define IS_NINJA_SUIT_STATUS(action) (istype(action, /datum/action/item_action/ninjastatus))
 #define IS_NINJA_SUIT_BOOST(action) (istype(action, /datum/action/item_action/ninjaboost))
 #define IS_NINJA_SUIT_EMP(action) (istype(action, /datum/action/item_action/ninjapulse))
 #define IS_NINJA_SUIT_STAR_CREATION(action) (istype(action, /datum/action/item_action/ninjastar))

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

@@ -5,35 +5,3 @@
 	button_icon_state = "health"
 	icon_icon = 'icons/obj/device.dmi'
 	var/action_background_icon_state = "bg_default_on"
-
-/**
- * Proc called to put a status readout to the ninja in chat.
- *
- * Called put some information about the ninja's current status into chat.
- * This information used to be displayed constantly on the status tab screen
- * when the suit was on, but was turned into this as to remove the code from
- * human.dm
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjastatus()
-	var/mob/living/carbon/human/ninja = affecting
-	var/list/info_list = list()
-	info_list += "<span class='info'>SpiderOS Status: [s_initialized ? "Initialized" : "Disabled"]</span>\n"
-	//Ninja status
-	info_list += "<span class='info'>Fingerprints: [md5(ninja.dna.uni_identity)]</span>\n"
-	info_list += "<span class='info'>Unique Identity: [ninja.dna.unique_enzymes]</span>\n"
-	info_list += "<span class='info'>Overall Status: [ninja.stat > 1 ? "dead" : "[ninja.health]% healthy"]</span>\n"
-	info_list += "<span class='info'>Nutrition Status: [ninja.nutrition]</span>\n"
-	info_list += "<span class='info'>Oxygen Loss: [ninja.getOxyLoss()]</span>\n"
-	info_list += "<span class='info'>Toxin Levels: [ninja.getToxLoss()]</span>\n"
-	info_list += "<span class='info'>Burn Severity: [ninja.getFireLoss()]</span>\n"
-	info_list += "<span class='info'>Brute Trauma: [ninja.getBruteLoss()]</span>\n"
-	info_list += "<span class='info'>Radiation Levels: [ninja.radiation] rad</span>\n"
-	info_list += "<span class='info'>Body Temperature: [ninja.bodytemperature-T0C] degrees C ([ninja.bodytemperature*1.8-459.67] degrees F)</span>\n"
-
-	//Diseases
-	if(length(ninja.diseases))
-		info_list += "Viruses:"
-		for(var/datum/disease/ninja_disease in ninja.diseases)
-			info_list += "<span class='info'>* [ninja_disease.name], Type: [ninja_disease.spread_text], Stage: [ninja_disease.stage]/[ninja_disease.max_stages], Possible Cure: [ninja_disease.cure_text]</span>\n"
-
-	to_chat(ninja, "[info_list.Join()]")

code/modules/ninja/suit/suit.dm

@@ -121,9 +121,6 @@
 	if(s_coold > 0)
 		to_chat(user, "<span class='warning'><b>ERROR</b>: suit is on cooldown.</span>")
 		return FALSE
-	if(IS_NINJA_SUIT_STATUS(action))
-		ninjastatus()
-		return TRUE
 	if(IS_NINJA_SUIT_BOOST(action))
 		ninjaboost()
 		return TRUE