diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index 65e8a46dc1..73a731de4a 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -9,10 +9,6 @@ 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 @@ -45,11 +41,6 @@ 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 2b4c51a8f8..7e8e6a5b74 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml @@ -115,40 +115,3 @@ 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 71e5647b26..690e7e36d2 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml @@ -424,26 +424,3 @@ 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 728f327acd..d9cfed8acb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -214,7 +214,6 @@ - RootSpeakTranslator - BasicGalaticCommonTranslatorImplanter - MofficTranslator - - N14MaterialCircuitry - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot @@ -296,7 +295,6 @@ - LargeBeaker - Dropper - ClothingEyesGlassesChemical - - N14MaterialCircuitry dynamicRecipes: - PowerDrill - MiningDrill @@ -496,7 +494,6 @@ - ReagentGrinderIndustrialMachineCircuitboard - StasisBedMachineCircuitboard - CryoPodMachineCircuitboard - - N14MaterialCircuitry dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard @@ -1059,9 +1056,6 @@ - WeaponMechCombatDisabler - WeaponMechCombatFlashbangLauncher - WeaponMechCombatMissileRack8 - - EnergySword - - EnergySwordDouble - - EnergyCutlass - type: MaterialStorage whitelist: tags: @@ -1488,10 +1482,6 @@ - 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 5384c0bb30..552e3fc6a5 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -429,72 +429,6 @@ 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 @@ -830,72 +764,6 @@ 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 @@ -917,9 +785,6 @@ state: rock_wall_north - map: [ "enum.EdgeLayer.West" ] state: rock_wall_west - - type: OreVein - oreChance: 0.33 - oreRarityPrototypeId: RandomOreDistributionBasalt - type: entity id: WallRockBasaltCoal @@ -1208,72 +1073,6 @@ 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 @@ -1583,72 +1382,6 @@ 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 @@ -1957,72 +1690,6 @@ 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 @@ -2332,72 +1999,6 @@ 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 @@ -2706,69 +2307,3 @@ - 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 6315938eff..158f58a267 100644 --- a/Resources/Prototypes/Procedural/biome_ore_templates.yml +++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml @@ -4,6 +4,7 @@ entityMask: AsteroidRock: AsteroidRockTin WallRock: WallRockTin + WallRockBasalt: WallRockBasaltTin WallRockChromite: WallRockChromiteTin WallRockSand: WallRockSandTin WallRockSnow: WallRockSnowTin @@ -12,50 +13,12 @@ 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 @@ -68,6 +31,7 @@ entityMask: AsteroidRock: AsteroidRockCoal WallRock: WallRockCoal + WallRockBasalt: WallRockBasaltCoal WallRockChromite: WallRockChromiteCoal WallRockSand: WallRockSandCoal WallRockSnow: WallRockSnowCoal @@ -81,6 +45,7 @@ entityMask: AsteroidRock: AsteroidRockSalt WallRock: WallRockSalt + WallRockBasalt: WallRockBasaltSalt WallRockChromite: WallRockChromiteSalt WallRockSand: WallRockSandSalt WallRockSnow: WallRockSnowSalt @@ -96,6 +61,7 @@ entityMask: AsteroidRock: AsteroidRockGold WallRock: WallRockGold + WallRockBasalt: WallRockBasaltGold WallRockChromite: WallRockChromiteGold WallRockSand: WallRockSandGold WallRockSnow: WallRockSnowGold @@ -110,6 +76,7 @@ entityMask: AsteroidRock: AsteroidRockSilver WallRock: WallRockSilver + WallRockBasalt: WallRockBasaltSilver WallRockChromite: WallRockChromiteSilver WallRockSand: WallRockSandSilver WallRockSnow: WallRockSnowSilver @@ -125,6 +92,7 @@ entityMask: AsteroidRock: AsteroidRockPlasma WallRock: WallRockPlasma + WallRockBasalt: WallRockBasaltPlasma WallRockChromite: WallRockChromitePlasma WallRockSand: WallRockSandPlasma WallRockSnow: WallRockSnowPlasma @@ -139,6 +107,7 @@ entityMask: AsteroidRock: AsteroidRockUranium WallRock: WallRockUranium + WallRockBasalt: WallRockBasaltUranium WallRockChromite: WallRockChromiteUranium WallRockSand: WallRockSandUranium WallRockSnow: WallRockSnowUranium @@ -152,6 +121,7 @@ entityMask: AsteroidRock: AsteroidRockBananium WallRock: WallRockBananium + WallRockBasalt: WallRockBasaltBananium WallRockChromite: WallRockChromiteBananium WallRockSand: WallRockSandBananium WallRockSnow: WallRockSnowBananium @@ -165,6 +135,7 @@ entityMask: AsteroidRock: AsteroidRockDiamond WallRock: WallRockDiamond + WallRockBasalt: WallRockBasaltDiamond WallRockChromite: WallRockChromiteDiamond WallRockSand: WallRockSandDiamond WallRockSnow: WallRockSnowDiamond @@ -179,6 +150,7 @@ entityMask: AsteroidRock: AsteroidRockArtifactFragment WallRock: WallRockArtifactFragment + WallRockBasalt: WallRockBasaltArtifactFragment WallRockChromite: WallRockChromiteArtifactFragment WallRockSand: WallRockSandArtifactFragment WallRockSnow: WallRockSnowArtifactFragment @@ -193,6 +165,7 @@ entityMask: AsteroidRock: AsteroidRockBluespace WallRock: WallRockBluespace + WallRockBasalt: WallRockBasaltBluespace WallRockChromite: WallRockChromiteBluespace WallRockSand: WallRockSandBluespace WallRockSnow: WallRockSnowBluespace @@ -206,6 +179,7 @@ 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 b52235ca5a..1b941cd1a2 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -125,28 +125,6 @@ - !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 c1fda0f87a..a2d2397dcd 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -38,11 +38,3 @@ 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 aec889fa4b..44f13faac1 100644 --- a/Resources/Prototypes/Reagents/Materials/ores.yml +++ b/Resources/Prototypes/Reagents/Materials/ores.yml @@ -95,12 +95,3 @@ 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 9f2c843be2..77ca2c5b87 100644 --- a/Resources/Prototypes/Recipes/Lathes/hardsuits.yml +++ b/Resources/Prototypes/Recipes/Lathes/hardsuits.yml @@ -11,7 +11,7 @@ category: Tacsuits completetime: 60 materials: - Tungsten: 300 + Plasteel: 3000 Durathread: 300 ReinforcedGlass: 1000 Uranium: 100 @@ -24,7 +24,7 @@ category: Tacsuits completetime: 60 materials: - Tungsten: 300 + Plasteel: 3000 Durathread: 300 ReinforcedGlass: 1000 Uranium: 100 @@ -38,7 +38,7 @@ category: Tacsuits completetime: 90 materials: - Tungsten: 350 + Plasteel: 3500 ReinforcedGlass: 1250 Durathread: 500 Plastic: 500 @@ -54,7 +54,7 @@ category: Tacsuits completetime: 120 materials: - Tungsten: 500 + Plasteel: 5000 WebSilk: 3000 ReinforcedGlass: 1500 Plastic: 1000 @@ -68,7 +68,7 @@ category: Tacsuits completetime: 180 materials: - Tungsten: 800 + Plasteel: 8000 WebSilk: 3000 ReinforcedGlass: 1500 Plastic: 1500 @@ -82,7 +82,7 @@ category: Tacsuits completetime: 120 materials: - Tungsten: 1000 + Plasteel: 10000 WebSilk: 3000 ReinforcedPlasmaGlass: 1500 Plastic: 1500 @@ -97,7 +97,7 @@ category: Tacsuits completetime: 300 materials: # GOOD LUCK. - Tungsten: 3000 + Plasteel: 30000 ReinforcedPlasmaGlass: 4500 WebSilk: 3500 Plastic: 3000 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index a7359f185e..cf3fc3f155 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -1028,36 +1028,3 @@ 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 7088b84cae..3f2c8f11c2 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -285,14 +285,3 @@ 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 fbeab5d0e1..5d286bd2e2 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -192,6 +192,7 @@ - ClothingOuterHardsuitShanlinUnpainted - ClothingOuterHardsuitShiweiUnpainted - ClothingOuterHardsuitJuggernautReverseEngineered + #- ClothingOuterHardsuitCybersunEliteUnpainted # IOU technologyPrerequisites: - AdvancedTacsuits softCapContribution: 1.5 @@ -212,7 +213,6 @@ - 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. - - EnergySwordDouble - - EnergyCutlass + #- 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. :) softCapContribution: 1.5 diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml index e84716ebca..956523c92b 100644 --- a/Resources/Prototypes/Stacks/Materials/ingots.yml +++ b/Resources/Prototypes/Stacks/Materials/ingots.yml @@ -13,11 +13,3 @@ 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 92ce2f60b4..cf01903aca 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,11 +91,3 @@ 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 deleted file mode 100644 index b5087d710b..0000000000 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml +++ /dev/null @@ -1,60 +0,0 @@ -# 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 deleted file mode 100644 index a7dc6f2cee..0000000000 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml +++ /dev/null @@ -1,151 +0,0 @@ -#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 deleted file mode 100644 index f98aa7981c..0000000000 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml +++ /dev/null @@ -1,124 +0,0 @@ -- 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 deleted file mode 100644 index 773471351f..0000000000 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ /dev/null @@ -1,34 +0,0 @@ -- 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 deleted file mode 100644 index a1071523ee..0000000000 --- a/Resources/Prototypes/_Nuclear14/Reagents/ores.yml +++ /dev/null @@ -1,32 +0,0 @@ -- 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 deleted file mode 100644 index d771ec11c5..0000000000 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml +++ /dev/null @@ -1,35 +0,0 @@ -- 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 deleted file mode 100644 index 31d32eee22..0000000000 --- a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml +++ /dev/null @@ -1,63 +0,0 @@ -- 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 deleted file mode 100644 index d260ae1122..0000000000 --- a/Resources/Prototypes/_Nuclear14/ore.yml +++ /dev/null @@ -1,17 +0,0 @@ -- 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 e2ebfb2e26..8845e993ac 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -64,12 +64,6 @@ minOreYield: 1 maxOreYield: 2 -- type: ore - id: OreTungsten - oreEntity: TungstenOre1 - minOreYield: 1 - maxOreYield: 2 - - type: ore id: OreQuartzCrab oreEntity: MobSpawnCrabQuartz @@ -118,28 +112,6 @@ 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 1cf09d8328..05b9647ea1 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, Tungsten by tresguys(Discord)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -117,15 +117,6 @@ { "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 deleted file mode 100644 index 5d60315af0..0000000000 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_2.png deleted file mode 100644 index 303caa93f8..0000000000 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_3.png deleted file mode 100644 index a0dfaf69f6..0000000000 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/tungsten_3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json index 231372f6cb..597fa0499f 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, tungsten by tresguys(Discord)", + "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", "size": { "x": 32, "y": 32 @@ -42,9 +42,6 @@ }, { "name": "diamond" - }, - { - "name": "tungsten" } ] } diff --git a/Resources/Textures/Objects/Materials/ore.rsi/tungsten.png b/Resources/Textures/Objects/Materials/ore.rsi/tungsten.png deleted file mode 100644 index cbc3d425d0..0000000000 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/tungsten.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/aluminium.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/aluminium.png deleted file mode 100644 index 46ee7111df..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/aluminium.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire.png deleted file mode 100644 index 06b26e46af..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire.png and /dev/null 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 deleted file mode 100644 index 853ab0fe4c..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_2.png and /dev/null 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 deleted file mode 100644 index 2cc5c318b7..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bluewire_3.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/brass.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/brass.png deleted file mode 100644 index 1e767c6499..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/brass.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bullets.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bullets.png deleted file mode 100644 index 69b2076ae7..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/bullets.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/casings.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/casings.png deleted file mode 100644 index 87ee642a94..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/casings.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic.png deleted file mode 100644 index e4aa87e47a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic.png and /dev/null 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 deleted file mode 100644 index 97981c7003..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_2.png and /dev/null 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 deleted file mode 100644 index 97981c7003..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ceramic_3.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits.png deleted file mode 100644 index 9070df4019..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits.png and /dev/null 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 deleted file mode 100644 index 9f3d17790d..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_2.png and /dev/null 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 deleted file mode 100644 index 51277023eb..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/circuits_3.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/cloth.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/cloth.png deleted file mode 100644 index d08d7937a0..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/cloth.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/coal.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/coal.png deleted file mode 100644 index 993bfcf45b..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/coal.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/copper.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/copper.png deleted file mode 100644 index c315148f6f..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/copper.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood.png deleted file mode 100644 index dfa26bc93d..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood.png and /dev/null 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 deleted file mode 100644 index 201fbf4e5d..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_2.png and /dev/null 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 deleted file mode 100644 index 8e90063d72..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/firewood_3.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/gold.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/gold.png deleted file mode 100644 index 46050f982f..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/gold.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire.png deleted file mode 100644 index d6c59e80c0..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire.png and /dev/null 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 deleted file mode 100644 index 172f7960d9..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_2.png and /dev/null 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 deleted file mode 100644 index 5a619f919e..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/greenwire_3.png and /dev/null 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 deleted file mode 100644 index c7e3b2b094..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_aluminum.png and /dev/null 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 deleted file mode 100644 index 831b40d8db..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_brass.png and /dev/null 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 deleted file mode 100644 index 4a2b4fa949..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_copper.png and /dev/null 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 deleted file mode 100644 index cbcdcd7c9a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_gold.png and /dev/null 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 deleted file mode 100644 index 2807c0d34f..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_iron.png and /dev/null 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 deleted file mode 100644 index c6329ba249..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_lead.png and /dev/null 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 deleted file mode 100644 index f7f4fb2d8e..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/ingot_silver.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/iron.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/iron.png deleted file mode 100644 index d989b64779..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/iron.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/lead.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/lead.png deleted file mode 100644 index b99101a0ff..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/lead.png and /dev/null 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 deleted file mode 100644 index 40a89d1c10..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png and /dev/null 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 deleted file mode 100644 index 53d4bc1a60..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png and /dev/null 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 deleted file mode 100644 index 7dbeb76c0b..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/log.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/log.png deleted file mode 100644 index 72da2645a4..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/log.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json deleted file mode 100644 index 836d7a30af..0000000000 --- a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/meta.json +++ /dev/null @@ -1,275 +0,0 @@ -{ - "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 deleted file mode 100644 index b121231a8d..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/militaryfiber.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail.png deleted file mode 100644 index 83055814cf..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail.png and /dev/null 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 deleted file mode 100644 index ca5075ec2c..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_2.png and /dev/null 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 deleted file mode 100644 index e0cb966963..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_3.png and /dev/null 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 deleted file mode 100644 index 6b90fce17f..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/nail_4.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank.png deleted file mode 100644 index 7885a50a65..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank.png and /dev/null 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 deleted file mode 100644 index 5faf4a4ff5..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_2.png and /dev/null 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 deleted file mode 100644 index 7d01697b00..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plank_3.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plastic.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plastic.png deleted file mode 100644 index d5622e16d5..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/plastic.png and /dev/null 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 deleted file mode 100644 index 513ac16448..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_aluminum.png and /dev/null 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 deleted file mode 100644 index 67d4ef8248..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_brass.png and /dev/null 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 deleted file mode 100644 index 0b72f7ed27..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_copper.png and /dev/null 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 deleted file mode 100644 index a35d8ffe25..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_gold.png and /dev/null 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 deleted file mode 100644 index 30004de5a8..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_lead.png and /dev/null 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 deleted file mode 100644 index 20cda8dea1..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_silver.png and /dev/null 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 deleted file mode 100644 index 277dd5c99d..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/powder_steel.png and /dev/null 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 deleted file mode 100644 index 51eda91ecc..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png and /dev/null 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 deleted file mode 100644 index 806f5217c4..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire.png deleted file mode 100644 index b5af3153ef..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire.png and /dev/null 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 deleted file mode 100644 index c63fa6a41d..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_2.png and /dev/null 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 deleted file mode 100644 index c41e0d2ace..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/redwire_3.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/rubber.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/rubber.png deleted file mode 100644 index bde3f0a69f..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap.png deleted file mode 100644 index 3eb4f2258b..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap.png and /dev/null 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 deleted file mode 100644 index 48ab8350b3..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_2.png and /dev/null 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 deleted file mode 100644 index f407fa257a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_3.png and /dev/null 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 deleted file mode 100644 index 40105e09fa..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_aluminum.png and /dev/null 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 deleted file mode 100644 index 381bdc0847..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_brass.png and /dev/null 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 deleted file mode 100644 index 8a950f73d4..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_clockwork.png and /dev/null 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 deleted file mode 100644 index 1fa14a349a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_copper.png and /dev/null 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 deleted file mode 100644 index db8fe44508..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic.png and /dev/null 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 deleted file mode 100644 index c550c5ab01..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_2.png and /dev/null 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 deleted file mode 100644 index c550c5ab01..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_electronic_3.png and /dev/null 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 deleted file mode 100644 index 6ad4064c97..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass.png and /dev/null 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 deleted file mode 100644 index 6a4c6463bc..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_2.png and /dev/null 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 deleted file mode 100644 index 6a4c6463bc..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_glass_3.png and /dev/null 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 deleted file mode 100644 index 25fbd65a0a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_gold.png and /dev/null 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 deleted file mode 100644 index 6eb4ea7e8a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_lead.png and /dev/null 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 deleted file mode 100644 index fab94a466f..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts.png and /dev/null 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 deleted file mode 100644 index 99e1275d8a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_2.png and /dev/null 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 deleted file mode 100644 index 99e1275d8a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_parts_3.png and /dev/null 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 deleted file mode 100644 index 2588a7b481..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_silver.png and /dev/null 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 deleted file mode 100644 index be46022258..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel.png and /dev/null 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 deleted file mode 100644 index 853031769a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_2.png and /dev/null 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 deleted file mode 100644 index 853031769a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_steel_3.png and /dev/null 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 deleted file mode 100644 index d6fe3a429a..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/scrap_wood.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/silver.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/silver.png deleted file mode 100644 index 6704406da4..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/silver.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/sulfur.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/sulfur.png deleted file mode 100644 index 726532deb4..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/sulfur.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/thread.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/thread.png deleted file mode 100644 index 2c11b34b04..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/thread.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/uranium.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/uranium.png deleted file mode 100644 index da2162b3eb..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/uranium.png and /dev/null differ diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire.png deleted file mode 100644 index 3e0db1c24b..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire.png and /dev/null 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 deleted file mode 100644 index acc6ba0771..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_2.png and /dev/null 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 deleted file mode 100644 index 72856cda53..0000000000 Binary files a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/yellowwire_3.png and /dev/null differ