]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Added ore bag of holding (#22680)
authorStanislav4ix <124695665+Stanislav4ix@users.noreply.github.com>
Tue, 19 Dec 2023 22:28:56 +0000 (23:28 +0100)
committerGitHub <noreply@github.com>
Tue, 19 Dec 2023 22:28:56 +0000 (09:28 +1100)
* Added ore bag of holding

* Now its in industrial tecnologi

Yeah, I fixed it with Tunguso4ka

Co-Authored-By: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
* Update ore_bag_holding.yml

Now the "magnet" has a larger radius of attraction

* Changed location

---------

Co-authored-by: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag_holding.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Recipes/Lathes/devices.yml
Resources/Prototypes/Research/industrial.yml
Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json [new file with mode: 0644]

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag_holding.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag_holding.yml
new file mode 100644 (file)
index 0000000..e8c7fa3
--- /dev/null
@@ -0,0 +1,16 @@
+- type: entity
+  name: ore bag of holding
+  id: OreBagOfHolding
+  parent: OreBag
+  description: A robust bag of holding for salvage billionaires and rich miners alike to carry large amounts of ore. Magnetises any nearby ores when attached to a belt.
+  components:
+  - type: MagnetPickup
+    range: 2
+  - type: Sprite
+    sprite: Objects/Specific/Mining/ore_bag_holding.rsi
+    state: icon
+  - type: Clothing
+    sprite: Objects/Specific/Mining/ore_bag_holding.rsi
+  - type: Storage
+    grid:
+    - 0,0,19,9
index eff2333d31bee687cdccd8017a64f673fe5352a5..8565c62b47619e2155b441c49937a539ef72ef3b 100644 (file)
       - ClothingEyesGlassesChemical
       - FauxTileAstroGrass
       - FauxTileAstroIce
+      - OreBagOfHolding
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ExplosivePayload
index 344f2c38d9cdec8b7a8f546548f268078b72595a..1593f125978cfae9179f70d944a2c82b21c9f099 100644 (file)
     Plasma: 1500
     Uranium: 150
 
+- type: latheRecipe
+  id: OreBagOfHolding
+  result: OreBagOfHolding
+  completetime: 5
+  materials:
+    Steel: 2000
+    Silver: 750
+    Plasma: 1500
+    Uranium: 150
+
 - type: latheRecipe
   id: WeaponCrusher
   result: WeaponCrusher
index f5083ac51fa9fd45e8954b281a8f2736d6fa3437..e460957b80d8e106a6f6d07573e46183c0fef741 100644 (file)
@@ -13,6 +13,7 @@
   - MiningDrill
   - BorgModuleMining
   - OreProcessorMachineCircuitboard
+  - OreBagOfHolding
 
 - type: technology
   id: AdvancedPowercells
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..f9cde5c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/icon.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/icon.png
new file mode 100644 (file)
index 0000000..cbf6749
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a0dc828
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..65683df
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json
new file mode 100644 (file)
index 0000000..3b28912
--- /dev/null
@@ -0,0 +1,111 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/5ce5a66c814c4a60118d24885389357fd0240002/icons/obj/mining.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}