Update 5-29-2020 #6
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
Co-authored-by: Theos <theubernyan@gmail.com>
… in lavaland base (#8499)
* Power tools now start in their usual modes again + cleanup * Makes turdis happy even if this isn't a "real" error * Super pretty * MCHSL saves my life * Orginized in a less stupid way * ugly
* runechat fixes * there
Right now there isn't any efficient way for doctors or paramedics to make use of the chemicals put in Chem Storage in a way that makes it more efficient then just throwing someone in a sleeper. If Doctors or Paramedics could get access to chem bags, they could organize and carry healing chemicals for use during the round. This doesn't really buff chemistry in any way, but it allows for competent players to benefit from competent chemists in a way that's more rewarding then just throwing someone in cryo/sleeper. More medbay/paramedic/chemistry interaction is good.
* Adds mass driver to the syndicate infiltrator * fixed cannon * changes ;)
* Make the bucket on the ashwalker ruin wooden * gives them a rake too. Why not? * Update lavaland_surface_ash_walker1.dmm
* Meth tweak * Slightly less damage * Meth nerf 2: Electric boogaloo Meth brain damage set to original value Meth speed lowered from 2 to 1.6 (previously 1.3) Meth now creates a small caustic smoke cloud on reaction * Meth now properly results in 5 parts instead of 4 * Adds suggested changes Minor edit to suggested change to handle removed var * Removed random extra newline Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
…oncept" (#8295) * Religion sect * im sectsy (#49874) * isholy * 512 * Apply suggestions from code review Co-Authored-By: Hopekz <hopekxx@gmail.com> * Update code/modules/religion/rites.dm Co-authored-by: Hopekz <hopekxx@gmail.com> * Update code/modules/religion/religion_sects.dm Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Update code/modules/religion/religion_sects.dm Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Update code/modules/religion/religion_sects.dm Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Update code/modules/religion/religion_sects.dm Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Update code/modules/religion/religion_structures.dm Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Update code/modules/religion/religion_structures.dm Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> * Update religion_sects.dm * Update code/modules/religion/religion_sects.dm Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> Co-authored-by: Hopekz <hopekxx@gmail.com> Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: Theos agent id machine fixed
* mechs can't punch while EMPed * fuck (#8520) * gygax can't meme while EMPed * no mech overload while EMPed * some mechs have bumpsmash on by default and the actions are global so * Update mecha_actions.dm
* Update tomato.dm * changed it from 20 to 15
…and the chemical agent-s (#8642) * Update other_reagents.dm * Update dna.dm * Update yogstation.dme * Update other_reagents.dm * Update snail.dm * Update snail.dm * Update code/modules/mob/living/carbon/human/species_types/snail.dm Co-authored-by: Hopekz <hopekxx@gmail.com> * Update snail.dm Co-authored-by: Hopekz <hopekxx@gmail.com>
* Amber task force combat knife reminder * ERT * Update code/modules/antagonists/ert/ert.dm Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Theos <theubernyan@gmail.com>
…ties dont show up till grown (#8700) * Update mushrooms.dm * Update code/modules/hydroponics/grown/mushrooms.dm Co-authored-by: Hopekz <hopekxx@gmail.com> Co-authored-by: Hopekz <hopekxx@gmail.com>
* initial * what is hourglass and why is he making my checks fail * Revert "what is hourglass and why is he making my checks fail" This reverts commit a57ed34.
…port) (#8528) * Create knifeboxing.dm * Create knifeboxing.dm * Update recipes.dm * Add files via upload * Add files via upload * Update yogstation.dme * Update knifeboxing.dm * logging * Update recipes.dm * Update granters.dm Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Hopekz <hopekxx@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Intent of your Pull Request
Explain what the purpose of your PR is.
Mention if you tested your changes. If you changed a map, make sure you used the mapmerge tool.
Mention if your PR is related to an issue.
You can type "Fixes issue #6" and issue 6 will be automatically closed when your pull request is merged. This is much easier for everyone.
Edit the changelog at the bottom for changes that are noticeable by the players. Remove it if this isn't the case.
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.
Include [admin] in the title if it's something admin related.
Include [s] in the title if you don't want it to be announced on discord and the server.
Changelog
🆑
rscadd: Added new things
rscdel: Removed old things
bugfix: fixed a few things
wip: This is work in progress
tweak: tweaked 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
experimental: This is experimental
/:cl: