Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/devices/uplinks.dm
	code/game/objects/weapons.dm
	code/modules/mining/mine_items.dm
	html/changelog.html
	icons/obj/chemical.dmi
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/defines/obj/weapon.dm

@@ -1016,6 +1016,7 @@
 	flags = FPRINT | TABLEPASS| CONDUCT
 	m_amt = 3750
 
+/*	//gtfo my object tree
 /obj/item/weapon/rubber_chicken
 	name = "rubber chicken"
 	desc = "A rubber chicken, isn't that hilarious?"
@@ -1023,6 +1024,7 @@
 	icon_state = "rubber_chicken"
 	item_state = "rubber_chicken"
 	w_class = 2.0
+*/
 
 /obj/item/weapon/screwdriver
 	name = "screwdriver"