Commit Graph

1160 Commits

Author SHA1 Message Date
silicons
f119081798 let's make this work 2021-06-15 12:03:34 -07:00
silicons
b04a580e1d it works 2021-06-13 22:19:06 -07:00
silicons
e7f5f80fb1 yelling 2021-06-13 15:34:47 -07:00
silicons
e84f7ae4ac fix 2021-06-13 01:16:44 -07:00
silicons
b6bb20842f Yelling works 2021-06-13 00:50:00 -07:00
silicons
2f9492945d sigh 2021-06-07 19:45:58 -07:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons
b3382a8fe2 local testing time 2021-06-07 16:49:27 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
Timothy Teakettle
c51fa954cf Update mobs.dm 2021-05-10 14:51:18 +01:00
Timothy Teakettle
be9b1ddffb fixes 2021-05-10 14:43:45 +01:00
LetterN
1bee003d49 fixes roundend runtime 2021-05-09 22:48:50 +08:00
Timothy Teakettle
3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
silicons
4f73557168 Merge pull request #14647 from SandPoot/limb-grower-tgui
Ports TGUI limb grower from tg
2021-04-28 21:20:01 -06:00
silicons
d547aa7ff1 almost compiling 2021-04-26 23:37:26 -07:00
silicons
1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons
a415453540 ripping off my own code 2021-04-26 23:29:37 -07:00
silicons
eb2c12ceee yell wip 2021-04-26 23:10:10 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
SandPoot
c2b7140ddd upload icons.dm 2021-04-24 21:43:12 -03:00
SandPoot
90661d3687 upload files 2021-04-24 21:37:01 -03:00
SandPoot
e6c23728eb upload files 2021-04-23 12:56:11 -03:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03: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
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Putnam
899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
silicons
5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -07:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
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
0f16178425 changes 2021-02-28 02:43:32 -07:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -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