cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

next globs (#19292)

Browse Source 
* next globs

* few more

* some more

* .

* should be added on map laod

* .

* that needs its own PR

* .
This commit is contained in:
Kashargul
2026-03-18 21:27:27 +01:00
committed by GitHub
parent 5ee606f745
commit 91ce60e01b
57 changed files with 367 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/communicator/communicator.dm
+3 -4
View File
@@ -84,8 +84,7 @@
// assign the device to the holder's name automatically in a spectacularly shitty way.
/obj/item/communicator/Initialize(mapload)
. = ..()
all_communicators += src
all_communicators = sort_names(all_communicators)
GLOB.all_communicators += src
node = get_exonet_node()
START_PROCESSING(SSobj, src)
camera = new(src)
@@ -174,7 +173,7 @@
src.known_devices.Cut()
if(!get_connection_to_tcomms()) //If the network's down, we can't see anything.
return
for(var/obj/item/communicator/comm in all_communicators)
for(var/obj/item/communicator/comm in GLOB.all_communicators)
if(!comm || !comm.exonet || !comm.exonet.address || comm.exonet.address == src.exonet.address) //Don't add addressless devices, and don't add ourselves.
continue
src.known_devices |= comm
@@ -304,7 +303,7 @@
node = null
//Clean up references that might point at us
all_communicators -= src
GLOB.all_communicators -= src
STOP_PROCESSING(SSobj, src)
GLOB.listening_objects.Remove(src)
QDEL_NULL(camera)
code/game/objects/items/devices/communicator/messaging.dm
+1 -1
View File
@@ -140,7 +140,7 @@
return
var/list/choices = list()
for(var/obj/item/communicator/comm in all_communicators)
for(var/obj/item/communicator/comm in GLOB.all_communicators)
if(!comm.network_visibility || !comm.exonet || !comm.exonet.address)
continue
choices.Add(comm)
code/game/objects/items/devices/communicator/phone.dm
+3 -3
View File
@@ -307,16 +307,16 @@
return
var/list/choices = list()
for(var/obj/item/communicator/comm in all_communicators)
for(var/obj/item/communicator/comm in GLOB.all_communicators)
if(!comm.network_visibility || !comm.exonet || !comm.exonet.address)
continue
choices.Add(comm)
if(!choices.len)
to_chat(src , span_danger("There are no available communicators, sorry."))
to_chat(src, span_danger("There are no available communicators, sorry."))
return
var/choice = tgui_input_list(src,"Send a voice request to whom?", "Recipient Choice", choices)
var/choice = tgui_input_list(src, "Send a voice request to whom?", "Recipient Choice", choices)
if(choice)
var/obj/item/communicator/chosen_communicator = choice
var/mob/observer/dead/O = src
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -291,7 +291,7 @@ AI MODULES
// VOREstation edit: use map default laws
/obj/item/aiModule/reset/Initialize(mapload)
. = ..()
laws = new global.using_map.default_law_type // Pull from loaded map
laws = new using_map.default_law_type // Pull from loaded map
/obj/item/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
log_law_changes(target, sender)
code/game/objects/structures/watercloset_vr.dm
+1 -1
View File
@@ -6,7 +6,7 @@
var/exit_landmark
/obj/structure/toilet/Initialize(mapload)
if(z in global.using_map.map_levels)
if(z in using_map.map_levels)
teleplumbed = TRUE
exit_landmark = locate(/obj/effect/landmark/teleplumb_exit)
if(teleplumbed && exit_landmark)