Revert "Tg status tab"

This reverts commit 931f3ca63b.

code/modules/mob/dead/dead.dm

@@ -17,7 +17,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 	prepare_huds()
 
 	if(length(CONFIG_GET(keyed_list/cross_server)))
-		add_verb(src, /mob/dead/proc/server_hop)
+		verbs += /mob/dead/proc/server_hop
 	set_focus(src)
 	return INITIALIZE_HINT_NORMAL
 
@@ -42,26 +42,27 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 	loc = destination
 	Moved(oldloc, NONE, TRUE)
 
+/mob/dead/Stat()
+	..()
 
-/mob/dead/get_status_tab_items()
-	. = ..()
-	. += ""
-	//. += "Game Mode: [SSticker.hide_mode ? "Secret" : "[GLOB.master_mode]"]"
+	if(!statpanel("Status"))
+		return
+	//stat(null, "Game Mode: [SSticker.hide_mode ? "Secret" : "[GLOB.master_mode]"]")
 
 	if(SSticker.HasRoundStarted())
 		return
 
 	var/time_remaining = SSticker.GetTimeLeft()
 	if(time_remaining > 0)
-		. += "Time To Start: [round(time_remaining/10)]s"
+		stat(null, "Time To Start: [round(time_remaining/10)]s")
 	else if(time_remaining == -10)
-		. += "Time To Start: DELAYED"
+		stat(null, "Time To Start: DELAYED")
 	else
-		. += "Time To Start: SOON"
+		stat(null, "Time To Start: SOON")
 
-	. += "Players: [SSticker.totalPlayers]"
+	stat(null, "Players: [SSticker.totalPlayers]")
 	if(client.holder)
-		. += "Players Ready: [SSticker.totalPlayersReady]"
+		stat(null, "Players Ready: [SSticker.totalPlayersReady]")
 
 /mob/dead/proc/server_hop()
 	set category = "OOC"
@@ -73,7 +74,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 	var/pick
 	switch(csa.len)
 		if(0)
-			remove_verb(src, /mob/dead/proc/server_hop)
+			verbs -= /mob/dead/proc/server_hop
 			to_chat(src, "<span class='notice'>Server Hop has been disabled.</span>")
 		if(1)
 			pick = csa[0]

code/modules/mob/dead/new_player/new_player.dm

@@ -303,7 +303,6 @@
 	if(observer.client && observer.client.prefs)
 		observer.real_name = observer.client.prefs.real_name
 		observer.name = observer.real_name
-		observer.client.init_verbs()
 	observer.update_icon()
 	observer.stop_sound_channel(CHANNEL_LOBBYMUSIC)
 	QDEL_NULL(mind)
@@ -398,7 +397,6 @@
 		character.update_parallax_teleport()
 
 	SSticker.minds += character.mind
-	character.client.init_verbs() // init verbs for the late join
 
 	var/mob/living/carbon/human/humanc
 	if(ishuman(character))
@@ -592,7 +590,6 @@
 		mind.transfer_to(H)					//won't transfer key since the mind is not active
 
 	H.name = real_name
-	client.init_verbs()
 		//h13 assign your characters custom height.
 	if (H.custom_body_size) //Do they have it set?
 		H.resize(H.custom_body_size * 0.01)

code/modules/mob/dead/observer/observer.dm

@@ -59,10 +59,10 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 /mob/dead/observer/Initialize()
 	set_invisibility(GLOB.observer_default_invisibility)
 
-	add_verb(src, list(
+	verbs += list(
 		/mob/dead/observer/proc/dead_tele,
 		/mob/dead/observer/proc/open_spawners_menu,
-		/mob/dead/observer/proc/view_gas))
+		/mob/dead/observer/proc/view_gas)
 
 	if(icon_state in GLOB.ghost_forms_with_directions_list)
 		ghostimage_default = image(src.icon,src,src.icon_state + "_nodir")
@@ -120,8 +120,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	real_name = name
 
 	if(!fun_verbs)
-		remove_verb(src, /mob/dead/observer/verb/boo)
-		remove_verb(src, /mob/dead/observer/verb/possess)
+		verbs -= /mob/dead/observer/verb/boo
+		verbs -= /mob/dead/observer/verb/possess
 
 	animate(src, pixel_y = 2, time = 10, loop = -1)
 
