From 9a267ed8e9146cf1b673d3717bd9a255548e3def Mon Sep 17 00:00:00 2001 From: NEirotoXiN Date: Fri, 13 Dec 2024 00:11:07 +0300 Subject: [PATCH 1/3] =?UTF-8?q?mail(=D0=BC=D0=B5=D0=B9=D0=B1=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BE=D0=BC=D0=B0=D0=BD=D0=BE=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=85=D1=83=D0=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_NF/Mail/mail.yml | 87 +++++++++++++++++++ .../Prototypes/_NF/Mail/mailDeliveries.yml | 6 ++ RobustToolbox | 2 +- 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index d3f70d67fe7..3537bceac25 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml index aa8503b629e..bb43da7b18f 100644 --- a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml +++ b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml @@ -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 diff --git a/RobustToolbox b/RobustToolbox index 32bca7cfd41..c86cb0b7951 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 32bca7cfd417edcad9a60c2b1703eba8675f56af +Subproject commit c86cb0b7951cc4a662c7292138c5f45d868c5f58 From aac94f9504391205227a05effe5708393f5dc7fd Mon Sep 17 00:00:00 2001 From: NEirotoXiN Date: Fri, 13 Dec 2024 00:43:51 +0300 Subject: [PATCH 2/3] things in dragon --- Resources/Prototypes/Entities/Mobs/Player/dragon.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index b12def44c86..4c73f3c69c1 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -121,6 +121,14 @@ spawned: - id: FoodMeatDragon amount: 2 + - id: HeadSkeleton + amount: 1 + - id: WeaponCrusher + amount: 1 + prob: 0.6 + - id: MobRandomCargoCorpse + amount: 1 + prob: 0.25 - type: InteractionPopup successChance: 0.25 # It's no goose, but you better smell like carp. interactSuccessString: petting-success-dragon From 7407cdaca4d7c53f15d059b1903fc68531604153 Mon Sep 17 00:00:00 2001 From: NEirotoXiN Date: Fri, 13 Dec 2024 00:57:07 +0300 Subject: [PATCH 3/3] CorvaxMark --- Resources/Prototypes/Entities/Mobs/Player/dragon.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 4c73f3c69c1..4ef933fa0ba 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -121,12 +121,12 @@ spawned: - id: FoodMeatDragon amount: 2 - - id: HeadSkeleton + - id: HeadSkeleton # Corvax amount: 1 - - id: WeaponCrusher + - id: WeaponCrusher # Corvax amount: 1 prob: 0.6 - - id: MobRandomCargoCorpse + - id: MobRandomCargoCorpse # Corvax amount: 1 prob: 0.25 - type: InteractionPopup