Merge pull request #1604 from ultramario1998:further-courier

A couple more courier packages
impstation · Feb 8, 2025 · a2984ca · a2984ca
2 parents e79a6fb + 909612a
commit a2984ca
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 20 deletions.
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Mail/mail.yml
@@ -1,13 +1,6 @@
 # Impstation Mail
 
-- type: entity
-  parent: BaseMailLarge
-  id: MailImpGoblin
-  suffix: a whole goblin
-  components:
-  - type: Mail
-    contents:
-    - id: MobGoblinStowaway
+# Everyone
 
 - type: entity
   parent: BaseMailLarge
@@ -53,10 +46,19 @@
     contents:
     - id: MobAngryBee
 
+- type: entity
+  parent: BaseMail
+  id: MailImpBROS
+  suffix: an bros
+  components:
+  - type: Mail
+    contents:
+    - id: MobBros
+
 - type: entity
   parent: BaseMailLarge
   id: MailImpChameleonScarf
-  suffix: Chameleon scarf
+  suffix: chameleon scarf
   components:
   - type: Mail
     contents:
@@ -115,9 +117,99 @@
       prob: 0.2
     - id: PaperMailNTBedsheetsAd
 
+- type: entity
+  parent: BaseMail
+  id: MailImpSpaceBlade
+  suffix: space blade
+  components:
+  - type: Mail
+    contents:
+    - id: MysterySpaceBladeBox
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailImpFuckingGun
+  suffix: real gun
+  components:
+  - type: Mail
+    contents: # syndicate guns only
+    - id: WeaponPistolViper
+      orGroup: Gun
+      prob: 1
+    - id: WeaponRevolverPython
+      orGroup: Gun
+      prob: 1
+    - id: WeaponPistolCobra
+      orGroup: Gun
+      prob: 0.5
+    - id: WeaponRevolverMateba
+      orGroup: Gun
+      prob: 0.1
+    - id: WeaponShotgunBulldog
+      orGroup: Gun
+      prob: 0.25
+    - id: WeaponLightMachineGunL6
+      orGroup: Gun
+      prob: 0.1
+    - id: WeaponLauncherChinaLake
+      orGroup: Gun
+      prob: 0.1
+
+# Department-specific mail:
+# Engineering
+
+- type: entity
+  parent: BaseMail
+  id: MailImpEngineeringCompressedMatter
+  suffix: compressed matter
+  components:
+  - type: Mail
+    contents:
+    - id: RCDAmmo
+
+# Job-specific mail:
+# HoS
+
+- type: entity
+  parent: BaseMail
+  id: MailImpHosPillRefill
+  suffix: hos pills (refill)
+  components:
+  - type: Mail
+    isFragile: true
+    isPriority: true
+    contents:
+    - id: PillCanisterHOSRefill
+    - id: PaperMailHosRefill
+
+# Warden
+
+- type: entity
+  parent: BaseMail
+  id: MailImpHosPillWarden
+  suffix: hos pills (warden sample)
+  components:
+  - type: Mail
+    isFragile: true
+    contents:
+    - id: PillCanisterWardenSample
+
+# Passenger
+
+- type: entity
+  parent: BaseMailLarge
+  id: MailImpGoblin
+  suffix: a whole goblin
+  components:
+  - type: Mail
+    contents:
+    - id: MobGoblinStowaway
+
+# Salvage Specialist
+
 - type: entity
   parent: BaseMailLarge
-  id: MailTckTck #for salvagers. also because I want to
+  id: MailImpTckTck #for salvagers. also because I want to
   suffix: Tck'tck
   components:
   - type: Mail
@@ -127,11 +219,15 @@
       prob: 0.05 #9% was too much power
     - id: PaperMailTckTck
 
+# Chef
+
 - type: entity
-  parent: BaseMail
-  id: MailSpaceBlade
-  suffix: SpaceBlade
+  parent: BaseMailLarge
+  id: MailImpChefConveyor
+  suffix: chef conveyors
   components:
   - type: Mail
     contents:
-    - id: MysterySpaceBladeBox
+    - id: ConveyorBeltAssembly
+      amount: 3
+    - id: PaperMailDahirInsaat
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Mail/paper.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Mail/paper.yml
@@ -53,3 +53,40 @@
       ──────────────────────────────────────────
       Sincerely, T'ckr'tk, Fourth.
       O'ckt'rt "Outriggers"
