Merge pull request #1434 from kipdotnet/mailtime

mail expansion #1

Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml

@@ -1238,7 +1238,7 @@
     contents:
     - id: LuxuryPen
       orGroup: Pen
-      prob: 0.50
+      prob: 0.8
     # DeltaV: Commenting these two out because I dunno if crew should have nice things
     # - id: PenHop
     #   orGroup: Pen
@@ -1248,12 +1248,12 @@
     #   prob: 0.25
     # TODO: come up with a slightly less powerful version of these
     # Ultra-rare
-    # - id: CyberPen
-    #   orGroup: Pen
-    #   prob: 0.005
-    # - id: PenCentcom
-    #   orGroup: Pen
-    #   prob: 0.005
+    - id: CyberPen
+      orGroup: Pen
+      prob: 0.1
+    - id: PenCentcom
+      orGroup: Pen
+      prob: 0.1
     - id: PaperMailNFPaperPusherAd
 
 - type: entity

Resources/Prototypes/_Impstation/Entities/Objects/Specific/Janitorial/spray.yml

@@ -0,0 +1,16 @@
+- type: entity
+  name: spray bottle
+  id: SprayBottleCarpetium
+  suffix: Filled, Carpetium
+  parent: SprayBottle
+  components:
+  - type: Tag
+    tags:
+    - Spray
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 100
+        reagents:
+        - ReagentId: Carpetium
+          Quantity: 100

Resources/Prototypes/_Impstation/Entities/Objects/Specific/Mail/mail.yml

@@ -2,10 +2,127 @@
 
 - type: entity
   parent: BaseMailLarge
-  id: MailGoblin
-  suffix: pumpkinpie
+  id: MailImpGoblin
+  suffix: a whole goblin
   components:
   - type: Mail
     contents:
-    - id: FoodPiePumpkin
+    - id: MobGoblinStowaway
 
+- type: entity
+  parent: BaseMailLarge
+  id: MailImpToolbox
+  suffix: toolbox
+  components:
+  - type: Mail
+    contents:
+    - id: ToolboxElectricalFilled
+      orGroup: Toolbox
+      prob: 0.3
+    - id: ToolboxArtisticFilled
+      orGroup: Toolbox
+      prob: 0.3
+    - id: ToolboxMechanicalFilled
+      orGroup: Toolbox
+      prob: 0.3
+    - id: ToolboxSyndicateFilled
+      orGroup: Toolbox
+      prob: 0.1
+    - id: PaperMailNFPowerTool
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailImpSCargo
+  suffix: S-cargo
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingBackpackSCargoDuffelPurple
+      orGroup: Backpack
+      prob: 0.5
+    - id: ClothingBackpackSCargoDuffelCyan
+      orGroup: Backpack
+      prob: 0.5
+
+- type: entity
+  parent: BaseMail
+  id: MailImpBee
+  suffix: angry bee
+  components:
+  - type: Mail
+    contents:
+    - id: MobAngryBee
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailImpChameleonScarf
+  suffix: Chameleon scarf
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingNeckChameleon
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailImpShoes
+  suffix: toolbox
+  components:
+  - type: Mail
+    contents:
+    - id: ClothingShoesBootsWork #I wish I got mailed free workboots
+      orGroup: Shoes
+      prob: 0.3
+    - id: ClothingShoesBootsMag
+      orGroup: Shoes
+      prob: 0.3
+    - id: ClothingShoesSkates
+      orGroup: Shoes
+      prob: 0.3
+    - id: ClothingShoesChameleon
+      orGroup: Shoes
+      prob: 0.1
+
+- type: entity
+  parent: BaseMail
+  id: MailImpCarpetiumBottle
+  suffix: carpetium
+  components:
+  - type: Mail
+    contents:
+    - id: SprayBottleCarpetium
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailImpBedsheets
+  suffix: bedsheets
+  components:
+  - type: Mail
+    contents:
+    - id: BedsheetRainbow
+      orGroup: Bedsheet
+      prob: 0.2
+    - id: BedsheetWiz
+      orGroup: Bedsheet
+      prob: 0.2
+    - id: BedsheetNT
+      orGroup: Bedsheet
+      prob: 0.2
+    - id: BedsheetCosmos
+      orGroup: Bedsheet
+      prob: 0.2
+    - id: BedsheetCentcom
+      orGroup: Bedsheet
+      prob: 0.2
+    - id: PaperMailNTBedsheetsAd
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailTckTck #for salvagers. also because I want to
+  suffix: Tck'tck
+  components:
+  - type: Mail
+    contents:
+    - id: MobTckTck
+    - id: BorgModuleTckTckGun
+      prob: 0.09
+    - id: PaperMailTckTck

