Revert "Ports tgstation's Color Standardization, adds Color Defines and Signals"

code/game/objects/effects/countdown.dm

@@ -8,7 +8,7 @@
 	invisibility = INVISIBILITY_OBSERVER
 	anchored = TRUE
 	layer = GHOST_LAYER
-	color = COLOR_RED // text color
+	color = "#ff0000" // text color
 	var/text_size = 3 // larger values clip when the displayed text is larger than 2 digits.
 	var/started = FALSE
 	var/displayed_text

code/game/objects/effects/mines.dm

@@ -115,7 +115,7 @@
 	name = "Red Orb"
 	desc = "You feel angry just looking at it."
 	duration = 1200 //2min
-	color = COLOR_RED
+	color = "#FF0000"
 
 /obj/effect/mine/pickup/bloodbath/mineEffect(mob/living/carbon/victim)
 	if(!victim.client || !istype(victim))
@@ -152,7 +152,7 @@
 /obj/effect/mine/pickup/healing
 	name = "Blue Orb"
 	desc = "You feel better just looking at it."
-	color = COLOR_BLUE
+	color = "#0000FF"
 
 /obj/effect/mine/pickup/healing/mineEffect(mob/living/carbon/victim)
 	if(!victim.client || !istype(victim))
@@ -163,7 +163,7 @@
 /obj/effect/mine/pickup/speed
 	name = "Yellow Orb"
 	desc = "You feel faster just looking at it."
-	color = COLOR_YELLOW
+	color = "#FFFF00"
 	duration = 300
 
 /obj/effect/mine/pickup/speed/mineEffect(mob/living/carbon/victim)

code/game/objects/effects/misc.dm

@@ -75,7 +75,7 @@
 	name = "lighting fx obj"
 	desc = "Tell a coder if you're seeing this."
 	icon_state = "nothing"
-	light_color = COLOR_WHITE
+	light_color = "#FFFFFF"
 	light_range = MINIMUM_USEFUL_LIGHT_RANGE
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 

code/game/objects/effects/spawners/bundle.dm

@@ -2,7 +2,7 @@
 	name = "bundle spawner"
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "x2"
-	color = COLOR_GREEN
+	color = "#00FF00"
 
 	var/list/items
 

code/game/objects/items/RCD.dm

@@ -764,7 +764,7 @@ RLD
 						var/obj/machinery/light/L = new /obj/machinery/light(light)
 						L.setDir(align)
 						L.color = color_choice
-						L.set_light_color(L.color)
+						L.light_color = L.color
 						return TRUE
 				return FALSE
 
@@ -784,7 +784,7 @@ RLD
 						var/destination = get_turf(A)
 						var/obj/machinery/light/floor/FL = new /obj/machinery/light/floor(destination)
 						FL.color = color_choice
-						FL.set_light_color(FL.color)
+						FL.light_color = FL.color
 						return TRUE
 				return FALSE
 
@@ -794,7 +794,7 @@ RLD
 				to_chat(user, "<span class='notice'>You fire a glowstick!</span>")
 				var/obj/item/flashlight/glowstick/G  = new /obj/item/flashlight/glowstick(start)
 				G.color = color_choice
-				G.set_light_color(G.color)
+				G.light_color = G.color
 				G.throw_at(A, 9, 3, user)
 				G.on = TRUE
 				G.update_brightness()

code/game/objects/items/cards_ids.dm

@@ -571,7 +571,7 @@
 //Polychromatic Knight Badge
 
 /obj/item/card/id/knight
-	var/id_color = COLOR_GREEN //defaults to green
+	var/id_color = "#00FF00" //defaults to green
 	name = "knight badge"
 	icon_state = "knight"
 	desc = "A badge denoting the owner as a knight! It has a strip for swiping like an ID"
@@ -621,7 +621,7 @@
 	. += "<span class='notice'>Alt-click to recolor it.</span>"
 
 /obj/item/card/id/knight/blue
-	id_color = COLOR_BLUE
+	id_color = "#0000FF"
 
 /obj/item/card/id/knight/captain
 	id_color = "#FFD700"

code/game/objects/items/cigs_lighters.dm

@@ -502,14 +502,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "zippo"
 	item_state = "zippo"
