LetterJay
|
fbbceadc6e
|
Merge branch 'master' into AllMapChangesInOne
|
2017-05-30 23:08:32 -05:00 |
|
LetterJay
|
9b00499d24
|
It's been a long night
|
2017-05-30 22:41:22 -05:00 |
|
LetterJay
|
8f06db65c9
|
Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534
[MIRROR] Replaced mob spawner vars with outfits
|
2017-05-30 21:43:31 -05:00 |
|
LetterJay
|
1763c4b65d
|
Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
[MIRROR] Area Refactor + Var-edit Cleanup
|
2017-05-30 20:49:42 -05:00 |
|
LetterJay
|
adb7a9b6ff
|
rej clean up
more areas
|
2017-05-30 20:08:53 -05:00 |
|
LetterJay
|
abd0e85efa
|
Merge pull request #1197 from Citadel-Station-13/upstream-merge-27669
[MIRROR] Splits up mine_items.dm
|
2017-05-30 18:46:24 -05:00 |
|
LetterJay
|
402b52229f
|
shit always breaks somehow.
|
2017-05-30 18:37:28 -05:00 |
|
LetterJay
|
fce022389a
|
Update job.dm
|
2017-05-30 17:07:04 -05:00 |
|
LetterJay
|
81e4f39733
|
Merge branch 'master' into upstream-merge-27669
|
2017-05-30 17:02:11 -05:00 |
|
LetterJay
|
976086e490
|
Merge branch 'master' into upstream-merge-27534
|
2017-05-30 16:45:59 -05:00 |
|
LetterJay
|
5073d8e6f2
|
rej
|
2017-05-30 16:43:09 -05:00 |
|
LetterJay
|
c3a243106f
|
wew
|
2017-05-30 16:42:56 -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
|
bc5ecc91b5
|
rej clean
|
2017-05-30 15:55:00 -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
|
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
|
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 |
|
LetterJay
|
ae22a1876a
|
41 files changed, original only had 4. SPACES.
|
2017-05-30 14:36:11 -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
|
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
|
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
|
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
|
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
|
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 |
|
LetterJay
|
aefca24012
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697
|
2017-05-29 02:12:41 -05:00 |
|
LetterJay
|
af72f4ce16
|
Merge pull request #1151 from Citadel-Station-13/upstream-merge-27528
[MIRROR] Adds the Beach Bum Language
|
2017-05-29 02:04:32 -05:00 |
|
LetterJay
|
be65d00de2
|
Merge pull request #1278 from Citadel-Station-13/GreytideStationwide
[s] Fixes all access bug
|
2017-05-29 01:33:38 -05:00 |
|
CitadelStationBot
|
4bb2883638
|
Fixes gun rapid-melee attack exploit (#1276)
|
2017-05-28 23:27:52 -07:00 |
|
LetterJay
|
e0fab7fa5e
|
fixes an oopsie
|
2017-05-29 01:25:02 -05:00 |
|
LetterJay
|
a29e0c45ae
|
BEACHBUMBS!
|
2017-05-28 21:54:10 -05:00 |
|
LetterJay
|
77b4be8b3f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528
|
2017-05-28 21:49:30 -05:00 |
|
LetterJay
|
745437e0eb
|
Merge pull request #1170 from Citadel-Station-13/upstream-merge-27595
[MIRROR] Improves collector feedback
|
2017-05-28 19:47:09 -05:00 |
|