Commit Graph

1843 Commits

Author SHA1 Message Date
LetterJay
976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -07:00
CitadelStationBot
2dc13e6242 makes machineguns pass their users to their fire helpers instead of the floor (#1256) 2017-06-02 21:46:15 -07:00
CitadelStationBot
b85384c0ad Fixes meteor and immoveable rods hitting Centcomm (#1252) 2017-06-02 21:36:45 -07:00
CitadelStationBot
bdd4f9d17f Allows explorer webbings to hold marker beacons (#1219) 2017-06-02 21:35:41 -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
2c7e3ad4f7 Makes op belts less brown (#1336) 2017-06-02 21:18:26 -07:00
CitadelStationBot
55f8700a8c Fix some camera Initializes (#1337) 2017-06-02 21:18:07 -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
7b346b6241 Merge pull request #1342 from Citadel-Station-13/upstream-merge-27932
[MIRROR] Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
2017-06-02 22:47:01 -05:00
LetterJay
c36ca8a434 Merge pull request #1344 from Citadel-Station-13/upstream-merge-27945
[MIRROR] Fixes airlocks not updating icon properly
2017-06-02 22:46:38 -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
6da343e11c Merge pull request #1346 from Citadel-Station-13/upstream-merge-27917
[MIRROR] Cult floors now reduce rune scribing for small runes by 50%
2017-06-02 22:45:56 -05:00
LetterJay
3120544ae3 Merge pull request #1347 from Citadel-Station-13/upstream-merge-27942
[MIRROR] Fixes doppler arrays
2017-06-02 22:45:41 -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
c4b280b269 Merge pull request #1323 from Citadel-Station-13/upstream-merge-27879
[MIRROR] Fixes posters
2017-06-02 22:40:28 -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
LetterJay
e49345c27c Merge pull request #1319 from Citadel-Station-13/upstream-merge-27865
[MIRROR] Adds repair and lavaland map generator templates for buildmode use
2017-06-02 22:39:45 -05:00
LetterJay
c9a1735deb Merge pull request #1318 from Citadel-Station-13/upstream-merge-27871
[MIRROR] [Meta] Var Cleanup and tweaks
2017-06-02 22:39:23 -05:00
CitadelStationBot
6f54c40f03 Fixes doppler arrays 2017-06-02 16:14:48 -05:00
CitadelStationBot
9a05029df6 Cult floors now reduce rune scribing for small runes by 50% 2017-06-02 16:12:43 -05:00
CitadelStationBot
48c439aaac Fix cable coil dupe and APC icon oddity 2017-06-02 14:11:29 -05:00
CitadelStationBot
b676e7b5ae Fixes airlocks not updating icon properly 2017-06-02 12:14:17 -05:00
CitadelStationBot
6e563e7a53 Attempts to add items to a storage container beyond its slots limit will obtain a failure message again. 2017-06-02 06:42:23 -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
d36bc75074 Fixes posters 2017-05-31 19:29:20 -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
CitadelStationBot
946a6b1146 [Meta] Var Cleanup and tweaks 2017-05-31 08:57:18 -05:00
CitadelStationBot
4eb5a9bf21 Mapped active shieldgens 2017-05-31 08:56:07 -05:00
LetterJay
ffd2d6fd0a Merge pull request #1206 from Citadel-Station-13/upstream-merge-27721
[MIRROR] Fix roundid
2017-05-31 02:33:42 -05:00
LetterJay
fbedba7c3f Update world.dm 2017-05-31 02:10:31 -05:00
LetterJay
4f0ee1cbb8 Update world.dm 2017-05-31 01:57:46 -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
ad96bb6fcf Merge branch 'master' into upstream-merge-27721 2017-05-31 01:47:16 -05:00
LetterJay
01ab250772 commit 2017-05-31 00:02:23 -05:00
LetterJay
b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
LetterJay
872b0e61fd rej cleanup, etc. 2017-05-30 23:43:14 -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
9ba058930e Update Space_Station_13_areas.dm 2017-05-30 22:18:02 -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
8948f2d636 FIXING SHIT. 2017-05-30 20:16:00 -05:00
LetterJay
adb7a9b6ff rej clean up
more areas
2017-05-30 20:08:53 -05:00