-	heat = 1500
-	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
 	w_class = WEIGHT_CLASS_TINY
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
-	resistance_flags = FIRE_PROOF
 	price = 1
-	light_color = LIGHT_COLOR_FIRE
 	var/lit = 0
 	var/fancy = TRUE
 	var/overlay_state
@@ -519,6 +515,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		"thirteen",
 		"snake"
 		)
+	heat = 1500
+	resistance_flags = FIRE_PROOF
+	light_color = LIGHT_COLOR_FIRE
+	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
 
 /obj/item/lighter/Initialize()
 	. = ..()
@@ -907,7 +907,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_state = null
 	item_state = null
 	w_class = WEIGHT_CLASS_NORMAL
-	light_color = COLOR_CREAMY_ORANGE
+	light_color = "#FFCC66"
 	var/icon_off = "bong"
 	var/icon_on = "bong_lit"
 	var/chem_volume = 100

code/game/objects/items/crayons.dm

@@ -30,7 +30,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	attack_verb = list("attacked", "coloured")
 	grind_results = list()
-	var/paint_color = COLOR_RED
+	var/paint_color = "#FF0000" //RGB
 
 	var/drawtype
 	var/text_buffer = ""
@@ -791,7 +791,7 @@
 	charges = 100
 	reagent_contents = list(/datum/reagent/clf3 = 1)
 	actually_paints = FALSE
-	paint_color = COLOR_BLACK
+	paint_color = "#000000"
 
 /obj/item/toy/crayon/spraycan/lubecan
 	name = "slippery spraycan"

code/game/objects/items/devices/PDA/PDA.dm

@@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	var/current_overlays = PDA_STANDARD_OVERLAYS
 	var/font_index = 0 //This int tells DM which font is currently selected and lets DM know when the last font has been selected so that it can cycle back to the first font when "toggle font" is pressed again.
 	var/font_mode = "font-family:monospace;" //The currently selected font.
-	var/background_color = COLOR_OLIVE //The currently selected background color.
+	var/background_color = "#808000" //The currently selected background color.
 
 	#define FONT_MONO "font-family:monospace;"
 	#define FONT_SHARE "font-family:\"Share Tech Mono\", monospace;letter-spacing:0px;"
@@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	var/fon = FALSE //Is the flashlight function on?
 	var/f_lum = 2.3 //Luminosity for the flashlight function
 	var/f_pow = 0.6 //Power for the flashlight function
-	var/f_col = COLOR_CREAMY_ORANGE //Color for the flashlight function
+	var/f_col = "#FFCC66" //Color for the flashlight function
 	var/silent = FALSE //To beep or not to beep, that is the question
 	var/toff = FALSE //If TRUE, messenger disabled
 	var/tnote = null //Current Texts

code/game/objects/items/devices/flashlight.dm

@@ -11,10 +11,10 @@
 	slot_flags = ITEM_SLOT_BELT
 	materials = list(MAT_METAL=50, MAT_GLASS=20)
 	actions_types = list(/datum/action/item_action/toggle_light)
-	light_color = COLOR_CREAMY_ORANGE
 	var/on = FALSE
 	var/brightness_on = 4 //range of light when on
 	var/flashlight_power = 0.8 //strength of the light when on
+	light_color = "#FFCC66"
 
 /obj/item/flashlight/Initialize()
 	. = ..()
@@ -26,10 +26,9 @@
 	if(on)
 		icon_state = "[initial(icon_state)]-on"
 		if(flashlight_power)
-			set_light_range(brightness_on)
-			set_light_power(flashlight_power)
+			set_light(l_range = brightness_on, l_power = flashlight_power)
 		else
-			set_light_range(brightness_on)
+			set_light(brightness_on)
 	else
 		icon_state = initial(icon_state)
 		set_light(0)
@@ -259,15 +258,16 @@
 	desc = "A red Kinaris issued flare. There are instructions on the side, it reads 'pull cord, make light'."
 	w_class = WEIGHT_CLASS_SMALL
 	brightness_on = 7 // Pretty bright.
+	light_color = "#FA421A"
 	icon_state = "flare"
 	item_state = "flare"
 	actions_types = list()
-	heat = 1000
-	light_color = LIGHT_COLOR_FLARE
-	grind_results = list(/datum/reagent/sulfur = 15)
 	var/fuel = 0
 	var/on_damage = 7
 	var/produce_heat = 1500
