Merge pull request #2297 from Markolie/itemcolor

Replace _color with item_color

code/game/objects/effects/decals/Cleanable/tracks.dm

@@ -24,9 +24,9 @@ var/global/list/image/fluidtrack_cache=list()
 	var/crusty=0
 	var/image/overlay
 
-	New(_direction,_color,_wet)
+	New(_direction,item_color,_wet)
 		src.direction=_direction
-		src.basecolor=_color
+		src.basecolor=item_color
 		src.wet=_wet
 
 // Footprints, tire trails...

code/game/objects/items.dm

@@ -37,7 +37,7 @@
 	var/list/materials = list()
 	//Since any item can now be a piece of clothing, this has to be put here so all items share it.
 	var/flags_inv //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
-	var/_color = null
+	var/item_color = null
 	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
 	//var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
 	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)

code/game/objects/items/weapons/implants/implant.dm

@@ -8,7 +8,7 @@
 	var/implanted = null
 	var/mob/living/imp_in = null
 	var/obj/item/organ/external/part = null
-	_color = "b"
+	item_color = "b"
 	var/allow_reagents = 0
 	var/malfunction = 0
 

code/game/objects/items/weapons/implants/implantcase.dm

@@ -22,7 +22,7 @@
 
 	update()
 		if (src.imp)
-			src.icon_state = text("implantcase-[]", src.imp._color)
+			src.icon_state = text("implantcase-[]", src.imp.item_color)
 			src.origin_tech = src.imp.origin_tech
 		else
 			src.icon_state = "implantcase-0"

code/game/objects/items/weapons/implants/implantfreedom.dm

@@ -3,7 +3,7 @@
 /obj/item/weapon/implant/freedom
 	name = "freedom"
 	desc = "Use this to escape from those evil Red Shirts."
-	_color = "r"
+	item_color = "r"
 	var/activation_emote = "chuckle"
 	origin_tech = "materials=2;magnets=3;biotech=3;syndicate=4"
 	var/uses = 4

code/game/objects/items/weapons/melee/energy.dm

@@ -25,10 +25,10 @@
 		hitsound = 'sound/weapons/blade1.ogg'
 		if(attack_verb_on.len)
 			attack_verb = attack_verb_on
-		if(!_color)
+		if(!item_color)
 			icon_state = icon_state_on
 		else
-			icon_state = "sword[_color]"
+			icon_state = "sword[item_color]"
 		w_class = w_class_on
 		playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
 		user << "<span class='notice'>[src] is now active.</span>"
@@ -86,8 +86,8 @@
 	var/blade_color
 	
 /obj/item/weapon/melee/energy/sword/New()
-	if(_color == null)
-		_color = pick("red", "blue", "green", "purple")
+	if(item_color == null)
+		item_color = pick("red", "blue", "green", "purple")
 
 /obj/item/weapon/melee/energy/sword/IsShield()
 	if(active)
@@ -120,12 +120,12 @@
 	icon_state = "esaw_0"
 	icon_state_on = "esaw_1"
 	hitcost = 75 //Costs more than a standard cyborg esword
-	_color = null
+	item_color = null
 	w_class = 3
 
 /obj/item/weapon/melee/energy/sword/cyborg/saw/New()
 	..()
-	_color = null
+	item_color = null
 
 /obj/item/weapon/melee/energy/sword/cyborg/saw/IsShield()
 	return 0
@@ -133,16 +133,16 @@
 /obj/item/weapon/melee/energy/sword/saber
 
 /obj/item/weapon/melee/energy/sword/saber/blue
-	_color = "blue"
+	item_color = "blue"
 
 /obj/item/weapon/melee/energy/sword/saber/purple
-	_color = "purple"
+	item_color = "purple"
 
 /obj/item/weapon/melee/energy/sword/saber/green
-	_color = "green"
+	item_color = "green"
 
 /obj/item/weapon/melee/energy/sword/saber/red
-	_color = "red"
+	item_color = "red"
 
 /obj/item/weapon/melee/energy/sword/saber/attackby(obj/item/weapon/W, mob/living/user, params)
 	..()
@@ -156,7 +156,7 @@
 			var/obj/item/weapon/twohanded/dualsaber/newSaber = new /obj/item/weapon/twohanded/dualsaber(user.loc)
 			if(src.hacked) // That's right, we'll only check the "original" esword.
 				newSaber.hacked = 1
-				newSaber._color = "rainbow"
+				newSaber.item_color = "rainbow"
 			user.unEquip(W)
 			user.unEquip(src)
 			qdel(W)
@@ -165,7 +165,7 @@
 	else if(istype(W, /obj/item/device/multitool))
 		if(hacked == 0)
 			hacked = 1
-			_color = "rainbow"
+			item_color = "rainbow"
 			user << "<span class='warning'>RNBW_ENGAGE</span>"
 
 			if(active)

code/game/objects/structures/bedsheet_bin.dm

@@ -15,7 +15,7 @@ LINEN BINS
 	throw_speed = 1
 	throw_range = 2
 	w_class = 1.0
-	_color = "white"
+	item_color = "white"
 	slot_flags = SLOT_BACK
 
 
@@ -31,127 +31,127 @@ LINEN BINS
 
 /obj/item/weapon/bedsheet/blue
 	icon_state = "sheetblue"
