From 80308ce6ccfe717d66d686a67a85984a7d35b6d8 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 4 Dec 2020 06:44:59 -0500
Subject: [PATCH] should always be able to remove piercings

---
 .../bodyModification/bodyModification.js      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/facilities/bodyModification/bodyModification.js b/src/facilities/bodyModification/bodyModification.js
index 0a58c4b87cf..96ec38bc8c2 100644
--- a/src/facilities/bodyModification/bodyModification.js
+++ b/src/facilities/bodyModification/bodyModification.js
@@ -242,19 +242,21 @@ App.UI.bodyModification = function(slave, cheat = false) {
 		// Determine parts that cannot be pierced
 		let validPiercingLocations = Array.from(piercingLocations);
 
-		if (slave.nipples !== "fuckable") {
-			removePiercingLocation("nipples");
-		}
+		if (piercingLevel !== 0) { // Sometimes a piercing winds up in a place that is no longer valid.  Make sure players can always remove an existing piercing.
+			if (slave.nipples !== "fuckable") {
+				removePiercingLocation("nipples");
+			}
 
-		if (slave.vagina !== -1 || slave.dick !== 0) {
-			removePiercingLocation("clit");
-			if (slave.vagina !== -1) {
+			if (slave.vagina === -1) {
 				removePiercingLocation("vagina");
 			}
-		}
 
-		if (slave.dick === 0) {
-			removePiercingLocation("dick");
+			if (slave.dick === 0) {
+				removePiercingLocation("dick");
+				if (slave.vagina === -1) {
+					removePiercingLocation("clit");
+				}
+			}
 		}
 
 		function removePiercingLocation(location) {
-- 
GitLab