forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tgmastermerge #382
Merged
Merged
Tgmastermerge #382
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…1348) * ko * change request
tgstation#51252) * here goes nothing no really this is basically nothing * dme is less dumb * aaaaa string files * Card backend (#3) * Adds card backend and hotloading This is a combination of 2 commits. OH SHIT THE SM IS ON FIRE WE DONE LADS * Woop * Best we'll get * fixed file system, courtesy of potato * updated tools (thanks potato), now up to 40 cards * Adds rarity (#4) * Adds rarity * just to be sure * Adds it to cards * Didn't read templates WHAT A NERD AMAROIGHT * Commets * Woop you'd think I'd know my own system * There we go * Fuck you EOF (#5) * Makes rarity not suck (#6) * Fuck you EOF * Makes rarity not suck * Auto stash before merge of "blueeyedwhitejumpsuit" and "origin/blueeyedwhitejumpsuit" * Makes rarity work as expected, thanks dogman (#7) * smolcards * Adds datum cards (#8) * Datum cards * Some docs and a little bit of cleanup * fuck * problems be had * Fuck (#9) * fucko bungo RELASE ME FROM THIS HELL GIT * datum FUCKING AHHHHHHHHHHH * packs and games * boomer mood (#10) * Card debugging (#11) * Adds debug vars * that's a bit better * shit * unfucks rarity * scales sorted * That should do it * Parity * fun fact * series 1 json * and so it is done * Don't need this, I'm dumb. MacRo-Op???@?#?@??!#?!@ * BRAINDAMAGE * resin redux, smaller cards * shut up shut up shut up IT'S ASSUMED TYPE OK? *it's not all that bad* * double rarity TABLELS, fixed the silly linter * flippers and rarities * guaranteed rarity, rarity tables * fuck it let's ask * resinfront * 2560 core set * fixes flippers * template icon, extra variable juice * ADDS SPEED (#12) * FUCK FUCK FUCK SHIT I BROKE IT AGAIN * Kills my dreams in the NAME OF SPEED * and some cleanup * Minor changes, some qol (#13) * couple small changes, moved the datum procs around to make things cleaner, made some comments autodocced * Let's be more clear, * and a woooop * Removing ids, carpel tunnel edittion (#14) * Subsystem * Carpel tunnel completed * woop * curator is no longer equipment * I'm not dumb you're dumb (#15) * minor rarity tweak ladies and gents, it's finished Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
…on#51326) * Removes mutation/chromosomes storage limit from DNA consoles * Update tgui.bundle.js
…gstation#51277) * F * Update mulebot.dm
* 1 * 2 * debines * knojbhgfxychgvjbkn * better emp (test later) * alt * | || || |_ * scewact
* Fixes boxstation grav gen power * And AI sat too
…tion#51243) * fix (maybe) * atmos jumpsuits now have the same protections as engi jumpsuit * gosh i hate plasmem * hhhnnn * fuck
Turns out GitHub Desktop actually does bundle a sh.exe, just not a bash. Also tries to look for the py launcher to help people who didn't check the "Add Python to PATH" option.
…you from your fate (tgstation#51427) * Fixes grabs being impossible to escape, at the expense of making it easier to escape a grab. Damage inflicted by resisting increased to compensate. * Upped the time between resists a bit
* Adds coupons * fixes invalid var * fixes old var name * test * does this please you travis? * is that a prize, or.... * adjusts odds * fikou owes me $10 * neatens code per review * corrects bouncy * corrects some errors * redisables price gouging on goodies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
merge tg master
Why It's Good For The Game
heehaw
Changelog
🆑
code: pulled from tg master hhaha
/:cl: