Merge branch 'master' into weapon-removal

code/modules/pda/cart.dm

@@ -167,7 +167,7 @@ var/list/civilian_cartridges = list(
 
 /obj/item/cartridge/quartermaster
 	name = "\improper Space Parts & Space Vendors cartridge"
-	desc = "Perfect for the Quartermaster on the go!"
+	desc = "Perfect for the " + JOB_QUARTERMASTER + " on the go!"
 	icon_state = "cart-q"
 	programs = list(
 		new/datum/data/pda/app/supply)

code/modules/pda/messenger.dm

@@ -22,6 +22,7 @@
 	data["silent"] = notify_silent						// does the pda make noise when it receives a message?
 	data["toff"] = toff									// is the messenger function turned off?
 	data["active_conversation"] = active_conversation	// Which conversation are we following right now?
+	data["enable_message_embeds"] = user?.client?.prefs?.read_preference(/datum/preference/toggle/messenger_embeds)
 
 	has_back = active_conversation
 	if(active_conversation)

code/modules/pda/pda.dm

@@ -142,7 +142,7 @@ var/global/list/obj/item/pda/PDAs = list()
 			model_name = "Thinktronic 5230 Personal Data Assistant"
 		if(2)
 			icon = 'icons/obj/pda_slim.dmi'
-			model_name = "Ward-Takahashi SlimFit� Personal Data Assistant"
+			model_name = "Ward-Takahashi SlimFit™ Personal Data Assistant"
 		if(3)
 			icon = 'icons/obj/pda_old.dmi'
 			model_name = "Thinktronic 5120 Personal Data Assistant"
@@ -169,7 +169,7 @@ var/global/list/obj/item/pda/PDAs = list()
 			)
 		if(7)
 			icon = 'icons/obj/pda_slider.dmi'			//VOREStation edit
-			model_name = "Slider� Personal Data Assistant"
+			model_name = "Slider® Personal Data Assistant"
 		if(8)
 			icon = 'icons/obj/pda_vintage.dmi'
 			model_name = "\[ERR:INVALID_MANUFACTURER_ID\] Personal Data Assistant"