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
TG Update #5
Merged
Merged
TG Update #5
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
* your 12 steps program starts now * typo slaying * better approach
Fixes cloning records not getting updating when rescanning an already scanned subject
there's no reason for it.
Fixed a minor runtime caused by admins clicking a follow link while in the lobby.
Happens every time disease loses.
critical fix
Fixes clockwork apply_inate_effects ark check
Fix broken force_give call in hardset_dna
* Renamed internal AI upload GPS var to internal_gps * honk * archaism
* fuck you whoever made the last icon it was garbage * ticket log fixes * ticket log fixes * changes colors from hardcode per line to a define * some nicer darkmode colors * asay and ooc name default fixes * fuck you appveyer build again * slight brightening of the default font color * properly fixes tip of the round being hard to read
* add a new holodeck program: photobooth * Add two paint buckets and three spray cans to the booth * remove step_ variables * made the photobooth floor white again, we got buckets for that anyway * retrigger ci
* mechs have exit times, sleep pilot on death * fixes edge case on mech destruction * Revert "Update code/game/mecha/mecha.dm" This reverts commit a4c466f. * Update code/game/mecha/mecha.dm Co-Authored-By: py01 <pyronetics01@gmail.com> * trying to fix giant diff * Update mecha.dm * readds changes to mecha.dm
* Adds beetlejuice component. * NAMEOF is horrible. * Okay, this var name is better * regex
…ommand role set to high (#43173) * Fixes mannequin runtime when a person with a nonhuman species has a command role set to high * AnturK
…roves ran_zone selection mechanism (#43222) * Fixes runtime from attempting checking armor on missing bodypart, changes how ran_zone selects a zone. * Update code/modules/mob/mob_helpers.dm pickweight ran_zone is no longer percentage-based Co-Authored-By: Militaires <ahmedosama2001@gmail.com> * adds check to second return too * look how they massacred my boy
* 1 * 2 * 3 * temp * r * rogue space * e * e Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> * restarts appveyor
* pulling offset fixes * commentary change
* Adds incap check to canusetopic * Collates if branches * properly fixes mobility flags
This was broken by the bundle rework. I chose bundle type "A" since rolling a 17 is pretty good.
the mini e-gun says its two settings is stun and kill. this is false
Fixes Janitor ERT runtime on Create Antag preview and ERT leader (heavy) spawning nude.
TheSwain
pushed a commit
that referenced
this pull request
Nov 5, 2019
TheSwain
pushed a commit
that referenced
this pull request
Nov 24, 2019
TheSwain
pushed a commit
that referenced
this pull request
Apr 9, 2020
Pull from main tgstation repo.
remove32
pushed a commit
that referenced
this pull request
Jun 4, 2020
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>
remove32
added a commit
that referenced
this pull request
Jun 5, 2020
* Merge TG * clean up metastation's map, which got mergefucked * Automatic changelog compile, [ci skip] * Adds a knockedout trait, begins refactoring mobility 2.0 (tgstation#51348) * ko * change request * Automatic changelog compile [ci skip] * Fixes Icebox ladders and shuffles around icebox mining. (tgstation#51351) * Fixes Icebox ladders and shuffles around icebox mining * Re-applies decals. * Haha whoops so that's how multiz ladders work, * Automatic changelog generation for PR tgstation#51351 [ci skip] * Temporary turf visuals fix. (tgstation#51399) * [READY] Codename: Blue Eyes White Jumpsuit, the TG TCG, Part 1, Reborn (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> * Automatic changelog generation for PR tgstation#51252 [ci skip] * Removes mutation/chromosomes storage limit from DNA consoles (tgstation#51326) * Removes mutation/chromosomes storage limit from DNA consoles * Update tgui.bundle.js * Automatic changelog generation for PR tgstation#51326 [ci skip] * Automatic changelog compile, [ci skip] * Automatic changelog compile [ci skip] * replaces the mulebot 16 second hardstun with an 8 second knockdown (tgstation#51277) * F * Update mulebot.dm * Automatic changelog generation for PR tgstation#51277 [ci skip] * light floors emit colored lights (tgstation#51097) * 1 * 2 * debines * knojbhgfxychgvjbkn * better emp (test later) * alt * | || || |_ * scewact * Automatic changelog generation for PR tgstation#51097 [ci skip] * Removes some dead code (tgstation#51426) * Automatic changelog generation for PR tgstation#51426 [ci skip] * Fixes boxstation grav gen power (tgstation#51425) * Fixes boxstation grav gen power * And AI sat too * Automatic changelog generation for PR tgstation#51425 [ci skip] * Remove DEBUG_ADMIN_HREF from default config (tgstation#51415) * atmos jumpsuits now have the same protections as engi jumpsuit (tgstation#51243) * fix (maybe) * atmos jumpsuits now have the same protections as engi jumpsuit * gosh i hate plasmem * hhhnnn * fuck * Automatic changelog generation for PR tgstation#51243 [ci skip] * Update precommit hooks to work in GitHub Desktop (tgstation#51404) 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. * Fixes neckgrabs being only escapable if RNGesus comes down and saves 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 * Automatic changelog generation for PR tgstation#51427 [ci skip] * Fixes Get-Current-Logs (tgstation#51376) * Adds coupons to cargo, turns small crates into goodies (tgstation#51216) * 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 * Automatic changelog generation for PR tgstation#51216 [ci skip] * Automatic changelog compile [ci skip] * fix compile error * fix icebox slicing issue Co-authored-by: remove32 <watkinsdakotan@gmail.com> Co-authored-by: tgstation-server <tgstation-server@tgstation13.org> Co-authored-by: Rohesie <rohesie@gmail.com> Co-authored-by: Changelogs <action@github.com> Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> Co-authored-by: AnturK <AnturK@users.noreply.github.com> Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Kelenius <kelenius@ya.ru> Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com> Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com> Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com> Co-authored-by: Fikou <piotrbryla@onet.pl> Co-authored-by: Tad Hardesty <tad@platymuus.com> Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
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
Why It's Good For The Game
Changelog
🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl: