diff --git a/code/__defines/_planes+layers.dm b/code/__defines/_planes+layers.dm index ae6b80b0dd..a044b16c85 100644 --- a/code/__defines/_planes+layers.dm +++ b/code/__defines/_planes+layers.dm @@ -70,6 +70,7 @@ What is the naming convention for planes or layers? #define OBJ_PLANE -35 #define HIDING_LAYER 2.6 // Layer at which mobs hide to be under things like tables #define DOOR_OPEN_LAYER 2.7 // Under all objects if opened. 2.7 due to tables being at 2.6 + #define TABLE_LAYER 2.8 // Just under stuff that wants to be slightly below common objects. #define UNDER_JUNK_LAYER 2.9 // Things that want to be slightly below common objects // Turf/Obj layer boundary #define ABOVE_JUNK_LAYER 3.1 // Things that want to be slightly above common objects diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index ef8fc37c19..c6089a8788 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -99,7 +99,7 @@ return (copytext(message, length(message)) == "!") ? 2 : 1 /datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask) - log_say("(HIVE) [message]", src) + log_say("(HIVE) [message]", speaker) if(!speaker_mask) speaker_mask = speaker.name message = format_message(message, get_spoken_verb(message)) diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index b32af0f479..a0fdf06f20 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -6,7 +6,7 @@ density = 1 anchored = 1 climbable = 1 - layer = UNDER_JUNK_LAYER + layer = TABLE_LAYER throwpass = 1 surgery_odds = 66 var/flipped = 0