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
Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	baystation12.dme
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 #2189 from GauHelldragon/bleeding-edge-freeze

Re-ticking farmbots.
Merge remote-tracking branch 'bs12/bleeding-edge-freeze'

Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
	maps/RandomZLevels/jungle.dmm
Merge branch 'master' of https://github.com/tehdrama/NanotrasenStation

Conflicts:
	html/changelog.html