* Fixes voice of god runtime when a target resists the command (#69921)
* Fixes voice of god runtime when a target resisted your command and adds a grep to avoid it being a problem again in the future.
* Fixes voice of god runtime when a target resists the command
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
* Removing trailing / from several mapping regexes (#69448)
* Removing trailing / from several mapping check regexes
So we have check_grep.sh which helpfully checks for a bunch of common map mistakes, including doubled up items. This adjusts them to capture doubled up base types which might be mapped in.
* Commit before pushing next time
* Removing trailing / from several mapping regexes
* Commit
Co-authored-by: Vire <66576896+Maurukas@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
* adds structure spawners for electrified grilles, adds greps for some fulltile window spawners (#69528)
* adds structure spawner for electrified grilles
* sdmm key cleanup
* adds structure spawners for electrified grilles, adds greps for some fulltile window spawners
* should fix blueshift lints lets see
* should resolve most if not all of the others
* damn you skyrat map reset
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
* Updates check_grep.sh to have more clarity and contrast (#68387)
* Updates check_grep.sh to have more clarity
Hey there,
One issue with check_grep is that it was very inconsistent in how it handled the error conditions and echos to the end user. Some of them didn't have ERROR:, some of them didn't have two echos to separate them from the actual grep result, etc.
This should add more clarity to all of it by making each error line exit with a RED color, the boilerplate lines with a BLUE color, having an echo in each line to separate, etc. This should be much easier to see for anyone at a glance. This works on my local machine, and I suppose we'll find out how it looks on GitHub.
* Updates check_grep.sh to have more clarity and contrast
Co-authored-by: san7890 <the@san7890.com>
* The lint for whitespace issues now shouts louder (#68386)
* The lint for whitespace issues now shouts louder
Co-authored-by: oranges <email@oranges.net.nz>
* Merge Conflict Markers - The Explicit Pathing, Layering, Iconing, Warning. (#68039)
* Merge Conflict Markers - The Explicit Pathing
Hey there,
This PR corrects an issue I've been having with mapmerge2 these last few months. Basically, what it does is create a base `/obj` that is given the name `---Merge Conflict Marker---`. This is fine and all, but the problem is that the base `/obj` is set to a certain plane. This does mean that sometimes, this VERY IMPORTANT marker is covered up by rocks or other objects. So, this seeks to get rid of that potential flaw, as well as do some other things.
Sometimes, when objects are rendered via GAGS or other code-means, they tend to have the same default Purple/White Sprite that any object without a valid icon_state has. This has caused me some confusion, so I have decided to create a new icon for conflict markers. This icon was designed to be as ugly as possible, while creating as much contrast as possible with the background by incorporating several colors into its design. I hope you find merge conflicts as unpleasant as I do.
I also updated mapmerge2 to have it so you can set the specified path of the object, as well as a small comment on the warnings if you do not heed it. I'm keeping the fact that mapmerge2 adds a name to the object just in case someone else really needs that. I also updated the linters to check for this path as well (even though the name and description should suffice for linting), and it should all be gravy from here.
* Adds further contrast to the DMI.
* Splits the merge conflict marker into a generic /obj
I also added a thing where if it didn't get caught by linters and it showed up on Initalize, it would error to mapping logs, spit out an error in world, and do all sorts of stuff to remind you.
* python new line
* forgot to add a tab
* Merge Conflict Markers - The Explicit Pathing, Layering, Iconing, Warning.
Co-authored-by: san7890 <the@san7890.com>
* Greps to check for commonly misplaced structures in closed turfs (#67447)
Adds some checks for structures that are commonly misplaced inside walls. One of the more recent updatepaths also replaced a bunch of posters with windoors in walls so this will help find all those.
I also edited the one that checks for lattices to look for closed turfs, because we really don't want the structures we're looking for to be in any closed turfs anyways.
We don't want to look for all structures like this because things like transit tubes exist.
* Greps to check for commonly misplaced structures in closed turfs
* grep fix
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
* Adds Greps for Multiple Areas/Turfs on the same tile. (#67173)
Hey there,
Even though mapmerge2 (through behavior introduced in #39889) should automatically check for "stacked turfs", they still slip through somehow. Not really sure how, but let's make sure that doesn't happen again with the power of grep.
* Adds Greps for Multiple Areas/Turfs on the same tile.
Co-authored-by: san7890 <the@san7890.com>
* [MDB IGNORE] The Grand Airlock Naming Audit (#67235)
I manually audited all 4,710 instances of airlocks across all maps for upper casing
You'll never guess what I found.
UPDATE: We now have a grep to check for mistitled airlocks, and it's in this PR!
* [MDB IGNORE] The Grand Airlock Naming Audit
* TG MAP RESET
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
* Fixes some improper balloon alerts, adds a grep to prevent future bad balloon alert calls (#66214)
* Fixes some improper balloon alerts, adds a grep to prevent future bad balloon alert calls
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
* Creates Linters for (bad) Commented Out Lines in Maps (#65888)
* Creates CI Linters for Commented Out Lines in Maps
Creates Linters for (bad) Commented Out Lines in Maps
Hey there,
This PR is made because what happened in #65837 was fucking horrible awful shit that I'm still dealing with a few days after I fixed it. This _should hopefully_ add a new linter for commented out lines of code in a .DMM file, and HOPEFULLY doesn't flag the commented line that prevents unwanted TGM > DMM conversion.
As a proof to see if it works, I'll be adding a comment to Line 2 of IcemoonUnderground_Above.dmm. Hopefully, on the first CI check, it'll fail. I'll remove that line so it doesn't make its way into production (it will suck).
* Creates Linters for (bad) Commented Out Lines in Maps
Co-authored-by: san7890 <34697715+san7890@users.noreply.github.com>
* Fixes a bunch map log runtimes, adds CI to catch some more potential map issues (#64599)
* Fixes APC offsets in template maps, airlock note placer helper
* also hellfactory
* remove doubled lavaland mining cable
* Updates CI grep checks for cable check to work, and also check lattices and identical pipes
* Add APC pixel offset checking
* mass apc offset fixes
* Fixes a bunch map log runtimes, adds CI to catch some more potential map issues
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
* Add merge conflict markers to linter (#61669)
Updates check_grep.sh with a case for the /obj mapmerge2 creates on merge conflicted tiles. You're supposed to fix all of these before you continue a merge, but there's zero warning if you don't clear them all. As a result they can end up in the commit pushed to github, and they can hide quite easily in a PR that otherwise looks fine.
Your average map file is about 3 megabytes of raw text, or 160,000 lines. I don't want to have to read them all to prevent this from happening again.
* Add merge conflict markers to linter
Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
* Juke Build 0.8.1 (#60404)
* Juke Build 0.8.1 Hotfix 1 (#60897)
* Juke Build 0.8.1 Hotfix 1
* Do not restore Yarn cache on just DM build
* Makes it so Skyrat's modular code is also checked for updates to see if it needs to rebuild
* chmod's tools/bootstrap/nod
Added a / just to make it so it'd let me commit
* Trying to chmod again
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
* Update rust-g version to latest release (#59863)
* Update rust version to latest release
This should fix the fact our docker build has been failing for the past
10 days
* Make wget not be quite so noisy
* Update rust-g version to latest release
Co-authored-by: oranges <email@oranges.net.nz>
* 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>
* 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>
* 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>
