From: Redfire1331 <125223432+Redfire1331@users.noreply.github.com>
Date: Fri, 26 Apr 2024 12:39:32 +0000 (-0400)
Subject: Added Chopsticks (#27298)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=080b1b1e0ca40b34d1a3538942ee54acdd8b117f;p=space-station-14.git

Added Chopsticks (#27298)

* added chopstick sprites

* Create chopsticks.yml

* added chopstick yml

* hopfully it acts like a forke

* added chopsticks to dinnerware vendor

* uncapitalized the name

* Update Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* made the chopsticks icon a reasonable size

* added chopsticks to chang vendor

* made paired chopsticks you can break apart

* added them to vendors

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
---

diff --git a/Resources/Audio/Effects/chopstickbreak.ogg b/Resources/Audio/Effects/chopstickbreak.ogg
new file mode 100644
index 0000000000..bac8ac0462
Binary files /dev/null and b/Resources/Audio/Effects/chopstickbreak.ogg differ
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
index 282f58535b..5befd85ca8 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
@@ -7,4 +7,5 @@
     DrinkHellRamen: 3
     FoodSnackChowMein: 3
     FoodSnackDanDanNoodles: 3
+    PairedChopsticks: 3
 # rice?
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
index 86f35b5269..11e48f830e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -6,6 +6,7 @@
     RollingPin: 4
     Spoon: 4
     Fork: 4
+    PairedChopsticks: 4
     FoodBowlBig: 10
     FoodPlate: 10
     FoodPlateSmall: 10
diff --git a/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml b/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml
new file mode 100644
index 0000000000..47cae456fa
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml
@@ -0,0 +1,31 @@
+- type: entity
+  parent: BaseItem
+  id: ChopSticks
+  name: chopsticks
+  description: A very traditional utensil.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/chopstick.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Misc/chopstick.rsi
+    size: Small
+  - type: Utensil
+    types:
+    - Fork
+
+- type: entity
+  parent: BaseItem
+  name: paired chopsticks
+  id: PairedChopsticks
+  description: You should probably seperate them.
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: ChopSticks
+  - type: Sprite
+    sprite: Objects/Misc/chopstick.rsi
+    state: paired
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Effects/chopstickbreak.ogg
diff --git a/Resources/Textures/Objects/Misc/chopstick.rsi/icon.png b/Resources/Textures/Objects/Misc/chopstick.rsi/icon.png
new file mode 100644
index 0000000000..95acfb53cd
Binary files /dev/null and b/Resources/Textures/Objects/Misc/chopstick.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/chopstick.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/chopstick.rsi/inhand-left.png
new file mode 100644
index 0000000000..48fa05ce34
Binary files /dev/null and b/Resources/Textures/Objects/Misc/chopstick.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/chopstick.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/chopstick.rsi/inhand-right.png
new file mode 100644
index 0000000000..51dc3961d5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/chopstick.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/chopstick.rsi/meta.json b/Resources/Textures/Objects/Misc/chopstick.rsi/meta.json
new file mode 100644
index 0000000000..78e9149225
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/chopstick.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/1179",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      },
+      {
+        "name": "paired"
+      }
+    ] 
+  }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Misc/chopstick.rsi/paired.png b/Resources/Textures/Objects/Misc/chopstick.rsi/paired.png
new file mode 100644
index 0000000000..220dc31ecb
Binary files /dev/null and b/Resources/Textures/Objects/Misc/chopstick.rsi/paired.png differ