Merge branch 'Citadel-Station-13:master' into Projectile_Rework

2022-03-21 17:21:14 -04:00
parent d9ff37d2ff f2395b0e06
commit fb4e27e536
5 changed files with 32 additions and 12 deletions
@@ -134,7 +134,7 @@
 	approx_lines = max(1, mheight / CHAT_MESSAGE_APPROX_LHEIGHT)

 	// Translate any existing messages upwards, apply exponential decay factors to timers
-	message_loc = get_atom_on_turf(target)
+	message_loc = isturf(target) ? target : get_atom_on_turf(target)
 	if (owned_by.seen_messages)
 		var/idx = 1
 		var/combined_height = approx_lines