From e7ba8df654c93ab5fbae71fbb7150a403ef8bafe Mon Sep 17 00:00:00 2001
From: MrPerson <spamtaffic@gmail.com>
Date: Fri, 13 Mar 2015 12:10:13 -0700
Subject: [PATCH] Moved all pull icon updating to update_icon(), to reduce
 copy+paste. Made the pull icon update_icon() as part of creation as requested
 by oranges.

---
 code/_onclick/hud/alien.dm          | 2 +-
 code/_onclick/hud/alien_larva.dm    | 2 +-
 code/_onclick/hud/drones.dm         | 2 +-
 code/_onclick/hud/human.dm          | 2 +-
 code/_onclick/hud/monkey.dm         | 2 +-
 code/_onclick/hud/robot.dm          | 2 +-
 code/_onclick/hud/screen_objects.dm | 7 +++++++
 code/modules/mob/mob.dm             | 4 ++--
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm
index 4f13c983594..a0422e05b91 100644
--- a/code/_onclick/hud/alien.dm
+++ b/code/_onclick/hud/alien.dm
@@ -106,7 +106,7 @@
 
 	mymob.pullin = new /obj/screen/pull()
 	mymob.pullin.icon = 'icons/mob/screen_alien.dmi'
-	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.update_icon(mymob)
 	mymob.pullin.screen_loc = ui_pull_resist
 
 //begin indicators
diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
index 3f9ea8e37d6..ab395f371e1 100644
--- a/code/_onclick/hud/alien_larva.dm
+++ b/code/_onclick/hud/alien_larva.dm
@@ -29,7 +29,7 @@
 
 	mymob.pullin = new /obj/screen/pull()
 	mymob.pullin.icon = 'icons/mob/screen_alien.dmi'
-	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.update_icon(mymob)
 	mymob.pullin.screen_loc = ui_pull_resist
 
 	mymob.blind = new /obj/screen()
diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm
index 086dc39c95a..63600d94053 100644
--- a/code/_onclick/hud/drones.dm
+++ b/code/_onclick/hud/drones.dm
@@ -11,7 +11,7 @@
 
 	mymob.pullin = new /obj/screen/pull()
 	mymob.pullin.icon = ui_style
-	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.update_icon(mymob)
 	mymob.pullin.screen_loc = ui_drone_pull
 	adding += mymob.pullin
 
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 4d2ea2b32f0..18b4f72a13b 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -267,7 +267,7 @@
 
 	mymob.pullin = new /obj/screen/pull()
 	mymob.pullin.icon = ui_style
-	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.update_icon(mymob)
 	mymob.pullin.screen_loc = ui_pull_resist
 	hotkeybuttons += mymob.pullin
 
diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm
index 3cd2871960c..c96e2556de9 100644
--- a/code/_onclick/hud/monkey.dm
+++ b/code/_onclick/hud/monkey.dm
@@ -96,7 +96,7 @@
 
 	mymob.pullin = new /obj/screen/pull()
 	mymob.pullin.icon = ui_style
-	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.update_icon(mymob)
 	mymob.pullin.screen_loc = ui_pull_resist
 
 	lingchemdisplay = new /obj/screen/ling/chems()
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index fe5b38db0ab..878efe59e65 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -127,7 +127,7 @@
 
 	mymob.pullin = new /obj/screen/pull()
 	mymob.pullin.icon = 'icons/mob/screen_cyborg.dmi'
-	mymob.pullin.icon_state = "pull0"
+	mymob.pullin.update_icon(mymob)
 	mymob.pullin.screen_loc = ui_borg_pull
 
 	mymob.blind = new /obj/screen()
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 0a289671a7a..856dce11be8 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -187,6 +187,13 @@
 /obj/screen/pull/Click()
 	usr.stop_pulling()
 
+/obj/screen/pull/update_icon(mob/mymob)
+	if(!mymob) return
+	if(mymob.pulling)
+		icon_state = "pull"
+	else
+		icon_state = "pull0"
+
 /obj/screen/resist
 	name = "resist"
 	icon = 'icons/mob/screen_midnight.dmi'
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 95602ff6bbe..0743fbaa710 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -391,7 +391,7 @@ var/list/slot_equipment_priority = list( \
 		src.pulling = AM
 		AM.pulledby = src
 		if(pullin)
-			pullin.icon_state = "pull"
+			pullin.update_icon(src)
 		if(ismob(AM))
 			var/mob/M = AM
 			if(!iscarbon(src))
@@ -408,7 +408,7 @@ var/list/slot_equipment_priority = list( \
 		pulling.pulledby = null
 		pulling = null
 		if(pullin)
-			pullin.icon_state = "pull0"
+			pullin.update_icon(src)
 
 /mob/verb/mode()
 	set name = "Activate Held Object"