Standardize computer luminosity shit, deduplicate power stuff.

This commit is contained in:
Rob Nelson
2014-07-20 16:17:19 -04:00
committed by ZomgPonies
parent 94b5466254
commit 471bc24c1e
23 changed files with 4 additions and 139 deletions
@@ -10,12 +10,6 @@
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)
@@ -10,12 +10,6 @@
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()
..()
-6
View File
@@ -8,12 +8,6 @@
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")
@@ -12,12 +12,6 @@
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()
-6
View File
@@ -11,12 +11,6 @@
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)
-6
View File
@@ -12,12 +12,6 @@
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)
-6
View File
@@ -15,12 +15,6 @@
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()
..()
@@ -57,12 +57,6 @@ var/shuttle_call/shuttle_calls[0]
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))
+4 -1
View File
@@ -15,7 +15,6 @@
if(ticker)
initialize()
/obj/machinery/computer/initialize()
power_change()
@@ -93,6 +92,10 @@
/obj/machinery/computer/power_change()
..()
update_icon()
if(!(stat & (BROKEN|NOPOWER)))
SetLuminosity(2)
else
SetLuminosity(0)
/obj/machinery/computer/proc/set_broken()
-6
View File
@@ -9,12 +9,6 @@
var/list/tracked = list( )
l_color = "#0000FF"
power_change()
..()
if(!(stat & (BROKEN|NOPOWER)))
SetLuminosity(2)
else
SetLuminosity(0)
/obj/machinery/computer/crew/New()
-6
View File
@@ -9,12 +9,6 @@
var/opened = 0
l_color = "#FFFFFF"
power_change()
..()
if(!(stat & (BROKEN|NOPOWER)))
SetLuminosity(2)
else
SetLuminosity(0)
verb/AccessInternals()
-6
View File
@@ -17,12 +17,6 @@
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)
-6
View File
@@ -34,12 +34,6 @@
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)
-6
View File
@@ -12,12 +12,6 @@
active_power_usage = 80
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.
-6
View File
@@ -15,12 +15,6 @@
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)
-6
View File
@@ -17,12 +17,6 @@
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)
-6
View File
@@ -23,12 +23,6 @@
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)
-6
View File
@@ -6,12 +6,6 @@
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)
@@ -7,12 +7,6 @@
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)
-6
View File
@@ -5,12 +5,6 @@
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"
@@ -2,12 +2,6 @@
/obj/machinery/computer/telecomms
l_color = "#50AB00"
power_change()
..()
if(!(stat & (BROKEN|NOPOWER)))
SetLuminosity(2)
else
SetLuminosity(0)
/obj/machinery/computer/telecomms/server
name = "Telecommunications Server Monitor"
@@ -20,12 +20,6 @@
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))
@@ -1,9 +1,3 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/machinery/computer/telecomms/traffic
name = "Telecommunications Traffic Control"
icon_state = "computer_generic"
@@ -21,12 +15,6 @@
var/storedcode = "" // code stored
l_color = "#50AB00"
power_change()
..()
if(!(stat & (BROKEN|NOPOWER)))
SetLuminosity(2)
else
SetLuminosity(0)
req_access = list(access_tcomsat)