Merge pull request #1087 from tigercat2000/LightDefines

REFACTOR: Most consoles and machinery now use defines for light color
2026-08-22 19:47:22 +01:00 · 2015-05-16 21:04:45 -04:00
parent 7b0f6c6c62 13e395e9c6
commit cf90e1703b
40 changed files with 70 additions and 46 deletions
@@ -81,4 +81,28 @@

 #define EVENT_LEVEL_MUNDANE 1
 #define EVENT_LEVEL_MODERATE 2
-#define EVENT_LEVEL_MAJOR 3
+#define EVENT_LEVEL_MAJOR 3
+
+//Light color defs, for light-emitting things
+//Some defs may be pure color- this is for neatness, and configurability. Changing #define COLOR_ is a bad idea.
+#define LIGHT_COLOR_CYAN		"#7BF9FF"
+#define LIGHT_COLOR_PURE_CYAN	"#00FFFF"
+
+#define LIGHT_COLOR_RED			"#B40000"
+#define LIGHT_COLOR_ORANGE		"#FF9933"
+#define LIGHT_COLOR_DARKRED		"#A91515"
+#define LIGHT_COLOR_PURE_RED	"#FF0000"
+
+#define LIGHT_COLOR_GREEN		"#00CC00"
+#define LIGHT_COLOR_DARKGREEN	"#50AB00"
+#define LIGHT_COLOR_PURE_GREEN	"#00FF00"
+
+#define LIGHT_COLOR_LIGHTBLUE	"#0099FF"
+#define LIGHT_COLOR_DARKBLUE	"#315AB4"
+#define LIGHT_COLOR_PURE_BLUE	"#0000FF"
+
+#define LIGHT_COLOR_FADEDPURPLE	"#A97FAA"
+#define LIGHT_COLOR_PURPLE		"#CD00CD"
+#define LIGHT_COLOR_PINK		"#FF33CC"
+
+#define LIGHT_COLOR_WHITE		"#FFFFFF"
@@ -222,7 +222,7 @@
 	idle_power_usage = 1250
 	active_power_usage = 2500

-	light_color = "#7BF9FF"
+	light_color = LIGHT_COLOR_CYAN

 	power_change()
 		..()
@@ -9,7 +9,7 @@

 	var/range = 25

-	light_color = "#7BF9FF"
+	light_color = LIGHT_COLOR_CYAN

 	//Simple variable to prevent me from doing attack_hand in both this and the child computer
 	var/zone = "This computer is working on a wireless range, the range is currently limited to 25 meters."
@@ -3,7 +3,7 @@
 	desc = "A little security robot.  He looks less than thrilled."
 	icon = 'icons/obj/aibots.dmi'
 	icon_state = "secbot0"
-	light_color = "#FF0000"
+	light_color = LIGHT_COLOR_PURE_RED
 	layer = 5.0
 	density = 0
 	anchored = 0
@@ -414,12 +414,12 @@ Auto Patrol: []"},
 /obj/machinery/bot/secbot/proc/flashing_lights()
 	if(mode == BOT_HUNT)
 		switch(light_color)
-			if("#FF0000")
-				light_color = "#0000FF"
-			if("#0000FF")
-				light_color = "#FF0000"
+			if(LIGHT_COLOR_PURE_RED)
+				light_color = LIGHT_COLOR_PURE_BLUE
+			if(LIGHT_COLOR_PURE_BLUE)
+				light_color = LIGHT_COLOR_PURE_RED
 	else
-		light_color = "#FF0000"
+		light_color = LIGHT_COLOR_PURE_RED

 //Secbot Construction

@@ -24,7 +24,7 @@
 	var/speed_coeff
 	var/efficiency

-	light_color = "#00FF00"
+	light_color = LIGHT_COLOR_PURE_GREEN
 	power_change()
 		..()
 		if(!(stat & (BROKEN|NOPOWER)))
@@ -9,7 +9,7 @@
 	var/damaged = 0
 	var/last_change = 0

-	light_color = "#7BF9FF"
+	light_color = LIGHT_COLOR_CYAN


 	attack_ai(var/mob/user as mob)
@@ -9,7 +9,7 @@
 	var/mob/living/carbon/human/victim = null
 	var/obj/machinery/optable/table = null

-	light_color = "#0000FF"
+	light_color = LIGHT_COLOR_PURE_BLUE

 /obj/machinery/computer/operating/New()
 	..()
@@ -7,7 +7,7 @@
 	var/mob/living/silicon/ai/occupant = null
 	var/active = 0

-	light_color = "#CD00CD"
+	light_color = LIGHT_COLOR_PURPLE

 /obj/machinery/computer/aifixer/New()
 	src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
@@ -11,7 +11,7 @@
 	var/receive_frequency = 1437
 	var/datum/radio_frequency/radio_connection

-	light_color = "#7BF9FF"
+	light_color = LIGHT_COLOR_CYAN


 /obj/machinery/computer/atmos_alert/initialize()
@@ -11,7 +11,7 @@ var/camera_cache_id = 1
 	var/obj/machinery/camera/current = null
 	var/list/network = list("")
 	var/last_pic = 1.0
