LetterJay
|
81e4f39733
|
Merge branch 'master' into upstream-merge-27669
|
2017-05-30 17:02:11 -05:00 |
|
LetterJay
|
c81dc599e3
|
Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414
[MIRROR] 4th Attempt at 60% shuttle recall gang murderbone thing
|
2017-05-30 16:04:41 -05:00 |
|
LetterJay
|
df34173509
|
Merge pull request #1301 from Citadel-Station-13/upstream-merge-27831
[MIRROR] Fixes multi cyborgs
|
2017-05-30 15:50:56 -05:00 |
|
LetterJay
|
5201e60356
|
Merge pull request #1303 from Citadel-Station-13/upstream-merge-27820
[MIRROR] Adds some silly new meson failure excuses
|
2017-05-30 15:50:40 -05:00 |
|
LetterJay
|
9474de0028
|
Merge pull request #1304 from Citadel-Station-13/upstream-merge-27754
[MIRROR] !!!Projectile spread tweaks!!! <-- Yes, this is a huge balance change for dualwielding!
|
2017-05-30 15:50:21 -05:00 |
|
LetterJay
|
ebaa245f0b
|
Merge pull request #1305 from Citadel-Station-13/upstream-merge-27839
[MIRROR] Fixes another holocall runtime
|
2017-05-30 15:50:07 -05:00 |
|
LetterJay
|
cbe12313d2
|
Merge pull request #1306 from Citadel-Station-13/upstream-merge-27844
[MIRROR] Lavaland - Ruins now have lights
|
2017-05-30 15:49:40 -05:00 |
|
LetterJay
|
b33d26c67f
|
Merge pull request #1307 from Citadel-Station-13/upstream-merge-27846
[MIRROR] Flamethrower fixes
|
2017-05-30 15:48:44 -05:00 |
|
LetterJay
|
f259908266
|
Merge pull request #1196 from Citadel-Station-13/upstream-merge-27675
[MIRROR] Fixes Gang War's infinity shuttle
|
2017-05-30 15:48:23 -05:00 |
|
LetterJay
|
377d3ffbf9
|
Merge pull request #1184 from Citadel-Station-13/upstream-merge-27631
[MIRROR] Turret bases will properly layer under turret covers
|
2017-05-30 15:47:00 -05:00 |
|
LetterJay
|
33af767101
|
Merge pull request #1169 from Citadel-Station-13/upstream-merge-27596
[MIRROR] Nerfs plasma cost
|
2017-05-30 15:46:34 -05:00 |
|
LetterJay
|
a38973ece8
|
commit
|
2017-05-30 15:44:41 -05:00 |
|
LetterJay
|
c28818b893
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27414
|
2017-05-30 15:29:24 -05:00 |
|
LetterJay
|
2de531b2e7
|
Merge pull request #1173 from Citadel-Station-13/upstream-merge-27607
[MIRROR] Fixed some jobs not spawning with their box
|
2017-05-30 15:18:54 -05:00 |
|
LetterJay
|
3c89f142ed
|
Update materials.dm
|
2017-05-30 15:17:00 -05:00 |
|
LetterJay
|
f2730839d4
|
Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR] Refactors explosions
|
2017-05-30 15:15:51 -05:00 |
|
LetterJay
|
9a64d4731c
|
Merge pull request #1167 from Citadel-Station-13/upstream-merge-27589
[MIRROR] Adds marker beacons to mining as a vendible item
|
2017-05-30 15:02:44 -05:00 |
|
CitadelStationBot
|
d4af5004a6
|
Flamethrower fixes
|
2017-05-30 14:55:42 -05:00 |
|
CitadelStationBot
|
87593dd8f7
|
Lavaland - Ruins now have lights
|
2017-05-30 14:46:30 -05:00 |
|
CitadelStationBot
|
6c958c129a
|
Fixes another holocall runtime
|
2017-05-30 14:44:25 -05:00 |
|
LetterJay
|
ae22a1876a
|
41 files changed, original only had 4. SPACES.
|
2017-05-30 14:36:11 -05:00 |
|
LetterJay
|
20ea1dd108
|
Merge pull request #1165 from Citadel-Station-13/upstream-merge-27601
[MIRROR] Dot Nonsense: find the current running proc's type!
|
2017-05-30 14:21:33 -05:00 |
|
LetterJay
|
b2afc61f54
|
cyka
|
2017-05-30 14:18:32 -05:00 |
|
LetterJay
|
80896d0371
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675
|
2017-05-30 14:14:25 -05:00 |
|
CitadelStationBot
|
9deb5069f4
|
!!!Projectile spread tweaks!!! <-- Yes, this is a huge balance change for dualwielding!
|
2017-05-30 11:22:09 -05:00 |
|
CitadelStationBot
|
dceafe4122
|
Adds some silly new meson failure excuses
|
2017-05-30 11:12:56 -05:00 |
|
CitadelStationBot
|
38b10b8c53
|
Fixes multi cyborgs
|
2017-05-30 08:52:22 -05:00 |
|
LetterJay
|
601636f4a1
|
map rotation
|
2017-05-30 01:55:28 -05:00 |
|
LetterJay
|
c2f8df8a6f
|
Merge pull request #1286 from Citadel-Station-13/upstream-merge-27791
[MIRROR] Gives abductees a message saying they can't remember the abduction
|
2017-05-29 15:03:34 -05:00 |
|
LetterJay
|
775ce7a9eb
|
Merge pull request #1283 from Citadel-Station-13/upstream-merge-27797
[MIRROR] Speeds up apc visual updates
|
2017-05-29 15:02:17 -05:00 |
|
LetterJay
|
dba35effd5
|
Merge pull request #1282 from Citadel-Station-13/upstream-merge-27796
[MIRROR] You can pet dogs again.
|
2017-05-29 15:01:53 -05:00 |
|
LetterJay
|
7750095289
|
Merge pull request #1281 from Citadel-Station-13/upstream-merge-27770
[MIRROR] AI holocall hangups
|
2017-05-29 15:01:43 -05:00 |
|
LetterJay
|
4f214e3f55
|
Merge pull request #1280 from Citadel-Station-13/upstream-merge-27768
[MIRROR] Cable coils New -> Initialize
|
2017-05-29 15:01:24 -05:00 |
|
LetterJay
|
fd99ecba30
|
Merge pull request #1279 from Citadel-Station-13/upstream-merge-27774
[MIRROR] Fixes mesons giving the wrong message when toggling off
|
2017-05-29 15:01:11 -05:00 |
|
LetterJay
|
b0681a0ae2
|
Merge pull request #1288 from Citadel-Station-13/upstream-merge-27802
[MIRROR] Fixes holopads not returning an initialize hint
|
2017-05-29 15:00:52 -05:00 |
|
LetterJay
|
8a519b765b
|
Merge pull request #1289 from Citadel-Station-13/upstream-merge-27800
[MIRROR] Fixes SSmachines using colons
|
2017-05-29 15:00:41 -05:00 |
|
LetterJay
|
aa6d89df07
|
Merge pull request #1291 from Citadel-Station-13/upstream-merge-27769
[MIRROR] Increase plasmaman tank volume
|
2017-05-29 14:58:56 -05:00 |
|
LetterJay
|
568b8c34cc
|
Merge pull request #1292 from Citadel-Station-13/upstream-merge-27756
[MIRROR] The officer's sabre can be used to remove a lizard's tail.
|
2017-05-29 14:58:47 -05:00 |
|
CitadelStationBot
|
94fdea8866
|
Some pAI fixes
|
2017-05-29 14:42:48 -05:00 |
|
CitadelStationBot
|
507f3d7761
|
The officer's sabre can be used to remove a lizard's tail.
|
2017-05-29 11:08:28 -05:00 |
|
CitadelStationBot
|
b05d56d9fa
|
Increase plasmaman tank volume
|
2017-05-29 11:07:23 -05:00 |
|
CitadelStationBot
|
3ba2db8bcb
|
Fixes SSmachines using colons
|
2017-05-29 11:04:13 -05:00 |
|
CitadelStationBot
|
86123e0271
|
Fixes holopads not returning an initialize hint
|
2017-05-29 11:03:08 -05:00 |
|
CitadelStationBot
|
18db38f7db
|
Gives abductees a message saying they can't remember the abduction
|
2017-05-29 09:19:20 -05:00 |
|
CitadelStationBot
|
8d5c202774
|
Speeds up apc visual updates
|
2017-05-29 09:14:01 -05:00 |
|
CitadelStationBot
|
6b01698202
|
You can pet dogs again.
|
2017-05-29 08:58:43 -05:00 |
|
CitadelStationBot
|
d60e7c9d2a
|
AI holocall hangups
|
2017-05-29 06:38:24 -05:00 |
|
CitadelStationBot
|
84c9682114
|
Cable coils New -> Initialize
|
2017-05-29 06:34:17 -05:00 |
|
CitadelStationBot
|
de413c89de
|
Fixes mesons giving the wrong message when toggling off
|
2017-05-29 06:32:10 -05:00 |
|
LetterJay
|
750baf3dca
|
multi level
|
2017-05-29 02:15:26 -05:00 |
|