Commit Graph

117 Commits

Author SHA1 Message Date
Tad Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Jordan Brown
482e83ce89 Merge pull request #37463 from praisenarsie/patch-39
Renames praisenarsie to Frozenguy5 in credits
2018-04-26 15:28:02 -05:00
vuonojenmustaturska
c8a91e0d13 Fixes runtime condenser (#37193)
* Fixes runtime condenser

* stray comment
2018-04-16 04:35:26 -05:00
Bjorn Neergaard
f56e139fda Use a rust DLL for logging (#36858)
By moving our logging to a DLL we see a drop in CPU/real time of 2-3 orders of magnitude. This is due to BYOND opening and closing file handles on every write, causing incredible amounts of unneeded overhead. The logging library also handles timestamps for us, further increasing performance gains.

This library will also allow for further offloading in the future, such as completely replacing file2text() and friends.

A pre-compiled DLL is bundled, but Linux users will have to compile manually. Directions can be found at the rust-g repo.

Log output is enhanced with millisecond time stamps:

[2018-04-01 15:56:23.522] blah blah blah

This includes runtimes as well, which benefit from the same timestamp improvements and no longer have hacky splitting code to add their own timestamps.

Log shutdown is handled in a dedicated proc called as late as possible, as rust-g integration expands this will be factored out into a generic native code shutdown proc.
2018-04-10 17:02:44 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot
bcc360d0d9 [MIRROR] Fixes omega detective office + prepare_maps change (#6110)
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
2018-03-26 04:31:41 -05:00
CitadelStationBot
67e6c464c3 [MIRROR] Test merge candidate is removed on commit push (#5878)
* Test merge candidate is removed on commit push (#36266)

* Test merge candidate is removed on commit push
2018-03-10 07:38:19 -06:00
CitadelStationBot
5776be9c1e [MIRROR] Fixes unicode changelog tags (#5679)
* Fixes unicode changelog tags (#35905)

* Fixes unicode changelog tags
2018-02-24 06:11:09 -06:00
LetterJay
d7a7bea995 Merge pull request #5439 from Citadel-Station-13/upstream-merge-35512
[MIRROR] Split up Revert/Removal
2018-02-13 06:28:42 -06:00
LetterJay
de4869542c Merge pull request #5443 from Citadel-Station-13/upstream-merge-35551
[MIRROR] Tests give 3 GBP
2018-02-13 06:28:33 -06:00
Jordan Brown
16de4e4c90 Disables max errors on travis compile (#35550) 2018-02-12 12:49:01 -06:00
Jordan Brown
b6ca568ac1 Tests give 3 GBP (#35551) 2018-02-12 12:47:48 -06:00
Jordan Brown
8c28ac1a1a Split up Revert/Removal 2018-02-12 09:22:07 -06:00
Jordan Brown
d1fea8e4f7 Removes Map Merge 1 2018-02-11 13:03:47 -06:00
CitadelStationBot
afb0b08837 [MIRROR] Fixes servant cyborgs with the Standard module not having Abscond (#5266)
* Fixes servant cyborgs with the Standard module not having Abscond

* Update clockwork_slab.dm

* Update clockwork_slab.dm
2018-02-05 01:39:36 -06:00
CitadelStationBot
0bb8649794 [MIRROR] Fix map keys overflowing earlier than expected (#5259)
* Merge pull request #35133 from AutomaticFrenzy/patch/key-overflow-fix

Fix map keys overflowing earlier than expected

* Fix map keys overflowing earlier than expected
2018-02-04 22:35:52 -06:00
CitadelStationBot
59fc595ba3 [MIRROR] Fix hook installation on Linux (#5244)
* Merge pull request #35161 from AutomaticFrenzy/patch/hook-install

Fix hook installation on Linux

* Fix hook installation on Linux
2018-02-04 22:21:05 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown
497dcd9d9e Merge pull request #34895 from JJRcop/patch-16
#34889 Fixes possible issue with set_labels
2018-01-24 14:51:59 -06:00
Jordan Brown
46692c87b4 Disable ruins for test run mode (#34653)
* Disable ruins for test run mode

* Fix

* Actually, let's enable them all

* That never happened
2018-01-20 05:28:45 -06:00
Tad Hardesty
f62aa9e21f Add READMEs to hooks and mapmerge2 directories (#34511) 2018-01-18 21:27:04 -06:00
deathride58
e14795291d Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319
[MIRROR] Fails travis on common mapping mistakes
2018-01-17 20:12:39 +00:00
LetterJay
78c33f32ba Update github_webhook_processor.php 2018-01-17 02:36:51 -06:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-16 14:37:26 -06:00
Jordan Brown
2b035d94c0 Fixes webhook diff selecting partial match 2018-01-16 07:43:03 -06:00
AnturK
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
Tad Hardesty
12da7d5dec Fix the batch file method of mapmerge2 and save a .before (#34361) 2018-01-12 09:44:00 -06:00
Jordan Brown
32052fd06f Fixes BUILD_TESTING logic being inverted (#34201) 2018-01-10 03:11:40 -06:00
deathride58
d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
Jordan Brown
065b616af8 Removes standard resources from config tree 2018-01-07 20:32:08 -06:00
deathride58
c4501563b1 tools sync, fixes minor regression in traumas.json. travis is broken too 2018-01-04 11:00:50 -05:00
Jordan Brown
2c350fcb6c Autotag .github => GitHub (#33965) 2018-01-01 04:01:33 -06:00
Tad Hardesty
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
Jordan Brown
636a87ab8f The runtime condenser now supports taking input from stdin and outputting on stdout 2017-12-21 00:45:37 -06:00
Leo
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
CitadelStationBot
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
oranges
c23f12eaa8 Merge pull request #32429 from MrStonedOne/patch-446
Fix webhook
2017-11-05 14:34:15 -06:00
LetterJay
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
JJRcop
de38417c37 Fixes Sounds detection in webhook (#32319) 2017-11-02 13:27:06 -05:00
oranges
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
JJRcop
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
LetterJay
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
oranges
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
JJRcop
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
Jordan Brown
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
LetterJay
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
LetterJay
df370b0692 Update build_tools.sh 2017-10-27 15:32:00 -05:00
oranges
23af6f7f52 Use phpenv for the php build in travis instead of a PPA 2017-10-26 05:09:33 -05:00
Kyle Spier-Swenson
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