-	light_color = "#B40000"
+	light_color = LIGHT_COLOR_RED
 	var/mapping = 0
 	var/cache_id = 0
 	var/list/networks[0]
@@ -11,7 +11,7 @@
 	var/mode = 0.0
 	var/printing = null

-	light_color = "#0099FF"
+	light_color = LIGHT_COLOR_LIGHTBLUE

 	proc/is_centcom()
 		return istype(src, /obj/machinery/computer/card/centcom)
@@ -16,7 +16,7 @@
 	var/autoprocess = 0
 	var/data[0]

-	light_color = "#315AB4"
+	light_color = LIGHT_COLOR_DARKBLUE

 /obj/machinery/computer/cloning/New()
 	..()
@@ -58,7 +58,7 @@ var/shuttle_call/shuttle_calls[0]

 	var/datum/announcement/priority/crew_announcement = new

-	light_color = "#0099FF"
+	light_color = LIGHT_COLOR_LIGHTBLUE

 /obj/machinery/computer/communications/New()
 	..()
@@ -5,7 +5,7 @@
 	use_power = 1
 	idle_power_usage = 250
 	active_power_usage = 500
-	light_color = "#315AB4"
+	light_color = LIGHT_COLOR_DARKBLUE
 	circuit = "/obj/item/weapon/circuitboard/crew"
 	var/obj/nano_module/crew_monitor/crew_monitor

@@ -3,7 +3,7 @@
 	desc = "A yellow computer used in case of critically low levels of HONK."
 	icon = 'icons/obj/machines/HONKputer.dmi'
 	icon_state = "honk"
-	light_color = "#FF33CC"
+	light_color = LIGHT_COLOR_PINK
 	req_access = list(access_clown)
 	circuit = "/obj/item/weapon/circuitboard/HONKputer"
 	var/authenticated = 0
@@ -8,7 +8,7 @@
 	var/mob/living/silicon/ai/current = null
 	var/opened = 0

-	light_color = "#FFFFFF"
+	light_color = LIGHT_COLOR_WHITE
 	light_range_on = 2


@@ -16,7 +16,7 @@
 	var/temp = null
 	var/printing = null

-	light_color = "#315AB4"
+	light_color = LIGHT_COLOR_DARKBLUE

 /obj/machinery/computer/med_data/attack_ai(user as mob)
 	return src.attack_hand(user)
@@ -8,7 +8,7 @@
 	name = "Message Monitor Console"
 	desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages."
 	icon_state = "comm_logs"
-	light_color = "#00b000"
+	light_color = LIGHT_COLOR_GREEN
 	var/hack_icon = "comm_logsc"
 	var/normal_icon = "comm_logs"
 	circuit = "/obj/item/weapon/circuitboard/message_monitor"
@@ -34,7 +34,7 @@
 	var/customjob		= "Admin"
 	var/custommessage 	= "This is a test, please ignore."

-	light_color = "#50AB00"
+	light_color = LIGHT_COLOR_DARKGREEN


 /obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob, params)
@@ -4,7 +4,7 @@
 	name = "Pod Launch Control"
 	desc = "A controll for launching pods. Some people prefer firing Mechas."
 	icon_state = "computer_generic"
-	light_color = "#00B000"
+	light_color = LIGHT_COLOR_GREEN
 	circuit = /obj/item/weapon/circuitboard/pod
 	var/id = 1.0
 	var/obj/machinery/mass_driver/connected = null
@@ -2,7 +2,7 @@
 	name = "Pod Tracking Console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "podtracking"
-	light_color = "#C860C8"
+	light_color = LIGHT_COLOR_PURPLE
 	req_access = list(access_robotics)
 	circuit = "/obj/item/weapon/circuitboard/pod_locater"

@@ -11,7 +11,7 @@
 	idle_power_usage = 20
 	active_power_usage = 80

-	light_color = "#FF9933"
+	light_color = LIGHT_COLOR_ORANGE

 //fix for issue 521, by QualityVan.
 //someone should really look into why circuits have a powernet var, it's several kinds of retarded.
@@ -14,7 +14,7 @@
 	var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
 	var/obj/item/weapon/card/id/prisoner/inserted_id

-	light_color = "#A91515"
+	light_color = LIGHT_COLOR_DARKRED


 	attack_ai(var/mob/user as mob)
@@ -14,7 +14,7 @@ var/prison_shuttle_timeleft = 0
 	name = "Prison Shuttle Console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
-	light_color = "#00ffff"
+	light_color = LIGHT_COLOR_PURE_CYAN
 	req_access = list(access_security)
 	circuit = "/obj/item/weapon/circuitboard/prison_shuttle"
 	var/temp = null
@@ -10,7 +10,7 @@
 	circuit = /obj/item/weapon/circuitboard/robotics
 	var/temp = null

-	light_color = "#CD00CD"
+	light_color = LIGHT_COLOR_PURPLE

 /obj/machinery/computer/robotics/proc/can_control(var/mob/user, var/mob/living/silicon/robot/R)
 	if(!istype(R))
