This repository has been archived by the owner on May 30, 2022. It is now read-only.
Upstream magic #211
Merged
Upstream magic #211
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
* small player piano fixes * fix runtime when mousedropping a thing that is not a piano
* Updates The Nuclear Knights' Boots description * Whoops, missed a -
* Replace several tgui tooltips with HTML titles * Bundle
* adds the chameleon outfit traitor item, to replace the chameleon jumpsuit. it's like the chameleon suit but includes shoes, backpack, belt, hat, glasses and outer suit * adds chameleon remote * adds chameleon suit options, shoes carry over sound (boom boots blacklisted) gloves carry over fiber type (but not glove ID), helmets block hair * removes accidental HoS cape copy, adds full indy set as individual choices, adds longgloves to janitor preset * adds monkey psyche sprites * Commits frawhst suggestions Co-authored-by: frawhst <67879783+frawhst@users.noreply.github.com> * Update code/obj/item/clothing/chameleon_js.dm * makes selection boxes tgui-y, adds functionality for suits blocking hair (and adds such functionality to adeptus robes to match), adjusts red hat in-hands * rudely pushing with merge conflicts * Revert "rudely pushing with merge conflicts" This reverts commit 439d5788af47529c9281bae2859e586b01a3bc11. * fix blockedmode Co-authored-by: frawhst <67879783+frawhst@users.noreply.github.com>
* Destroyable lockers * Logging * Bolting lockers, reinforced lockers * Projectiles * Actually bolt all of these * Make reinforced lockers energy immune * Nerf .22, rubber shotgun and stinger * didnt need istype_exact * Minimum damage on reinforced * Bolt sec lockers * Fix logging, reduce duplication * Make sec lockers strong * Actually fix merge * Hit particle * Reduce damage * Soften break sound attack
* Adds Mulebot functionality to Oshan * Adjusts delivery locations, adds markings * More delivery location adjustments * Adds Ranch and Hydro Delivery * Merge Conflict Fix Attempt Co-authored-by: ZeWaka <zewakagamer@gmail.com>
* Wait till funny blank screen is fixed * Adjusts botany destination and spawn point * Adds crew quarters destination
* add range check handling for input cancels * Disconnect All no longer also uses object
Credits reset to stack size 1 on having material changed, just in case...
triggering a gib() inside a death() causes the mob to get deleted before the death() call finishes which results in unsent signals etc. etc.
This reverts commit a10431e.
* mechcomp player piano stuff part 1 * player piano mechcomp integration part 2 * absolutely not * make sure you can't connect unanchored pianos
* toggle hearing all cherrypick this later * fix hearing all
boring-cyborg
bot
added
documentation
stonepillars
added a commit
to stonepillars/goonstation
that referenced
this pull request
May 23, 2022
…ream-magic Upstream magic
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.
[weird]
Unblocks #138