Commit Graph
1228 Commits
Author SHA1 Message Date
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -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
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
LetterJay 905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJayandGitHub 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
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 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 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
LetterJay 60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -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
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
CitadelStationBot e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBotandkevinz000 94405f5176 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363) 2017-06-04 09:10:35 -07:00
CitadelStationBotandkevinz000 e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
CitadelStationBotandkevinz000 159f78efe7 Fixes #27989 : Riot suits no longer hide jumpsuits (#1379) 2017-06-04 09:09:03 -07:00
CitadelStationBotandkevinz000 b5d2cf3c99 [READY] Stacks will change item_states and w_class based on how full they are. (#1370) 2017-06-04 09:08:33 -07:00
CitadelStationBotandkevinz000 4ac745a275 the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#1375) 2017-06-04 09:08:19 -07:00
CitadelStationBotandkevinz000 c1adecc0e2 Fix AI status displays to use a list instead of the world list (#1391) 2017-06-04 09:08:04 -07:00
CitadelStationBotandkevinz000 bfe11f8540 Fixes #27979 : Bulldog shotguns update properly when their magazine is removed. (#1377) 2017-06-04 09:07:36 -07:00
CitadelStationBotandkevinz000 63f9657d9b Refactors a cooldown var to not require a spawn or sleep (#1381) 2017-06-04 09:06:47 -07:00
CitadelStationBotandkevinz000 ae1e159673 Remove a commented out function (#1389) 2017-06-04 09:06:02 -07:00
CitadelStationBotandkevinz000 c77607e411 This doesn't do anything (#1390) 2017-06-04 09:05:28 -07:00
CitadelStationBotandkevinz000 1c1cbe8e5b Refactor another spawn var (#1395) 2017-06-04 09:04:56 -07:00
CitadelStationBotandkevinz000 9f02ba1245 Refactors another spawn cooldown var (#1393) 2017-06-04 09:04:49 -07:00
CitadelStationBotandkevinz000 0455bf5f9a we have to move forward with grammar fixes (#1397) 2017-06-04 09:04:03 -07:00