Upstream merge 68 #2287
Merged
Upstream merge 68 #2287
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
fixed the map (for real this time)
* add * yes
* Act * Adds Jaunt ECS and related prototypes * Adds jaunt sounds * Adds enter and exit sound support to polymorphs * Updates jaunt description * Adds jaunt action sprite and changes jaunt polymorph to use it * Adds Jaunt and upgrade to the wizard grimoire * Makes base mob jaunt parent off of incorporeal and basemob, adds blue ghost sprite for ethereal jaunt * Update Resources/Locale/en-US/store/spellbook-catalog.ftl Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Polymorph/PolymorphPrototype.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Polymorph/PolymorphPrototype.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * removes meta changes * removes other meta changes * adds context menu and a description to basemobjaunt * comments for jaunt component and adds on component shutdown method * Update Content.Shared/Jaunt/JauntComponent.cs * Update Content.Shared/Jaunt/JauntComponent.cs * Update Content.Shared/Jaunt/JauntComponent.cs * Update Resources/Prototypes/Catalog/spellbook_catalog.yml --------- Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…-station-14 into ion-storm-refactor
* Update labeler.yml * Update labeler-needsreview.yml * Update labeler-staging.yml * Update labeler-stable.yml * Update labeler-untriaged.yml * Create labeler-size.yml * Update labeler-size.yml * Update labeler-size.yml * Update conflict-labeler.yml * Rename conflict-labeler.yml to labeler-conflict.yml
Swap VowAlert and VowBrokenAlert on lines 149 and 150 so that the proper alerts are cleared and shown
* Borg type switching. This allows borgs (new spawn or constructed) to select their chassis type on creation, like in SS13. This removes the need for the many different chassis types, and means round-start borgs can actually play the game immediately instead of waiting for science to unlock everything. New borgs have an additional action that allows them to select their type. This opens a nice window with basic information about the borgs and a select button. Once a type has been selected it is permanent for that borg chassis. These borg types also immediately start the borg with specific modules, so they do not need to be printed. Additional modules can still be inserted for upgrades, though this is now less critical. The built-in modules cannot be removed, but are shown in the UI. The modules that each borg type starts with: * Generic: tools * Engineering: advanced tools, construction, RCD, cable * Salvage: Grappling gun, appraisal, mining * Janitor: cleaning, light replacer * Medical: treatment * Service: music, service, clowning Specialized borgs have 3 additional module slots available on top of the ones listed above, generic borgs have 5. Borg types are specified in a new BorgTypePrototype. These prototypes specify all information about the borg type. It is assigned to the borg entity through a mix of client side, server, and shared code. Some of the involved components were made networked, others are just ensured they're set on both sides of the wire. The most gnarly change is the inventory template prototype, which needs to change purely to modify the borg hat offset. I managed to bodge this in with an API that *probably* won't explode for specifically for this use case, but it's still not the most clean of API designs. Parts for specific borg chassis have been removed (so much deleted YAML) and specialized borg modules that are in the base set of a type have been removed from the exosuit fab as there's no point to printing those. The ability to "downgrade" a borg so it can select a new chassis, like in SS13, is something that would be nice, but was not high enough priority for me to block the feature on. I did keep it in mind with some of the code, so it may be possible in the future. There is no fancy animation when selecting borg types like in SS13, because I didn't think it was high priority, and it would add a lot of complex code. * Fix sandbox failure due to collection expression. * Module tweak Fix salvage borg modules still having research/lathe recipes Engie borg has regular tool module, not advanced. * Fix inventory system breakage * Fix migrations Some things were missing * Guidebook rewordings & review * MinWidth on confirm selection button
…nt (space-wizards#33213) * add air alarms to sec checkpoint, cmo and western surgery * decals and cleanup
* initial commit * delete WIP-marker.md * add TEG room, move gas chambers up * remove outside burn chamber button, add naming to APC, SMES, Substation * add HV below TEG Substation * removed invalids
…zards#33287) * Role abandonment aHelp requirement. * disable roundstart chat message --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…izards#33262) * Add the stuff * Loc fix * fixes * Change
Conflicts:
.github/labeler.yml
.github/workflows/labeler-stable.yml
.github/workflows/labeler-staging.yml
.github/workflows/labeler-untriaged.yml
Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
Content.Server/Administration/BanPanelEui.cs
Content.Server/Administration/Managers/BanManager.cs
Content.Server/Administration/Managers/IBanManager.cs
Content.Server/Bed/Cryostorage/CryostorageSystem.cs
Content.Server/Ghost/GhostSystem.cs
Content.Server/Physics/Controllers/MoverController.cs
Content.Server/Silicons/Laws/SiliconLawSystem.cs
Content.Server/StationEvents/Events/IonStormRule.cs
Content.Server/VendingMachines/VendingMachineSystem.cs
Content.Shared.Database/LogType.cs
Content.Shared/Administration/BanPanelEuiState.cs
Content.Shared/CCVar/CCVars.cs
Content.Shared/DrawDepth/DrawDepth.cs
Resources/Prototypes/Catalog/Fills/Crates/service.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
Resources/Prototypes/Datasets/Names/borer.yml
Resources/Prototypes/Datasets/Names/diona.yml
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
Resources/Prototypes/Entities/Mobs/Player/observer.yml
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Resources/Prototypes/Entities/Objects/Materials/ore.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
Resources/Prototypes/Entities/Stations/base.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
Resources/Prototypes/Recipes/Construction/structures.yml
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
Resources/Prototypes/Research/industrial.yml
Resources/Prototypes/Stacks/science_stacks.yml
Resources/Prototypes/Tiles/plating.yml
Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png
Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
Resources/Textures/Structures/Windows/mining.rsi/full.png
Resources/Textures/Structures/Windows/mining.rsi/meta.json
Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png
Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png
Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png
Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png
Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png
Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png
Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png
Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png
Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png
Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/full.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png
Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png
Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state1.png
Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
Resources/Textures/Structures/Windows/window.rsi/full.png
Resources/Textures/Structures/Windows/window.rsi/meta.json
Resources/Textures/Structures/Windows/window.rsi/window0.png
Resources/Textures/Structures/Windows/window.rsi/window1.png
Resources/Textures/Structures/Windows/window.rsi/window2.png
Resources/Textures/Structures/Windows/window.rsi/window3.png
Resources/Textures/Structures/Windows/window.rsi/window4.png
Resources/Textures/Structures/Windows/window.rsi/window5.png
Resources/Textures/Structures/Windows/window.rsi/window6.png
Resources/Textures/Structures/Windows/window.rsi/window7.png
Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json
Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
Resources/Textures/Tiles/plating_burnt.png
Resources/Textures/Tiles/steel_burnt.png
Resources/migration.yml
stalengd
force-pushed
the
upstream-merge-68
branch
from
51820a8 to
d690271
Compare
|
Чеки. |
Да, там какая-то новая система с выбором типа борга и удалили все части, которые относятся к конкретному типу борга |
|
@Kirus59 чеки побеждены |
Kirus59
approved these changes
Dec 1, 2024
This was referenced Dec 1, 2024
Merged
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
Список конфликтующих файлов оставил в описании первого мерж коммита.
В том числе мержится PR, в котором оффы выпилили почти все CVar-ы из файла
CCVars.cs, там были и некоторые наши, их пришлось перенести вCCVars220, при этом не все изменения в старом коде где использовались наши cvar были помечены, я их также не стал метить, поскольку неизвестно где они начинаются и заканчиваются.Медиа
Проверки
Изменения
no cl