@@ -270,7 +270,6 @@ Works together with spawning an observer, noted above.
 	var/mob/dead/observer/ghost = new(src)	// Transfer safety to observer spawning proc.
 	SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
 	ghost.can_reenter_corpse = can_reenter_corpse
-	ghost.client.init_verbs()
 	if (client && client.prefs && client.prefs.auto_ooc)
 		if (!(client.prefs.chat_toggles & CHAT_OOC))
 			client.prefs.chat_toggles ^= CHAT_OOC
@@ -368,7 +367,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	client.change_view(CONFIG_GET(string/default_view))
 	SStgui.on_transfer(src, mind.current) // Transfer NanoUIs.
 	mind.current.key = key
-	mind.current.client.init_verbs()
 	return 1
 
 /mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source, flashwindow = TRUE)
@@ -779,11 +777,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			ghostimage_simple.icon_state = icon_state
 		if("fun_verbs")
 			if(fun_verbs)
-				add_verb(src, /mob/dead/observer/verb/boo)
-				add_verb(src, /mob/dead/observer/verb/possess)
+				verbs += /mob/dead/observer/verb/boo
+				verbs += /mob/dead/observer/verb/possess
 			else
-				remove_verb(src, /mob/dead/observer/verb/boo)
-				remove_verb(src, /mob/dead/observer/verb/possess)
+				verbs -= /mob/dead/observer/verb/boo
+				verbs -= /mob/dead/observer/verb/possess
 
 /mob/dead/observer/reset_perspective(atom/A)
 	if(client)

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

@@ -26,8 +26,8 @@
 	var/static/regex/alien_name_regex = new("alien (larva|sentinel|drone|hunter|praetorian|queen)( \\(\\d+\\))?")
 
 /mob/living/carbon/alien/Initialize()
-	add_verb(src, /mob/living/proc/mob_sleep)
-	add_verb(src, /mob/living/proc/lay_down)
+	verbs += /mob/living/proc/mob_sleep
+	verbs += /mob/living/proc/lay_down
 
 	create_bodyparts() //initialize bodyparts
 
@@ -86,10 +86,11 @@
 /mob/living/carbon/alien/IsAdvancedToolUser()
 	return has_fine_manipulation
 
+/mob/living/carbon/alien/Stat()
+	..()
 
-/mob/living/carbon/alien/get_status_tab_items()
-	. = ..()
-	. += "Intent: [a_intent]"
+	if(statpanel("Status"))
+		stat(null, "Intent: [a_intent]")
 
 /mob/living/carbon/alien/getTrail()
 	if(getBruteLoss() < 200)

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -143,10 +143,10 @@ Doesn't work on other aliens/AI.*/
 	action_icon_state = "alien_acid"
 
 /obj/effect/proc_holder/alien/acid/on_gain(mob/living/carbon/user)
-	add_verb(user, /mob/living/carbon/proc/corrosive_acid)
+	user.verbs.Add(/mob/living/carbon/proc/corrosive_acid)
 
 /obj/effect/proc_holder/alien/acid/on_lose(mob/living/carbon/user)
-	remove_verb(user, /mob/living/carbon/proc/corrosive_acid)
+	user.verbs.Remove(/mob/living/carbon/proc/corrosive_acid)
 
 /obj/effect/proc_holder/alien/acid/proc/corrode(atom/target,mob/living/carbon/user = usr)
 	if(target in oview(1,user))

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -29,9 +29,11 @@
 	internal_organs += new /obj/item/organ/alien/plasmavessel/small/tiny
 	..()
 
-/mob/living/carbon/alien/larva/get_status_tab_items()
-	. = ..()
-	. += "Progress: [amount_grown]/[max_grown]"
+//This needs to be fixed
+/mob/living/carbon/alien/larva/Stat()
+	..()
+	if(statpanel("Status"))
+		stat(null, "Progress: [amount_grown]/[max_grown]")
 
 /mob/living/carbon/alien/larva/adjustPlasma(amount)
 	if(stat != DEAD && amount > 0)

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

@@ -465,18 +465,16 @@
 			var/turf/target = get_turf(loc)
 			I.safe_throw_at(target,I.throw_range,I.throw_speed,src, force = move_force)
 
+/mob/living/carbon/Stat()
+	..()
+	if(statpanel("Status"))
+		var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
+		if(vessel)
+			stat(null, "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]")
+		if(locate(/obj/item/assembly/health) in src)
+			stat(null, "Health: [health]")
 
