52257ff371
Merge pull request #33710 from ShizCalev/crashedship
...
Corrects crashedship diags
2017-12-21 14:25:11 -06:00
72d33b8c6b
Merge pull request #4450 from Citadel-Station-13/upstream-merge-33625
...
[MIRROR] Fixes config entries in the changelog having no icon
2017-12-21 20:20:18 +00:00
e9d8888407
Automatic changelog generation for PR #4433 [ci skip]
2017-12-21 14:19:55 -06:00
2350486542
Merge pull request #4433 from Citadel-Station-13/upstream-merge-33614
...
[MIRROR] Decal rotation fix
2017-12-21 20:19:52 +00:00
53e7d47893
Merge pull request #4407 from Citadel-Station-13/upstream-merge-33581
...
[MIRROR] add view range respects widescreen
2017-12-21 20:19:04 +00:00
2eaae2eb14
Automatic changelog generation for PR #4487 [ci skip]
2017-12-21 13:56:22 -06:00
f4bd8d270e
Merge pull request #4487 from ganglyalexander/patch-1
...
dog borgs module icon fix
2017-12-21 19:56:20 +00:00
529e839203
dog borgs module icon fix
2017-12-21 13:46:44 -06:00
1ce5a0ae98
Merge pull request #4486 from Citadel-Station-13/RnD
...
Techwebs update 1: Departmental lathes/imprinters can now link to research consoles
2017-12-21 13:05:39 -06:00
087c43ab71
Update rdmachines.dm
2017-12-21 12:44:59 -06:00
2d995e3f5a
Update rdconsole.dm
2017-12-21 12:44:16 -06:00
8e6c8fc8b5
Update departmental_lathe.dm
2017-12-21 12:43:21 -06:00
6573aa52e4
Update departmental_circuit_imprinter.dm
2017-12-21 12:42:18 -06:00
1b470bdacf
Merge pull request #4392 from Citadel-Station-13/upstream-merge-33562
...
[MIRROR] Fixes LoadEntries return value
2017-12-21 11:32:12 -06:00
06c309fb0c
Merge branch 'master' into upstream-merge-33562
2017-12-21 11:30:58 -06:00
9d232ff4a3
Merge pull request #4485 from Citadel-Station-13/revert-4404-upstream-merge-33582
...
Revert "[MIRROR] Db schema version check by simplification"
2017-12-21 09:52:50 -06:00
abced738bd
Revert "[MIRROR] Db schema version check by simplification"
2017-12-21 09:52:42 -06:00
ff4c5907a6
[MIRROR] Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round. ( #4484 )
...
* Merge pull request #33730 from kevinz000/patch-409
Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.
* Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.
2017-12-21 06:04:20 -08:00
8750d93126
Merge branch 'master' into upstream-merge-33614
2017-12-21 05:02:21 -06:00
f29a3f89d0
Merge pull request #4421 from Citadel-Station-13/upstream-merge-33591
...
[MIRROR] fixes magic mirrors letting you be robustin zombies
2017-12-21 05:01:50 -06:00
c4f2e2f911
Automatic changelog generation for PR #4412 [ci skip]
2017-12-21 05:01:34 -06:00
57646f2e08
Merge pull request #4412 from Citadel-Station-13/upstream-merge-33549
...
[MIRROR] Removes the visible messages from crossing vitality matrices
2017-12-21 05:01:32 -06:00
e4fe687bd5
Merge pull request #4404 from Citadel-Station-13/upstream-merge-33582
...
[MIRROR] Db schema version check by simplification
2017-12-21 05:00:51 -06:00
13f059e123
Merge pull request #4130 from Citadel-Station-13/upstream-merge-33037
...
[MIRROR] Conversion script MariaDB note
2017-12-21 05:00:18 -06:00
fddd04c964
Automatic changelog generation for PR #4446 [ci skip]
2017-12-21 04:59:47 -06:00
346c1bbdd6
Merge pull request #4446 from Citadel-Station-13/upstream-merge-33638
...
[MIRROR] Codespeak manual rebalance/recost
2017-12-21 04:59:45 -06:00
13c6a7d738
Automatic changelog generation for PR #4466 [ci skip]
2017-12-21 04:59:02 -06:00
d66b64b1f1
Merge pull request #4466 from Michiyamenotehifunana/xeno-nerf
...
Removes pierce immunity from roundstart xenos
2017-12-21 04:59:00 -06:00
3156382d2e
Merge pull request #4470 from Citadel-Station-13/upstream-merge-33700
...
[MIRROR] Fixes some syndicate duffelbags missing inhands
2017-12-21 04:58:46 -06:00
e4d2234537
Merge pull request #4481 from Citadel-Station-13/upstream-merge-33706
...
[MIRROR] Fixes some mecha code.
2017-12-21 04:58:33 -06:00
74232f6373
Merge pull request #4480 from Citadel-Station-13/upstream-merge-33550
...
[MIRROR] Adds instanceless component dupe mode
2017-12-21 04:58:20 -06:00
0decf08a7f
Automatic changelog generation for PR #4479 [ci skip]
2017-12-21 04:58:08 -06:00
8518a9b3e5
Merge pull request #4479 from Citadel-Station-13/upstream-merge-33703
...
[MIRROR] Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
2017-12-21 04:58:06 -06:00
b9d4a65f11
Merge pull request #4478 from Citadel-Station-13/upstream-merge-33702
...
[MIRROR] The runtime condenser now supports taking input from stdin and outputting on stdout
2017-12-21 04:57:34 -06:00
e070e5b023
Automatic changelog generation for PR #4477 [ci skip]
2017-12-21 04:57:21 -06:00
ea6b3f9c92
Merge pull request #4477 from Citadel-Station-13/upstream-merge-33704
...
[MIRROR] Fixes Arm Implant EMP Effect
2017-12-21 04:57:19 -06:00
b749977eb9
Merge pull request #4476 from Citadel-Station-13/upstream-merge-33697
...
[MIRROR] Fix smoke machine runtime
2017-12-21 04:57:02 -06:00
4d01f1c6bf
Automatic changelog generation for PR #4475 [ci skip]
2017-12-21 04:56:37 -06:00
97f427b5ee
Merge pull request #4475 from Citadel-Station-13/upstream-merge-33689
...
[MIRROR] Fix pulling things across space transitions
2017-12-21 04:56:35 -06:00
8ea38cfde2
Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681
...
[MIRROR] Immovable rod abuse, smite and event trigger.
2017-12-21 04:55:32 -06:00
1a5006dc2f
Merge pull request #4473 from Citadel-Station-13/upstream-merge-33672
...
[MIRROR] Fixes bullets making sounds in space and water
2017-12-21 04:55:16 -06:00
f8f04b1ce9
Merge pull request #4452 from Citadel-Station-13/upstream-merge-33470
...
[MIRROR] [READY]Refactors reagent container types
2017-12-21 04:50:20 -06:00
86fed404b1
Update weldingtool.dm
2017-12-21 04:36:01 -06:00
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
56ecc13289
Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
...
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
464e33ca2b
Fixes some mecha code.
2017-12-21 01:37:53 -06:00
14942fb582
Merge pull request #33706 from AnturK/dumbmechacode
...
Fixes some mecha code.
2017-12-21 01:37:53 -06:00
354485d70d
Adds instanceless component dupe mode
2017-12-21 00:51:02 -06:00
09c802f984
Merge pull request #33550 from ninjanomnom/instanceless-component-dupe
...
Adds instanceless component dupe mode
2017-12-21 00:51:02 -06:00
7e69ee112a
Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
2017-12-21 00:46:48 -06:00
Jordan Brown