 LetterJay
|
490885a36f
|
update
|
2017-10-01 13:02:52 -05:00 |
|
|
LetterJay
|
c2ee5f7e23
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-10-01 12:22:41 -05:00 |
|
|
LetterJay
|
58ff06a44b
|
Merge pull request #3005 from Citadel-Station-13/upstream-merge-31000
[MIRROR] Server tools API v3.1
|
2017-10-01 04:30:34 -04:00 |
|
|
LetterJay
|
926db45b54
|
Update world.dm
|
2017-10-01 03:06:11 -05:00 |
|
|
LetterJay
|
80a84db919
|
Update adminhelp.dm
|
2017-10-01 02:39:24 -05:00 |
|
|
LetterJay
|
ef10ac589a
|
Update getrev.dm
|
2017-10-01 02:39:07 -05:00 |
|
|
LetterJay
|
346ec9a0bf
|
Update README.md
|
2017-10-01 02:38:14 -05:00 |
|
|
LetterJay
|
0ab234ceb0
|
Merge branch 'master' into upstream-merge-31000
|
2017-10-01 03:31:49 -04:00 |
|
|
LetterJay
|
22b148f078
|
Merge pull request #3014 from Citadel-Station-13/upstream-merge-31140
[MIRROR] Fixes AI law weights infinite loop
|
2017-10-01 03:26:42 -04:00 |
|
|
LetterJay
|
659a8d4053
|
Merge pull request #3002 from Citadel-Station-13/upstream-merge-31037
[MIRROR] Movement delay fixes and optimization
|
2017-10-01 03:26:26 -04:00 |
|
|
LetterJay
|
92c3a48507
|
Merge branch 'master' into upstream-merge-31140
|
2017-10-01 02:53:18 -04:00 |
|
|
LetterJay
|
6a8ca2e02c
|
Merge branch 'master' into upstream-merge-31037
|
2017-10-01 02:53:03 -04:00 |
|
|
CitadelStationBot
|
7980a72092
|
Automatic changelog generation for PR #2985 [ci skip]
|
2017-10-01 01:51:57 -05:00 |
|
|
LetterJay
|
b15f639621
|
Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
|
2017-10-01 02:51:56 -04:00 |
|
|
CitadelStationBot
|
121b7af232
|
Automatic changelog generation for PR #2972 [ci skip]
|
2017-10-01 01:50:34 -05:00 |
|
|
LetterJay
|
ef96be641a
|
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
[MIRROR] Adds Nars-Ian and clock hawks
|
2017-10-01 02:50:31 -04:00 |
|
|
LetterJay
|
81e40cc5c8
|
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
[MIRROR] Configuration datum refactor
|
2017-10-01 02:50:17 -04:00 |
|
|
LetterJay
|
8be007225b
|
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
[MIRROR] Fixes shade attackby
|
2017-10-01 02:20:35 -04:00 |
|
|
LetterJay
|
1d1a862e1b
|
Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045
[MIRROR] Reebe is fancier now
|
2017-10-01 02:20:23 -04:00 |
|
|
LetterJay
|
747312cb6d
|
updates
|
2017-10-01 00:59:59 -05:00 |
|
|
LetterJay
|
0cc54029e2
|
Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096
[MIRROR] Cleans up some unused code
|
2017-10-01 01:19:36 -04:00 |
|
|
LetterJay
|
33b481dffb
|
Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073
[MIRROR] Log attempted injections as well as successful ones
|
2017-10-01 01:19:20 -04:00 |
|
|
LetterJay
|
f55c86edfb
|
Merge branch 'master' into upstream-merge-31045
|
2017-10-01 01:17:52 -04:00 |
|
|
LetterJay
|
45c79ffbbe
|
Merge pull request #3016 from Citadel-Station-13/upstream-merge-31093
[MIRROR] Stops putting RCD, bluespace bags, and staves into ORM
|
2017-10-01 01:11:06 -04:00 |
|
|
LetterJay
|
11b558c367
|
Merge branch 'master' into upstream-merge-31093
|
2017-10-01 00:50:26 -04:00 |
|
|
LetterJay
|
7cf1c052f9
|
Merge branch 'upstream-merge-30763' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-09-30 23:26:58 -05:00 |
|
|
LetterJay
|
d6ec5791a6
|
Update dna.dm
|
2017-09-30 22:35:57 -05:00 |
|
|
CitadelStationBot
|
aaa2a214cb
|
[MIRROR] Fixes material container flags precedence (#3029)
* Fixes material container flags precedence
* Update material_container.dm
|
2017-09-30 12:39:57 -07:00 |
|
|
LetterJay
|
04d071deda
|
Merge branch 'master' into upstream-merge-30763
|
2017-09-30 15:30:46 -04:00 |
|
|
LetterJay
|
dddf85a7df
|
Update bags.dm
|
2017-09-30 14:23:03 -05:00 |
|
|
LetterJay
|
fdb101596d
|
Update bodybag.dm
|
2017-09-30 14:22:39 -05:00 |
|
|
LetterJay
|
6c4934a34a
|
Update ai_laws.dm
|
2017-09-30 14:22:12 -05:00 |
|
|
LetterJay
|
6ec50aeae2
|
Update observer.dm
|
2017-09-30 14:20:50 -05:00 |
|
|
LetterJay
|
9f01bf378d
|
Update hypospray.dm
|
2017-09-30 14:20:25 -05:00 |
|
|
LetterJay
|
4fd4d77eb1
|
Update shade.dm
|
2017-09-30 14:20:01 -05:00 |
|
|
LetterJay
|
6d59f3b06f
|
Update misc_walls.dm
|
2017-09-30 14:19:40 -05:00 |
|
|
LetterJay
|
b88081e106
|
Update misc_floor.dm
|
2017-09-30 14:19:27 -05:00 |
|
|
LetterJay
|
a6a4deb94c
|
Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084
[MIRROR] Fixes transitions
|
2017-09-30 15:18:26 -04:00 |
|
|
LetterJay
|
d4cdba3297
|
Update parrot.dm
|
2017-09-30 14:18:02 -05:00 |
|
|
LetterJay
|
825f05b3f9
|
Merge pull request #2962 from Citadel-Station-13/upstream-merge-31032
[MIRROR] Fixes doomsday not working with multiz stations
|
2017-09-30 15:17:14 -04:00 |
|
|
LetterJay
|
d3c952d974
|
Merge pull request #2954 from Citadel-Station-13/upstream-merge-31044
[MIRROR] Clockwork cult rework: Post-merge micro-patch
|
2017-09-30 15:16:55 -04:00 |
|
|
LetterJay
|
063a44281e
|
Merge branch 'master' into upstream-merge-31044
|
2017-09-30 14:53:08 -04:00 |
|
|
CitadelStationBot
|
38c7e2e958
|
Automatic changelog generation for PR #2950 [ci skip]
|
2017-09-30 13:52:10 -05:00 |
|
|
LetterJay
|
910f74dd5f
|
Merge pull request #2950 from Citadel-Station-13/upstream-merge-29741
[MIRROR] (Ready) Clockwork Cult Rework: Proof-of-concept
|
2017-09-30 14:52:07 -04:00 |
|
|
LetterJay
|
b810f30e10
|
Update clockwork_slab.dm
|
2017-09-30 12:48:49 -05:00 |
|
|
LetterJay
|
47a65d829d
|
Merge branch 'master' into upstream-merge-29741
|
2017-09-30 13:35:47 -04:00 |
|
|
LetterJay
|
2bbc880bf1
|
Merge pull request #3009 from Citadel-Station-13/upstream-merge-31092
[MIRROR] Fixes subsystems not returning a qdel hint
|
2017-09-30 12:58:30 -04:00 |
|
|
CitadelStationBot
|
1a6cce145f
|
Automatic changelog generation for PR #2996 [ci skip]
|
2017-09-30 11:57:54 -05:00 |
|
|
LetterJay
|
f1858a3a63
|
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
[MIRROR] Alt-clicking descriptions when examining
|
2017-09-30 12:57:52 -04:00 |
|
|
LetterJay
|
10b530920b
|
Merge pull request #3015 from Citadel-Station-13/upstream-merge-31111
[MIRROR] Fixes SM shard extraction
|
2017-09-30 12:57:33 -04:00 |
|