CitadelStationBot
ba30ba3dcb
Fixes soapstone time.
2017-12-24 15:03:22 -06:00
FrozenGuy5
0068bb2ed2
adds world.realtime to soapstone
2017-12-24 15:03:22 -06:00
LetterJay
2378235f51
Merge pull request #4510 from Citadel-Station-13/upstream-merge-33775
...
[MIRROR] Revert gulpfs version to 6d71a65 in tgui
2017-12-24 02:41:16 -06:00
CitadelStationBot
28dd4814ae
Revert gulpfs version to 6d71a65 in tgui
2017-12-23 08:04:47 -06:00
Jordan Brown
17c9a5ab0b
Merge pull request #33775 from MoreRobustThanYou/patch-39
...
Revert gulpfs version to 6d71a65 in tgui
2017-12-23 08:04:47 -06:00
CitadelStationBot
94e02ddeed
Automatic changelog generation for PR #4491 [ci skip]
2017-12-22 15:14:27 -06:00
CitadelStationBot
938f409782
[MIRROR] Christmas ( #4491 )
...
* Christmas (#33690 )
* Christmas Event Updates
* Dont recreate the list every time
* Check for drop del
* Changes some things to placate that one guy from FTL
* Christmas
2017-12-22 13:14:25 -08:00
CitadelStationBot
f6e82e4460
Automatic changelog generation for PR #4504 [ci skip]
2017-12-22 14:33:00 -06:00
CitadelStationBot
6856fc1be2
[MIRROR] [s] Fixes the frying oil reagent ( #4504 )
...
* Merge pull request #33745 from vuonojenmustaturska/oilfix
[s] Fixes the frying oil reagent
* [s] Fixes the frying oil reagent
2017-12-22 12:32:56 -08:00
LetterJay
3af83a898d
cl
2017-12-22 13:41:26 -06:00
LetterJay
8d2ff011a1
Merge pull request #4495 from Citadel-Station-13/research_1
...
Syncs and fixes R&D
2017-12-22 03:14:09 -06:00
kevinz000
a82d0e13ce
Fixes RND
2017-12-22 00:58:46 -08:00
CitadelStationBot
a990811cee
Automatic changelog generation for PR #4488 [ci skip]
2017-12-21 15:37:35 -06:00
deathride58
baedc87c0a
Merge pull request #4488 from Citadel-Station-13/upstream-merge-33606
...
[MIRROR] Everyone gains antag HUD at round end
2017-12-21 21:37:33 +00:00
deathride58
8d9d41373b
Merge pull request #4489 from Citadel-Station-13/upstream-merge-33710
...
[MIRROR] Corrects crashedship diags
2017-12-21 21:36:26 +00:00
CitadelStationBot
56da16b270
Automatic changelog generation for PR #4490 [ci skip]
2017-12-21 15:36:08 -06:00
deathride58
82913edda0
Merge pull request #4490 from Citadel-Station-13/upstream-merge-33709
...
[MIRROR] Adjustable Chat Line Height
2017-12-21 21:36:05 +00:00
CitadelStationBot
44230b0b0b
Adjustable Chat Line Height
2017-12-21 14:25:21 -06:00
Jordan Brown
b188266478
Merge pull request #33709 from uraniummeltdown/linespacing
...
Adjustable Chat Line Height
2017-12-21 14:25:21 -06:00
CitadelStationBot
264caaeb53
Corrects crashedship diags
2017-12-21 14:25:11 -06:00
Jordan Brown
52257ff371
Merge pull request #33710 from ShizCalev/crashedship
...
Corrects crashedship diags
2017-12-21 14:25:11 -06:00
CitadelStationBot
7d705ac940
Everyone gains antag HUD at round end
2017-12-21 14:24:49 -06:00
Jordan Brown
3f78bdcf59
Merge pull request #33606 from coiax/antaghud-on-end
...
Everyone gains antag HUD at round end
2017-12-21 14:24:49 -06:00
deathride58
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
CitadelStationBot
e9d8888407
Automatic changelog generation for PR #4433 [ci skip]
2017-12-21 14:19:55 -06:00
deathride58
2350486542
Merge pull request #4433 from Citadel-Station-13/upstream-merge-33614
...
[MIRROR] Decal rotation fix
2017-12-21 20:19:52 +00:00
deathride58
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
CitadelStationBot
2eaae2eb14
Automatic changelog generation for PR #4487 [ci skip]
2017-12-21 13:56:22 -06:00
deathride58
f4bd8d270e
Merge pull request #4487 from ganglyalexander/patch-1
...
dog borgs module icon fix
2017-12-21 19:56:20 +00:00
Matthew
529e839203
dog borgs module icon fix
2017-12-21 13:46:44 -06:00
LetterJay
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
LetterJay
087c43ab71
Update rdmachines.dm
2017-12-21 12:44:59 -06:00
LetterJay
2d995e3f5a
Update rdconsole.dm
2017-12-21 12:44:16 -06:00
LetterJay
8e6c8fc8b5
Update departmental_lathe.dm
2017-12-21 12:43:21 -06:00
LetterJay
6573aa52e4
Update departmental_circuit_imprinter.dm
2017-12-21 12:42:18 -06:00
LetterJay
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
LetterJay
06c309fb0c
Merge branch 'master' into upstream-merge-33562
2017-12-21 11:30:58 -06:00
LetterJay
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
LetterJay
abced738bd
Revert "[MIRROR] Db schema version check by simplification"
2017-12-21 09:52:42 -06:00
CitadelStationBot
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
LetterJay
8750d93126
Merge branch 'master' into upstream-merge-33614
2017-12-21 05:02:21 -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