Resources/Prototypes/_Impstation/Entities/Objects/Specific/Mail/paper.yml

@@ -0,0 +1,44 @@
+- type: entity
+  id: PaperMailNTBedsheetsAd
+  categories: [ HideSpawnMenu ]
+  suffix: "bedsheet ad"
+  parent: Paper
+  components:
+  - type: Paper
+    stampedBy:
+    - stampedColor: '#333333FF'
+      stampedName: Salas Naana
+#      stampType: Signature # DeltaV - Not compatible with our signatures code stuff apparently
+    content: |2
+      [head=3]Hello Valued Customer,[/head]
+      You have been selected to receive a complimentary sampler of the high-quality linen that Nanotrasen has to offer.
+
+      Whether for sleeping or snacking, Nanotrasen's patented HyperWeave fabric is sure to deliver the highest standard of well-rested productivity.
+      Remember, there's no substitute for good rest, and whether you prefer a mattress or a cryopod, comfort is a top priority.
+
+      We hope you enjoy.
+
+      Sincerely,
+            Salas Naana, Assistant-in-chief, NT Habs - Hospitality Dept.
+
+- type: entity
+  id: PaperMailTckTck
+  categories: [ HideSpawnMenu ]
+  suffix: "tck'tck note"
+  parent: Paper
+  components:
+  - type: Paper
+    stampedBy:
+    - stampedColor: '#333333FF'
+      stampedName: T'ckr'tk, Fourth
+#      stampType: Signature # DeltaV - Not compatible with our signatures code stuff apparently
+    content: |2
+      [head=3]U'uat kck,[/head]
+      R'chtr k'ck t'ckr ut't uuo,
+
+      Tr' ck't'rck U'uta ut'ck, "Nanotrasen" tk'rt u'out'ck ta.
+      Uot'a "Tck'tck", ot'rq t'u'ta "Salvage Department".
+
+      U'tu'uo, "Tck'tck" r'tua.
+
+            T'ckr'tk, Fourth, O'ckt'rt "Outriggers".

Resources/Prototypes/_Impstation/Mail/mailDeliveries.yml

@@ -1,13 +1,16 @@
 - type: mailDeliveryPool
   id: RandomDeltaVMailDeliveryPool
   everyone:
-    #Imp: table weight adds to 38
-    #Clothing - 7.5
-    MailNFCosplayMaid: 2.5
+    #Imp: table weight adds to 40
+    #Clothing - 8
     MailWinterCoat: 1.5
     MailNFCosplayWizard: 1
     MailSunglasses: 1
+    MailImpSCargo: 1
+    MailImpShoes: 1
     MailFishingCap: 0.5
+    MailNFCosplayMaid: 0.5
+    MailImpChameleonScarf: 0.5
     MailNoir: 0.5
     MailNFTacticalMaid: 0.5
     #Food - 9.69
@@ -28,34 +31,38 @@
     MailNFSodaSpaceCola: 0.2
     MailNFSodaSpaceMountainWind: 0.2
     MailNFSodaSpaceUp: 0.2
-    #Tools - 4.2
-    MailRestraints: 1.2
+    #Tools - 4.6
+    MailRestraints: 0.6
     MailFlashlight: 1
     MailNFKnife: 1
