update master #13
Merged
update master #13
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
Co-Authored-By: Rohesie <rohesie@gmail.com>
* adds code and sprite for poutine * added gravy reagent and updated poutine recipe to use it in place of ketchup * fixed errors causing failed check * fixed errors causing failed check * fixed another failed check * custom poutine can now be made Co-authored-by: Sylphet <Sylphet@users.noreply.github.com>
Eight dollars a bar, fry-man. So, uh, you look.
* Electropack status fix * Hands check * Cleanup * TTV and assemblies hands state
* Modular Computer Part Exports * Couple value tweaks.
* Small N2 atmos piping change on MetaStation Slightly changed the piping of the N2 to Airmix and N2 to Pure pipes to make them look more orderly and consistent with the O2. * Replaced pumps with existing "on" instance in DM Changed pumps from previously used new instances to existing "on" pump instances
* Smouldering clothes can now manually be extinguished. * Extra safety on mob overlays. * moves overlay cutting to carbon.dm * Check check.
* Cooldown vars * Changes how the cooldown is determined * Further change as requested * Continued changes
…50052) About The Pull Request As requested by oranges this enforces a requirement, when configured, that a player must have a certain amount of living playtime in hours to auto-enroll into a discord role. Why It's Good For The Game Removes discord moderation requirement Changelog cl bobbahbrown server: Discord role auto enrollment can now be configured to require a certain number of living hours. /cl
[READY]Adds new Space Ruin with ghost roles.
Moves all RnD's core consoles to the bridge.
There was a missing line (line 17) that outlined what reagents are produced by dried Tea Aspera leaves when ground. With the code added back, dried Tea Aspera will now produce 4% vitamins and 10% Tea Leaves in relation to their potency, which is in line with the stats I could find listed on the /tg/station wiki and the reagent list for the Tea Astera.
I got high and made a thing that was broke and 3 years, 2 months, 17 days later I get high and fix it.
* Update aimed.dm * Update spellbook.dm * Update aimed.dm * Update aimed.dm * minimum cooldown is now 2 seconds
…49831) About The Pull Request The admin Create Command Report verb now displays the current Central Command name in the dialog box, in case it has been previously changed. also fixed one(1) typo Why It's Good For The Game because the other day I murdered everybody's immulsion by sending a "Central Command" report without realizing someone had hit Change Command Report previously (pr title aside this is not just for manuel) Changelog cl bandit admin: The Create Command Report dialog now tells you the current CentCom name. /cl
About The Pull Request This PR reorganizes all mouse pointers icons in the codebase into a single folder under /effects, and removes 4 unused mouse pointer icons, all of which are remnants of the Clockwork Cult. Also removes one rogue white pixel in blind_target.dmi. Why It's Good For The Game Better organization and less space taken by unused icons. Changelog cl Arkatos code: Mouse pointer icons were reorganized to be more easily used in the future. /cl
Checks to see if the turf we're zapping off exists and has a gasmix Why It's Good For The Game Makes things less cringe Changelog cl fix: Fixed a supermatter zap runtime /cl
Does the same thing as my last PR 49949 but only the firelock portion of it.
…with a target (#50048) * use the correct do_after target * stomp * sorry travis * lace em up * less specific * checks if the shoes move * NULL ME OUT * last requests * unhelper
* initial small thing * improvements 1. Removes loops for picking up items. its now an item by item basis unless there is an ore box involved 2. Removed pickup_rate and ore_buffer var for the ORM, they aren't needed anymore 3. Fixed conveyors not moving items that get created on top of them (New / Initialize), by sending signals when atoms are created. * renames the registered signal proc name so travis doesn't throw a fit * signal improvement * forgot to update other proc names * ninjanomnom review changes replace NEVER_PROCESS with START_PROCESSING_MANUALLY default_unfasten_wrench override for ORM 50 -> 5 SECONDS I totally didn't mispell anything * makes a new signal: COMSIG_ATOM_CREATED * more review changes * duh * even more review improvements * switch >= to > * reverts conveyors back to using process() for moving stuff * various touch ups, adds documentation * rebase to fix map conflicts with forgottenship.dmm Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
…atums. (#49991) * The exportlarity. * Some clean up on cargo logs. May need tweaks still * Whoops. * Several Review comments and some cleanup on pricetags * Review comments round 2 * Almost forgot * further updates. * Forgot one. * Yeah that isn't doing anything.
Dennok
pushed a commit
that referenced
this pull request
Jun 10, 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>
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.
No description provided.