cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-30 16:56:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,558 Commits 8 Branches 0 Tags
bluespace-locker
Commit Graph
611 Commits
Author SHA1 Message Date
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
Putnam 9dcfceb8e9 Made IC issue wording less assuming-salt 2020-08-08 01:32:18 -07:00
Enric Gabriel 8558cc8747 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-04 01:48:59 -03:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Enric Gabriel 935901593b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 09:52:32 -03:00
LinandGitHub 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
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03:00
Timothy TeakettleandGitHub 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
siliconsandGitHub a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component 
the fried component
 2020-07-20 16:59:36 -07:00
LinandGitHub 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 TeakettleandGitHub 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
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
siliconsandGitHub 484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
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 GabrielandGitHub 1f4cad192c ic quick spawn revamped (#19) 2020-07-04 14:15:04 -03:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03: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
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