[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
Hooray modularity! Things that modify core files without directly touching said core files go here. This is similar to how Hippie handles things. This stops dreammaker from throwing errors and warnings if you try to compile these files while they're inside code/citadel/.