-/mob/living/carbon/get_status_tab_items()
-	. = ..()
-	var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
-	if(vessel)
-		. += "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]"
-	if(locate(/obj/item/assembly/health) in src)
-		. += "Health: [health]"
-
-/mob/living/carbon/get_proc_holders()
-	. = ..()
-	. += add_abilities_to_panel()
+	add_abilities_to_panel()
 
 /mob/living/carbon/attack_ui(slot)
 	if(!has_hand_for_held_index(active_hand_index))
@@ -997,4 +995,4 @@
 /mob/living/carbon/transfer_ckey(mob/new_mob, send_signal = TRUE)
 	if(combatmode)
 		toggle_combat_mode(TRUE, TRUE)
-	return ..()
+	return ..() 

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

@@ -6,8 +6,9 @@
 	appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
 
 /mob/living/carbon/human/Initialize()
-	add_verb(src, /mob/living/proc/mob_sleep)
-	add_verb(src, /mob/living/proc/lay_down)
+	verbs += /mob/living/proc/mob_sleep
+	verbs += /mob/living/proc/lay_down
+	verbs += /mob/living/carbon/human/proc/underwear_toggle //fwee
 	time_initialized = world.time
 
 	//initialize limbs first
@@ -61,52 +62,70 @@
 	add_to_all_human_data_huds()
 
 
-/mob/living/carbon/human/get_status_tab_items()
-	. = ..()
-	. += "Intent: [a_intent]"
-	. += "Move Mode: [m_intent]"
-	if (internal)
-		if (!internal.air_contents)
-			qdel(internal)
-		else
-			. += ""
-			. += "Internal Atmosphere Info: [internal.name]"
-			. += "Tank Pressure: [internal.air_contents.return_pressure()]"
-			. += "Distribution Pressure: [internal.distribute_pressure]"
-	if(mind)
-		var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
-		if(changeling)
-			. += ""
-			. += "Chemical Storage: [changeling.chem_charges]/[changeling.chem_storage]"
-			. += "Absorbed DNA: [changeling.absorbedcount]"
+/mob/living/carbon/human/Stat()
+	..()
+	//Same thing from mob
+	if(statpanel("Status"))
+		if(tickrefresh == 1)
+			sList2 = list()
+			sList2 += "Intent: [a_intent]"
+			sList2 += "Move Mode: [m_intent]"
+			if (internal)
+				if (!internal.air_contents)
+					qdel(internal)
+				else
+					sList2 += "Internal Atmosphere Info: "+ "[internal.name]"
+					sList2 += "Tank Pressure: "+ "[internal.air_contents.return_pressure()]"
+					sList2 += "Distribution Pressure: "+ "[internal.distribute_pressure]"
+			if(mind)
+				var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
+				if(changeling)
+					sList2 += "Chemical Storage: " + "[changeling.chem_charges]/[changeling.chem_storage]"
+					sList2 += "Absorbed DNA: "+ "[changeling.absorbedcount]"
+				var/datum/antagonist/nightmare/nightmare = mind.has_antag_datum(/datum/antagonist/nightmare)
+				if(nightmare)
+					for(var/datum/objective/O in mind.objectives)
+						if(istype(O, /datum/objective/break_lights))
+							var/datum/objective/break_lights/BL = O
+							if(BL.mode)	//Keeping lights out of areas
+								var/T = "Target Area(s): "
+								for(var/area/I in BL.area_targets)
+									T += "[initial(I.name)], "
+								sList2 += T
+							else	//Break number of lights
+								sList2 += "Lights Broken: " + "[BL.lightsbroken]/[BL.target_amount]"
+		if (sList2 != null)
+			stat(null, "[sList2.Join("\n\n")]")
 
 	//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()]"
