Skip to content

Commit

Permalink
Reverts/removes the forced sprint and resist keybindings on SPACE and…
Browse files Browse the repository at this point in the history
… SHIFT+R respectively (Aurorastation#18233)

* changes

* cl
  • Loading branch information
Jaraci authored Jan 20, 2024
1 parent a080b8e commit 051a764
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 41 deletions.
23 changes: 0 additions & 23 deletions code/modules/mob/living/living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1043,29 +1043,6 @@ default behaviour is:
set name = "throw_intent_toggle"
toggle_throw_mode()

/**
* User by a macro in skin.dmf to toggle the running
*/
/mob/living/verb/run_intent_keyDown()
set hidden = 1
set name = "run_intent"

if(usr?.m_intent != M_WALK)
return

if(hud_used?.move_intent)
hud_used.move_intent.Click()

/mob/living/verb/run_intent_keyUp()
set hidden = 1
set name = "run_intent_up"

if(usr?.m_intent != M_RUN)
return

if(hud_used?.move_intent)
hud_used.move_intent.Click()

/mob/living/proc/add_hallucinate(var/amount)
hallucination += amount
hallucination += amount
Expand Down
13 changes: 13 additions & 0 deletions html/changelogs/omi-forcedbindings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Your name.
author: Omi

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Removed/reverted the addition of forced sprint and resist keybindings."
18 changes: 0 additions & 18 deletions interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -410,15 +410,6 @@ macro "macro"
elem
name = "."
command = "Move-Down"
elem
name = "Space"
command = "run_intent"
elem
name = "Space+UP"
command = "run_intent_up"
elem
name = "SHIFT+R"
command = "Resist"
elem
name = "R"
command = "throw_intent_toggle"
Expand Down Expand Up @@ -665,15 +656,6 @@ macro "hotkeymode"
elem
name = "."
command = "Move-Down"
elem
name = "Space"
command = "run_intent"
elem
name = "Space+UP"
command = "run_intent_up"
elem
name = "SHIFT+R"
command = "Resist"
elem
name = "R"
command = "throw_intent_toggle"
Expand Down

0 comments on commit 051a764

Please sign in to comment.