cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-20 03:38:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
1122 Commits
Author SHA1 Message Date
siliconsandGitHub e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Enric Gabriel 310b0e4e91 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 14:53:25 -03:00
ArturlangandGitHub 92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Letter N 7eab0263ba https://github.com/tgstation/tgstation/pull/51213 2020-07-16 20:51:25 +08:00
timothyteakettle 03bd806c73 pickle 2020-07-16 02:51:07 +01:00
siliconsandGitHub 4785a753ba Update SDQL_2.dm 2020-07-15 17:12:48 -07:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
silicons 98e727ec03 ok 2020-07-11 00:55:23 -07:00
silicons 3d80792e79 more 2020-07-11 00:37:56 -07:00
Enric Gabriel 7b593d16fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 03:13:42 -03:00
LinandGitHub 49ae116bac Merge pull request #12705 from Citadel-Station-13/silicons-patch-16 
fixes sdql2 array operator not properly nesting lists
 2020-07-10 14:56:31 -05:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
siliconsandGitHub 9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07:00
Enric Gabriel 70b811dba1 the player panel that doesn't fucking kill your eyes 2020-07-04 15:18:18 -03:00
Enric GabrielandGitHub 1f4cad192c ic quick spawn revamped (#19) 2020-07-04 14:15:04 -03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Enric Gabriel f5bd261e38 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-30 22:01:51 -03:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Enric Gabriel d505bf0716 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-28 13:33:22 -03:00
siliconsandGitHub 0c4e1e7696 Update SDQL_2_wrappers.dm 2020-06-27 07:17:29 -07:00
Enric Gabriel 7d406989cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-26 22:06:16 -03:00
siliconsandGitHub 13c2c335f4 Update chat_commands.dm 2020-06-26 10:50:09 -07:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Enric Gabriel 18faedfc1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-15 17:36:27 -03:00
kevinz000 3dbfc6ddf2 better support 2020-06-12 18:50:57 -07:00
kevinz000 e2aab5c1a5 css is really hard folks 2020-06-12 18:01:53 -07:00
kevinz000 e1a1dc61f6 this is ugly and i hate it 2020-06-12 17:50:23 -07:00
kevinz000 78e153cbe4 is this better 2020-06-12 17:32:17 -07:00
kevinz000 be6ea51f19 closing 2020-06-12 17:11:29 -07:00
kevinz000 c42894ddd9 css? 2020-06-12 17:07:10 -07:00
kevinz000 52ab6e557b fix 2020-06-12 17:00:01 -07:00
kevinz000 3cf14f4fad prettier 2020-06-12 16:48:22 -07:00
kevinz000 6cf18e1d49 why did i find replace 2020-06-12 16:38:28 -07:00
kevinz000 c7eead3f28 don't blind find/replace folks 2020-06-12 16:34:54 -07:00
kevinz000 146542b077 sdql2 2020-06-12 16:33:36 -07:00
kevinz000 00666422af fix 2020-06-12 15:47:46 -07:00
Artur b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
Enric Gabriel 85bbfa1c87 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-30 22:17:42 -03:00
Letter NandGitHub af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Enric Gabriel 4d962b8fb1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-25 18:06:40 -03:00
GhomandGitHub 07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
Ghommie a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Artur 04dcd6a02c Dos2unix 2020-05-22 19:20:59 +03:00
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Enric Gabriel 2109cd8ad2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-20 22:21:28 -03:00
kevinz000andGitHub 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