diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 29834f1c943..94d4d5348d3 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -9,6 +9,14 @@ var/range = 25 + l_color = "#7BF9FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(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/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index e7286a781f2..9c883691ce8 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -9,6 +9,14 @@ var/damaged = 0 var/last_change = 0 + l_color = "#7BF9FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + attack_ai(var/mob/user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index f1a1f02db70..2e454fd1c51 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -9,6 +9,14 @@ var/mob/living/carbon/human/victim = null var/obj/machinery/optable/table = null + l_color = "#0000FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/operating/New() ..() for(dir in list(NORTH,EAST,SOUTH,WEST)) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 3048b644b43..133bfb683c5 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -7,6 +7,14 @@ var/mob/living/silicon/ai/occupant = null var/active = 0 + l_color = "#CD00CD" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/aifixer/New() src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 1d50405a048..48dc219e616 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -3,6 +3,8 @@ desc = "random arcade machine" icon = 'icons/obj/computer.dmi' icon_state = "arcade" + l_color = "#00FF00" + var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/blink = 2, @@ -27,6 +29,13 @@ /obj/item/toy/nuke = 2 ) +/obj/machinery/computer/arcade/power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/arcade/New() ..() var/choice = pick(typesof(/obj/machinery/computer/arcade) - /obj/machinery/computer/arcade) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index b283709654b..30d78efe9b9 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -11,6 +11,14 @@ var/receive_frequency = 1437 var/datum/radio_frequency/radio_connection + l_color = "#7BF9FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/atmos_alert/initialize() ..() diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 51e420b52f2..ce8bc8b4688 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -10,6 +10,14 @@ var/list/network = list("SS13") var/mapping = 0//For the overview file, interesting bit of code. + l_color = "#B40000" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + attack_ai(var/mob/user as mob) return attack_hand(user) diff --git a/code/game/machinery/computer/camera_monitor.dm b/code/game/machinery/computer/camera_monitor.dm index c8f3b7b3481..126f95a908e 100644 --- a/code/game/machinery/computer/camera_monitor.dm +++ b/code/game/machinery/computer/camera_monitor.dm @@ -1,5 +1,13 @@ /obj/machinery/computer/security + + l_color = "#B40000" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) New() if(network) networks = list(network) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index b168fff6a5c..76d46a47818 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -11,6 +11,14 @@ var/mode = 0.0 var/printing = null + l_color = "#0000FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + 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 ee49ed799ae..da082bcc8fc 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -14,6 +14,14 @@ var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything. var/loading = 0 // Nice loading text + l_color = "#0000FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/cloning/New() ..() spawn(5) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 886e9de1b77..9c5d7577afd 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -56,6 +56,14 @@ var/shuttle_call/shuttle_calls[0] var/stat_msg2 var/display_type="blank" + l_color = "#0000FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/communications/Topic(href, href_list) if(..(href, href_list)) return diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 81ea44b5bd3..19e0e018024 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -8,6 +8,14 @@ circuit = "/obj/item/weapon/circuitboard/crew" var/list/tracked = list( ) + l_color = "#0000FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/crew/New() tracked = list() diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index b77e483203a..91fbb084615 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -8,6 +8,14 @@ var/mob/living/silicon/ai/current = null var/opened = 0 + l_color = "#FFFFFF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + verb/AccessInternals() set category = "Object" diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 43955777f56..ff9758a5ad0 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -16,6 +16,14 @@ var/temp = null var/printing = null + l_color = "#0000FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /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 5ccd98fbc82..ce11ebe0ab9 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -33,6 +33,14 @@ var/customjob = "Admin" var/custommessage = "This is a test, please ignore." + l_color = "#50AB00" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob) if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index 1f58c9659b0..20c50419156 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -10,16 +10,18 @@ use_power = 2 idle_power_usage = 20 active_power_usage = 80 - l_color = "#D7DF01" -/obj/machinery/power/monitor/power_change() - ..() - if(!(stat & (BROKEN|NOPOWER))) - SetLuminosity(3) - else - SetLuminosity(0) + l_color = "#FF9933" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + //fix for issue 521, by QualityVan. //someone should really look into why circuits have a powernet var, it's several kinds of retarded. + /obj/machinery/power/monitor/New() ..() var/obj/structure/cable/attached = null diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 2bb0e276ad5..67a86a5fdf9 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -14,6 +14,14 @@ var/screen = 0 // 0 - No Access Denied, 1 - Access allowed var/obj/item/weapon/card/id/prisoner/inserted_id + l_color = "#B40000" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + attack_ai(var/mob/user as mob) return src.attack_hand(user) @@ -46,11 +54,15 @@ Tr = get_turf(C) if((Tr) && (Tr.z != src.z)) continue//Out of range if(!C.implanted) continue - dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: " - dat += "((1))" - dat += "((5))" - dat += "((10))
" - dat += "********************************
" + + // AUTOFIXED BY fix_string_idiocy.py + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\computer\prisoner.dm:41: dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: " + dat += {"[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: + ((1)) + ((5)) + ((10))
+ ********************************
"} + // END AUTOFIX dat += "
Tracking Implants
" for(var/obj/item/weapon/implant/tracking/T in world) Tr = get_turf(T) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 4787b954097..98b2f0fed0b 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -16,6 +16,14 @@ var/stop = 0.0 var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text + l_color = "#CD00CD" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/robotics/attack_ai(var/mob/user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f3104345576..2790dd4b8f8 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -22,6 +22,14 @@ var/sortBy = "name" var/order = 1 // -1 = Descending - 1 = Ascending + l_color = "#B40000" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob) if(istype(O, /obj/item/weapon/card/id) && !scan) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index b8b25b3e34b..2ab144691fd 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -5,6 +5,14 @@ var/auth_need = 3.0 var/list/authorized = list( ) + l_color = "#7BF9FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 35e80f54e7a..d2cd356d3ff 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -6,6 +6,14 @@ circuit = "/obj/item/weapon/circuitboard/stationalert" var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list()) + l_color = "#7BF9FF" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + attack_ai(mob/user) add_fingerprint(user) @@ -35,9 +43,13 @@ var/list/alm = L[alarm] var/area/A = alm[1] var/list/sources = alm[3] - dat += "" - dat += "• " - dat += "[A.name]" + + // AUTOFIXED BY fix_string_idiocy.py + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\computer\station_alert.dm:39: dat += "" + dat += {" + • + [A.name]"} + // END AUTOFIX if (sources.len > 1) dat += text(" - [] sources", sources.len) dat += "
\n" diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index 1e1569ab1cd..da0776a3c18 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -4,6 +4,14 @@ icon_state = "comm_logs" circuit = "/obj/item/weapon/circuitboard/merch" + l_color = "#50AB00" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + /obj/item/weapon/circuitboard/merch name = "\improper Merchandise Computer Circuitboard" build_path = /obj/machinery/computer/merch diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 49238fdb993..9d06657e86d 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -1,10 +1,11 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/telecomms - l_color = "#50A900" + + l_color = "#50AB00" power_change() ..() if(!(stat & (BROKEN|NOPOWER))) - SetLuminosity(3) + SetLuminosity(2) else SetLuminosity(0) diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index dd29affc6b3..cbf0bd2d82f 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -19,6 +19,14 @@ var/temp = "" // temporary feedback messages + l_color = "#50AB00" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + attack_hand(mob/user as mob) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index ab492949c3a..d86b4a89bae 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -20,6 +20,16 @@ var/storedcode = "" // code stored + l_color = "#50AB00" + power_change() + ..() + if(!(stat & (BROKEN|NOPOWER))) + SetLuminosity(2) + else + SetLuminosity(0) + + req_access = list(access_tcomsat) + proc/update_ide()