+	heat = 1000
+	light_color = LIGHT_COLOR_FLARE
+	grind_results = list(/datum/reagent/sulfur = 15)
 
 /obj/item/flashlight/flare/New()
 	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
@@ -332,13 +332,14 @@
 	desc = "A torch fashioned from some leaves and a log."
 	w_class = WEIGHT_CLASS_BULKY
 	brightness_on = 4
+	light_color = "#FAA44B"
 	icon_state = "torch"
 	item_state = "torch"
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+	light_color = LIGHT_COLOR_ORANGE
 	on_damage = 10
 	slot_flags = null
-	light_color = LIGHT_COLOR_FIRE
 
 /obj/item/flashlight/lantern
 	name = "lantern"
@@ -348,8 +349,8 @@
 	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
 	desc = "A mining lantern."
 	brightness_on = 6			// luminosity when on
+	light_color = "#FFAA44"
 	flashlight_power = 0.75
-	light_color = LIGHT_COLOR_FIRE
 
 
 /obj/item/flashlight/slime
@@ -490,7 +491,7 @@
 
 /obj/item/flashlight/glowstick/red
 	name = "red glowstick"
-	color = COLOR_SOFT_RED
+	color = LIGHT_COLOR_RED
 
 /obj/item/flashlight/glowstick/blue
 	name = "blue glowstick"
@@ -516,7 +517,7 @@
 	name = "disco light"
 	desc = "Groovy..."
 	icon_state = null
-	light_color = COLOR_WHITE
+	light_color = null
 	brightness_on = 0
 	flashlight_power = 1
 	light_range = 0

code/game/objects/items/devices/reverse_bear_trap.dm

@@ -112,7 +112,7 @@
 		playsound(src, 'sound/effects/splat.ogg', 50, TRUE, frequency = 0.5)
 		jill.apply_damage(9999, BRUTE, BODY_ZONE_HEAD)
 		jill.death() //just in case, for some reason, they're still alive
-		flash_color(jill, flash_color = COLOR_RED, flash_time = 100)
+		flash_color(jill, flash_color = "#FF0000", flash_time = 100)
 
 /obj/item/reverse_bear_trap/proc/reset()
 	ticking = FALSE

code/game/objects/items/flamethrower.dm

@@ -14,7 +14,6 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=500)
 	resistance_flags = FIRE_PROOF
-	trigger_guard = TRIGGER_GUARD_NORMAL
 	var/status = FALSE
 	var/lit = FALSE	//on or off
 	var/operating = FALSE//cooldown
@@ -26,6 +25,7 @@
 	var/create_full = FALSE
 	var/create_with_tank = FALSE
 	var/igniter_type = /obj/item/assembly/igniter
+	trigger_guard = TRIGGER_GUARD_NORMAL
 
 /obj/item/flamethrower/Destroy()
 	if(weldtool)

code/game/objects/items/grenades/flashbang.dm

@@ -13,7 +13,7 @@
 		return
 	do_sparks(rand(5, 9), FALSE, src)
 	playsound(flashbang_turf, 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9)
-	new /obj/effect/dummy/lighting_obj (flashbang_turf, COLOR_WHITE, (flashbang_range + 2), 4, 2)
+	new /obj/effect/dummy/lighting_obj (flashbang_turf, LIGHT_COLOR_WHITE, (flashbang_range + 2), 4, 2)
 	for(var/mob/living/M in get_hearers_in_view(flashbang_range, flashbang_turf))
 		bang(get_turf(M), M)
 	qdel(src)

code/game/objects/items/handcuffs.dm

@@ -114,7 +114,7 @@
 	icon_state = "cuff"
 	item_state = "coil"
 	item_color = "red"
-	color = COLOR_RED
+	color = "#ff0000"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	materials = list(MAT_METAL=150, MAT_GLASS=75)
@@ -136,11 +136,11 @@
 
 /obj/item/restraints/handcuffs/cable/red
 	item_color = "red"
-	color = COLOR_RED
+	color = "#ff0000"
 
 /obj/item/restraints/handcuffs/cable/yellow
 	item_color = "yellow"
