[Tweak] Syndi pens are bought in boxes now (#15190)

* pens are bought in wrappers now

* pro

* maybe

* pro

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index a0caee11d29164537b9b01937a88e890f5a16c42..2b2a4c04678693df14714e4e563e3c66fcb30f5e 100644 (file)
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -59,7 +59,7 @@
   name: uplink-edagger-name
   description: uplink-edagger-desc
   icon: { sprite: /Textures/Objects/Weapons/Melee/e_dagger.rsi, state: icon }
-  productEntity: EnergyDagger
+  productEntity: EnergyDaggerBox
   cost:
     Telecrystal: 3
   categories:
@@ -156,7 +156,8 @@
   id: UplinkExplodingPen
   name: uplink-exploding-pen-name
   description: uplink-exploding-pen-desc
-  productEntity: PenExploding
+  icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen }
+  productEntity: PenExplodingBox
   cost:
     Telecrystal: 5
   categories:
@@ -314,7 +315,8 @@
   id: UplinkHypopen
   name: uplink-hypopen-name
   description: uplink-hypopen-desc
-  productEntity: Hypopen
+  icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen }
+  productEntity: HypopenBox
   cost:
     Telecrystal: 6
   categories:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 100e64120b048fe5e2f84466c983d791a501aea4..bc7108141de1a06abecf12af6866b4fbe6e730bc 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -249,6 +249,22 @@
   - type: StaticPrice # A new shitcurity meta
     price: 75
 
+- type: entity
+  parent: BaseItem
+  id: HypopenBox
+  name: hypopen box
+  description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind.
+  components:
+  - type: Sprite
+    sprite: Objects/Storage/penbox.rsi
+    state: hypopen
+    netsync: false
+  - type: SpawnItemsOnUse
+    items:
+    - id: Hypopen
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
 - type: entity
   name: brigmedic hypospray
   parent: BaseItem

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
index f7e746e00f3c03fee42bce3a2f02348a25fcdc45..e7ff65613f7a8c6ed6feb48a568cebdd8802f1bc 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
@@ -16,3 +16,19 @@
     canCreateVacuum: false
   - type: ActivateOnPaperOpened
   - type: ExplodeOnTrigger
+
+- type: entity
+  parent: BaseItem
+  id: PenExplodingBox
+  name: exploding pen box
+  description: A small box containing an exploding pen. Packaging disintegrates when opened, leaving no evidence behind.
+  components:
+  - type: Sprite
+    sprite: Objects/Storage/penbox.rsi
+    state: exploding_pen
+    netsync: false
+  - type: SpawnItemsOnUse
+    items:
+    - id: PenExploding
+    sound:
+      path: /Audio/Effects/unwrap.ogg

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 5d35f7f0b037ef243de17a5a6be83c7535ee99fb..e092f1f7059c4d879ccaa3a75a2cffe71b94dfb1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -122,6 +122,23 @@
   - type: DisarmMalus
     malus: 0
 
+- type: entity
+  parent: BaseItem
+  id: EnergyDaggerBox
+  name: e-dagger box
+  suffix: E-Dagger
+  description: A small box containing an e-dagger. Packaging disintegrates when opened, leaving no evidence behind.
+  components:
+  - type: Sprite
+    sprite: Objects/Storage/penbox.rsi
+    state: e_dagger
+    netsync: false
+  - type: SpawnItemsOnUse
+    items:
+    - id: EnergyDagger
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
 - type: entity
   name: energy cutlass
   parent: EnergySword

diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/e_dagger.png b/Resources/Textures/Objects/Storage/penbox.rsi/e_dagger.png
new file mode 100644 (file)
index 0000000..da51302
Binary files /dev/null and b/Resources/Textures/Objects/Storage/penbox.rsi/e_dagger.png differ

diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/exploding_pen.png b/Resources/Textures/Objects/Storage/penbox.rsi/exploding_pen.png
new file mode 100644 (file)
index 0000000..efd0efa
Binary files /dev/null and b/Resources/Textures/Objects/Storage/penbox.rsi/exploding_pen.png differ

diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/hypopen.png b/Resources/Textures/Objects/Storage/penbox.rsi/hypopen.png
new file mode 100644 (file)
index 0000000..f0566a2
Binary files /dev/null and b/Resources/Textures/Objects/Storage/penbox.rsi/hypopen.png differ

diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/meta.json b/Resources/Textures/Objects/Storage/penbox.rsi/meta.json
new file mode 100644 (file)
index 0000000..f46856a
--- /dev/null
+++ b/Resources/Textures/Objects/Storage/penbox.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created for SS14 by deltanedas (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "e_dagger"
+        },
+        {
+            "name": "exploding_pen"
+        },
+        {
+            "name": "hypopen"
+        }
+    ]
+}