cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

add 'get machines by type' to SSmachines (#28979)

Browse Source
This commit is contained in:
warriorstar-orion
2025-04-16 17:17:54 +00:00
committed by GitHub
parent e5a1f31e6d
commit fa1faf6054
49 changed files with 109 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/photography.dm
+2 -2
View File
@@ -660,13 +660,13 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
if(camera && on)
if(get_dist(src, M) <= canhear_range)
talk_into(M, msg)
for(var/obj/machinery/computer/security/telescreen/entertainment/T in GLOB.machines)
for(var/obj/machinery/computer/security/telescreen/entertainment/T in GLOB.telescreens)
if(usr && (usr.unique_datum_id in T.watchers))
T.atom_say("[M.name]: [msg]") // Uses appearance for identifying speaker, not voice
/obj/item/videocam/hear_message(mob/M as mob, msg)
if(camera && on)
for(var/obj/machinery/computer/security/telescreen/entertainment/T in GLOB.machines)
for(var/obj/machinery/computer/security/telescreen/entertainment/T in GLOB.telescreens)
if(usr && (usr.unique_datum_id in T.watchers))
T.atom_say("*[M.name] [msg]") // Uses appearance for identifying speaker, not voice
code/modules/paperwork/ticketmachine.dm
+1 -1
View File
@@ -79,7 +79,7 @@
if(allowed(usr) || user.can_advanced_admin_interact())
icon_state = "doorctrl1"
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 15)
for(var/obj/machinery/ticket_machine/M in GLOB.machines)
for(var/obj/machinery/ticket_machine/M in SSmachines.get_by_type(/obj/machinery/ticket_machine))
if(M.id == id)
if(cooldown)
return