Commit Graph

1921 Commits

Author SHA1 Message Date
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
LetterJay 905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJay fc1017fa14 Merge pull request #1287 from Citadel-Station-13/upstream-merge-27801
[MIRROR] Holocall cleanup
2017-06-05 23:19:23 -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 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
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 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
LetterJay 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
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 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
LetterJay b93c49bd1d Merge pull request #1410 from Citadel-Station-13/upstream-merge-28090
[MIRROR] Fixes roundstart spawning
2017-06-05 05:12:06 -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
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 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
CitadelStationBot 94405f5176 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363) 2017-06-04 09:10:35 -07:00
CitadelStationBot e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
CitadelStationBot 6e632190b3 Planned Spaceparenthood would like to apologize for mislabeling their cloning pod ejection buttons. (#1366) 2017-06-04 09:09:44 -07:00
CitadelStationBot 618d893388 wat (#1380) 2017-06-04 09:09:15 -07:00
CitadelStationBot 159f78efe7 Fixes #27989 : Riot suits no longer hide jumpsuits (#1379) 2017-06-04 09:09:03 -07:00
CitadelStationBot 79f28a732d Buffs chemical grenades (#1372) 2017-06-04 09:08:50 -07:00
CitadelStationBot 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
CitadelStationBot 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
CitadelStationBot c1adecc0e2 Fix AI status displays to use a list instead of the world list (#1391) 2017-06-04 09:08:04 -07:00
CitadelStationBot 7ec36019d5 Refactor another spawned cooldown var (#1383) 2017-06-04 09:07:49 -07:00
CitadelStationBot bfe11f8540 Fixes #27979 : Bulldog shotguns update properly when their magazine is removed. (#1377) 2017-06-04 09:07:36 -07:00
CitadelStationBot 8fcbf20c79 Another spawn timer (#1388) 2017-06-04 09:07:16 -07:00
CitadelStationBot 63f9657d9b Refactors a cooldown var to not require a spawn or sleep (#1381) 2017-06-04 09:06:47 -07:00
CitadelStationBot e57863cfe1 Refactor another spawn cooldown (#1385) 2017-06-04 09:06:38 -07:00
CitadelStationBot 1e12557776 Remove spawns in favour of stacktrace calls, which don't stop the called (#1382) 2017-06-04 09:06:27 -07:00
CitadelStationBot 6def6cddda Refactors yet another spawn cooldown (#1384) 2017-06-04 09:06:14 -07:00
CitadelStationBot ae1e159673 Remove a commented out function (#1389) 2017-06-04 09:06:02 -07:00
CitadelStationBot 8dae545d59 Goodbye spawn (#1387) 2017-06-04 09:05:47 -07:00
CitadelStationBot c77607e411 This doesn't do anything (#1390) 2017-06-04 09:05:28 -07:00
CitadelStationBot 9023e0ff67 refactor another spawn cooldown (#1392) 2017-06-04 09:05:12 -07:00
CitadelStationBot 1c1cbe8e5b Refactor another spawn var (#1395) 2017-06-04 09:04:56 -07:00
CitadelStationBot 9f02ba1245 Refactors another spawn cooldown var (#1393) 2017-06-04 09:04:49 -07:00
CitadelStationBot bf4973e580 Refactor another spawn (#1394) 2017-06-04 09:04:32 -07:00