diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl index 85c3a1f565f..7d0b8e36efa 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl @@ -133,3 +133,6 @@ ent-MailVagueThreat = { ent-BaseMail } ent-MailWinterCoat = { ent-BaseMail } .suffix = wintercoat .desc = { ent-BaseMail.desc } +ent-MailBoomBox = { ent-BaseMail } + .suffix = boombox + .desc = { ent-BaseMail.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml deleted file mode 100644 index f652f2573f5..00000000000 --- a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml +++ /dev/null @@ -1,116 +0,0 @@ -# - type: mailDeliveryPool - # id: RandomMailDeliveryPool - # everyone: - # MailAlcohol: 0.5 - # MailSake: 0.5 - # MailBible: 1 - # MailBikeHorn: 0.5 - # MailBlockGameDIY: 1 - # MailCake: 1 - # MailCallForHelp: 0.6 - # MailCheese: 1 - # MailChocolate: 1 - # MailCigarettes: 0.5 - # MailCigars: 0.5 - # MailCookies: 1.1 - # MailCosplayArc: 0.5 - # MailCosplayGeisha: 0.5 - # MailCosplayMaid: 0.5 - # MailCosplayNurse: 0.5 - # MailCosplaySchoolgirl: 0.5 - # MailCosplayWizard: 0.5 - # MailCrayon: 1 - # MailFigurine: 1 - # MailFishingCap: 0.5 - # MailFlashlight: 1 - # MailFlowers: 1 - # MailHighlander: 0.12 - # MailHighlanderDulled: 1 - # MailHoneyBuns: 1 - # MailJunkFood: 1 - # MailKatana: 1 - # MailKnife: 1 - # MailMoney: 1 - # MailMuffins: 1.1 - # MailMoffins: 0.5 - # MailNoir: 0.5 - # MailPAI: 1 - # MailPlushie: 1 - # MailRestraints: 1 - # MailSixPack: 0.5 - # MailSkub: 0.5 - # MailSoda: 1 - # MailSpaceVillainDIY: 1 - # MailSunglasses: 1 - # MailVagueThreat: 0.4 - # This is mainly for Glacier. - # MailWinterCoat: 1.5 - # MailBoombox: 1.5 - # MailBoomboxPack1: 0.5 - # MailBoomboxPack2: 0.5 - # MailBoomboxPack3: 0.5 - # MailBoomboxPack4: 0.5 - # MailBoomboxPack5: 0.5 - # MailBoomboxPack6: 0.5 - # MailBoomboxPack7: 0.5 - # MailBoomboxPack8: 0.5 - -# Department and job-specific mail can have slightly higher weights, -# since they'll be merged with the everyone pool. - # departments: - # Medical: - # MailMedicalBasicSupplies: 2 - # MailMedicalChemistrySupplement: 2 - # MailMedicalEmergencyPens: 3 - # MailMedicalMedicinePills: 2 - # MailMedicalSheetPlasma: 1 - # MailMedicalSpaceacillin: 1 - # MailMedicalStabilizers: 2 - # Engineering: - # MailAMEGuide: 1 - # MailEngineeringCables: 2 - # MailEngineeringKudzuDeterrent: 2 - # MailEngineeringSheetGlass: 2 - # MailEngineeringWelderReplacement: 2 - # Security: - # MailSecurityDonuts: 3 - # MailSecurityFlashlight: 2 - # MailSecurityNonlethalsKit: 2 - # MailSecuritySpaceLaw: 1 -# All heads of staff are in Command and not their departments, technically. -# So any items from the departments above that should also be sent to the - # respective department heads should be duplicated below. - # Command: - # MailCommandPinpointerNuclear: 0.5 - - # jobs: - # Botanist: - # MailBotanistChemicalBottles: 2 - # MailBotanistMutagen: 1.5 - # MailBotanistSeeds: 1 - # ChiefEngineer: - # MailEngineeringKudzuDeterrent: 2 - # ChiefMedicalOfficer: - # MailMedicalEmergencyPens: 2 - # MailMedicalMedicinePills: 3 - # MailMedicalSheetPlasma: 2 - # Clown: - # MailClownGildedBikeHorn: 0.5 - # MailClownHonkSupplement: 3 - # HeadOfPersonnel: - # MailHoPBureaucracy: 2 - # MailHoPSupplement: 3 - # HeadOfSecurity: - # MailSecurityNonlethalsKit: 2 - # Lawyer: - # MailSecuritySpaceLaw: 2 - # Mime: - # MailMimeArtsCrafts: 3 - # MailMimeBlankBook: 2 - # MailMimeBottleOfNothing: 1 - # Musician: - # MailMusicianInstrumentSmall: 1 - # Passenger: - # MailPassengerMoney: 3 - # Warden: - # MailWardenCrowdControl: 2 diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index 7611e3d9095..695b407364d 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -2046,3 +2046,121 @@ maxAmount: 2 - id: Handcuffs maxAmount: 2 + +# Corvax Frontier + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBox + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBox + - id: BaseBoomBoxTapeSpaceAsshole + prob: 0.5 + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack1 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeSpaceOddity + - id: BaseBoomBoxTapeSpaceAsshole + - id: BaseBoomBoxTapeStarman + - id: BaseBoomBoxTapeTheChain + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack2 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeCantSmile + - id: BaseBoomBoxTapeUnderStars + - id: BaseBoomBoxTapeComingHome + - id: BaseBoomBoxTapeSignals + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack3 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeDemonKittyRag + - id: BaseBoomBoxTapeKissTheSky + - id: BaseBoomBoxTapeRetrograde + - id: BaseBoomBoxTapeThisAintNoPlaceForNoHero + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack4 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeMrKittyAfterDark + - id: BaseBoomBoxTapeTobyFoxHopesAndDreams + - id: BaseBoomBoxTapeTobyFoxMegalovania + - id: BaseBoomBoxTapeTobyFoxUndertale + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack5 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeImagineDragonEnemy + - id: BaseBoomBoxTapeKDAVillian + - id: BaseBoomBoxTapeRamseyGoodbye + - id: BaseBoomBoxTapeSamuelKimGunsForHire + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack6 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeSigridEverybodyKnows + - id: BaseBoomBoxTapeTitoTarantulaAfterDark + - id: BaseBoomBoxTapeTheOffspringTheKids + - id: BaseBoomBoxTapeMichaelHolborn + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack7 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeDavidRawlings + - id: BaseBoomBoxTapeKavinskynightcall + - id: BaseBoomBoxTapeHIFIBeacon + - id: BaseBoomBoxTapeHIFIBlink + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomBoxTapePack8 + suffix: boombox + components: + - type: Mail + contents: + - id: BaseBoomBoxTapeHIFIFail + - id: BaseBoomBoxTapeHIFIRekka + - id: BaseBoomBoxTapeHotLineCrystals + - id: BaseBoomBoxTapeHotLineHydrogen diff --git a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml index 582d317a880..fc1b840ca03 100644 --- a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml +++ b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml @@ -84,6 +84,16 @@ MailRestraints: 0.5 # TODO: figure out what to do with this. MailNFSmoke: 0.5 MailNFVagueThreat: 0.4 + # Music + MailBoomBox: 1.3 + MailBoomBoxTapePack1: 0.5 + MailBoomBoxTapePack2: 0.5 + MailBoomBoxTapePack3: 0.5 + MailBoomBoxTapePack4: 0.5 + MailBoomBoxTapePack5: 0.5 + MailBoomBoxTapePack6: 0.5 + MailBoomBoxTapePack7: 0.5 + MailBoomBoxTapePack8: 0.5 # Department and job-specific mail can have slightly higher weights, # since they'll be merged with the everyone pool.