-		if(SN.s_initialized)
-			//Suit gear
-			. += "Energy Charge: [round(SN.cell.charge/100)]%"
-			. += "Smoke Bombs: \Roman [SN.s_bombs]"
-			//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)"
+		if(statpanel("SpiderOS"))
+			stat("SpiderOS Status:","[SN.s_initialized ? "Initialized" : "Disabled"]")
+			stat("Current Time:", "[STATION_TIME_TIMESTAMP("hh:mm:ss")]")
+			if(SN.s_initialized)
+				//Suit gear
+				stat("Energy Charge:", "[round(SN.cell.charge/100)]%")
+				stat("Smoke Bombs:", "\Roman [SN.s_bombs]")
+				//Ninja status
+				stat("Fingerprints:", "[md5(dna.uni_identity)]")
+				stat("Unique Identity:", "[dna.unique_enzymes]")
+				stat("Overall Status:", "[stat > 1 ? "dead" : "[health]% healthy"]")
+				stat("Nutrition Status:", "[nutrition]")
+				stat("Hydration Status:", "[thirst]")
+				stat("Oxygen Loss:", "[getOxyLoss()]")
+				stat("Toxin Levels:", "[getToxLoss()]")
+				stat("Burn Severity:", "[getFireLoss()]")
+				stat("Brute Trauma:", "[getBruteLoss()]")
+				stat("Radiation Levels:","[radiation] rad")
+				stat("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]"
+				//Diseases
+				if(diseases.len)
+					stat("Viruses:", null)
+					for(var/thing in diseases)
+						var/datum/disease/D = thing
+						stat("*", "[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)

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

@@ -17,8 +17,8 @@
 	hud_type = /datum/hud/monkey
 
 /mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner)
-	add_verb(src, /mob/living/proc/mob_sleep)
-	add_verb(src, /mob/living/proc/lay_down)
+	verbs += /mob/living/proc/mob_sleep
+	verbs += /mob/living/proc/lay_down
 
 	if(unique_name) //used to exclude pun pun
 		gender = pick(MALE, FEMALE)
@@ -89,16 +89,16 @@
 		return
 	add_movespeed_modifier(MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
 
-/mob/living/carbon/monkey/get_status_tab_items()
-	. = ..()
-	. += "Intent: [a_intent]"
-	. += "Move Mode: [m_intent]"
-	if(client && mind)
-		var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
-		if(changeling)
-			. += ""
-			. += "Chemical Storage: [changeling.chem_charges]/[changeling.chem_storage]"
-			. += "Absorbed DNA: [changeling.absorbedcount]"
+/mob/living/carbon/monkey/Stat()
+	..()
+	if(statpanel("Status"))
+		stat(null, "Intent: [a_intent]")
+		stat(null, "Move Mode: [m_intent]")
+		if(client && mind)
+			var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
+			if(changeling)
+				stat("Chemical Storage", "[changeling.chem_charges]/[changeling.chem_storage]")
+				stat("Absorbed DNA", changeling.absorbedcount)
 	return
 
 

code/modules/mob/living/living.dm

@@ -1104,10 +1104,8 @@
 		A.action.Remove(src)
 
 /mob/living/proc/add_abilities_to_panel()
-	var/list/L = list()
 	for(var/obj/effect/proc_holder/A in abilities)
-		L[++L.len] = list("[A.panel]",A.get_panel_text(),A.name,"[REF(A)]")
-	return L
+		statpanel("[A.panel]",A.get_panel_text(),A)
 
 /mob/living/lingcheck()
 	if(mind)

code/modules/mob/living/silicon/ai/ai.dm

@@ -137,7 +137,7 @@
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
-	add_verb(src, /mob/living/silicon/ai/proc/show_laws_verb)
+	verbs += /mob/living/silicon/ai/proc/show_laws_verb
 
 	aiPDA = new/obj/item/pda/ai(src)
 	aiPDA.owner = name
@@ -151,10 +151,10 @@
 	deploy_action.Grant(src)
 
 	if(isturf(loc))
-		add_verb(src, list(/mob/living/silicon/ai/proc/ai_network_change, \
+		verbs.Add(/mob/living/silicon/ai/proc/ai_network_change, \
 		/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
 		/mob/living/silicon/ai/proc/botcall, /mob/living/silicon/ai/proc/control_integrated_radio, \
-		/mob/living/silicon/ai/proc/set_automatic_say_channel))
+		/mob/living/silicon/ai/proc/set_automatic_say_channel)
 
 	GLOB.ai_list += src
 	GLOB.shuttle_caller_list += src
@@ -205,26 +205,26 @@
 	display_icon_override = ai_core_icon
 	set_core_display_icon(ai_core_icon)
 
-/mob/living/silicon/ai/get_status_tab_items()
-	. = ..()
-	if(stat != CONSCIOUS)
-		. += text("Systems nonfunctional")
-		return
-	. += text("System integrity: [(health + 100) * 0.5]%")
-	. += text("Connected cyborgs: [length(connected_robots)]")
-	for(var/r in connected_robots)
-		var/mob/living/silicon/robot/connected_robot = r
-		var/robot_status = "Nominal"
-		if(connected_robot.shell)
-			robot_status = "AI SHELL"
-		else if(connected_robot.stat != CONSCIOUS || !connected_robot.client)
-			robot_status = "OFFLINE"
-		else if(!connected_robot.cell || connected_robot.cell.charge <= 0)
-			robot_status = "DEPOWERED"
-		//Name, Health, Battery, Module, Area, and Status! Everything an AI wants to know about its borgies!
-		. += text("[connected_robot.name] | S.Integrity: [connected_robot.health]% | Cell: [connected_robot.cell ? "[connected_robot.cell.charge]/[connected_robot.cell.maxcharge]" : "Empty"] | \
-		Module: [connected_robot.designation] | Loc: [get_area_name(connected_robot, TRUE)] | Status: [robot_status]")
-	. += text("AI shell beacons detected: [LAZYLEN(GLOB.available_ai_shells)]") //Count of total AI shells
+/mob/living/silicon/ai/Stat()
+	..()
+	if(statpanel("Status"))
+		if(!stat)
+			stat(null, text("System integrity: [(health+100)/2]%"))
+			stat(null, text("Connected cyborgs: [connected_robots.len]"))
+			for(var/mob/living/silicon/robot/R in connected_robots)
+				var/robot_status = "Nominal"
+				if(R.shell)
+					robot_status = "AI SHELL"
+				else if(R.stat || !R.client)
+					robot_status = "OFFLINE"
+				else if(!R.cell || R.cell.charge <= 0)
+					robot_status = "DEPOWERED"
+				//Name, Health, Battery, Module, Area, and Status! Everything an AI wants to know about its borgies!
+				stat(null, text("[R.name] | S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "Empty"] | \
+				Module: [R.designation] | Loc: [get_area_name(R, TRUE)] | Status: [robot_status]"))
+			stat(null, text("AI shell beacons detected: [LAZYLEN(GLOB.available_ai_shells)]")) //Count of total AI shells
+		else
+			stat(null, text("Systems nonfunctional"))
 
 /mob/living/silicon/ai/proc/ai_alerts()
 	var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"

code/modules/mob/living/silicon/pai/pai.dm

@@ -172,12 +172,13 @@
 		else
 			client.eye = card
 
-/mob/living/silicon/pai/get_status_tab_items()
-	. += ..()
-	if(!stat)
-		. += text("Emitter Integrity: [emitterhealth * (100/emittermaxhealth)]")
-	else
-		. += text("Systems nonfunctional")
+/mob/living/silicon/pai/Stat()
+	..()
+	if(statpanel("Status"))
+		if(!stat)
+			stat(null, text("Emitter Integrity: [emitterhealth * (100/emittermaxhealth)]"))
+		else
+			stat(null, text("Systems nonfunctional"))
 
 /mob/living/silicon/pai/restrained(ignore_grab)
 	. = FALSE

code/modules/mob/living/silicon/robot/robot.dm

@@ -321,20 +321,19 @@
 	if(thruster_button)
 		thruster_button.icon_state = "ionpulse[ionpulse_on]"
 
+/mob/living/silicon/robot/Stat()
+	..()
+	if(statpanel("Status"))
+		if(cell)
+			stat("Charge Left:", "[cell.charge]/[cell.maxcharge]")
+		else
+			stat(null, text("No Cell Inserted!"))
 
-/mob/living/silicon/robot/get_status_tab_items()
-	. = ..()
-	. += ""
-	if(cell)
-		. += "Charge Left: [cell.charge]/[cell.maxcharge]"
-	else
-		. += text("No Cell Inserted!")
-
-	if(module)
-		for(var/datum/robot_energy_storage/st in module.storages)
-			. += "[st.name]: [st.energy]/[st.max_energy]"
-	if(connected_ai)
-		. += "Master AI: [connected_ai.name]"
+		if(module)
+			for(var/datum/robot_energy_storage/st in module.storages)
+				stat("[st.name]:", "[st.energy]/[st.max_energy]")
+		if(connected_ai)
+			stat("Master AI:", connected_ai.name)
 
 /mob/living/silicon/robot/restrained(ignore_grab)
 	. = 0

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -38,7 +38,7 @@
 
 /mob/living/simple_animal/pet/cat/Initialize()
 	. = ..()
-	add_verb(src, /mob/living/proc/lay_down)
+	verbs += /mob/living/proc/lay_down
 
 /mob/living/simple_animal/pet/cat/ComponentInitialize()
 	. = ..()

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -154,17 +154,18 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 		REMOVE_TRAIT(summoner, TRAIT_NODEATH, "memento_mori")
 		to_chat(summoner,"<span class='danger'>You feel incredibly vulnerable as the memento mori pulls your life force in one too many directions!")
 
-/mob/living/simple_animal/hostile/guardian/get_status_tab_items()
-	. += ..()
-	if(summoner)
-		var/resulthealth
-		if(iscarbon(summoner))
-			resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100)
-		else
-			resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5)
-		. += "Summoner Health: [resulthealth]%"
-	if(cooldown >= world.time)
-		. += "Manifest/Recall Cooldown Remaining: [DisplayTimeText(cooldown - world.time)]"
+/mob/living/simple_animal/hostile/guardian/Stat()
+	..()
+	if(statpanel("Status"))
+		if(summoner)
+			var/resulthealth
+			if(iscarbon(summoner))
+				resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100)
+			else
+				resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5)
+			stat(null, "Summoner Health: [resulthealth]%")
+		if(cooldown >= world.time)
+			stat(null, "Manifest/Recall Cooldown Remaining: [DisplayTimeText(cooldown - world.time)]")
 
 /mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
 	. = ..()
