Merge pull request #5127 from VOREStation/vplk-table-layer-fixes

Table Layering and Runtime Fixes
This commit is contained in:
Neerti
2018-03-29 23:20:57 -04:00
committed by GitHub
3 changed files with 3 additions and 2 deletions
+1
View File
@@ -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
+1 -1
View File
@@ -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))
+1 -1
View File
@@ -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