shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,878 Commits 5 Branches 0 Tags
3ca098fe98009fb476272c8db003ffc9c02eb3a8
Commit Graph

1069 Commits

Author SHA1 Message Date
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Lin
7352e21877 Merge pull request #12844 from Citadel-Station-13/silicons-patch-41 
fixes traitor jobban link
 2020-07-23 13:19:25 -05:00
silicons
6e08865b36 Update topic.dm 2020-07-20 17:30:35 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component 
the fried component
 2020-07-20 16:59:36 -07:00
Lin
f0df3689dc Merge pull request #12790 from Citadel-Station-13/silicons-patch-30 
truncates sdql2 output to 2500 objects instead of 20000 because it's a real epic gamer moment when admins crash their clients doing SELECT /datum/gas_mixture
 2020-07-20 18:20:27 -05:00
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Arturlang
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
silicons
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
Lin
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
silicons
9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +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
silicons
0c4e1e7696 Update SDQL_2_wrappers.dm 2020-06-27 07:17:29 -07:00
silicons
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
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
Letter N
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
Ghom
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
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
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
kevinz000
b6a74288b9 [s] cryogenics logging (#12264) 
* Update cryopod.dm

* Update admin_investigate.dm

* Update logging.dm

* Update cryopod.dm

* how asleep was i last night gamers

* Update cryopod.dm
 2020-05-16 05:00:26 +02:00