From: Stanislav4ix <124695665+Stanislav4ix@users.noreply.github.com> Date: Tue, 19 Dec 2023 22:28:56 +0000 (+0100) Subject: Added ore bag of holding (#22680) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d38b4e1bca44f8de04b9ea9e56b99f814ab2cf9a;p=space-station-14.git Added ore bag of holding (#22680) * 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> --- 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 index 0000000000..e8c7fa37dd --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag_holding.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index eff2333d31..8565c62b47 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -277,6 +277,7 @@ - ClothingEyesGlassesChemical - FauxTileAstroGrass - FauxTileAstroIce + - OreBagOfHolding - type: EmagLatheRecipes emagDynamicRecipes: - ExplosivePayload diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 344f2c38d9..1593f12597 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -131,6 +131,16 @@ 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 diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index f5083ac51f..e460957b80 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -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 index 0000000000..f9cde5ce9f 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 index 0000000000..cbf6749b58 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 index 0000000000..a0dc828771 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 index 0000000000..65683df20d 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 index 0000000000..3b28912df0 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json @@ -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 + ] + ] + } + ] +}