597111234e
Enforces utf-8 encoding on all changelog files. ( #34434 )
...
* Enforces utf-8 encoding on all changelog files.
* Lets python3 use pip
* py2.7 begone
2018-01-14 12:39:49 -06:00
12da7d5dec
Fix the batch file method of mapmerge2 and save a .before ( #34361 )
2018-01-12 09:44:00 -06:00
32052fd06f
Fixes BUILD_TESTING logic being inverted ( #34201 )
2018-01-10 03:11:40 -06:00
d4cf5d2eba
Merge branch 'master' into upstream-merge-34067
2018-01-08 20:01:59 +00:00
065b616af8
Removes standard resources from config tree
2018-01-07 20:32:08 -06:00
c4501563b1
tools sync, fixes minor regression in traumas.json. travis is broken too
2018-01-04 11:00:50 -05:00
2c350fcb6c
Autotag .github => GitHub ( #33965 )
2018-01-01 04:01:33 -06:00
61f00cbfb0
Add a new and improved mapmerge ( #33869 )
...
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
2017-12-29 00:28:25 -06:00
636a87ab8f
The runtime condenser now supports taking input from stdin and outputting on stdout
2017-12-21 00:45:37 -06:00
0dc826735b
Adds a python script to load jsons to prevent any syntax error on them ( #33001 )
...
* Adds a python script to load jsons to prevent any syntax error on them
* Corrects identation on hallucination.json
2017-11-24 12:59:41 -06:00
2f11412766
[MIRROR] Webhook processor will comment negative PR balances on unlabelled PRs ( #3970 )
...
* Webhook processor will comment negative PR balances on unlabelled PRs (#32771 )
* Webhook processor will comment negative PR balances on unlabelled PRs
2017-11-17 00:26:08 -08:00
c23f12eaa8
Merge pull request #32429 from MrStonedOne/patch-446
...
Fix webhook
2017-11-05 14:34:15 -06:00
012ab11173
Merge pull request #3768 from Citadel-Station-13/upstream-merge-32319
...
[MIRROR] Fixes Sounds detection in webhook
2017-11-03 00:14:29 -05:00
de38417c37
Fixes Sounds detection in webhook ( #32319 )
2017-11-02 13:27:06 -05:00
c3fab199be
Huge atmos nerf, tweak buff ( #32285 )
...
It's not that different from other subsystems to justify the huge extra point cost, and the people who make atmos related changes have attained a great number of points.
Tweak is for small things that shouldn't affect the point balance either way
2017-11-02 04:16:38 -05:00
a7cd317dae
Contributors can add the ready tag to their own prs ( #32062 )
...
* Contributors can add the ready tag
* Webhook synchronize case pushes update at the end
* Fixes pr not getting tagged when opened
2017-11-01 21:37:10 -05:00
bfb51941e7
Merge pull request #3733 from Citadel-Station-13/upstream-merge-32297
...
[MIRROR] Improves webhook logging (and fixes the bug that broke it)
2017-11-01 01:44:38 -04:00
a02d9f2106
Merge pull request #32297 from MrStonedOne/patch-444
...
Improves webhook logging (and fixes the bug that broke it)
2017-10-31 17:08:18 -05:00
fcfc1d82c9
Webhook now comments its diff ( #32151 )
...
* Webhook now comments its diff instead of its dump
* Fixes variable access in webhook
* Fixes webhook regex flaw
* Missing semicolon in webhook
well... I don't have much to say to you
this is... i mean... 😀 😀 😁 😁 😁 😁 😂 😂 😂 😂 😂 😂 😂 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭 😭
* Fixes anoher webhook regex issue
* Re-adds content to webhook update
* Encapsulates webhook diff in <details>
2017-10-31 15:21:27 -05:00
d9bb2bc4e6
Merge pull request #32157 from JJRcop/patch-2
...
Fixes webhook tagging when tree is found anywhere
2017-10-30 14:58:11 -05:00
81abe4f1e2
Merge pull request #3627 from Citadel-Station-13/upstream-merge-32050
...
[MIRROR] Use phpenv for the php build in travis instead of a PPA
2017-10-28 03:16:26 -04:00
df370b0692
Update build_tools.sh
2017-10-27 15:32:00 -05:00
23af6f7f52
Use phpenv for the php build in travis instead of a PPA
2017-10-26 05:09:33 -05:00
76efd703da
Webhook processor no longer removes [tags] from titles ( #32053 )
...
* Webhook processor no longer removes [tags] from titles
This was shit
* Does the oranges
2017-10-26 05:08:22 -05:00
1eaaf665f9
Renames 'Ready for Review' to 'Review Again' ( #31995 )
2017-10-23 00:10:40 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
66834cd3dc
Changes starting PR balance to 5
2017-10-16 15:12:00 -05:00
b7128a4508
Fix TGUI compiler git updates
2017-10-12 12:34:27 -05:00
ad43fdd5e8
Merge pull request #3192 from Citadel-Station-13/upstream-merge-31307
...
[MIRROR] Fixes maintainer detection for review auto-tagging
2017-10-07 01:07:12 -04:00
63ff77842f
Fixes maintainer detection for review auto-tagging ( #31307 )
...
* Fixes maintainer detection for review auto-tagging
* User not author
* oranges was right
2017-10-06 21:34:38 -05:00
70a5c4f80e
Autotagging tgui tree to UI label ( #31353 )
2017-10-06 21:29:14 -05:00
fef5c53791
Merge pull request #31173 from tgstation/Cyberboss-patch-3
...
Edits to code/controllers/configuration/entries autotag Config Update
2017-10-01 15:25:40 -05:00
f508d248be
Merge pull request #31091 from tgstation/Cyberboss-patch-1
...
Gives 1 GBP for Grammar and formatting
2017-09-28 21:55:35 -05:00
11ebba05e4
[MIRROR] Travis improvements for tools and trusty environment bump ( #2900 )
...
* Travis improvements for tools and trusty environment bump
We now run a php linter on the webhook
We now combine and build all maps in the right build script
Because only the byond build will use the maps this shouldn't
run in the tools script file, this is only working because of
the order the build scripts are run in the travis yml
* Travis improvements for tools and trusty environment bump
2017-09-22 22:36:41 -05:00
235236c5a9
updates tool folder ( #2905 )
...
* updates tool folder
* impliments #2874 changes
2017-09-22 21:56:34 -05:00
fe00ad6b4b
Remaps vuonojenmustaturska to Naksu ( #2776 )
2017-09-15 03:34:39 -05:00
5b0d8c9470
Caches the github diff for has_tree_been_edited ( #30578 )
2017-09-12 14:16:20 -05:00
9f52791492
Update github_webhook_processor.php
2017-09-11 22:28:26 -05:00
4383f5e70f
Gives the webhook processor the ability to self update
2017-09-11 21:00:12 -05:00
337e765d09
Update github_webhook_processor.php
2017-09-11 14:13:23 -05:00
71e87d851c
Adds Features per Fix tracking
2017-09-08 10:28:02 -05:00
ed4488bd1d
cleans merge conflict mess of #2638 ( #2639 )
2017-09-08 06:55:51 -05:00
34315805ba
Fixes tgstation-server autotagging
2017-09-07 05:20:03 -05:00
92b7af7e14
commit
2017-09-02 23:39:20 -05:00
29f0e2edd4
Rename toolsmerge-upstream-pull-request.sh to merge-upstream-pull-request.sh
2017-09-01 22:31:16 -05:00
0d36f6dd47
Update toolsmerge-upstream-pull-request.sh ( #2579 )
2017-09-01 19:02:13 -07:00
120c1724ed
Update toolsmerge-upstream-pull-request.sh
2017-08-30 16:31:40 +01:00
a389945f28
Merge pull request #2434 from Citadel-Station-13/upstream-merge-30012
...
[MIRROR] Patch DMITool's import to accept pngs with no alpha channel
2017-08-20 09:46:55 -05:00
6541ea749c
Fixes midi2piano ( #2433 )
2017-08-19 18:59:35 -07:00
10807cb1b9
Patch DMITool's import to accept pngs with no alpha channel
2017-08-19 18:39:13 -05:00
AnturK