No tabs map

ss220club · Aug 1, 2024 · 13c1ac5 · 13c1ac5
1 parent f13748e
commit 13c1ac5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm b/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
@@ -6,11 +6,12 @@
 	var/static/list/appearances
 	var/static/list/departments = list(
 				"Assistant" = null,
+				"Service" = GLOB.service_positions,
+				"Supply" = GLOB.supply_positions,
 				"Engineering" = GLOB.engineering_positions,
 				"Medical" = GLOB.medical_positions,
 				"Science" = GLOB.science_positions,
 				"Security" = GLOB.security_positions,
-				"Support" = GLOB.service_positions,
 				"Command" = GLOB.command_positions,
 				"Special" = (get_all_solgov_jobs() + get_all_soviet_jobs() + get_all_centcom_jobs()),
 				"Custom" = null,
@@ -133,7 +134,7 @@
 	data["blood_type"] = blood_type
 	data["dna_hash"] = dna_hash
 	data["fingerprint_hash"] = fingerprint_hash
-	data["photo"] = "[icon2base64(photo)]"
+	data["photo"] = photo
 	data["ai_tracking"] = untrackable
 	return data
 

diff --git a/tgui/packages/tgui/interfaces/AgentCard.js b/tgui/packages/tgui/interfaces/AgentCard.js
@@ -2,11 +2,6 @@ import { useBackend, useLocalState, useSharedState } from '../backend';
 import { Button, NoticeBox, LabeledList, Section, Tabs, ImageButton, Stack, Slider } from '../components';
 import { Window } from '../layouts';
 
-const TABS = [
-  { key: 'Card Info', icon: 'table', label: 'Информация' },
-  { key: 'Appearance', icon: 'id-card', label: 'Внешний вид' },
-];
-
 const GENDERS = [
   { name: 'Male', icon: 'mars' },
   { name: 'Female', icon: 'venus' },
@@ -34,18 +29,12 @@ export const AgentCard = (props, context) => {
         <Stack fill vertical>
           <Stack.Item textAlign="center">
             <Tabs fluid>
-              {TABS.map((tab, i) => (
-                <Tabs.Tab
-                  ml={i === 0 ? 1 : 0.5}
-                  mr={i === 1 ? 1 : 0.5}
-                  key={tab.key}
-                  icon={tab.icon}
-                  selected={i === tabIndex}
-                  onClick={() => setTabIndex(i)}
-                >
-                  {tab.label}
-                </Tabs.Tab>
-              ))}
+              <Tabs.Tab key="Card Info" icon={'table'} selected={0 === tabIndex} onClick={() => setTabIndex(0)}>
+                Информация
+              </Tabs.Tab>
+              <Tabs.Tab key="Appearance" icon={'id-card'} selected={1 === tabIndex} onClick={() => setTabIndex(1)}>
+                Внешний вид
+              </Tabs.Tab>
             </Tabs>
           </Stack.Item>
           {decideTab(tabIndex)}

diff --git a/tgui/public/tgui.bundle.js b/tgui/public/tgui.bundle.js