Commit Graph
22 Commits
Author SHA1 Message Date
JeremiahandRoxy a5a4b83a25 Sets prettier to run on the repo (#91379)
Prettier (an auto formatter) is set to only run within the tgui folder
currently. This removes that limitation, allowing it to automatically
format all supported files in the repo (.js, .html, .yml
[etc](https://prettier.io/docs/))

I made a few exceptions for bundled and generated files
I'm of the opinion that code should look uniform and am lazy enough to
want CTRL-S to format files without having to think beyond that
2025-06-05 19:13:02 -04:00
WaterpigandMajkl-J bb70889f6e TG Upstream Part 1
3591 individual conflicts

Update build.js

Update install_node.sh

Update byond.js

oh my fucking god

hat

slow

huh

holy shit

we all fall down

2 more I missed

2900 individual conflicts

2700 Individual conflicts

replaces yarn file with tg version, bumping us down to 2200-ish

Down to 2000 individual conflicts

140 down

mmm

aaaaaaaaaaaaaaaaaaa

not yt

575

soon

900 individual conflicts

600 individual conflicts, 121 file conflicts

im not okay

160 across 19 files

29 in 4 files

0 conflicts, compiletime fix time

some minor incap stuff

missed ticks

weird dupe definition stuff

missed ticks 2

incap fixes

undefs and pie fix

Radio update and some extra minor stuff

returns a single override

no more dupe definitions, 175 compiletime errors

Unticked file fix

sound and emote stuff

honk and more radio stuff
2024-10-19 08:04:33 -07:00
Waterpig 4c4930c71d Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit 2024-09-08 00:59:39 +02:00
klorpaandGitHub e1bf793264 Spelling and Grammar Fixes (#86022)
## About The Pull Request
Fixes several errors to spelling, grammar, and punctuation.
## Why It's Good For The Game
## Changelog
🆑
spellcheck: fixed a few typos
/🆑
2024-08-23 21:49:46 +02:00
16c66010c9 [MIRROR] /icons/ folder cleansing crusade part 3 (#27859)
* /icons/ folder cleansing crusade part 3

* fixes

---------

Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com>
Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
2024-06-09 12:00:28 +05:30
YesterdaysPromiseandGitHub 8eb3b51ad9 /icons/ folder cleansing crusade part 3 (#83420)
## About The Pull Request

In my effort to make the /icons/ folder cleaner and more intuitive
instead of having to rely on recalling names of stuff and looking them
up in code to find them for poor sods such as myself, plus in spurt of
complusion to organize stuff, here goes. I've tracked all changes in
commit descriptions. A lot still to be done, but I know these waves go
over dozens of files making things slow, so went lighter on it.
Destroyed useless impostor files taking up space and cleaned a stray
pixel on my way.

## Why It's Good For The Game

Cleaner /icons/ file means saner spriters, less time spent. Stray pixels
and impostor files (ones which are copies of actually used ones
elsewhere) are not good.

## Changelog

🆑
image: Cleaned a single stray pixel in a single frame of a bite
telegraphing accidentaly found while re-organizing the files.
/🆑
2024-05-25 21:08:08 -07:00
0ffe662b49 [MIRROR] Adds links to additional help documents on hackmd to the GAGS readme [MDB IGNORE] (#23441)
* Adds links to additional help documents on hackmd to the GAGS readme (#78027)

Just some additional links in the readme for coders and spriters, no
player facing changes. I'll update the guides themselves more as I see
what information people need or issues they have.

* Adds links to additional help documents on hackmd to the GAGS readme

---------

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2023-08-31 14:27:12 -07:00
Emmett GainesandGitHub 08ab70cba4 Adds links to additional help documents on hackmd to the GAGS readme (#78027)
Just some additional links in the readme for coders and spriters, no
player facing changes. I'll update the guides themselves more as I see
what information people need or issues they have.
2023-08-31 15:25:07 -04:00
2f552919c1 [MIRROR] Icons folder cleaning wave two [MDB IGNORE] (#22454)
* Icons folder cleaning wave two

* Merge conflict resolution

* Modular path hell

* hmm

* Update 2022-10.yml

* Another modular thing

---------

Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
2023-07-16 00:41:18 -04:00
YesterdaysPromiseandGitHub fb10121022 Icons folder cleaning wave two (#76788)
## About The Pull Request

Further continous organizing and cleaning the Icons folder. There are
still some minior nitpicks left to do, but I reached my daily sanity
expenses limit again, and the faster these get in the less issues for
both me and others later. Also cleans some mess I caused by my blindness
last PR.

## Why It's Good For The Game

Saner spriters = better sprites
2023-07-14 18:36:41 +00:00
7b94ae1c04 [MIRROR] Sorts the Greyscale Configs files [MDB IGNORE] (#21891)
* Sorts the Greyscale Configs files

* fix

---------

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: ghost sheep <sheepwiththemask@gmail.com>
2023-06-18 14:34:07 +02:00
OrionTheFoxandGitHub bfe651c900 Sorts the Greyscale Configs files (#76090)
## About The Pull Request
Step 1 to finishing https://github.com/tgstation/tgstation/pull/75986

All the GAGS configs are in one big file. It's a mess. I can't work with
it like this...

PR is simple, it splits `config_types/greyscale_configs.dm` into a
folder of greyscale configs. Currently it's sorted roughly by category,
I.E `greyscale_configs/greyscale_clothes.dm`, but this can be changed as
requested. Mostly just need this to be less... y'know.
Single-unsorted-.dm-file.

Also updates the .README with both the new path, and some practices I've
learned that make GAGS easier to work with. Namely, it clears up how
preset-colored states work, gives a more common example of a .json file
without references and with generic variable names instead of example
ones, leaves a note to make a pre-made OBJ icon for mappers' sakes,
correctly mentions that Name is _required_ in the config, links to the
update path of the folder (right now it just hyperlinks to
greyscale_unsorted.dm), and gives advice on minimizing code using
subtyping, especially for clothing.

Wow, wall of text, I swear it looks better than this in the .README
## Why It's Good For The Game
Code readability and paving the way for me putting in the
standardization I wanted.
2023-06-16 20:48:30 -06:00
8a9ab67aad [MIRROR] That's it. *GAGS'ifies your berets* (#7097)
* That's it. *GAGS'ifies your berets*

* a

* Update head.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 22:21:49 +01:00
GoldenAlpharexandGitHub ced603614d That's it. *GAGS'ifies your berets* (#59536)
Converts berets to greyscale config
2021-07-23 21:37:23 +02:00
b5dc716b24 Greyscale sombrero and shamebrero (#5496)
Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-06 15:08:09 +01:00
Emmett GainesandGitHub a66bf56b31 Greyscale sombrero and shamebrero (#58854)
* Greyscale sombrero and shamebrero

* Fixes json indentation and sombrero greyscale assignment
2021-05-06 15:19:54 +02:00
41196908e2 [MIRROR] Renames GAS to GAGS (#5071)
* Renames GAS to GAGS (#58488)

* Renames GAS to GAGS

* Adds a hypen to Auto-Generated

Co-authored-by: Fikou <piotrbryla@ onet.pl>

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* Renames GAS to GAGS

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Fikou <piotrbryla@ onet.pl>
2021-04-21 18:34:19 +01:00
c568d68bb2 Renames GAS to GAGS (#58488)
* Renames GAS to GAGS

* Adds a hypen to Auto-Generated

Co-authored-by: Fikou <piotrbryla@onet.pl>

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-04-22 00:33:55 +08:00
29c9908e09 [MIRROR] Adds icon state configuration to GAS (#4990)
* Adds icon state configuration to GAS (#58487)

Relatively simple change that allows you to specify icon states in greyscale config so as to allow generating icon files with multiple states. This is a requisite for GAS to work with icon smoothing.

Also a couple bits of additional warnings and documentation.

* Adds icon state configuration to GAS

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-04-18 01:24:43 +01:00
Emmett GainesandGitHub b630f46019 Adds icon state configuration to GAS (#58487)
Relatively simple change that allows you to specify icon states in greyscale config so as to allow generating icon files with multiple states. This is a requisite for GAS to work with icon smoothing.

Also a couple bits of additional warnings and documentation.
2021-04-18 11:34:10 +12:00
bc6c285adb [MIRROR] Advanced Greyscale Sprite Generation (#4792)
* Advanced Greyscale Sprite Generation (#58112)

* Nonfunctional greyscale code

* Functional greyscale sprites via filter

Probably going to set the icon instead later

* Switches to greyscale json config

* Adds the reference layer type and converts the other canister types

* Working previews

* Adds readme

* Fixes overlays and breaking

* Removes old canister sprites

* Removes an unused var

* Fixes tgui lints

* Removes a bunch of the old canister icon states

Yeah I need to fix relabeling as well

* Removes some debug sprites

* Sorts canister type list and breaks up base shader step

* Removes an unnecessary preview hack

* Makes prototype canister greyscale

* Properly sizes the ui

* Fills in the canister map sprite

* Adds some more warnings to layers

* Makes broken overlay more prominent

* Removes a preview var that isn't needed anymore

* Cleans up client ref in Destroy

* Cleans up the tgui window a bit

* Update GreyscaleModifyMenu.tsx

* Animates the canister falling over

* Removes a commented out line that's no longer needed

Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Advanced Greyscale Sprite Generation

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-04-10 17:59:30 +01:00
1946abd0e5 Advanced Greyscale Sprite Generation (#58112)
* Nonfunctional greyscale code

* Functional greyscale sprites via filter

Probably going to set the icon instead later

* Switches to greyscale json config

* Adds the reference layer type and converts the other canister types

* Working previews

* Adds readme

* Fixes overlays and breaking

* Removes old canister sprites

* Removes an unused var

* Fixes tgui lints

* Removes a bunch of the old canister icon states

Yeah I need to fix relabeling as well

* Removes some debug sprites

* Sorts canister type list and breaks up base shader step

* Removes an unnecessary preview hack

* Makes prototype canister greyscale

* Properly sizes the ui

* Fills in the canister map sprite

* Adds some more warnings to layers

* Makes broken overlay more prominent

* Removes a preview var that isn't needed anymore

* Cleans up client ref in Destroy

* Cleans up the tgui window a bit

* Update GreyscaleModifyMenu.tsx

* Animates the canister falling over

* Removes a commented out line that's no longer needed

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2021-04-10 17:21:57 +03:00