 LetterJay
|
a8eaaff8e7
|
Merge pull request #7003 from Citadel-Station-13/upstream-merge-38173
[MIRROR] Delay smoothing atoms that have not initialized yet
|
2018-06-03 16:23:48 -05:00 |
|
|
CitadelStationBot
|
5974ec89c3
|
Automatic changelog generation for PR #7002 [ci skip]
|
2018-06-03 16:22:32 -05:00 |
|
|
LetterJay
|
37ff8a616d
|
Merge pull request #7002 from Citadel-Station-13/upstream-merge-38225
[MIRROR] Include item overlays in attack animations (shows the proper color of screwdrivers etc)
|
2018-06-03 16:22:30 -05:00 |
|
|
CitadelStationBot
|
4e7b5bd0c9
|
Automatic changelog generation for PR #7001 [ci skip]
|
2018-06-03 16:22:11 -05:00 |
|
|
LetterJay
|
9c4d7ca029
|
Merge pull request #7001 from Citadel-Station-13/upstream-merge-38228
[MIRROR] we can stop using getFlatIcon?
|
2018-06-03 16:22:09 -05:00 |
|
|
CitadelStationBot
|
3607e0db5d
|
Automatic changelog generation for PR #7000 [ci skip]
|
2018-06-03 16:21:55 -05:00 |
|
|
LetterJay
|
5cb9495b84
|
Merge pull request #7000 from Citadel-Station-13/upstream-merge-38246
[MIRROR] Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device.
|
2018-06-03 16:21:53 -05:00 |
|
|
CitadelStationBot
|
d667da2d8d
|
Automatic changelog generation for PR #6999 [ci skip]
|
2018-06-03 16:21:39 -05:00 |
|
|
LetterJay
|
7fdbe8b115
|
Merge pull request #6999 from Citadel-Station-13/upstream-merge-38244
[MIRROR] Adds one brain damage statement
|
2018-06-03 16:21:37 -05:00 |
|
|
CitadelStationBot
|
18de1bad24
|
Automatic changelog generation for PR #6998 [ci skip]
|
2018-06-03 16:21:21 -05:00 |
|
|
LetterJay
|
2c6c5bc5d2
|
Merge pull request #6998 from Citadel-Station-13/upstream-merge-38249
[MIRROR] Fixes comms consoles thinking the transit is on centcom
|
2018-06-03 16:21:19 -05:00 |
|
|
CitadelStationBot
|
431f48c089
|
Automatic changelog generation for PR #6997 [ci skip]
|
2018-06-03 16:21:00 -05:00 |
|
|
LetterJay
|
c98f998473
|
Merge pull request #6997 from Citadel-Station-13/upstream-merge-38233
[MIRROR] Replaces the black-and-red spacesuit on the infiltrator with a normal syndicate red fatsuit
|
2018-06-03 16:20:58 -05:00 |
|
|
CitadelStationBot
|
b3a4fb6560
|
Automatic changelog generation for PR #6996 [ci skip]
|
2018-06-03 16:20:33 -05:00 |
|
|
LetterJay
|
391d4f1cfa
|
Merge pull request #6996 from Citadel-Station-13/upstream-merge-38245
[MIRROR] Readds missing objs to Delta toxins
|
2018-06-03 16:20:30 -05:00 |
|
|
LetterJay
|
a3167c00fa
|
Merge pull request #6993 from Citadel-Station-13/upstream-merge-38215
[MIRROR] Fixes datediff not returning
|
2018-06-03 16:20:12 -05:00 |
|
|
CitadelStationBot
|
dd70a5ef8b
|
Automatic changelog generation for PR #6989 [ci skip]
|
2018-06-03 16:20:01 -05:00 |
|
|
LetterJay
|
54296cc3e5
|
Merge pull request #6989 from Citadel-Station-13/upstream-merge-38226
[MIRROR] Roboticists now have access to open the R&D windoors.
|
2018-06-03 16:19:59 -05:00 |
|
|
CitadelStationBot
|
c96416ed91
|
Automatic changelog generation for PR #6992 [ci skip]
|
2018-06-03 16:19:38 -05:00 |
|
|
LetterJay
|
8bc642c6bd
|
Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220
[MIRROR] Fixes pocket items being deleted when monkeyizing
|
2018-06-03 16:19:36 -05:00 |
|
|
CitadelStationBot
|
46790245f9
|
Automatic changelog generation for PR #6991 [ci skip]
|
2018-06-03 16:19:18 -05:00 |
|
|
LetterJay
|
a8274810ab
|
Merge pull request #6991 from Citadel-Station-13/upstream-merge-38218
[MIRROR] Fixes cigar bugs
|
2018-06-03 16:19:16 -05:00 |
|
|
letterjay
|
a12edb0d01
|
Delay smoothing atoms that have not initialized yet
|
2018-06-03 14:25:36 -05:00 |
|
|
Tad Hardesty
|
9f4f470607
|
Delay smoothing atoms that have not initialized yet (#38173)
|
2018-06-03 14:25:35 -05:00 |
|
|
letterjay
|
d705b0ac5a
|
Include item overlays in attack animations (shows the proper color of screwdrivers etc)
|
2018-06-03 13:25:19 -05:00 |
|
|
vuonojenmustaturska
|
568dfa7f35
|
Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225)
* overlay attacks
* this works too
* fix trays too
|
2018-06-03 13:25:19 -05:00 |
|
|
letterjay
|
a15a92cd40
|
we can stop using getFlatIcon?
|
2018-06-03 13:21:03 -05:00 |
|
|
vuonojenmustaturska
|
f83dc08fa7
|
are we free? (#38228)
|
2018-06-03 13:21:03 -05:00 |
|
|
letterjay
|
582a35618a
|
Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device.
|
2018-06-03 12:59:27 -05:00 |
|
|
theo2003
|
805852e1df
|
Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device. (#38246)
|
2018-06-03 12:59:27 -05:00 |
|
|
letterjay
|
675d6bd77c
|
Adds one brain damage statement
|
2018-06-03 12:58:15 -05:00 |
|
|
yorii
|
68236af542
|
Adds one brain damage statement (#38244)
* this one is kinda funny tbqh
* fix comma
* fix
|
2018-06-03 12:58:15 -05:00 |
|
|
letterjay
|
1f637ddfdc
|
Fixes comms consoles thinking the transit is on centcom
|
2018-06-03 11:45:43 -05:00 |
|
|
vuonojenmustaturska
|
83cf30c92e
|
oh ho (#38249)
|
2018-06-03 11:45:43 -05:00 |
|
|
letterjay
|
4f7bb603a4
|
Replaces the black-and-red spacesuit on the infiltrator with a normal syndicate red fatsuit
|
2018-06-03 11:05:46 -05:00 |
|
|
iksyp
|
42e5ded9b3
|
fatsuits (#38233)
|
2018-06-03 11:05:45 -05:00 |
|
|
letterjay
|
f0c8d6ee2f
|
Readds missing objs to Delta toxins
|
2018-06-03 11:04:31 -05:00 |
|
|
81Denton
|
8b4a3ab273
|
Readds missing objs to Delta toxins (#38245)
* prb: no update
* another one
|
2018-06-03 11:04:30 -05:00 |
|
|
CitadelStationBot
|
ab7709bedd
|
Automatic changelog generation for PR #6988 [ci skip]
|
2018-06-03 10:44:53 -05:00 |
|
|
LetterJay
|
ae3f3cd741
|
Merge pull request #6988 from Citadel-Station-13/upstream-merge-38230
[MIRROR] Fixes tritium and plasma fires storing cached_results incorrectly
|
2018-06-03 10:44:51 -05:00 |
|
|
CitadelStationBot
|
927e3af71a
|
Automatic changelog generation for PR #6987 [ci skip]
|
2018-06-03 10:42:29 -05:00 |
|
|
LetterJay
|
73d1abed5c
|
Merge pull request #6987 from Citadel-Station-13/upstream-merge-38199
[MIRROR] fixes a locate and adds job checks to download objective
|
2018-06-03 10:42:27 -05:00 |
|
|
LetterJay
|
7b7420dec6
|
Merge pull request #6986 from Citadel-Station-13/upstream-merge-38250
[MIRROR] [s]Fixes bloodcult exploit
|
2018-06-03 10:42:16 -05:00 |
|
|
CitadelStationBot
|
5503e00199
|
Automatic changelog generation for PR #6985 [ci skip]
|
2018-06-03 10:41:41 -05:00 |
|
|
LetterJay
|
2e1d2c9736
|
Merge pull request #6985 from Citadel-Station-13/upstream-merge-38213
[MIRROR] Fix mecha mouse pointer issues
|
2018-06-03 10:41:39 -05:00 |
|
|
LetterJay
|
d06d599bb7
|
Merge pull request #6984 from Citadel-Station-13/upstream-merge-38156
[MIRROR] Only load Reebe during clock cult
|
2018-06-03 10:41:25 -05:00 |
|
|
letterjay
|
46a35e4fb0
|
Fixes datediff not returning
|
2018-06-03 09:04:16 -05:00 |
|
|
Jordie
|
d8113dfc99
|
Fixes datediff not returning (#38215)
|
2018-06-03 09:04:16 -05:00 |
|
|
letterjay
|
ac196fb155
|
Fixes pocket items being deleted when monkeyizing
|
2018-06-03 09:04:08 -05:00 |
|
|
ShizCalev
|
67841c3f19
|
Fixes pocket items being deleted when monkeyizing (#38220)
|
2018-06-03 09:04:08 -05:00 |
|