Merge branch 'master' into ai-tweaks

cmss13-devs · Oct 30, 2023 · 8b2c165 · 8b2c165
2 parents 2d7d7d4 + 6d8d5e6
commit 8b2c165
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm
@@ -315,15 +315,18 @@ GLOBAL_VAR_INIT(radio_communication_clarity, 100)
 			return TRUE
 
 		else
-			if(LAZYACCESS(modifiers, MIDDLE_CLICK) && (object.type in submenu_types))
+			if(LAZYACCESS(modifiers, MIDDLE_CLICK))
 				for(var/datum/game_master_submenu/submenu in current_submenus)
 					if(submenu.referenced_atom == object)
 						submenu.tgui_interact(user)
 						return TRUE
 
-				var/new_menu_type = submenu_types[object.type]
+				for(var/submenu_type in submenu_types)
+					if(istype(object, submenu_type))
+						var/new_submenu_type = submenu_types[submenu_type]
+						current_submenus += new new_submenu_type(user, object)
+						return TRUE
 
-				current_submenus += new new_menu_type(user, object)
 				return TRUE
 
 /datum/game_master/proc/remove_objective(datum/destroying_datum)

diff --git a/code/modules/mob/living/carbon/xenomorph/ai/movement/lurking.dm b/code/modules/mob/living/carbon/xenomorph/ai/movement/lurking.dm
@@ -31,6 +31,8 @@
 
 	addtimer(CALLBACK(src, PROC_REF(check_annoyance)), AI_CHECK_ANNOYANCE_COOLDOWN, TIMER_UNIQUE|TIMER_LOOP|TIMER_DELETE_ME)
 
+	start_lurking()
+
 #undef AI_CHECK_ANNOYANCE_COOLDOWN
 
 /datum/xeno_ai_movement/linger/lurking/ai_move_idle(delta_time)