Putnam
|
0b2b34e867
|
Fixes multi-z proper
|
2020-05-12 19:13:39 -07:00 |
|
Putnam
|
e243752369
|
Removed tossing from pressure diff (for now)
|
2020-05-12 16:10:20 -07:00 |
|
Putnam
|
8458f97692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 13:34:31 -07:00 |
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
Putnam
|
17826fe98b
|
monstermos wow
|
2020-05-11 22:00:04 -07:00 |
|
Putnam
|
c859cfee6b
|
Bad merge, ouchies
|
2020-05-11 17:36:26 -07:00 |
|
Putnam
|
478400979d
|
Added a fallback, just in case (may not work?)
|
2020-05-11 17:13:47 -07:00 |
|
Putnam
|
f4f80594bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-11 17:10:55 -07:00 |
|
Putnam
|
121d594faa
|
Fixes
|
2020-05-11 17:09:35 -07:00 |
|
Putnam
|
e8d7da56f4
|
Ported C++mos from yogs (help me)
|
2020-05-11 15:44:26 -07:00 |
|
Putnam
|
7004001e4b
|
Brings back the gas archive
|
2020-05-09 11:23:38 -07:00 |
|
Ghommie
|
60bdbfaf61
|
Merge conflicts, procs instead of macros, mood signals.
|
2020-05-08 02:12:41 +02:00 |
|
Ghom
|
a273fc0fed
|
Merge branch 'master' into Ghommie-cit721
|
2020-05-07 18:18:54 +02:00 |
|
Ghommie
|
f770586407
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723
|
2020-05-05 05:09:29 +02:00 |
|
Ghommie
|
643ef48f0e
|
Macros, generic skill implementations.
|
2020-05-05 04:42:34 +02:00 |
|
Ghommie
|
76e1ee80b7
|
Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them"
|
2020-05-03 07:12:41 +02:00 |
|
kevinz000
|
c1436c4c7b
|
Maptick lag minimization port (#12066)
* extools.dll
* backend
* queued pipenet builds
* oh yeah we don't have that
* wow
* Update air.dm
|
2020-05-03 03:34:33 +02:00 |
|
Ghommie
|
a194d7dafe
|
merge conflict and job/dept discounts support.
|
2020-05-03 02:11:05 +02:00 |
|
kevinz000
|
3cb4ef24ba
|
Merge pull request #12081 from Ghommie/Ghommie-cit716
Fixing some runtimes with kevinz skills and holodeck hotspots.
|
2020-05-02 15:55:10 -07:00 |
|
Ghommie
|
f62aaddb1d
|
Fixing some runtimes with kevinz skills and holodeck hotspots.
|
2020-05-01 23:22:23 +02:00 |
|
kevinz000
|
f99d904dc7
|
ports /tg/station vis_flags related fixes (#12064)
* fixes
* Update layers_planes.dm
* kay
|
2020-05-01 21:14:04 +02:00 |
|
Psody-Mordheim
|
030201e5de
|
Two lines (#12071)
|
2020-05-01 18:42:01 +02:00 |
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
Ghom
|
d693d3ef26
|
Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4
datum pipeline null gasmix stack trace now gives a REF()
|
2020-04-12 05:46:07 +02:00 |
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
kevinz000
|
9d931c0a3a
|
Update datum_pipeline.dm
|
2020-04-10 04:32:16 -07:00 |
|
Putnam
|
31f4269515
|
Makes miasma generate correctly, reverts previous pluox change.
|
2020-04-05 03:23:58 -07:00 |
|
Putnam
|
1bf37dfb1b
|
Doubles pluoxium specific heat
|
2020-04-04 22:04:37 -07:00 |
|
actioninja
|
abde27c098
|
layer changes
|
2020-03-28 23:50:08 -07:00 |
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
kevinz000
|
9420424c8f
|
Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-06 00:14:13 -07:00 |
|
Ghommie
|
bb7bfc04cc
|
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-05 01:47:04 +01:00 |
|
kevinz000
|
045d5b2dbf
|
fixes
|
2020-02-27 20:06:52 -07:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
Ghommie
|
698f0b8177
|
Something about pAIs and silicon access priviledges.
|
2020-02-18 16:20:44 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
kevinz000
|
ecbb7767c3
|
Update cryo.dm
|
2020-02-11 23:07:47 -07:00 |
|
Seris02
|
4ec99a38e2
|
merge fixes
|
2020-02-07 15:28:05 +08:00 |
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
Putnam
|
d2f1069764
|
Ported atmos reaction priority fix
|
2020-02-04 14:32:39 -08:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
Artur
|
db36a90e35
|
Fixes.
|
2020-01-30 19:23:38 +01:00 |
|