Merge branch 'master' into patch-2

code/_globalvars/lists/client.dm

@@ -6,20 +6,42 @@ GLOBAL_LIST_EMPTY(keybindings_by_name)
 // This is a mapping from JS keys to Byond - ref: https://keycode.info/
 GLOBAL_LIST_INIT(_kbMap, list(
 	"UP" = "North",
+	"ARROWUP" = "North",
 	"RIGHT" = "East",
+	"ARROWRIGHT" = "East",
 	"DOWN" = "South",
+	"ARROWDOWN" = "South",
 	"LEFT" = "West",
+	"ARROWLEFT" = "West",
 	"INSERT" = "Insert",
 	"HOME" = "Northwest",
 	"PAGEUP" = "Northeast",
-	"DEL" = "Delete",
+	"DEL" = "Delete", // Unlikely this is correct now
+	"DELETE" = "Delete",
 	"END" = "Southwest",
 	"PAGEDOWN" = "Southeast",
 	"SPACEBAR" = "Space",
 	"ENTER" = "Return",
 	"ALT" = "Alt",
 	"SHIFT" = "Shift",
-	"CONTROL" = "Ctrl"
+	"CONTROL" = "Ctrl",
+	"MULTIPLY" = "Multiply",
+	"DIVIDE" = "Divide",
+	"SUBTRACT" = "Subtract",
+	"ADD" = "Add",
+	"DECIMAL" = "Decimal",
+	"CLEAR" = "Center",
+	"PAUSE" = "Pause",
+	"CONTEXTMENU" = "Apps",
+	"NUMLOCK" = "Numlock",
+	"SCROLLLOCK" = "Scroll",
+	"MEDIANEXTTRACK" = "MediaNext",
+	"MEDIAPLAYPAUSE" = "MediaPlayPause",
+	"MEDIASTOP" = "MediaStop",
+	"MEDIAPREVIOUSTRACK" = "MediaPrev",
+	"VOLUMEMUTE" = "VolumeMute",
+	"VOLUMEUP" = "VolumeUp",
+	"VOLUMEDOWN" = "VolumeDown",
 	))
 
 ///List of ckeys that have seen a blurb of a given key.

code/modules/projectiles/gun_helpers.dm

@@ -530,7 +530,7 @@ DEFINES in setup.dm, referenced here.
 /mob/living/carbon/human/verb/holster_verb(unholster_number_offset = 1 as num)
 	set name = "holster"
 	set hidden = TRUE
-	if(usr.is_mob_incapacitated(TRUE) || usr.is_mob_restrained())
+	if(usr.is_mob_incapacitated(TRUE) || usr.is_mob_restrained() || IsKnockDown() || HAS_TRAIT_FROM(src, TRAIT_UNDENSE, LYING_DOWN_TRAIT))
 		to_chat(src, SPAN_WARNING("You can't draw a weapon in your current state."))
 		return
 

html/changelogs/archive/2024-06.yml

@@ -240,3 +240,19 @@
   iloveloopers:
   - balance: Custom research chemicals with an intensityfire above or equal to 50
       will now burn white.
+2024-06-28:
+  Drathek:
+  - bugfix: Fixed a crash in the Hotkey menu when searching by key when filtered
+  - bugfix: Fixed/Added support for various keys (e.g. keypad and media keys)
+  Git-Nivrak:
+  - bugfix: Fixes being able to draw weapons when knocked down
+  HeresKozmos:
+  - maptweak: Filled in a hole in the map.
+  - maptweak: Fixed an area in the easter egg section of Sorokyne
+  coldironwarrior:
+  - spellcheck: fixed a few typos in the xeno bioscan announcement
+  kiVts:
+  - code_imp: Prevented potential unintended behavior with research upgrade items
+      on initialize
+  private-tristan:
+  - qol: Facehuggers no longer show as having any plasma

tgui/packages/tgui/interfaces/KeyBinds.jsx

@@ -92,10 +92,16 @@ export const KeyBinds = (props) => {
                           if (!targetEntry) {
                             return;
                           }
-                          // If a keybind was found, scroll to the first match.
-                          document
-                            .getElementById(targetEntry[0])
-                            .scrollIntoView();
+                          // If a keybind was found, scroll to the first match currently rendered.
+                          for (let i = 0; i < targetEntry.length; i++) {
+                            const element = document.getElementById(
+                              targetEntry[i],
+                            );
+                            if (element) {
+                              element.scrollIntoView();
+                              break;
+                            }
+                          }
                         }}
                       />
                     </Flex.Item>