cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Computer Lighting Update

Browse Source
This commit is contained in:
SamCroswell
2015-07-07 01:10:55 -04:00
parent 2a34b600a9
commit 1d670c4c0f
55 changed files with 167 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/dna/dna_modifier.dm
+2 -12
View File
@@ -317,7 +317,8 @@
name = "DNA Modifier Access Console"
desc = "Allows you to scan and modify DNA."
icon = 'icons/obj/computer.dmi'
icon_state = "scanner"
icon_screen = "dna"
icon_keyboard = "med_key"
density = 1
circuit = /obj/item/weapon/circuitboard/scan_consolenew
var/selected_ui_block = 1.0
@@ -371,17 +372,6 @@
if(prob(75))
qdel(src)
/obj/machinery/computer/scan_consolenew/power_change()
if(stat & BROKEN)
icon_state = "broken"
else if(powered())
icon_state = initial(icon_state)
stat &= ~NOPOWER
else
spawn(rand(0, 15))
src.icon_state = "c_unpowered"
stat |= NOPOWER
/obj/machinery/computer/scan_consolenew/New()
..()
for(var/i=0;i<3;i++)
code/game/machinery/atmo_control.dm
+2 -1
View File
@@ -136,7 +136,8 @@ obj/machinery/air_sensor
/obj/machinery/computer/general_air_control
icon = 'icons/obj/computer.dmi'
icon_state = "tank"
icon_screen = "tank"
icon_keyboard = "atmos_key"
circuit = "/obj/item/weapon/circuitboard/air_management"
req_one_access_txt = "24;10"
code/game/machinery/atmoalter/area_atmos_computer.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/area_atmos
name = "Area Air Control"
desc = "A computer used to control the stationary scrubbers and pumps in the area."
icon_state = "area_atmos"
icon_screen = "area_atmos"
icon_keyboard = "atmos_key"
circuit = "/obj/item/weapon/circuitboard/area_atmos"
var/list/connectedscrubbers = new()
code/game/machinery/computer/HolodeckControl.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/HolodeckControl
name = "Holodeck Control Computer"
desc = "A computer used to control a nearby holodeck."
icon_state = "holocontrol"
icon_keyboard = "tech_key"
icon_screen = "holocontrol"
var/area/linkedholodeck = null
var/area/target = null
var/active = 0
code/game/machinery/computer/Operating.dm
+2 -1
View File
@@ -4,7 +4,8 @@
name = "Operating Computer"
density = 1
anchored = 1.0
icon_state = "operating"
icon_keyboard = "med_key"
icon_screen = "crew"
circuit = "/obj/item/weapon/circuitboard/operating"
var/mob/living/carbon/human/victim = null
var/obj/machinery/optable/table = null
code/game/machinery/computer/aifixer.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/aifixer
name = "AI System Integrity Restorer"
icon = 'icons/obj/computer.dmi'
icon_state = "ai-fixer"
icon_keyboard = "rd_key"
icon_screen = "ai-fixer"
circuit = /obj/item/weapon/circuitboard/aifixer
req_access = list(access_captain, access_robotics, access_heads)
var/mob/living/silicon/ai/occupant = null
code/game/machinery/computer/arcade.dm
+2
View File
@@ -3,6 +3,8 @@
desc = "random arcade machine"
icon = 'icons/obj/computer.dmi'
icon_state = "arcade"
icon_keyboard = null
icon_screen = "invaders"
light_color = "#00FF00"
var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2,
code/game/machinery/computer/atmos_alert.dm
+6 -4
View File
@@ -5,7 +5,8 @@
name = "Atmospheric Alert Computer"
desc = "Used to access the station's atmospheric sensors."
circuit = "/obj/item/weapon/circuitboard/atmos_alert"
icon_state = "alert:0"
icon_keyboard = "atmos_key"
icon_screen = "alert:0"
var/list/priority_alarms = list()
var/list/minor_alarms = list()
var/receive_frequency = 1437
@@ -60,13 +61,14 @@
if(stat & (NOPOWER|BROKEN))
return
if(priority_alarms.len)
icon_state = "alert:2"
icon_screen = "alert:2"
else if(minor_alarms.len)
icon_state = "alert:1"
icon_screen = "alert:1"
else
icon_state = "alert:0"
icon_screen = "alert:0"
return
code/game/machinery/computer/atmos_control.dm
+2 -1
View File
@@ -5,7 +5,8 @@
/obj/machinery/computer/atmoscontrol
name = "\improper Central Atmospherics Computer"
icon = 'icons/obj/computer.dmi'
icon_state = "tank"
icon_keyboard = "atmos_key"
icon_screen = "tank"
density = 1
anchored = 1.0
circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
code/game/machinery/computer/camera.dm
+11 -5
View File
@@ -6,7 +6,8 @@ var/camera_cache_id = 1
/obj/machinery/computer/security
name = "Camera Monitor"
desc = "Used to access the various cameras networks on the station."
icon_state = "cameras"
icon_keyboard = "security_key"
icon_screen = "cameras"
circuit = "/obj/item/weapon/circuitboard/camera"
var/obj/machinery/camera/current = null
var/list/network = list("")
@@ -264,6 +265,7 @@ var/camera_cache_id = 1
desc = "Used for watching camera networks."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "telescreen"
light_range_on = 0
network = list("SS13")
density = 0
@@ -279,14 +281,16 @@ var/camera_cache_id = 1
icon = 'icons/obj/status_display.dmi'
icon_state = "entertainment"
light_color = "#FFEEDB"
light_range_on = 2
light_range_on = 0
network = list("news")
luminosity = 0
/obj/machinery/computer/security/wooden_tv
name = "Security Camera Monitor"
desc = "An old TV hooked into the stations camera network."
icon_state = "security_det"
icon_state = "television"
icon_keyboard = null
icon_screen = "detective_tv"
light_color = "#3848B3"
light_power_on = 0.5
network = list("SS13")
@@ -294,13 +298,15 @@ var/camera_cache_id = 1
/obj/machinery/computer/security/mining
name = "Outpost Camera Monitor"
desc = "Used to access the various cameras on the outpost."
icon_state = "miningcameras"
icon_keyboard = "mining_key"
icon_screen = "mining"
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"
icon_keyboard = "power_key"
icon_screen = "engie_cams"
light_color = "#FAC54B"
network = list("Power Alarms","Atmosphere Alarms","Fire Alarms")
code/game/machinery/computer/card.dm
+2 -1
View File
@@ -3,7 +3,8 @@
/obj/machinery/computer/card
name = "Identification Computer"
desc = "Terminal for programming Nanotrasen employee ID cards to access parts of the station."
icon_state = "id"
icon_keyboard = "id_key"
icon_screen = "id"
req_access = list(access_change_ids)
circuit = "/obj/item/weapon/circuitboard/card"
var/obj/item/weapon/card/id/scan = null
code/game/machinery/computer/cloning.dm
+3 -14
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/cloning
name = "Cloning Console"
icon = 'icons/obj/computer.dmi'
icon_state = "dna"
icon_keyboard = "med_key"
icon_screen = "dna"
circuit = "/obj/item/weapon/circuitboard/cloning"
req_access = list(access_heads) //Only used for record deletion right now.
var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
@@ -372,16 +373,4 @@
if (R.ckey == find_key)
selected_record = R
break
return selected_record
/obj/machinery/computer/cloning/update_icon()
if(stat & BROKEN)
icon_state = "commb"
else
if(stat & NOPOWER)
src.icon_state = "c_unpowered"
stat |= NOPOWER
else
icon_state = initial(icon_state)
stat &= ~NOPOWER
return selected_record
code/game/machinery/computer/communications.dm
+2 -1
View File
@@ -36,7 +36,8 @@ var/shuttle_call/shuttle_calls[0]
/obj/machinery/computer/communications
name = "Communications Console"
desc = "This can be used for various important functions. Still under developement."
icon_state = "comm"
icon_keyboard = "tech_key"
icon_screen = "comm"
req_access = list(access_heads)
circuit = "/obj/item/weapon/circuitboard/communications"
var/prints_intercept = 1
code/game/machinery/computer/computer.dm
+17 -14
View File
@@ -1,6 +1,7 @@
/obj/machinery/computer
name = "computer"
icon = 'icons/obj/computer.dmi'
icon_state = "computer"
density = 1
anchored = 1.0
use_power = 1
@@ -8,9 +9,10 @@
active_power_usage = 300
var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly
var/processing = 0
var/light_range_on = 3
var/light_power_on = 2
var/icon_keyboard = "generic_key"
var/icon_screen = "generic"
var/light_range_on = 2
var/light_power_on = 1
/obj/machinery/computer/New()
..()
@@ -19,6 +21,7 @@
/obj/machinery/computer/initialize()
power_change()
update_icon()
/obj/machinery/computer/process()
if(stat & (NOPOWER|BROKEN))
@@ -65,18 +68,18 @@
density = 0
/obj/machinery/computer/update_icon()
..()
icon_state = initial(icon_state)
// Broken
overlays.Cut()
var/overlay_layer = LIGHTING_LAYER+0.1
if(stat & NOPOWER)
overlays += image(icon,"[icon_keyboard]_off",overlay_layer)
return
overlays += image(icon, icon_keyboard ,overlay_layer)
if(stat & BROKEN)
icon_state += "b"
// Powered
else if(stat & NOPOWER)
icon_state = initial(icon_state)
icon_state += "0"
luminosity = 0
overlays += image(icon,"[icon_state]_broken",overlay_layer)
else
overlays += image(icon,icon_screen,overlay_layer)
/obj/machinery/computer/power_change()
code/game/machinery/computer/crew.dm
+2 -13
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/crew
name = "crew monitoring computer"
desc = "Used to monitor active health sensors built into most of the crew's uniforms."
icon_state = "crew"
icon_keyboard = "med_key"
icon_screen = "crew"
use_power = 1
idle_power_usage = 250
active_power_usage = 500
@@ -28,17 +29,5 @@
/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
crew_monitor.ui_interact(user, ui_key, ui, force_open)
/obj/machinery/computer/crew/update_icon()
if(stat & BROKEN)
icon_state = "crewb"
else
if(stat & NOPOWER)
src.icon_state = "c_unpowered"
stat |= NOPOWER
else
icon_state = initial(icon_state)
stat &= ~NOPOWER
/obj/machinery/computer/crew/interact(mob/user)
crew_monitor.ui_interact(user)
code/game/machinery/computer/hologram.dm
+2 -1
View File
@@ -4,7 +4,8 @@
name = "Hologram Computer"
desc = "Rumoured to control holograms."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "holo_console0"
icon_keyboard = "tech_key"
icon_screen = "holocontrol"
var/obj/machinery/hologram/projector/projector = null
var/temp = null
var/lumens = 0.0
code/game/machinery/computer/honkputer.dm
+3 -1
View File
@@ -2,7 +2,9 @@
name = "HONKputer Mark I"
desc = "A yellow computer used in case of critically low levels of HONK."
icon = 'icons/obj/machines/HONKputer.dmi'
icon_state = "honk"
icon_state = "honkputer"
icon_keyboard = "key_honk"
icon_screen = "honkcomms"
light_color = LIGHT_COLOR_PINK
req_access = list(access_clown)
circuit = "/obj/item/weapon/circuitboard/HONKputer"
code/game/machinery/computer/law.dm
+4 -2
View File
@@ -3,7 +3,8 @@
/obj/machinery/computer/aiupload
name = "AI Upload"
desc = "Used to upload laws to the AI."
icon_state = "command"
icon_screen = "command"
icon_keyboard = "med_key"
circuit = "/obj/item/weapon/circuitboard/aiupload"
var/mob/living/silicon/ai/current = null
var/opened = 0
@@ -60,7 +61,8 @@
/obj/machinery/computer/borgupload
name = "Cyborg Upload"
desc = "Used to upload laws to Cyborgs."
icon_state = "command"
icon_screen = "command"
icon_keyboard = "med_key"
circuit = "/obj/item/weapon/circuitboard/borgupload"
var/mob/living/silicon/robot/current = null
code/game/machinery/computer/medical.dm
+5 -2
View File
@@ -3,7 +3,8 @@
/obj/machinery/computer/med_data//TODO:SANITY
name = "Medical Records"
desc = "This can be used to check medical records."
icon_state = "medcomp"
icon_keyboard = "med_key"
icon_screen = "medcomp"
req_one_access = list(access_medical, access_forensics_lockers)
circuit = "/obj/item/weapon/circuitboard/med_data"
var/obj/item/weapon/card/id/scan = null
@@ -518,4 +519,6 @@
/obj/machinery/computer/med_data/laptop
name = "Medical Laptop"
desc = "Cheap Nanotrasen Laptop."
icon_state = "medlaptop"
icon_state = "laptop"
icon_keyboard = "laptop_key"
icon_screen = "medlaptop"
code/game/machinery/computer/message.dm
+10 -9
View File
@@ -7,9 +7,9 @@
/obj/machinery/computer/message_monitor
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"
icon_screen = "comm_logs"
light_color = LIGHT_COLOR_GREEN
var/hack_icon = "comm_logsc"
var/hack_icon = "tcboss"
var/normal_icon = "comm_logs"
circuit = "/obj/item/weapon/circuitboard/message_monitor"
//Server linked to.
@@ -55,7 +55,7 @@
// It'll take more time if there's more characters in the password..
if(!emag)
if(!isnull(src.linkedServer))
icon_state = hack_icon // An error screen I made in the computers.dmi
icon_screen = hack_icon // An error screen I made in the computers.dmi
emag = 1
screen = 2
spark_system.set_up(5, 0, src)
@@ -70,13 +70,14 @@
user << "<span class='notice'>A no server error appears on the screen.</span>"
/obj/machinery/computer/message_monitor/update_icon()
..()
if(stat & (NOPOWER|BROKEN))
return
if(emag || hacking)
icon_state = hack_icon
icon_screen = hack_icon
else
icon_state = normal_icon
icon_screen = normal_icon
..()
/obj/machinery/computer/message_monitor/initialize()
//Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
@@ -261,11 +262,11 @@
var/currentKey = src.linkedServer.decryptkey
user << "<span class='warning'>Brute-force completed! The key is '[currentKey]'.</span>"
src.hacking = 0
src.icon_state = normal_icon
src.icon_screen = normal_icon
src.screen = 0 // Return the screen back to normal
/obj/machinery/computer/message_monitor/proc/UnmagConsole()
src.icon_state = normal_icon
src.icon_screen = normal_icon
src.emag = 0
/obj/machinery/computer/message_monitor/proc/ResetMessage()
@@ -358,7 +359,7 @@
if((istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot)) && (usr.mind.special_role && usr.mind.original == usr))
src.hacking = 1
src.screen = 2
src.icon_state = hack_icon
src.icon_screen = hack_icon
//Time it takes to bruteforce is dependant on the password length.
spawn(100*length(src.linkedServer.decryptkey))
if(src && src.linkedServer && usr)
code/game/machinery/computer/pod.dm
+4 -15
View File
@@ -3,7 +3,7 @@
/obj/machinery/computer/pod
name = "Mass Drivers and Pod Doors Control"
desc = "A controll for launching pods. Some people prefer firing Mechas."
icon_state = "mass_drivers"
icon_screen = "mass_driver"
light_color = "#555555"
circuit = /obj/item/weapon/circuitboard/pod
var/list/id_tags = list()
@@ -90,9 +90,6 @@
visible_message("Cannot locate any mass driver of that ID. Cancelling firing sequence!")
return
if(icon_state != "old")
flick("mass_drivers_timing", src)
for(var/obj/machinery/door/poddoor/M in world)
if(M.z != src.z) continue
if(M.id_tag == ident_tag)
@@ -170,12 +167,10 @@
/obj/machinery/computer/pod/process()
if(!..())
return
var/timing = 0
for(var/ident_tag in id_tags)
if(timings[ident_tag])
if(times[ident_tag] > 0)
times[ident_tag] = round(times[ident_tag]) - 1
timing = 1
else
spawn()
launch_sequence(ident_tag)
@@ -187,11 +182,6 @@
else
times[ident_tag] = maxtimes[ident_tag]
updateDialog()
if(icon_state != "old")
if(timing)
icon_state = "mass_drivers_timing"
else
icon_state = "mass_drivers"
return
@@ -270,7 +260,9 @@
/obj/machinery/computer/pod/old
icon_state = "old"
icon_state = "oldcomp"
icon_screen = "library"
icon_keyboard = null
name = "DoorMex Control Computer"
circuit = /obj/item/weapon/circuitboard/olddoor
@@ -312,9 +304,6 @@
visible_message("Cannot locate any mass driver of that ID. Cancelling firing sequence!")
return
if(icon_state != "old")
flick("mass_drivers_timing", src)
if(teleporter_dest)
for(var/obj/structure/deathsquad_tele/D in world)
if(D.z != src.z) continue
code/game/machinery/computer/pod_tracking_console.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/podtracker
name = "Pod Tracking Console"
icon = 'icons/obj/computer.dmi'
icon_state = "podtracking"
icon_keyboard = "tech_key"
icon_screen = "rdcomp"
light_color = LIGHT_COLOR_PURPLE
req_access = list(access_robotics)
circuit = "/obj/item/weapon/circuitboard/pod_locater"
code/game/machinery/computer/prisoner.dm
+2 -1
View File
@@ -3,7 +3,8 @@
/obj/machinery/computer/prisoner
name = "Prisoner Management"
icon = 'icons/obj/computer.dmi'
icon_state = "explosive"
icon_keyboard = "security_key"
icon_screen = "explosive"
req_access = list(access_armory)
circuit = "/obj/item/weapon/circuitboard/prisoner"
var/id = 0.0
code/game/machinery/computer/prisonshuttle.dm
+2 -1
View File
@@ -13,7 +13,8 @@ var/prison_shuttle_timeleft = 0
/obj/machinery/computer/prison_shuttle
name = "Prison Shuttle Console"
icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
icon_keyboard = "security_key"
icon_screen = "syndishuttle"
light_color = LIGHT_COLOR_PURE_CYAN
req_access = list(access_security)
circuit = "/obj/item/weapon/circuitboard/prison_shuttle"
code/game/machinery/computer/robot.dm
+2 -1
View File
@@ -5,7 +5,8 @@
name = "robotics control console"
desc = "Used to remotely lockdown or detonate linked Cyborgs."
icon = 'icons/obj/computer.dmi'
icon_state = "robot"
icon_keyboard = "tech_key"
icon_screen = "robot"
req_access = list(access_robotics)
circuit = /obj/item/weapon/circuitboard/robotics
var/temp = null
code/game/machinery/computer/salvage_ship.dm
+2 -1
View File
@@ -4,7 +4,8 @@
/obj/machinery/computer/salvage_ship
name = "salvage ship terminal"
icon = 'icons/obj/computer.dmi'
icon_state = "syndishuttle"
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
req_access = list(access_salvage_captain)
var/area/curr_location
var/moving = 0
code/game/machinery/computer/security.dm
+2 -1
View File
@@ -3,7 +3,8 @@
/obj/machinery/computer/secure_data//TODO:SANITY
name = "Security Records"
desc = "Used to view and edit personnel's security records"
icon_state = "security"
icon_keyboard = "security_key"
icon_screen = "security"
req_one_access = list(access_security, access_forensics_lockers)
circuit = "/obj/item/weapon/circuitboard/secure_data"
var/obj/item/weapon/card/id/scan = null
code/game/machinery/computer/shuttle.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/shuttle
name = "Shuttle"
desc = "For shuttle control."
icon_state = "shuttle"
icon_keyboard = "tech_key"
icon_screen = "shuttle"
var/auth_need = 3.0
var/list/authorized = list( )
code/game/machinery/computer/skills.dm
+3 -1
View File
@@ -3,7 +3,9 @@
/obj/machinery/computer/skills//TODO:SANITY
name = "Employment Records"
desc = "Used to view personnel's employment records"
icon_state = "medlaptop"
icon_state = "laptop"
icon_keyboard = "laptop_key"
icon_screen = "medlaptop"
light_color = LIGHT_COLOR_GREEN
req_one_access = list(access_heads)
circuit = "/obj/item/weapon/circuitboard/skills"
code/game/machinery/computer/specops_shuttle.dm
+2 -1
View File
@@ -14,7 +14,8 @@ var/specops_shuttle_timeleft = 0
/obj/machinery/computer/specops_shuttle
name = "Spec. Ops. Shuttle Console"
icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
icon_keyboard = "security_key"
icon_screen = "syndishuttle"
light_color = LIGHT_COLOR_PURE_CYAN
req_access = list(access_cent_specops)
// req_access = list(ACCESS_CENT_SPECOPS)
code/game/machinery/computer/station_alert.dm
+5 -4
View File
@@ -2,7 +2,8 @@
/obj/machinery/computer/station_alert
name = "Station Alert Computer"
desc = "Used to access the station's automated alert system."
icon_state = "alert:0"
icon_keyboard = "tech_key"
icon_screen = "alert:0"
circuit = "/obj/item/weapon/circuitboard/stationalert"
var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
@@ -102,15 +103,15 @@
process()
if(stat & (BROKEN|NOPOWER))
icon_state = "atmos0"
icon_screen = "alert:0"
return
var/active_alarms = 0
for (var/cat in src.alarms)
var/list/L = src.alarms[cat]
if(L.len) active_alarms = 1
if(active_alarms)
icon_state = "alert:2"
icon_screen = "alert:2"
else
icon_state = "alert:0"
icon_screen = "alert:0"
..()
return
code/game/machinery/computer/store.dm
+1 -13
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/merch
name = "Merch Computer"
icon = 'icons/obj/computer.dmi'
icon_state = "comm_logs"
icon_screen = "comm_logs"
circuit = "/obj/item/weapon/circuitboard/merch"
light_color = LIGHT_COLOR_GREEN
@@ -145,15 +145,3 @@ td.cost.toomuch {
usr << "\blue You've successfully purchased the item. It should be in your hands or on the floor."
src.updateUsrDialog()
return
/obj/machinery/computer/merch/update_icon()
if(stat & BROKEN)
icon_state = "comm_logsb"
else
if(stat & NOPOWER)
src.icon_state = "comm_logs0"
stat |= NOPOWER
else
icon_state = initial(icon_state)
stat &= ~NOPOWER
code/game/machinery/computer/syndicate_specops_shuttle.dm
+2 -1
View File
@@ -13,7 +13,8 @@ var/syndicate_elite_shuttle_timeleft = 0
/obj/machinery/computer/syndicate_elite_shuttle
name = "Elite Syndicate Squad Shuttle Console"
icon = 'icons/obj/computer.dmi'
icon_state = "syndishuttle"
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
light_color = LIGHT_COLOR_PURE_CYAN
req_access = list(access_syndicate)
var/temp = null
code/game/machinery/computer/telecrystalconsoles.dm
+5 -2
View File
@@ -6,7 +6,6 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
/obj/machinery/computer/telecrystals
name = "\improper Telecrystal assignment station"
desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..."
icon_state = "tcstation"
/////////////////////////////////////////////
/obj/machinery/computer/telecrystals/uplinker
@@ -14,6 +13,8 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \
you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant."
icon_state = "tcstation"
icon_keyboard = "tcstation_key"
icon_screen = "syndie"
var/obj/item/uplinkholder = null
var/obj/machinery/computer/telecrystals/boss/linkedboss = null
@@ -51,6 +52,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
/obj/machinery/computer/telecrystals/uplinker/update_icon()
overlays.Cut()
..()
if(uplinkholder)
overlays += "[initial(icon_state)]-closed"
@@ -126,7 +128,8 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \
Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \
based on the danger rating of the mission."
icon_state = "tcboss"
icon_keyboard = "syndie_key"
icon_screen = "tcboss"
var/virgin = 1
var/scanrange = 10
var/storedcrystals = 0
code/game/machinery/computer/xenos_shuttle.dm
+2 -1
View File
@@ -4,7 +4,8 @@
/obj/machinery/computer/xenos_station
name = "xenos shuttle terminal"
icon = 'icons/obj/computer.dmi'
icon_state = "xenocontrol"
icon_keyboard = "telesci_key"
icon_screen = "telesci"
req_access = list()
var/area/curr_location
var/moving = 0
code/game/machinery/guestpass.dm
+2
View File
@@ -42,6 +42,8 @@
/obj/machinery/computer/guestpass
name = "guest pass terminal"
icon_state = "guest"
icon_screen = "pass"
icon_keyboard = null
density = 0
code/game/machinery/telecomms/logbrowser.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/machinery/computer/telecomms/server
name = "Telecommunications Server Monitor"
icon_state = "comm_logs"
icon_screen = "comm_logs"
var/screen = 0 // the screen number:
code/game/machinery/telecomms/telemonitor.dm
+1 -1
View File
@@ -9,7 +9,7 @@
/obj/machinery/computer/telecomms/monitor
name = "Telecommunications Monitor"
icon_state = "comm_monitor"
icon_screen = "comm_monitor"
var/screen = 0 // the screen number:
var/list/machinelist = list() // the machines located by the computer
code/game/machinery/telecomms/traffic_control.dm
-1
View File
@@ -1,6 +1,5 @@
/obj/machinery/computer/telecomms/traffic
name = "Telecommunications Traffic Control"
icon_state = "computer_generic"
var/screen = 0 // the screen number:
var/list/servers = list() // the servers located by the computer
code/game/machinery/teleporter.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/teleporter
name = "Teleporter Control Console"
desc = "Used to control a linked teleportation Hub and Station."
icon_state = "teleport"
icon_screen = "teleport"
icon_keyboard = "teleport_key"
circuit = "/obj/item/weapon/circuitboard/teleporter"
var/obj/item/device/gps/locked = null
var/regime_set = "Teleporter"
code/game/mecha/mech_bay.dm
+5 -3
View File
@@ -98,7 +98,8 @@
density = 1
anchored = 1
icon = 'icons/obj/computer.dmi'
icon_state = "recharge_comp"
icon_keyboard = "tech_key"
icon_screen = "recharge_comp"
light_color = LIGHT_COLOR_FADEDPURPLE
circuit = /obj/item/weapon/circuitboard/mech_bay_power_console
var/obj/machinery/mech_bay_recharge_port/recharge_port
@@ -160,9 +161,10 @@
/obj/machinery/computer/mech_bay_power_console/update_icon()
if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge))
icon_state = "recharge_comp"
icon_screen = "recharge_comp"
else
icon_state = "recharge_comp_on"
icon_screen = "recharge_comp_on"
..()
/obj/machinery/computer/mech_bay_power_console/initialize()
reconnect()
code/game/mecha/mecha_control_console.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/mecha
name = "Exosuit Control"
icon = 'icons/obj/computer.dmi'
icon_state = "mecha"
icon_keyboard = "rd_key"
icon_screen = "mecha"
light_color = LIGHT_COLOR_FADEDPURPLE
req_access = list(access_robotics)
circuit = "/obj/item/weapon/circuitboard/mecha_control"
code/game/supplyshuttle.dm
+2 -2
View File
@@ -104,7 +104,7 @@ var/list/mechtoys = list(
name = "Supply Shuttle Console"
desc = "Used to order supplies."
icon = 'icons/obj/computer.dmi'
icon_state = "supply"
icon_screen = "supply"
req_access = list(access_cargo)
circuit = "/obj/item/weapon/circuitboard/supplycomp"
var/temp = null
@@ -117,7 +117,7 @@ var/list/mechtoys = list(
name = "Supply Ordering Console"
desc = "Used to order supplies from cargo staff."
icon = 'icons/obj/computer.dmi'
icon_state = "request"
icon_screen = "request"
circuit = "/obj/item/weapon/circuitboard/ordercomp"
var/temp = null
var/reqtime = 0 //Cooldown for requisitions - Quarxink
code/modules/atmos_automation/console.dm
+2 -1
View File
@@ -1,6 +1,7 @@
/obj/machinery/computer/general_air_control/atmos_automation
icon = 'icons/obj/computer.dmi'
icon_state = "aac"
icon_screen = "area_atmos"
icon_keyboard = "atmos_key"
circuit = "/obj/item/weapon/circuitboard/atmos_automation"
req_one_access_txt = "24;10"
Mtoollink = 1
code/modules/research/rdconsole.dm
+2 -1
View File
@@ -33,7 +33,8 @@ 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"
icon_screen = "rdcomp"
icon_keyboard = "rd_key"
light_color = LIGHT_COLOR_FADEDPURPLE
circuit = /obj/item/weapon/circuitboard/rdconsole
var/datum/research/files //Stores all the collected research data.
code/modules/research/server.dm
+2 -1
View File
@@ -175,7 +175,8 @@
/obj/machinery/computer/rdservercontrol
name = "R&D Server Controller"
icon_state = "rdcomp"
icon_screen = "rdcomp"
icon_keyboard = "rd_key"
light_color = LIGHT_COLOR_FADEDPURPLE
circuit = /obj/item/weapon/circuitboard/rdservercontrol
var/screen = 0
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
+2 -1
View File
@@ -13,7 +13,8 @@ datum/genesequence
/obj/machinery/computer/reconstitutor
name = "Flora reconstitution console"
icon = 'icons/obj/computer.dmi'
icon_state = "dna"
icon_keyboard = "med_key"
icon_screen = "dna"
circuit = "/obj/item/weapon/circuitboard/reconstitutor"
req_access = list(access_heads) //Only used for record deletion right now.
var/obj/machinery/clonepod/pod1 = 1 //Linked cloning pod.
code/modules/shuttles/antagonist.dm
+8 -4
View File
@@ -2,16 +2,20 @@
name = "skipjack control console"
req_access = list(access_vox)
shuttle_tag = "Vox Skipjack"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
/obj/machinery/computer/shuttle_control/multi/vox/attack_ai(user as mob)
user << "\red Access Denied."
return 1
return 1
/obj/machinery/computer/shuttle_control/multi/syndicate
name = "Syndicate control console"
req_access = list(access_syndicate)
shuttle_tag = "Syndicate"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
/obj/machinery/computer/shuttle_control/multi/syndicate/attack_ai(user as mob)
user << "\red Access Denied."
return 1
return 1
code/modules/shuttles/shuttle_console.dm
+4 -3
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/shuttle_control
name = "shuttle control console"
icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
icon_screen = "shuttle"
icon_keyboard = "med_key"
circuit = null
var/shuttle_tag // Used to coordinate data in shuttle controller.
@@ -15,7 +16,7 @@
if(!allowed(user))
user << "\red Access Denied."
return 1
ui_interact(user)
/obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
@@ -84,7 +85,7 @@
if (!istype(shuttle))
return
shuttle.launch(user)
/obj/machinery/computer/shuttle_control/proc/force_launch(var/mob/user)
var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
if (!istype(shuttle))
code/modules/shuttles/shuttle_specops.dm
+2
View File
@@ -1,6 +1,8 @@
/obj/machinery/computer/shuttle_control/specops
name = "special operations shuttle console"
shuttle_tag = "Special Operations"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
req_access = list(access_cent_specops)
/obj/machinery/computer/shuttle_control/specops/attack_ai(user as mob)
code/modules/shuttles/shuttles_multi.dm
+5 -4
View File
@@ -43,7 +43,8 @@
command_announcement.Announce(arrival_message,(announcer ? announcer : "Central Command"))
/obj/machinery/computer/shuttle_control/multi
icon_state = "syndishuttle"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
/obj/machinery/computer/shuttle_control/multi/attack_hand(user as mob)
@@ -84,7 +85,7 @@
var/datum/shuttle/multi_shuttle/MS = shuttle_controller.shuttles[shuttle_tag]
if(!istype(MS)) return
//world << "multi_shuttle: last_departed=[MS.last_departed], origin=[MS.origin], interim=[MS.interim], travel_time=[MS.move_time]"
if (MS.moving_status != SHUTTLE_IDLE)
@@ -102,7 +103,7 @@
//TODO: Actually end the mission.
MS.return_warning = 1
return
MS.long_jump(MS.last_departed,MS.origin,MS.interim,MS.move_time)
MS.last_departed = MS.origin
MS.at_origin = 1
@@ -127,7 +128,7 @@
MS.last_departed = MS.origin
MS.at_origin = 0
MS.long_jump(MS.last_departed, MS.destinations[choice], MS.interim, MS.move_time)
MS.last_departed = MS.destinations[choice]
return
code/modules/telesci/telesci_computer.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/telescience
name = "\improper Telepad Control Console"
desc = "Used to teleport objects to and from the telescience telepad."
icon_state = "teleport"
icon_keyboard = "telesci_key"
icon_screen = "telesci"
circuit = /obj/item/weapon/circuitboard/telesci_console
req_access = list(access_research)
var/sending = 1
code/modules/virus2/diseasesplicer.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/machinery/computer/diseasesplicer
name = "Disease Splicer"
icon = 'icons/obj/computer.dmi'
icon_state = "crew"
icon_screen = "crew"
icon_keyboard = "med_key"
var/datum/disease2/effectholder/memorybank = null
var/list/species_buffer = null