Merge remote-tracking branch 'BeeStation/master' into plate-code

BeeStation · Aug 14, 2024 · 278ae10 · 278ae10
2 parents e824b4c + fcd39b2
commit 278ae10
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm
@@ -29,6 +29,9 @@ GLOBAL_LIST_INIT(valid_keys, list(
 	"é" = 1, "è" = 1, "ç" = 1, "à" = 1, "ù" = 1,
 	// Scrolling support
 	"ScrollUp" = 1, "ScrollDown" = 1,
+	// CTRLKeys and ShiftKeys support to declutter logs
+	"CtrlW" = 1, "CtrlA" = 1, "CtrlS" = 1, "CtrlD" = 1, "CtrlNorth" = 1, "CtrlWest" = 1, "CtrlSouth" = 1, "CtrlEast" = 1,
+	"ShiftW" = 1, "ShiftA" = 1, "ShiftS" = 1, "ShiftD" = 1, "ShiftNorth" = 1, "ShiftWest" = 1, "ShiftSouth" = 1, "ShiftEast" = 1,
 ))
 
 /proc/input_sanity_check(client/C, key)

diff --git a/html/changelog.html b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">14 August 2024</h2>
+			<h3 class="author">ro5490 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="admin">sorted out keypress log clutter</li>
+			</ul>
+
 			<h2 class="date">12 August 2024</h2>
 			<h3 class="author">rkz, Fikou, Kapu, Ryll/Shaps, ShizCalev updated:</h3>
 			<ul class="changes bgimages16">
@@ -834,19 +840,6 @@ <h3 class="author">XeonMations updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed candles being able to create unnatural darkness.</li>
 			</ul>
-
-			<h2 class="date">12 June 2024</h2>
-			<h3 class="author">XeonMations updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed the ED-209 Crafting recipe using a dragnet instead of a disabler</li>
-				<li class="balance">Changed legion core healing from 50 to 20 on station z level</li>
-				<li class="balance">Made inert legion cores no longer able to be preserved and thus work</li>
-			</ul>
-			<h3 class="author">rkz, MrMelbert(Lizard Variants), Krysonism(New sprites), Thunder12345(Spacelizard plushy) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">new lizard plushy variants!</li>
-				<li class="rscadd">Find a few new lizard plushy hiding spots, because they now exist in the maps! Oppose the moths!</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
@@ -43912,3 +43912,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   rkz, Ryll/Shaps, KingofKosmos, Ghommie:
   - rscadd: personalized combat messages. Expect much more "you attack player" than
       "playername attacks player"
+2024-08-14:
+  ro5490:
+  - admin: sorted out keypress log clutter