Merge branch 'master' into upstream-merge-11110

This commit is contained in:
Nadyr
2021-07-16 19:09:43 -04:00
committed by GitHub
529 changed files with 1341 additions and 1359 deletions

View File

@@ -12,7 +12,7 @@
appearance_flags = TILE_BOUND|PIXEL_SCALE|NO_CLIENT_COLOR
layer = LAYER_HUD_BASE
plane = PLANE_PLAYER_HUD
unacidable = 1
unacidable = TRUE
var/obj/master = null //A reference to the object in the slot. Grabs or items, generally.
var/datum/hud/hud = null // A reference to the owner HUD, if any.