Generalized shuttle passenger announcement proc.

Author: MistakeNot4892

code/modules/overmap/overmap_shuttle.dm

@@ -25,10 +25,10 @@
 
 /datum/shuttle/autodock/overmap/fuel_check()
 	if(!try_consume_fuel()) //insufficient fuel
-		for(var/mob/hearer in global.living_mob_list_ + global.ghost_mob_list)
-			if(is_type_in_list(get_area(hearer), shuttle_area))
-				hearer.show_message(SPAN_WARNING("You hear the shuttle engines sputter... perhaps it doesn't have enough fuel?"), AUDIBLE_MESSAGE,
-				SPAN_WARNING("The shuttle shakes but fails to take off."), VISIBLE_MESSAGE)
+		message_passengers(
+			SPAN_WARNING("You hear the shuttle engines sputter... perhaps it doesn't have enough fuel?"),
+			SPAN_WARNING("The shuttle shakes but fails to take off.")
+		)
 		return FALSE //failure
 	return TRUE //sucess, continue with launch
 

code/modules/shuttles/shuttle.dm

@@ -463,17 +463,7 @@
 		return dir2angle(destination.dir) - dir2angle(rotation_center.dir)
 	return 0 // do not rotate
 
-/datum/shuttle/proc/message_passengers(var/message)
-	for(var/client/C)
-		if(!C.mob)
-			continue
-		var/area/mob_area = get_area(C.mob)
-		if(!istype(mob_area))
-			continue
-		// I don't know how much of this is actually needed.
-		if(ispath(shuttle_area) && istype(mob_area, shuttle_area))
-			C.mob.visible_message(message)
-		else if(istype(shuttle_area, /area) && mob_area == shuttle_area)
-			C.mob.visible_message(message)
-		else if(islist(shuttle_area) && ((mob_area in shuttle_area) || (mob_area.type in shuttle_area)))
-			C.mob.visible_message(message)
+/datum/shuttle/proc/message_passengers(audible_message, visible_message)
+	for(var/mob/hearer in global.living_mob_list_ + global.ghost_mob_list)
+		if(is_type_in_list(get_area(hearer), shuttle_area))
+			hearer.show_message(audible_message, AUDIBLE_MESSAGE, visible_message, VISIBLE_MESSAGE)