Merge remote-tracking branch 'upstream/master' into kk-leggies

code/modules/client/preference_setup/global/setting_datums.dm

@@ -113,6 +113,13 @@ var/list/_client_preferences_by_type
 	enabled_description = "Visible"
 	disabled_description = "Hidden"
 	enabled_by_default = FALSE
+
+/datum/client_preference/ghost_see_whisubtle
+	description = "See subtles/whispers as ghost"
+	key = "GHOST_SEE_WHISUBTLE"
+	enabled_description = "Visible"
+	disabled_description = "Hidden"
+	enabled_by_default = TRUE
 //VOREStation Add End
 /datum/client_preference/weather_sounds
 	description ="Weather sounds"
@@ -373,7 +380,7 @@ var/list/_client_preferences_by_type
 	key = "RECEIVE_TIPS"
 	enabled_description = "Enabled"
 	disabled_description = "Disabled"
- 
+
 /datum/client_preference/pain_frequency
 	description = "Pain Messages Cooldown"
 	key = "PAIN_FREQUENCY"

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

@@ -1442,15 +1442,9 @@
 
 /datum/gear/fluff/harmony_id
 	path = /obj/item/weapon/card/id/event/polymorphic/itg
-	display_name = "Harmony's ITG-ID card"
+	display_name = "ITG-ID card"
 	ckeywhitelist = list("verysoft")
-	character_name = list("Harmony")
-
-/datum/gear/fluff/shinerunner_id
-	path = /obj/item/weapon/card/id/event/polymorphic/itg
-	display_name = "Shine-Runner's ITG-ID card"
-	ckeywhitelist = list("verysoft")
-	character_name = list("Shine-Runner")
+	character_name = null
 
 /datum/gear/fluff/dessa_hat
 	path = /obj/item/clothing/head/fluff/giantbow/dessa
@@ -1463,6 +1457,13 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/fluff/casey_glasses
+	path = /obj/item/clothing/glasses/big_round
+	display_name = "Big Round Glasses"
+	slot = slot_glasses
+	ckeywhitelist = list("verysoft")
+	character_name = null
+
 //  W CKEYS
 /datum/gear/fluff/sthasha_bracer
 	path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha

code/modules/client/preferences_vr.dm

@@ -88,6 +88,21 @@
 
 	feedback_add_details("admin_verb","TWhisubtleVis") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/verb/toggle_ghost_privacyvision()
+	set name = "Toggle Ghost Private Eyes/ears"
+	set category = "Preferences"
+	set desc = "Toggles your ability to see subtles/whispers. Overrides admin status. Respects Ghost Privacy"
+
+	var/pref_path = /datum/client_preference/ghost_see_whisubtle
+
+	toggle_preference(pref_path)
+
+	to_chat(src, "As a ghost, you will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear subtles/whispers made by players.")
+
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	feedback_add_details("admin_verb","TGhostSeeWhisSubtle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/verb/toggle_capture_crystal()
 	set name = "Toggle Catchable"
 	set category = "Preferences"