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
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
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
4768b23398
Merge pull request #14860 from Arturlang/nanite_updates
...
Updates our nanite stuff to TG's, mostly
2021-06-18 20:01:05 -07:00
a8b7c07f00
Update open.dm
2021-06-17 07:07:49 -07:00
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
c1928c9446
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-16 19:04:16 -07:00
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
b04a580e1d
it works
2021-06-13 22:19:06 -07:00
e7f5f80fb1
yelling
2021-06-13 15:34:47 -07:00
b6bb20842f
Yelling works
2021-06-13 00:50:00 -07:00
8feb473e65
fixes
2021-06-12 04:49:23 -07:00
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
1c17570ea8
works but leaks
2021-05-30 00:28:51 -07:00
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
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
47489c21d6
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
2021-04-27 00:59:45 -07:00
a415453540
ripping off my own code
2021-04-26 23:29:37 -07:00
f1e55f2df0
Paranoid updates to maybe fix air duplication
2021-03-20 22:02:47 -07:00
a478555dbd
mapfix
2021-03-15 21:02:50 +08:00
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
cc360288bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-03-08 14:46:46 -08:00
f07a9c13fb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-03-02 01:44:58 -08:00
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
f87aa0ac5b
toast. And DiscoFox ™️
2021-02-08 18:46:05 +08:00
d8e408d1f1
Fixed some major incompetency from 2018.
...
// If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that.
LINDA_turf_tile.dm, line 16.
2021-01-24 13:26:47 -08:00
51100c9bf9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-01-20 18:38:52 -08:00
02ca168df3
why are we building windows facing nothing but rock infront of it?
2021-01-20 11:37:44 +08:00
158dd11d8d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-01-19 17:52:40 -08:00
ea07ad6e48
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-13 15:41:28 -07:00
05f7991981
snap
2021-01-09 20:37:24 +01:00
8cc0b9c69e
Various fixes and performance tweaks
2021-01-09 05:44:18 -08:00
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
186bb483b1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-01-06 23:55:24 -08:00
51143f89e5
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-29 10:37:06 +08:00
46a0c65e46
Merge branch 'master' into debris
2020-12-28 19:04:22 +01:00
5e269c327a
Update space.dm
2020-12-27 10:53:11 -07:00
a6ae0fe5c2
ok
2020-12-26 20:56:48 -08:00
bfb3d087c3
ok
2020-12-26 20:50:28 -08:00
d3414a4d23
ok
2020-12-26 20:47:50 -08:00
dafc6bf89f
fix
2020-12-26 20:41:21 -08:00
6044086de0
changes
2020-12-26 20:29:52 -08:00
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
f0b3ad7a22
mostly works!
...
occasional deadlock at last test; gonna keep checking that out.
2020-12-18 17:49:32 -08:00
2de8b8e188
lord help me
2020-12-17 22:29:11 -08:00
fbafd8391b
Tweaks and such.
2020-12-14 15:38:26 -08:00
Lin