Skip to content

Adds 2 new hotkeys and some hotkey related fixes #1110

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.

Sign up for GitHub

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

Open
Sneakyrat6 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adds 2 new hotkeys and some hotkey related fixes #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion code/controllers/subsystem/input.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ SUBSYSTEM_DEF(input)
"default" = list(
"Tab" = "\".winset \\\"input.focus=true?map.focus=true input.background-color=[COLOR_INPUT_DISABLED]:input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
"O" = "ooc",
"L" = "looc",
"T" = "say",
"Y" = "whisper",
"M" = "me",
"U" = "surrender",
"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
Expand All @@ -42,13 +44,17 @@ SUBSYSTEM_DEF(input)
"old_default" = list(
"Tab" = "\".winset \\\"mainwindow.macro=old_hotkeys map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"",
"Ctrl+T" = "say",
"Ctrl+Y" = "whisper",
"Ctrl+U" = "surrender",
"Ctrl+O" = "ooc",
"Ctrl+L" = "looc",
),
"old_hotkeys" = list(
"Tab" = "\".winset \\\"mainwindow.macro=old_default input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
"O" = "ooc",
"L" = "looc",
"T" = "say",
"Y" = "whisper",
"M" = "me",
"U" = "surrender",
"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
Expand Down Expand Up @@ -83,7 +89,6 @@ SUBSYSTEM_DEF(input)
"Q" = "Q", // drop
"R" = "R", // throw
"X" = "X", // switch hands
"Y" = "Y", // activate item
"Z" = "Z", // activate item
)

Expand Down
17 changes: 12 additions & 5 deletions code/modules/keybindings/bindings_human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
if(!equipped_belt) // We also let you equip a belt like this
if(!thing)
to_chat(user, "<span class='notice'>You have no belt to take something out of.</span>")
return
equip_to_slot_if_possible(thing, SLOT_BELT)
else
equip_to_slot_if_possible(thing, SLOT_BELT)
var/mob/living/carbon/human/H = src
if(istype(H))
H.update_inv_hands()
return
if(!istype(equipped_belt)) // not a storage item
if(!thing)
to_chat(user, "<span class='notice'>You have no belt to take something out of.</span>")
equipped_belt.attack_hand(src)
else
to_chat(user, "<span class='notice'>You can't fit anything in.</span>")
return
Expand All @@ -36,11 +39,15 @@
if(!thing)
to_chat(user, "<span class='notice'>You have no backpack to take something out of.</span>")
return
equip_to_slot_if_possible(thing, SLOT_BACK)
else
equip_to_slot_if_possible(thing, SLOT_BACK)
var/mob/living/carbon/human/H = src
if(istype(H))
H.update_inv_hands()
return
if(!istype(equipped_backpack)) // not a storage item
if(!thing)
to_chat(user, "<span class='notice'>You have no backpack to take something out of.</span>")
equipped_backpack.attack_hand(src)
else
to_chat(user, "<span class='notice'>You can't fit anything in.</span>")
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/keybindings/bindings_mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
if("X", "Northeast") // Northeast is Page-up
swap_hand()
return
if("Y", "Z", "Southeast") // Southeast is Page-down
if("Z", "Southeast") // Southeast is Page-down
mode() // attack_self(). No idea who came up with "mode()"
return
if("Q", "Northwest") // Northwest is Home
Expand Down
18 changes: 14 additions & 4 deletions interface/interface.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,14 @@ Hotkey-Mode: (hotkey-mode must be on)
\tr = throw
\tm = me
\tt = say
\ty = whisper
\to = OOC
\tl = LOOC
\tb = resist
\tu = surrender
\t<B></B>h = stop pulling
\tx = swap-hand
\tz = activate held object (or y)
\tz = activate held object
\tShift+e = Put held item into belt or take out most recent item added to belt.
\tShift+b = Put held item into backpack or take out most recent item added to backpack.
\tf = cycle-intents-left
Expand All @@ -146,10 +149,13 @@ Any-Mode: (hotkey doesn't need to be on)
\tCtrl+e = equip
\tCtrl+r = throw
\tCtrl+b = resist
\tCtrl+u = surrender
\tCtrl+h = stop pulling
\tCtrl+y = whisper
\tCtrl+o = OOC
\tCtrl+l = LOOC
\tCtrl+x = swap-hand
\tCtrl+z = activate held object (or Ctrl+y)
\tCtrl+z = activate held object
\tCtrl+f = cycle-intents-left
\tCtrl+g = cycle-intents-right
\tCtrl+1 = help-intent
Expand Down Expand Up @@ -183,10 +189,12 @@ Hotkey-Mode: (hotkey-mode must be on)
\t<B></B>h = stop pulling
\tm = me
\tt = say
\ty = whisper
\to = OOC
\tl = LOOC
\tx = cycle active modules
\tb = resist
\tz = activate held object (or y)
\tz = activate held object
\tf = cycle-intents-left
\tg = cycle-intents-right
\t1 = activate module 1
Expand All @@ -205,8 +213,10 @@ Any-Mode: (hotkey doesn't need to be on)
\tCtrl+x = cycle active modules
\tCtrl+b = resist
\tCtrl+h = stop pulling
\tCtrl+y = whisper
\tCtrl+o = OOC
\tCtrl+z = activate held object (or Ctrl+y)
\tCtrl+l = LOOC
\tCtrl+z = activate held object
\tCtrl+f = cycle-intents-left
\tCtrl+g = cycle-intents-right
\tCtrl+1 = activate module 1
Expand Down