Merge remote-tracking branch 'origin/next' into next

# Conflicts: # src/utils/icons.ts
VATSIM-Radar · Jan 20, 2025 · 289fbad · 289fbad
2 parents 1c8b5e8 + 544e38c
commit 289fbad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/assets/icons/aircraft/s12.svg → src/assets/icons/aircraft/s12s.svg b/src/assets/icons/aircraft/s12.svg → src/assets/icons/aircraft/s12s.svg
diff --git a/src/utils/icons.ts b/src/utils/icons.ts
@@ -19,7 +19,7 @@ export type AircraftIcon =
     | 'e50p'
     | 'c525'
     | 'pc24'
-    | 's12'
+    | 's12s'
     | 'pite'
     | 'g109'
     | 'yk40'
@@ -287,8 +287,8 @@ export const aircraftIcons: AircraftIcons = {
         icon: 'pc24',
         width: getAircraftSizeByCoef(0.30),
     },
-    s12: {
-        icon: 's12',
+    s12s: {
+        icon: 's12s',
         width: getAircraftSizeByCoef(0.8),
     },
     pite: {
@@ -1396,7 +1396,7 @@ export function getAircraftIcon(aircraft: VatsimShortenedAircraft | VatsimPilot)
         case 'YK40':
         case 'G109':
         case 'PITE':
-        case 'S12':
+        case 'S12S':
         case 'PC24':
         case 'C525':
         case 'B407':