Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix keybind, break other things #2537

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Conversation

AndrewL97
Copy link
Collaborator

@AndrewL97 AndrewL97 commented Jun 18, 2024

Pulls in TG's (#82417)
Fixes keybind menu
fixes funky bugs I introduced when pulling in the above commit

Arthri and others added 2 commits June 18, 2024 21:01
…ts (#82417)

# Conflicts:
#	tgui/packages/tgui/interfaces/ApcControl.jsx
#	tgui/packages/tgui/interfaces/AtmosControlPanel.jsx
#	tgui/packages/tgui/interfaces/BluespaceSender.tsx
#	tgui/packages/tgui/interfaces/BluespaceVendor.tsx
#	tgui/packages/tgui/interfaces/CameraConsole.tsx
#	tgui/packages/tgui/interfaces/Cargo.jsx
#	tgui/packages/tgui/interfaces/CommunicationsConsole.jsx
#	tgui/packages/tgui/interfaces/CrewConsole.jsx
#	tgui/packages/tgui/interfaces/DestinationTagger.tsx
#	tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleStorage.jsx
#	tgui/packages/tgui/interfaces/DnaConsole/MutationInfo.jsx
#	tgui/packages/tgui/interfaces/ExperimentConfigure.jsx
#	tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
#	tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx
#	tgui/packages/tgui/interfaces/Fax.tsx
#	tgui/packages/tgui/interfaces/Filteriffic.jsx
#	tgui/packages/tgui/interfaces/FishCatalog.tsx
#	tgui/packages/tgui/interfaces/Gps.jsx
#	tgui/packages/tgui/interfaces/Hypertorus/Gases.tsx
#	tgui/packages/tgui/interfaces/Jukebox.tsx
#	tgui/packages/tgui/interfaces/LibraryAdmin.tsx
#	tgui/packages/tgui/interfaces/LibraryConsole.jsx
#	tgui/packages/tgui/interfaces/LibraryVisitor.jsx
#	tgui/packages/tgui/interfaces/MatMarket.tsx
#	tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx
#	tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
#	tgui/packages/tgui/interfaces/NtosMessenger/index.tsx
#	tgui/packages/tgui/interfaces/NtosNetDownloader.tsx
#	tgui/packages/tgui/interfaces/PersonalCrafting.tsx
#	tgui/packages/tgui/interfaces/Photocopier.jsx
#	tgui/packages/tgui/interfaces/PlaneMasterDebug.tsx
#	tgui/packages/tgui/interfaces/PortableChemMixer.tsx
#	tgui/packages/tgui/interfaces/PowerMonitor.jsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skin_tone.tsx
#	tgui/packages/tgui/interfaces/RequestsConsole/MessageWriteTab.tsx
#	tgui/packages/tgui/interfaces/RestockTracker.jsx
#	tgui/packages/tgui/interfaces/SecurityRecords/RecordTabs.tsx
#	tgui/packages/tgui/interfaces/SeedExtractor.tsx
#	tgui/packages/tgui/interfaces/ShuttleManipulator.jsx
#	tgui/packages/tgui/interfaces/StackCrafting.tsx
#	tgui/packages/tgui/interfaces/StationAlertConsole.jsx
#	tgui/packages/tgui/interfaces/Supermatter.tsx
#	tgui/packages/tgui/interfaces/Techweb.jsx
#	tgui/packages/tgui/interfaces/WarrantConsole.tsx
#	tgui/packages/tgui/interfaces/common/AccessConfig.tsx
#	tgui/packages/tgui/interfaces/common/AccessList.jsx
@github-actions github-actions bot changed the title Remove several functions from collections.js which have ES5 equivalen… Remove several functions from collections.js which have ES5 equivalen Jun 18, 2024
@AndrewL97 AndrewL97 changed the title Remove several functions from collections.js which have ES5 equivalen Fix keybind, break other things Jun 18, 2024
@Koshenko Koshenko merged commit a7769f6 into Mojave-Sun:master Jun 20, 2024
11 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants