Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733

[MIRROR] [s] Cameranet fixes
This commit is contained in:
deathride58
2018-02-23 13:21:23 +00:00
committed by GitHub
23 changed files with 848 additions and 1183 deletions
+4 -1
View File
@@ -17,7 +17,7 @@
armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50)
max_integrity = 100
integrity_failure = 50
var/list/network = list("SS13")
var/list/network = list("ss13")
var/c_tag = null
var/c_tag_order = 999
var/status = TRUE
@@ -44,6 +44,9 @@
/obj/machinery/camera/Initialize(mapload, obj/structure/camera_assembly/CA)
. = ..()
for(var/i in network)
network -= i
network += lowertext(i)
if(CA)
assembly = CA
else
@@ -99,6 +99,9 @@
if(tempnetwork.len < 1)
to_chat(user, "<span class='warning'>No network found, please hang up and try your call again!</span>")
return
for(var/i in tempnetwork)
tempnetwork -= i
tempnetwork += lowertext(i)
state = 4
var/obj/machinery/camera/C = new(loc, src)
forceMove(C)
+8 -2
View File
@@ -5,12 +5,18 @@
icon_keyboard = "security_key"
circuit = /obj/item/circuitboard/computer/security
var/last_pic = 1
var/list/network = list("SS13")
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/Initialize()
. = ..()
for(var/i in network)
network -= i
network += lowertext(i)
/obj/machinery/computer/security/check_eye(mob/user)
if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind )
user.unset_machine()
@@ -185,5 +191,5 @@
desc = "Used to access the various cameras on the outpost."
icon_screen = "mining"
icon_keyboard = "mining_key"
network = list("MINE")
network = list("mine")
circuit = /obj/item/circuitboard/computer/mining
@@ -7,7 +7,7 @@
var/lock_override = NONE
var/mob/camera/aiEye/remote/eyeobj
var/mob/living/current_user = null
var/list/networks = list("SS13")
var/list/networks = list("ss13")
var/datum/action/innate/camera_off/off_action = new
var/datum/action/innate/camera_jump/jump_action = new
var/list/actions = list()
@@ -16,6 +16,9 @@
/obj/machinery/computer/camera_advanced/Initialize()
. = ..()
for(var/i in networks)
networks -= i
networks += lowertext(i)
if(lock_override)
if(lock_override & CAMERA_LOCK_STATION)
z_lock |= SSmapping.levels_by_trait(ZTRAIT_STATION)
@@ -261,7 +264,7 @@
name = "ratvarian camera observer"
desc = "A console used to snoop on the station's goings-on. A jet of steam occasionally whooshes out from slats on its sides."
use_power = FALSE
networks = list("SS13", "MiniSat") //:eye:
networks = list("ss13", "minisat") //:eye:
var/datum/action/innate/servant_warp/warp_action = new
/obj/machinery/computer/camera_advanced/ratvar/Initialize()
@@ -76,7 +76,7 @@
for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
if(camera.stat || !camera.can_use())
continue
if(length(list("SS13","MINE")&camera.network))
if(length(list("ss13","mine")&camera.network))
bugged_cameras[camera.c_tag] = camera
sortList(bugged_cameras)
return bugged_cameras