shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,658 Commits 5 Branches 0 Tags
e98868e9e18a2915a6cd713b8d9064b2d09d2fbd
Commit Graph
2658 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub e98868e9e1 Merge pull request #1437 from Citadel-Station-13/upstream-merge-28100 
[MIRROR] Hang up holocalls with an action
 2017-06-06 13:30:19 -05:00
LetterJayandGitHub 8a9db7b4d2 Merge pull request #1432 from Citadel-Station-13/upstream-merge-28094 
[MIRROR] Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1
 2017-06-06 13:06:23 -05:00
LetterJayandGitHub 8273877b23 Update holocall.dm 2017-06-06 13:05:38 -05:00
LetterJayandGitHub e32283f059 Merge pull request #1438 from Citadel-Station-13/upstream-merge-28081 
[MIRROR] Hulks now take 10 hits to destroy dominators up from 2
 2017-06-06 13:02:36 -05:00
CitadelStationBot 5b53514452 Hulks now take 10 hits to destroy dominators up from 2 2017-06-06 10:40:10 -05:00
CitadelStationBot 98e2a659f4 Hang up holocalls with an action 2017-06-06 10:34:58 -05:00
CitadelStationBot 629a417177 Automatic changelog generation for PR #1274 [ci skip] 2017-06-06 09:01:35 -05:00
LetterJayandGitHub 71bb6c930c Merge pull request #1274 from Citadel-Station-13/upstream-merge-27652 
[MIRROR] [Centcom] Nanotrasen Private Security 2.0
 2017-06-06 09:01:33 -05:00
LetterJayandGitHub 60b5c7b33e Merge pull request #1247 from Citadel-Station-13/upstream-merge-27726 
[MIRROR] Custom emotes no longer replace the pronouns
 2017-06-06 09:00:47 -05:00
CitadelStationBot f9bb31b5e7 Automatic changelog generation for PR #1244 [ci skip] 2017-06-06 09:00:34 -05:00
LetterJayandGitHub 36a0fe00c3 Merge pull request #1244 from Citadel-Station-13/upstream-merge-27728 
[MIRROR] The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
 2017-06-06 09:00:27 -05:00
LetterJayandGitHub 31e145800f Merge pull request #1434 from Citadel-Station-13/upstream-merge-28083 
[MIRROR] Fixes projectile fields blocking clicks
 2017-06-06 08:59:56 -05:00
LetterJayandGitHub 948853b03f Merge pull request #1433 from Citadel-Station-13/WonderfulWorldOfSQL 
SQL updates
 2017-06-06 07:59:15 -05:00
LetterJay dbb233b874 missed a few things 2017-06-06 07:49:18 -05:00
CitadelStationBot 7ef70f6c95 Fixes projectile fields blocking clicks 2017-06-06 07:15:12 -05:00
CitadelStationBot 369d8f1142 Fixes 28060 : emergency shields have a hit effect instead of setting opacity to 1 2017-06-06 07:13:05 -05:00
LetterJay 905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJayandGitHub fc1017fa14 Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801 
[MIRROR] Holocall cleanup
 2017-06-05 23:19:23 -05:00
LetterJayandGitHub 962177c423 Merge branch 'master' into upstream-merge-27652 2017-06-05 23:16:40 -05:00
LetterJay 5f74de6bdf cleanup 2017-06-05 23:12:15 -05:00
LetterJay 1c71b4fd68 cleanup 2017-06-05 23:10:02 -05:00
LetterJay 54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
LetterJayandGitHub 0b196930bb Merge pull request #1241 from Citadel-Station-13/upstream-merge-27708 
[MIRROR] Small outfit refactor
 2017-06-05 23:07:02 -05:00
LetterJayandGitHub 0158eded16 Merge pull request #1240 from Citadel-Station-13/upstream-merge-27712 
[MIRROR] Fixes revision stat tracking
 2017-06-05 23:06:50 -05:00
LetterJayandGitHub 09fcdabba2 Merge pull request #1239 from Citadel-Station-13/upstream-merge-27714 
[MIRROR] Fixes world start outfit runtime
 2017-06-05 23:06:37 -05:00
LetterJayandGitHub b2d288d1f8 Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611 
[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
 2017-06-05 23:06:18 -05:00
LetterJay 3d750adbd7 master cleanup 2017-06-05 22:50:31 -05:00
LetterJay a8fe8fd1aa cleanup 2017-06-05 22:49:04 -05:00
LetterJay 43a3a6b52a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27708 2017-06-05 22:48:20 -05:00
LetterJayandGitHub b36e3065e0 Merge branch 'master' into upstream-merge-27712 2017-06-05 22:46:25 -05:00
LetterJay 891060c7f2 cleanup 2017-06-05 22:43:49 -05:00
LetterJay 9dcba474a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27714 2017-06-05 22:42:58 -05:00
LetterJay be38799933 cleanup 2017-06-05 22:39:51 -05:00
LetterJayandGitHub 26fbf3632d Merge pull request #1427 from Citadel-Station-13/upstream-merge-28069 
[MIRROR] Makes cable great again
 2017-06-05 20:25:31 -05:00
CitadelStationBot 564426fe3e Makes cable great again 2017-06-05 16:39:37 -05:00
LetterJay 18a98963b3 updater world.dm 2017-06-05 11:21:48 -05:00
LetterJay 8add0bbf63 missing stack icons 2017-06-05 10:48:03 -05:00
LetterJayandGitHub dfe99653fa Rename server_to_bridge_port.txt to server_to_tool_bridge_port.txt 2017-06-05 07:43:33 -05:00
CitadelStationBot 7bfdf3402b Automatic changelog generation for PR #1412 [ci skip] 2017-06-05 07:37:14 -05:00
LetterJayandGitHub 1a32b7605d Merge pull request #1411 from Citadel-Station-13/TGS3-Config-Changes 
TGS3 config changes
 2017-06-05 07:37:05 -05:00
LetterJay d12546ef35 Improper mirror 2017-06-05 07:25:02 -05:00
LetterJay 60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
LetterJayandGitHub b93c49bd1d Merge pull request #1410 from Citadel-Station-13/upstream-merge-28090 
[MIRROR] Fixes roundstart spawning
 2017-06-05 05:12:06 -05:00
LetterJayandGitHub 3429693bc9 Merge pull request #1404 from Citadel-Station-13/upstream-merge-26647 
[MIRROR] Refactors the latejoin list
 2017-06-05 04:49:27 -05:00
LetterJay 7a7f00bdd1 THE DEVIL 2017-06-05 04:35:22 -05:00
LetterJay 5b6907c9e8 yeeehaaaww 2017-06-05 04:24:57 -05:00
CitadelStationBot d22704b37c Fixes roundstart spawning 2017-06-05 04:04:22 -05:00
LetterJay 1690ac291b missing beacon icons 2017-06-05 03:19:30 -05:00
LetterJayandGitHub 2eb7872a6a Merge pull request #1285 from Citadel-Station-13/upstream-merge-27782 
[MIRROR] Adds coalesce to world.internet_address
 2017-06-05 02:12:56 -05:00
LetterJay 803f7a46c4 magic SQL shit 2017-06-05 01:56:23 -05:00