@@ -440,13 +441,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 						to_chat(src, "<span class='holoparasite'><font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font> has been summoned!</span>")
 				guardians -= G
 				if(!guardians.len)
-					remove_verb(src, /mob/living/proc/guardian_reset)
+					verbs -= /mob/living/proc/guardian_reset
 			else
 				to_chat(src, "<span class='holoparasite'>There were no ghosts willing to take control of <font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font>. Looks like you're stuck with it for now.</span>")
 		else
 			to_chat(src, "<span class='holoparasite'>You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].</span>")
 	else
-		remove_verb(src, /mob/living/proc/guardian_reset)
+		verbs -= /mob/living/proc/guardian_reset
 
 ////////parasite tracking/finding procs
 
@@ -570,9 +571,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 		if("carp")
 			to_chat(user, "[G.carp_fluff_string]")
 			to_chat(user, "<span class='holoparasite'><font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font> has been caught!</span>")
-	add_verb(user, list(/mob/living/proc/guardian_comm, \
-						/mob/living/proc/guardian_recall, \
-						/mob/living/proc/guardian_reset))
+	user.verbs += /mob/living/proc/guardian_comm
+	user.verbs += /mob/living/proc/guardian_recall
+	user.verbs += /mob/living/proc/guardian_reset
 
 /obj/item/guardiancreator/choose
 	random = FALSE

