Commit Graph

34 Commits

Author SHA1 Message Date
SkyratBot
124ddd7cca [MIRROR] tgui Preferences Menu + total rewrite of the preferences backend (#8153)
* tgui Preferences Menu + total rewrite of the preferences backend

* nah, we dont need to ping those people

* trying to remove the funny stuff

* unmodularizing this

* prefs reset

* this may need to be reverted, who knows

* okay, this part

* perhaps

* EEEEEEEEE

* unsanitary

* E

* Stage 1 + loadout system

* more fixes

* E

* I mean, it launches?

* More fixes and reorganisation

* E

* customisation code is spaget.

* disable ERP prefs

* Update erp_preferences.dm

* Update erp_preferences.dm

* E

* Slowly getting there

* It may be time for help :)

* tri...colors... help

* preferences now pass preferences

* Update dna.dm

* Fuck this man

* missing savefile return, set_species works, removed dumb stuff from updateappearance

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8199

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8224

* https://github.com/tgstation/tgstation/pull/61519

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8278

* e

* le butonAZARAK HELLO

* hhh

* Proper recognition where it's due, MrMelbert!

* EEEE

* examine block

* Better gen hit sounds from whitedream

* final loadout touches, more bug fixes im sure to come

* i said there would be bugfixes

* Update LoadoutManager.js

* Missing preferences in the html menu

* LIVE TESTING PHASE BABY

* Update LoadoutManager.js

* EEE

* LAUNCH TEST FIRE

* Update job.dm

* Update new_player.dm

* 50gb DAY ONE PATCH

* EEE

* Update preferences.dm

* buggle fixes

* Update examine.dm

