From eab6f4fc44c7c909a614c991f7085499829376c5 Mon Sep 17 00:00:00 2001
From: MisterBook <MisterBook@FakeAccount.Fake>
Date: Wed, 5 Jun 2013 19:37:29 -0500
Subject: [PATCH] Taser fix v.3.2

Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
---
 baystation12.dme                                              | 1 +
 code/datums/datacore.dm                                       | 2 ++
 .../structures/crates_lockers/closets/secure/security.dm      | 2 +-
 code/modules/mob/living/carbon/human/human_defense.dm         | 4 ++--
 code/modules/mob/living/carbon/human/update_icons.dm          | 2 ++
 code/modules/mob/new_player/preferences_setup.dm              | 2 ++
 code/modules/organs/organ_external.dm                         | 2 ++
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/baystation12.dme b/baystation12.dme
index bd0d1a256d3..0ea75da44d9 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -492,6 +492,7 @@
 #include "code\game\objects\items\devices\transfer_valve.dm"
 #include "code\game\objects\items\devices\uplinks.dm"
 #include "code\game\objects\items\devices\violin.dm"
+#include "code\game\objects\items\devices\whistle.dm"
 #include "code\game\objects\items\devices\PDA\cart.dm"
 #include "code\game\objects\items\devices\PDA\chatroom.dm"
 #include "code\game\objects\items\devices\PDA\PDA.dm"
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index e2a9e1e1bfe..37797884f17 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -122,8 +122,10 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 			icobase = 'icons/mob/human_races/r_lizard.dmi'
 		if("Skrell")
 			icobase = 'icons/mob/human_races/r_skrell.dmi'
+			/*
 		if("Vox")
 			icobase = 'icons/mob/human_races/r_vox.dmi'
+			*/
 		else
 			icobase = 'icons/mob/human_races/r_human.dmi'
 
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 413333f397c..b19a4cdf724 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -186,7 +186,7 @@
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/taperoll/police(src)
-		new /obj/item/device/hailer
+		new /obj/item/device/hailer(src)
 		return
 
 
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index ee346ebd8fb..79be30e4c40 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -23,8 +23,8 @@ emp_act
 				if(C.body_parts_covered & select_area.body_part) // Is that body part being targeted covered?
 					P.agony=P.agony*C.siemens_coefficient
 					visible_message("\red [src]'s [C.name] absorbs some of the shock from the [P.name]!</B></red>")
-					apply_effect(P.agony,AGONY,0)
-					del P
+		apply_effect(P.agony,AGONY,0)
+		del P
 					/* Commenting out new-old taser nerf.
 					if(C.siemens_coefficient == 0) //If so, is that clothing shock proof?
 						if(prob(deflectchance))
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index c506b35250d..6264e381ac2 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -444,9 +444,11 @@ proc/get_damage_icon_part(damage_state, body_part)
 			if("skrell")
 				race_icon = 'icons/mob/human_races/r_skrell.dmi'
 				deform_icon = 'icons/mob/human_races/r_def_skrell.dmi'
+				/*
 			if("vox")
 				race_icon = 'icons/mob/human_races/r_vox.dmi'
 				deform_icon = 'icons/mob/human_races/r_def_vox.dmi'
+				*/
 			else
 				race_icon = 'icons/mob/human_races/r_human.dmi'
 				deform_icon = 'icons/mob/human_races/r_def_human.dmi'
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index f1cf54af153..0bc7879292a 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -144,8 +144,10 @@ datum/preferences
 				icobase = 'icons/mob/human_races/r_lizard.dmi'
 			if("Skrell")
 				icobase = 'icons/mob/human_races/r_skrell.dmi'
+				/*
 			if("Vox")
 				icobase = 'icons/mob/human_races/r_vox.dmi'
+				*/
 			else
 				icobase = 'icons/mob/human_races/r_human.dmi'
 		preview_icon = new /icon(icobase, "torso_[g]")
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 4d0e8bfac35..2c3778d79f0 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -740,8 +740,10 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 				base = new('icons/mob/human_races/r_lizard.dmi')
 			if("skrell")
 				base = new('icons/mob/human_races/r_skrell.dmi')
+				/*
 			if("vox")
 				base = new('icons/mob/human_races/r_vox.dmi')
+				*/
 			else
 				base = new('icons/mob/human_races/r_human.dmi')
 		if(base)