diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index 73a731de4a3..65e8a46dc1b 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -9,6 +9,10 @@ materials-steel = steel materials-gold = gold materials-silver = silver materials-plasteel = plasteel +materials-aluminium = aluminium +materials-copper = copper +materials-tungsten = tungsten-carbide +materials-lead = lead # Other materials-biomass = biomass @@ -41,6 +45,11 @@ materials-raw-bananium = raw bananium materials-raw-salt = raw salt materials-raw-bluespace = raw bluespace materials-raw-normality = raw normality +materials-raw-aluminium = raw aluminium +materials-raw-lead = raw lead +materials-raw-sulfur = raw sulfur +materials-raw-copper = raw copper +materials-raw-tungsten = raw tungsten # Material Reclaimer material-reclaimer-upgrade-process-rate = process rate diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml index 7e8e6a5b746..2b4c51a8f8a 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml @@ -115,3 +115,40 @@ state: silver - type: Stack count: 1 + +- type: entity + parent: IngotBase + id: IngotTungsten + name: tungsten-carbide bar + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Tungsten: 100 + - type: Stack + stackType: Tungsten + baseLayer: base + layerStates: + - tungsten_1 + - tungsten_2 + - tungsten_3 + - type: Sprite + state: tungsten_3 + layers: + - state: tungsten_3 + map: ["base"] + - type: Item + heldPrefix: tungsten + - type: Appearance + +- type: entity + parent: IngotTungsten + id: IngotTungsten1 + name: tungsten-carbide bar + suffix: Single + components: + - type: Sprite + state: tungsten_1 + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml index 690e7e36d26..71e5647b26d 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml @@ -424,3 +424,26 @@ components: - type: Stack count: 1 + +- type: entity + parent: OreBase + id: TungstenOre + name: wolframite + suffix: Full + components: + - type: Stack + stackType: TungstenOre + - type: Sprite + state: tungsten + - type: Material + - type: PhysicalComposition + materialComposition: + RawTungsten: 500 + +- type: entity + parent: TungstenOre + id: TungstenOre1 + suffix: Single + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c06f1681441..df29e003b82 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -214,6 +214,7 @@ - RootSpeakTranslator - BasicGalaticCommonTranslatorImplanter - MofficTranslator + - N14MaterialCircuitry - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot @@ -295,6 +296,7 @@ - LargeBeaker - Dropper - ClothingEyesGlassesChemical + - N14MaterialCircuitry dynamicRecipes: - PowerDrill - MiningDrill @@ -494,6 +496,7 @@ - ReagentGrinderIndustrialMachineCircuitboard - StasisBedMachineCircuitboard - CryoPodMachineCircuitboard + - N14MaterialCircuitry dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard @@ -1055,6 +1058,9 @@ - WeaponMechCombatDisabler - WeaponMechCombatFlashbangLauncher - WeaponMechCombatMissileRack8 + - EnergySword + - EnergySwordDouble + - EnergyCutlass - type: MaterialStorage whitelist: tags: @@ -1480,6 +1486,10 @@ - IngotGold1 - IngotSilver1 - MaterialBananium1 + - N14IngotLead1 + - N14IngotCopper1 + - N14IngotAluminium1 + - IngotTungsten1 - type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier magnetEnabled: True range: 0.30 # Delta V - End Magnet Pull diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 552e3fc6a5f..5384c0bb30c 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -429,6 +429,72 @@ oreChance: 0.33 oreRarityPrototypeId: RandomOreDistributionStandard +- type: entity + id: AsteroidRockAluminium + parent: AsteroidRock + description: An ore vein rich with bauxite. + suffix: Aluminium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreAluminium + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_bauxite + +- type: entity + id: AsteroidRockLead + parent: AsteroidRock + description: An ore vein rich with casiterite. + suffix: Lead + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreLead + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_lead + +- type: entity + id: AsteroidRockCopper + parent: AsteroidRock + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_copper + # Rocks and ore veins - type: entity @@ -764,6 +830,72 @@ state: rock_west - state: rock_bluespace +- type: entity + id: WallRockAluminium + parent: WallRock + description: An ore vein rich with bauxite. + suffix: Aluminium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreAluminium + - type: Sprite + layers: + - state: rock + - map: [ "enum.EdgeLayer.South" ] + state: rock_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_west + - state: rock_bauxite + +- type: entity + id: WallRockLead + parent: WallRock + description: An ore vein rich with casiterite. + suffix: Lead + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreLead + - type: Sprite + layers: + - state: rock + - map: [ "enum.EdgeLayer.South" ] + state: rock_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_west + - state: rock_lead + +- type: entity + id: WallRockCopper + parent: WallRock + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - type: Sprite + layers: + - state: rock + - map: [ "enum.EdgeLayer.South" ] + state: rock_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_west + - state: rock_copper + # Basalt variants - type: entity id: WallRockBasalt @@ -785,6 +917,9 @@ state: rock_wall_north - map: [ "enum.EdgeLayer.West" ] state: rock_wall_west + - type: OreVein + oreChance: 0.33 + oreRarityPrototypeId: RandomOreDistributionBasalt - type: entity id: WallRockBasaltCoal @@ -1073,6 +1208,72 @@ state: rock_wall_west - state: rock_bluespace +- type: entity + id: WallRockBasaltAluminium + parent: WallRockBasalt + description: An ore vein rich with bauxite. + suffix: Aluminium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreAluminium + - type: Sprite + layers: + - state: rock_wall + - map: [ "enum.EdgeLayer.South" ] + state: rock_wall_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_wall_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_wall_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_wall_west + - state: rock_bauxite + +- type: entity + id: WallRockBasaltLead + parent: WallRockBasalt + description: An ore vein rich with casiterite. + suffix: Lead + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreLead + - type: Sprite + layers: + - state: rock_wall + - map: [ "enum.EdgeLayer.South" ] + state: rock_wall_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_wall_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_wall_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_wall_west + - state: rock_lead + +- type: entity + id: WallRockBasaltCopper + parent: WallRockBasalt + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - type: Sprite + layers: + - state: rock_wall + - map: [ "enum.EdgeLayer.South" ] + state: rock_wall_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_wall_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_wall_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_wall_west + - state: rock_copper + # Snow variants - type: entity id: WallRockSnow @@ -1382,6 +1583,72 @@ state: rock_snow_west - state: rock_bluespace +- type: entity + id: WallRockSnowAluminium + parent: WallRockSnow + description: An ore vein rich with bauxite. + suffix: Aluminium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreAluminium + - type: Sprite + layers: + - state: rock_snow + - map: [ "enum.EdgeLayer.South" ] + state: rock_snow_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_snow_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_snow_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_snow_west + - state: rock_bauxite + +- type: entity + id: WallRockSnowLead + parent: WallRockSnow + description: An ore vein rich with casiterite. + suffix: Lead + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreLead + - type: Sprite + layers: + - state: rock_snow + - map: [ "enum.EdgeLayer.South" ] + state: rock_snow_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_snow_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_snow_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_snow_west + - state: rock_lead + +- type: entity + id: WallRockSnowCopper + parent: WallRockSnow + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - type: Sprite + layers: + - state: rock_snow + - map: [ "enum.EdgeLayer.South" ] + state: rock_snow_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_snow_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_snow_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_snow_west + - state: rock_copper + # Sand variants - type: entity id: WallRockSand @@ -1690,6 +1957,72 @@ state: rock_sand_west - state: rock_bluespace +- type: entity + id: WallRockSandAluminium + parent: WallRockSand + description: An ore vein rich with bauxite. + suffix: Aluminium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreAluminium + - type: Sprite + layers: + - state: rock_sand + - map: [ "enum.EdgeLayer.South" ] + state: rock_sand_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_sand_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_sand_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_sand_west + - state: rock_bauxite + +- type: entity + id: WallRockSandLead + parent: WallRockSand + description: An ore vein rich with casiterite. + suffix: Lead + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreLead + - type: Sprite + layers: + - state: rock_sand + - map: [ "enum.EdgeLayer.South" ] + state: rock_sand_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_sand_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_sand_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_sand_west + - state: rock_lead + +- type: entity + id: WallRockSandCopper + parent: WallRockSand + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - type: Sprite + layers: + - state: rock_sand + - map: [ "enum.EdgeLayer.South" ] + state: rock_sand_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_sand_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_sand_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_sand_west + - state: rock_copper + # Chromite variants - type: entity id: WallRockChromite @@ -1999,6 +2332,72 @@ state: rock_chromite_west - state: rock_bluespace +- type: entity + id: WallRockChromiteAluminium + parent: WallRockChromite + description: An ore vein rich with bauxite. + suffix: Aluminium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreAluminium + - type: Sprite + layers: + - state: rock_chromite + - map: [ "enum.EdgeLayer.South" ] + state: rock_chromite_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_chromite_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_chromite_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_chromite_west + - state: rock_bauxite + +- type: entity + id: WallRockChromiteLead + parent: WallRockChromite + description: An ore vein rich with casiterite. + suffix: Lead + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreLead + - type: Sprite + layers: + - state: rock_chromite + - map: [ "enum.EdgeLayer.South" ] + state: rock_chromite_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_chromite_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_chromite_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_chromite_west + - state: rock_lead + +- type: entity + id: WallRockChromiteCopper + parent: WallRockChromite + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - type: Sprite + layers: + - state: rock_chromite + - map: [ "enum.EdgeLayer.South" ] + state: rock_chromite_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_chromite_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_chromite_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_chromite_west + - state: rock_copper + # Andesite variants - type: entity id: WallRockAndesite @@ -2307,3 +2706,69 @@ - map: [ "enum.EdgeLayer.West" ] state: rock_andesite_west - state: rock_bluespace + +- type: entity + id: WallRockAndesiteAluminium + parent: WallRockAndesite + description: An ore vein rich with bauxite. + suffix: Aluminium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreAluminium + - type: Sprite + layers: + - state: rock_andesite + - map: [ "enum.EdgeLayer.South" ] + state: rock_andesite_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_andesite_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_andesite_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_andesite_west + - state: rock_bauxite + +- type: entity + id: WallRockAndesiteLead + parent: WallRockAndesite + description: An ore vein rich with casiterite. + suffix: Lead + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreLead + - type: Sprite + layers: + - state: rock_andesite + - map: [ "enum.EdgeLayer.South" ] + state: rock_andesite_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_andesite_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_andesite_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_andesite_west + - state: rock_lead + +- type: entity + id: WallRockAndesiteCopper + parent: WallRockAndesite + description: An ore vein rich with native copper. + suffix: Copper + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCopper + - type: Sprite + layers: + - state: rock_andesite + - map: [ "enum.EdgeLayer.South" ] + state: rock_andesite_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_andesite_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_andesite_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_andesite_west + - state: rock_copper diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml index 158f58a2670..6315938eff9 100644 --- a/Resources/Prototypes/Procedural/biome_ore_templates.yml +++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml @@ -4,7 +4,6 @@ entityMask: AsteroidRock: AsteroidRockTin WallRock: WallRockTin - WallRockBasalt: WallRockBasaltTin WallRockChromite: WallRockChromiteTin WallRockSand: WallRockSandTin WallRockSnow: WallRockSnowTin @@ -13,12 +12,50 @@ maxGroupSize: 20 radius: 4 +- type: biomeMarkerLayer + id: OreAluminium + entityMask: + AsteroidRock: AsteroidRockAluminium + WallRock: WallRockAluminium + WallRockChromite: WallRockChromiteAluminium + WallRockSand: WallRockSandAluminium + WallRockSnow: WallRockSnowAluminium + maxCount: 30 + minGroupSize: 7 + maxGroupSize: 15 + radius: 4 + +- type: biomeMarkerLayer + id: OreCopper + entityMask: + AsteroidRock: AsteroidRockCopper + WallRock: WallRockCopper + WallRockChromite: WallRockChromiteCopper + WallRockSand: WallRockSandCopper + WallRockSnow: WallRockSnowCopper + maxCount: 30 + minGroupSize: 7 + maxGroupSize: 15 + radius: 4 + +- type: biomeMarkerLayer + id: OreLead + entityMask: + AsteroidRock: AsteroidRockLead + WallRock: WallRockLead + WallRockChromite: WallRockChromiteLead + WallRockSand: WallRockSandLead + WallRockSnow: WallRockSnowLead + maxCount: 30 + minGroupSize: 5 + maxGroupSize: 8 + radius: 4 + - type: biomeMarkerLayer id: OreQuartz entityMask: AsteroidRock: AsteroidRockQuartz WallRock: WallRockQuartz - WallRockBasalt: WallRockBasaltQuartz WallRockChromite: WallRockChromiteQuartz WallRockSnow: WallRockSnowQuartz maxCount: 30 @@ -31,7 +68,6 @@ entityMask: AsteroidRock: AsteroidRockCoal WallRock: WallRockCoal - WallRockBasalt: WallRockBasaltCoal WallRockChromite: WallRockChromiteCoal WallRockSand: WallRockSandCoal WallRockSnow: WallRockSnowCoal @@ -45,7 +81,6 @@ entityMask: AsteroidRock: AsteroidRockSalt WallRock: WallRockSalt - WallRockBasalt: WallRockBasaltSalt WallRockChromite: WallRockChromiteSalt WallRockSand: WallRockSandSalt WallRockSnow: WallRockSnowSalt @@ -61,7 +96,6 @@ entityMask: AsteroidRock: AsteroidRockGold WallRock: WallRockGold - WallRockBasalt: WallRockBasaltGold WallRockChromite: WallRockChromiteGold WallRockSand: WallRockSandGold WallRockSnow: WallRockSnowGold @@ -76,7 +110,6 @@ entityMask: AsteroidRock: AsteroidRockSilver WallRock: WallRockSilver - WallRockBasalt: WallRockBasaltSilver WallRockChromite: WallRockChromiteSilver WallRockSand: WallRockSandSilver WallRockSnow: WallRockSnowSilver @@ -92,7 +125,6 @@ entityMask: AsteroidRock: AsteroidRockPlasma WallRock: WallRockPlasma - WallRockBasalt: WallRockBasaltPlasma WallRockChromite: WallRockChromitePlasma WallRockSand: WallRockSandPlasma WallRockSnow: WallRockSnowPlasma @@ -107,7 +139,6 @@ entityMask: AsteroidRock: AsteroidRockUranium WallRock: WallRockUranium - WallRockBasalt: WallRockBasaltUranium WallRockChromite: WallRockChromiteUranium WallRockSand: WallRockSandUranium WallRockSnow: WallRockSnowUranium @@ -121,7 +152,6 @@ entityMask: AsteroidRock: AsteroidRockBananium WallRock: WallRockBananium - WallRockBasalt: WallRockBasaltBananium WallRockChromite: WallRockChromiteBananium WallRockSand: WallRockSandBananium WallRockSnow: WallRockSnowBananium @@ -135,7 +165,6 @@ entityMask: AsteroidRock: AsteroidRockDiamond WallRock: WallRockDiamond - WallRockBasalt: WallRockBasaltDiamond WallRockChromite: WallRockChromiteDiamond WallRockSand: WallRockSandDiamond WallRockSnow: WallRockSnowDiamond @@ -150,7 +179,6 @@ entityMask: AsteroidRock: AsteroidRockArtifactFragment WallRock: WallRockArtifactFragment - WallRockBasalt: WallRockBasaltArtifactFragment WallRockChromite: WallRockChromiteArtifactFragment WallRockSand: WallRockSandArtifactFragment WallRockSnow: WallRockSnowArtifactFragment @@ -165,7 +193,6 @@ entityMask: AsteroidRock: AsteroidRockBluespace WallRock: WallRockBluespace - WallRockBasalt: WallRockBasaltBluespace WallRockChromite: WallRockChromiteBluespace WallRockSand: WallRockSandBluespace WallRockSnow: WallRockSnowBluespace @@ -179,7 +206,6 @@ entityMask: AsteroidRock: AsteroidRockNormality WallRock: WallRockNormality - WallRockBasalt: WallRockBasaltNormality WallRockChromite: WallRockChromiteNormality WallRockSand: WallRockSandNormality WallRockSnow: WallRockSnowNormality diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 1b941cd1a2c..b52235ca5a0 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -125,6 +125,28 @@ - !type:BiomeMarkerLoot proto: OreIron +- type: salvageLoot + id: OreAluminium + guaranteed: true + loots: + - !type:BiomeMarkerLoot + proto: OreAluminium + +- type: salvageLoot + id: OreCopper + guaranteed: true + loots: + - !type:BiomeMarkerLoot + proto: OreCopper + +- type: salvageLoot + id: OreLead + guaranteed: true + loots: + - !type:BiomeMarkerLoot + proto: OreLead + + - type: salvageLoot id: OreCoal guaranteed: true diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml index a2d2397dcde..c1fda0f87a5 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -38,3 +38,11 @@ icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel } color: "#696969" #Okay, this is epic price: 0.28 # 1-1 mix of plasma and steel. + +- type: material + id: Tungsten + stackEntity: IngotTungsten1 + name: materials-tungsten + unit: materials-unit-bar + icon: { sprite: Objects/Materials/ingots.rsi, state: tungsten_1 } + price: 0.5 diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml index 44f13faac1d..aec889fa4b1 100644 --- a/Resources/Prototypes/Reagents/Materials/ores.yml +++ b/Resources/Prototypes/Reagents/Materials/ores.yml @@ -95,3 +95,12 @@ icon: { sprite: Objects/Materials/ore.rsi, state: normality } color: "#53a9ff" price: 7.5 + +- type: material + id: RawTungsten + stackEntity: TungstenOre1 + name: materials-raw-tungsten + unit: materials-unit-chunk + icon: { sprite: Objects/Materials/ore.rsi, state: tungsten } + color: "#FFD700" + price: 0.5 diff --git a/Resources/Prototypes/Recipes/Lathes/hardsuits.yml b/Resources/Prototypes/Recipes/Lathes/hardsuits.yml index 77ca2c5b878..9f2c843be2e 100644 --- a/Resources/Prototypes/Recipes/Lathes/hardsuits.yml +++ b/Resources/Prototypes/Recipes/Lathes/hardsuits.yml @@ -11,7 +11,7 @@ category: Tacsuits completetime: 60 materials: - Plasteel: 3000 + Tungsten: 300 Durathread: 300 ReinforcedGlass: 1000 Uranium: 100 @@ -24,7 +24,7 @@ category: Tacsuits completetime: 60 materials: - Plasteel: 3000 + Tungsten: 300 Durathread: 300 ReinforcedGlass: 1000 Uranium: 100 @@ -38,7 +38,7 @@ category: Tacsuits completetime: 90 materials: - Plasteel: 3500 + Tungsten: 350 ReinforcedGlass: 1250 Durathread: 500 Plastic: 500 @@ -54,7 +54,7 @@ category: Tacsuits completetime: 120 materials: - Plasteel: 5000 + Tungsten: 500 WebSilk: 3000 ReinforcedGlass: 1500 Plastic: 1000 @@ -68,7 +68,7 @@ category: Tacsuits completetime: 180 materials: - Plasteel: 8000 + Tungsten: 800 WebSilk: 3000 ReinforcedGlass: 1500 Plastic: 1500 @@ -82,7 +82,7 @@ category: Tacsuits completetime: 120 materials: - Plasteel: 10000 + Tungsten: 1000 WebSilk: 3000 ReinforcedPlasmaGlass: 1500 Plastic: 1500 @@ -97,7 +97,7 @@ category: Tacsuits completetime: 300 materials: # GOOD LUCK. - Plasteel: 30000 + Tungsten: 3000 ReinforcedPlasmaGlass: 4500 WebSilk: 3500 Plastic: 3000 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index f935ca994e2..64a2dd2079d 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -1020,3 +1020,36 @@ Glass: 300 Silver: 100 Gold: 100 + +- type: latheRecipe + id: EnergySword + result: EnergySword + completetime: 10 + materials: + Tungsten: 300 + Gold: 300 + Bluespace: 300 + Plasma: 300 + Diamond: 100 + +- type: latheRecipe + id: EnergyCutlass + result: EnergyCutlass + completetime: 10 + materials: + Tungsten: 300 + Gold: 300 + Bluespace: 300 + Plasma: 300 + Diamond: 100 + +- type: latheRecipe + id: EnergySwordDouble + result: EnergySwordDouble + completetime: 20 + materials: + Tungsten: 600 + Gold: 600 + Bluespace: 600 + Plasma: 600 + Diamond: 200 diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index 3f2c8f11c2a..7088b84caeb 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -285,3 +285,14 @@ completetime: 4 materials: RawNormality: 100 + +- type: latheRecipe + id: IngotTungsten1 + result: IngotTungsten1 + applyMaterialDiscount: false + miningPoints: 5 + completetime: 4 + materials: + RawTungsten: 100 + RawIron: 100 + Coal: 100 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 5d286bd2e2c..fbeab5d0e1e 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -192,7 +192,6 @@ - ClothingOuterHardsuitShanlinUnpainted - ClothingOuterHardsuitShiweiUnpainted - ClothingOuterHardsuitJuggernautReverseEngineered - #- ClothingOuterHardsuitCybersunEliteUnpainted # IOU technologyPrerequisites: - AdvancedTacsuits softCapContribution: 1.5 @@ -213,6 +212,7 @@ - PowerCageHigh - ShuttleGunDusterCircuitboard - WeaponMechCombatImmolationGun # Goobstation - #- EnergySword # TODO: Add a bunch of stupidly exotic energy weapons to act as a reaaaaaally nice incentive for research to consider this. - # Make the energy sword for instance include bananium and bluespace in its recipe. :) + - EnergySword # TODO: Add a bunch of stupidly exotic energy weapons to act as a reaaaaaally nice incentive for research to consider this. + - EnergySwordDouble + - EnergyCutlass softCapContribution: 1.5 diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml index 956523c92ba..e84716ebcaf 100644 --- a/Resources/Prototypes/Stacks/Materials/ingots.yml +++ b/Resources/Prototypes/Stacks/Materials/ingots.yml @@ -13,3 +13,11 @@ spawn: IngotSilver1 maxCount: 30 itemSize: 1 + +- type: stack + id: Tungsten + name: tungsten-carbide + icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: tungsten_1 } + spawn: IngotTungsten1 + maxCount: 30 + itemSize: 1 diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml index cf01903aca0..92ce2f60b44 100644 --- a/Resources/Prototypes/Stacks/Materials/ore.yml +++ b/Resources/Prototypes/Stacks/Materials/ore.yml @@ -4,7 +4,7 @@ icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold } spawn: GoldOre1 maxCount: 30 - + - type: stack id: DiamondOre name: rough diamond @@ -91,3 +91,11 @@ spawn: NormalityOre1 maxCount: 30 itemSize: 2 + +- type: stack + id: TungstenOre + name: raw wolframite + icon: { sprite: Objects/Materials/ore.rsi, state: tungsten } + spawn: TungstenOre1 + maxCount: 30 + itemSize: 2 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml new file mode 100644 index 00000000000..b5087d710be --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml @@ -0,0 +1,60 @@ +# See specific/hydroponics for fertilizer. + +#MARK: Base +- type: entity + abstract: true + parent: MaterialBase + id: N14MaterialBase + suffix: Full, 30 + description: A raw material. + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/materials.rsi + - type: Material + - type: Appearance + +#MARK: Circuitry +- type: entity + parent: N14MaterialBase + id: N14MaterialCircuitry + name: circuitry + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Circuitry: 100 + - type: Stack + stackType: Circuitry + baseLayer: base + layerStates: + - circuits + - circuits_2 + - circuits_3 + count: 15 + - type: Sprite + state: circuits_3 + layers: + - state: circuits_3 + map: ["base"] + - type: Appearance + +- type: entity + parent: N14MaterialCircuitry + id: N14MaterialCircuitry10 + suffix: 10 + components: + - type: Sprite + state: circuits_2 + - type: Stack + count: 10 + +- type: entity + parent: N14MaterialCircuitry + id: N14MaterialCircuitry1 + suffix: Single + components: + - type: Sprite + state: circuits + - type: Stack + count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml new file mode 100644 index 00000000000..a7dc6f2cee7 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml @@ -0,0 +1,151 @@ +#MARK: Lead +- type: entity + parent: IngotBase + id: N14IngotLead + name: lead bar + suffix: Full, 30 + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Lead: 100 + - type: Stack + stackType: Lead + baseLayer: base + layerStates: + - ingot_lead + - ingot_lead + - ingot_lead + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: ingot_lead + layers: + - state: ingot_lead + map: ["base"] + - type: MeleeWeapon + attackRate: 0.6 + damage: + types: + Blunt: 9 + soundHit: + path: /Audio/Weapons/smash.ogg + - type: DamageOtherOnHit + damage: + types: + Blunt: 14 + - type: Item + heldPrefix: ingot_lead + - type: Appearance + - type: Extractable + grindableSolutionName: lead + - type: SolutionContainerManager + solutions: + lead: + reagents: + - ReagentId: Lead + Quantity: 10 + +- type: entity + parent: N14IngotLead + id: N14IngotLead1 + name: lead bar + suffix: Single + components: + - type: Sprite + state: ingot_lead + - type: Stack + count: 1 + +#MARK: Aluminum +- type: entity + parent: IngotBase + id: N14IngotAluminium + name: aluminium bar + suffix: Full, 30 + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Aluminum: 100 + - type: Stack + stackType: Aluminium + baseLayer: base + layerStates: + - ingot_aluminum + - ingot_aluminum + - ingot_aluminum + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: ingot_aluminum + layers: + - state: ingot_aluminum + map: ["base"] + - type: Item + heldPrefix: ingot_aluminum + - type: Appearance + - type: Extractable + grindableSolutionName: aluminium + - type: SolutionContainerManager + solutions: + aluminium: + reagents: + - ReagentId: Aluminium + Quantity: 10 + +- type: entity + parent: N14IngotAluminium + id: N14IngotAluminium1 + name: aluminium bar + suffix: Single + components: + - type: Sprite + state: ingot_aluminum + - type: Stack + count: 1 + +#MARK: Copper +- type: entity + parent: IngotBase + id: N14IngotCopper + name: copper bar + suffix: Full, 30 + components: + - type: Material + - type: PhysicalComposition + materialComposition: + N14Copper: 100 + - type: Stack + stackType: N14Copper + baseLayer: base + layerStates: + - ingot_copper + - ingot_copper + - ingot_copper + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: ingot_copper + layers: + - state: ingot_copper + map: ["base"] + - type: Item + heldPrefix: ingot_copper + - type: Appearance + - type: Extractable + grindableSolutionName: copper + - type: SolutionContainerManager + solutions: + copper: + reagents: + - ReagentId: Copper + Quantity: 10 + +- type: entity + parent: N14IngotCopper + id: N14IngotCopper1 + name: copper bar + suffix: Single + components: + - type: Sprite + state: ingot_copper + - type: Stack + count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml new file mode 100644 index 00000000000..f98aa7981c4 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml @@ -0,0 +1,124 @@ +- type: entity + parent: OreBase # From Entities\Objects\Materials\ore.yml + id: N14AluminiumOre + name: bauxite + suffix: Full + components: + - type: Stack + stackType: N14AluminiumOre + count: 30 + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: aluminium + - type: Material + - type: PhysicalComposition + materialComposition: + RawAluminium: 500 + +- type: entity + id: N14AluminiumOre1 + parent: N14AluminiumOre + suffix: Single + components: + - type: Stack + count: 1 + + +- type: entity + parent: OreBase # From Entities\Objects\Materials\ore.yml + id: N14LeadOre + name: galena + suffix: Full + components: + - type: Stack + stackType: N14LeadOre + count: 30 + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: lead + - type: Material + - type: PhysicalComposition + materialComposition: + RawLead: 500 + - type: Extractable + grindableSolutionName: leadore + - type: SolutionContainerManager + solutions: + leadore: + reagents: + - ReagentId: Lead + Quantity: 10 + +- type: entity + id: N14LeadOre1 + parent: N14LeadOre + suffix: Single + components: + - type: Stack + count: 1 + +- type: entity + parent: OreBase + id: N14CopperOre + name: tetrahedrite + suffix: Full + components: + - type: Stack + stackType: N14CopperOre + count: 30 + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: copper + - type: Material + - type: PhysicalComposition + materialComposition: + N14RawCopper: 500 + - type: Extractable + grindableSolutionName: copperore + - type: SolutionContainerManager + solutions: + copperore: + reagents: + - ReagentId: Copper + Quantity: 10 + +- type: entity + id: N14CopperOre1 + parent: N14CopperOre + suffix: Single + components: + - type: Stack + count: 1 + +- type: entity + parent: OreBase + id: SulfurOre + name: sulfur ore + suffix: Full + components: + - type: Stack + stackType: SulfurOre + count: 30 + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: sulfur + - type: Material + - type: PhysicalComposition + materialComposition: + RawSulfur: 500 + - type: Extractable + grindableSolutionName: sulfurore + - type: SolutionContainerManager + solutions: + sulfurore: + reagents: + - ReagentId: Sulfur + Quantity: 10 + +- type: entity + id: SulfurOre1 + parent: SulfurOre + suffix: Single + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml new file mode 100644 index 00000000000..773471351f8 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -0,0 +1,34 @@ +- type: material + id: Circuitry + stackEntity: N14MaterialCircuitry1 + name: materials-circuitry # N14TODO: Localise + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: circuits_3 } + color: "#8A9A5B" + price: 0.1 + +- type: material + id: Lead + stackEntity: N14IngotLead1 + name: materials-lead + unit: materials-unit-bar + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_lead } + color: "#C0C0C0" + price: 0.04 + +- type: material + id: Aluminum + stackEntity: N14IngotAluminium1 + name: materials-aluminium + unit: materials-unit-bar + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_aluminum } + color: "#C0C0C0" + price: 0.01 + +- type: material + id: N14Copper + stackEntity: N14IngotCopper1 + name: materials-copper + unit: materials-unit-bar + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_copper } + color: "#B87333" + price: 0.01 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/ores.yml b/Resources/Prototypes/_Nuclear14/Reagents/ores.yml new file mode 100644 index 00000000000..a1071523eee --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Reagents/ores.yml @@ -0,0 +1,32 @@ +- type: material + id: RawAluminium + stackEntity: N14AluminiumOre1 + name: materials-raw-aluminium + unit: materials-unit-chunk + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: aluminium } + price: 0.05 + +- type: material + id: RawLead + stackEntity: N14LeadOre1 + name: materials-raw-lead + unit: materials-unit-chunk + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: lead } + price: 0.05 + +- type: material + id: RawSulfur + stackEntity: SulfurOre1 + name: materials-raw-sulfur + unit: materials-unit-chunk + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: sulfur } + price: 0.05 + +- type: material + id: N14RawCopper + stackEntity: N14CopperOre1 + name: materials-raw-copper + unit: materials-unit-chunk + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: copper } + color: "#9A6E3A" + price: 0.05 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml new file mode 100644 index 00000000000..d771ec11c5e --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml @@ -0,0 +1,35 @@ +- type: latheRecipe + id: N14IngotLead1 + result: N14IngotLead1 + miningPoints: 10 + applyMaterialDiscount: false + completetime: 2 + materials: + RawLead: 100 + +- type: latheRecipe + id: N14IngotCopper1 + result: N14IngotCopper1 + completetime: 2 + miningPoints: 10 + materials: + N14RawCopper: 100 + Coal: 50 + +- type: latheRecipe + id: N14IngotAluminium1 + result: N14IngotAluminium1 + completetime: 2 + miningPoints: 10 + materials: + RawAluminium: 100 + Coal: 50 + +- type: latheRecipe + id: N14MaterialCircuitry + result: N14MaterialCircuitry1 + completetime: 2 + materials: + Gold: 100 + Plastic: 100 + Glass: 100 diff --git a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml new file mode 100644 index 00000000000..31d32eee224 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml @@ -0,0 +1,63 @@ +- type: stack + id: Circuitry + name: circuitry + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: circuits_3 } + spawn: N14MaterialCircuitry1 + maxCount: 15 + +- type: stack + id: N14AluminiumOre + name: bauxite + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: lead } + spawn: N14AluminiumOre1 + maxCount: 10 + itemSize: 1 + +- type: stack + id: N14LeadOre + name: lead ore + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: lead } + spawn: N14LeadOre1 + maxCount: 10 + itemSize: 1 + +- type: stack + id: N14CopperOre + name: copper ore + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: copper } + spawn: N14CopperOre1 + maxCount: 30 + itemSize: 1 + +- type: stack + id: SulfurOre + name: sulfur ore + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: sulfur } + spawn: SulfurOre1 + maxCount: 10 + itemSize: 1 + +# Metals +- type: stack + id: Lead + name: lead + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: ingot_lead } + spawn: N14IngotLead1 + maxCount: 30 + itemSize: 1 + +- type: stack + id: Aluminium + name: aluminium + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: ingot_aluminum } + spawn: N14IngotAluminium1 + maxCount: 30 + itemSize: 1 + +- type: stack + id: N14Copper + name: copper + icon: { sprite: "/Textures/_Nuclear14/Objects/Misc/materials.rsi", state: ingot_copper } + spawn: N14IngotCopper1 + maxCount: 30 + itemSize: 1 diff --git a/Resources/Prototypes/_Nuclear14/ore.yml b/Resources/Prototypes/_Nuclear14/ore.yml new file mode 100644 index 00000000000..d260ae1122a --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/ore.yml @@ -0,0 +1,17 @@ +- type: ore + id: OreAluminium + oreEntity: N14AluminiumOre1 + minOreYield: 1 + maxOreYield: 5 + +- type: ore + id: OreLead + oreEntity: N14LeadOre1 + minOreYield: 1 + maxOreYield: 5 + +- type: ore + id: OreCopper + oreEntity: N14CopperOre1 + minOreYield: 1 + maxOreYield: 5 diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index 8845e993ac5..e2ebfb2e261 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -64,6 +64,12 @@ minOreYield: 1 maxOreYield: 2 +- type: ore + id: OreTungsten + oreEntity: TungstenOre1 + minOreYield: 1 + maxOreYield: 2 + - type: ore id: OreQuartzCrab oreEntity: MobSpawnCrabQuartz @@ -112,6 +118,28 @@ OreArtifactFragment: 0.5 OreBluespace: 0.5 OreNormality: 0.3 + OreAluminium: 2 + OreLead: 2 + OreCopper: 2 + +- type: weightedRandomOre + id: RandomOreDistributionBasalt + weights: + OreSteel: 20 + OreCoal: 0.1 + OreSpaceQuartz: 0.1 + OreGold: 10 + OrePlasma: 0.4 + OreSilver: 0.1 + OreUranium: 0.1 + OreBananium: 0.1 + OreArtifactFragment: 0.1 + OreBluespace: 0.5 + OreNormality: 0.3 + OreAluminium: 8 + OreLead: 0.2 + OreCopper: 0.2 + OreTungsten: 5 - type: weightedRandomOre id: OreCrab diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json index 05b9647ea19..1cf09d8328a 100644 --- a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, Tungsten by tresguys(Discord)", "size": { "x": 32, "y": 32 @@ -117,6 +117,15 @@ { "name": "silver-inhand-right", "directions": 4 + }, + { + "name": "tungsten_1" + }, + { + "name": "tungsten_2" + }, + { + "name": "tungsten_3" } ] } diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_1.png b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_1.png new file mode 100644 index 00000000000..5d60315af0c Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_1.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_2.png new file mode 100644 index 00000000000..303caa93f85 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_3.png new file mode 100644 index 00000000000..a0dfaf69f66 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_3.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json index 597fa0499fb..231372f6cbe 100644 --- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd", + "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd, tungsten by tresguys(Discord)", "size": { "x": 32, "y": 32 @@ -42,6 +42,9 @@ }, { "name": "diamond" + }, + { + "name": "tungsten" } ] } diff --git a/Resources/Textures/Objects/Materials/ore.rsi/tungsten.png b/Resources/Textures/Objects/Materials/ore.rsi/tungsten.png new file mode 100644 index 00000000000..cbc3d425d03 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/tungsten.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/aluminium.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/aluminium.png new file mode 100644 index 00000000000..46ee7111dfd Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/aluminium.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire.png new file mode 100644 index 00000000000..06b26e46aff Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_2.png new file mode 100644 index 00000000000..853ab0fe4cb Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_3.png new file mode 100644 index 00000000000..2cc5c318b7b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/brass.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/brass.png new file mode 100644 index 00000000000..1e767c64990 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/brass.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bullets.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bullets.png new file mode 100644 index 00000000000..69b2076ae7e Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bullets.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/casings.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/casings.png new file mode 100644 index 00000000000..87ee642a944 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/casings.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic.png new file mode 100644 index 00000000000..e4aa87e47ad Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_2.png new file mode 100644 index 00000000000..97981c70037 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_3.png new file mode 100644 index 00000000000..97981c70037 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits.png new file mode 100644 index 00000000000..9070df40192 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_2.png new file mode 100644 index 00000000000..9f3d17790d2 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_3.png new file mode 100644 index 00000000000..51277023eb7 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/cloth.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/cloth.png new file mode 100644 index 00000000000..d08d7937a0a Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/cloth.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/coal.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/coal.png new file mode 100644 index 00000000000..993bfcf45b6 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/coal.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/copper.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/copper.png new file mode 100644 index 00000000000..c315148f6f1 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/copper.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood.png new file mode 100644 index 00000000000..dfa26bc93d7 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_2.png new file mode 100644 index 00000000000..201fbf4e5df Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_3.png new file mode 100644 index 00000000000..8e90063d729 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/gold.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/gold.png new file mode 100644 index 00000000000..46050f982f3 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/gold.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire.png new file mode 100644 index 00000000000..d6c59e80c0c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_2.png new file mode 100644 index 00000000000..172f7960d9e Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_3.png new file mode 100644 index 00000000000..5a619f919e7 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_aluminum.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_aluminum.png new file mode 100644 index 00000000000..c7e3b2b0945 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_aluminum.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_brass.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_brass.png new file mode 100644 index 00000000000..831b40d8db5 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_brass.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_copper.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_copper.png new file mode 100644 index 00000000000..4a2b4fa9492 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_copper.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_gold.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_gold.png new file mode 100644 index 00000000000..cbcdcd7c9a6 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_gold.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_iron.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_iron.png new file mode 100644 index 00000000000..2807c0d34f0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_iron.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_lead.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_lead.png new file mode 100644 index 00000000000..c6329ba2499 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_lead.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_silver.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_silver.png new file mode 100644 index 00000000000..f7f4fb2d8ee Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_silver.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/iron.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/iron.png new file mode 100644 index 00000000000..d989b647795 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/iron.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/lead.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/lead.png new file mode 100644 index 00000000000..b99101a0ff0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/lead.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png new file mode 100644 index 00000000000..40a89d1c10a Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png new file mode 100644 index 00000000000..53d4bc1a609 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png new file mode 100644 index 00000000000..7dbeb76c0ba Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/log.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/log.png new file mode 100644 index 00000000000..72da2645a45 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/log.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json new file mode 100644 index 00000000000..836d7a30afb --- /dev/null +++ b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json @@ -0,0 +1,275 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/5e2e8ebe440947bcf947189d5a46bfbb5ae2e8e8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scrap_glass" + }, + { + "name": "scrap_glass_2" + }, + { + "name": "scrap_glass_3" + }, + { + "name": "scrap_parts" + }, + { + "name": "scrap_parts_2" + }, + { + "name": "scrap_parts_3" + }, + { + "name": "scrap" + }, + { + "name": "scrap_2" + }, + { + "name": "scrap_3" + }, + { + "name": "thread" + }, + { + "name": "scrap_clockwork" + }, + { + "name": "scrap_electronic" + }, + { + "name": "scrap_electronic_2" + }, + { + "name": "scrap_electronic_3" + }, + { + "name": "circuits" + }, + { + "name": "circuits_2" + }, + { + "name": "circuits_3" + }, + { + "name": "redwire" + }, + { + "name": "redwire_2" + }, + { + "name": "redwire_3" + }, + { + "name": "greenwire" + }, + { + "name": "greenwire_2" + }, + { + "name": "greenwire_3" + }, + { + "name": "bluewire" + }, + { + "name": "bluewire_2" + }, + { + "name": "bluewire_3" + }, + { + "name": "yellowwire" + }, + { + "name": "yellowwire_2" + }, + { + "name": "yellowwire_3" + }, + { + "name": "nail" + }, + { + "name": "nail_2" + }, + { + "name": "nail_3" + }, + { + "name": "nail_4" + }, + { + "name": "plank" + }, + { + "name": "plank_2" + }, + { + "name": "plank_3" + }, + { + "name": "log" + }, + { + "name": "firewood" + }, + { + "name": "firewood_2" + }, + { + "name": "firewood_3" + }, + { + "name": "ingot_aluminum" + }, + { + "name": "scrap_aluminum" + }, + { + "name": "powder_aluminum" + }, + { + "name": "ingot_copper" + }, + { + "name": "scrap_copper" + }, + { + "name": "powder_copper" + }, + { + "name": "ingot_gold" + }, + { + "name": "scrap_gold" + }, + { + "name": "powder_gold" + }, + { + "name": "ingot_silver" + }, + { + "name": "scrap_silver" + }, + { + "name": "powder_silver" + }, + { + "name": "ingot_iron" + }, + { + "name": "scrap_steel" + }, + { + "name": "scrap_steel_2" + }, + { + "name": "scrap_steel_3" + }, + { + "name": "powder_steel" + }, + { + "name": "ingot_brass" + }, + { + "name": "scrap_brass" + }, + { + "name": "casings" + }, + { + "name": "powder_brass" + }, + { + "name": "ingot_lead" + }, + { + "name": "scrap_lead" + }, + { + "name": "bullets" + }, + { + "name": "powder_lead" + }, + { + "name": "rubber" + }, + { + "name": "scrap_wood" + }, + { + "name": "plastic" + }, + { + "name": "ceramic" + }, + { + "name": "ceramic_2" + }, + { + "name": "ceramic_3" + }, + { + "name": "militaryfiber" + }, + { + "name": "leather_1" + }, + { + "name": "leather_2" + }, + { + "name": "leather_3" + }, + { + "name": "raw_leather_1" + }, + { + "name": "raw_leather_2" + }, + { + "name": "cloth" + }, + { + "name": "uranium" + }, + { + "name": "coal" + }, + { + "name": "aluminium" + }, + { + "name": "gold" + }, + { + "name": "silver" + }, + { + "name": "iron" + }, + { + "name": "brass" + }, + { + "name": "copper" + }, + { + "name": "lead" + }, + { + "name": "sulfur" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/militaryfiber.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/militaryfiber.png new file mode 100644 index 00000000000..b121231a8db Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/militaryfiber.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail.png new file mode 100644 index 00000000000..83055814cfc Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_2.png new file mode 100644 index 00000000000..ca5075ec2cc Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_3.png new file mode 100644 index 00000000000..e0cb966963d Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_4.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_4.png new file mode 100644 index 00000000000..6b90fce17f5 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_4.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank.png new file mode 100644 index 00000000000..7885a50a65c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_2.png new file mode 100644 index 00000000000..5faf4a4ff59 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_3.png new file mode 100644 index 00000000000..7d01697b00c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plastic.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plastic.png new file mode 100644 index 00000000000..d5622e16d5b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plastic.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_aluminum.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_aluminum.png new file mode 100644 index 00000000000..513ac164485 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_aluminum.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_brass.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_brass.png new file mode 100644 index 00000000000..67d4ef8248a Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_brass.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_copper.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_copper.png new file mode 100644 index 00000000000..0b72f7ed279 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_copper.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_gold.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_gold.png new file mode 100644 index 00000000000..a35d8ffe254 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_gold.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_lead.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_lead.png new file mode 100644 index 00000000000..30004de5a89 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_lead.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_silver.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_silver.png new file mode 100644 index 00000000000..20cda8dea1b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_silver.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_steel.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_steel.png new file mode 100644 index 00000000000..277dd5c99d8 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_steel.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png new file mode 100644 index 00000000000..51eda91ecca Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png new file mode 100644 index 00000000000..806f5217c40 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire.png new file mode 100644 index 00000000000..b5af3153efe Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_2.png new file mode 100644 index 00000000000..c63fa6a41d9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_3.png new file mode 100644 index 00000000000..c41e0d2ace0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/rubber.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/rubber.png new file mode 100644 index 00000000000..bde3f0a69f6 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/rubber.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap.png new file mode 100644 index 00000000000..3eb4f2258bd Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_2.png new file mode 100644 index 00000000000..48ab8350b3a Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_3.png new file mode 100644 index 00000000000..f407fa257a0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_aluminum.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_aluminum.png new file mode 100644 index 00000000000..40105e09faa Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_aluminum.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_brass.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_brass.png new file mode 100644 index 00000000000..381bdc08477 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_brass.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_clockwork.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_clockwork.png new file mode 100644 index 00000000000..8a950f73d45 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_clockwork.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_copper.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_copper.png new file mode 100644 index 00000000000..1fa14a349a0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_copper.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic.png new file mode 100644 index 00000000000..db8fe445081 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_2.png new file mode 100644 index 00000000000..c550c5ab017 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_3.png new file mode 100644 index 00000000000..c550c5ab017 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass.png new file mode 100644 index 00000000000..6ad4064c97d Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_2.png new file mode 100644 index 00000000000..6a4c6463bcd Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_3.png new file mode 100644 index 00000000000..6a4c6463bcd Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_gold.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_gold.png new file mode 100644 index 00000000000..25fbd65a0aa Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_gold.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_lead.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_lead.png new file mode 100644 index 00000000000..6eb4ea7e8a7 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_lead.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts.png new file mode 100644 index 00000000000..fab94a466fb Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_2.png new file mode 100644 index 00000000000..99e1275d8ad Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_3.png new file mode 100644 index 00000000000..99e1275d8ad Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_silver.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_silver.png new file mode 100644 index 00000000000..2588a7b4815 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_silver.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel.png new file mode 100644 index 00000000000..be46022258a Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_2.png new file mode 100644 index 00000000000..853031769aa Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_3.png new file mode 100644 index 00000000000..853031769aa Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_wood.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_wood.png new file mode 100644 index 00000000000..d6fe3a429a9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_wood.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/silver.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/silver.png new file mode 100644 index 00000000000..6704406da46 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/silver.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/sulfur.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/sulfur.png new file mode 100644 index 00000000000..726532deb41 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/sulfur.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/thread.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/thread.png new file mode 100644 index 00000000000..2c11b34b043 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/thread.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/uranium.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/uranium.png new file mode 100644 index 00000000000..da2162b3eb0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/uranium.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire.png new file mode 100644 index 00000000000..3e0db1c24bb Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_2.png new file mode 100644 index 00000000000..acc6ba07710 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_3.png new file mode 100644 index 00000000000..72856cda532 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_3.png differ