-	_color = "blue"
+	item_color = "blue"
 
 /obj/item/weapon/bedsheet/green
 	icon_state = "sheetgreen"
-	_color = "green"
+	item_color = "green"
 
 /obj/item/weapon/bedsheet/orange
 	icon_state = "sheetorange"
-	_color = "orange"
+	item_color = "orange"
 
 /obj/item/weapon/bedsheet/purple
 	icon_state = "sheetpurple"
-	_color = "purple"
+	item_color = "purple"
 
 /obj/item/weapon/bedsheet/patriot
 	name = "patriotic bedsheet"
 	desc = "You've never felt more free than when sleeping on this."
 	icon_state = "sheetUSA"
-	_color = "sheetUSA"
+	item_color = "sheetUSA"
 
 /obj/item/weapon/bedsheet/rainbow
 	name = "rainbow bedsheet"
 	desc = "A multi_colored blanket.  It's actually several different sheets cut up and sewn together."
 	icon_state = "sheetrainbow"
-	_color = "rainbow"
+	item_color = "rainbow"
 
 /obj/item/weapon/bedsheet/red
 	icon_state = "sheetred"
-	_color = "red"
+	item_color = "red"
 
 /obj/item/weapon/bedsheet/yellow
 	icon_state = "sheetyellow"
-	_color = "yellow"
+	item_color = "yellow"
 
 /obj/item/weapon/bedsheet/mime
 	name = "mime's blanket"
 	desc = "A very soothing striped blanket.  All the noise just seems to fade out when you're under the covers in this."
 	icon_state = "sheetmime"
-	_color = "mime"
+	item_color = "mime"
 
 /obj/item/weapon/bedsheet/clown
 	name = "clown's blanket"
 	desc = "A rainbow blanket with a clown mask woven in.  It smells faintly of bananas."
 	icon_state = "sheetclown"
-	_color = "clown"
+	item_color = "clown"
 
 /obj/item/weapon/bedsheet/captain
 	name = "captain's bedsheet."
 	desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
 	icon_state = "sheetcaptain"
-	_color = "captain"
+	item_color = "captain"
 
 /obj/item/weapon/bedsheet/rd
 	name = "research director's bedsheet"
 	desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
 	icon_state = "sheetrd"
-	_color = "director"
+	item_color = "director"
 
 /obj/item/weapon/bedsheet/medical
 	name = "medical blanket"
 	desc = "It's a sterilized* blanket commonly used in the Medbay.  *Sterilization is voided if a virologist is present onboard the station."
 	icon_state = "sheetmedical"
-	_color = "medical"
+	item_color = "medical"
 
 /obj/item/weapon/bedsheet/cmo
 	name = "chief medical officer's bedsheet"
 	desc = "It's a sterilized blanket that has a cross emblem.  There's some cat fur on it, likely from Runtime."
 	icon_state = "sheetcmo"
-	_color = "cmo"
+	item_color = "cmo"
 
 /obj/item/weapon/bedsheet/hos
 	name = "head of security's bedsheet"
 	desc = "It is decorated with a shield emblem.  While crime doesn't sleep, you do, but you are still THE LAW!"
 	icon_state = "sheethos"
-	_color = "hosred"
+	item_color = "hosred"
 
 /obj/item/weapon/bedsheet/hop
 	name = "head of personnel's bedsheet"
 	desc = "It is decorated with a key emblem.  For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
 	icon_state = "sheethop"
-	_color = "hop"
+	item_color = "hop"
 
 /obj/item/weapon/bedsheet/ce
 	name = "chief engineer's bedsheet"
 	desc = "It is decorated with a wrench emblem.  It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
 	icon_state = "sheetce"
-	_color = "chief"
+	item_color = "chief"
 
 /obj/item/weapon/bedsheet/qm
 	name = "quartermaster's bedsheet"
 	desc = "It is decorated with a crate emblem in silver lining.  It's rather tough, and just the thing to lie on after a hard day of pushing paper."
 	icon_state = "sheetqm"
-	_color = "qm"
+	item_color = "qm"
 
 /obj/item/weapon/bedsheet/brown
 	icon_state = "sheetbrown"
-	_color = "cargo"
+	item_color = "cargo"
 
 /obj/item/weapon/bedsheet/centcom
 	name = "centcom bedsheet"
 	desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
 	icon_state = "sheetcentcom"
-	_color = "centcom"
+	item_color = "centcom"
 
 /obj/item/weapon/bedsheet/syndie
 	name = "syndicate bedsheet"
 	desc = "It has a syndicate emblem and it has an aura of evil."
 	icon_state = "sheetsyndie"
-	_color = "syndie"
+	item_color = "syndie"
 
 /obj/item/weapon/bedsheet/cult
 	name = "cultist's bedsheet"
 	desc = "You might dream of Nar'Sie if you sleep with this.  It seems rather tattered and glows of an eldritch presence."
 	icon_state = "sheetcult"
-	_color = "cult"
+	item_color = "cult"
 
 /obj/item/weapon/bedsheet/wiz
 	name = "wizard's bedsheet"
 	desc = "A special fabric enchanted with magic so you can have an enchanted night.  It even glows!"
 	icon_state = "sheetwiz"
-	_color = "wiz"
+	item_color = "wiz"