From c2bf323caa32201ed6ca62d7994fb891495dc8b1 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Sat, 3 Mar 2012 15:22:33 -0700
Subject: [PATCH] Fixed some screwwy icon stuff from the last commit, fixed an
 overlay not updating.

---
 code/modules/mob/screen.dm      | 3 ++-
 code/modules/projectiles/gun.dm | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index dc5a633a1bf..07e6674f3d8 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -30,7 +30,7 @@
 	name = "gun"
 	icon = 'screen1.dmi'
 	master = null
-	dir = 1
+	dir = 2
 
 	move
 		name = "Allow Walking"
@@ -52,6 +52,7 @@
 		desc = "The shortcut key for this is \"F6\""
 		icon_state = "gun"
 		screen_loc = ui_gun_select
+		dir = 1
 
 /obj/screen/zone_sel/MouseDown(location, control,params)
 	// Changes because of 4.0
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 0ae8a0c0a30..d108e2934c0 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -319,7 +319,6 @@ mob/proc
 				M << 'TargetOff.ogg'
 		del(target_locked)
 		targeted_by -= I
-		update_clothing()
 		I.target = null
 		var/mob/T = I.loc
 		if(T && ismob(T))
@@ -327,6 +326,7 @@ mob/proc
 			del(T.gun_move_icon)
 			del(T.gun_run_icon)
 		if(!targeted_by.len) del targeted_by
+		spawn(1) update_clothing()
 
 /*	Captive(var/obj/item/weapon/gun/I)
 		Sound(src,'CounterAttack.ogg')