Commit Graph

155 Commits

Author SHA1 Message Date
Gandalf
ef9e80482a a (#3819) 2021-03-03 23:42:47 +01:00
SkyratBot
1953b7ff5b [MIRROR] Removes the ban on line splitting, adds a note about its proper use (#3709)
* Removes the ban on line splitting, adds a note about its proper use (#57112)

* Removes the ban on line splitting, adds a note about its proper use

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-28 12:23:11 +00:00
SkyratBot
4707bc833b Fix my CODEOWNERS (#3687)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-02-27 12:35:37 +00:00
SkyratBot
e9896f3cf5 [MIRROR] Add more TGS setup info to the README (#3615)
* Add more TGS setup info to the README (#57124)

* Add more TGS setup info to the README

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-02-23 21:47:12 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
d2221bc210 [MIRROR] Removes tweak and replaces it with a tag for QoL and Atomic prs (#3374)
* Removes tweak and replaces it with a tag for QoL and Atomic prs (#56890)

* Removes tweak and replaces it with a tag for QoL and Atomic prs

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-02-14 03:40:19 +00:00
SkyratBot
84b751b381 [MIRROR] Write clear rules on descriptive and obvious names in the contribution guidelines (#3355)
* Write clear rules on descriptive and obvious names in the contribution guidelines (#56872)

This has more or less been enforced already by me and Rohesie, but puts it into clear writing, as the frequency of these names stays about the same.

Formally bans variables like M, C, and H. Writes an exclusion for `i`, as though I don't like this one, I believe other maintainers disagree. Let me know if I'm misinformed.

Also adds some additional details on negated names, such as `is_not_flying` -> `is_flying`.

* Write clear rules on descriptive and obvious names in the contribution guidelines

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-13 23:32:29 +00:00
SkyratBot
8653572845 [MIRROR] Contribution guidelines: type checks in lists (#3304)
* Contribution guidelines: type checks in lists (#56761)

* Updates the contribution guidelines to include the `as anything` key to skip checks in lists.
* Reduces the explanation a bit, to make it more succinct.
* Makes the examples use default byond types and vars, and code that actually compiles, instead of pseudo-code. Plus early continues, because they're good.

* Contribution guidelines: type checks in lists

Co-authored-by: Rohesie <rohesie@gmail.com>
2021-02-11 20:01:19 +00:00
Useroth
ef6481e253 Missed PR mirrors from tgstation (https://github.com/tgstation/tgstation/pull/55373 and https://github.com/tgstation/tgstation/pull/56080) (#2759)
* Mirror of tgstation's Common Build Tooling (#55373)

* tgui 4.3 (#56080)

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2021-01-18 07:42:54 +01:00
SkyratBot
f8f8c9e393 [MIRROR] Use draft pull requests instead of the 'Work In Progress' and 'Needs Review' labels. (#2728)
* Use draft pull requests instead of the 'Work In Progress' and 'Needs Review' labels. (#56168)

* Use draft pull requests instead of the 'Work In Progress' and 'Needs Review' labels.

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-01-17 13:06:05 +01:00
SkyratBot
0a420291ed [MIRROR] Updates Contribution Guidelines regarding Prior Approval for Station Maps (#2718)
* Updates Contribution Guidelines regarding Prior Approval for Station Maps (#56166)

Updates the contribution guidelines to require the addition, removal or replacement of station maps to require prior approval before making the PR.

Ultimately shouldn't change much about how the PRs are handled, but gives an early warning that approval should be sought and should help cut down on lost time mapping if I would reject a PR outright. With how long station maps take to make, prior warning that it outright won't be merged is, in my opinion, good.

* Updates Contribution Guidelines regarding Prior Approval for Station Maps

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2021-01-16 00:49:08 +01:00
SkyratBot
bf854ac799 [MIRROR] Update documentation with the new build process (#2708)
* Update build process in documentation (#56173)

Building tgstation is a bit different nowadays, so I've updated the
docs a bit.

* Update documentation with the new build process

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2021-01-16 00:40:09 +01:00
Alex 'Avunia' Takiya
bea83b2999 [MANUAL MIRROR] Use portable Python for map merge hooks, other tools / Add .dmm merge driver (#2681)
* Use portable Python for map merge hooks, other tools (#55658)

* Add .dmm merge driver (#55699)

This is kind of a prototype. It only fully handles a few situations, 
and doesn't produce particularly easy-to-read conflict markers when it 
fails. I hope that it can be useful at least some of the time, can be 
improved over time, and that the lessons learned can influence a future 
interactive GUI conflict resolver (integrated into StrongDMM?). In the 
worst case, one can fall back to the tried and true "manually re-do one 
side's changes" strategy. 

**Automatic use**: In `tools/hooks/`, run `Install.bat`

**Manual use**, for Git GUIs that don't run merge drivers: while a 
merge is in progress, in `tools/mapmerge2/`, double-click `Resolve Map 
Conflicts.bat`

This PR also removes the error-prone "Prepare Maps.bat" / 
"mapmerge.bat" workflow. Those who aren't using the hooks should 
instead use `Run Before Committing.bat` before committing. First-time 
contributors who opened a PR without map merging can be advised to run 
`I Forgot To Map Merge.bat`.

* Fix loose double-quot in tradership_faction.dmm

Co-authored-by: Tad Hardesty <tad@platymuus.com>
2021-01-14 16:52:24 +01:00
SkyratBot
66a822067c [MIRROR] Add testing rule to contribution guidelines (#2690)
* Add testing rule to contribution guidelines (#56147)

Adds a clause to the contributing guidelines that you are expected to have tested your code, which implicitly bans webedited larger PRs. Also updates the wording about changelogs.

* Add testing rule to contribution guidelines

Co-authored-by: Rob Bailey <actioninja@gmail.com>
2021-01-14 15:03:16 +01:00
Alex 'Avunia' Takiya
406348a10c Add active test merges to stale exemption (#2636) 2021-01-11 13:28:37 +00:00
Alex 'Avunia' Takiya
42e4f49463 Update feature request issue template (#2585)
Copies a modified version of the pull request template to replace the tgstation forums URL
2021-01-09 19:47:13 +01:00
Useroth
412da03049 Let's fix bonked workflow files (#2059)
* Update update_tgs_dmapi.yml

* Update update_tgs_dmapi.yml
2020-12-06 20:48:15 +00:00
SkyratBot
2d58d386ef [MIRROR] Migrate some docs from the GitHub wiki into the repository (#2027)
* Merge pull request #55268 from AutomaticFrenzy/patch/docs-from-github-wiki

Migrate some docs from the GitHub wiki into the repository

* Migrate some docs from the GitHub wiki into the repository

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-12-03 17:16:02 +00:00
SkyratBot
67a9fd3a45 [MIRROR] Remove the hyphen from the default value of the github url string (no longer -tg-station) (#1858)
* Remove the hyphen from the default value of the github url string (no longer -tg-station) (#55136)

* Remove the hyphen from the default value of the github url string (no longer -tg-station)

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-11-26 23:18:34 +00:00
Useroth
efdcd78046 Update CODEOWNERS (#1747) 2020-11-20 21:24:14 +00:00
SkyratBot
b357fa714d [MIRROR] Adds the use of delta-time to the contribution guidelines (#1748)
* Adds the use of delta-time to the contribution guidelines (#54911)

Delta-time is a concept we added but isn't used a lot yet, I think adding it to the contribution guidelines with an explanation of how to actually use it (As its a concept that only really applies to game dev afaik, and isn't something everyone is familiar with) will increase the amount of people using it.

* Adds the use of delta-time to the contribution guidelines

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-20 20:14:46 +00:00
SkyratBot
84743b612e Improve naming in new GitHub actions (#1624)
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-11-08 05:00:49 +00:00
SkyratBot
42a9493776 [MIRROR] Fix the "payment required" crap CI is failing on (#1574)
* Merge pull request #54805 from Jared-Fogle/pay-up

Fix the "payment required" crap CI is failing on

* Fix the "payment required" crap CI is failing on

Co-authored-by: oranges <email@oranges.net.nz>
2020-11-05 13:48:53 +01:00
SkyratBot
730067a7dc [MIRROR] Annotate lint output for nice inline viewing (#1551)
* Annotate lint output for nice inline viewing (#54735)

* Annotate lint output for nice inline viewing

* Update .github/workflows/test.yml

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Annotate lint output for nice inline viewing

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
2020-11-02 22:12:47 +00:00
SkyratBot
d89c12eab5 [MIRROR] Completely replace Travis and AppVeyor with GitHub Actions (#1519)
* Completely replace Travis and AppVeyor with GitHub Actions

* Delete .travis.yml

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-01 16:41:43 +00:00
SkyratBot
fa3d2b1f59 [MIRROR] Use a more common documentation block standard. (#1533)
* Use a more common documentation block standard. (#54623)

* Use a more common documentation block standard.

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-11-01 11:30:55 +01:00
SkyratBot
d13a8ff21d [MIRROR] Adds linting guidelines to CONTRIBUTING.md (#1504)
* Adds linting guidelines to CONTRIBUTING.md (#54646)

* Adds linting guidelines to CONTRIBUTING.md

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-10-30 02:27:34 +00:00
SkyratBot
10e705b038 [MIRROR] Veni, Vidi, Vici (#1486)
* adds myself to codeowners (#54634)

* Veni, Vidi, Vici

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2020-10-27 09:06:22 +00:00
SkyratBot
9f75f03239 [MIRROR] Fix git add in DMAPI update action (#1418)
* Fix git add in DMAPI update action (#54505)

Old command won't add new files. git hard.

* Fix git add in DMAPI update action

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-22 04:37:58 +02:00
SkyratBot
d21d31d3a8 [MIRROR] Better script for docker (#1417)
* Better script for docker (#54501)

The linux one shot script is not a drop-in for the docker script. Let's separate the two.

* Better script for docker

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-22 04:37:29 +02:00
SkyratBot
59796ef157 [MIRROR] Resolves an inaccuracy in CONTRIBUTING.md (#1395)
* resolves an inaccuracy in CONTRIBUTING.md (#54469)

* Resolves an inaccuracy in CONTRIBUTING.md

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-10-20 16:44:34 +01:00
SkyratBot
c414a1cdb8 [MIRROR] Clearing my assignment here (#1368)
* Clearing my assignment here (#54449)

Because that'd basically be roundabout self-merging

* Clearing my assignment here

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-19 08:56:40 +02:00
SkyratBot
0bd60dbbe8 Fix DMAPI auto updater (#1355)
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-18 01:22:31 +01:00
SkyratBot
6d8dc769f6 [MIRROR] Getters/setters on the contribution guidelines (#1328)
* Getters/setters on the contribution guidelines (#54384)

Adds recommendations about getters and setters to the contribution guidelines.
Does two minor tweaks on other topics, for clarity mostly.

* Getters/setters on the contribution guidelines

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-10-15 22:08:30 +01:00
SkyratBot
e67c72e6f8 [MIRROR] Fixes compile changelog action. Hopefully. (#1296)
* Fixes compile changelog action. Hopefully. (#54359)

* Fixes compile changelog action. Hopefully.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2020-10-14 00:07:37 +01:00
SkyratBot
ecbd625ed1 [MIRROR] Host owns the config (#1293)
* Host owns the config (#54278)

* Host owns the config

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2020-10-13 23:20:47 +02:00
SkyratBot
bf45bab485 [MIRROR] Makes changelog compile only fire if CHANGELOG_ENABLER secret is present (#1046)
* Makes changelog compile only fire if CHANGELOG_ENABLER secret is present (#53845)

Not tested yet, so please speak up if you notice anything off.

For any interested downstream/fork maintainers reading this:

You need to add CHANGELOG_ENABLER secret with some nonempty value to your repository if you want this action to continue to work as before.

* Makes changelog compile only fire if CHANGELOG_ENABLER secret is present

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2020-09-29 13:56:35 +02:00
SkyratBot
ac7b25e9bf [MIRROR] JATUM (#1045)
* JATUM (#53831)

Adds the JATUM serialization system. Inspired by @ RemieRichards. Allows for easy serialization and deserialization of trivial datums.

Also adds a missing html_encode.

* JATUM

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-09-29 12:33:17 +02:00
SkyratBot
e69f9de251 [MIRROR] Disable TGS DMAPI Update Workflow while I'm away (#904)
* Merge pull request #53877 from tgstation/Cyberboss-patch-1-1

Disable TGS DMAPI Update Workflow while I'm away

* Disable TGS DMAPI Update Workflow while I'm away

Co-authored-by: oranges <email@oranges.net.nz>
2020-09-21 15:36:53 +01:00
SkyratBot
e235507979 [MIRROR] Updates the tgs-dmapi-updater action reference (#825)
* Updates the tgs-dmapi-updater action reference (#53777)

* Updates the tgs-dmapi-updater action reference

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-09-17 00:10:26 +01:00
SkyratBot
5b2b643a0a [MIRROR] Add workflow_dispatch to TGS DMAPI update action for testing (#824)
* Add workflow_dispatch to TGS DMAPI update action for testing (#53775)

* Add workflow_dispatch to TGS DMAPI update action for testing

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-09-17 00:10:17 +01:00
SkyratBot
2c7889a808 [MIRROR] Adds a GitHub action to automatically update the DMAPI (#823)
* Merge pull request #53674 from tgstation/Cyberboss-patch-2

Adds a GitHub action to automatically update the DMAPI

* Adds a GitHub action to automatically update the DMAPI

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-09-16 12:41:22 +02:00
SkyratBot
c87636c2bc [MIRROR] Update bad link in CONTRIBUTING.md (#809)
* Update bad link in CONTRIBUTING.md (#53688)

* Update bad link in CONTRIBUTING.md

Co-authored-by: msgerbs <msgerbs@users.noreply.github.com>
2020-09-15 22:43:41 +01:00
SkyratBot
79a32a11e4 [MIRROR] Create MAINTAINER_GUIDELINES.md (#792)
* Create MAINTAINER_GUIDELINES.md (#53665)

* Create MAINTIAINER_GUIDELINES.md

This is echoing a post I made on the maintainer team page.

* Fix typo in file name

* Create MAINTAINER_GUIDELINES.md

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-09-14 00:42:16 +02:00
SkyratBot
3ab227eafa [MIRROR] Adds some robust database programming tips to contributing.md (#615)
* Adds some robust database programming tips to contributing.md (#53347)

* Adds some robust database programming tips to contributing.md

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2020-09-02 03:09:04 +02:00
SkyratBot
b816ef4b87 [MIRROR] Adds a requirement to profile optimizations to contributing.md (#546)
* Adds a requirement to profile optimizations to contributing.md (#53235)

Co-authored-by: TiviPlus <TiviPlus>

* Adds a requirement to profile optimizations to contributing.md

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-08-27 22:10:52 +02:00
SkyratBot
e4c1d0925a [MIRROR] Asserts dominance over the atmos system (#520)
* Asserts dominance (#53194)

* Asserts dominance over the atmos system

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-08-26 01:39:36 +02:00
SkyratBot
3acf2f5fc2 [MIRROR] Add me as codeowner for unit tests (#498)
* Add me as codeowner for unit tests (#53166)

* Add me as codeowner for unit tests

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-08-24 23:55:12 +02:00
SkyratBot
971b0ba1de [MIRROR] tgchat: Hotfixes, Message Annotations (#364)
* tgchat: Hotfixes, Message Annotations (#52947)

This PR changes the message pipeline a little bit to support list-based messages, which can be annotated with custom data. Function signature of to_chat was slightly changed as well:

// Plain text message
to_chat(client,
  type = MESSAGE_TYPE_INFO,
  text = "foo")

// HTML message
to_chat(client,
  type = MESSAGE_TYPE_INFO,
  html = "<span class='notice'>foo</span>")

Old to_chat format is still supported, but handle_whitespace, trailing_newline and confidential flags have no effect. confidential flag could still be revived though, if there is enough merit in it, for example to filter out confidential messages when saving a chat log.

The reason for using /list and not /datum, is because lists are plain faster, and there are minimal data transformations - these lists are fed directly to json_encode and sent to tgchat.

Plain text messages do not need to be HTML-escaped, which makes them safer and more performant than HTML messages. Plain text messages can be made interactive (or formatted with CSS) by custom-handling them in javscript based on message type and annotations.

It would be impossible to annotate every single message in the game (at the moment of writing, there are 9447 to_chat calls in the code), but it could be done selectively, for only those messages that are hard to classify by span classes (and there are still A LOT of them).
Please annotate more messages. Thank you.

    Fixes #52943
    Fixes #52908
    Fixes #52816

Changelog

cl
add: tgchat: Unread message count is now smarter and won't increase on other tabs if you have already read the same message in the active tab.
add: tgchat: Admin PMs are now properly annotated and can be filtered into separate tabs.
fix: tgchat: Fix: Highlighted message overlay no longer blocks clicks. Clicking a highlighted (F) link should work as it should.
fix: tgui: Fixed NTOS bluescreen due to calling .includes() on a stylesheet href which could be null on certain browsers.
code: tgchat: Chat schema bumped to version 5. All chat-related settings were reset to avoid breakage.
/cl

* tgchat: Hotfixes, Message Annotations

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-08-17 14:48:28 +02:00
Useroth
b7b32cb604 Let's disable docker publishing (#291) 2020-08-11 20:53:46 +02:00