Commit Graph

10640 Commits

Author SHA1 Message Date
LetterJay
e2ba458400 Update roundend.dm 2017-12-24 02:40:05 -06:00
AnturK
a912e14912 Makes newscaster feedback messages and comments always a list. 2017-12-21 07:13:54 -06:00
LetterJay
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
CitadelStationBot
c4f2e2f911 Automatic changelog generation for PR #4412 [ci skip] 2017-12-21 05:01:34 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
CitadelStationBot
fddd04c964 Automatic changelog generation for PR #4446 [ci skip] 2017-12-21 04:59:47 -06:00
LetterJay
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
CitadelStationBot
13c6a7d738 Automatic changelog generation for PR #4466 [ci skip] 2017-12-21 04:59:02 -06:00
LetterJay
d66b64b1f1 Merge pull request #4466 from Michiyamenotehifunana/xeno-nerf
Removes pierce immunity from roundstart xenos
2017-12-21 04:59:00 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
CitadelStationBot
0decf08a7f Automatic changelog generation for PR #4479 [ci skip] 2017-12-21 04:58:08 -06:00
LetterJay
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
LetterJay
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
CitadelStationBot
e070e5b023 Automatic changelog generation for PR #4477 [ci skip] 2017-12-21 04:57:21 -06:00
LetterJay
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
LetterJay
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
CitadelStationBot
4d01f1c6bf Automatic changelog generation for PR #4475 [ci skip] 2017-12-21 04:56:37 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
86fed404b1 Update weldingtool.dm 2017-12-21 04:36:01 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
CitadelStationBot
464e33ca2b Fixes some mecha code. 2017-12-21 01:37:53 -06:00
Jordan Brown
14942fb582 Merge pull request #33706 from AnturK/dumbmechacode
Fixes some mecha code.
2017-12-21 01:37:53 -06:00
CitadelStationBot
354485d70d Adds instanceless component dupe mode 2017-12-21 00:51:02 -06:00
Jordan Brown
09c802f984 Merge pull request #33550 from ninjanomnom/instanceless-component-dupe
Adds instanceless component dupe mode
2017-12-21 00:51:02 -06:00
CitadelStationBot
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
e3a3082596 Merge pull request #33703 from kevinz000/patch-407
Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
2017-12-21 00:46:48 -06:00
Jordan Brown
636a87ab8f The runtime condenser now supports taking input from stdin and outputting on stdout 2017-12-21 00:45:37 -06:00
CitadelStationBot
a76f89946a Fixes Arm Implant EMP Effect 2017-12-21 00:43:22 -06:00
Jordan Brown
82114e753d Merge pull request #33704 from Fox-McCloud/arm-implant-fix
Fixes Arm Implant EMP Effect
2017-12-21 00:43:22 -06:00
CitadelStationBot
ce0de769c2 Fix smoke machine runtime 2017-12-21 00:41:09 -06:00
MoreRobustThanYou
39ecfd64db Fix smoke machine runtime (#33697)
* Fix smoke machine runtime

* Woops.
2017-12-21 00:41:09 -06:00
CitadelStationBot
4de4be811c Fix pulling things across space transitions 2017-12-21 00:33:52 -06:00
Tad Hardesty
30fb3f8f5c Fix pulling things across space transitions (#33689) 2017-12-21 00:33:52 -06:00
CitadelStationBot
71158b9261 Immovable rod abuse, smite and event trigger. 2017-12-21 00:11:20 -06:00
AnturK
6c4d687db6 Immovable rod abuse, smite and event trigger. (#33681) 2017-12-21 00:11:20 -06:00
CitadelStationBot
3a529ecc2b Fixes bullets making sounds in space and water 2017-12-21 00:09:08 -06:00
ShizCalev
92b018bed7 Fixes bullets making sounds in space and water (#33672)
* Bullet sounds

* explicit lists
2017-12-21 00:09:08 -06:00
CitadelStationBot
408cf32ddc Automatic changelog generation for PR #4445 [ci skip] 2017-12-20 21:47:52 -06:00
deathride58
4d08f9b0bc Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635
[MIRROR] Fixes captain's PDA showing the toggle remote door menu option
2017-12-21 03:47:50 +00:00
deathride58
b4321a1dbe Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636
[MIRROR] restores reaction max_reqs checking code
2017-12-21 03:44:57 +00:00
deathride58
59947b4b3b Merge pull request #4424 from Citadel-Station-13/upstream-merge-33632
[MIRROR] properly disables fusion
2017-12-21 03:43:30 +00:00
CitadelStationBot
f3e7f5f2fd Automatic changelog generation for PR #4420 [ci skip] 2017-12-20 21:42:40 -06:00