 MrJWhit
|
60446316bb
|
Update _flags.dm
|
2020-08-14 21:14:21 -04:00 |
|
|
silicons
|
67b518bf42
|
experimental
|
2020-07-27 13:09:54 -07:00 |
|
|
silicons
|
49070d732b
|
ohhhhhhh boy
|
2020-07-26 15:10:08 -07:00 |
|
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
|
DeltaFire
|
db823ac16c
|
fixes the organ bitfields
|
2020-07-25 19:13:08 +02:00 |
|
|
silicons
|
33d5ba788b
|
aight
|
2020-07-24 20:19:18 -07:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
703afec454
|
ok
|
2020-07-23 08:57:15 -07:00 |
|
|
silicons
|
924309aab8
|
changeS
|
2020-07-20 11:11:12 -07:00 |
|
|
silicons
|
984796b8c6
|
sigh
|
2020-07-20 10:46:52 -07:00 |
|
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
|
silicons
|
bd8cc4791f
|
whew
|
2020-07-07 21:02:23 -07:00 |
|
|
silicons
|
a738d52740
|
oh god oh FUCK
|
2020-07-03 00:11:09 -07:00 |
|
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
|
Timothy Teakettle
|
eba1e8f301
|
fixes the merge conflicts
|
2020-06-15 23:29:49 +01:00 |
|
|
kevinz000
|
8162303bad
|
Merge remote-tracking branch 'citadel/master' into pp_fix
|
2020-06-13 12:03:01 -07:00 |
|
|
kevinz000
|
1a9787a9c2
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-06-02 21:49:43 -07:00 |
|
|
kevinz000
|
05fe0c7dcc
|
ok
|
2020-05-30 00:59:29 -07:00 |
|
|
kevinz000
|
433bd1af79
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-27 18:11:15 -07:00 |
|
|
kevinz000
|
e4eb49050c
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-24 15:03:06 -07:00 |
|
|
kevinz000
|
05068f80db
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-07 10:57:10 -07:00 |
|
|
kevinz000
|
532aba9157
|
fixes
|
2020-05-07 08:36:15 -07:00 |
|
|
kevinz000
|
f034c7c536
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-05 17:38:43 -07:00 |
|
|
kevinz000
|
555702c1d7
|
flag define precedence
|
2020-03-26 12:28:05 -07:00 |
|