Merge pull request #1218 from hivehum/laying-pipe

The ACME brand "Bulletcatcher™"

Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl

@@ -9,3 +9,6 @@ uplink-nemesis-br-desc = Precise and Deadly: the stylish Nemesis-11 Battle Rifle
 
 uplink-rifle-magazine-nemesis-name = Rifle Magazine (.25 Caseless)
 uplink-rifle-magazine-nemesis-desc = Rifle magazine with 24 cartridges. Compatible with the Nemesis-11.
+
+uplink-bulletcatcher-name = ACME brand "Bulletcatcher™"
+uplink-bulletcatcher-desc = Security aiming guns at you? Worse, your audience? Put a quick stop to that with the ACME brand "Bulletcatcher™"! When they point that rifle at your face, point our patented pipe right back at them!

Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml

@@ -18,7 +18,7 @@
     blacklist:
       components:
       - SurplusBundle
-      
+
 - type: listing
   id: uplinkZipperAP
   name: uplink-zipper-ap-name
@@ -56,3 +56,21 @@
     Telecrystal: 2
   categories:
   - UplinkAmmo
+
+- type: listing
+  id: UplinkBulletcatcher
+  name: uplink-bulletcatcher-name
+  description: uplink-bulletcatcher-desc
+  icon: { sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi, state: bulletcatcher }
+  productEntity: BulletCatcherBox
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 3
+  cost:
+    Telecrystal: 6
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Clown
+  categories:
+  - UplinkJob

Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/clown.yml

@@ -0,0 +1,52 @@
+- type: entity
+  name: ACME brand "Bulletcatcher™"
+  parent: [BaseItem, Tier1Contraband]
+  id: BulletCatcher
+  description: You can do anything if you try hard and believe in yourself.
+  components:
+    - type: Sprite
+      sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi
+      state: bulletcatcher
+    - type: Item
+      size: Large
+      sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi
+    - type: Appearance
+    - type: Reflect
+      reflectProb: 1
+      reflects:
+        - NonEnergy
+      spread: 1
+      soundOnReflect: /Audio/_Impstation/Weapons/pvc.ogg
+
+- type: entity
+  id: BulletCatcherBox
+  parent: [BaseItem, Tier1Contraband]
+  name: factory-sealed ACME brand "Bulletcatcher™"
+  description: Wow! An ACME brand "Bulletcatcher™"! It's what I always wanted!
+  components:
+  - type: Item
+    size: Huge
+  - type: Sprite
+    sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi
+    state: box
+  - type: SpawnItemsOnUse
+    items:
+      - id: ACMEBoxOpen
+      - id: BulletCatcher
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
+- type: entity
+  id: ACMEBoxOpen
+  parent: [BaseItem, Tier1Contraband]
+  name: discarded ACME brand box
+  description: I hope whoever opened this gets the day that they deserve.
+  components:
+  - type: Item
+    size: Large
+  - type: Sprite
+    sprite: _Impstation/Objects/Weapons/Melee/bulletcatcher.rsi
+    state: boxopen
+  - type: Tag
+    tags:
+      - Trash

Resources/Textures/_Impstation/Objects/Weapons/Melee/bulletcatcher.rsi/meta.json

@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "bulletcatcher by Carousel",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bulletcatcher"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "box"
+        },
+        {
+            "name": "boxopen"
+        }
+    ]
+}