cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-10 06:34:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added luminescence to some computers

Browse Source 
- Added colored lights to all listed computers
- Should be fullly functional
- Uses the code Pomf used for Telecomms Computer testing

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/station_alert.dm
	code/game/machinery/telecomms/traffic_control.dm
This commit is contained in:
dylanstrategie
2014-07-20 01:53:20 +02:00
committed by ZomgPonies
parent ee5d2c8a1c
commit 4e10136895
25 changed files with 215 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/atmoalter/area_atmos_computer.dm
+8
View File
@@ -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."
code/game/machinery/computer/HolodeckControl.dm
+8
View File
@@ -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)
code/game/machinery/computer/Operating.dm
+8
View File
@@ -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))
code/game/machinery/computer/aifixer.dm
+8
View File
@@ -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")
code/game/machinery/computer/arcade.dm
+9
View File
@@ -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)
code/game/machinery/computer/atmos_alert.dm
+8
View File
@@ -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()
..()
code/game/machinery/computer/camera.dm
+8
View File
@@ -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)
code/game/machinery/computer/camera_monitor.dm
+8
View File
@@ -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)
code/game/machinery/computer/card.dm
+8
View File
@@ -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)
code/game/machinery/computer/cloning.dm
+8
View File
@@ -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)
code/game/machinery/computer/communications.dm
+8
View File
@@ -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
code/game/machinery/computer/crew.dm
+8
View File
@@ -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()
code/game/machinery/computer/law.dm
+8
View File
@@ -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"
code/game/machinery/computer/medical.dm
+8
View File
@@ -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)
code/game/machinery/computer/message.dm
+8
View File
@@ -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))
code/game/machinery/computer/power.dm
+9 -7
View File
@@ -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
code/game/machinery/computer/prisoner.dm
+17 -5
View File
@@ -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 += "<A href='?src=\ref[src];inject1=\ref[C]'>(<font color=red>(1)</font>)</A>"
dat += "<A href='?src=\ref[src];inject5=\ref[C]'>(<font color=red>(5)</font>)</A>"
dat += "<A href='?src=\ref[src];inject10=\ref[C]'>(<font color=red>(10)</font>)</A><BR>"
dat += "********************************<BR>"
// 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:
<A href='?src=\ref[src];inject1=\ref[C]'>(<font color=red>(1)</font>)</A>
<A href='?src=\ref[src];inject5=\ref[C]'>(<font color=red>(5)</font>)</A>
<A href='?src=\ref[src];inject10=\ref[C]'>(<font color=red>(10)</font>)</A><BR>
********************************<BR>"}
// END AUTOFIX
dat += "<HR>Tracking Implants<BR>"
for(var/obj/item/weapon/implant/tracking/T in world)
Tr = get_turf(T)
code/game/machinery/computer/robot.dm
+8
View File
@@ -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)
code/game/machinery/computer/security.dm
+8
View File
@@ -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)
code/game/machinery/computer/shuttle.dm
+8
View File
@@ -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
code/game/machinery/computer/station_alert.dm
+15 -3
View File
@@ -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 += "<NOBR>"
dat += "&bull; "
dat += "[A.name]"
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\computer\station_alert.dm:39: dat += "<NOBR>"
dat += {"<NOBR>
&bull;
[A.name]"}
// END AUTOFIX
if (sources.len > 1)
dat += text(" - [] sources", sources.len)
dat += "</NOBR><BR>\n"
code/game/machinery/computer/store.dm
+8
View File
@@ -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
code/game/machinery/telecomms/logbrowser.dm
+3 -2
View File
@@ -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)
code/game/machinery/telecomms/telemonitor.dm
+8
View File
@@ -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
code/game/machinery/telecomms/traffic_control.dm
+10
View File
@@ -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()