Merge branch 'master' into dev-freeze

Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

code/game/objects/items/weapons/implants/implant.dm

@@ -7,7 +7,7 @@
 	var/implanted = null
 	var/mob/imp_in = null
 	var/datum/organ/external/part = null
-	color = "b"
+	item_color = "b"
 	var/allow_reagents = 0
 	var/malfunction = 0
 

code/game/objects/items/weapons/implants/implantcase.dm

@@ -15,7 +15,7 @@
 
 	update()
 		if (src.imp)
-			src.icon_state = text("implantcase-[]", src.imp.color)
+			src.icon_state = text("implantcase-[]", src.imp.item_color)
 		else
 			src.icon_state = "implantcase-0"
 		return

code/game/objects/items/weapons/implants/implantfreedom.dm

@@ -3,7 +3,7 @@
 /obj/item/weapon/implant/freedom
 	name = "freedom"
 	desc = "Use this to escape from those evil Red Shirts."
-	color = "r"
+	item_color = "r"
 	var/activation_emote = "chuckle"
 	var/uses = 1.0