mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 15:08:34 +01:00
Convert some more globals (#19231)
* move ref lists from world new to ref list creation * tg styl * . * next globals * ugh * some more * pain * . * horror * . * . * . * shoe me * ye * . * eh * . * . --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
ecca95d008
commit
1fcbb216e7
@@ -102,7 +102,7 @@
|
||||
animate(pixel_y = default_pixel_y, time = 10, loop = -1)
|
||||
GLOB.observer_mob_list += src
|
||||
. = ..()
|
||||
visualnet = ghostnet
|
||||
visualnet = GLOB.ghostnet
|
||||
|
||||
/mob/observer/dead/proc/checkStatic()
|
||||
return !(check_rights_for(src.client, R_ADMIN|R_FUN|R_EVENT|R_SERVER) || (client && client.buildmode) || isbelly(loc))
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
/mob/observer/eye/aiEye/Initialize(mapload)
|
||||
. = ..()
|
||||
visualnet = cameranet
|
||||
visualnet = GLOB.cameranet
|
||||
|
||||
/mob/observer/eye/aiEye/Destroy()
|
||||
if(owner)
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
updating = 1
|
||||
spawn(BORG_CAMERA_BUFFER)
|
||||
if(old_loc != src.loc)
|
||||
cameranet.updatePortableCamera(src.camera)
|
||||
GLOB.cameranet.updatePortableCamera(src.camera)
|
||||
updating = 0
|
||||
|
||||
/mob/living/silicon/ai/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
@@ -25,8 +25,8 @@
|
||||
updating = 1
|
||||
spawn(BORG_CAMERA_BUFFER)
|
||||
if(old_loc != src.loc)
|
||||
cameranet.updateVisibility(old_loc, 0)
|
||||
cameranet.updateVisibility(loc, 0)
|
||||
GLOB.cameranet.updateVisibility(old_loc, 0)
|
||||
GLOB.cameranet.updateVisibility(loc, 0)
|
||||
updating = 0
|
||||
|
||||
#undef BORG_CAMERA_BUFFER
|
||||
@@ -38,24 +38,24 @@
|
||||
/obj/machinery/camera/deactivate(user as mob, var/choice = 1)
|
||||
..(user, choice)
|
||||
if(src.can_use())
|
||||
cameranet.addCamera(src)
|
||||
GLOB.cameranet.addCamera(src)
|
||||
else
|
||||
src.set_light(0)
|
||||
cameranet.removeCamera(src)
|
||||
GLOB.cameranet.removeCamera(src)
|
||||
|
||||
/obj/machinery/camera/Initialize(mapload)
|
||||
. = ..()
|
||||
//Camera must be added to global list of all cameras no matter what...
|
||||
if(cameranet.cameras_unsorted || !SSticker)
|
||||
cameranet.cameras += src
|
||||
cameranet.cameras_unsorted = 1
|
||||
if(GLOB.cameranet.cameras_unsorted || !SSticker)
|
||||
GLOB.cameranet.cameras += src
|
||||
GLOB.cameranet.cameras_unsorted = 1
|
||||
else
|
||||
dd_insertObjectList(cameranet.cameras, src)
|
||||
dd_insertObjectList(GLOB.cameranet.cameras, src)
|
||||
update_coverage(1)
|
||||
|
||||
/obj/machinery/camera/Destroy()
|
||||
clear_all_networks()
|
||||
cameranet.cameras -= src
|
||||
GLOB.cameranet.cameras -= src
|
||||
return ..()
|
||||
|
||||
// Mobs
|
||||
@@ -64,9 +64,9 @@
|
||||
..()
|
||||
if(was_dead && stat != DEAD)
|
||||
// Arise!
|
||||
cameranet.updateVisibility(src, 0)
|
||||
GLOB.cameranet.updateVisibility(src, 0)
|
||||
|
||||
/mob/living/silicon/ai/death(gibbed)
|
||||
if(..())
|
||||
// If true, the mob went from living to dead (assuming everyone has been overriding as they should...)
|
||||
cameranet.updateVisibility(src, 0)
|
||||
GLOB.cameranet.updateVisibility(src, 0)
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
|
||||
/mob/observer/eye/maskEye/Initialize(mapload)
|
||||
. = ..()
|
||||
visualnet = cultnet
|
||||
visualnet = GLOB.cultnet
|
||||
|
||||
@@ -6,40 +6,40 @@
|
||||
|
||||
/mob/living/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
. = ..()
|
||||
if(!cultnet.provides_vision(src))
|
||||
if(!GLOB.cultnet.provides_vision(src))
|
||||
return
|
||||
if(!updating_cult_vision)
|
||||
updating_cult_vision = 1
|
||||
spawn(CULT_UPDATE_BUFFER)
|
||||
if(old_loc != src.loc)
|
||||
cultnet.updateVisibility(old_loc, 0)
|
||||
cultnet.updateVisibility(loc, 0)
|
||||
GLOB.cultnet.updateVisibility(old_loc, 0)
|
||||
GLOB.cultnet.updateVisibility(loc, 0)
|
||||
updating_cult_vision = 0
|
||||
|
||||
#undef CULT_UPDATE_BUFFER
|
||||
|
||||
/mob/living/Initialize(mapload)
|
||||
. = ..()
|
||||
cultnet.updateVisibility(src, 0)
|
||||
GLOB.cultnet.updateVisibility(src, 0)
|
||||
|
||||
/mob/living/rejuvenate()
|
||||
var/was_dead = stat == DEAD
|
||||
..()
|
||||
if(was_dead && stat != DEAD)
|
||||
// Arise!
|
||||
cultnet.updateVisibility(src, 0)
|
||||
GLOB.cultnet.updateVisibility(src, 0)
|
||||
|
||||
/mob/living/death(gibbed, deathmessage="seizes up and falls limp...")
|
||||
if(..(gibbed, deathmessage))
|
||||
// If true, the mob went from living to dead (assuming everyone has been overriding as they should...)
|
||||
cultnet.updateVisibility(src)
|
||||
GLOB.cultnet.updateVisibility(src)
|
||||
|
||||
/datum/antagonist/add_antagonist(var/datum/mind/player)
|
||||
. = ..()
|
||||
if(src == GLOB.cult)
|
||||
cultnet.updateVisibility(player.current, 0)
|
||||
GLOB.cultnet.updateVisibility(player.current, 0)
|
||||
|
||||
/datum/antagonist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
|
||||
..()
|
||||
if(src == GLOB.cult)
|
||||
cultnet.updateVisibility(player.current, 0)
|
||||
GLOB.cultnet.updateVisibility(player.current, 0)
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
*
|
||||
* WHERE * IS * EVERYTHING?
|
||||
*
|
||||
* cameranet.dm = Everything * about * the * cameranet * datum.
|
||||
* cameranet.dm = Everything * about * the * GLOB.cameranet * datum.
|
||||
* chunk.dm = Everything * about * the * chunk * datum.
|
||||
* eye.dm = Everything * about * the * AI * and * the * AIEye.
|
||||
* updating.dm = Everything * about * triggers * that * will * update * chunks.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
/proc/updateVisibility(atom/A, var/opacity_check = 1)
|
||||
if(SSticker)
|
||||
for(var/datum/visualnet/VN in visual_nets)
|
||||
for(var/datum/visualnet/VN in GLOB.visual_nets)
|
||||
VN.updateVisibility(A, opacity_check)
|
||||
|
||||
/turf
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
|
||||
/datum/visualnet/New()
|
||||
..()
|
||||
visual_nets += src
|
||||
GLOB.visual_nets += src
|
||||
|
||||
/datum/visualnet/Destroy()
|
||||
visual_nets -= src
|
||||
GLOB.visual_nets -= src
|
||||
return ..()
|
||||
|
||||
// Checks if a chunk has been Generated in x, y, z.
|
||||
@@ -153,8 +153,8 @@
|
||||
/turf/verb/view_chunk()
|
||||
set src in world
|
||||
|
||||
if(cameranet.chunkGenerated(x, y, z))
|
||||
var/datum/chunk/chunk = cameranet.getCameraChunk(x, y, z)
|
||||
if(GLOB.cameranet.chunkGenerated(x, y, z))
|
||||
var/datum/chunk/chunk = GLOB.cameranet.getCameraChunk(x, y, z)
|
||||
usr.client.debug_variables(chunk)
|
||||
*/
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
if(isobj(OR))
|
||||
qdel(OR)
|
||||
|
||||
cultnet.updateVisibility(src, 0)
|
||||
GLOB.cultnet.updateVisibility(src, 0)
|
||||
|
||||
if(aiming)
|
||||
qdel(aiming)
|
||||
|
||||
@@ -467,7 +467,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
|
||||
unset_machine()
|
||||
src << browse(null, t1)
|
||||
if (href_list["switchcamera"])
|
||||
switchCamera(locate(href_list["switchcamera"])) in cameranet.cameras
|
||||
switchCamera(locate(href_list["switchcamera"])) in GLOB.cameranet.cameras
|
||||
if (href_list["showalerts"])
|
||||
subsystem_alarm_monitor()
|
||||
//Carn: holopad requests
|
||||
@@ -504,7 +504,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
|
||||
return
|
||||
|
||||
/mob/living/silicon/ai/proc/camera_visibility(mob/observer/eye/aiEye/moved_eye)
|
||||
cameranet.visibility(moved_eye, client, all_eyes)
|
||||
GLOB.cameranet.visibility(moved_eye, client, all_eyes)
|
||||
|
||||
/mob/living/silicon/ai/forceMove(atom/destination, direction, movetime)
|
||||
. = ..()
|
||||
@@ -556,7 +556,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
|
||||
return
|
||||
|
||||
var/list/cameralist = new()
|
||||
for (var/obj/machinery/camera/C in cameranet.cameras)
|
||||
for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
|
||||
if(!C.can_use())
|
||||
continue
|
||||
var/list/tempnetwork = difflist(C.network, GLOB.restricted_camera_networks, 1)
|
||||
@@ -580,7 +580,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
|
||||
|
||||
src.network = network
|
||||
|
||||
for(var/obj/machinery/camera/C in cameranet.cameras)
|
||||
for(var/obj/machinery/camera/C in GLOB.cameranet.cameras)
|
||||
if(!C.can_use())
|
||||
continue
|
||||
if(network in C.network)
|
||||
|
||||
@@ -155,7 +155,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
|
||||
if(screen && screen.ai)
|
||||
screen.ai.camera_visibility(src)
|
||||
else
|
||||
cameranet.visibility(src)
|
||||
GLOB.cameranet.visibility(src)
|
||||
update_camera_telegraphing()
|
||||
|
||||
/mob/observer/eye/aiEye/pic_in_pic/proc/update_camera_telegraphing()
|
||||
|
||||
Reference in New Issue
Block a user