shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,909 Commits 5 Branches 0 Tags
a668251de6263ebd415b5bf8faecbe48468d5cbb
Commit Graph

62 Commits

Author SHA1 Message Date
silicons
8f478ce66a quirky uh oh 2020-07-15 14:47:59 -07:00
silicons
d22ab62b50 Update combat.dm 2020-06-29 23:20:52 -07:00
silicons
6265cb190b Update bindings_client.dm 2020-06-29 05:04:28 -07:00
silicons
9697e1b946 Update bindings_client.dm 2020-06-29 04:42:58 -07:00
Lin
bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework 
"Unofficial" Combat Rework Part 3: Blocking/Parrying
 2020-06-12 16:39:11 -05:00
kevinz000
ee5b209932 eh 2020-06-04 23:27:50 -07:00
kevinz000
29302c51ed ok 2020-06-04 22:58:42 -07:00
kevinz000
92d1af5889 adjustments 2020-06-04 22:18:19 -07:00
kevinz000
502873cb7c Delete bindings_living.dm 2020-05-30 18:19:39 -07:00
kevinz000
4a971a223c Delete bindings_mob.dm 2020-05-30 18:19:04 -07:00
kevinz000
03ee37bb06 let's finish parrying 2020-05-28 04:55:43 -07:00
kevinz000
433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
Ghom
968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
kevinz000
88476273fd almost ready 2020-05-26 23:46:15 -07:00
kevinz000
be02287dca category + compile 2020-05-24 15:21:52 -07:00
kevinz000
79f7ba9ac5 keybindings 2020-05-24 15:10:11 -07:00
kevinz000
e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
kevinz000
e792600115 Update movement.dm (#12327) 2020-05-21 15:00:21 +02:00
kevinz000
b57e1c1e93 Rebindable Hotkeys (#12138) 
* demodularize interface

* keybindings

* binds

* prefs

* loose ends

* globals

* changes

* s

* datum ref lists

* ok

* fixes

* fixes

* fix

* ok

* sigh

* sigh

* indicators

* let's play the move code around game

* let's play the i didn't comma my lists game

* let's play the indent game

* let's play hte spelling bee

* let's fail the spelling bee

* LET'S PLAY THe HOW HARd  IS  IT TO SPELL A PROC GAME

* let's play the bugfix game

* bugfixes

* improvements

* Update bindings_client.dm

* pixel shift

* A

* wups
 2020-05-20 23:40:20 +02:00
kevinz000
62fd71c50e kay 2020-04-24 23:31:34 -07:00
kevinz000
41f359db83 fixes 2020-04-11 05:11:42 -07:00
kevinz000
234687c5c8 do_after_advanced 2020-04-11 05:10:07 -07:00
kevinz000
d4c6148a11 Merge remote-tracking branch 'citadel/master' into typing_indicators 2020-03-23 15:33:22 -07:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

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

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

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

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

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

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
monster860
86baaf3710 Pixel shifting for ERP 2020-03-06 04:31:46 -05:00
kevinz000
d1f161fe0f changes 2020-03-04 15:42:01 -07:00
kevinz000
0d312b8dff only way 2020-03-04 08:02:28 -07:00
kevinz000
c28a78de3d ok 2020-03-04 06:41:53 -07:00
kevinz000
1ae4ef16bc sigh 2020-03-04 06:03:51 -07:00
kevinz000
e243dc689b index 2020-03-04 03:12:46 -07:00
kevinz000
54a6c5a6fe Typing indicators 2020-02-27 23:58:49 -07:00
Seris02
b271096b77 rest key, v, version two (#11090) 
* maybe

* skreeeee

* yes

* fucccccccccck

* happy now

* Update interface.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-17 12:47:19 +01:00
kevinz000
bedb42f147 Merge remote-tracking branch 'citadel/master' into optimization_1 2020-01-24 03:41:40 -07:00
kevinz000
97ded4b27b ok 2020-01-14 18:09:12 -07:00
kevinz000
41bbdae220 micro optimization 2020-01-14 17:50:14 -07:00
kevinz000
eff86a449f wew 2020-01-14 16:45:22 -07:00
Artur
e3d3f7b750 Ported 2020-01-13 13:20:55 +02:00
deathride58
5c9c9d9566 Adds space to sprint and toggle sprint as preferences 2019-12-30 15:32:15 -05:00
Ghommie
1c3682cd15 Brings carbon action intent hotkeys down to living. 2019-12-17 00:03:39 +01:00
Ghommie
978b675986 FUCK 2019-11-15 20:12:54 +01:00
Ghommie
2f1a76c21e Unmodularize keybindings. 2019-11-13 23:57:49 +01:00
deathride58
4551b13547 [s] ports tgstation/tgstation#46425 2019-09-11 19:24:05 -04:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
ShizCalev
49bf67ed1d Updates BYOND links to use HTTPS (#37918) 
* Updates BYOND links to use HTTPS

* revert

* if -> If
 2018-05-20 15:31:28 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
deathride58
3bb8902846 Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413 
[MIRROR] Gives admins the D(say) hotkey + fixes buildmode permissions
 2018-04-27 09:36:44 +00:00
Dax Dupont
d0266b01cd Gives admins the D(say) hotkey + fixes buildmode permissions (#37413) 2018-04-25 21:40:05 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00