Merge pull request #309 from NEirotoXiN00/NFMail

Почта-почта-почта
Corvax-Frontier · Jun 15, 2024 · c0a3fb7 · c0a3fb7
2 parents a31dcbd + 2b46e0b
commit c0a3fb7
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 116 deletions.
diff --git a/...urces/Locale/en-US/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl b/...urces/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 }
diff --git a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml
diff --git 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
@@ -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.