]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Red racoon suit (#22862)
authorlzk <124214523+lzk228@users.noreply.github.com>
Sun, 7 Jan 2024 20:37:56 +0000 (21:37 +0100)
committerGitHub <noreply@github.com>
Sun, 7 Jan 2024 20:37:56 +0000 (23:37 +0300)
* comit

* :do_not_litter: :panda_face:

* stupid

* stupid x2

* fix tests

* Update cargo_vending.yml

15 files changed:
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
Resources/Prototypes/Entities/Clothing/Head/misc.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json [new file with mode: 0644]

index 52676943d0d67ff34c1d689accf27d5d96460af1..092f3be21523b68a5f2c4401bdb4926e53fc6919 100644 (file)
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 4650
+  cost: 4670
   category: Service
   group: market
 
index d4dd657027cbb9515815924fdb80c0a5b370dd5d..a2e835a28bb194c19358f46fea6795709ea8e7c6 100644 (file)
@@ -27,6 +27,8 @@
     ClothingHeadHatPumpkin: 2
     ClothingHeadHatShrineMaidenWig: 2
     ClothingOuterSuitShrineMaiden: 2
+    ClothingHeadHatRedRacoon: 2
+    ClothingOuterRedRacoon: 2
     Gohei: 2
     ClothingHeadPaperSack: 2
     ClothingHeadPaperSackSmile: 2
index 645c47f9bf078280930194f0a167e1bec66305fa..7b93e83cd9e3df76b48f1fc7a8b5cfac149c0c46 100644 (file)
     sprite: Clothing/Head/Misc/squiddy.rsi
   - type: IngestionBlocker
   - type: IdentityBlocker
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatRedRacoon
+  name: red racoon hat
+  description: Fluffy hat of red racoon!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/red_racoon.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/red_racoon.rsi
index 38c1fa11260a2290f1c04d12a6f3c5c37d61c429..82df2c21e8f0d2a4144f9d0350eefa5e8a5adaa2 100644 (file)
   components:
   - type: Item
     size: Huge
-  - type: Clothing
-    slots:
-    - outerClothing
index 1a5688b6a7793c124164e279d03181113db3b0bc..2e54fcd247d4f10e239c43b2a5cdcff3c9f9e01d 100644 (file)
       - state: equipped-OUTERCLOTHING-lines
         color: "#000000"
   - type: TemperatureProtection
-    coefficient: 0.3
\ No newline at end of file
+    coefficient: 0.3
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterRedRacoon
+  name: red racoon suit
+  description: Fluffy suit of red racoon!
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/red_racoon.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/red_racoon.rsi
diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..69e81b9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png
new file mode 100644 (file)
index 0000000..be8beea
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..4ad9c51
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..4ad9c51
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/red_racoon.rsi/meta.json
new file mode 100644 (file)
index 0000000..c07c7a8
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by netwy(583844759429316618)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..d4d1011
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png
new file mode 100644 (file)
index 0000000..25e2613
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..c160a2e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..28625bf
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json
new file mode 100644 (file)
index 0000000..b20ea02
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by netwy(583844759429316618)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}