cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Game Preferences Update (#13936)

Browse Source
This commit is contained in:
AffectedArc07
2020-10-09 14:53:59 -04:00
committed by GitHub
parent 44431ff0b5
commit a50f656d8d
42 changed files with 227 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/keybindings/bindings_atom.dm
+1 -1
View File
@@ -5,7 +5,7 @@
if(!user.keys_held["Ctrl"])
var/movement_dir = NONE
var/list/movement = SSinput.movement_keys
if(user.prefs.toggles & AZERTY)
if(user.prefs.toggles & PREFTOGGLE_AZERTY)
movement = SSinput.alt_movement_keys
for(var/_key in user.keys_held)
movement_dir = movement_dir | movement[_key]
code/modules/keybindings/bindings_client.dm
+2 -2
View File
@@ -44,7 +44,7 @@
current_key_address = ((current_key_address + 1) % HELD_KEY_BUFFER_LENGTH)
var/movement = SSinput.movement_keys[_key]
if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key]
if (prefs.toggles & PREFTOGGLE_AZERTY) movement = SSinput.alt_movement_keys[_key]
if(!(next_move_dir_sub & movement) && !keys_held["Ctrl"])
next_move_dir_add |= movement
@@ -85,7 +85,7 @@
keys_held[i] = null
break
var/movement = SSinput.movement_keys[_key]
if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key]
if (prefs.toggles & PREFTOGGLE_AZERTY) movement = SSinput.alt_movement_keys[_key]
if(!(next_move_dir_add & movement))
next_move_dir_sub |= movement
code/modules/keybindings/bindings_mob.dm
+3 -3
View File
@@ -3,7 +3,7 @@
// Or we can have NPC's send actual keypresses and detect that by seeing no client
/mob/key_down(_key, client/user)
if(user.prefs.toggles & AZERTY)
if(user.prefs.toggles & PREFTOGGLE_AZERTY)
switch(_key)
if("Delete")
if(!pulling)
@@ -70,7 +70,7 @@
toggle_move_intent()
return
//Bodypart selections
if(client.prefs.toggles & NUMPAD_TARGET)
if(client.prefs.toggles & PREFTOGGLE_NUMPAD_TARGET)
switch(_key)
if("Numpad8")
user.body_toggle_head()
@@ -107,7 +107,7 @@
if("Numpad4")
a_intent_change("harm")
return
if(client.keys_held["Ctrl"] && client.prefs.toggles & AZERTY)
if(client.keys_held["Ctrl"] && client.prefs.toggles & PREFTOGGLE_AZERTY)
switch(SSinput.alt_movement_keys[_key])
if(NORTH)
northface()
code/modules/keybindings/bindings_robot.dm
+2 -2
View File
@@ -10,9 +10,9 @@
cycle_modules()
return
if("Q")
if(!(client.prefs.toggles & AZERTY))
if(!(client.prefs.toggles & PREFTOGGLE_AZERTY))
on_drop_hotkey_press() // User is in QWERTY hotkey mode.
if("A")
if(client.prefs.toggles & AZERTY)
if(client.prefs.toggles & PREFTOGGLE_AZERTY)
on_drop_hotkey_press()
return ..()