From 6445cfdd9d35e29188df2ee151b4fa36dc3ce667 Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Thu, 15 Jul 2021 17:32:03 -0300
Subject: [PATCH] Removes spontaneous vore and reorganizes buttons

---
 code/__DEFINES/voreconstants.dm            |  4 +-
 code/modules/vore/eating/living.dm         |  2 +-
 code/modules/vore/eating/vorepanel.dm      |  7 ---
 tgui/packages/tgui/interfaces/VorePanel.js | 62 +++++++++-------------
 4 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/code/__DEFINES/voreconstants.dm b/code/__DEFINES/voreconstants.dm
index 67ef9bc81f..372c5b776c 100644
--- a/code/__DEFINES/voreconstants.dm
+++ b/code/__DEFINES/voreconstants.dm
@@ -21,11 +21,9 @@
 #define ABSORBABLE		(1<<9)
 /// Can get simplemob vored?
 #define MOBVORE			(1<<10)
-/// Spontaneous vore. Unused, usable in the future?
-#define SPNTVORE		(1<<11)
 
 /// Change this whenever you add a vore flag, must be largest vore flag*2-1
-#define MAX_VORE_FLAG	(1<<12)-1
+#define MAX_VORE_FLAG	(1<<11)-1
 
 #define isbelly(A) istype(A, /obj/belly)
 
diff --git a/code/modules/vore/eating/living.dm b/code/modules/vore/eating/living.dm
index ff4a26e0e2..6bc44e6489 100644
--- a/code/modules/vore/eating/living.dm
+++ b/code/modules/vore/eating/living.dm
@@ -284,7 +284,7 @@
 		to_chat(src,"<span class='warning'>You attempted to apply your vore prefs but somehow you're in this character without a client.prefs variable. Tell a dev.</span>")
 		return FALSE
 	ENABLE_BITFIELD(vore_flags,VOREPREF_INIT)
-	COPY_SPECIFIC_BITFIELDS(vore_flags, client.prefs.vore_flags, DIGESTABLE | DEVOURABLE | FEEDING | LICKABLE | SMELLABLE | ABSORBABLE | MOBVORE | SPNTVORE)
+	COPY_SPECIFIC_BITFIELDS(vore_flags, client.prefs.vore_flags, DIGESTABLE | DEVOURABLE | FEEDING | LICKABLE | SMELLABLE | ABSORBABLE | MOBVORE)
 	vore_taste = client.prefs.vore_taste
 	vore_smell = client.prefs.vore_smell
 
diff --git a/code/modules/vore/eating/vorepanel.dm b/code/modules/vore/eating/vorepanel.dm
index 489ed39094..a3adc89352 100644
--- a/code/modules/vore/eating/vorepanel.dm
+++ b/code/modules/vore/eating/vorepanel.dm
@@ -186,7 +186,6 @@
 		"feeding" = CHECK_BITFIELD(host.vore_flags, FEEDING),
 		"absorbable" = CHECK_BITFIELD(host.vore_flags, ABSORBABLE),
 		"allowmobvore" = CHECK_BITFIELD(host.vore_flags, MOBVORE),
-		"allow_spontaneous_tf" = CHECK_BITFIELD(host.vore_flags, SPNTVORE),
 		"vore_sounds" = CHECK_BITFIELD(host.client.prefs.cit_toggles, EATING_NOISES),
 		"digestion_sounds" = CHECK_BITFIELD(host.client.prefs.cit_toggles, DIGESTION_NOISES),
 		"lickable" = CHECK_BITFIELD(host.vore_flags, LICKABLE),
@@ -307,12 +306,6 @@
 			host.vore_smell = new_smell
 			unsaved_changes = TRUE
 			return TRUE
-		if("toggle_allow_spontaneous_tf")
-			TOGGLE_BITFIELD(host.vore_flags, SPNTVORE)
-			if(host.client.prefs)
-				COPY_SPECIFIC_BITFIELDS(host.client.prefs.vore_flags, host.vore_flags, SPNTVORE)
-			unsaved_changes = TRUE
-			return TRUE
 		if("toggle_digest")
 			TOGGLE_BITFIELD(host.vore_flags, DIGESTABLE)
 			if(host.client.prefs)
diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js
index 4a99bada10..3e29c8bff4 100644
--- a/tgui/packages/tgui/interfaces/VorePanel.js
+++ b/tgui/packages/tgui/interfaces/VorePanel.js
@@ -431,7 +431,6 @@ const VoreUserPreferences = (props, context) => {
     feeding,
     absorbable,
     allowmobvore,
-    allow_spontaneous_tf,
     vore_sounds,
     digestion_sounds,
     lickable,
@@ -450,27 +449,6 @@ const VoreUserPreferences = (props, context) => {
     }>
       <Flex spacing={1} wrap="wrap" justify="center">
         <Flex.Item basis="33%">
-          <Button
-            onClick={() => act("toggle_digest")}
-            icon={digestable ? "toggle-on" : "toggle-off"}
-            selected={digestable}
-            fluid
-            tooltip={"This button is for those who don't like being digested. It can make you undigestable."
-            + (digestable ? " Click here to prevent digestion." : " Click here to allow digestion.")}
-            tooltipPosition="bottom-right"
-            content={digestable ? "Digestion Allowed" : "No Digestion"} />
-        </Flex.Item>
-        <Flex.Item basis="33%">
-          <Button
-            onClick={() => act("toggle_absorbable")}
-            icon={absorbable ? "toggle-on" : "toggle-off"}
-            selected={absorbable}
-            fluid
-            tooltip={"This button allows preds to know whether you prefer or don't prefer to be absorbed. "
-            + (absorbable ? "Click here to disallow being absorbed." : "Click here to allow being absorbed.")}
-            content={absorbable ? "Absorption Allowed" : "No Absorption"} />
-        </Flex.Item>
-        <Flex.Item basis="33%" grow={1}>
           <Button
             onClick={() => act("toggle_devour")}
             icon={devourable ? "toggle-on" : "toggle-off"}
@@ -505,10 +483,31 @@ const VoreUserPreferences = (props, context) => {
               : "Click here to allow being fed to/by other people.")}
             content={feeding ? "Feeding Allowed" : "No Feeding"} />
         </Flex.Item>
-        <Flex.Item basis="33%">
+        <Flex.Item basis="50%">
+          <Button
+            onClick={() => act("toggle_digest")}
+            icon={digestable ? "toggle-on" : "toggle-off"}
+            selected={digestable}
+            fluid
+            tooltip={"This button is for those who don't like being digested. It can make you undigestable."
+            + (digestable ? " Click here to prevent digestion." : " Click here to allow digestion.")}
+            tooltipPosition="bottom-right"
+            content={digestable ? "Digestion Allowed" : "No Digestion"} />
+        </Flex.Item>
+        <Flex.Item basis="50%">
+          <Button
+            onClick={() => act("toggle_absorbable")}
+            icon={absorbable ? "toggle-on" : "toggle-off"}
+            selected={absorbable}
+            fluid
+            tooltip={"This button allows preds to know whether you prefer or don't prefer to be absorbed. "
+            + (absorbable ? "Click here to disallow being absorbed." : "Click here to allow being absorbed.")}
+            content={absorbable ? "Absorption Allowed" : "No Absorption"} />
+        </Flex.Item>
+        <Flex.Item basis="50%">
           <Button
             onClick={() => act("toggle_vore_sounds")}
-            icon={vore_sounds ? "toggle-on" : "toggle-off"}
+            icon={vore_sounds ? "volume-up" : "volume-mute"}
             selected={vore_sounds}
             fluid
             tooltip={"Be able to hear vore sounds. "
@@ -520,7 +519,7 @@ const VoreUserPreferences = (props, context) => {
         <Flex.Item basis="50%">
           <Button
             onClick={() => act("toggle_digestion_sounds")}
-            icon={digestion_sounds ? "toggle-on" : "toggle-off"}
+            icon={digestion_sounds ? "volume-up" : "volume-mute"}
             selected={digestion_sounds}
             fluid
             tooltip={"Be able to hear digestion sounds. "
@@ -529,19 +528,6 @@ const VoreUserPreferences = (props, context) => {
               : "Click here to turn on digestion sounds.")}
             content={digestion_sounds ? "Digestion Sounds Enabled" : "Digestion Sounds Disabled"} />
         </Flex.Item>
-        <Flex.Item basis="50%">
-          <Button
-            onClick={() => act("toggle_allow_spontaneous_tf")}
-            icon={allow_spontaneous_tf ? "toggle-on" : "toggle-off"}
-            selected={allow_spontaneous_tf}
-            fluid
-            tooltip={"This toggle is for spontaneous or environment related transformation"
-            + " as a victim, such as via chemicals. "
-            + (allow_spontaneous_tf
-              ? "Click here to allow being spontaneously transformed."
-              : "Click here to disable being spontaneously transformed.")}
-            content={allow_spontaneous_tf ? "Spontaneous TF Enabled" : "Spontaneous TF Disabled"} />
-        </Flex.Item>
         <Flex.Item basis="25%">
           <Button
             onClick={() => act("toggle_lickable")}