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 |
|
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
|
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
|
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
|
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 |
|
Jordan Brown
|
14942fb582
|
Merge pull request #33706 from AnturK/dumbmechacode
Fixes some mecha code.
|
2017-12-21 01:37:53 -06:00 |
|
Tad Hardesty
|
30fb3f8f5c
|
Fix pulling things across space transitions (#33689)
|
2017-12-21 00:33: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
|
b2187123fb
|
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
[MIRROR] [Ready]Brain Trauma additions
|
2017-12-21 03:42:38 +00:00 |
|
deathride58
|
cf80b8a573
|
Merge pull request #4453 from Citadel-Station-13/upstream-merge-33651
[MIRROR] Changelings learn languages from people they absorb
|
2017-12-21 03:30:22 +00:00 |
|
deathride58
|
17dda62a93
|
Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
|
2017-12-21 03:28:14 +00:00 |
|
deathride58
|
58f5069180
|
Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664
[MIRROR] Halve gun empty sound level
|
2017-12-21 03:27:50 +00:00 |
|
deathride58
|
811cd917aa
|
Merge pull request #4457 from Citadel-Station-13/upstream-merge-33683
[MIRROR] Fixes get admin command
|
2017-12-21 03:27:32 +00:00 |
|
deathride58
|
2de3b12364
|
Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594
[MIRROR] Adds knock off component
|
2017-12-21 03:25:41 +00:00 |
|
QualityVan
|
5869eae8e9
|
Fixes some syndicate duffelbags missing inhands
|
2017-12-20 19:54:56 -06:00 |
|
LetterJay
|
84f51a8cbb
|
antag team
|
2017-12-20 13:24:06 -06:00 |
|
LetterJay
|
00d3b8f1b7
|
a lot of shit synced in this one commit.
|
2017-12-20 02:53:51 -06:00 |
|
LetterJay
|
92c347d068
|
Merge branch 'master' into upstream-merge-33246
|
2017-12-20 00:27:06 -06:00 |
|
Jordan Brown
|
25d5e5b6b4
|
Merge pull request #33594 from AnturK/knockoff
Adds knock off component
|
2017-12-20 00:14:36 -06:00 |
|
Jordan Brown
|
b305f1bb26
|
Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears
Halve gun empty sound level
|
2017-12-20 00:14:28 -06:00 |
|
oranges
|
d960c45e77
|
Merge pull request #33622 from duncathan/assert_gas
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
|
2017-12-20 00:14:13 -06:00 |
|
LetterJay
|
5bd61908a3
|
Update game_mode.dm
|
2017-12-19 23:53:36 -06:00 |
|
LetterJay
|
4d5c32ae56
|
Update game_mode.dm
|
2017-12-19 22:11:04 -06:00 |
|
LetterJay
|
74bba8aea7
|
Update cards_ids.dm
|
2017-12-19 19:31:44 -06:00 |
|
LetterJay
|
2b434438e0
|
Update telecrystalconsoles.dm
|
2017-12-19 19:31:17 -06:00 |
|
LetterJay
|
9d90a2bf5b
|
Update pinpointer.dm
|
2017-12-19 19:30:54 -06:00 |
|
LetterJay
|
c545ef06cd
|
Update nuclearbomb.dm
|
2017-12-19 19:30:23 -06:00 |
|
LetterJay
|
951a540882
|
Update nuclear.dm
|
2017-12-19 19:29:27 -06:00 |
|
LetterJay
|
992984388b
|
Update game_mode.dm
|
2017-12-19 19:29:04 -06:00 |
|
LetterJay
|
5983d7b13d
|
Update antag_spawner.dm
|
2017-12-19 19:27:36 -06:00 |
|
LetterJay
|
dfa53390df
|
Update nuclear.dm
|
2017-12-19 19:12:26 -06:00 |
|
LetterJay
|
f3e031fe2f
|
Update telecrystalconsoles.dm
|
2017-12-19 18:02:16 -06:00 |
|
LetterJay
|
408182758f
|
Merge branch 'master' into upstream-merge-33498
|
2017-12-19 17:50:11 -06:00 |
|
LetterJay
|
1b6b8a7c00
|
Update cleanable.dm
|
2017-12-19 17:46:15 -06:00 |
|
LetterJay
|
a0a4acbc2c
|
Update nuclear.dm
|
2017-12-19 17:33:55 -06:00 |
|
LetterJay
|
0a05b499fd
|
Update cleanable.dm
|
2017-12-19 17:14:57 -06:00 |
|
LetterJay
|
7d193a5303
|
Update wizard.dm
|
2017-12-19 15:35:57 -06:00 |
|
LetterJay
|
a30de42820
|
Update traitor.dm
|
2017-12-19 15:35:45 -06:00 |
|
LetterJay
|
2d65e0df49
|
Update nuclear.dm
|
2017-12-19 15:35:29 -06:00 |
|
LetterJay
|
61c7080c34
|
Update game_mode.dm
|
2017-12-19 15:34:59 -06:00 |
|
LetterJay
|
cb8c6cd5e2
|
Update changeling.dm
|
2017-12-19 15:34:38 -06:00 |
|
LetterJay
|
98d752fe21
|
Update traitor_bro.dm
|
2017-12-19 15:34:27 -06:00 |
|
LetterJay
|
a8db6dc9c2
|
Update mop_bucket.dm
|
2017-12-19 15:29:36 -06:00 |
|
LetterJay
|
d59e85e214
|
Update weldingtool.dm
|
2017-12-19 15:20:39 -06:00 |
|
Jordan Brown
|
30e8b2a12d
|
Merge pull request #33683 from AnturK/getcommandfix
Fixes get admin command
|
2017-12-19 14:30:27 -06:00 |
|
Leo
|
4e5671960d
|
Merge pull request #33651 from coiax/absorb-language
Changelings learn languages from people they absorb
|
2017-12-19 07:55:57 -06:00 |
|