Commit Graph

1128 Commits

Author SHA1 Message Date
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
DeltaFire
483790889c Merge pull request #14312 from Citadel-Station-13/silicons-patch-20
makes codebase compile on 514 (wow one line)
2021-03-06 03:41:59 +01:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Letter N
ea4cb2c14d stop spamming text pls 2021-03-04 10:26:41 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
silicons
63ce4ffed6 Update _lists.dm 2021-02-24 17:45:49 -07:00
SmArtKar
e925aea454 Fixes 2021-02-23 12:44:11 +03:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Lin
cef0226b0b Merge pull request #14244 from silicons/botany_logging
streamlining botany logging, adds english_list_assoc
2021-02-15 14:22:36 -06:00
silicons
d28411b4a3 Update _lists.dm 2021-02-13 20:31:34 -07:00
silicons
6941f2a183 woops 2021-02-13 20:01:48 -07:00
silicons
4a0adc49f6 mod 2021-02-13 20:00:28 -07:00
silicons
77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
timothyteakettle
a9170aae93 Update priority_announce.dm 2021-02-06 17:42:37 +00:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
MrJWhit
c642f77c81 Weeeeeeee 2021-01-22 19:49:04 -05:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
ecd3e6188d Update unsorted.dm 2021-01-14 19:30:13 -07:00
silicons
faf210ead0 Update unsorted.dm 2021-01-14 18:36:00 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris
Merry Christmas - GIVING JANITORS A JOB
2021-01-08 00:26:52 -08:00
Letter N
cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
Letter N
56789c5924 firsthit-lib_machines 2020-12-31 16:46:40 +08:00
silicons
e91b3b7a81 Merge pull request #13916 from timothyteakettle/better-holoforms
reverts the removal of the holoform verb because kevin likes it
2020-12-30 14:45:23 -07:00
Timothy Teakettle
5bc7c5a448 revert 2020-12-30 02:21:30 +00:00
Letter N
f28363ae56 code quality 2020-12-29 11:12:56 +08:00
silicons
0c87c3b0e0 fiX 2020-12-28 12:15:55 -08:00
Letter N
792c9ad752 actualy important because of glidesize 2020-12-23 14:16:29 +08:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
silicons
0fae2d4cc9 Update shell.dm 2020-12-17 19:39:55 -07:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
Timothy Teakettle
866220aefb better cooldown 2020-12-13 02:33:57 +00:00
Timothy Teakettle
85b6248f48 remove the second check 2020-12-13 02:32:09 +00:00
timothyteakettle
76b291c0b5 action 2020-12-13 01:16:25 +00:00
Timothy Teakettle
7dfb097bcc close enough 2020-12-12 23:48:21 +00:00
timothyteakettle
3a017d1173 it works 2020-12-12 01:49:50 +00:00
Timothy Teakettle
99f50addc7 wip 2020-12-11 20:35:37 +00:00
silicons
3f4702a99c done 2020-12-11 05:52:09 -07:00