]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Doggy Ears (#22832)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Sat, 23 Dec 2023 03:20:08 +0000 (06:20 +0300)
committerGitHub <noreply@github.com>
Sat, 23 Dec 2023 03:20:08 +0000 (20:20 -0700)
* add content

* sprite update

* goodbuy nose

Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
Resources/Prototypes/Entities/Clothing/Head/misc.yml
Resources/Prototypes/Entities/Objects/Decoration/present.yml
Resources/Textures/Clothing/Head/Hats/dogears.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/dogears.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/dogears.rsi/meta.json [new file with mode: 0644]

index feae7a8942f0ca3eec0276bd3cf8f109251321e9..74b61d910f43ba180dee404c90542d3cb5121181 100644 (file)
@@ -79,6 +79,8 @@
         prob: 0.001
       - id: ClothingHeadHatCatEars
         prob: 0.01
+      - id: ClothingHeadHatDogEars
+        prob: 0.01
         # TRAITOR EQUIPMENT (0.01%)
       - id: Telecrystal10
         prob: 0.0001
index 39e751b17d3dd1ebfb1766a7f5b0ba6c118f6144..645c47f9bf078280930194f0a167e1bec66305fa 100644 (file)
     sprite: Clothing/Head/Hats/catears.rsi
   - type: AddAccentClothing
     accent: OwOAccent
+    
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatDogEars
+  name: doggy ears
+  description: Only for good boys.
+  suffix: DO NOT MAP
+  components:
+  - type: Tag
+    tags:
+      - DroneUsable
+  - type: Sprite
+    sprite: Clothing/Head/Hats/dogears.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/dogears.rsi
+  - type: AddAccentClothing
+    accent: BarkAccent
 
 - type: entity
   parent: ClothingHeadBase
index eb5b5d14d5b8fcd23785f468db72e496dd481e85..2afbb86b03ee9ff6a0263c238cc7ff8402ad9c9b 100644 (file)
         orGroup: GiftPool
       - id: ClothingHeadHatCatEars
         orGroup: GiftPool
+      - id: ClothingHeadHatDogEars
+        orGroup: GiftPool
       - id: ToySword
         orGroup: GiftPool
       - id: RevolverCapGun
diff --git a/Resources/Textures/Clothing/Head/Hats/dogears.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..b02a778
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/dogears.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/icon.png
new file mode 100644 (file)
index 0000000..4c4e0fd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..eee155b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..5f6a850
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/dogears.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/dogears.rsi/meta.json
new file mode 100644 (file)
index 0000000..1656c0a
--- /dev/null
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4,
+      "delays": [
+                [0.2, 0.2, 0.2, 0.2],
+                [0.2, 0.2, 0.2, 0.2],
+                [0.2, 0.2, 0.2, 0.2],
+                [0.2, 0.2, 0.2, 0.2]
+            ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}