Revert "12/21 modernizations from TG live"

This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
+9 -6
View File
@@ -8,6 +8,8 @@
var/list/network = list("SS13")
var/mapping = 0//For the overview file, interesting bit of code.
var/list/watchers = list() //who's using the console, associated with the camera they're on.
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/security/check_eye(mob/user)
if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind )
@@ -27,7 +29,7 @@
if(!Adjacent(user))
user.unset_machine()
return
else if(iscyborg(user))
else if(isrobot(user))
var/list/viewing = viewers(src)
if(!viewing.Find(user))
user.unset_machine()
@@ -68,7 +70,7 @@
if(!(user in watchers))
user.unset_machine() // no usable camera on the network, we disconnect the user from the computer.
return
playsound(src, 'sound/machines/terminal_prompt.ogg', 25, 0)
playsound(src, 'sound/machines/terminal_displaying.ogg', 25, 0)
use_camera_console(user)
/obj/machinery/computer/security/proc/use_camera_console(mob/user)
@@ -91,7 +93,7 @@
var/camera_fail = 0
if(!C.can_use() || user.machine != src || user.eye_blind || user.incapacitated())
camera_fail = 1
else if(iscyborg(user))
else if(isrobot(user))
var/list/viewing = viewers(src)
if(!viewing.Find(user))
camera_fail = 1
@@ -103,18 +105,18 @@
user.unset_machine()
return 0
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
if(isAI(user))
var/mob/living/silicon/ai/A = user
A.eyeobj.setLoc(get_turf(C))
A.client.eye = A.eyeobj
else
user.reset_perspective(C)
user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/noise)
user.clear_fullscreen("flash", 5)
watchers[user] = C
use_power(50)
addtimer(src, "use_camera_console", 5, TIMER_NORMAL, user)
addtimer(src, "use_camera_console", 5, FALSE, user)
playsound(src, 'sound/machines/terminal_select.ogg', 25, 0)
else
user.unset_machine()
@@ -153,6 +155,7 @@
density = 0
circuit = null
clockwork = TRUE //it'd look very weird
use_auto_lights = 0
/obj/machinery/computer/security/telescreen/update_icon()
icon_state = initial(icon_state)