+    MailImpToolbox: 1
     MailSignallerKit: 0.5
     MailNFSword: 0.5
-    #Trinkets - 6.9
-    MailNFPAI: 1.2
+    #Trinkets - 6.4
+    MailNFPAI: 1
     MailBooksAll: 1
     MailFlowers: 1
     MailNFSoaps: 1
     MailNFPen: 0.7
     MailNFCigarettes: 0.5
-    MailNFSoapsOmega: 0.5
-    MailNFVagueThreat: 0.5
+    MailNFSoapsOmega: 0.4
+    MailNFVagueThreat: 0.3
     MailCigars: 0.2
     MailNFJoints: 0.2
     MailNFGoldCigars: 0.1
     #Unique items - 1
     MailNFBible: 1
-    #Fun - 6.71 including MailNFEMP
+    #Fun - 8.31 including MailNFEMP
+    MailImpCarpetiumBottle: 1
+    MailImpBedsheets: 1
     MailCrayon: 1
     MailNFCritter: 1
     MailNFFigurineBulk: 1
     MailNFPlushie: 1
-    MailNFBuildABuddy: 0.6
+    MailNFBuildABuddy: 0.2
     MailNFBikeHorn: 0.5
-    MailBlockGameDIY: 0.5
+    MailImpBee: 0.4
+    MailBlockGameDIY: 0.4
     MailSpaceVillainDIY: 0.4 # Lowered to accommodate the foam sabre
     MailNFSmoke: 0.4
     #MailNFEMP: 0.3 # Imp commented cuz error log :(
@@ -95,7 +102,7 @@
       MailStationRepNFNukeDisk: 0.3
       MailCommandNFPipebombIntern: 0.1
 
-  jobs: # add to 39
+  jobs: # add to 43
     Botanist: # adds to 4.5
       MailBotanistChemicalBottles: 2
       MailBotanistMutagen: 1.5
@@ -124,5 +131,8 @@
       MailMimeBottleOfNothing: 1
     Passenger:
       MailPassengerMoney: 3
+      MailImpGoblin: 2
     Warden:
       MailWardenCrowdControl: 2
+    SalvageSpecialist:
+      MailTckTck: 2

Resources/Prototypes/_NF/Mail/Items/paper.yml

@@ -273,7 +273,7 @@
   components:
   - type: Paper
     content: |2
-      [head=2]GREETINGS DELTA SECTOR CITIZEN[/head]
+      [head=2]GREETINGS IMP SECTOR CITIZEN[/head]
 
       OUR REPORTS INDICATE THAT:
       1. YOU HAVE FAILED YOUR QUARTERLY HYGIENE INSPECTION.
@@ -325,7 +325,7 @@
       [head=2]May you write well, neatly, and with style.[/head]
 
             [head=3]Sincerely,
-               [italic]The Frontier Paper Pusher's Club[/italic][/head]
+               [italic]The IMP Paper Pusher's Club[/italic][/head]
 
 - type: entity
   id: PaperMailNFPetBedAssemblyManual
@@ -453,19 +453,19 @@
 - type: entity
   id: PaperMailNFSpaceLaw
   categories: [ HideSpawnMenu ]
-  suffix: "space-law" # DeltaV- edited contents to be from the Delta Sector instead of the Frontier
+  suffix: "space-law" # DeltaV- edited contents to be from the Delta Sector instead of the Frontier # Imp- edited contents to be from the IMP Sector instead of the Delta Sector
   parent: Paper
   components:
   - type: Paper
     stampState: paper_stamp-centcom
     stampedBy:
     - stampedColor: '#006600FF'
-      stampedName: Central Admiralty of the Delta Sector
+      stampedName: Central Admiralty of the IMP Sector
     content: |2
 
             [head=1]Space Law is your shield.[/head]
 
-                  [head=2]With it, you guard the Delta Sector.[/head][head=3]
+                  [head=2]With it, you guard the IMP Sector.[/head][head=3]
       [/head]
         [head=1]Memorize it. Grasp it firmly.[/head]