@@ -22,7 +22,7 @@
 	var/sortBy = "name"
 	var/order = 1 // -1 = Descending - 1 = Ascending

-	light_color = "#B40000"
+	light_color = LIGHT_COLOR_RED


 /obj/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob, params)
@@ -5,7 +5,7 @@
 	var/auth_need = 3.0
 	var/list/authorized = list(  )

-	light_color = "#7BF9FF"
+	light_color = LIGHT_COLOR_CYAN


 	attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob, params)
@@ -4,7 +4,7 @@
 	name = "Employment Records"
 	desc = "Used to view personnel's employment records"
 	icon_state = "medlaptop"
-	light_color = "#00b000"
+	light_color = LIGHT_COLOR_GREEN
 	req_one_access = list(access_heads)
 	circuit = "/obj/item/weapon/circuitboard/skills"
 	var/obj/item/weapon/card/id/scan = null
@@ -15,7 +15,7 @@ var/specops_shuttle_timeleft = 0
 	name = "Spec. Ops. Shuttle Console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
-	light_color = "#00ffff"
+	light_color = LIGHT_COLOR_PURE_CYAN
 	req_access = list(access_cent_specops)
 //	req_access = list(ACCESS_CENT_SPECOPS)
 	var/temp = null
@@ -6,7 +6,7 @@
 	circuit = "/obj/item/weapon/circuitboard/stationalert"
 	var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())

-	light_color = "#7BF9FF"
+	light_color = LIGHT_COLOR_CYAN


 	attack_ai(mob/user)
@@ -4,7 +4,7 @@
 	icon_state = "comm_logs"
 	circuit = "/obj/item/weapon/circuitboard/merch"

-	light_color = "#00CC00"
+	light_color = LIGHT_COLOR_GREEN

 /obj/item/weapon/circuitboard/merch
 	name = "\improper Merchandise Computer Circuitboard"
@@ -14,7 +14,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 	name = "Elite Syndicate Squad Shuttle Console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "syndishuttle"
-	light_color = "#00ffff"
+	light_color = LIGHT_COLOR_PURE_CYAN
 	req_access = list(access_syndicate)
 	var/temp = null
 	var/hacked = 0
@@ -17,7 +17,7 @@
 	var/current_heat_capacity = 50
 	var/efficiency

-	light_color = "#FFFFFF"
+	light_color = LIGHT_COLOR_WHITE
 	power_change()
 		..()
 		if(!(stat & (BROKEN|NOPOWER)))
@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 /obj/machinery/computer/telecomms

-	light_color = "#50AB00"
+	light_color = LIGHT_COLOR_DARKGREEN

 /obj/machinery/computer/telecomms/server
 	name = "Telecommunications Server Monitor"
@@ -20,7 +20,7 @@
 	var/temp = ""				// temporary feedback messages
 	circuit = "/obj/item/weapon/circuitboard/comm_monitor"

-	light_color = "#50AB00"
+	light_color = LIGHT_COLOR_DARKGREEN

 	attack_hand(mob/user as mob)
 		if(stat & (BROKEN|NOPOWER))
@@ -14,7 +14,7 @@

 	var/storedcode = ""			// code stored

-	light_color = "#50AB00"
+	light_color = LIGHT_COLOR_DARKGREEN

 	req_access = list(access_tcomsat)
 	circuit = "/obj/item/weapon/circuitboard/comm_traffic"
@@ -99,7 +99,7 @@
 	anchored = 1
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "recharge_comp"
-	light_color = "#a97faa"
+	light_color = LIGHT_COLOR_FADEDPURPLE
 	circuit = /obj/item/weapon/circuitboard/mech_bay_power_console
 	var/obj/machinery/mech_bay_recharge_port/recharge_port

@@ -2,7 +2,7 @@
 	name = "Exosuit Control"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "mecha"
-	light_color = "#a97faa"
+	light_color = LIGHT_COLOR_FADEDPURPLE
 	req_access = list(access_robotics)
 	circuit = "/obj/item/weapon/circuitboard/mecha_control"
 	var/list/located = list()
@@ -34,7 +34,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 /obj/machinery/computer/rdconsole
 	name = "R&D Console"
 	icon_state = "rdcomp"
-	light_color = "#a97faa"
+	light_color = LIGHT_COLOR_FADEDPURPLE
 	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.
 	var/obj/item/weapon/disk/tech_disk/t_disk = null	//Stores the technology disk.
@@ -181,7 +181,7 @@
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
 	icon_state = "rdcomp"
-	light_color = "#a96faa"
+	light_color = LIGHT_COLOR_FADEDPURPLE
 	circuit = /obj/item/weapon/circuitboard/rdservercontrol
 	var/screen = 0
 	var/obj/machinery/r_n_d/server/temp_server
@@ -3,7 +3,7 @@
 	req_access = list()
 	shuttle_tag = "White Ship"
 	circuit = "/obj/item/weapon/circuitboard/white_ship"
-	light_color = "#CC0000"
+	light_color = LIGHT_COLOR_DARKRED

 /obj/machinery/computer/shuttle_control/multi/whiteship/attack_ai(user as mob)
 	user << "\red Access Denied."