Commit Graph

475 Commits

Author SHA1 Message Date
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +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
1a66a7e3ff [MIRROR] Simplified Node Bootstrap mk. II (#3302)
* Simplified Node Bootstrap mk. II (#56797)

Script tools/bootstrap/node_.ps1 will now only download a single node.exe file (32-bit variant) and nothing more.
Since we don't need to unzip, we removed a dependency on a .NET component.
Removed logging, because TGS4 already logs stdout/err, while all this fancy output redirection breaks on older PowerShell versions.
node.bat uses a system-wide node exe if available
CBT will not mislead users by printing things like "missing tgstation.dmb"

* Simplified Node Bootstrap mk. II

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2021-02-11 19:50:02 +00:00
Gandalf
a94557ee41 hardate (#3218) 2021-02-09 00:00:46 +00:00
SkyratBot
02571bae25 [MIRROR] Revert "Use a dummy include to indicate TGUI isn't built" (#3181)
* Revert "Use a dummy include to indicate TGUI isn't built (#56470)" (#56711)

* Revert "Use a dummy include to indicate TGUI isn't built"

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2021-02-08 23:37:44 +00:00
SkyratBot
cc9ef500c7 [MIRROR] repaths plasteel tiles to iron (#3155)
* repaths plasteel tiles to iron

* Update robot_modules.dm

* a

* fuck me

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:29:36 +00:00
SkyratBot
628fb7b63c [MIRROR] Simplify Node bootstrapping (#3179)
* Simplify Node bootstrapping (#56713)

Fixes #56676 (can't test because author didn't answer my inquiries on discord)

- Script `tools/bootstrap/node_.ps1` will now only download a single `node.exe` file (32-bit variant) and nothing more.
- Since we don't need to unzip, we removed a dependency on a .NET component.
- Removed logging, because TGS4 already logs stdout/err, while all this fancy output redirection breaks on older PowerShell versions.
- `node.bat` uses a system-wide node exe if available
- CBT will not mislead users by printing things like "missing tgstation.dmb"

* Simplify Node bootstrapping

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2021-02-08 14:30:15 +00:00
SkyratBot
f4fd38b1a8 [MIRROR] Aquarium fish improvements (#3069)
* Aquarium fish improvements (#56573)

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

* Aquarium fish improvements

* Update mapping_helpers.dm

* Update packs.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 19:36:20 +00:00
SkyratBot
cd2cf79c55 [MIRROR] Skip first whitespace only lines in changelog PR parser (#3051)
* Skip first whitespace only lines (#56534)

Parser won't crash on first empty lines anymore.

* Skip first whitespace only lines in changelog PR parser

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2021-02-03 22:32:56 +00:00
SkyratBot
0d687afc93 [MIRROR] Reverts the recent config changes (#3039)
* Reverts the recent config changes

* aaa

* a

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-03 14:53:43 +00:00
SkyratBot
51bb9fb188 [MIRROR] Adds configuration consistency tests (#3036)
* Adds configuration consistency tests (#56562)

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

* Adds configuration consistency tests

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-03 14:24:16 +00:00
SkyratBot
c0cb9c1576 [MIRROR] Use a dummy include to indicate TGUI isn't built (#3025)
* Use a dummy include to indicate TGUI isn't built (#56470)

* Use a dummy include to indicate TGUI isn't built

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-02-02 19:04:26 +00:00
SkyratBot
fd766966d9 [MIRROR] Adds powershell require command to node bootstrap script. (#2939)
* Adds powershell require command to node bootstrap script.

* Update node_.ps1

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-29 16:34:41 +00:00
NotRanged
6401f881eb pls (#2851)
Co-authored-by: Ranged <nickvanderkroon@gmail.com>
2021-01-24 03:02:05 +00:00
SkyratBot
a104c83089 [MIRROR] cbt: Touch file targets after running the task (#2788)
* CBT: Touch file targets after running the task (#56229)

After task is done building, it touches file targets (because our script in the task may not always update our targets, e.g. compilation resulted in the same output), guaranteeing that the file was updated.

On a next rebuild, it sees that the file was touched and won't rebuild it.

Failures raise exceptions, so in that case they won't be touched.

Refactored things a bit, made some room for specifying "non-file" sources/targets later.

* cbt: Touch file targets after running the task

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2021-01-19 22:08:54 +00:00
SkyratBot
2c2396c84d [MIRROR] Add error handling for build tool (#2782)
* Add error handling for build tool (#56195)

* add some error handling for build tool

* Cosmetic changes

Co-authored-by: windarkata <windarkata@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Add error handling for build tool

Co-authored-by: windarkata <27014495+remove32@users.noreply.github.com>
Co-authored-by: windarkata <windarkata@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-01-19 10:35:50 +00:00
SkyratBot
ced918038e Fix tgui being built too often/not often enough (#2749)
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-18 19:27:42 +00:00
Gandalf2k15
9c9a93c2c0 aaa 2021-01-18 19:15:19 +00:00
SkyratBot
feb03de76f [MIRROR] Fix Docker build failing on a clean checkout (#2732)
* Fix Docker build failing on a clean checkout

* Update Dockerfile

* Update Dockerfile

* Update node

* Update Dockerfile

* Update node

* Update run_server.sh

* Update deploy.sh

Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-18 18:52:23 +00:00
SkyratBot
d6c7731955 Force UTF-8 encoding in tools/bootstrap/node_.ps1 (#2714)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-18 18:35:46 +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
b99505e5fd [MIRROR] Adds custom icon mapping helper. (#2748)
* Adds custom icon mapping helper. (#56183)

Allows embedding icon edits in your maps by fetching them from external host.
This is intended for use with live-loaded away/event maps not standard ones.

Also updates rustg defines to expose the additional options arguments. (https://github.com/tgstation/rust-g/pull/59)

* Adds custom icon mapping helper.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2021-01-17 13:40:10 +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
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
fc4353c695 [MIRROR] Optimize mapmerge's DMM.generate_new_key method (#2638)
* Optimize mapmerge's DMM.generate_new_key method (#56068)

Tested on #55867, takes the merge driver's runtime from 148.1s to 4.8s

* Optimize mapmerge's DMM.generate_new_key method

Co-authored-by: Tad Hardesty <tad@platymuus.com>
2021-01-12 01:44:56 +01:00
SkyratBot
76bb0c52c6 [MIRROR] Add export PKG_CONFIG_ALLOW_CROSS to PreCompile.sh (#2527)
* Add export PKG_CONFIG_ALLOW_CROSS to PreCompile.sh (#55909)

From the rust-g README

* Add export PKG_CONFIG_ALLOW_CROSS to PreCompile.sh

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-01-07 00:15:10 +01:00
SkyratBot
d7f054b035 [MIRROR] Refactors monkeys into a species (#2379)
* Refactors monkeys into a species

* aaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-31 21:08:07 +01:00
SkyratBot
600e8ba592 [MIRROR] You now get 1 GBP for sound and sprite PRs (#2361)
* You now get 1 GBP for sound and sprite PRs (#55611)

* You now get 1 GBP for sound and sprite PRs

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-12-29 02:39:16 +00:00
SkyratBot
286dbbc937 [MIRROR] removes all dirty map var edits from the codebase and reverts pixel_x/y grep (#2294)
* removes all dirty map var edits from the codebase and reverts pixel_x/y grep (#55256)

* Revert "grep for pixelx/y = 0 varedits (#54845)"

This reverts commit 311b9da86b.

* part1

* part2

* part3

* Delete PubbyStation.dmm

* removes all dirty map var edits from the codebase and reverts pixel_x/y grep

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-12-24 00:40:41 +00:00
SkyratBot
c4973bd09b [MIRROR] Don't auto apply unit tests label (#2250)
* Merge pull request #55618 from tgstation/Jared-Fogle-patch-1

Don't auto apply unit tests label

* Don't auto apply unit tests label

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-12-20 10:55:03 +00:00
SkyratBot
97df15640a [MIRROR] Runtime condenser supports rustg continuing line syntax (#2191)
* Runtime condenser supports rustg continuing line syntax (#55339)

also made it skip empty lines because they sometimes randomly get
printed in the middle of runtime messages

Also delete runtime condenser binary in favor of Releases page.

Co-authored-by: Tad Hardesty <tad@ platymuus.com>

* Runtime condenser supports rustg continuing line syntax

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Tad Hardesty <tad@ platymuus.com>
2020-12-16 07:18:26 +01:00
SkyratBot
528e327dd1 [MIRROR] Replaces deprecated access syntax in github_webhook_processor.php (#2189)
* Replace deprecated PHP syntax in webhook processor (#55546)

Line 17 of the Run Linters job of the CI Suite workflow:

> PHP Fatal error: Array and string offset access syntax with curly braces is
> no longer supported in ./tools/WebhookProcessor/github_webhook_processor.php
> on line 972

Something, something the PHP version updated to 7.x and dropped curly brackets support.

* Replaces deprecated access syntax in github_webhook_processor.php

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-12-16 07:17:20 +01:00
SkyratBot
988622a270 [MIRROR] GBP Tweaks (#2143)
* GBP Tweaks (#55441)

Some rescaling since the stakes are 10x higher now:

    Fix: +3
    Tweak: -2
    Performance: +12
    Priority: High: +15
    Priority: Critical: +20
    Feedback: +2
    Code Improvement: +2

The intention with the formula tweak is for the highest absolute value of the label set (favoring the negative) to be applied.

* GBP Tweaks

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-12-12 12:05:15 +01:00
SkyratBot
9db59d58a7 [MIRROR] Update precompile.sh with the one I had to use to get everything to work (#2105)
* Update precompile.sh with the one I had to use to get everything to work (#55304)

Some notes:
* failures are hard to deal with if so many installs are behind narrowly scoped checks. This should be improved. for instance rustup failing meant it never ran again. even if you fixed the cause.
* you have to install the 64 bit version of openssl too or pkg-config can't find it.
* rustup was not in path
* setting a target changes the path the .so is dumped out to.

I don't care how ugly and bad this is, this is likely what will get used in production unless somebody hands me a better working version.

side-note: move to debian based docker images when?

* Update precompile.sh with the one I had to use to get everything to work

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2020-12-10 10:47:21 +00:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
c08400b0af [MIRROR] grep for pixelx/y = 0 varedits (#1978)
* grep for pixelx/y = 0 varedits (#54845)

Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>

* grep for pixelx/y = 0 varedits

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
2020-11-30 23:01:57 +00:00
SkyratBot
923cacf541 [MIRROR] Working on unit test related issues grants 6 GBP, automatically add tag (#1892)
* Working on unit test related issues grants 6 GBP, automatically add tag (#55199)

Unit tests (a label I recently added) will now give 6 GBP. This label should be added to anything that adds a new unit test, even on features.

* Working on unit test related issues grants 6 GBP, automatically add tag

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-11-28 12:53:47 +01:00
SkyratBot
290a335121 [MIRROR] Nerfs GBP gain (#1831)
* Nerfs GBP gain (#55038)

Basically no one ever hits the lower limit and people have fucking bank at this point.

* Nerfs GBP gain

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-11-26 00:14:58 +00:00
SkyratBot
0efa39a6af [MIRROR] Update TGS4 PreCompile.sh (#1679)
* Update TGS4 PreCompile.sh (#54794)

* Update TGS4 PreCompile.sh

- Fix bad brackets
- Update rust-g build command
- Remove `--default-host`

* Add i686-unknown-linux-gnu target

* Update TGS4 PreCompile.sh

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-11-11 02:55:14 +00:00
SkyratBot
0227a2292d [MIRROR] Grep for stacked cables on maps (#1653)
* Grep for stacked cables on maps  (#54847)

* Grep for stacked cables on maps

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-11-09 20:17:49 +00:00
SkyratBot
8894ac50fb [MIRROR] Grep for proc(var/bad) (#1652)
* Grep for proc(var/bad) (#54848)

* Grep for proc(var/bad)

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-11-09 20:17:31 +00:00
SkyratBot
1928fb112e [MIRROR] Grep for spelling nanotrasen as nanotransen (#1650)
* Grep for spelling nanotrasen as nanotransen (#54849)

* Grep for spelling nanotrasen as nanotransen

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-11-09 20:15:48 +00:00
SkyratBot
f018d8ddf0 [MIRROR] Delete TGUICompiler.php (#1626)
* Delete TGUICompiler.php (#54834)

Delete TGUICompiler.php

* Delete TGUICompiler.php

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-11-08 05:02:59 +00:00
SkyratBot
dda9a1f7a5 [MIRROR] Grep for cable varedits (#1625)
* p2 (#54846)

Grep for cable varedits

* Grep for cable varedits

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-11-08 05:02:09 +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
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
598c92621f [MIRROR] Add hook events needed to Webhook Processor header documentation (#1225)
* Merge pull request #54120 from Coolguy3289/patch-2

Add hook events needed to Webhook Processor header documentation

* Add hook events needed to Webhook Processor header documentation

Co-authored-by: oranges <email@oranges.net.nz>
2020-10-09 18:33:27 +02:00
SkyratBot
bb7f23fa99 [MIRROR] removes astplate flooring, adds it to turfs2decals script (#964)
* removes astplate flooring, adds it to turfs2decals script (#53868)

* removes astplate flooring, adds it to turfs2decals script

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-09-24 20:32:57 +02:00
SkyratBot
a78d01efb2 [MIRROR] Add SpacemanDMM binaries to Travis cache (#874)
* Merge pull request #53814 from AutomaticFrenzy/patch/cache-spaceman-dmm

Add SpacemanDMM binaries to Travis cache

* Add SpacemanDMM binaries to Travis cache

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-09-20 00:34:25 +01:00
SkyratBot
569b3e219c [MIRROR] Skip app execution aliases when searching for Python (#842)
* Skip app execution aliases when searching for Python (#53569)

* Skip app execution aliases when searching for Python

Co-authored-by: Tad Hardesty <tad@platymuus.com>
2020-09-17 06:10:42 +02:00