Spent BBs, RGBBs, RGBB mail

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml

@@ -8,7 +8,7 @@
       size: Tiny
     - type: Reflective
     - type: Appearance
-    - type: FlyBySound
+    # - type: FlyBySound # Frontier
     - type: Sprite
       sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi
       layers:
@@ -17,55 +17,59 @@
       tags:
         - BulletBB
         - Trash
-    - type: Physics
-      bodyType: Dynamic
-      linearDamping: 0.1
-      angularDamping: 0.1
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape: !type:PhysShapeCircle
-            radius: 0.01
-          density: 1
-          mask:
-          - ItemMask
-          restitution: 0.3 #bounce
-          friction: 0.2
-        projectile:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.15,-0.15,0.15,0.15"
-          hard: false
-          mask:
-          - Impassable
-          - BulletImpassable
-        fly-by: &flybyfixture
-          shape: !type:PhysShapeCircle
-            radius: 1.5
-          layer:
-          - Impassable
-          - MidImpassable
-          - HighImpassable
-          - LowImpassable
-          hard: False
+    # - type: Physics # Frontier
+    #   bodyType: Dynamic # Frontier
+    #   linearDamping: 0.1 # Frontier
+    #   angularDamping: 0.1 # Frontier
+    # - type: Fixtures # Frontier
+    #   fixtures: # Frontier
+    #     fix1: # Frontier
+    #       shape: !type:PhysShapeCircle # Frontier
+    #         radius: 0.01 # Frontier
+    #       density: 1 # Frontier
+    #       mask: # Frontier
+    #       - ItemMask # Frontier
+    #       restitution: 0.3 #bounce # Frontier
+    #       friction: 0.2 # Frontier
+    #     projectile: # Frontier
+    #       shape: # Frontier
+    #         !type:PhysShapeAabb # Frontier
+    #         bounds: "-0.15,-0.15,0.15,0.15" # Frontier
+    #       hard: false # Frontier
+    #       mask: # Frontier
+    #       - Impassable # Frontier
+    #       - BulletImpassable # Frontier
+    #     fly-by: &flybyfixture # Frontier
+    #       shape: !type:PhysShapeCircle # Frontier
+    #         radius: 1.5 # Frontier
+    #       layer: # Frontier
+    #       - Impassable # Frontier
+    #       - MidImpassable # Frontier
+    #       - HighImpassable # Frontier
+    #       - LowImpassable # Frontier
+    #       hard: False # Frontier
     - type: TileFrictionModifier
       modifier: 0.01
-    - type: Projectile
-      impactEffect: BulletImpactEffect
-      deleteOnCollide: false
-      onlyCollideWhenShot: true
-      damage:
-        types:
-          Blunt: 1
-      soundHit:
-        path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
-    - type: Ammo
-      muzzleFlash: null
+    # - type: Projectile # Frontier
+    #   impactEffect: BulletImpactEffect # Frontier
+    #   deleteOnCollide: false # Frontier
+    #   onlyCollideWhenShot: true # Frontier
+    #   damage: # Frontier
+    #     types: # Frontier
+    #       Blunt: 1 # Frontier
+    #   soundHit: # Frontier
+    #     path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg # Frontier
+    # - type: Ammo # Frontier
+    #   muzzleFlash: null # Frontier
     - type: PhysicalComposition
       materialComposition:
         Steel: 1
     - type: SpaceGarbage
-    #- type: StaticPrice
-    #  price: 0.05
-    - type: TimedDespawn
-      lifetime: 30
+    #- type: StaticPrice # Frontier
+    #  price: 0.05 # Frontier
+    # - type: TimedDespawn # Frontier
+    #   lifetime: 30 # Frontier
+    - type: CartridgeAmmo # Frontier
+      proto: BulletBBDamaged # Frontier
+      deleteOnSpawn: true # Frontier
+      muzzleFlash: null

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml

@@ -20,6 +20,7 @@
     BoxCartridgeBB: 10
   emaggedInventory:
     ThrowingKnife: 1
+    BoxCartridgeRGBB: 1
 
 - type: vendingMachineInventory
   id: LessLethalVendPOIInventory
