From fd243de33d86c5e1ddadad2320bc901e76db6376 Mon Sep 17 00:00:00 2001
From: Nerd Lord <duorabbit2@gmail.com>
Date: Tue, 19 Apr 2016 15:40:02 -0400
Subject: [PATCH 1/2] kor's fault

---
 code/game/objects/items/nuke_tools.dm    |   4 ----
 code/game/objects/items/weapons/tools.dm |  23 ++++++++---------------
 icons/obj/items_cyborg.dmi               | Bin 2251 -> 2258 bytes
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/code/game/objects/items/nuke_tools.dm b/code/game/objects/items/nuke_tools.dm
index dc36d390d6c..2993fa31776 100644
--- a/code/game/objects/items/nuke_tools.dm
+++ b/code/game/objects/items/nuke_tools.dm
@@ -65,12 +65,8 @@
 	desc = "A screwdriver with an ultra thin tip."
 	icon = 'icons/obj/nuke_tools.dmi'
 	icon_state = "screwdriver_nuke"
-	item_state = "screwdriver_nuke"
 	toolspeed = 2
 
-/obj/item/weapon/screwdriver/nuke/New()
-//to skip screwdriver icon update
-
 /obj/item/weapon/paper/nuke_instructions
 	info = "How to break into a Nanotrasen self-destruct terminal and remove its plutonium core:<br>\
 	<ul>\
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 7ff02366d3c..7f22e5ce66b 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -85,7 +85,7 @@
 	name = "screwdriver"
 	desc = "You can be totally screwy with this."
 	icon = 'icons/obj/items.dmi'
-	icon_state = "screwdriver_blue"
+	icon_state = null
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 5
@@ -104,10 +104,9 @@
 	return(BRUTELOSS)
 
 /obj/item/weapon/screwdriver/New(loc, var/param_color = null)
-	if(!param_color)
+	if(!param_color && !icon_state)
 		param_color = pick("red","blue","pink","brown","green","cyan","yellow")
-
-	icon_state = "screwdriver_[param_color]"
+		icon_state = "screwdriver_[param_color]"
 
 	if (prob(75))
 		src.pixel_y = rand(0, 16)
@@ -126,12 +125,9 @@
 	name = "powered screwdriver"
 	desc = "An electrical screwdriver, designed to be both precise and quick."
 	icon = 'icons/obj/items_cyborg.dmi'
-	icon_state = "screwdriver"
+	icon_state = "screwdriver_cyborg"
 	toolspeed = 2
 
-/obj/item/weapon/screwdriver/cyborg/New(loc, var/param_color = null)
-	return ..(loc, "cyborg")
-
 /*
  * Wirecutters
  */
@@ -139,7 +135,7 @@
 	name = "wirecutters"
 	desc = "This cuts wires."
 	icon = 'icons/obj/items.dmi'
-	icon_state = "cutters_red"
+	icon_state = null
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 6
@@ -154,9 +150,9 @@
 
 /obj/item/weapon/wirecutters/New(loc, var/param_color = null)
 	..()
-	if(!param_color)
+	if(!param_color && !icon_state)
 		param_color = pick("yellow", "red")
-	icon_state = "cutters_[param_color]"
+		icon_state = "cutters_[param_color]"
 
 /obj/item/weapon/wirecutters/attack(mob/living/carbon/C, mob/user)
 	if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
@@ -180,12 +176,9 @@
 	name = "wirecutters"
 	desc = "This cuts wires."
 	icon = 'icons/obj/items_cyborg.dmi'
-	icon_state = "cutters"
+	icon_state = "cutters_cyborg"
 	toolspeed = 2
 
-/obj/item/weapon/wirecutters/cyborg/New(loc, var/param_color = null)
-	return ..(loc, "cyborg")
-
 /*
  * Welding Tool
  */
diff --git a/icons/obj/items_cyborg.dmi b/icons/obj/items_cyborg.dmi
index eb685d69d43bb930a6f4619f3abf9b9645d13646..cddb57303d22b6e63a6c7d5df163fb034310fb55 100644
GIT binary patch
delta 291
zcmV+;0o?w}5z-N`>H&WXdQ@0+L}hbha%pgMX>V=-0C=30)WL4UAPfM|bMh6ay>3&R
zw%VzesnyiO`U?>OCqW}H8D}VeKi2F}scV57pl4gMEtc%<_<lOG!^f%o26W0AwrAUy
zRatl?sSlS;RTe#{uBZ9ph!ce4LK*2nOTa~0NQExEt;?cCKEQu`zLl@Lbh}%n+bSb(
zM%rg<{>Pyu5;UKFpP#NGJ%SN^w160iLbGczH5R)lcLKpnRAE4=Ap)&$cziO$s7aBv
zIx0VnY9XpxWjeq{a|terHFpWib5XVEId-tl(p8q;Wa(|9hT)5*sHLP%&{h3fD#sfg
ppU51Pr~gVg8t)eD|4qarx@5=m;qt@$0M}zqBH9R5)U)>j)CD{hjB5Y@

delta 284
zcmV+%0ptGC5z7&<>H&WQdQ@0+L}hbha%pgMX>V=-0C=30)WL27ArJu2^YRrNy|#_6
znx1-TG{!^y1;fJZGARoNW+nc8soR5zZGjs@-Y}VgFt6Wt`@^x`ejL~ZoJVWww|f1u
zU{yd#Dh8{DRSK|IGzFeGL0rzz$N*Y`o3Tow^Koy<s?PBNruBcLeBI>R%_8461?LtV
z`)tkcIF3Yu=GX7-r@PGHzzCHrAV#7%?4<L;L68nF88a5nhL)$@Fls`wRww1B!48tD
zL(_w6HJ6ZXNOPaj%1xbw;;x5fk#36gsz|RhH4JCECM{)6g6`^{BzoTJ^o>kOW%{Rt
ir}2*$|B&$?o!1Y$<M#Had;t>9NLcZ175KCM0@MY1;gGff


From fb274886f932b34ac55ae47135928bf7809c2f71 Mon Sep 17 00:00:00 2001
From: Nerd Lord <duorabbit2@gmail.com>
Date: Tue, 19 Apr 2016 15:44:30 -0400
Subject: [PATCH 2/2] regardless of what you do this is disgusting

---
 code/game/objects/items/weapons/tools.dm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 7f22e5ce66b..0751fcb5128 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -104,8 +104,9 @@
 	return(BRUTELOSS)
 
 /obj/item/weapon/screwdriver/New(loc, var/param_color = null)
-	if(!param_color && !icon_state)
-		param_color = pick("red","blue","pink","brown","green","cyan","yellow")
+	if(!icon_state)
+		if(!param_color)
+			param_color = pick("red","blue","pink","brown","green","cyan","yellow")
 		icon_state = "screwdriver_[param_color]"
 
 	if (prob(75))
@@ -150,8 +151,9 @@
 
 /obj/item/weapon/wirecutters/New(loc, var/param_color = null)
 	..()
-	if(!param_color && !icon_state)
-		param_color = pick("yellow", "red")
+	if(!icon_state)
+		if(!param_color)
+			param_color = pick("yellow","red")
 		icon_state = "cutters_[param_color]"
 
 /obj/item/weapon/wirecutters/attack(mob/living/carbon/C, mob/user)