Upstream sync #1322
Merged
Upstream sync #1322
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
* so it begins * The Cratening * welded sprites
* Removes spaceacillin * this game blows
* changes microwave and nanomed to use old /tg/ sprites * makes microwave smaller
Co-authored-by: deltanedas <@deltanedas:kde.org>
* everything * half loot
* Basic TEG start. Connects via node group. * Basic TEG test map * Sensor monitoring basics, TEG circulator flow * Basic power generation (it doesn't work) * More sensor monitoring work * Battery (SMES) monitoring system. * Sensor monitoring fixes Make it work properly when mapped. * Test map improvements * Revise TEG power output mechanism. Now uses a fixed supplier with a custom ramping system. * TEG test map fixes * Make air alarms and pumps open UI on activate. * Clean up thermo machines power switch. Removed separate Enabled bool from the component that always matched the power receiver's state. This enables adding a PowerSwitch component to give us alt click/verb menu. * TEG but now fancy * Make sensor monitoring console obviously WiP to mappers. * Vending machine sound, because of course. * Terrible, terrible graph background color * Examine improvements for the TEG. * Account for electrical power when equalizing gas mixtures. * Get rid of the TegCirculatorArrow logic. Use TimedDespawn instead. The "no show in right-click menuu" goes into a new general-purpose component. Thanks Julian. * Put big notice of "not ready, here's why" on the sensor monitoring console. * TryGetComponent -> TryComp * Lol there's a HideContextMenu tag * Test fixes * Guidebook for TEG Fixed rotation on GuideEntityEmbed not working correctly. Added Margin property to GuideEntityEmbed * Make TEG power bar default to invisible. So it doesn't appear in the guidebook and spawn menu.
* Laws * positronic brain and PAI rewrite * MMI * MMI pt. 2 * borg brain transfer * Roleban support, Borg job (WIP), the end of mind shenaniganry * battery drain, item slot cleanup, alerts * visuals * fix this pt1 * fix this pt2 * Modules, Lingering Stacks, Better borg flashlight * Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power. * sprotes * no zombie borgs * oh fuck yeah i love a good relay * charger * fix the tiniest of sprite issues * adjustable names * a functional UI???? * foobar * more modules * this shit for some reason * upstream * genericize selectable borg modules * upstream again * holy fucking shit * i love christ * proper construction * da job * AA borgs * and boom more shit * admin logs * laws redux * ok just do this rq * oh boy that looks like modules * oh shit research * testos passo * so much shit holy fuck * fuckit we SHIP * last minute snags * should've gotten me on a better day
* kill target has to be human * death to linq * file scope * !!! *--------- Co-authored-by: deltanedas <@deltanedas:kde.org>
# Conflicts: # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/typing_indicator.yml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Effects/speech.rsi/alien0.png # Resources/Textures/Effects/speech.rsi/alien1.png # Resources/Textures/Effects/speech.rsi/alien2.png # Resources/Textures/Effects/speech.rsi/alienroyal0.png # Resources/Textures/Effects/speech.rsi/alienroyal1.png # Resources/Textures/Effects/speech.rsi/alienroyal2.png # Resources/Textures/Effects/speech.rsi/blob0.png # Resources/Textures/Effects/speech.rsi/blob1.png # Resources/Textures/Effects/speech.rsi/blob2.png # Resources/Textures/Effects/speech.rsi/clock0.png # Resources/Textures/Effects/speech.rsi/clock1.png # Resources/Textures/Effects/speech.rsi/clock2.png # Resources/Textures/Effects/speech.rsi/default0.png # Resources/Textures/Effects/speech.rsi/default1.png # Resources/Textures/Effects/speech.rsi/default2.png # Resources/Textures/Effects/speech.rsi/guardian0.png # Resources/Textures/Effects/speech.rsi/guardian1.png # Resources/Textures/Effects/speech.rsi/guardian2.png # Resources/Textures/Effects/speech.rsi/holo0.png # Resources/Textures/Effects/speech.rsi/holo1.png # Resources/Textures/Effects/speech.rsi/holo2.png # Resources/Textures/Effects/speech.rsi/lawyer0.png # Resources/Textures/Effects/speech.rsi/lawyer1.png # Resources/Textures/Effects/speech.rsi/lawyer2.png # Resources/Textures/Effects/speech.rsi/machine0.png # Resources/Textures/Effects/speech.rsi/machine1.png # Resources/Textures/Effects/speech.rsi/machine2.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Effects/speech.rsi/robot0.png # Resources/Textures/Effects/speech.rsi/robot1.png # Resources/Textures/Effects/speech.rsi/robot2.png # Resources/Textures/Effects/speech.rsi/slime0.png # Resources/Textures/Effects/speech.rsi/slime1.png # Resources/Textures/Effects/speech.rsi/slime2.png # Resources/Textures/Effects/speech.rsi/swarmer0.png # Resources/Textures/Effects/speech.rsi/swarmer1.png # Resources/Textures/Effects/speech.rsi/swarmer2.png # Resources/Textures/Effects/speech.rsi/syndibot0.png # Resources/Textures/Effects/speech.rsi/syndibot1.png # Resources/Textures/Effects/speech.rsi/syndibot2.png # Resources/Textures/Structures/Machines/microwave.rsi/meta.json # Resources/Textures/Structures/Machines/microwave.rsi/mw.png # Resources/Textures/Structures/Machines/microwave.rsi/mw0.png # Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png # Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png # Resources/Textures/Structures/Machines/microwave.rsi/mwb.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png # Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png # Resources/Textures/Structures/Machines/microwave.rsi/mwo.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/command.rsi/base.png # Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/command.rsi/open.png # Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png # Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png # Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png # Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png # Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png # Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png # Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png # Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png # Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png # Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/science.rsi/base.png # Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/science.rsi/open.png # Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png # Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png # Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json # Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png # Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
github-actions
bot
added
Status: Needs Review
Morb0
pushed a commit
that referenced
this pull request
Aug 13, 2023
Morb0
pushed a commit
that referenced
this pull request
Jan 16, 2025
* Pride-O-Mat (#1322) * Added Pride-O-Mat * Yep * Updated license to the correct one * Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory * Removed bunny ears, fixed typo * Made requested changes Webedit lmao --------- Co-authored-by: Dorragon <[email protected]>
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
Медиа
Проверки
Изменения