+
+- type: entity
+  id: PaperMailDahirInsaat
+  categories: [ HideSpawnMenu ]
+  suffix: "construction ad"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2
+          [head=2]Dear Imp Sector Nutrition Department[/head]
+
+          [head=3]We at [italic]Dahir Insaat[/italic] would like to offer you this opportunity to demo our New[/head]
+                            [head=2][bold]Turnkey Kitchen[/bold][/head]
+          [head=3].[/head]
+              [head=4]Put the conveyors down and watch it go![/head]
+                        [color=#BBBBBB]Check out our state-of-the-art Quadcopter technology! Now with Disabler variants! Usable anywhere five semi trucks can park.[/color]
+
+- type: entity
+  id: PaperMailHosRefill
+  categories: [ HideSpawnMenu ]
+  suffix: "rx note"
+  parent: Paper
+  components:
+  - type: Paper
+    content: |2 # credits to Moomoobeef (Github) for this template!
+        [color=#5b97bc]░░██░░ [head=2]Rx Memo[/head]
+        ██████ [head=3]Subject: Your Refill [/head]
+        ░░██░░ [head=3]From: Nanotrasen Pharmacies [/head]
+        [/color]                  [color=#bbbbbb][head=3]The Real Chemistry Department[/head]
+        [/color]───────────────────────────────────────
+            [head=5]Dear (NAME),[/head]
+        Your refill request has been approved. Please find it enclosed. 
+
+        You have: ([color=#cb0000]4[/color] of 365) fills remaining.
+
+        Please remember to contact your prescribing doctor for further fills. We remind you that Nanotrasen takes your mental health very seriously.
+        ──────────────────────────────────────
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Medical/healing.yml
@@ -46,6 +46,52 @@
   - type: StealTarget
     stealGroup: SecPillCanister
 
+- type: entity
+  name: head of security's pill refill # sent through the mail
+  parent: [PillCanister, BaseCommandContraband]
+  description: They keep sending these. God, you can't live without them at this point. Are there less than there were yesterday? # change this if it's too depressing?
+  id: PillCanisterHOSRefill
+  suffix: Psicodine 18u Happiness 2u, 2
+  components:
+  - type: Label
+    currentLabel: psicodine 20u
+  - type: StorageFill
+    contents:
+    - id: PillLacedPsicodine
+      amount: 2
+  - type: Sprite
+    sprite: _Impstation/Objects/Specific/Chemistry/pills_canister.rsi
+    state: pill_canister # while it would make sense within contect, we shouldn't use the hos bottle sprite, given that the refill is NOT a thief target.
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      right:
+      - state: inhand-right
+
+- type: entity
+  name: special pill sampler
+  parent: [PillCanister, BaseSecurityContraband]
+  description: A special pill, guaranteed to make any rough shift better. Try it out! # get em hooked early
+  id: PillCanisterWardenSample
+  suffix: Psicodine 18u Happiness 2u, 1
+  components:
+  - type: Label
+    currentLabel: psicodine 20u
+  - type: StorageFill
+    contents:
+    - id: PillLacedPsicodine
+      amount: 1
+  - type: Sprite
+    sprite: _Impstation/Objects/Specific/Chemistry/pills_canister.rsi
+    state: pill_canister
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      right:
+      - state: inhand-right
+
 # Pure happy pills & pillbottle
 
 - type: entity

diff --git a/Resources/Prototypes/_Impstation/Mail/mailDeliveries.yml b/Resources/Prototypes/_Impstation/Mail/mailDeliveries.yml
@@ -59,19 +59,21 @@
     MailNFCritter: 1
     MailNFFigurineBulk: 1
     MailNFPlushie: 1
-    MailSpaceBlade: 1
+    MailImpSpaceBlade: 1
     MailNFBuildABuddy: 0.2
     MailNFBikeHorn: 0.5
-    MailImpBee: 0.4
+    MailImpBee: 0.3
+    MailImpBROS: 0.1
     MailBlockGameDIY: 0.4
     MailSpaceVillainDIY: 0.4 # Lowered to accommodate the foam sabre
     MailNFSmoke: 0.4
     #MailNFEMP: 0.3 # Imp commented cuz error log :(
     MailNFThrongler: 0.01 # DeltaV: 0.1 to 0.01
+    MailImpFuckingGun: 0.01 # Mira requested this. maybe don't turn it on yet without discussion
 
   # Department and job-specific mail can have slightly higher weights,
   # since they'll be merged with the everyone pool.
-  departments: #add to 36.9
+  departments: #add to 37.9
     Medical: #adds to 15 including MailMedicalSpaceacillin
       MailMedicalBasicSupplies: 2
       MailMedicalChemistrySupplement: 2
@@ -81,12 +83,13 @@
       # MailMedicalSpaceacillin: 1
       MailMedicalStabilizers: 2
       MailNFMedkit: 2
-    Engineering: #adds to 12
+    Engineering: #adds to 13
       MailEngineeringCables: 2
       MailEngineeringKudzuDeterrent: 2
       MailEngineeringSheetGlass: 2
       MailEngineeringWelderReplacement: 2
       MailNFCircuitboardIndustrial: 2
+      MailImpEngineeringCompressedMatter: 2
       MailNFCircuitboardService: 1
       MailNFPowerTool: 1
     Security: #adds to 9
@@ -103,11 +106,13 @@
       MailStationRepNFNukeDisk: 0.3
       MailCommandNFPipebombIntern: 0.1
 
-  jobs: # add to 43
+  jobs: # add to 46
     Botanist: # adds to 4.5
       MailBotanistChemicalBottles: 2
       MailBotanistMutagen: 1.5
       MailBotanistSeeds: 1
+    Chef:
+      MailImpChefConveyor: 1
     ChiefEngineer:
       MailEngineeringKudzuDeterrent: 2
     ChiefMedicalOfficer: # adds to 7
@@ -124,6 +129,7 @@
       MailHoPSupplement: 3
     HeadOfSecurity:
       MailSecurityNonlethalsKit: 2
+      MailImpHosPillRefill: 1
     Lawyer:
       MailSecurityDVSpaceLaw: 2
     Mime: #adds to 6
@@ -135,5 +141,6 @@
       MailImpGoblin: 2
     Warden:
       MailWardenCrowdControl: 2
+      MailImpHosPillWarden: 1
     SalvageSpecialist:
-      MailTckTck: 2
+      MailImpTckTck: 2