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

1341 Commits

Author SHA1 Message Date
CitadelStationBot
7b6c76525c Trims whitelist entries and makes them use ckey() 2017-06-08 09:45:45 -05:00
LetterJay
190b47983c cleanup 2017-06-08 03:39:13 -05:00
LetterJay
9b840ae323 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:36:39 -05:00
LetterJay
923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881 
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
 2017-06-08 03:35:23 -05:00
LetterJay
3563459d15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:33:56 -05:00
LetterJay
ad97147dfe Merge pull request #1314 from Citadel-Station-13/upstream-merge-27870 
[MIRROR] Fixes ghosts using marker beacon
 2017-06-08 03:31:22 -05:00
LetterJay
f367878119 Merge pull request #1277 from Citadel-Station-13/upstream-merge-27773 
[MIRROR] Splits mining_mobs.dm into separate files
 2017-06-08 03:30:13 -05:00
LetterJay
d79bd3988c Merge pull request #1473 from Citadel-Station-13/upstream-merge-28158 
[MIRROR] Adds creamatoriums
 2017-06-08 03:27:35 -05:00
CitadelStationBot
d341334118 [s] Fixes IRC ahelps 2017-06-07 21:27:14 -05:00
CitadelStationBot
e21e4eac9d Adds creamatoriums 2017-06-07 20:45:26 -05:00
CitadelStationBot
06187dd178 Syndicate Uplink - Typos & Grammar mk2 2017-06-07 14:56:22 -05:00
CitadelStationBot
1ef233d304 I might HAVE accidently made dualwielding hilariously OP again so have a nerf! 2017-06-07 09:14:59 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
CitadelStationBot
2e75f2e61c gas miners only update overlays when they actually need to 2017-06-07 03:06:05 -05:00
LetterJay
b332506cf2 Merge pull request #1442 from Citadel-Station-13/upstream-merge-28105 
[MIRROR] Fixes logged out spawning new_players
 2017-06-06 23:33:35 -05:00
LetterJay
cc24b6e3a7 Merge pull request #1443 from Citadel-Station-13/whitelist 
testing
 2017-06-06 14:48:48 -05:00
LetterJay
ccd1235599 testing 2017-06-06 14:48:19 -05:00
CitadelStationBot
c5143880d2 Fixes logged out spawning new_players 2017-06-06 13:28:23 -05:00
CitadelStationBot
60f759e674 Graceful shutdown now asks the server to kill it 2017-06-06 13:26:07 -05:00
LetterJay
35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJay
962177c423 Merge branch 'master' into upstream-merge-27652 2017-06-05 23:16:40 -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
LetterJay
0b196930bb Merge pull request #1241 from Citadel-Station-13/upstream-merge-27708 
[MIRROR] Small outfit refactor
 2017-06-05 23:07:02 -05:00
LetterJay
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
LetterJay
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
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
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
CitadelStationBot
564426fe3e Makes cable great again 2017-06-05 16:39:37 -05:00
CitadelStationBot
0c6a4a538a Add status string for server tools 2017-06-05 16:28:19 -05:00
CitadelStationBot
f03aa5e0fa Adds some more syndicate equipment. 2017-06-05 13:50:54 -05:00
LetterJay
60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
LetterJay
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
cebutris
97027d1631 it actually works now 2017-06-05 03:37:25 -04:00
LetterJay
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
CitadelStationBot
e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
cebutris
ec90b20862 oof 2017-06-04 13:20:08 -04:00
CitadelStationBot
94405f5176 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363) 2017-06-04 09:10:35 -07:00