Upstream sync #2830
Merged
Upstream sync #2830
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
… which also uses IonStormSystem. Added StartIonStormedComponent. Changed stuff related to the Derelict Cyborg. Derelict Cyborg now spawns with a randomized lawset.
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…ture Cyborgs and AI's, including those in subsequent rounds.
…h i didn't want to.
…screen. It still appears in the Player Manifest.
…relict Cyborg right now) not showing up as 'antag' in the admin player overlay.
Made some modifications requested by reviewers prior to and after map merge, also added holiday decorations!
* Various changes (see PR) * variantized, fixedgridatmos, tiledwalls
* Fix AutoDrain Per the system comments, AutoDrain is designed to automatically move puddles into the drain (like a floor drain). Drains without AutoDrain are still supposed to gradually empty the buffer, but not remove puddles (like sinks and toilets). However, a logic error in the original implementation causes drains with AutoDrain set to false to simply not work. Hence sinks never emptied. * Update documentation
Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead. Lights with less than 4 characters of text weren't aligned right, now they are.
Added a delay to cleaning with the towel
* Adds wand of locker and locker projectile * Adds IsOpen method to check if storage is open * Adds store on collide * Adds Store On Collide to Wizard Locker * Adds Lock API * Adds locking support * Adds resist override and custom visual layers * Fixes decursed states, adds comment for a future visualizer * adds locker wand visuals and descriptions * shrinks locker radius, moves TODO for throw support * Adds whitelist and moves storage and lock logic into their own methods * Adds support to disable store on collide after the first open. Fixes prediction issues with disabling. * Adds wand of locker to the grimoire * Adds wizard access prototype * Adds Wizard to universal access * Moves Lock on collide to on collide method * Comments * Changes layer order * Fixes prediction issues when locking. * Adds Wiz access to universal ID
# Conflicts: # Resources/Prototypes/Datasets/Names/borer.yml # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/Textures/Tiles/plating_burnt.png
github-actions
bot
added
S: Needs Review
size/L
S: Untriaged
Changes: Sprites
lzk228
added a commit
that referenced
this pull request
Dec 10, 2024
Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
AwareFoxy
pushed a commit
to space-syndicate/space-station-14-next
that referenced
this pull request
Dec 12, 2024
* Translate Upstream space-syndicate#2748 (space-syndicate#2837) Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> * Перевод Upstream space-syndicate#2830 (space-syndicate#2836) Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com> * translate borer names (space-syndicate#2835) * [Localize] Poster 52 (space-syndicate#2840) * Translate new diona names (space-syndicate#2839) Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> * [Resprite] Medical uniforms & rollerbeds (space-syndicate#2802) * Automatic changelog update --------- Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com> Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com> Co-authored-by: MureixloI <132683811+MureixloI@users.noreply.github.com> Co-authored-by: IanComradeBot <96892333+IanComradeBot@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.
Описание PR
Почему / Баланс
Технические детали
Медиа
Требования
Критические изменения
Список изменений