-	color = COLOR_YELLOW
+	color = "#ffff00"
 
 /obj/item/restraints/handcuffs/cable/blue
 	item_color = "blue"
@@ -160,7 +160,7 @@
 
 /obj/item/restraints/handcuffs/cable/cyan
 	item_color = "cyan"
-	color = COLOR_CYAN
+	color = "#00ffff"
 
 /obj/item/restraints/handcuffs/cable/white
 	item_color = "white"

code/game/objects/items/hot_potato.dm

@@ -46,7 +46,7 @@
 	color_val = !color_val
 	if(istype(target))
 		current = WEAKREF(target)
-		target.add_atom_colour(color_val? COLOR_YELLOW : COLOR_CYAN, FIXED_COLOUR_PRIORITY)
+		target.add_atom_colour(color_val? "#ffff00" : "#00ffff", FIXED_COLOUR_PRIORITY)
 
 /obj/item/hot_potato/proc/detonate()
 	var/atom/location = loc

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

@@ -81,8 +81,8 @@
 	armour_penetration = 100
 	attack_verb_off = list("attacked", "chopped", "cleaved", "torn", "cut")
 	attack_verb_on = list()
+	light_color = "#40ceff"
 	total_mass = null
-	light_color = LIGHT_COLOR_LIGHT_CYAN
 
 /obj/item/melee/transforming/energy/axe/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -141,15 +141,15 @@
 	hitcost = 75 //Costs more than a standard cyborg esword
 	w_class = WEIGHT_CLASS_NORMAL
 	sharpness = IS_SHARP
+	light_color = "#40ceff"
 	tool_behaviour = TOOL_SAW
 	toolspeed = 0.7
-	light_color = LIGHT_COLOR_LIGHT_CYAN
 
 /obj/item/melee/transforming/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	return 0
 
 /obj/item/melee/transforming/energy/sword/saber
-	var/list/possible_colors = list("red" = COLOR_SOFT_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER)
+	var/list/possible_colors = list("red" = LIGHT_COLOR_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER)
 	var/hacked = FALSE
 
 /obj/item/melee/transforming/energy/sword/saber/Initialize(mapload)
@@ -163,11 +163,11 @@
 	. = ..()
 	if(hacked)
 		var/set_color = pick(possible_colors)
-		set_light_color(possible_colors[set_color])
+		light_color = possible_colors[set_color]
 		update_light()
 
 /obj/item/melee/transforming/energy/sword/saber/red
-	possible_colors = list("red" = COLOR_SOFT_RED)
+	possible_colors = list("red" = LIGHT_COLOR_RED)
 
 /obj/item/melee/transforming/energy/sword/saber/blue
 	possible_colors = list("blue" = LIGHT_COLOR_LIGHT_CYAN)
@@ -200,7 +200,7 @@
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	icon_state_on = "cutlass1"
-	light_color = COLOR_RED
+	light_color = "#ff0000"
 
 /obj/item/melee/transforming/energy/blade
 	name = "energy blade"

code/game/objects/items/religion.dm

@@ -249,11 +249,11 @@
 
 /obj/item/godstaff/red
 	icon_state = "godstaff-red"
-	conversion_color = COLOR_RED
+	conversion_color = "#ff0000"
 
 /obj/item/godstaff/blue
 	icon_state = "godstaff-blue"
-	conversion_color = COLOR_BLUE
+	conversion_color = "#0000ff"
 
 /obj/item/clothing/gloves/plate
 	name = "Plate Gauntlets"

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -82,21 +82,21 @@
 	item_state = "tile-fairygrass"
 	turf_type = /turf/open/floor/grass/fairy
 	resistance_flags = FLAMMABLE
-	color = COLOR_BLUE_LIGHT
+	color = "#33CCFF"
 
 /obj/item/stack/tile/fairygrass/white
 	name = "white fairygrass tile"
 	singular_name = "white fairygrass floor tile"
 	desc = "A patch of odd, glowing white grass."
 	turf_type = /turf/open/floor/grass/fairy/white
-	color = COLOR_WHITE
+	color = "#FFFFFF"
 
 /obj/item/stack/tile/fairygrass/red
 	name = "red fairygrass tile"
 	singular_name = "red fairygrass floor tile"
 	desc = "A patch of odd, glowing red grass."
 	turf_type = /turf/open/floor/grass/fairy/red
