diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm
index 462b1121..e3dc28ee 100644
--- a/code/datums/elements/flavor_text.dm
+++ b/code/datums/elements/flavor_text.dm
@@ -83,8 +83,15 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
 		var/mob/living/carbon/human/L = target
 		if(L.gender)
 			examineTabOutput += "[icon2html('hyperstation/icons/chat/gender.dmi', world, L.gender)]"
+
 		examineTabOutput += "[L.name] "
 		examineTabOutput += "([L.dna.custom_species ? L.dna.custom_species : L.dna.species.name])"
+
+		if(L.client.prefs.pins) //character has pins
+			var/P = ""
+			for(P in L.client.prefs.pins)
+				examineTabOutput += "[icon2html('hyperstation/icons/chat/pins.dmi', world, P)]" //show pins!
+
 	examineTabOutput += "</center>"
 	examineTabOutput += "<br>[url_encode(msg)]"
 	if(ismob(target))
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 1ba1677b..4e308742 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -105,6 +105,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/roleplayroles = FALSE //for the roleplay roles
 	var/importantroles = FALSE //for things that define as important.
 
+
 	var/datum/species/pref_species = new /datum/species/human()	//Mutant race
 	var/list/features = list("mcolor" = "FFF",
 		"tail_lizard" = "Smooth",
@@ -233,6 +234,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/unlock_content = 0
 	var/vip = 0
 
+	//visable pins!
+	var/list/pins = list()
+
 	var/list/ignoring = list()
 
 	var/clientfps = 60
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 6027fd3d..0db1cde1 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -144,6 +144,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["sillyroles"]			>> sillyroles
 	S["roleplayroles"]		>> roleplayroles
 	S["importantroles"]		>> importantroles
+	S["pins"]				>> pins
 
 	//try to fix any outdated data if necessfary
 	if(needs_update >= 0)
@@ -265,6 +266,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Hyper
 	WRITE_FILE(S["noncon"], noncon)
+	WRITE_FILE(S["pins"], pins)
 
 	return 1
 
diff --git a/hyperstation/icons/chat/pins.dmi b/hyperstation/icons/chat/pins.dmi
new file mode 100644
index 00000000..6bf0a30b
Binary files /dev/null and b/hyperstation/icons/chat/pins.dmi differ
diff --git a/hyperstation/icons/mobs/head.dmi b/hyperstation/icons/mobs/head.dmi
index 15994e69..2932bb38 100644
Binary files a/hyperstation/icons/mobs/head.dmi and b/hyperstation/icons/mobs/head.dmi differ
diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm
index 1ce337fa..1b08f4c1 100644
--- a/modular_citadel/code/modules/client/preferences_savefile.dm
+++ b/modular_citadel/code/modules/client/preferences_savefile.dm
@@ -99,7 +99,8 @@
 	WRITE_FILE(S["feature_has_anus"], features["has_anus"])
 	WRITE_FILE(S["feature_butt_size"], features["butt_size"])
 	WRITE_FILE(S["feature_butt_color"], features["butt_color"])
-
+	//pins
+	WRITE_FILE(S["pins"], pins)
 
 	//gear loadout
 	if(islist(chosen_gear))