Removes lockboxes.
Merge remote-tracking branch 'upstream/master'
Added captured variable to mobs, non-chair equivalent to being buckled into a chair
Miscellaneous ninja fixes and ability cost changes (because nearly all were inconsistent with listed/actual cost), e-net fix
Fixed accidental change of ninja cell to super capacity.
Reverted lockbox removal which was on my master branch. Should be merged with next dev.
Merge remote-tracking branch 'upstream/master'
Fixes #4221.
Added filling_color var to food items for use in sandwiches.
Added sandwich topping and filler mask.
Ticked sandwich file that I accidentally included in prior commit. Sandwiches are now a thing that can be made from bread slices.
Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.
Colour fix for bread slices.
Replaces modwho and adminwho with staffwho.

(Also, stealthfix.)
Made it so asay is not the same color as adminlogs.
Merge pull request #4244 from LightningIron/master

Ninja bugfixes/minor code cleaning/energy cost changes
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Conflicts:
	code/modules/customitems/item_defines.dm
Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes.

Who does that?  People that cause runtimes, that's who!

(Jerks)
Merge pull request #4261 from DJSnapshot/dev

Replaced modwho and adminwho with staffwho. Fixed Asay colors.
Merge pull request #1 from Baystation12/master

Master