shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,182 Commits 5 Branches 0 Tags
503d0156c6215ba02e66441706ae8d2cddb67ccc
Commit Graph

615 Commits

Author SHA1 Message Date
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Letter N
47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Artur
c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Letter N
57a008d567 fixes adminbus 2020-08-26 11:22:57 +08:00
Letter N
c13a22a841 stops kevinz from leaking his IP 2020-08-24 18:42:48 +08:00
Letter N
b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08:00
Letter N
271c66ad40 travis moment 2020-08-22 17:03:10 +08:00
Letter N
0b159b218a revert moment 2020-08-22 16:30:56 +08:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Letter N
fa7b82694d src.islazy = TRUE 2020-08-19 10:04:56 +08:00
Letter N
b59d449a75 Update adminhelp.dm 2020-08-19 09:59:41 +08:00
Putnam
9dcfceb8e9 Made IC issue wording less assuming-salt 2020-08-08 01:32:18 -07:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Lin
a5dd08a054 Merge pull request #12734 from silicons/shoelaces 
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
 2020-07-28 21:51:43 -05:00
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
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -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
silicons
416b989e12 changes 2020-07-20 11:35:10 -07: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
484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07: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
silicons
98e727ec03 ok 2020-07-11 00:55:23 -07:00
silicons
3d80792e79 more 2020-07-11 00:37:56 -07: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
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
silicons
0c4e1e7696 Update SDQL_2_wrappers.dm 2020-06-27 07:17:29 -07: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