shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,527 Commits 5 Branches 0 Tags
c36ca8a4341d6a7faf3f3bf3c6c39f616859db13
Commit Graph

1830 Commits

Author SHA1 Message Date
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
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
LetterJay
0fe4a33b15 Merge pull request #1100 from Citadel-Station-13/upstream-merge-27453 
[MIRROR] [All stations] Cleaned up var-editted areas
 2017-05-30 19:50:35 -05:00
LetterJay
f6f0523fa9 Merge pull request #1200 from Citadel-Station-13/upstream-merge-27661 
[MIRROR] Fixes ex_act not having waitfor = FALSE
 2017-05-30 18:46:40 -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
29da073bb9 Merge pull request #1284 from Citadel-Station-13/upstream-merge-27840 
[MIRROR] Fixes doubled post-round end time.
 2017-05-30 18:40:54 -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
41065c4e73 waitfor 2017-05-30 16:21:24 -05:00
LetterJay
6b7dffddb2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27661 2017-05-30 16:05:53 -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