Add default whistle + whistles reorganize (#27676)

* Add default whistle + whistle reorganize * aaa * fux? * fiiiiix??? * Revert "fiiiiix???" This reverts commit 15353465d58db615185afa8c549e1819099c1a5b. * Apply suggestions from code review Co-authored-by: Tayrtahn <[email protected]> --------- Co-authored-by: Tayrtahn <[email protected]>
space-syndicate · May 5, 2024 · ead78b7 · ead78b7
1 parent 45fc6be
commit ead78b7
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 44 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
@@ -6,8 +6,12 @@
   description: Someone forgot to turn off kettle?
   components:
   - type: Item
+    sprite: Objects/Fun/whistles.rsi
     size: Tiny
+  - type: Sprite
+    sprite: Objects/Fun/whistles.rsi
   - type: Clothing
+    sprite: Objects/Fun/whistles.rsi
     quickEquip: false
     slots: neck
   - type: UseDelay
@@ -16,18 +20,26 @@
     sound:
       collection: BaseWhistle
   - type: Whistle
-    distance: 5
+    distance: 3
+
+- type: entity
+  parent: BaseWhistle
+  id: Whistle
+  components:
+  - type: Sprite
+    state: whistle
 
 - type: entity
   parent: BaseWhistle
   id: SecurityWhistle
   description: Sound of it make you feel fear.
   components:
   - type: Sprite
-    sprite: Objects/Fun/whistle.rsi
-    state: securityWhistle
-  - type: Item
-    sprite: Objects/Fun/whistle.rsi
+    state: sec
+  - type: Clothing
+    equippedPrefix: sec
+  - type: Whistle
+    distance: 5
 
 - type: entity
   parent: BaseWhistle
@@ -36,13 +48,9 @@
   description: A whistle used by Syndicate commanders to draw attention. Avanti!
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    state: icon
+    state: trench
   - type: Clothing
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    quickEquip: False
-    slots:
-    - neck
+    equippedPrefix: trench
   - type: EmitSoundOnUse
     sound:
       collection: TrenchWhistle

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -129,6 +129,7 @@
     - PlushiePenguin
     - PlushieHuman
     - ClothingHeadHatCowboyRed
+    - Whistle
   - type: WiresPanel
   - type: Wires
     layoutId: Arcade

diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
diff --git a/Resources/Textures/Objects/Fun/whistle.rsi/meta.json b/Resources/Textures/Objects/Fun/whistle.rsi/meta.json
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/meta.json b/Resources/Textures/Objects/Fun/whistles.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "sec and whistle made by Foleps (discord), trench by Firewatchin (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "whistle"
+    },
+    {
+      "name": "sec-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "sec"
+    },
+    {
+      "name": "trench-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "trench"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png
diff --git a/...jects/Fun/whistle.rsi/securityWhistle.png → ...Textures/Objects/Fun/whistles.rsi/sec.png b/...jects/Fun/whistle.rsi/securityWhistle.png → ...Textures/Objects/Fun/whistles.rsi/sec.png
diff --git a/.../Neck/Misc/whistles.rsi/equipped-NECK.png → ...Fun/whistles.rsi/trench-equipped-NECK.png b/.../Neck/Misc/whistles.rsi/equipped-NECK.png → ...Fun/whistles.rsi/trench-equipped-NECK.png
diff --git a/.../Clothing/Neck/Misc/whistles.rsi/icon.png → ...tures/Objects/Fun/whistles.rsi/trench.png b/.../Clothing/Neck/Misc/whistles.rsi/icon.png → ...tures/Objects/Fun/whistles.rsi/trench.png
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png b/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png