@@ -42,4 +43,5 @@
     WeaponRifleBB: 2
     BoxCartridgeBB: 10
   emaggedInventory:
-    ThrowingKnife: 1
+    ThrowingKnife: 1
+    BoxCartridgeRGBB: 1

Resources/Prototypes/_NF/Entities/Objects/Fun/toy_guns.yml

@@ -0,0 +1,7 @@
+- type: entity
+  parent: WeaponRifleBB # Frontier
+  id: WeaponRifleBBEmpty
+  suffix: Empty
+  components:
+  - type: BallisticAmmoProvider
+    unspawnedCount: 0

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml

@@ -0,0 +1,12 @@
+- type: entity
+  parent: BoxCartridgeBB
+  id: BoxCartridgeRGBB
+  name: box of RGBBs
+  components:
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - BulletBB
+    proto: BulletRGBB
+  - type: StaticPrice
+    price: 2500 # 25k for a meme item

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml

@@ -0,0 +1,91 @@
+# separate BB "cartridge" and projectile
+- type: entity
+  id: BulletBBDamaged
+  description: Did you shoot your eye out?
+  name: damaged BB
+  parent: BaseItem
+  components:
+  - type: Reflective
+  - type: Appearance
+  - type: Projectile
+    impactEffect: BulletImpactEffect
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Blunt: 1
+    soundHit:
+      path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi
+    layers:
+    - state: bbbullet
+  - type: Tag
+    tags:
+    - Trash
+  - type: Physics
+    bodyType: Dynamic
+    linearDamping: 0.1
+    angularDamping: 0.1
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.01
+        density: 1
+        mask:
+        - ItemMask
+        restitution: 0.3 #bounce
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.15,0.15,0.15"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+      fly-by: &flybyfixture
+        shape: !type:PhysShapeCircle
+          radius: 1.5
+        layer:
+        - Impassable
+        - MidImpassable
+        - HighImpassable
+        - LowImpassable
+        hard: False
+  - type: TileFrictionModifier
+    modifier: 0.01
+  - type: SpaceGarbage
+  - type: TimedDespawn
+    lifetime: 30
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 1
+
+# RGB bullets (sins)
+- type: entity
+  parent: BulletBB
+  id: BulletRGBB
+  name: RGBB
+  description: Don't shoot your eye out, gamer.
+  components:
+  - type: CartridgeAmmo # Frontier
+    proto: BulletRGBBDamaged # Frontier
+
+- type: entity
+  id: BulletRGBBDamaged
+  description: Did you shoot your eye out, gamer?
+  name: damaged RGBB
+  parent: BulletBBDamaged
+  components:
+  - type: PointLight
+    radius: 1.5
+    energy: 2
+  - type: RgbLightController
+    layers: [ 0 ]
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi
+    layers:
+    - state: bbbullet
+      shader: unshaded

Resources/Prototypes/_NF/Mail/mail.yml

@@ -1352,6 +1352,17 @@
     contents:
     - id: WeaponVulpCannon
 
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseMailLarge
+  id: MailNFRGBBGun
+  suffix: RGBB gun
+  components:
+  - type: Mail
+    contents:
+    - id: WeaponRifleBBEmpty
+    - id: BoxCartridgeRGBB
+
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: BaseMailLarge

Resources/Prototypes/_NF/Mail/mailDeliveries.yml

@@ -43,19 +43,20 @@
     MailNFBikeHorn: 0.5
     MailBlockGameDIY: 0.6
     MailNFDAW: 0.15
+    MailNFEmotionalRPG: 0.1
     MailNFFigurineBulk: 0.6
     MailNFInstrumentSmall: 1
     MailNFInstrumentLarge: 1
     MailNFInstrumentFlatpack: 1
     MailNFPAI: 1
     MailNFPlushie: 1
+    MailNFRGBBGun: 0.1
     MailNFSkub: 0.6
     MailNFSoaps: 0.75
     MailNFSoapsOmega: 0.05 # Rare variant
     MailSpaceVillainDIY: 0.6
     MailNFThrongler: 0.1
     MailNFUnicycle: 0.5
-    MailNFEmotionalRPG: 0.1
     MailNFVulpCannon: 0.1
     # Useful
     MailNFATV: 0.9