cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 16:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-08-01 21:33:42 -04:00
committed by GitHub
parent eae5a43733
commit 96bdaf93b9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgui/packages/tgui/interfaces/VorePanel.js
+3 -4
View File
@@ -1777,7 +1777,9 @@ const VoreUserPreferences = (props, context) => {
<VoreUserPreferenceItem spec={preferences.spontaneous_tf} />
</Flex.Item>
<Flex.Item basis="32%">
<<<<<<< HEAD
<Button fluid content="Slective Mode Preference" onClick={() => act('switch_selective_mode_pref')} />
</Flex.Item>
<Flex.Item basis="32%">
<VoreUserPreferenceItem spec={preferences.autotransferable} />
</Flex.Item>
<Flex.Item basis="49%">
@@ -1785,9 +1787,6 @@ const VoreUserPreferences = (props, context) => {
</Flex.Item>
<Flex.Item basis="49%">
<VoreUserPreferenceItem spec={preferences.liquid_give} tooltipPosition="top" />
=======
<Button fluid content="Slective Mode Preference" onClick={() => act('switch_selective_mode_pref')} />
>>>>>>> 7550df1e26... Merge pull request #13406 from Heroman3003/selective-upgrade
</Flex.Item>
</Flex>
<Section title="Aesthetic Preferences">