Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
This commit is contained in:
Fermi
2019-11-24 03:04:13 +00:00
parent c8b206a4cf
commit 1509d9d183
186 changed files with 405 additions and 764 deletions
@@ -309,7 +309,6 @@
else
var/datum/numbered_display/ND = .[I.type]
ND.number++
. = sortTim(., /proc/cmp_numbered_displays_name_asc, associative = TRUE)
//This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing.
/datum/component/storage/proc/orient2hud(mob/user, maxcolumns)