Merge branch 'master' into dev

Conflicts:
	baystation12.dme
	html/changelog.html

code/WorkInProgress/SkyMarshal/officer_stuff.dm

@@ -23,7 +23,7 @@
 	name = "\improper NanoTrasen Navy Uniform"
 	icon_state = "officer"
 	item_state = "g_suit"
-	color = "officer"
+	item_color = "officer"
 	displays_id = 0
 
 /obj/item/clothing/under/rank/centcom/officer
@@ -31,7 +31,7 @@
 	name = "\improper NanoTrasen Officers Uniform"
 	icon_state = "officer"
 	item_state = "g_suit"
-	color = "officer"
+	item_color = "officer"
 	displays_id = 0
 
 /obj/item/clothing/under/rank/centcom/captain
@@ -39,5 +39,5 @@
 	name = "\improper NanoTrasen Captains Uniform"
 	icon_state = "centcom"
 	item_state = "dg_suit"
-	color = "centcom"
+	item_color = "centcom"
 	displays_id = 0

code/WorkInProgress/Susan/susan_desert_turfs.dm

@@ -250,7 +250,7 @@ Alien plants should do something if theres a lot of poison
 	name = "warden's jumpsuit"
 	icon_state = "wardendnavyclothes"
 	item_state = "wardendnavyclothes"
-	color = "wardendnavyclothes"
+	item_color = "wardendnavyclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	flags = FPRINT | TABLEPASS
 
@@ -259,7 +259,7 @@ Alien plants should do something if theres a lot of poison
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
 	icon_state = "officerdnavyclothes"
 	item_state = "officerdnavyclothes"
-	color = "officerdnavyclothes"
+	item_color = "officerdnavyclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	flags = FPRINT | TABLEPASS
 
@@ -268,7 +268,7 @@ Alien plants should do something if theres a lot of poison
 	name = "head of security's jumpsuit"
 	icon_state = "hosdnavyclothes"
 	item_state = "hosdnavyclothes"
-	color = "hosdnavyclothes"
+	item_color = "hosdnavyclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	flags = FPRINT | TABLEPASS
 

code/WorkInProgress/autopsy.dm

@@ -76,6 +76,7 @@
 			chemtraces += V
 
 /obj/item/weapon/autopsy_scanner/verb/print_data()
+	set category = "Object"
 	set src in view(usr, 1)
 	set name = "Print Data"
 	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))