code/modules/mob/living/simple_animal/guardian/types/assassin.dm

@@ -24,10 +24,11 @@
 	if(loc == summoner && toggle)
 		ToggleMode(0)
 
-/mob/living/simple_animal/hostile/guardian/assassin/get_status_tab_items()
-	. = ..()
-	if(stealthcooldown >= world.time)
-		. += "Stealth Cooldown Remaining: [DisplayTimeText(stealthcooldown - world.time)]"
+/mob/living/simple_animal/hostile/guardian/assassin/Stat()
+	..()
+	if(statpanel("Status"))
+		if(stealthcooldown >= world.time)
+			stat(null, "Stealth Cooldown Remaining: [DisplayTimeText(stealthcooldown - world.time)]")
 
 /mob/living/simple_animal/hostile/guardian/assassin/AttackingTarget()
 	. = ..()

code/modules/mob/living/simple_animal/guardian/types/explosive.dm

@@ -7,10 +7,11 @@
 	carp_fluff_string = "<span class='holoparasite'>CARP CARP CARP! Caught one! It's an explosive carp! Boom goes the fishy.</span>"
 	var/bomb_cooldown = 0
 
-/mob/living/simple_animal/hostile/guardian/bomb/get_status_tab_items()
-	. = ..()
-	if(bomb_cooldown >= world.time)
-		. += "Bomb Cooldown Remaining: [DisplayTimeText(bomb_cooldown - world.time)]"
+/mob/living/simple_animal/hostile/guardian/bomb/Stat()
+	..()
+	if(statpanel("Status"))
+		if(bomb_cooldown >= world.time)
+			stat(null, "Bomb Cooldown Remaining: [DisplayTimeText(bomb_cooldown - world.time)]")
 
 /mob/living/simple_animal/hostile/guardian/bomb/AttackingTarget()
 	. = ..()

