Skip to content
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

Драконы\почта #102

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Player/dragon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,14 @@
spawned:
- id: FoodMeatDragon
amount: 2
- id: HeadSkeleton # Corvax
amount: 1
- id: WeaponCrusher # Corvax
amount: 1
prob: 0.6
- id: MobRandomCargoCorpse # Corvax
amount: 1
prob: 0.25
- type: InteractionPopup
successChance: 0.25 # It's no goose, but you better smell like carp.
interactSuccessString: petting-success-dragon
Expand Down
87 changes: 87 additions & 0 deletions Resources/Prototypes/_NF/Mail/mail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2165,3 +2165,90 @@
- type: Mail
contents:
- id: FoodBoxDonut

- type: entity
categories: [ HideSpawnMenu ]
parent: BaseMail
id: MailBoomBox
suffix: boombox
components:
- type: Mail
contents:
- id: BaseBoomBox
- id: BaseBoomBoxTapeSpaceAsshole
prob: 0.5

- type: entity
categories: [ HideSpawnMenu ]
parent: BaseMail
id: MailBoomBoxTapePack1
suffix: boombox
components:
- type: Mail
contents:
- id: BaseBoomBoxTapeSpaceOddity
- id: BaseBoomBoxTapeSpaceAsshole
- id: BaseBoomBoxTapeStarman
- id: BaseBoomBoxTapeTheChain
- id: BaseBoomBoxTapeSigridEverybodyKnows
prob: 0.5

- type: entity
categories: [ HideSpawnMenu ]
parent: BaseMail
id: MailBoomBoxTapePack2
suffix: boombox
components:
- type: Mail
contents:
- id: BaseBoomBoxTapeCantSmile
- id: BaseBoomBoxTapeUnderStars
- id: BaseBoomBoxTapeComingHome
- id: BaseBoomBoxTapeSignals
- id: BaseBoomBoxTapeSigridEverybodyKnows
prob: 0.5

- type: entity
categories: [ HideSpawnMenu ]
parent: BaseMail
id: MailBoomBoxTapePack3
suffix: boombox
components:
- type: Mail
contents:
- id: BaseBoomBoxTapeDemonKittyRag
- id: BaseBoomBoxTapeKissTheSky
- id: BaseBoomBoxTapeRetrograde
- id: BaseBoomBoxTapeThisAintNoPlaceForNoHero
- id: BaseBoomBoxTapeSigridEverybodyKnows
prob: 0.5

- type: entity
categories: [ HideSpawnMenu ]
parent: BaseMail
id: MailBoomBoxTapePack4
suffix: boombox
components:
- type: Mail
contents:
- id: BaseBoomBoxTapeMrKittyAfterDark
- id: BaseBoomBoxTapeTobyFoxHopesAndDreams
- id: BaseBoomBoxTapeTobyFoxMegalovania
- id: BaseBoomBoxTapeTobyFoxUndertale
- id: BaseBoomBoxTapeSigridEverybodyKnows
prob: 0.5

