forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 0
[pull] master from space-wizards:master #347
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
Merged
Merged
Conversation
This file contains hidden or 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
…slip properties (#40201) Crashed the snakeskin boots stockmarket by removing their non-slip properties
…on clearer (#40375) * Renamed regular implanter (the extractor from the medifab) to implant extractor * wrong way
silence!!! Co-authored-by: iaada <[email protected]>
* Added tactical katana + tactical katana shipment (placeholder descriptions) * Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)" This reverts commit aa1928b. Whoops, committed to master by mistake * Made ninja items highly illegal * Rerun checks
* Make ichor heal brute, burn, and toxin evenly * Nerf healing to more reasonable values
* Initial commit * Minor changes
* Added Cutting Slicing and Executing options to the cane blade * swaped from BaseItem to BaseSword for cleaner code * fixed a double gap in code
Sent tarantulas to the gym
* finally some good objectives * oopsie * guh fuck * more steal objectives that are actually good * i want to die * fucking upload to github please * adding it to the objectiveGroups.yml * higher weights for testing * upload * just need to do text shit. coding done waow * OBJECTIVES WORK AND HAVE TEXT. FIX VIS * I THINK ITS DONE AAAAAAAAAAAAAAA * grammatical fix * more formatting fixes * i might be stupid * forgot to fix a weight issue * more grammar grrrrrrrrrrrrr * made the double barrel obj have higher difficulty since it's cared about more than beer goggles * Requested Changes * forgot a thing oopsie
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )