From 7e6234096cfc9636e019143397ece120144bef3a Mon Sep 17 00:00:00 2001
From: Yawet330 <65188584+Yawet330@users.noreply.github.com>
Date: Wed, 9 Aug 2023 21:01:27 +0100
Subject: [PATCH 1/4] Update ooc.dm

---
 code/modules/client/verbs/ooc.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 93f91ad3a0..cc44171ed0 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -234,7 +234,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 	var/list/choices = list()
 	for(var/client/C in GLOB.clients)
 		if(isobserver(C.mob) && see_ghost_names)
-			choices["[C.mob]([C])"] = C
+			choices["[C.mob]"] = C //NONMODULARITY NOTE: Removes the ability to link CKEYs to Characters. Always reapply for privacy reasons.
 		else
 			choices[C] = C
 	choices = sortList(choices)

From 73a7c997384b74d5fad248cf626c6eb2640c65b4 Mon Sep 17 00:00:00 2001
From: Yawet330 <65188584+Yawet330@users.noreply.github.com>
Date: Wed, 9 Aug 2023 21:04:22 +0100
Subject: [PATCH 2/4] Update genitals_interface.dm

---
 modular_splurt/code/datums/genitals/genitals_interface.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modular_splurt/code/datums/genitals/genitals_interface.dm b/modular_splurt/code/datums/genitals/genitals_interface.dm
index ef142eb47f..4b328774bc 100644
--- a/modular_splurt/code/datums/genitals/genitals_interface.dm
+++ b/modular_splurt/code/datums/genitals/genitals_interface.dm
@@ -44,7 +44,8 @@
 	var/list/genitals = list()
 	for(var/obj/item/organ/genital/genital in genital_holder.internal_organs)	//Only get the genitals
 		if(CHECK_BITFIELD(genital.genital_flags, GENITAL_INTERNAL))			//Not those though
-			continue
+			if(genital.is_exposed) //No siree. No more using this to OOCly metagame character genitals.
+				continue
 
 		var/list/genital_entry = list()
 		genital_entry["img"] = icon2base64(getFlatIcon(genital, no_anim=TRUE))

From 0729efd3f51f48a60ff75f0a5453f482558c5bb3 Mon Sep 17 00:00:00 2001
From: Yawet330 <65188584+Yawet330@users.noreply.github.com>
Date: Wed, 9 Aug 2023 21:11:32 +0100
Subject: [PATCH 3/4] Update genitals_interface.dm

---
 modular_splurt/code/datums/genitals/genitals_interface.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_splurt/code/datums/genitals/genitals_interface.dm b/modular_splurt/code/datums/genitals/genitals_interface.dm
index 4b328774bc..be6faefbe1 100644
--- a/modular_splurt/code/datums/genitals/genitals_interface.dm
+++ b/modular_splurt/code/datums/genitals/genitals_interface.dm
@@ -44,7 +44,7 @@
 	var/list/genitals = list()
 	for(var/obj/item/organ/genital/genital in genital_holder.internal_organs)	//Only get the genitals
 		if(CHECK_BITFIELD(genital.genital_flags, GENITAL_INTERNAL))			//Not those though
-			if(genital.is_exposed) //No siree. No more using this to OOCly metagame character genitals.
+			if(genital.is_exposed()) //No siree. No more using this to OOCly metagame character genitals.
 				continue
 
 		var/list/genital_entry = list()

From be03e8c46e83d8ba7b5cd340afb057bde4918806 Mon Sep 17 00:00:00 2001
From: Yawet330 <65188584+Yawet330@users.noreply.github.com>
Date: Fri, 11 Aug 2023 15:05:06 +0100
Subject: [PATCH 4/4] Update ooc.dm

---
 code/modules/client/verbs/ooc.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index cc44171ed0..a1253acffb 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -234,7 +234,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 	var/list/choices = list()
 	for(var/client/C in GLOB.clients)
 		if(isobserver(C.mob) && see_ghost_names)
-			choices["[C.mob]"] = C //NONMODULARITY NOTE: Removes the ability to link CKEYs to Characters. Always reapply for privacy reasons.
+			choices["[C]"] = C //NONMODULARITY NOTE: Removes the ability to link CKEYs to Characters. Always reapply for privacy reasons.
 		else
 			choices[C] = C
 	choices = sortList(choices)