From 653bd71158a07aca2f90860b79e356a6521d12fc Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 20 May 2021 20:37:15 -0400
Subject: [PATCH] fix
---
src/npc/descriptions/belly/belly.js | 2 +-
src/npc/descriptions/boobs/boobs.js | 2 +-
src/npc/descriptions/butt/butt.js | 2 +-
src/npc/descriptions/butt/buttplug.js | 2 +-
src/npc/descriptions/crotch/crotch.js | 2 +-
src/npc/descriptions/describePiercings.js | 4 ++--
src/npc/descriptions/style/clothing.js | 2 +-
src/npc/descriptions/style/clothingCorset.js | 2 +-
src/npc/descriptions/style/hairClothing.js | 2 +-
src/npc/descriptions/style/upperFace.js | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/npc/descriptions/belly/belly.js b/src/npc/descriptions/belly/belly.js
index bbfdbbaf2ee..8f6140c27f1 100644
--- a/src/npc/descriptions/belly/belly.js
+++ b/src/npc/descriptions/belly/belly.js
@@ -2665,7 +2665,7 @@ App.Desc.belly = function(slave, {market, eventDescription} = {}) {
function clothing() {
const r = [];
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "belly" in clothing.desc) {
+ if (clothing && clothing.desc && "belly" in clothing.desc) {
r.push(clothing.desc.belly(slave));
} else {
switch (slave.clothes) {
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index b50138eb19b..0754af60b45 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -262,7 +262,7 @@ App.Desc.boobs = function() {
let r = '';
const {he, his, him, His, girl} = getPronouns(slave);
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "boobs" in clothing.desc) {
+ if (clothing && clothing.desc && "boobs" in clothing.desc) {
r += clothing.desc.boobs(slave);
} else {
switch (slave.clothes) {
diff --git a/src/npc/descriptions/butt/butt.js b/src/npc/descriptions/butt/butt.js
index 93c0162689d..ef1b4dfd913 100644
--- a/src/npc/descriptions/butt/butt.js
+++ b/src/npc/descriptions/butt/butt.js
@@ -14,7 +14,7 @@ App.Desc.butt = function(slave, {market, eventDescription} = {}) {
if (V.showClothing === 1 && !market) {
if (V.surgeryDescription === 0) {
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "butt" in clothing.desc) {
+ if (clothing && clothing.desc && "butt" in clothing.desc) {
r.push(clothing.desc.butt(slave));
} else {
switch (slave.clothes) {
diff --git a/src/npc/descriptions/butt/buttplug.js b/src/npc/descriptions/butt/buttplug.js
index 24e87de2e23..8bc3ef985ae 100644
--- a/src/npc/descriptions/butt/buttplug.js
+++ b/src/npc/descriptions/butt/buttplug.js
@@ -25,7 +25,7 @@ App.Desc.buttplug = function(slave, {market, eventDescription} = {}) {
} else {
if (V.showClothing === 1 && !market) {
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "buttplug" in clothing.desc) {
+ if (clothing && clothing.desc && "buttplug" in clothing.desc) {
r.push(clothing.desc.buttplug(slave));
} else {
switch (slave.clothes) {
diff --git a/src/npc/descriptions/crotch/crotch.js b/src/npc/descriptions/crotch/crotch.js
index 76867ee17d9..c31e2878c48 100644
--- a/src/npc/descriptions/crotch/crotch.js
+++ b/src/npc/descriptions/crotch/crotch.js
@@ -25,7 +25,7 @@ App.Desc.crotch = function(slave, {market, eventDescription} = {}) {
}
} else {
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "crotch" in clothing.desc) {
+ if (clothing && clothing.desc && "crotch" in clothing.desc) {
r.push(clothing.desc.crotch(slave));
switch (slave.clothes) {
case "a Fuckdoll suit":
diff --git a/src/npc/descriptions/describePiercings.js b/src/npc/descriptions/describePiercings.js
index ed684b0c752..d5d27e471cf 100644
--- a/src/npc/descriptions/describePiercings.js
+++ b/src/npc/descriptions/describePiercings.js
@@ -23,7 +23,7 @@ App.Desc.piercing = function(slave, surface) {
}
if (slave.assignment === "get milked" || slave.assignment === "work in the dairy") {
r.push(`${He} has a plastic livestock tag in one ear to help identify ${him} for milking.`);
- } else if (clothing && "earPiercing" in clothing.desc) {
+ } else if (clothing && clothing.desc && "earPiercing" in clothing.desc) {
r.push(clothing.desc.earPiercing(slave));
} else {
switch (slave.clothes) {
@@ -519,7 +519,7 @@ App.Desc.piercing = function(slave, surface) {
}
} else {
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "corsetPiercing" in clothing.desc) {
+ if (clothing && clothing.desc && "corsetPiercing" in clothing.desc) {
r.push(clothing.desc.corsetPiercing(slave));
} else {
switch (slave.clothes) {
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index ef8172bf1c4..158a6f1300a 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -16,7 +16,7 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
r.push(`${slave.slaveName} is wearing ${slave.clothes},`);
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "summary" in clothing.desc) {
+ if (clothing && clothing.desc && "summary" in clothing.desc) {
r.push(clothing.desc.summary(slave));
} else {
switch (slave.clothes) {
diff --git a/src/npc/descriptions/style/clothingCorset.js b/src/npc/descriptions/style/clothingCorset.js
index c039f235ad2..9d7d202c2a5 100644
--- a/src/npc/descriptions/style/clothingCorset.js
+++ b/src/npc/descriptions/style/clothingCorset.js
@@ -8,7 +8,7 @@ App.Desc.clothingCorset = function(slave) {
his, He, His
} = getPronouns(slave);
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "clothingCorset" in clothing.desc) {
+ if (clothing && clothing.desc && "clothingCorset" in clothing.desc) {
r.push(clothing.desc.clothingCorset(slave));
} else {
switch (slave.clothes) {
diff --git a/src/npc/descriptions/style/hairClothing.js b/src/npc/descriptions/style/hairClothing.js
index 2a4ca379609..bfa07f1a2fc 100644
--- a/src/npc/descriptions/style/hairClothing.js
+++ b/src/npc/descriptions/style/hairClothing.js
@@ -10,7 +10,7 @@ App.Desc.hairClothing = function(slave) {
if (slave.fuckdoll === 0) {
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "hStyle" in clothing.desc) {
+ if (clothing && clothing.desc && "hStyle" in clothing.desc) {
r.push(clothing.desc.hStyle(slave));
} else {
switch (slave.hStyle) {
diff --git a/src/npc/descriptions/style/upperFace.js b/src/npc/descriptions/style/upperFace.js
index a3def8f0a35..3265bef0087 100644
--- a/src/npc/descriptions/style/upperFace.js
+++ b/src/npc/descriptions/style/upperFace.js
@@ -52,7 +52,7 @@ App.Desc.upperFace = function(slave) {
if (slave.eyewear === "corrective glasses" || slave.eyewear === "blurring glasses" || slave.eyewear === "glasses") {
r.push(`${He}'s wearing a pair of`);
const clothing = App.Data.clothes.get(slave.clothes);
- if (clothing && "upperFace" in clothing.desc) {
+ if (clothing && clothing.desc && "upperFace" in clothing.desc) {
r.push(clothing.desc.upperFace(slave));
} else {
switch (slave.clothes) {
--
GitLab