From 269ead92ea0d4f5d13577b081f8f083be4ceb2a3 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Mon, 24 Oct 2016 03:04:37 +0200
Subject: [PATCH] Legion fixes, debug controller additions, turret fix

---
 code/controllers/verbs.dm                     | 26 ++++++++++++++++++-
 code/game/machinery/portable_turret.dm        |  2 +-
 code/modules/awaymissions/corpse.dm           |  2 --
 .../simple_animal/hostile/megafauna/legion.dm |  9 ++++---
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index 3aa638aa40f..3fe74ae04eb 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -18,7 +18,7 @@
 	return
 
 
-/client/proc/debug_controller(controller in list("Master","failsafe","Ticker","Air","Lighting","Jobs","Sun","Radio","Configuration","pAI", "Cameras","Garbage", "Transfer Controller","Event","Alarm","Scheduler","Nano","Vote"))
+/client/proc/debug_controller(controller in list("Master","failsafe","Ticker","Air","Lighting","Jobs","Sun","Radio","Configuration","pAI", "Cameras","Garbage", "Transfer Controller","Event","Alarm","Scheduler","Nano","Vote","Diseases","Fires","Mob","NPC AI","Shuttle","Timer","Weather","Space"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -76,6 +76,30 @@
 		if("Vote")
 			debug_variables(vote)
 			feedback_add_details("admin_verb","DVote")
+		if("Diseases")
+			debug_variables(disease_master)
+			feedback_add_details("admin_verb","DDiseases")
+		if("Fires")
+			debug_variables(fire_master)
+			feedback_add_details("admin_verb","DFires")
+		if("Mob")
+			debug_variables(mob_master)
+			feedback_add_details("admin_verb","DMob")
+		if("NPC AI")
+			debug_variables(npcai_master)
+			feedback_add_details("admin_verb","DNPCAI")
+		if("Shuttle")
+			debug_variables(shuttle_master)
+			feedback_add_details("admin_verb","DShuttle")
+		if("Timer")
+			debug_variables(timer_master)
+			feedback_add_details("admin_verb","DTimer")
+		if("Weather")
+			debug_variables(weather_master)
+			feedback_add_details("admin_verb","DWeather")
+		if("Space")
+			debug_variables(space_manager)
+			feedback_add_details("admin_verb","DSpace")
 
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
 	return
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index cbaacfb1175..469738e7aaa 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -316,7 +316,7 @@ var/list/turret_icons
 			req_access += required
 
 /obj/machinery/porta_turret/power_change()
-	if(powered())
+	if(powered() || !use_power)
 		stat &= ~NOPOWER
 		update_icon()
 	else
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 6bf82a0f889..4c050e0d4f3 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -41,8 +41,6 @@
 	M.death(1) //Kills the new mob
 	M.adjustOxyLoss(oxy_damage)
 	M.adjustBruteLoss(brute_damage)
-	M.adjustOxyLoss(oxy_damage)
-	M.adjustBruteLoss(brute_damage)
 	M.timeofdeath = timeofdeath
 	if(mob_species)
 		M.set_species(mob_species)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
index b9f6f97f864..975f7f0b93c 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -158,21 +158,22 @@ Difficulty: Medium
 
 /obj/item/weapon/staff/storm/attack_self(mob/user)
 	if(storm_cooldown > world.time)
-		user << "<span class='warning'>The staff is still recharging!</span>"
+		to_chat(user, "<span class='warning'>The staff is still recharging!</span>")
 		return
 
 	var/area/user_area = get_area(user)
 	var/datum/weather/A
+	var/z_level_name = space_manager.levels_by_name[user.z]
 	for(var/V in weather_master.existing_weather)
 		var/datum/weather/W = V
-		if(W.target_z == user.z && W.area_type == user_area.type)
+		if(W.target_z == z_level_name && W.area_type == user_area.type)
 			A = W
 			break
 	if(A)
 
 		if(A.stage != END_STAGE)
 			if(A.stage == WIND_DOWN_STAGE)
-				user << "<span class='warning'>The storm is already ending! It would be a waste to use the staff now.</span>"
+				to_chat(user, "<span class='warning'>The storm is already ending! It would be a waste to use the staff now.</span>")
 				return
 			user.visible_message("<span class='warning'>[user] holds [src] skywards as an orange beam travels into the sky!</span>", \
 			"<span class='notice'>You hold [src] skyward, dispelling the storm!</span>")
@@ -183,7 +184,7 @@ Difficulty: Medium
 		A = new storm_type
 		A.name = "staff storm"
 		A.area_type = user_area.type
-		A.target_z = user.z
+		A.target_z = z_level_name
 		A.telegraph_duration = 100
 		A.end_duration = 100