Polaris sync

code/modules/client/preference_setup/general/03_body.dm

@@ -111,7 +111,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				else
 					O.robotize()
 
-	for(var/name in list(O_HEART,O_EYES,O_BRAIN))
+	for(var/name in list(O_HEART,O_EYES,O_LUNGS,O_BRAIN))
 		var/status = pref.organ_data[name]
 		if(!status)
 			continue
@@ -178,6 +178,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				organ_name = "eyes"
 			if(O_BRAIN)
 				organ_name = "brain"
+			if(O_LUNGS)
+				organ_name = "lungs"
 
 		if(status == "cyborg")
 			++ind
@@ -211,6 +213,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			switch(organ_name)
 				if("heart")
 					. += "\tPacemaker-assisted [organ_name]"
+				if("lungs")
+					. += "\tAssisted [organ_name]"
 				if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements
 					. += "\tSurgically altered [organ_name]"
 				if("eyes")
@@ -539,7 +543,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 
 	else if(href_list["organs"])
 
-		var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes", "Brain")
+		var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes", "Lungs", "Brain")
 		if(!organ_name) return
 
 		var/organ = null
@@ -548,6 +552,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				organ = O_HEART
 			if("Eyes")
 				organ = O_EYES
+			if("Lungs")
+				organ = O_LUNGS
 			if("Brain")
 				if(pref.organ_data[BP_HEAD] != "cyborg")
 					user << "<span class='warning'>You may only select an assisted or synthetic brain if you have a full prosthetic body.</span>"

code/modules/client/preference_setup/global/02_settings.dm

@@ -8,12 +8,14 @@
 
 /datum/category_item/player_setup_item/player_global/settings/load_preferences(var/savefile/S)
 	S["lastchangelog"]        >> pref.lastchangelog
+	S["lastnews"]             >> pref.lastnews
 	S["default_slot"]	      >> pref.default_slot
 	S["preferences"]          >> pref.preferences_enabled
 	S["preferences_disabled"] >> pref.preferences_disabled
 
 /datum/category_item/player_setup_item/player_global/settings/save_preferences(var/savefile/S)
 	S["lastchangelog"]        << pref.lastchangelog
+	S["lastnews"]             << pref.lastnews
 	S["default_slot"]         << pref.default_slot
 	S["preferences"]          << pref.preferences_enabled
 	S["preferences_disabled"] << pref.preferences_disabled
@@ -47,6 +49,7 @@
 			pref.preferences_disabled -= key
 
 	pref.lastchangelog	= sanitize_text(pref.lastchangelog, initial(pref.lastchangelog))
+	pref.lastnews		= sanitize_text(pref.lastnews, initial(pref.lastnews))
 	pref.default_slot	= sanitize_integer(pref.default_slot, 1, config.character_slots, initial(pref.default_slot))
 
 /datum/category_item/player_setup_item/player_global/settings/content(var/mob/user)

code/modules/client/preference_setup/loadout/loadout_eyes.dm

@@ -42,15 +42,13 @@
 	display_name = "Security HUD, sunglasses (Security)"
 	path = /obj/item/clothing/glasses/sunglasses/sechud
 
-/datum/gear/eyes/secaviators
-	display_name = "Security HUD Aviators"
+/datum/gear/eyes/security/aviator
+	display_name = "Security HUD Aviators (Security)"
 	path = /obj/item/clothing/glasses/sunglasses/sechud/aviator
-	allowed_roles = list("Security Officer","Head of Security","Warden")
 
-/datum/gear/eyes/secaviators/prescription
-	display_name = "Security HUD Aviators, prescription"
+/datum/gear/eyes/security/aviator/prescription
+	display_name = "Security HUD Aviators, prescription (Security)"
 	path = /obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription
-	allowed_roles = list("Security Officer","Head of Security","Warden")
 
 /datum/gear/eyes/medical
 	display_name = "Medical HUD (Medical)"
@@ -61,10 +59,32 @@
 	display_name = "Medical HUD, prescription (Medical)"
 	path = /obj/item/clothing/glasses/hud/health/prescription
 
-/datum/gear/eyes/shades
-	display_name = "Sunglasses, fat (Security/Command)"
-	path = /obj/item/clothing/glasses/sunglasses/big
-	allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
+/datum/gear/eyes/medical/aviator
+	display_name = "Medical HUD Aviators (Medical)"
+	path = /obj/item/clothing/glasses/sunglasses/medhud/aviator
+
+/datum/gear/eyes/medical/aviator
+	display_name = "Medical HUD Aviators, prescription (Medical)"
+	path = /obj/item/clothing/glasses/sunglasses/medhud/aviator/prescription
+
+/datum/gear/eyes/meson
+	display_name = "Optical Meson Scanners (Engineering)"
+	path = /obj/item/clothing/glasses/meson
+	allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician")
+
+/datum/gear/eyes/meson/prescription
+	display_name = "Optical Meson Scanners, prescription (Engineering)"
+	path = /obj/item/clothing/glasses/meson/prescription
+
+/datum/gear/eyes/meson/aviator
+	display_name = "Optical Meson Aviators, (Engineering)"
+	path = /obj/item/clothing/glasses/meson/aviator
+
+/datum/gear/eyes/meson/aviator/prescription
+	display_name = "Optical Meson Aviators, prescription (Engineering)"
+	path = /obj/item/clothing/glasses/meson/aviator/prescription
+
+/datum/gear/eyes/meson/aviator/prescription
 
 /datum/gear/eyes/glasses/fakesun
 	display_name = "Sunglasses, stylish"
@@ -74,7 +94,16 @@
 	display_name = "Sunglasses, stylish aviators"
 	path = /obj/item/clothing/glasses/fakesunglasses/aviator
 
-/datum/gear/eyes/shades/prescriptionsun
+/datum/gear/eyes/sun
+	display_name = "Sunglasses (Security/Command)"
+	path = /obj/item/clothing/glasses/sunglasses
+	allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
+
+/datum/gear/eyes/sun/shades
+	display_name = "Sunglasses, fat (Security/Command)"
+	path = /obj/item/clothing/glasses/sunglasses/big
+
+/datum/gear/eyes/sun/prescriptionsun
 	display_name = "sunglasses, presciption (Security/Command)"
 	path = /obj/item/clothing/glasses/sunglasses/prescription
 	cost = 2

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -387,7 +387,7 @@
 	path = /obj/item/clothing/under/pt
 
 /datum/gear/uniform/pt/expeditionary
-	display_name = "pt uniform, expeditionary"
+	display_name = "pt uniform, sifguard"
 	path = /obj/item/clothing/under/pt/expeditionary
 
 /datum/gear/uniform/pt/fleet