CitadelStationBot
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
Poojawa
235236c5a9
updates tool folder ( #2905 )
...
* updates tool folder
* impliments #2874 changes
2017-09-22 21:56:34 -05:00
CitadelStationBot
fe00ad6b4b
Remaps vuonojenmustaturska to Naksu ( #2776 )
2017-09-15 03:34:39 -05:00
Jordan Brown
5b0d8c9470
Caches the github diff for has_tree_been_edited ( #30578 )
2017-09-12 14:16:20 -05:00
LetterJay
9f52791492
Update github_webhook_processor.php
2017-09-11 22:28:26 -05:00
Jordan Brown
4383f5e70f
Gives the webhook processor the ability to self update
2017-09-11 21:00:12 -05:00
LetterJay
337e765d09
Update github_webhook_processor.php
2017-09-11 14:13:23 -05:00
Jordan Brown
71e87d851c
Adds Features per Fix tracking
2017-09-08 10:28:02 -05:00
Poojawa
ed4488bd1d
cleans merge conflict mess of #2638 ( #2639 )
2017-09-08 06:55:51 -05:00
Jordan Brown
34315805ba
Fixes tgstation-server autotagging
2017-09-07 05:20:03 -05:00
LetterJay
92b7af7e14
commit
2017-09-02 23:39:20 -05:00
LetterJay
29f0e2edd4
Rename toolsmerge-upstream-pull-request.sh to merge-upstream-pull-request.sh
2017-09-01 22:31:16 -05:00
kevinz000
0d36f6dd47
Update toolsmerge-upstream-pull-request.sh ( #2579 )
2017-09-01 19:02:13 -07:00
JamieH
120c1724ed
Update toolsmerge-upstream-pull-request.sh
2017-08-30 16:31:40 +01:00
LetterJay
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
CitadelStationBot
6541ea749c
Fixes midi2piano ( #2433 )
2017-08-19 18:59:35 -07:00
CitadelStationBot
10807cb1b9
Patch DMITool's import to accept pngs with no alpha channel
2017-08-19 18:39:13 -05:00
CitadelStationBot
46c43c7ae7
Removes out of date colon operator log
2017-08-16 17:49:13 -05:00
CitadelStationBot
0b516b5759
Makes [WIP] and [DNM] case insensitive for autotagging
2017-08-09 03:24:08 -05:00
CitadelStationBot
d76598e167
Adds log parsing sql email alert script
2017-08-06 03:10:55 -05:00
CitadelStationBot
cee5ab815a
Cleans up the tools folder ( #2171 )
2017-07-28 23:50:56 -07:00
CitadelStationBot
97269f8cd1
Prevents github bot from removing Sprites and Sound labels ( #1978 )
2017-07-11 22:14:57 -07:00
CitadelStationBot
efae0e576e
Allows [s] to be used anywhere in the title ( #1923 )
2017-07-07 04:46:26 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
a620ef5ad3
Adds auto labelling of changes to the SQL, icons, and sounds trees. Also autolabels reverts
2017-06-28 12:08:30 -05:00
CitadelStationBot
92da94ca2a
[MIRROR] Fixes mapmerge ( #1296 )
...
* Fixes mapmerge
* Update mapmerger.py
* Delete mapmerger.py.rej
2017-06-28 01:43:26 -05:00
CitadelStationBot
d99ccf36a2
Replaces old midi2piano with a new version
2017-06-26 22:06:15 -05:00
CitadelStationBot
60c5bdec07
PR webhook now adds the target repo's name to the message shown to players.
2017-06-15 19:51:32 -05:00
LetterJay
fa8f589e66
Merge pull request #1328 from Citadel-Station-13/upstream-merge-27904
...
[MIRROR] Moves tgstation-server
2017-06-02 22:45:10 -05:00
CitadelStationBot
34b81d5f6d
Moves tgstation-server
2017-06-01 09:16:35 -05:00
CitadelStationBot
293c873173
Moves dmm2tgm to mapmerge
2017-05-29 11:10:35 -05:00
CitadelStationBot
9006cfeb60
Map conversions will always write out LF ( #1212 )
2017-05-27 13:39:51 -07:00
LetterJay
e6c8385abc
Merge pull request #1201 from Citadel-Station-13/upstream-merge-27664
...
[MIRROR] Fixes typos and lies
2017-05-26 23:22:04 -05:00
CitadelStationBot
db90467ff2
Deletes the old java mapmerge
2017-05-26 13:22:05 -05:00
CitadelStationBot
3e05ac328a
Fixes typos and lies
2017-05-26 13:21:59 -05:00
Poojawa
186ed2acbb
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
2017-05-21 00:44:08 -05:00
LetterJay
0b1f4a27da
Merge pull request #452 from Citadel-Station-13/upstream-merge-26271
...
[MIRROR] tgstation-server 2.0
2017-05-21 00:25:43 -05:00
CitadelStationBot
395929c5e4
Travis CI build script fix ( #912 )
2017-05-11 18:25:44 -07:00
LetterJay
2abd7da7c4
Merge pull request #628 from Citadel-Station-13/upstream-merge-26642
...
[MIRROR] Fixes Linux buildscript chime when server ready
2017-05-02 11:14:56 -05:00
CitadelStationBot
a928f5dbaa
Removes some unused tools
2017-04-29 15:44:43 -05:00
CitadelStationBot
88323ff86c
Fixes Linux buildscript chime when server ready
2017-04-28 20:53:13 -05:00
LetterJay
61fee734f0
Merge pull request #530 from Citadel-Station-13/upstream-merge-26450
...
[MIRROR] Merge conflict tags aren't touched if github doesn't calculate them in time
2017-04-25 20:08:15 -05:00
CitadelStationBot
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
CitadelStationBot
7dccc9768f
Merge conflict tags aren't touched if github doesn't calculate them in time
2017-04-23 19:00:19 -05:00
CitadelStationBot
b42a27c712
tgstation-server 2.0
2017-04-18 04:55:14 -05:00
CitadelStationBot
010cd0b57d
Fixes Pull Request announcements not working in certain situations
2017-04-17 09:46:01 -05:00
CitadelStationBot
fd4b10e8b6
PR Mirror
2017-04-15 01:46:52 -05:00
LetterJay
6f239e6857
PRMirror
2017-04-15 01:03:44 -05:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