* >LOOC starts on

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-09-23 00:40:37 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
13be1166fa [MIRROR] Fixes a bunch of hotkey preferences bugs (#6149)
* Fixes a bunch of hotkey preferences bugs (#59492)

This fixes the problem of the keybind conflict message being shown over and over again until you manually save your preferences with correct keybinds + resetting to classic keys works now
You had to manually save your prefs because the code didn't save the new unbound keys to the prefs file
Classic mode was broken because the emote hotkeys didn't have classic_keys set to Unbound by default

New hotkeys are now actually set to Unbound if no default key is set
This was broken for emote hotkeys because classic_keys = list("Unbound") was missing for them
It was also broken because the code assumed conflicting keys if some Unbound key already existed ...
The code also used classic key defaults even if you had hotkey mode enabled thats fixed now too

* Fixes a bunch of hotkey preferences bugs

* Mirror!

Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-06 11:47:28 +12:00
SkyratBot
a8434238c5 [MIRROR] Adds keybinds for moving up/down z-levels (#4893)
* Adds keybinds for moving up/down z-levels (#58345)

* movin' on up

* removes unnecessary lines

* Adds keybinds for moving up/down z-levels

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-04-13 16:00:21 +01:00
SkyratBot
128f504bc6 [MIRROR] Adds a hotkey that puts you in throw mode aslong as you hold it (#4001)
* Adds a hotkey that puts you in throw mode aslong as you hold it (#57331)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds a hotkey that puts you in throw mode aslong as you hold it

* a

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-08 19:06:03 +00:00
SkyratBot
175d5e0301 [MIRROR] Removed antiquated intent cycle hotkey for borgs (#3205)
* Removed antiquated intent cycle hotkey for borgs (#56740)

The intent_cycle hotkey for borgs was left behind during the combat mode switch. It does nothing on its own, but existing as a default hotkey blocks the actual combat mode hotkey unless unbound manually.

Closes #56668
Related to #56601

* Removed antiquated intent cycle hotkey for borgs

Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com>
2021-02-08 23:47:24 +00:00
SkyratBot
c944469749 [MIRROR] Adds discrete keybindings for Enabling/Disabling Combat Mode (#3124)
* Adds discrete keybindings for Enabling/Disabling Combat Mode (#56648)

* Adds discrete keybindings for Enabling/Disabling Combat Mode

Co-authored-by: thebleh <43266738+rdragan@users.noreply.github.com>
2021-02-05 22:07:24 +00:00
SkyratBot
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01:00
SkyratBot
ecc11e392c [MIRROR] Adds binds for targeting the eyes and mouth (#2130)
* Adds binds for targeting the eyes and mouth (#55299)

* Adds binds for targeting the eyes and mouth

Co-authored-by: Coffee <CoffeeDragon16@gmail.com>
2020-12-11 06:07:56 +01:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
38bab4eecd [MIRROR] Kills the quickswap shortcut (#1923)
* Kills the quickswap shortcut (#55209)

* Kills the quickswap shortcut

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-11-29 16:07:15 +00:00
Azarak
1ae9add3bf [SEMI-MODULAR] Combat Indicator (#1678)
* aaa

* a
2020-11-12 06:12:25 +00:00
SkyratBot
970a2b03d6 [MIRROR] Mobility refactor: no more update_mobility() (#1233)
* Mobility refactor: no more update_mobility()

* Update robot.dm

Fixes robots.

* megadumb

* Update robot.dm

* weh

* Update gunpoint_datum.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-10 02:31:35 +02:00
Azarak
5efe748920 LOOC, Whisper hotkeys. LOOC stylings (#1134)
* hotkeyz

* Update chat-light.scss

* Update chat-dark.scss
2020-10-04 01:00:56 +01:00
SkyratBot
1713561d4b [MIRROR] Rebindable communication(OOC, Say, Me) (#1055)
* Rebindable communication(OOC, Say, Me) (#54035)

 OOC, Say and Me is now rebindable

* Rebindable communication(OOC, Say, Me)

* Update preferences.dm

* wowee

* aaa

Co-authored-by: Couls <coul422@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-30 00:50:37 +02:00
Azarak
7818dac725 [SEMI-MODULAR] PIXEL-SHIFTING module (#870)
* sif

* Update pixel_shift.dm

* Refactor

* Update code/modules/mob/mob_movement.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* oops

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update mob_movement.dm

* fuckywucky

* omg

* aaaaaaaaaa

* Update mob_movement.dm

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update modular_skyrat/modules/pixel_shift/code/pixel_shift.dm

Co-authored-by: Azarak <azarak10@gmail.com>

* Update pixel_shift.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-09-27 23:37:37 +02:00
SkyratBot
79e0e3c972 [MIRROR] remove obsolete face-dir keybinds (#984)
* remove obsolete face-dir keybinds (#53925)

* remove obsolete face-dir keybinds

Co-authored-by: Couls <coul422@gmail.com>
2020-09-25 16:31:15 +02:00
SkyratBot
c492889d80 [MIRROR] Makes locking movement a hotkey (#882)
* Makes locking movement a hotkey (#53771)

* kinda done

* Update code/datums/keybinding/mob.dm

Co-authored-by: Rohesie <rohesie@ gmail.com>

* Update code/datums/keybinding/mob.dm

Co-authored-by: Rohesie <rohesie@ gmail.com>

* Update code/datums/keybinding/mob.dm

Co-authored-by: Rohesie <rohesie@ gmail.com>

* Update code/datums/keybinding/mob.dm

Co-authored-by: Rohesie <rohesie@ gmail.com>

Co-authored-by: Rohesie <rohesie@ gmail.com>

* Makes locking movement a hotkey

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>
2020-09-20 00:36:26 +01:00
SkyratBot
c728a702c6 [MIRROR] Adds a keybind for resting (#848)
* Adds a keybind for resting (#53709)

Adds a keybind for resting, it's odd that there's bind for all the UI buttons such as Resist, Throw, Drop but there isn't one for resting. The default key is now U

* Adds a keybind for resting

Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-17 15:04:34 +02:00
Couls
dc5840dc4e keybind signal support, ported from TGMC (#52219)
* keybind signal support, ported from TGMC

* Thank you linter

* remove unused and extra defines

* move signal defines up and fix emote keybind runtimes

* Apply suggestions

* Update keybinding.dm

* Missed this one in the upstream merge

* Ignore keybindings without names

* back to the OG

* Update living.dm

* Update living.dm

* got it

* trailing newline

* Update code/datums/keybinding/living.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-22 16:53:27 -04:00
Dennok
e54ac594de look_up tweak and look_down verb (#52139)
* look_down

look_down 
persistent  look_up and look_down

* look_down

look_down 
persistent  look_up and look_down

* Now look prefer a hole in front of the astronauts

* up

* up

* up

* up

* Update living.dm

* Update living.dm
2020-07-20 16:12:19 -03:00
ATH1909
5cce5f87bd Finally adds a quickdraw hotkey for the suit storage slot (#52040) 2020-07-14 20:18:18 -04:00
Couls
c3c81454f5 Give a little (#50710)
Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-05-08 19:41:25 -07:00
Koshenko
a3ac1687a1 Add look up verb for multi-z (#50782)
* Add look up verb

* Made requested changes

* Added a toggle

* Removed redundant arg from signal

* Update code/modules/mob/living/living.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/living.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Adds keybinding description

* Removed unused signal

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-05-03 00:52:50 -03:00
Akrilla
8b69eba77c Equipment Swapping (#50294)
About The Pull Request

Adds a new hotkey, defaulted to V, which allows for swapping out equipment after a small delay. After the delay, you'll equip the currently held item into it's most preferred slot, and swapping out what was worn/equipped currently. This also allows for swapping out jumpsuits without dropping your pocket contents, belt, etc.
Why It's Good For The Game

QoL change that feels intuitive, and helps equipping feel more fluid.
Changelog

🆑
add: Equipment swapping, defaulted to V. Allows you to equip items while swapping out what you're already wearing after a small delay.
/🆑
2020-04-17 20:33:05 +12:00
skoglol
eb075ffc59 Sets more sane default keybinds 2020-02-16 14:29:37 +01:00
AnturK
33e3622f27 Add basic sanity to keybindings (#49116)
Not a fan adding another wrapper here but alternative is copypasta 
everyone will forget.
2020-02-02 19:51:39 -08:00
81Denton
0a42c12368 Add deadmin/readmin keybindings (#48370)
They're unbound by default, so admins will have to assign keys to them.
2019-12-24 11:29:17 -08:00
Emmett Gaines
53952e7622 Keybindable emotes followup (#47868)
Keybindable emotes followup
2019-11-19 16:54:30 -08:00
ninjanomnom
00cbd41b1c Makes every emote keybindable 2019-11-13 16:18:36 -05:00
Couls
26a61a489c ports TGMCs click hack for non-hotkey players ports classic keybinds from TGMC (#47670)
About The Pull Request

Ports tgstation/TerraGov-Marine-Corps#2977, overrides click proc to return focus back to chat bar using winsets also ports tgstation/TerraGov-Marine-Corps#1904 which has two sets of defaults for hotkey and classic mode
fixes #47672 fixes #47659

much credit to @Rohesie and the TGMC team for a bunch of these improvements
Why It's Good For The Game

lets the non-hotkey players walk and talk again
Changelog

cl
add: Custom keybinds will now check what style (classic / hotkey) you prefer when resetting if you use classic mode make sure to reset your keybinds to default!
add: multiple keybind support
tweak: non-hotkey mode keeps focus on chat
fix: pressing 4 as cyborg now properly cycles
fix: AI location hotkeys now work again
/cl
2019-11-14 09:22:33 +13:00
Couls
971ef6a416 Custom movement hotkeys and restore macros for T, O and M (#47626)
* Custom movement hotkeys and restore macros for T, O and M

* stray comma

* update movement keys on SSinput initialize

* use cardinals
2019-11-07 18:07:17 -05:00
Couls
65ce56587c fixes modifier hotkeys and adds alternative move intent toggle (#47569)
* fixes modifier hotkeys and adds alternative move intent toggle

* Fixes pulling keybind

* make the wrappers look more like the old popup windows

* it was the freaking save file

* bump up save file version

* reset keybindings to default
2019-11-06 04:20:30 -08:00
Couls
070bb5e69c Port Custom hotkeys from TGMC (#47003)
* custom keybindings

* Update _lists.dm

* Update robot.dm

* modify weights and clean up some vars

* Update say.dm

* Apply suggestions from code review

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* some review changes

* formatting

* include focus hack, remove me_wrapper, give default keybinds to new characters, misc fixes

* revert hack and more reviews

* remove another focus hack

this was causing issues with the keydown proc returning early
2019-11-03 01:35:30 -07:00