forked from space-syndicate/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 89
Апстрим коллизий #341
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
Open
FireNameFN
wants to merge
163
commits into
space-syndicate:master
Choose a base branch
from
FireNameFN:Upstream9
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Апстрим коллизий #341
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
* make admin interacts with storages silent * review * silent insert and transfer * i love code --------- Co-authored-by: ScarKy0 <[email protected]>
* Conveyor optimisations - Optimise movement for moving stuff. Better flags + less resolves + slapped parallelrobustjob on it. - Sleeping for entities getting conveyed into walls. * Blocker version * Finish * Final * Fix conveyor power mispredict * Bagel save * Revert "Bagel save" This reverts commit 1b93fda81fb852d89b89b0beae0b80f8a61165f2. * Conveyor resave * Fix prediction * Mob movement rewrite * Bandaid * Working version * Tentatively working * Friction to fix cornering * More fixes * Revert bagel * Revert this * a * Reviewed * Funky re-save * Fix velocity * Table fix * Review * a
* localize role type names within localization text * also unhardcode colors * comment * typo
* ACTUALLY predict gas pumps * generic fake * aaaaaaaaaaaaa
* Remove deleted projectiles from the container tracking them * Gotta dirty the container * Remove the container component when all embedded projectiles are gone * Add test * No clientside deletion of networked entities * Move cleanup logic before deletion
* Make ContainerFill/EntityTableContainerFill print current contents when failing to spawn an entity * List each entry on a new line; add fallback for empty
* Added ThornyComponent, ThornyImmuneComponent, and ThornySystem, as well as changed Botanists glove's to have the ThornyImmuneComponent, and for Death Nettle to have the ThornyComponent. * Added heat damage to the player if they pickup nettle without gloves. Also displays a popup message . * Revised OnHandPickUp method and reduced whitespace * Touching death nettle without gloves now does damage split between heat and caustic, and does more damage. * File-scoped namespace adherence * Code revisions, and removal of old file. * Removed thornyImmune key from botanist's gloves in gloves.yml for cleanup / yaml linter * Adds new generic DamageOnPickup, still very WIP * Starting on localization, removed _Notes.txt, adds immunity component * Added OnPickupDamageImmune component to botanists gloves * Removed botany specific components/system, moved to generic DamageOnPickup. Added code comments. Extra checks in component for whether to toss an item, damage an entity. Still WIP. * changes to audio and popups * Removes my system/component/ftl in favor of DamageOnInteract, tweaking values * me stupid * Death nettle will 'wilt' after 5 hits * added interaction delay to stop spam clicking, added a 10% stun (paralyze) chance * minor changes/cleanup * more minor changes and cleanup * Reduced maximum amatoxin within fly amanita spores. * Readjusted to allow more than 5 amatoxin above 50 potency * Remove Debug.Log statement from system * Mark Death Nettle as major contraband.
Co-authored-by: Kill_Me_I_Noobs <[email protected]>
Co-authored-by: Kill_Me_I_Noobs <[email protected]>
Co-authored-by: Kill_Me_I_Noobs <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Audio
Changes: Localization
Изменяет локализацию
Changes: Map
Изменяет карты
Changes: Sprites
Changes: UI
S: DO NOT MERGE
НЕ МЕРДЖИТЬ!!!!
S: Needs Review
ПРу необходим ревью
S: Untriaged
size/M
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.