]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Waist bags (#14474)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Mon, 20 Mar 2023 00:45:38 +0000 (19:45 -0500)
committerGitHub <noreply@github.com>
Mon, 20 Mar 2023 00:45:38 +0000 (17:45 -0700)
* Everything (hopefully)

* makes them actually obtainable (oops)

* renames the fannypack to "waist bag"

* Removes and replaces remaining mentions of fannypacks

* oops

12 files changed:
Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-trinkets.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag-trinkets.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag_leather.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json [new file with mode: 0644]

index 4f01f57d14c9ef60564cca7fdb307d839d5e77d2..4227c3c1eadf9ae7bdb41eaff418f1e2d8bbdf5a 100644 (file)
@@ -42,6 +42,8 @@
         prob: 0.1
       - id: ResearchDisk
         prob: 0.1
+      - id: ClothingBeltStorageWaistbag
+        prob: 0.1
         #  - Service
       - id: CrayonBox
         prob: 0.1
index 19eddd7060f8627c34b96cab34e657173e2b5327..3bc68e609e7e45e1bf8f8686baca16e9c5a61798 100644 (file)
@@ -58,4 +58,5 @@
     ClothingHeadRastaHat: 2
     ClothingNeckScarfStripedRed: 3
     ClothingNeckScarfStripedBlue: 3
-    ClothingNeckScarfStripedGreen: 3
\ No newline at end of file
+    ClothingNeckScarfStripedGreen: 3
+    ClothingBeltStorageWaistbag: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml
new file mode 100644 (file)
index 0000000..6d47010
--- /dev/null
@@ -0,0 +1,32 @@
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltStorageWaistbag
+  name: leather waist bag
+  description: A leather waist bag meant for carrying small items.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/waistbag_leather.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/waistbag_leather.rsi
+  - type: Storage
+    capacity: 20
+        
+#Colorization on worn items doesn't work. If this ever gets fixed, you can duplicate this entry and change the color on the sprite to add color variants.
+#- type: entity
+#  parent: ClothingBeltStorageWaistbag
+#  id: ClothingBeltWaistbagColorRed
+#  name: red waist bag
+#  description: A waist bag meant for carrying small items.
+#  components:
+#  - type: Sprite
+#    sprite: Clothing/Belt/waistbag.rsi
+#    layers:
+#    - state: "waistbag"
+#      color: "#bf1313"
+#    - state: "waistbag-trinkets"
+#  - type: Clothing
+#    sprite: Clothing/Belt/waistbag.rsi
+#    layers:
+#    - state: "equipped-BELT"
+#      color: "#bf1313"
+#    - state: "equipped-trinkets"
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..09a5ec4
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-trinkets.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-trinkets.png
new file mode 100644 (file)
index 0000000..29a8e9a
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-trinkets.png differ
diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/icon.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/icon.png
new file mode 100644 (file)
index 0000000..bf87f0e
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/waistbag.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json b/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json
new file mode 100644 (file)
index 0000000..3c74d08
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bb7fbdc95eb79ca8bdaa2e046b99267f2cfe4247",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "waistbag"
+    },
+    {
+      "name": "waistbag-trinkets"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "equipped-trinkets",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag-trinkets.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag-trinkets.png
new file mode 100644 (file)
index 0000000..f5d936d
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag-trinkets.png differ
diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag.png
new file mode 100644 (file)
index 0000000..bf87f0e
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag.png differ
diff --git a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..6b59068
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png
new file mode 100644 (file)
index 0000000..b2f0096
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json
new file mode 100644 (file)
index 0000000..51f6b66
--- /dev/null
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bb7fbdc95eb79ca8bdaa2e046b99267f2cfe4247",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file