code/modules/mob/living/simple_animal/guardian/types/support.dm

@@ -17,11 +17,11 @@
 	var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
 	medsensor.add_hud_to(src)
 
-
-/mob/living/simple_animal/hostile/guardian/healer/get_status_tab_items()
-	. = ..()
-	if(beacon_cooldown >= world.time)
-		. += "Beacon Cooldown Remaining: [DisplayTimeText(beacon_cooldown - world.time)]"
+/mob/living/simple_animal/hostile/guardian/healer/Stat()
+	..()
+	if(statpanel("Status"))
+		if(beacon_cooldown >= world.time)
+			stat(null, "Beacon Cooldown Remaining: [DisplayTimeText(beacon_cooldown - world.time)]")
 
 /mob/living/simple_animal/hostile/guardian/healer/AttackingTarget()
 	. = ..()

code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm

@@ -128,7 +128,7 @@
 
 /mob/living/simple_animal/hostile/jungle/leaper/Initialize()
 	. = ..()
-	remove_verb(src, /mob/living/verb/pulled)
+	verbs -= /mob/living/verb/pulled
 
 /mob/living/simple_animal/hostile/jungle/leaper/CtrlClickOn(atom/A)
 	face_atom(A)

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -638,8 +638,8 @@ Difficulty: Very Hard
 
 /mob/living/simple_animal/hostile/lightgeist/Initialize()
 	. = ..()
-	remove_verb(src, /mob/living/verb/pulled)
-	remove_verb(src, /mob/verb/me_verb)
+	verbs -= /mob/living/verb/pulled
+	verbs -= /mob/verb/me_verb
 	var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
 	medsensor.add_hud_to(src)
 
@@ -728,7 +728,7 @@ Difficulty: Very Hard
 		L.mind.transfer_to(holder_animal)
 		var/obj/effect/proc_holder/spell/targeted/exit_possession/P = new /obj/effect/proc_holder/spell/targeted/exit_possession
 		holder_animal.mind.AddSpell(P)
-		remove_verb(holder_animal, /mob/living/verb/pulled)
+		holder_animal.verbs -= /mob/living/verb/pulled
 
 /obj/structure/closet/stasis/dump_contents(var/kill = 1)
 	STOP_PROCESSING(SSobj, src)

code/modules/mob/living/simple_animal/parrot.dm

@@ -110,12 +110,12 @@
 
 	parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var
 
-	add_verb(src, list(/mob/living/simple_animal/parrot/proc/steal_from_ground, \
+	verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \
 			  /mob/living/simple_animal/parrot/proc/steal_from_mob, \
 			  /mob/living/simple_animal/parrot/verb/drop_held_item_player, \
 			  /mob/living/simple_animal/parrot/proc/perch_player, \
 			  /mob/living/simple_animal/parrot/proc/toggle_mode,
-			  /mob/living/simple_animal/parrot/proc/perch_mob_player))
+			  /mob/living/simple_animal/parrot/proc/perch_mob_player)
 
 
 /mob/living/simple_animal/parrot/examine(mob/user)
@@ -137,12 +137,11 @@
 
 	..(gibbed)
 
-
-/mob/living/simple_animal/parrot/get_status_tab_items()
-	. = ..()
-	. += ""
-	. += "Held Item: [held_item]"
-	. += "Mode: [a_intent]"
+/mob/living/simple_animal/parrot/Stat()
+	..()
+	if(statpanel("Status"))
+		stat("Held Item", held_item)
+		stat("Mode",a_intent)
 
 /mob/living/simple_animal/parrot/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode, atom/movable/source)
 	. = ..()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -5,7 +5,7 @@
 	maxHealth = 20
 	gender = PLURAL //placeholder
 	blood_volume = 550   //How much blud it has for bloodsucking
-
+	
 	status_flags = CANPUSH
 
 	var/icon_living = ""
@@ -294,11 +294,11 @@
 		remove_movespeed_modifier(MOVESPEED_ID_SIMPLEMOB_VARSPEED, TRUE)
 	add_movespeed_modifier(MOVESPEED_ID_SIMPLEMOB_VARSPEED, TRUE, 100, multiplicative_slowdown = speed, override = TRUE)
 
