silicons
|
5c44cc22f4
|
attempt examinate
|
2021-06-13 00:54:15 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
keronshb
|
b33269c806
|
trailing endline
|
2021-05-19 19:16:24 -04:00 |
|
keronshb
|
a6e157ba73
|
IT WORKS!!
|
2021-05-19 19:03:21 -04:00 |
|
keronshb
|
58cb278327
|
Missing errors and icons
|
2021-05-19 15:09:56 -04:00 |
|
SandPoot
|
9cf04467a7
|
upload files
|
2021-05-05 17:55:30 -03:00 |
|
silicons
|
8fe45263c5
|
whew
|
2021-04-26 22:58:30 -07:00 |
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07:00 |
|
silicons
|
e8e625cb5c
|
Merge pull request #14603 from Putnam3145/fix-base-option
Activity tracking; traitor class tweaks
|
2021-04-18 18:49:27 -06:00 |
|
Putnam
|
4811216f07
|
Activity tracking; traitor class tweaks
|
2021-04-13 06:42:32 -07:00 |
|
silicons
|
ef2482c6b0
|
renders storage objects independently per user (#14545)
* sigh
* sigh
* override
* hah..
* kinda working
* done
|
2021-04-13 15:16:21 +02:00 |
|
silicons
|
2a7aa8e826
|
Merge pull request #14524 from SandPoot/borgs-buff
Allows borgs to move pulled stuff around like a human
|
2021-03-28 13:48:14 -06:00 |
|
SandPoot
|
0994a37af5
|
upload files
|
2021-03-26 11:05:36 -03:00 |
|
Shadow Quill
|
89fdeb65c5
|
Adds small walk hud icons
|
2021-03-23 01:38:45 -05:00 |
|
silicons
|
02b52e6142
|
framework
|
2021-03-20 16:02:26 -07:00 |
|
silicons
|
5b2a42f254
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-20 14:13:23 -07:00 |
|
DeltaFire
|
79a464ca8c
|
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
|
2021-03-16 07:39:41 +01:00 |
|
silicons
|
5d51025ad6
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-15 14:39:16 -07:00 |
|
Letter N
|
cb346a3847
|
a
|
2021-03-05 14:29:36 +08:00 |
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
silicons
|
70b8d833c0
|
changes
|
2021-02-28 00:00:14 -07:00 |
|
Letter N
|
7d39949a2f
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-19 12:38:32 +08:00 |
|
Letter N
|
501d33cddd
|
agony
|
2021-02-19 10:32:24 +08:00 |
|
Dan-Neposh
|
2ec2f55eb7
|
updates fork
|
2021-02-17 12:03:28 -05:00 |
|
Dan-Neposh
|
ace2512812
|
solves run linter errors
|
2021-02-17 10:24:37 -05:00 |
|
Letter N
|
3f40e353aa
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-16 19:41:53 +08:00 |
|
silicons
|
60030b6c68
|
final tweaks
|
2021-02-13 20:46:40 -07:00 |
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
silicons
|
cc981cff7d
|
fix
|
2021-02-13 20:38:41 -07:00 |
|
silicons
|
5217d0b306
|
fix
|
2021-02-13 20:37:09 -07:00 |
|
silicons
|
bcd4ca9e67
|
fix
|
2021-02-13 20:34:47 -07:00 |
|
silicons
|
d6a3c2d003
|
update
|
2021-02-13 20:30:44 -07:00 |
|
silicons
|
2ef33c5c88
|
sprint updates
|
2021-02-13 20:24:26 -07:00 |
|
Letter N
|
45d6a5f87f
|
it compiles, UNTESTED YET
|
2021-02-13 21:41:59 +08:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
Artur
|
91cd7378ca
|
Give Improved
|
2021-01-24 16:05:42 +02:00 |
|
silicons
|
f2853ab414
|
Merge pull request #14103 from Arturlang/give_hotkey
[READY]Give hotkey, but citadel
|
2021-01-21 01:41:29 -07:00 |
|
Letter N
|
125cd17cee
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-01-20 15:40:41 +08:00 |
|
Artur
|
745c825205
|
Give hotkey, but citadel
|
2021-01-20 04:21:57 +02:00 |
|
Dan-Neposh
|
04d5721c4d
|
Merge branch 'master' into clockcultrework_v2
|
2021-01-14 19:51:15 -05:00 |
|
Dan-Neposh
|
ab5cffc360
|
Various edits in order to get this PR out finally
|
2021-01-14 12:56:55 -05:00 |
|
silicons
|
bd3761d39e
|
proper smooth movement
|
2021-01-08 10:51:48 -08:00 |
|
Letter N
|
cd5d558fad
|
safety? what's that?
* maybe table-breaking change
|
2021-01-04 11:57:12 +08:00 |
|
Letter N
|
56fb81d02c
|
Immursive Audio 2
|
2020-12-24 11:06:49 +08:00 |
|
Letter N
|
35edf3589b
|
break it real good
|
2020-12-23 18:58:02 +08:00 |
|
Putnam3145
|
9d300ade35
|
Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
|
2020-11-18 17:50:38 -08:00 |
|
Dan-Neposh
|
05401800f3
|
splits clockwork guardians from marauders
Also fixes that typo in the guardian spell description
|
2020-11-16 16:25:15 -05:00 |
|
Artur
|
f76c3e922c
|
Comments out spacedmm should not sleeps
|
2020-11-13 15:18:00 +02:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
silicons
|
7f611a98e1
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-10-10 22:23:22 -07:00 |
|