silicons
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
silicons
d9b70b1f1c
woo
2021-07-18 15:04:30 -07:00
silicons
0df58c878e
more
2021-07-18 14:01:43 -07:00
Lin
d50eb91632
Merge pull request #14921 from Putnam3145/componentize-acid
...
Componentizes acid
2021-07-13 11:52:43 -07:00
Putnam3145
899e74fc83
Componentized acid
2021-07-03 22:10:44 -07:00
Putnam3145
770bb9a4f1
Makes plumbing no longer SS_TICKER
2021-07-03 02:36:49 -07:00
Putnam3145
f3b590f5f0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps
2021-06-30 02:19:02 -07:00
silicons
55608737fa
more..
2021-06-28 14:51:55 -07:00
silicons
711e250e26
AAAA
2021-06-28 14:18:56 -07:00
silicons
805b931fb8
config reorganize start
2021-06-28 13:35:52 -07:00
Lin
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
Putnam3145
6d4d70298d
Wow It's Been At Double Speed
2021-06-25 07:30:27 -07:00
Putnam3145
fbbae70527
i need to go to bed and this is a LOT
2021-06-21 10:14:50 -07:00
Putnam3145
e6345dd32a
Hopefully fixes whatever requires SHOULD_NOT_SLEEP to be commented out
2021-06-21 07:55:44 -07:00
Putnam3145
f77495f45d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-21 02:19:51 -07:00
Putnam
a9db30d6d9
optimization, fix to breath, experimenting with speed
2021-06-13 07:31:01 -07:00
silicons
816b09bf32
Merge remote-tracking branch 'citadel/master' into backend_sync
2021-06-10 22:36:26 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
Putnam
7952a1cf88
this actually does not need named this way
2021-06-07 05:31:41 -07:00
Putnam
d03bf641dd
extreme optimization project to maybe fix game
2021-06-06 21:58:24 -07:00
Putnam
1c17570ea8
works but leaks
2021-05-30 00:28:51 -07:00
Putnam
9e55d9e2d9
quick hack to fix corruption
2021-05-26 09:25:14 -07:00
Putnam
61d0e3fed6
A minor thread optimization.
2021-05-26 06:13:50 -07:00
Putnam
e580c504fa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-05-21 18:52:16 -07:00
Putnam
62279e449e
Well, that works
2021-05-21 18:51:13 -07:00
zeroisthebiggay
5e01bb9c22
Update ticker.dm
2021-05-15 08:35:46 -04:00
zerothebigboy
e06b354613
sex!!!!!!!!!!
2021-05-15 06:58:20 -04:00
silicons
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
silicons
4289b8be1e
Merge remote-tracking branch 'citadel/master' into backend_sync
2021-04-28 22:34:17 -07:00
silicons
456b55cb06
that too
2021-04-28 22:25:39 -07:00
Putnam3145
8f14424a63
Fixes a couple runtimes in activity tracking ( #14666 )
2021-04-28 22:56:15 +02:00
silicons
47489c21d6
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
2021-04-27 00:59:45 -07:00
silicons
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
LetterN
e950bfcbe4
A gone
2021-03-31 08:58:36 +08:00
LetterN
a94e319acf
bwob allowed
2021-03-31 08:22:27 +08: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
LetterN
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
silicons
bfb122d706
Merge pull request #14475 from qweq12yt/black-market-fixes
...
Black Market: The return
2021-03-22 21:14:57 -06:00
Lin
715f86ef5c
Merge pull request #14447 from LetterN/fixes-2
...
Fixes laptop and tweaks stacks
2021-03-22 19:52:42 -05:00
LetterN
760a7de229
Merge remote-tracking branch 'origin/master' into fixes-2
2021-03-22 09:32:21 +08:00
silicons
4e22ad7484
Update job.dm
2021-03-21 02:07:03 -07:00
silicons
661ed14c83
Update job.dm
2021-03-21 02:05:43 -07:00
Putnam
f1e55f2df0
Paranoid updates to maybe fix air duplication
2021-03-20 22:02:47 -07:00
silicons
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
LetterN
292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
kappa-sama
524bb79f0e
tgui machine broke
2021-03-19 15:32:53 -03:00
GrayRachnid
5201cf6ac5
stops racism
2021-03-17 21:58:41 -04:00
LetterN
69982f6315
fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452
...
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
2021-03-17 11:49:50 +08:00
