diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 8c188a9e11b..dc8c798f8cb 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -247,3 +247,9 @@
 	flags = FPRINT | TABLEPASS | BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	siemens_coefficient = 2.0
+
+/obj/item/clothing/head/crown
+	name = "bananium crown"
+	icon_state = "crown"
+	desc = "A gliterring bananium crown with spessjewels in it. Swaggy."
+	flags = FPRINT | TABLEPASS | BLOCKHAIR
\ No newline at end of file
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index b466922b5e6..5e9ee88c48a 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -850,6 +850,18 @@
 	w_class = 1
 	slot_flags = SLOT_MASK
 
+
+////// Medallion - Lin Chang - Roland410
+
+/obj/item/clothing/tie/fluff/lin_chang_1
+	name = "shining black medallion"
+	desc = "A shiny black medallion made of something that looks like the Earth's obsidian, but it is harder than anything ever seen yet. On the front there seems to be a standing unathi chiseled in it, on the back the name of Lin Chang with the title of the Assassin Archmage."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "nasir_khayyam_1"
+	flags = FPRINT|TABLEPASS
+	w_class = 1
+	slot_flags = SLOT_MASK
+
 ////// Emerald necklace - Ty Foster - Nega
 
 /obj/item/clothing/mask/mara_kilpatrick_1
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index cd107f42fe6..f2a47b56f98 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -263,7 +263,7 @@
 
 		for(var/line in lines)
 		// split & clean up
-			var/list/Entry = text2list(line, "-")
+			var/list/Entry = text2list(line, ";")
 			for(var/i = 1 to Entry.len)
 				Entry[i] = trim(Entry[i])
 
diff --git a/icons/mob/custom-synthetic.dmi b/icons/mob/custom-synthetic.dmi
index d32659f6d6d..4329b1f1a45 100644
Binary files a/icons/mob/custom-synthetic.dmi and b/icons/mob/custom-synthetic.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 80787281fe0..9affa59a53a 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