-	color = COLOR_RED_LIGHT
+	color = "#FF3333"
 
 /obj/item/stack/tile/fairygrass/yellow
 	name = "yellow fairygrass tile"

code/game/objects/items/tools/weldingtool.dm

@@ -13,14 +13,14 @@
 	throwforce = 5
 	hitsound = "swing_hit"
 	usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
+	var/acti_sound = 'sound/items/welderactivate.ogg'
+	var/deac_sound = 'sound/items/welderdeactivate.ogg'
 	throw_speed = 3
 	throw_range = 5
 	w_class = WEIGHT_CLASS_SMALL
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
 	resistance_flags = FIRE_PROOF
-	heat = 3800
-	tool_behaviour = TOOL_WELDER
-	toolspeed = 1
+
 	materials = list(MAT_METAL=70, MAT_GLASS=30)
 	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
 	var/status = TRUE 		//Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
@@ -30,8 +30,9 @@
 	var/light_intensity = 2 //how powerful the emitted light is when used.
 	var/progress_flash_divisor = 10
 	var/burned_fuel_for = 0	//when fuel was last removed
-	var/acti_sound = 'sound/items/welderactivate.ogg'
-	var/deac_sound = 'sound/items/welderdeactivate.ogg'
+	heat = 3800
+	tool_behaviour = TOOL_WELDER
+	toolspeed = 1
 
 	drop_sound = 'sound/items/handling/weldingtool_drop.ogg'
 	pickup_sound =  'sound/items/handling/weldingtool_pickup.ogg'
@@ -352,12 +353,12 @@
 	item_state = "exwelder"
 	max_fuel = 40
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
+	var/last_gen = 0
 	change_icons = 0
 	can_off_process = 1
 	light_intensity = 1
 	toolspeed = 0.5
 	var/nextrefueltick = 0
-	var/last_gen = 0
 
 /obj/item/weldingtool/experimental/brass
 	name = "brass welding tool"

code/game/objects/items/twohanded.dm

@@ -284,7 +284,7 @@
 	var/hitsound_on = 'sound/weapons/blade1.ogg'
 	armour_penetration = 35
 	item_color = "green"
-	light_color = COLOR_GREEN
+	light_color = "#00ff00"//green
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 75
 	max_integrity = 200
@@ -293,7 +293,7 @@
 	var/hacked = FALSE
 	var/brightness_on = 6 //TWICE AS BRIGHT AS A REGULAR ESWORD
 	var/list/possible_colors = list("red", "blue", "green", "purple")
-	var/list/rainbow_colors = list(COLOR_SOFT_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
+	var/list/rainbow_colors = list(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
 	var/spinnable = TRUE
 	total_mass = 0.4 //Survival flashlights typically weigh around 5 ounces.
 	var/total_mass_on = 3.4
@@ -329,7 +329,7 @@
 		item_color = pick(possible_colors)
 		switch(item_color)
 			if("red")
-				light_color = COLOR_SOFT_RED
+				light_color = LIGHT_COLOR_RED
 			if("green")
 				light_color = LIGHT_COLOR_GREEN
 			if("blue")
@@ -711,7 +711,7 @@
 
 /obj/item/twohanded/pitchfork/demonic/Initialize()
 	. = ..()
-	set_light(3,6,COLOR_SOFT_RED)
+	set_light(3,6,LIGHT_COLOR_RED)
 
 /obj/item/twohanded/pitchfork/demonic/greater
 	force = 24

code/game/objects/structures/artstuff.dm

@@ -174,11 +174,11 @@
 		var/obj/item/pen/P = I
 		switch(P.colour)
 			if("black")
-				return COLOR_BLACK
+				return "#000000"
 			if("blue")
-				return COLOR_BLUE
+				return "#0000ff"
 			if("red")
-				return COLOR_RED
+				return "#ff0000"
 		return P.colour
 	else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/rag))
 		return canvas_color

code/game/objects/structures/flora.dm

@@ -350,7 +350,7 @@
 	name = "photosynthetic potted plant"
 	desc = "A bioluminescent plant."
 	icon_state = "plant-09"
-	light_color = COLOR_BRIGHT_BLUE
+	light_color = "#2cb2e8"
 	light_range = 3