-
-/mob/living/simple_animal/get_status_tab_items()
-	. = ..()
-	. += ""
-	. += "Health: [round((health / maxHealth) * 100)]%"
+/mob/living/simple_animal/Stat()
+	..()
+	if(statpanel("Status"))
+		stat(null, "Health: [round((health / maxHealth) * 100)]%")
+		return 1
 
 /mob/living/simple_animal/proc/drop_loot()
 	if(loot.len)

code/modules/mob/living/simple_animal/slime/slime.dm

@@ -197,21 +197,21 @@
 /mob/living/simple_animal/slime/Process_Spacemove(movement_dir = 0)
 	return 2
 
-/mob/living/simple_animal/slime/get_status_tab_items()
+/mob/living/simple_animal/slime/Stat()
 	if(..())
 
 		if(!docile)
-			. += "Nutrition: [nutrition]/[get_max_nutrition()]"
+			stat(null, "Nutrition: [nutrition]/[get_max_nutrition()]")
 		if(amount_grown >= SLIME_EVOLUTION_THRESHOLD)
 			if(is_adult)
-				. += "You can reproduce!"
+				stat(null, "You can reproduce!")
 			else
-				. += "You can evolve!"
+				stat(null, "You can evolve!")
 
 		if(stat == UNCONSCIOUS)
-			. += "You are knocked out by high levels of BZ!"
+			stat(null,"You are knocked out by high levels of BZ!")
 		else
-			. += "Power Level: [powerlevel]"
+			stat(null,"Power Level: [powerlevel]")
 
 
 /mob/living/simple_animal/slime/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE)

code/modules/mob/mob.dm

@@ -572,7 +572,7 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
 /mob/proc/is_muzzled()
 	return 0
 
-/*
+
 /mob/Stat()
 	..()
 	//This is where I try and add a temporary solution to the issue of the status tab. This solution is bad and I should feel bad, but it should mitigate some of the client lag.
@@ -646,31 +646,25 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
 				if(A.IsObscured())
 					continue
 				statpanel(listed_turf.name, null, A)
-*/
 
-/// Adds this list to the output to the stat browser
-/mob/proc/get_status_tab_items()
-	. = list()
 
-/// Gets all relevant proc holders for the browser statpenl
-/mob/proc/get_proc_holders()
-	. = list()
 	if(mind)
-		. += get_spells_for_statpanel(mind.spell_list)
-	. += get_spells_for_statpanel(mob_spell_list)
+		add_spells_to_statpanel(mind.spell_list)
+		var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
+		if(changeling)
+			add_stings_to_statpanel(changeling.purchasedpowers)
+	add_spells_to_statpanel(mob_spell_list)
 
-/mob/proc/get_spells_for_statpanel(list/spells)
-	var/list/L = list()
+/mob/proc/add_spells_to_statpanel(list/spells)
 	for(var/obj/effect/proc_holder/spell/S in spells)
 		if(S.can_be_cast_by(src))
 			switch(S.charge_type)
 				if("recharge")
-					L[++L.len] = list("[S.panel]", "[S.charge_counter/10.0]/[S.charge_max/10]", S.name, REF(S))
+					statpanel("[S.panel]","[S.charge_counter/10.0]/[S.charge_max/10]",S)
 				if("charges")
-					L[++L.len] = list("[S.panel]", "[S.charge_counter]/[S.charge_max]", S.name, REF(S))
+					statpanel("[S.panel]","[S.charge_counter]/[S.charge_max]",S)
 				if("holdervar")
-					L[++L.len] = list("[S.panel]", "[S.holder_var_type] [S.holder_var_amount]", S.name, REF(S))
-	return L
+					statpanel("[S.panel]","[S.holder_var_type] [S.holder_var_amount]",S)
 
 /mob/proc/add_stings_to_statpanel(list/stings)
 	for(var/obj/effect/proc_holder/changeling/S in stings)
@@ -800,8 +794,6 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
 		if(istype(S, spell))
 			mob_spell_list -= S
 			qdel(S)
-	if(client)
-		client << output(null, "statbrowser:check_spells")
 
 /mob/proc/anti_magic_check(magic = TRUE, holy = FALSE)
 	if(!magic && !holy)