236 Commits

Author SHA1 Message Date
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Hatterhat 35b8108edb brain freeze head cheese 2022-10-10 21:44:25 -05:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
LetterN 1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Timothy Teakettle ccebece42e icecream 2021-09-08 18:18:27 +01:00
silicons 59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Artur 3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Putnam3145 f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
Letter N de6f1401bb final fix 2021-03-08 13:24:28 +08:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
silicons 61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
MrJWhit d9f2cccd84 Hehoo maybe I should actually see what happens when I compile 2021-01-22 13:33:18 -05:00
MrJWhit 5fe6772c58 Update microwave.dm 2021-01-22 13:23:10 -05:00
timothyteakettle fcd8d35c76 thank 2020-12-27 02:23:57 +00:00
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
Letter N 9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons 4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
timothyteakettle e2b68797b7 bugfixes 2020-07-20 00:49:00 +01:00
timothyteakettle 8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
silicons 99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
shellspeed1 b490f02c78 Ports IV bags from TG
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle 5df4931266 fix food cart (#12523) 2020-06-14 22:50:16 -07:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Putnam3145 bb2942d0b8 Fixes a gibber runtime. (#12103) 2020-05-04 05:05:13 +02:00
Artur 80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
TrilbySpaceClone c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Timothy Teakettle c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00