diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 2583c9db450..103e537a02a 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -333,6 +333,8 @@
 					set_picture("ai_facepalm")
 				if("Friend Computer")
 					set_picture("ai_friend")
+				if("Tribunal")
+					set_picture("tribunal")
 
 			return
 
diff --git a/code/game/verbs/AI_status.dm b/code/game/verbs/AI_status.dm
index 9ebab4a16a1..238da0bbb8f 100644
--- a/code/game/verbs/AI_status.dm
+++ b/code/game/verbs/AI_status.dm
@@ -6,6 +6,8 @@
 		usr <<"You cannot change your emotional status because you are dead!"
 		return
 	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
+	if(src.ckey == "serithi")
+		ai_emotions.Add("Tribunal","Tribunal Malfunctioning")
 	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
 	for (var/obj/machinery/ai_status_display/AISD in world) //change status
 		spawn( 0 )
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 2adcdd9aa4d..36415c02705 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -252,6 +252,13 @@
 	icon = 'custom_items.dmi'
 	icon_state = "odysseus_spec_id"
 
+/obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary
+	name = "McReary's journal"
+	desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back."
+	icon = 'custom_items.dmi'
+	icon_state = "mcreary_journal"
+	item_state = "mcreary_journal"
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////
@@ -326,7 +333,6 @@
 	desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense."
 	icon = 'custom_items.dmi'
 	icon_state = "enos_adlai_1"
-	flags = FPRINT|TABLEPASS
 
 //////////// Suits ////////////
 
@@ -398,8 +404,17 @@
 	item_state = "tian_dress"
 	color = "tian_dress"
 
+/obj/item/clothing/under/rank/bartender/fluff/classy	//searif: Ara Al-Jazari
+	name = "classy bartender uniform"
+	desc = "A prim and proper uniform that looks very similar to a bartender's, the only differences being a red tie, waistcoat and a rag hanging out of the back pocket."
+	icon = 'custom_items.dmi'
+	icon_state = "ara_bar_uniform"
+	item_state = "ara_bar_uniform"
+	color = "ara_bar_uniform"
+
 //////////// Masks ////////////
 
+/*
 /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell
 	name = "\improper First Nations facemask"
 	desc = "A simple cloth rag that bears the flag of the first nations."
@@ -409,6 +424,7 @@
 	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
 	w_class = 2
 	gas_transfer_coefficient = 0.90
+*/
 
 /obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick
 	name = "shamrock pendant"
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index d627f74b44e..79ab096fec3 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -125,6 +125,9 @@
 		icons += "B.A.N.N.E.D."
 	if (src.name == "M00X-BC" && src.ckey == "searif")
 		icons += "M00X-BC"
+	if (src.name == "TRIBUNAL" && src.ckey == "serithi")
+		icons += "Tribunal"
+		icons += "Tribunal Malfunctioning"
 	icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
 	if(icontype == "Blue")
 		icon_state = "ai"
@@ -156,6 +159,10 @@
 		icon_state = "ai-malf"
 	else if(icontype == "Static")
 		icon_state = "ai-static"
+	else if(icontype == "Tribunal")
+		icon_state = "ai-tribunal"
+	else if(icontype == "Tribunal Malfunctioning")
+		icon_state = "ai-tribunal-malf"
 	else//(icontype == "Matrix")
 		icon_state = "ai-matrix"
 
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index bfd55b9a562..141a0f3fc8b 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index f1eb3e4ec5d..6e9dec731c3 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