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 |
|
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 |
|
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
|
159f78efe7
|
Fixes #27989 : Riot suits no longer hide jumpsuits (#1379)
|
2017-06-04 09:09:03 -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
|
bfe11f8540
|
Fixes #27979 : Bulldog shotguns update properly when their magazine is removed. (#1377)
|
2017-06-04 09:07:36 -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
|
ae1e159673
|
Remove a commented out function (#1389)
|
2017-06-04 09:06:02 -07:00 |
|
CitadelStationBot
|
c77607e411
|
This doesn't do anything (#1390)
|
2017-06-04 09:05:28 -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
|
0455bf5f9a
|
we have to move forward with grammar fixes (#1397)
|
2017-06-04 09:04:03 -07:00 |
|
CitadelStationBot
|
c36e599a6a
|
Fixes AOE modkits not working because I messed up the logic (#1400)
|
2017-06-04 09:03:45 -07:00 |
|
CitadelStationBot
|
eeda9fd77f
|
Proposal: typed map variables (#1398)
|
2017-06-04 09:03:38 -07:00 |
|
CitadelStationBot
|
e59e7f8d06
|
Fixes bsa not showing up (#1396)
|
2017-06-04 09:03:30 -07:00 |
|
CitadelStationBot
|
13767b91ad
|
Fixes admiral recall (#1374)
|
2017-06-04 02:18:42 -07:00 |
|
CitadelStationBot
|
c82c71a6c1
|
Removes poison pen. (#1295)
|
2017-06-03 06:39:23 -07:00 |
|
CitadelStationBot
|
f8505883d4
|
Removes dragoontomb ruin and loot. (#1290)
|
2017-06-03 06:39:11 -07:00 |
|
CitadelStationBot
|
32c288dfc8
|
Gives the pod people's dispenser all the chemicals they could ever want. (#1357)
|
2017-06-03 06:36:34 -07:00 |
|
CitadelStationBot
|
4a84f13ed0
|
Revert "[s]Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions""""""" (#1359)
|
2017-06-03 06:35:03 -07:00 |
|
CitadelStationBot
|
dfcd326337
|
[MIRROR] Typos in syndicate uplink descriptions (#1341)
* Typos in syndicate uplink descriptions
* Delete uplink_item.dm.rej
|
2017-06-03 06:28:48 -07:00 |
|
kevinz000
|
bce5cbd608
|
Delete corpse.dm.rej
|
2017-06-02 22:04:07 -07:00 |
|
kevinz000
|
804552355b
|
Update corpse.dm
|
2017-06-02 22:03:58 -07:00 |
|