Removed the 'AnyColor' paint can from the spacebattle map, as the item definition was commented out.
Updated the labcoat object path to work with it's new definition.
Added back in the game/code/objects/structures/signs.dm , which was unchecked for some reason. Was causing an away mission to not load properly.
Changelog!

Updated changelog with my additions
Feature: Bang kitchen trays with rolling pin just like riot shield + baton

The public demands it!!
added placeholder economic stuff (probably never finish it), added random system-wide events (which are announced at the newscaster when they occur)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
tweaked some supply packs a bit, added formalwear and pizza supply packs, made supply packs organised and selectable by type in the order menu

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
removed a bunch of unused files, moved amorphs and meme to workinprogress/cib

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
removed unused WIP file

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #2181 from caelaislinn/bleeding-edge-freeze

Supply pack tweaks, random event (system news announced at newscaster), cleanup
required_players_secret added, which is the number of players needed for a game mode to start when that mode has been chosen at random.

required_players for most modes reduced to the number of antagonists + 1, as the variable is only used when the game mode is explicitly voted for.
Merge pull request #2187 from CIB/BEF-premerge

Merge pre-tg-merge BEF
Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	baystation12.dme
Updated changelog.
Merge pull request #2188 from CIB/BEF-premerge

Updated changelog.
Re-ticked farmbots

They were unticked for some reason.
updated changelog
Added Purple Gloves
Merge pull request #2190 from SniperYeti/bleeding-edge-freeze

Added Purple Gloves
Merge pull request #2186 from RavingManiac/master

Changes to the minimum number of players needed for a game mode to start