From 7d103f5bd54b4e97bf05091e536bdfe961d14ff2 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 12 May 2015 04:49:59 -0700 Subject: [PATCH] Add light color defs for more things This commit adds custom color definitions to almost every computer that did not already have them. It also causes cigarretes to very dimly glow. Also contains custom colors for candles, flashlights, and the mentioned cigarretes. Oh, and beepsky flashes red and blue now while in hunt mode. FTW --- .../machinery/atmoalter/area_atmos_computer.dm | 6 ------ code/game/machinery/bots/secbot.dm | 17 ++++++++++++++--- code/game/machinery/computer/camera.dm | 6 ++++++ code/game/machinery/computer/card.dm | 2 +- code/game/machinery/computer/cloning.dm | 2 +- code/game/machinery/computer/communications.dm | 2 +- code/game/machinery/computer/computer.dm | 10 ++++++---- code/game/machinery/computer/crew.dm | 1 + code/game/machinery/computer/hologram.dm | 2 +- code/game/machinery/computer/honkputer.dm | 1 + code/game/machinery/computer/law.dm | 1 + code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/message.dm | 1 + code/game/machinery/computer/pod.dm | 1 + .../machinery/computer/pod_tracking_console.dm | 1 + code/game/machinery/computer/prisoner.dm | 2 +- code/game/machinery/computer/prisonshuttle.dm | 1 + code/game/machinery/computer/skills.dm | 3 ++- code/game/machinery/computer/specops_shuttle.dm | 7 ++++--- code/game/machinery/computer/store.dm | 2 +- .../computer/syndicate_specops_shuttle.dm | 1 + code/game/mecha/mech_bay.dm | 3 ++- code/game/mecha/mecha_control_console.dm | 1 + code/game/objects/items/candle.dm | 2 ++ code/game/objects/items/devices/flashlight.dm | 2 ++ .../game/objects/items/weapons/cigs_lighters.dm | 2 ++ code/modules/research/rdconsole.dm | 1 + code/modules/research/server.dm | 1 + 28 files changed, 58 insertions(+), 25 deletions(-) diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index c055f7b70b4..f8e00b06950 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -10,12 +10,6 @@ var/range = 25 light_color = "#7BF9FF" - power_change() - ..() - if(!(stat & (BROKEN|NOPOWER))) - set_light(2) - else - set_light(0) //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." diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index b627cca6e63..ab9a848d2ac 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -3,6 +3,7 @@ desc = "A little security robot. He looks less than thrilled." icon = 'icons/obj/aibots.dmi' icon_state = "secbot0" + light_color = "#FF0000" layer = 5.0 density = 0 anchored = 0 @@ -217,14 +218,14 @@ Auto Patrol: []"}, switch(mode) if(BOT_IDLE) // idle - + flashing_lights() //make sure they disengage properly walk_to(src,0) look_for_perp() // see if any criminals are in range if(!mode && auto_patrol) // still idle, and set to patrol mode = BOT_START_PATROL // switch to patrol mode if(BOT_HUNT) // hunting for perp - + flashing_lights() // if can't reach perp for long enough, go idle if(frustration >= 8) walk_to(src,0) @@ -274,7 +275,7 @@ Auto Patrol: []"}, back_to_idle() if(BOT_PREP_ARREST) // preparing to arrest target - + flashing_lights() //make sure they disengage properly // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 ) back_to_hunt() @@ -410,6 +411,16 @@ Auto Patrol: []"}, target = user mode = BOT_HUNT +/obj/machinery/bot/secbot/proc/flashing_lights() + if(mode == BOT_HUNT) + switch(light_color) + if("#FF0000") + light_color = "#0000FF" + if("#0000FF") + light_color = "#FF0000" + else + light_color = "#FF0000" + //Secbot Construction /obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob, params) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 5f1c0117048..7c8abadd7e9 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -280,6 +280,8 @@ var/camera_cache_id = 1 desc = "Damn, they better have Paradise TV on these things." icon = 'icons/obj/status_display.dmi' icon_state = "entertainment" + light_color = "#FFEEDB" + light_range_on = 2 network = list("news") luminosity = 0 @@ -287,16 +289,20 @@ var/camera_cache_id = 1 name = "Security Camera Monitor" desc = "An old TV hooked into the stations camera network." icon_state = "security_det" + light_color = "#3848B3" + light_power_on = 0.5 network = list("SS13") /obj/machinery/computer/security/mining name = "Outpost Camera Monitor" desc = "Used to access the various cameras on the outpost." icon_state = "miningcameras" + light_color = "#F9BBFC" network = list("Mining Outpost") /obj/machinery/computer/security/engineering name = "Engineering Camera Monitor" desc = "Used to monitor fires and breaches." icon_state = "engineeringcameras" + light_color = "#FAC54B" network = list("Power Alarms","Atmosphere Alarms","Fire Alarms") \ No newline at end of file diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index a44aa104e62..70e95c39a88 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -11,7 +11,7 @@ var/mode = 0.0 var/printing = null - light_color = "#0000FF" + light_color = "#0099FF" proc/is_centcom() return istype(src, /obj/machinery/computer/card/centcom) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 81aec1aed6c..f97aa4f3389 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -16,7 +16,7 @@ var/autoprocess = 0 var/data[0] - light_color = "#0000FF" + light_color = "#315AB4" /obj/machinery/computer/cloning/New() ..() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ecd428fca1e..c8c21691533 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -58,7 +58,7 @@ var/shuttle_call/shuttle_calls[0] var/datum/announcement/priority/crew_announcement = new - light_color = "#0000FF" + light_color = "#0099FF" /obj/machinery/computer/communications/New() ..() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index fb995b4b487..03eb5db3dab 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -8,7 +8,9 @@ active_power_usage = 300 var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly var/processing = 0 - luminosity = 2 + + var/light_range_on = 3 + var/light_power_on = 2 /obj/machinery/computer/New() ..() @@ -92,10 +94,10 @@ /obj/machinery/computer/power_change() ..() update_icon() - if(!(stat & (BROKEN|NOPOWER))) - set_light(2) - else + if((stat & (BROKEN|NOPOWER))) set_light(0) + else + set_light(light_range_on, light_power_on) /obj/machinery/computer/proc/set_broken() diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 084eb974688..786c7dedaac 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -5,6 +5,7 @@ use_power = 1 idle_power_usage = 250 active_power_usage = 500 + light_color = "#315AB4" circuit = "/obj/item/weapon/circuitboard/crew" var/obj/nano_module/crew_monitor/crew_monitor diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm index ecb3ba58b3d..36e8cb54456 100644 --- a/code/game/machinery/computer/hologram.dm +++ b/code/game/machinery/computer/hologram.dm @@ -20,7 +20,7 @@ return return -/obj/machinery/computer/hologram_comp/DblClick() +/obj/machinery/computer/hologram_comp/attack_hand() if (!in_range(src, usr)) return 0 src.show_console(usr) diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index bd9d0344a2c..e5dde186881 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -3,6 +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" req_access = list(access_clown) circuit = "/obj/item/weapon/circuitboard/HONKputer" var/authenticated = 0 diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 9cd5ca6a143..670dabcccc1 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -9,6 +9,7 @@ var/opened = 0 light_color = "#FFFFFF" + light_range_on = "2" verb/AccessInternals() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index c665214ed33..ec3460f2463 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -16,7 +16,7 @@ var/temp = null var/printing = null - light_color = "#0000FF" + light_color = "#315AB4" /obj/machinery/computer/med_data/attack_ai(user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 9cc273c1716..eca2511611c 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -8,6 +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" var/hack_icon = "comm_logsc" var/normal_icon = "comm_logs" circuit = "/obj/item/weapon/circuitboard/message_monitor" diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 69c68ecf8aa..2311203b0d4 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -4,6 +4,7 @@ name = "Pod Launch Control" desc = "A controll for launching pods. Some people prefer firing Mechas." icon_state = "computer_generic" + light_color = "#00B000" circuit = /obj/item/weapon/circuitboard/pod var/id = 1.0 var/obj/machinery/mass_driver/connected = null diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 5707e0d791f..f80026b2b41 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -2,6 +2,7 @@ name = "Pod Tracking Console" icon = 'icons/obj/computer.dmi' icon_state = "podtracking" + light_color = "#C860C8" req_access = list(access_robotics) circuit = "/obj/item/weapon/circuitboard/pod_locater" diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 3fa4f812240..e2347cce9eb 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -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 = "#B40000" + light_color = "#A91515" attack_ai(var/mob/user as mob) diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index a5837969741..2e163a037cf 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -14,6 +14,7 @@ var/prison_shuttle_timeleft = 0 name = "Prison Shuttle Console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" + light_color = "#00ffff" req_access = list(access_security) circuit = "/obj/item/weapon/circuitboard/prison_shuttle" var/temp = null diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 9f1781519ae..7430442ba5b 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -4,6 +4,7 @@ name = "Employment Records" desc = "Used to view personnel's employment records" icon_state = "medlaptop" + light_color = "#00b000" req_one_access = list(access_heads) circuit = "/obj/item/weapon/circuitboard/skills" var/obj/item/weapon/card/id/scan = null @@ -286,7 +287,7 @@ What a mess.*/ temp += "No" //RECORD CREATE if ("New Record (General)") - + if(PDA_Manifest.len) PDA_Manifest.Cut() var/datum/data/record/G = new /datum/data/record() diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 68ded19320d..3171da666c1 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -15,6 +15,7 @@ var/specops_shuttle_timeleft = 0 name = "Spec. Ops. Shuttle Console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" + light_color = "#00ffff" req_access = list(access_cent_specops) // req_access = list(ACCESS_CENT_SPECOPS) var/temp = null @@ -93,14 +94,14 @@ var/specops_shuttle_timeleft = 0 for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY - + del(announcer) /proc/specops_process() var/area/centcom/specops/special_ops = locate()//Where is the specops area located? var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. announcer.config(list("Response Team" = 0)) - + var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH\""//Initial message shown. if(announcer) @@ -234,7 +235,7 @@ var/specops_shuttle_timeleft = 0 for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY - + del(announcer) /proc/specops_can_move() diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index 4ac0a7e315a..f110ca0dfd1 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -4,7 +4,7 @@ icon_state = "comm_logs" circuit = "/obj/item/weapon/circuitboard/merch" - light_color = "#50AB00" + light_color = "#00CC00" /obj/item/weapon/circuitboard/merch name = "\improper Merchandise Computer Circuitboard" diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 969f3373729..7c2f3c3987d 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -14,6 +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" req_access = list(access_syndicate) var/temp = null var/hacked = 0 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 8de93482907..5925d46fc61 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -38,7 +38,7 @@ component_parts += new /obj/item/stack/cable_coil(src, 1) RefreshParts() locate_recharge_turf() - + /obj/machinery/mech_bay_recharge_port/upgraded/New() ..() component_parts = list() @@ -99,6 +99,7 @@ anchored = 1 icon = 'icons/obj/computer.dmi' icon_state = "recharge_comp" + light_color = "#a97faa" circuit = /obj/item/weapon/circuitboard/mech_bay_power_console var/obj/machinery/mech_bay_recharge_port/recharge_port diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index da461662f8f..a56dc0db575 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -2,6 +2,7 @@ name = "Exosuit Control" icon = 'icons/obj/computer.dmi' icon_state = "mecha" + light_color = "#a97faa" req_access = list(access_robotics) circuit = "/obj/item/weapon/circuitboard/mecha_control" var/list/located = list() diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index c37b6269274..8ae98e7db1f 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -6,6 +6,8 @@ item_state = "candle1" w_class = 1 + light_color = "#E09D37" + var/wax = 200 var/lit = 0 proc diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 217d6001be2..7a07056b9a4 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -117,6 +117,7 @@ desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = 2.0 brightness_on = 7 // Pretty bright. + light_color = "#e58775" icon_state = "flare" item_state = "flare" icon_action_button = null //just pull it manually, neckbeard. @@ -175,6 +176,7 @@ item_state = "slime" w_class = 1 brightness_on = 6 + light_color = "#FFBF00" on = 1 //Bio-luminesence has one setting, on. /obj/item/device/flashlight/slime/New() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index f76b927ad37..1525681adc7 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -157,6 +157,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = icon_on var/turf/T = get_turf(src) T.visible_message(flavor_text) + set_light(2, 0.25, "#E38F46") processing_objects.Add(src) @@ -203,6 +204,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/proc/die() var/turf/T = get_turf(src) + set_light(0) var/obj/item/butt = new type_butt(T) transfer_fingerprints_to(butt) if(ismob(loc)) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 28c595b8321..02fc7f371f5 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -34,6 +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" 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. diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index e999c34df17..ac693cf293d 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -181,6 +181,7 @@ /obj/machinery/computer/rdservercontrol name = "R&D Server Controller" icon_state = "rdcomp" + light_color = "#a96faa" circuit = /obj/item/weapon/circuitboard/rdservercontrol var/screen = 0 var/obj/machinery/r_n_d/server/temp_server