Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
[MIRROR] [s] Cameranet fixes
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
sec_hud = DATA_HUD_SECURITY_BASIC
|
||||
d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED
|
||||
mob_size = MOB_SIZE_LARGE
|
||||
var/list/network = list("SS13")
|
||||
var/list/network = list("ss13")
|
||||
var/obj/machinery/camera/current = null
|
||||
var/list/connected_robots = list()
|
||||
var/aiRestorePowerRoutine = 0
|
||||
@@ -149,7 +149,7 @@
|
||||
GLOB.shuttle_caller_list += src
|
||||
|
||||
builtInCamera = new (src)
|
||||
builtInCamera.network = list("SS13")
|
||||
builtInCamera.network = list("ss13")
|
||||
|
||||
|
||||
/mob/living/silicon/ai/Destroy()
|
||||
@@ -567,11 +567,13 @@
|
||||
var/mob/living/silicon/ai/U = usr
|
||||
|
||||
for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
|
||||
var/list/tempnetwork = C.network
|
||||
if(!(is_station_level(C.z) || is_mining_level(C.z) || ("ss13" in tempnetwork)))
|
||||
continue
|
||||
if(!C.can_use())
|
||||
continue
|
||||
|
||||
var/list/tempnetwork = C.network
|
||||
tempnetwork.Remove("CREED", "thunder", "RD", "toxins", "Prison")
|
||||
tempnetwork.Remove("rd", "toxins", "prison")
|
||||
if(tempnetwork.len)
|
||||
for(var/i in C.network)
|
||||
cameralist[i] = i
|
||||
@@ -591,7 +593,7 @@
|
||||
if(network in C.network)
|
||||
U.eyeobj.setLoc(get_turf(C))
|
||||
break
|
||||
to_chat(src, "<span class='notice'>Switched to [network] camera network.</span>")
|
||||
to_chat(src, "<span class='notice'>Switched to the \"[uppertext(network)]\" camera network.</span>")
|
||||
//End of code by Mord_Sith
|
||||
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
layer = BELOW_MOB_LAYER
|
||||
can_be_held = TRUE
|
||||
|
||||
var/network = "SS13"
|
||||
var/network = "ss13"
|
||||
var/obj/machinery/camera/current = null
|
||||
|
||||
var/ram = 100 // Used as currency to purchase different abilities
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
if(!scrambledcodes && !builtInCamera)
|
||||
builtInCamera = new (src)
|
||||
builtInCamera.c_tag = real_name
|
||||
builtInCamera.network = list("SS13")
|
||||
builtInCamera.network = list("ss13")
|
||||
builtInCamera.internal_light = FALSE
|
||||
if(wires.is_cut(WIRE_CAMERA))
|
||||
builtInCamera.status = 0
|
||||
|
||||
Reference in New Issue
Block a user