diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm index ca0f3904b32..91a81247598 100644 --- a/code/datums/spawners_menu.dm +++ b/code/datums/spawners_menu.dm @@ -37,14 +37,16 @@ /datum/spawners_menu/ui_act(action, params) if(..()) return - var/list/spawnerlist = list(GLOB.mob_spawners[params["name"]]) + + var/group_name = params["name"] + if(!group_name || !(group_name in GLOB.mob_spawners)) + return + var/list/spawnerlist = GLOB.mob_spawners[group_name] if(!spawnerlist.len) return - var/spawner_ref = pick(spawnerlist) - var/obj/effect/mob_spawn/MS = locate(spawner_ref) in GLOB.poi_list - if(!MS) + var/obj/effect/mob_spawn/MS = pick(spawnerlist) + if(!istype(MS) || !(MS in GLOB.poi_list)) return - switch(action) if("jump") if(MS)