]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add Experiment plushie (#36663)
authorT-Stalker <43253663+DogZeroX@users.noreply.github.com>
Fri, 18 Apr 2025 02:38:34 +0000 (23:38 -0300)
committerGitHub <noreply@github.com>
Fri, 18 Apr 2025 02:38:34 +0000 (12:38 +1000)
* Plushie

* Add to fills and fix license

* minor spelling issue

Resources/Audio/Items/Toys/arf.ogg [new file with mode: 0644]
Resources/Audio/Items/Toys/attributions.yml
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/expiplush.rsi/expi.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/expiplush.rsi/meta.json [new file with mode: 0644]

diff --git a/Resources/Audio/Items/Toys/arf.ogg b/Resources/Audio/Items/Toys/arf.ogg
new file mode 100644 (file)
index 0000000..4d29017
Binary files /dev/null and b/Resources/Audio/Items/Toys/arf.ogg differ
index cd767ff3d6b7cccf12781fecb3d568a729d2ceb7..2dd0ce9eded07fb15c1d4bed832ce7cb6595b06b 100644 (file)
@@ -92,3 +92,8 @@
   license: "CC0-1.0"
   copyright: "Created by xprospero for ss14"
   source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_3.ogg"
+
+- files: ["arf.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Orsoniks, from the game Casualties Unknown"
+  source: "https://orsonik.itch.io/scav-prototype"
index a345ed724b487da07771462f42b60d834c0e9a0c..af57a565a6bf96842cd69344b24a8ae47864865b 100644 (file)
@@ -10,6 +10,7 @@
     - id: PlushieNuke
     - id: PlushieSlime
     - id: PlushieSnake
+    - id: PlushieExperiment
     - !type:GroupSelector
       children:
       - id: PlushieLizard
@@ -72,7 +73,7 @@
           amount: !type:ConstantNumberSelector
             value: 3
 
-- type: entity  
+- type: entity
   id: CrateFunSharkPlushieBulk
   parent: CrateGenericSteel
   name: bulk soft toy shark crate
index 0c037d93a6774e21c9d7881f7104df2965827736..05dd5ce30974f24cd97d1697d0b79df348ad6374 100644 (file)
     - Payload
     - PlushieLizard
 
+- type: entity
+  parent: BasePlushie
+  id: PlushieExperiment #Arf!
+  name: experiment plushie
+  description: A plushie of a canid of sorts, it yearns to be detonated on a landmine.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/expiplush.rsi
+    state: expi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: expi-inhand-left
+        shader: shaded
+      right:
+      - state: expi-inhand-right
+        shader: shaded
+    heldPrefix: plushielizard
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Items/Toys/arf.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/arf.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/arf.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/arf.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/arf.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/arf.ogg
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    soundHit:
+      path: /Audio/Items/Toys/arf.ogg
+  - type: Tag
+    tags:
+    - ClothMade
+    - Payload
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: expi-equipped-HELMET
+        shader: shaded
+    quickEquip: false
+    sprite: Objects/Fun/toys.rsi
+    equippedPrefix: expi
+    slots:
+    - HEAD
+
 - type: entity
   parent: PlushieLizard
   id: PlushieRainbowLizard #Weh but gay
diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..fafecd6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png
new file mode 100644 (file)
index 0000000..92a2a36
Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png
new file mode 100644 (file)
index 0000000..049898a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/expi.png b/Resources/Textures/Objects/Fun/expiplush.rsi/expi.png
new file mode 100644 (file)
index 0000000..0bedfe8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/expiplush.rsi/expi.png differ
diff --git a/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json b/Resources/Textures/Objects/Fun/expiplush.rsi/meta.json
new file mode 100644 (file)
index 0000000..deaad88
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Orsoniks (rivey0 on discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "expi"
+    },
+    {
+      "name": "expi-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "expi-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "expi-equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file