- type: entity
categories: [ HideSpawnMenu ]
parent: BaseMail
id: MailBoomBoxTapePack5
suffix: boombox
components:
- type: Mail
contents:
- id: BaseBoomBoxTapeImagineDragonEnemy
- id: BaseBoomBoxTapeKDAVillian
- id: BaseBoomBoxTapeRamseyGoodbye
- id: BaseBoomBoxTapeSamuelKimGunsForHire
- id: BaseBoomBoxTapeSigridEverybodyKnows
prob: 0.5
6 changes: 6 additions & 0 deletions Resources/Prototypes/_NF/Mail/mailDeliveries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
MailNFThrongler: 0.1
MailNFUnicycle: 0.5
MailNFVulpCannon: 0.1
MailBoomBox: 1.0 # Corvax
MailBoomBoxTapePack1: 0.5 # Corvax
MailBoomBoxTapePack2: 0.5 # Corvax
MailBoomBoxTapePack3: 0.5 # Corvax
MailBoomBoxTapePack4: 0.5 # Corvax
MailBoomBoxTapePack5: 0.5 # Corvax
# Useful
MailNFATV: 0.9
MailNFSkeletonMotorcycle: 0.1 # Shares a pool with MailNFATV as a rare variant
Expand Down
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 91 files
+1 −1 MSBuild/Robust.Engine.Version.props
+0 −89 RELEASE-NOTES.md
+0 −6 Resources/EnginePrototypes/entityCategory.yml
+1 −8 Resources/Locale/en-US/custom-controls.ftl
+0 −3 Resources/Locale/en-US/entity-category.ftl
+0 −63 Robust.Analyzers.Tests/DuplicateDependencyAnalyzerTest.cs
+0 −126 Robust.Analyzers/DuplicateDependencyAnalyzer.cs
+0 −2 Robust.Client/ClientIoC.cs
+2 −3 Robust.Client/Console/Commands/LauncherAuthCommand.cs
+6 −18 Robust.Client/GameController/GameController.cs
+0 −8 Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs
+0 −3 Robust.Client/Graphics/Clyde/Clyde.Events.cs
+1 −13 Robust.Client/Graphics/Clyde/Clyde.Windowing.cs
+1 −1 Robust.Client/Graphics/Clyde/ClydeHeadless.cs
+0 −9 Robust.Client/Graphics/Clyde/Windowing/Glfw.WindowThread.cs
+0 −14 Robust.Client/Graphics/Clyde/Windowing/Glfw.Windows.cs
+0 −1 Robust.Client/Graphics/Clyde/Windowing/IWindowingImpl.cs
+0 −9 Robust.Client/Graphics/Clyde/Windowing/Sdl2.WindowThread.cs
+0 −11 Robust.Client/Graphics/Clyde/Windowing/Sdl2.Windows.cs
+1 −1 Robust.Client/Graphics/IClydeWindow.cs
+0 −86 Robust.Client/HWId/BasicHWId.cs
+0 −15 Robust.Client/IGameController.cs
+1 −0 Robust.Client/Physics/PhysicsSystem.Predict.cs
+3 −0 Robust.Client/Player/PlayerManager.cs
+1 −1 Robust.Client/Replays/Loading/ReplayLoadManager.Read.cs
+1 −17 Robust.Client/UserInterface/Control.cs
+0 −11 Robust.Client/UserInterface/Controllers/Implementations/EntitySpawningUIController.cs
+10 −36 Robust.Client/UserInterface/Controllers/Implementations/TileSpawningUIController.cs
+3 −16 Robust.Client/UserInterface/Controls/BaseButton.cs
+1 −22 Robust.Client/UserInterface/Controls/LineEdit.cs
+8 −22 Robust.Client/UserInterface/Controls/OSWindow.cs
+1 −1 Robust.Client/UserInterface/Controls/SpriteView.cs
+33 −12 Robust.Client/UserInterface/Controls/TabContainer.cs
+1 −1 Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.xaml
+1 −4 Robust.Client/UserInterface/CustomControls/TileSpawnWindow.xaml
+2 −4 Robust.Client/UserInterface/UserInterfaceManager.Roots.cs
+4 −7 Robust.Client/UserInterface/XAML/Proxy/XamlHotReloadManager.cs
+3 −7 Robust.Client/Utility/UserDataDir.cs
+0 −1 Robust.Roslyn.Shared/Diagnostics.cs
+2 −2 Robust.Server/BaseServer.cs
+1 −0 Robust.Server/Console/ServerConsoleHost.cs
+5 −6 Robust.Server/GameObjects/EntitySystems/MapSystem.cs
+4 −6 Robust.Server/GameStates/PvsChunk.cs
+0 −1 Robust.Server/GameStates/PvsSystem.Chunks.cs
+1 −2 Robust.Server/GameStates/PvsSystem.cs
+7 −7 Robust.Server/Physics/GridFixtureSystem.cs
+2 −1 Robust.Server/Player/PlayerManager.cs
+0 −2 Robust.Server/ServerIoC.cs
+0 −80 Robust.Server/ServerStatus/IWatchdogApi.cs
+8 −55 Robust.Server/ServerStatus/WatchdogApi.cs
+9 −25 Robust.Shared.Scripting/ScriptGlobalsShared.cs
+3 −21 Robust.Shared.Scripting/ScriptInstanceShared.cs
+0 −19 Robust.Shared/CVars.cs
+1 −6 Robust.Shared/Console/IConsoleShell.cs
+1 −3 Robust.Shared/ContentPack/Sandbox.yml
+2 −2 Robust.Shared/GameObjects/Components/UserInterface/BoundUserInterface.cs
+6 −6 Robust.Shared/GameObjects/EntityManager.Network.cs
+0 −9 Robust.Shared/GameObjects/EntityManager.cs
+0 −10 Robust.Shared/GameObjects/Systems/EntityLookupSystem.ComponentQueries.cs
+2 −1 Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
+1 −4 Robust.Shared/GameStates/SessionState.cs
+2 −2 Robust.Shared/Localization/Loc.cs
+0 −11 Robust.Shared/Network/AuthManager.cs
+46 −0 Robust.Shared/Network/HWId.cs
+0 −67 Robust.Shared/Network/IHWId.cs
+0 −3 Robust.Shared/Network/Messages/Handshake/MsgEncryptionRequest.cs
+0 −5 Robust.Shared/Network/Messages/Handshake/MsgEncryptionResponse.cs
+5 −0 Robust.Shared/Network/Messages/Handshake/MsgLoginStart.cs
+2 −0 Robust.Shared/Network/Messages/MsgPlayerList.cs
+6 −14 Robust.Shared/Network/NetManager.ClientConnect.cs
+4 −23 Robust.Shared/Network/NetManager.ServerAuth.cs
+0 −1 Robust.Shared/Network/NetManager.cs
+0 −17 Robust.Shared/Network/NetUserData.cs
+3 −6 Robust.Shared/Physics/Dynamics/Contacts/Contact.cs
+14 −14 Robust.Shared/Physics/Systems/SharedPhysicsSystem.Island.cs
+6 −5 Robust.Shared/Physics/Systems/SharedPhysicsSystem.cs
+1 −6 Robust.Shared/Player/CommonSession.cs
+1 −4 Robust.Shared/Player/ICommonSession.cs
+0 −3 Robust.Shared/Player/SharedPlayerManager.State.cs
+1 −0 Robust.Shared/Prototypes/PrototypeManager.YamlValidate.cs
+67 −55 Robust.Shared/Serialization/RobustSerializer.cs
+0 −59 Robust.Shared/Toolshed/TypeParsers/ProtoIdTypeParser.cs
+0 −12 Robust.Shared/Utility/Base64Helpers.cs
+7 −1 Robust.Shared/Utility/UniqueIndexHkm.cs
+0 −15 Robust.UnitTesting/GameControllerDummy.cs
+1 −2 Robust.UnitTesting/RobustIntegrationTest.NetManager.cs
+0 −2 Robust.UnitTesting/Server/RobustServerSimulation.cs
+5 −8 Robust.UnitTesting/Shared/EntityLookup_Test.cs
+0 −1 Robust.UnitTesting/Shared/GameObjects/EntityState_Tests.cs
+0 −2 Robust.UnitTesting/Shared/IoC/IoCManager_Test.cs
+9 −12 Robust.UnitTesting/Shared/Map/GridRotation_Tests.cs
Loading