LetterJay
|
976c1244dd
|
Config shit for cards (#1310)
|
2017-06-02 21:56:08 -07:00 |
|
CitadelStationBot
|
b85384c0ad
|
Fixes meteor and immoveable rods hitting Centcomm (#1252)
|
2017-06-02 21:36:45 -07:00 |
|
CitadelStationBot
|
9873fe0957
|
Buffs nitrous oxide (#1339)
|
2017-06-02 21:22:08 -07:00 |
|
CitadelStationBot
|
dbc902ef29
|
Fixes martial arts resetting on cloning. (#1338)
|
2017-06-02 21:21:47 -07:00 |
|
CitadelStationBot
|
264cbf040b
|
Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""" (#1350)
|
2017-06-02 21:16:56 -07:00 |
|
LetterJay
|
1dfe9eca9a
|
Merge pull request #1332 from Citadel-Station-13/upstream-merge-27906
[MIRROR] Adds three unique kinetic accelerator modules to necropolis chests
|
2017-06-02 22:47:30 -05:00 |
|
LetterJay
|
f3f0ab5d37
|
Merge pull request #1345 from Citadel-Station-13/upstream-merge-27921
[MIRROR] Fix cable coil dupe and APC icon oddity
|
2017-06-02 22:46:19 -05:00 |
|
LetterJay
|
dacbbedec8
|
Merge pull request #1326 from Citadel-Station-13/upstream-merge-27894
[MIRROR] Lowers portable pump max pressure to 1013.25
|
2017-06-02 22:44:41 -05:00 |
|
LetterJay
|
9b64f18e0e
|
Merge pull request #1324 from Citadel-Station-13/upstream-merge-27880
[MIRROR] Borg module resets now require cutting instead of pulsing the reset wire
|
2017-06-02 22:40:49 -05:00 |
|
LetterJay
|
b5cfa6709e
|
Merge pull request #1322 from Citadel-Station-13/upstream-merge-27877
[MIRROR] Advanced proccall now supports /proc/PROCNAME
|
2017-06-02 22:40:07 -05:00 |
|
CitadelStationBot
|
48c439aaac
|
Fix cable coil dupe and APC icon oddity
|
2017-06-02 14:11:29 -05:00 |
|
CitadelStationBot
|
cb755fc6d0
|
Adds three unique kinetic accelerator modules to necropolis chests
|
2017-06-01 15:32:16 -05:00 |
|
CitadelStationBot
|
fc2f45b71b
|
Lowers portable pump max pressure to 1013.25
|
2017-05-31 23:14:26 -05:00 |
|
CitadelStationBot
|
ac23b06edd
|
Borg module resets now require cutting instead of pulsing the reset wire
|
2017-05-31 19:56:43 -05:00 |
|
CitadelStationBot
|
538bce59a6
|
Advanced proccall now supports /proc/PROCNAME
|
2017-05-31 19:24:13 -05:00 |
|
CitadelStationBot
|
b78f317f2d
|
Adds repair and lavaland map generator templates for buildmode use
|
2017-05-31 12:57:22 -05:00 |
|
LetterJay
|
46bcc34a0e
|
Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677
[MIRROR] Adds marker beacons to miner borgs
|
2017-05-31 01:53:38 -05:00 |
|
LetterJay
|
4654baea3b
|
Merge pull request #1217 from Citadel-Station-13/upstream-merge-27685
[MIRROR] Fixes delayed login message
|
2017-05-31 01:48:42 -05:00 |
|
LetterJay
|
b19115e10f
|
Merge branch 'master' into upstream-merge-27454
|
2017-05-30 23:48:25 -05:00 |
|
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 |
|