diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index 5fd0406037..6d73b68403 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -57,7 +57,7 @@ namespace Content.Shared.GameObjects.Components public override void ExposeData(ObjectSerializer serializer) { - serializer.DataFieldCached(ref _maxCount, "max", 50); + serializer.DataFieldCached(ref _maxCount, "max", 30); serializer.DataFieldCached(ref _count, "count", MaxCount); if (serializer.Writing) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index c76feca824..edc90b9efd 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -12466,7 +12466,7 @@ entities: - parent: 1044 type: Transform - uid: 876 - type: GlassSheet1 + type: SheetGlass1 components: - parent: 1044 type: Transform @@ -13747,8 +13747,8 @@ entities: - Ointment - LightTube - LightBulb - - MetalStack - - GlassStack + - SheetSteel + - SheetGlass type: ProtolatheDatabase - containers: machine_board: @@ -13777,8 +13777,8 @@ entities: - Ointment - LightTube - LightBulb - - MetalStack - - GlassStack + - SheetSteel + - SheetGlass type: LatheDatabase - containers: machine_board: @@ -21277,7 +21277,7 @@ entities: rot: 3.141592697301183 rad type: Transform - uid: 1937 - type: GoldStack + type: IngotGold components: - parent: 853 pos: -2.615473,16.701466 @@ -35551,7 +35551,7 @@ entities: type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 3927 - type: MetalStack + type: SheetSteel components: - parent: 853 pos: 47.585052,4.443361 @@ -35614,21 +35614,21 @@ entities: rot: 4.371139006309477E-08 rad type: Transform - uid: 3936 - type: GlassStack + type: SheetGlass components: - parent: 853 pos: 49.131927,4.677736 rot: 4.371139006309477E-08 rad type: Transform - uid: 3937 - type: GlassStack + type: SheetGlass components: - parent: 853 pos: 48.788177,4.505861 rot: 4.371139006309477E-08 rad type: Transform - uid: 3938 - type: MetalStack + type: SheetSteel components: - parent: 853 pos: 48.038177,4.677736 diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index d666245826..a0d00475b2 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -60,10 +60,10 @@ components: - type: StorageFill contents: - - name: GoldStack + - name: IngotGold amount: 5 - name: DrinkGoldenCup prob: 0.05 orGroup: CupOrGold - - name: GoldStack + - name: IngotGold orGroup: CupOrGold diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml index 5e592679ce..e4c5198bf9 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml @@ -5,7 +5,7 @@ components: - type: StorageFill contents: - - name: GlassStack + - name: SheetGlass amount: 1 - type: entity @@ -15,7 +15,7 @@ components: - type: StorageFill contents: - - name: MetalStack + - name: SheetSteel amount: 1 - type: entity @@ -25,8 +25,8 @@ components: - type: StorageFill contents: - - name: WoodPlank - amount: 15 + - name: MaterialWoodPlank + amount: 1 - type: entity id: CrateMaterialsFuelTank @@ -68,24 +68,22 @@ # - name: WaterTankFull # amount: 1 -# Unimplemented Materials +- type: entity + id: CrateMaterialsPlastic + name: plastics crate + parent: CrateGenericonimo + components: + - type: StorageFill + contents: + - name: SheetPlastic + amount: 1 -#- type: entity -# id: CrateMaterialsPlastic -# name: plastics crate -# parent: CrateGenericonimo -# components: -# - type: StorageFill -# contents: -# - name: PlasticStack -# amount: 1 - -#- type: entity -# id: CrateMaterialsPlasteel -# name: plasteel crate -# parent: CrateGenericonimo -# components: -# - type: StorageFill -# contents: -# - name: PlasteelStack -# amount: 1 +- type: entity + id: CrateMaterialsPlasteel + name: plasteel crate + parent: CrateGenericonimo + components: + - type: StorageFill + contents: + - name: SheetPlasteel + amount: 1 diff --git a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml index b2bc1ee6f7..40ea4d365e 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml @@ -1,5 +1,5 @@ - type: latheRecipe - id: MetalStack + id: SheetSteel icon: sprite: Objects/Materials/sheets.rsi state: metal diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index c80b3fd010..5d25606523 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -149,14 +149,12 @@ name: material sheet printing id: Sheets description: Print those sheets! - icon: - sprite: Objects/Materials/sheets.rsi - state: researchicon + icon: Objects/Materials/Sheets/researchicon.png requiredPoints: 250 requiredTechnologies: - IndustrialEngineering unlockedRecipes: - - MetalStack + - SheetSteel - GlassStack # Electromagnetic Theory Technology Tree diff --git a/Resources/Prototypes/Catalog/VendingMachines/hats.yml b/Resources/Prototypes/Catalog/VendingMachines/hats.yml index 4b3594640a..3daca32b71 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/hats.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/hats.yml @@ -10,7 +10,6 @@ HatBandGreen: 3 HatBandRed: 3 HatBandSkull: 3 - ClothingHeadHatBearpelt: 3 ClothingHeadHatBeret: 3 ClothingHeadHatBluesoft: 3 ClothingHeadHatBluesoftFlipped: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 04590a0e93..e43ae9ffc5 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -1,14 +1,3 @@ -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatBearpelt - name: bear pelt - description: It's a cute bear pelt. - components: - - type: Sprite - sprite: Clothing/Head/Misc/bearpelt.rsi - - type: Clothing - sprite: Clothing/Head/Misc/bearpelt.rsi - - type: entity parent: ClothingHeadBase id: ClothingHeadHatBunny diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml index 774d9252dd..658e652990 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml @@ -31,7 +31,7 @@ sound: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: - WoodPlank: + MaterialWoodPlank: min: 1 max: 1 - !type:DoActsBehavior diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml index 62750b1bcc..3bc3a1c2b7 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml @@ -258,7 +258,7 @@ sound: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: - WoodPlank: + MaterialWoodPlank: min: 1 max: 1 - !type:DoActsBehavior @@ -289,7 +289,7 @@ sound: /Audio/Effects/woodhit.ogg - !type:SpawnEntitiesBehavior spawn: - WoodPlank: + MaterialWoodPlank: min: 1 max: 1 - !type:DoActsBehavior diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index 55f9940020..ff1f14657a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -80,7 +80,7 @@ - Ointment - LightTube - LightBulb - - MetalStack + - SheetSteel - GlassStack - Wirecutter - Screwdriver @@ -145,7 +145,7 @@ - Ointment - LightTube - LightBulb - - MetalStack + - SheetSteel - GlassStack - Wirecutter - Screwdriver diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml new file mode 100644 index 0000000000..ad7fa7389e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -0,0 +1,213 @@ +- type: entity + id: SheetGlassBase + abstract: true + parent: BaseItem + description: A sheet of glass, used often on the station in various applications. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/Sheets/glass.rsi + - type: Item + sprite: Objects/Materials/Sheets/glass.rsi + - type: ItemStatus + - type: Tag + tags: + - Sheet + +- type: entity + name: glass + id: SheetGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: glass + - type: Stack + stackType: Glass + - type: Sprite + state: glass_3 + - type: Item + HeldPrefix: glass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - glass + - glass_2 + - glass_3 + +- type: entity + id: SheetGlass1 + name: glass + parent: SheetGlass + components: + - type: Sprite + state: glass + - type: Stack + count: 1 + +- type: entity + name: reinforced glass + id: SheetRGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: rglass + - type: Stack + stackType: ReinforcedGlass + - type: Sprite + state: rglass_3 + - type: Item + HeldPrefix: rglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - rglass + - rglass_2 + - rglass_3 + +- type: entity + id: SheetRGlass1 + name: reinforced glass + parent: SheetRGlass + components: + - type: Sprite + state: rglass + - type: Stack + count: 1 + +- type: entity + name: plasma glass + id: SheetPGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: pglass + - type: Stack + stackType: PlasmaGlass + - type: Sprite + state: pglass_3 + - type: Item + HeldPrefix: pglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - pglass + - pglass_2 + - pglass_3 + +- type: entity + id: SheetPGlass1 + name: plasma glass + parent: SheetPGlass + components: + - type: Sprite + state: pglass + - type: Stack + count: 1 + +- type: entity + name: reinforced plasma glass + id: SheetRPGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: rpglass + - type: Stack + stackType: ReinforcedPlasmaGlass + - type: Sprite + state: rpglass_3 + - type: Item + HeldPrefix: rpglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - rpglass + - rpglass_2 + - rpglass_3 + +- type: entity + id: SheetRPGlass1 + name: reinforced plasma glass + parent: SheetPGlass + components: + - type: Sprite + state: rpglass + - type: Stack + count: 1 + +- type: entity + name: titanium glass + id: SheetTitaniumGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: titaniumglass + - type: Stack + stackType: TitaniumGlass + - type: Sprite + state: titaniumglass_3 + - type: Item + HeldPrefix: titaniumglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - titaniumglass + - titaniumglass_2 + - titaniumglass_3 + +- type: entity + id: SheetTitaniumGlass1 + name: titanium glass + parent: SheetTitaniumGlass + components: + - type: Sprite + state: titaniumglass + - type: Stack + count: 1 + +- type: entity + name: plastitanium glass + id: SheetPlastitaniumGlass + parent: SheetGlassBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plastitaniumglass + - type: Stack + stackType: PlastitaniumGlass + - type: Sprite + state: plastitaniumglass_3 + - type: Item + HeldPrefix: plastitaniumglass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plastitaniumglass + - plastitaniumglass_2 + - plastitaniumglass_3 + +- type: entity + id: SheetPlastitaniumGlass1 + name: plastitanium glass + parent: SheetPlastitaniumGlass + components: + - type: Sprite + state: plastitaniumglass + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml new file mode 100644 index 0000000000..888fc2b6c5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -0,0 +1,180 @@ +- type: entity + id: SheetMetalBase + abstract: true + parent: BaseItem + description: A sheet of metal, used often on the station in various applications. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/Sheets/metal.rsi + - type: Item + sprite: Objects/Materials/Sheets/metal.rsi + - type: ItemStatus + - type: Tag + tags: + - Sheet + +- type: entity + name: steel + id: SheetSteel + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: steel + - type: Stack + stackType: Steel + - type: Sprite + state: steel_3 + - type: Item + HeldPrefix: steel + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - steel + - steel_2 + - steel_3 + +- type: entity + id: SheetSteel1 + name: steel + parent: SheetSteel + components: + - type: Sprite + state: steel + - type: Stack + count: 1 + +- type: entity + name: plasteel + id: SheetPlasteel + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plasteel + - type: Stack + stackType: Plasteel + - type: Sprite + state: plasteel_3 + - type: Item + HeldPrefix: plasteel + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plasteel + - plasteel_2 + - plasteel_3 + +- type: entity + id: SheetPlasteel1 + name: plasteel + parent: SheetPlasteel + components: + - type: Sprite + state: plasteel + - type: Stack + count: 1 + +- type: entity + name: titanium + id: SheetTitanium + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: titanium + - type: Stack + stackType: Titanium + - type: Sprite + state: titanium_3 + - type: Item + HeldPrefix: titanium + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - titanium + - titanium_2 + - titanium_3 + +- type: entity + id: SheetTitanium1 + name: titanium + parent: SheetTitanium + components: + - type: Sprite + state: titanium + - type: Stack + count: 1 + +- type: entity + name: plastitanium + id: SheetPlastitanium + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plastitanium + - type: Stack + stackType: Plastitanium + - type: Sprite + state: plastitanium_3 + - type: Item + HeldPrefix: plastitanium + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plastitanium + - plastitanium_2 + - plastitanium_3 + +- type: entity + id: SheetPlastitanium1 + name: plastitanium + parent: SheetPlastitanium + components: + - type: Sprite + state: plastitanium + - type: Stack + count: 1 + +- type: entity + name: brass + id: SheetBrass + parent: SheetMetalBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: brass + - type: Stack + stackType: Brass + - type: Sprite + state: brass_3 + - type: Item + HeldPrefix: brass + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - brass + - brass_2 + - brass_3 + +- type: entity + id: SheetBrass1 + name: brass + parent: SheetBrass + components: + - type: Sprite + state: brass + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml new file mode 100644 index 0000000000..e7fd072cac --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -0,0 +1,156 @@ +- type: entity + id: SheetOtherBase + abstract: true + parent: BaseItem + description: A sheet of material, used often on the station in various applications. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/Sheets/other.rsi + - type: Item + sprite: Objects/Materials/Sheets/other.rsi + - type: ItemStatus + - type: Tag + tags: + - Sheet + +- type: entity + name: paper + id: SheetPaper + parent: SheetOtherBase + components: + - type: Stack + stackType: Paper + - type: Sprite + state: paper_3 + - type: Item + HeldPrefix: paper + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - paper + - paper_2 + - paper_3 + +- type: entity + id: SheetPaper1 + name: paper + parent: SheetPaper + components: + - type: Sprite + state: paper + - type: Stack + count: 1 + +- type: entity + name: phoron + id: SheetPhoron + parent: SheetOtherBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: phoron + - type: Stack + stackType: Phoron + - type: Sprite + state: phoron + - type: Item + HeldPrefix: phoron + +- type: entity + id: SheetPhoron1 + name: phoron + parent: SheetPhoron + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: plasma + id: SheetPlasma + parent: SheetOtherBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plasma + - type: Stack + stackType: Plasma + - type: Sprite + state: plasma_3 + - type: Item + HeldPrefix: plasma + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plasma + - plasma_2 + - plasma_3 + +- type: entity + id: SheetPlasma1 + name: plasma + parent: SheetPlasma + components: + - type: Sprite + state: plasma + - type: Stack + count: 1 + +- type: entity + name: plastic + id: SheetPlastic + parent: SheetOtherBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: plastic + - type: Stack + stackType: Plastic + - type: Sprite + state: plastic_3 + - type: Item + HeldPrefix: plastic + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - plastic + - plastic_2 + - plastic_3 + +- type: entity + id: SheetPlastic1 + name: plastic + parent: SheetPlastic + components: + - type: Sprite + state: plastic + - type: Stack + count: 1 + +- type: entity + name: uranium + id: SheetUranium + parent: SheetOtherBase + components: + - type: Stack + stackType: Uranium + - type: Sprite + state: uranium + - type: Item + HeldPrefix: uranium + +- type: entity + id: SheetUranium1 + name: uranium + parent: SheetUranium + suffix: 1 + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml new file mode 100644 index 0000000000..c1945e8a15 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml @@ -0,0 +1,213 @@ +- type: entity + id: IngotBase + abstract: true + parent: BaseItem + description: A heavy metal ingot stamped with the Nanotransen logo. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/ingots.rsi + - type: Item + sprite: Objects/Materials/ingots.rsi + - type: ItemStatus + - type: Tag + tags: + - Ingot + +- type: entity + name: adamantine bar + id: IngotAdamantine + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: adamantine + - type: Stack + stackType: Adamantine + - type: Sprite + state: adamantine_3 + - type: Item + HeldPrefix: adamantine + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - adamantine + - adamantine_2 + - adamantine_3 + +- type: entity + id: IngotAdamantine1 + name: adamantine bar + parent: IngotAdamantine + components: + - type: Sprite + state: adamantine + - type: Stack + count: 1 + +- type: entity + name: copper bar + id: IngotCopper + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: copper + - type: Stack + stackType: Copper + - type: Sprite + state: copper_3 + - type: Item + HeldPrefix: copper + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - copper + - copper_2 + - copper_3 + +- type: entity + id: IngotCopper1 + name: copper bar + parent: IngotCopper + components: + - type: Sprite + state: copper + - type: Stack + count: 1 + +- type: entity + name: gold bar + id: IngotGold + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: gold + - type: Stack + stackType: Gold + - type: Sprite + state: gold_3 + - type: Item + HeldPrefix: gold + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - gold + - gold_2 + - gold_3 + +- type: entity + id: IngotGold1 + name: gold bar + parent: IngotGold + components: + - type: Sprite + state: gold + - type: Stack + count: 1 + +- type: entity + name: hydrogen bar + id: IngotHydrogen + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: hydrogen + - type: Stack + stackType: Hydrogen + - type: Sprite + state: hydrogen_3 + - type: Item + HeldPrefix: hydrogen + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - hydrogen + - hydrogen_2 + - hydrogen_3 + +- type: entity + id: IngotHydrogen1 + name: hydrogen bar + parent: IngotHydrogen + components: + - type: Sprite + state: hydrogen + - type: Stack + count: 1 + +- type: entity + name: iron bar + id: IngotIron + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: iron + - type: Stack + stackType: Iron + - type: Sprite + state: iron_3 + - type: Item + HeldPrefix: iron + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - iron + - iron_2 + - iron_3 + +- type: entity + id: IngotIron1 + name: iron bar + parent: IngotIron + components: + - type: Sprite + state: iron + - type: Stack + count: 1 + +- type: entity + name: silver bar + id: IngotSilver + parent: IngotBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: silver + - type: Stack + stackType: Silver + - type: Sprite + state: silver_3 + - type: Item + HeldPrefix: silver + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - silver + - silver_2 + - silver_3 + +- type: entity + id: IngotSilver1 + name: silver bar + parent: IngotSilver + components: + - type: Sprite + state: silver + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml new file mode 100644 index 0000000000..5b9cfc52e9 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -0,0 +1,277 @@ +- type: entity + id: MaterialBase + abstract: true + parent: BaseItem + description: A raw material. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/materials.rsi + - type: Item + sprite: Objects/Materials/materials.rsi + - type: ItemStatus + +- type: entity + name: bananium + id: MaterialBananium + parent: MaterialBase + components: + - type: Stack + stackType: Bananium + - type: Sprite + state: bananium + +- type: entity + id: MaterialBananium1 + parent: MaterialBananium + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: cloth + id: MaterialCloth + parent: MaterialBase + components: + - type: Stack + stackType: Cloth + - type: Sprite + state: cloth_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - cloth + - cloth_2 + - cloth_3 + +- type: entity + id: MaterialCloth1 + parent: MaterialCloth + components: + - type: Sprite + state: cloth + - type: Stack + count: 1 + +- type: entity + name: cotton + id: MaterialCotton + parent: MaterialBase + components: + - type: Stack + stackType: Cotton + - type: Sprite + state: cotton_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - cotton + - cotton_2 + - cotton_3 + +- type: entity + id: MaterialCotton1 + parent: MaterialCotton + components: + - type: Sprite + state: cotton + - type: Stack + count: 1 + +- type: entity + name: refined diamond + id: MaterialDiamond + parent: MaterialBase + components: + - type: Stack + stackType: Diamond + - type: Sprite + state: diamond + - type: Item + HeldPrefix: diamond + +- type: entity + id: MaterialDiamond1 + parent: MaterialDiamond + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: durathread + id: MaterialDurathread + parent: MaterialBase + components: + - type: Stack + stackType: Durathread + - type: Sprite + state: durathread_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - durathread + - durathread_2 + - durathread_3 + +- type: entity + id: MaterialDurathread1 + parent: MaterialDurathread + components: + - type: Sprite + state: durathread + - type: Stack + count: 1 + +- type: entity + name: raw durathread + id: MaterialDurathreadRaw + parent: MaterialBase + components: + - type: Stack + stackType: RawDurathread + - type: Sprite + state: durathreadraw_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - durathreadraw + - durathreadraw_2 + - durathreadraw_3 + +- type: entity + id: MaterialDurathreadRaw1 + parent: MaterialDurathreadRaw + components: + - type: Sprite + state: durathreadraw + - type: Stack + count: 1 + +- type: entity + name: hide + id: MaterialHide + parent: MaterialBase + components: + - type: Stack + stackType: Hide + - type: Sprite + state: hide_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - hide + - hide_2 + - hide_3 + +- type: entity + id: MaterialHide1 + parent: MaterialHide + components: + - type: Sprite + state: hide + - type: Stack + count: 1 + +- type: entity + name: leather + id: MaterialLeather + parent: MaterialBase + components: + - type: Stack + stackType: Leather + - type: Sprite + state: leather_3 + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - leather + - leather_2 + - leather_3 + +- type: entity + id: MaterialLeather1 + parent: MaterialLeather + components: + - type: Sprite + state: leather + - type: Stack + count: 1 + +- type: entity + name: wood + id: MaterialWoodPlank + parent: MaterialBase + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: wood + - type: Stack + stackType: WoodPlank + - type: Sprite + state: wood + - type: Item + HeldPrefix: wood + +- type: entity + id: MaterialWoodPlank1 + parent: MaterialWoodPlank + suffix: 1 + components: + - type: Stack + count: 1 + +# Specific Hides + +- type: entity + name: bear hide + id: MaterialHideBear + parent: MaterialBase + components: + - type: Sprite + sprite: Objects/Materials/materials.rsi + state: bearpelt + - type: Clothing + sprite: Clothing/Head/Misc/hides.rsi + HeldPrefix: bear + ClothingPrefix: bear + Slots: + - Helmet + +- type: entity + name: cat hide + id: MaterialHideCat + parent: MaterialBase + components: + - type: Sprite + sprite: Objects/Materials/materials.rsi + state: cathide + # - type: Clothing + # sprite: Clothing/Head/Misc/hides.rsi + # HeldPrefix: cat + # ClothingPrefix: cat + # Slots: + # - Helmet + +- type: entity + name: corgi hide + id: MaterialHideCorgi + parent: MaterialBase + components: + - type: Sprite + sprite: Objects/Materials/materials.rsi + state: corgihide + - type: Clothing + sprite: Clothing/Head/Misc/hides.rsi + # HeldPrefix: corgi + ClothingPrefix: corgi2 + Slots: + - Helmet diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml new file mode 100644 index 0000000000..f5e7173ce3 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml @@ -0,0 +1,267 @@ +- type: entity + id: OreBase + abstract: true + parent: BaseItem + description: A piece of unrefined ore. + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/ore.rsi + - type: Item + sprite: Objects/Materials/ore.rsi + - type: ItemStatus + - type: Tag + tags: + - Ore + +- type: entity + name: adamantine ore + id: AdamantineOre + parent: OreBase + components: + - type: Stack + stackType: AdamantineOre + - type: Sprite + state: adamantine + +- type: entity + id: AdamantineOre1 + parent: AdamantineOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: ammonia + id: Ammonia + parent: OreBase + components: + - type: Stack + stackType: Ammonia + - type: Sprite + state: ammonia + +- type: entity + id: Ammonia1 + parent: Ammonia + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: bananium ore + id: BananiumOre + parent: OreBase + components: + - type: Stack + stackType: BananiumOre + - type: Sprite + state: bananium + +- type: entity + id: BananiumOre1 + parent: BananiumOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: raw diamond + id: DiamondRaw + parent: OreBase + components: + - type: Stack + stackType: DiamondOre + - type: Sprite + state: diamond + +- type: entity + id: DiamondRaw1 + parent: DiamondRaw + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: gold ore + id: GoldOre + parent: OreBase + components: + - type: Stack + stackType: GoldOre + - type: Sprite + state: gold + +- type: entity + id: GoldOre1 + parent: GoldOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: iron ore + id: IronOre + parent: OreBase + components: + - type: Stack + stackType: IronOre + - type: Sprite + state: iron + +- type: entity + id: IronOre1 + parent: IronOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: phoron ore + id: PhoronOre + parent: OreBase + components: + - type: Stack + stackType: PhoronOre + - type: Sprite + state: phoron + +- type: entity + id: PhoronOre1 + parent: PhoronOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: plasma ore + id: PlasmaOre + parent: OreBase + components: + - type: Stack + stackType: PlasmaOre + - type: Sprite + state: plasma + +- type: entity + id: PlasmaOre1 + parent: PlasmaOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: sand + id: Sand + parent: OreBase + components: + - type: Stack + stackType: Sand + - type: Sprite + state: sand + +- type: entity + id: Sand1 + parent: Sand + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: black sand + id: SandBlack + parent: OreBase + components: + - type: Stack + stackType: BlackSand + - type: Sprite + state: sand_black + +- type: entity + id: SandBlack1 + parent: SandBlack + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: silver ore + id: SilverOre + parent: OreBase + components: + - type: Stack + stackType: SilverOre + - type: Sprite + state: silver + +- type: entity + id: SilverOre1 + parent: SilverOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: slag + id: Slag + parent: OreBase + components: + - type: Stack + stackType: Slag + - type: Sprite + state: slag + +- type: entity + id: Slag1 + parent: Slag + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: titanium ore + id: TitaniumOre + parent: OreBase + components: + - type: Stack + stackType: TitaniumOre + - type: Sprite + state: titanium + +- type: entity + id: TitaniumOre1 + parent: TitaniumOre + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + name: uranium ore + id: UraniumOre + parent: OreBase + components: + - type: Stack + stackType: UraniumOre + - type: Sprite + state: uranium + +- type: entity + id: UraniumOre1 + parent: UraniumOre + suffix: 1 + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml new file mode 100644 index 0000000000..0a863e9e87 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml @@ -0,0 +1,47 @@ +- type: entity + id: PartBase + abstract: true + parent: BaseItem + description: + components: + - type: Sprite + netsync: false + sprite: Objects/Materials/parts.rsi + state: rods + - type: Item + sprite: Objects/Materials/parts.rsi + - type: ItemStatus + +- type: entity + name: metals rods + id: PartRodMetal + parent: PartBase + components: + - type: Stack + stackType: MetalRod + - type: Sprite + state: rods_5 +# - type: Item +# HeldPrefix: rods + - type: Construction + graph: metalRod + node: MetalRod + - type: Appearance + visuals: + - type: StackVisualizer + stackLayers: + - rods + - rods_2 + - rods_3 + - rods_4 + - rods_5 + +- type: entity + id: PartRodMetal1 + name: metal rod + parent: PartRodMetal + components: + - type: Sprite + state: rods + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml similarity index 98% rename from Resources/Prototypes/Entities/Objects/shards.yml rename to Resources/Prototypes/Entities/Objects/Materials/shards.yml index 948774211a..58eb23a8cd 100644 --- a/Resources/Prototypes/Entities/Objects/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -49,7 +49,7 @@ - type: WelderRefinable refineResult: - GlassStack - - MetalStack + - SheetSteel - type: DamageOtherOnHit amount: 10 diff --git a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml b/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml deleted file mode 100644 index 2f79d67d37..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml +++ /dev/null @@ -1,262 +0,0 @@ -- type: entity - name: material stack - id: MaterialStack - abstract: true - parent: BaseItem - components: - - type: Stack - - type: Material - - type: ItemStatus - -- type: entity - name: steel sheet - id: MetalStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: steel - - type: Stack - stackType: Steel - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: metal - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: metal - - type: FloorTile - outputs: - - underplating - -- type: entity - id: SteelSheet1 - name: steel sheet - parent: MetalStack - suffix: 1 - components: - - type: Stack - stackType: Steel - count: 1 - -- type: entity - name: glass sheet - id: GlassStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: glass - - type: Stack - stackType: Glass - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: glass - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: glass - -- type: entity - id: GlassSheet1 - name: glass sheet - parent: GlassStack - suffix: 1 - components: - - type: Stack - stackType: Glass - count: 1 - -- type: entity - name: Reinforced Glass - parent: MaterialStack - id: rglass - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: rglass - - type: Stack - stackType: ReinforcedGlass - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: rglass - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: rglass - -- type: entity - name: Reinforced Glass sheet - id: RGlassSheet1 - parent: rglass - suffix: 1 - components: - - type: Stack - stackType: ReinforcedGlass - count: 1 - - -- type: entity - name: plasteel sheet - id: PlasteelStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: plasteel - - type: Stack - stackType: Plasteel - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: plasteel - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: plasteel - -- type: entity - id: PlasteelSheet1 - name: plasteel sheet - parent: PlasteelStack - suffix: 1 - components: - - type: Stack - stackType: Plasteel - count: 1 - -- type: entity - name: gold bar - id: GoldStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: gold - - type: Stack - stackType: Gold - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: goldbar_30 - netsync: false - - type: Appearance - visuals: - - type: StackVisualizer - stackLayers: - - goldbar_10 - - goldbar_20 - - goldbar_30 - -- type: entity - id: GoldStack1 - name: gold bar 1 - parent: GoldStack - suffix: 1 - components: - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: goldbar_10 - - type: Stack - stackType: GoldStack1 - count: 1 - -- type: entity - name: plasma ore - id: OrePlasma - parent: BaseItem - components: - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: plasma_ore - -- type: entity - name: plasma sheet - id: PlasmaStack - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: plasma - - type: Stack - stackType: Plasma - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: plasma - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: plasma - -- type: entity - id: PlasmaStack1 - name: plasma sheet - parent: PlasmaStack - suffix: 1 - components: - - type: Stack - stackType: PlasmaStack1 - count: 1 - -- type: entity - name: wood plank - id: WoodPlank - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: wood - - type: Stack - stackType: Wood - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: wood - - type: Item - sprite: Objects/Materials/materials.rsi - HeldPrefix: wood - -- type: entity - id: WoodPlank1 - name: wood plank - parent: WoodPlank - suffix: 1 - components: - - type: Stack - stackType: WoodPlank1 - count: 1 - -- type: entity - name: plastic sheet - id: PlasticSheet - parent: MaterialStack - suffix: Full - components: - - type: Material - materials: - - key: enum.MaterialKeys.Stack - mat: plastic - - type: Stack - stackType: Plastic - - type: Sprite - sprite: Objects/Materials/sheets.rsi - state: plastic - - type: Item - sprite: Objects/Materials/sheets.rsi - HeldPrefix: plastic - -- type: entity - id: PlasticSheet1 - name: plastic sheet - parent: PlasticSheet - suffix: 1 - components: - - type: Stack - stackType: PlasticSheet1 - count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml b/Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml deleted file mode 100644 index 10b5c42426..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/metal_rod.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: entity - name: Metal Rod - parent: BaseItem - id: MetalRod - suffix: full - components: - - type: Sprite - sprite: Objects/Materials/materials.rsi - state: rods - - type: Item - size: 24 - icon: - sprite: Objects/Materials/materials.rsi - state: rods - - type: Construction - graph: metalRod - node: MetalRod - - type: Stack - stackType: MetalRod - count: 50 - max: 50 - - type: FloorTile - outputs: - - lattice - - floor_reinforced - -- type: entity - parent: MetalRod - id: MetalRodStack1 - suffix: 1 - components: - - type: Stack - stackType: MetalRod - count: 1 - max: 50 diff --git a/Resources/Prototypes/Entities/Objects/Specific/medical.yml b/Resources/Prototypes/Entities/Objects/Specific/medical.yml index 400e66e546..dfeb50fb05 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/medical.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/medical.yml @@ -57,7 +57,6 @@ stackType: Gauze max: 5 count: 5 - stacktype: enum.StackType.Gauze #first aid kit entities. See catalog/fills/firstaidkits for contents - type: entity name: first aid kit diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml new file mode 100644 index 0000000000..9a09fc1a73 --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/glass.yml @@ -0,0 +1,45 @@ +- type: material + id: GlassMaterialBase + density: 2500 + electricResistivity: 1.0e+13 + thermalConductivity: 0.9 + specificHeat: 840 + +- type: material + id: glass + name: glass + icon: Objects/Materials/Sheets/glass.rsi/glass.png + parent: GlassMaterialBase + +- type: material + id: rglass + name: reinforced glass + icon: Objects/Materials/Sheets/glass.rsi/rglass.png + density: 5000 + electricResistivity: 1.0e+13 + thermalConductivity: 0.9 + specificHeat: 5000 + +- type: material + id: pglass + name: plasma glass + icon: Objects/Materials/Sheets/glass.rsi/pglass.png + parent: GlassMaterialBase + +- type: material + id: rpglass + name: reinforced plasma glass + icon: Objects/Materials/Sheets/glass.rsi/prglass.png + parent: GlassMaterialBase + +- type: material + id: titaniumglass + name: titanium glass + icon: Objects/Materials/Sheets/glass.rsi/titaniumglass.png + parent: GlassMaterialBase + +- type: material + id: plastitaniumglass + name: plastitanium glass + icon: Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png + parent: GlassMaterialBase diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml new file mode 100644 index 0000000000..5bcc49178a --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -0,0 +1,42 @@ +- type: material + id: MaterialBase + density: 5000 + electricResistivity: 6.9e-7 + thermalConductivity: 18 + specificHeat: 500 + +- type: material + id: plasma + name: plasma + icon: Objects/Materials/Sheets/other.rsi/plasma.png + density: 200 + electricResistivity: 2.1e-1 + thermalConductivity: 80 + specificHeat: 2000 + +- type: material + id: phoron + name: phoron + icon: Objects/Materials/Sheets/other.rsi/phoron.png + density: 200 + electricResistivity: 2.1e-1 + thermalConductivity: 80 + specificHeat: 2000 + +- type: material + id: plastic + name: plastic + icon: Objects/Materials/Sheets/other.rsi/plastic.png + density: 6500 + electricResistivity: 1.0e+13 + thermalConductivity: 1.5 + specificHeat: 600 + +- type: material + id: wood + name: wood + icon: Objects/Materials/materials.rsi/wood_plank.png + density: 6000 + electricResistivity: 1.0e+13 + thermalConductivity: 1.5 + specificHeat: 600 diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml new file mode 100644 index 0000000000..e1bdfc3e99 --- /dev/null +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -0,0 +1,78 @@ +- type: material + id: MetalMaterialBase + density: 7700 + electricResistivity: 6.9e-7 + thermalConductivity: 18 + specificHeat: 500 + +- type: material + id: steel + name: steel + icon: Objects/Materials/Sheets/metal.rsi/steel.png + parent: MetalMaterialBase + +- type: material + id: adamantine + name: adamantine + icon: Objects/Materials/Ingots/adamantine.png + parent: MetalMaterialBase + +- type: material + id: copper + name: copper + icon: Objects/Materials/Ingots/copper.png + parent: MetalMaterialBase + +- type: material + id: gold + name: gold + icon: Objects/Materials/Ingots/gold.png + density: 10000 + electricResistivity: 8.0e-9 + thermalConductivity: 30 + specificHeat: 1000 + +- type: material + id: hydrogen + name: hydrogen + icon: Objects/Materials/Ingots/hydrogen.png + parent: MetalMaterialBase + +- type: material + id: iron + name: iron + icon: Objects/Materials/Ingots/iron.png + parent: MetalMaterialBase + +- type: material + id: silver + name: silver + icon: Objects/Materials/Ingots/silver.png + parent: MetalMaterialBase + +- type: material + id: plasteel + name: plasteel + icon: Objects/Materials/Sheets/metal.rsi/plasteel.png + density: 15400 # literally arbitrary values... + electricResistivity: 6.9e-7 + thermalConductivity: 18 + specificHeat: 200 + +- type: material + id: brass + name: brass + icon: Objects/Materials/Sheets/metal.rsi/brass.png + parent: MetalMaterialBase + +- type: material + id: titanium + name: titanium + icon: Objects/Materials/Sheets/metal.rsi/titanium.png + parent: MetalMaterialBase + +- type: material + id: plastitanium + name: plastitanium + icon: Objects/Materials/Sheets/metal.rsi/plastitanium.png + parent: MetalMaterialBase diff --git a/Resources/Prototypes/Reagents/materials.yml b/Resources/Prototypes/Reagents/materials.yml deleted file mode 100644 index 12b410d9fe..0000000000 --- a/Resources/Prototypes/Reagents/materials.yml +++ /dev/null @@ -1,74 +0,0 @@ -- type: material - id: steel - name: steel - color: gray - icon: Objects/Materials/sheets.rsi/metal.png - density: 7700 - electricResistivity: 6.9e-7 - thermalConductivity: 18 - specificHeat: 500 - -- type: material - id: glass - name: glass - color: '#e8f0ff33' - icon: Objects/Materials/sheets.rsi/glass.png - density: 2500 - electricResistivity: 1.0e+13 - thermalConductivity: 0.9 - specificHeat: 840 - -- type: material - id: rglass - name: Reinforced glass - color: '#49c9a7' - icon: Objects/Materials/sheets.rsi/rglass.png - density: 5000 - electricResistivity: 1.0e+13 - thermalConductivity: 0.9 - specificHeat: 5000 - -- type: material - id: gold - name: gold - icon: Objects/Materials/materials.rsi/goldbar_10.png - density: 10000 - electricResistivity: 8.0e-9 - thermalConductivity: 30 - specificHeat: 1000 - -- type: material - id: plasma - name: plasma - icon: Objects/Materials/sheets.rsi/plasma.png - density: 200 - electricResistivity: 2.1e-1 - thermalConductivity: 80 - specificHeat: 2000 - -- type: material - id: plasteel - name: plasteel - icon: Objects/Materials/sheet_plasteel.png - density: 15400 # literally arbitrary values... - electricResistivity: 6.9e-7 - thermalConductivity: 18 - specificHeat: 200 - -- type: material - id: wood - name: wood - icon: Objects/Materials/wood_plank.png - density: 6000 - electricResistivity: 1.0e+13 - thermalConductivity: 1.5 - specificHeat: 600 - -- type: material - id: plastic - name: plastic - icon: Objects/Materials/sheets.rsi/plastic.png - density: 6500 - electricResistivity: 1.0e+13 - thermalConductivity: 1.5 - specificHeat: 600 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml b/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml index a43bb1d729..4993ac017e 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml @@ -18,7 +18,7 @@ - to: start completed: - !type:SpawnPrototype - prototype: MetalRodStack1 + prototype: PartRodMetal1 amount: 2 - !type:DeleteEntity {} steps: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml b/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml index 8b732b8e44..21905f1309 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml @@ -13,4 +13,4 @@ amount: 1 - node: MetalRod - entity: MetalRod + entity: PartRodMetal diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml index 5e099a4fc0..93499d9fcb 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml @@ -22,7 +22,7 @@ - to: start completed: - !type:SpawnPrototype - prototype: MetalRod + prototype: PartRodMetal amount: 2 - !type:DeleteEntity {} steps: diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml index 408466aadf..11c50dc669 100644 --- a/Resources/Prototypes/Recipes/Construction/materials.yml +++ b/Resources/Prototypes/Recipes/Construction/materials.yml @@ -6,5 +6,5 @@ targetNode: MetalRod category: Materials description: A sturdy metal rod that can be used for various purposes. - icon: Objects/Materials/materials.rsi/rods.png + icon: Objects/Materials/parts.rsi/rods.png objectType: Item diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml new file mode 100644 index 0000000000..780cfeb3c6 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml @@ -0,0 +1,35 @@ +- type: stack + id: Glass + name: glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/glass.png + spawn: SheetGlass1 + +- type: stack + id: ReinforcedGlass + name: reinforced glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/rglass.png + spawn: SheetRGlass1 + +- type: stack + id: PlasmaGlass + name: plasma glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/pglass.png + spawn: SheetPGlass1 + +- type: stack + id: ReinforcedPlasmaGlass + name: reinforced plasma glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png + spawn: SheetRPGlass1 + +- type: stack + id: TitaniumGlass + name: titanium glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png + spawn: SheetTitaniumGlass1 + +- type: stack + id: PlastitaniumGlass + name: plastitanium glass + icon: /Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png + spawn: SheetPlastitaniumGlass1 diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml new file mode 100644 index 0000000000..a4e21c0487 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml @@ -0,0 +1,30 @@ +- type: stack + id: Steel + name: steel + icon: /Textures/Objects/Materials/Sheets/metal.rsi/steel.png + spawn: SheetSteel1 + +- type: stack + id: Plasteel + name: plasteel + icon: /Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png + spawn: SheetPlasteel1 + +- type: stack + id: Titanium + name: titanium + icon: /Textures/Objects/Materials/Sheets/metal.rsi/titanium.png + spawn: SheetTitanium1 + +- type: stack + id: Plastitanium + name: plastitanium + icon: /Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png + spawn: SheetPlastitanium1 + +- type: stack + id: Brass + name: brass + icon: /Textures/Objects/Materials/Sheets/metal.rsi/brass.png + spawn: SheetBrass1 + diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml new file mode 100644 index 0000000000..9b638a0011 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml @@ -0,0 +1,29 @@ +- type: stack + id: Paper + name: paper + icon: /Textures/Objects/Materials/Sheets/other.rsi/paper.png + spawn: SheetPaper1 + +- type: stack + id: Phoron + name: phoron + icon: /Textures/Objects/Materials/Sheets/other.rsi/phoron.png + spawn: SheetPhoron1 + +- type: stack + id: Plasma + name: plasma + icon: /Textures/Objects/Materials/Sheets/other.rsi/plasma.png + spawn: SheetPlasma1 + +- type: stack + id: Plastic + name: plastic + icon: /Textures/Objects/Materials/Sheets/other.rsi/plastic.png + spawn: SheetPlastic1 + +- type: stack + id: Uranium + name: uranium + icon: /Textures/Objects/Materials/Sheets/other.rsi/uranium.png + spawn: SheetUranium1 diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml new file mode 100644 index 0000000000..87d082e604 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/ingots.yml @@ -0,0 +1,35 @@ +- type: stack + id: Adamantine + name: adamantine + icon: "/Textures/Objects/Materials/ingots.rsi/adamantine.png" + spawn: IngotAdamantine1 + +- type: stack + id: Copper + name: copper + icon: "/Textures/Objects/Materials/ingots.rsi/copper.png" + spawn: IngotCopper1 + +- type: stack + id: Gold + name: gold + icon: "/Textures/Objects/Materials/ingots.rsi/gold.png" + spawn: IngotGold1 + +- type: stack + id: Hydrogen + name: hydrogen + icon: "/Textures/Objects/Materials/ingots.rsi/hydrogen.png" + spawn: IngotHydrogen1 + +- type: stack + id: Iron + name: iron + icon: "/Textures/Objects/Materials/ingots.rsi/iron.png" + spawn: IngotIron1 + +- type: stack + id: Silver + name: silver + icon: "/Textures/Objects/Materials/ingots.rsi/silver.png" + spawn: IngotSilver1 diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml new file mode 100644 index 0000000000..adbe69a432 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/materials.yml @@ -0,0 +1,53 @@ +- type: stack + id: Banananium + name: banananium + icon: /Textures/Objects/Materials/materials.rsi/banananium.png + spawn: MaterialBanananium1 + +- type: stack + id: Diamond + name: diamond + icon: /Textures/Objects/Materials/materials.rsi/diamond.png + spawn: MaterialDiamond1 + +- type: stack + id: WoodPlank + name: wood plank + icon: /Textures/Objects/Materials/materials.rsi/wood.png + spawn: MaterialWoodPlank1 + +- type: stack + id: Cloth + name: cloth + icon: /Textures/Objects/Materials/materials.rsi/cloth.png + spawn: MaterialCloth1 + +- type: stack + id: Cotton + name: cotton + icon: /Textures/Objects/Materials/materials.rsi/cotton.png + spawn: MaterialCotton1 + +- type: stack + id: Durathread + name: durathread + icon: /Textures/Objects/Materials/materials.rsi/durathread.png + spawn: MaterialDurathread1 + +- type: stack + id: RawDurathread + name: raw durathread + icon: /Textures/Objects/Materials/materials.rsi/durathreadraw.png + spawn: MaterialDurathreadRaw1 + +- type: stack + id: Hide + name: hide + icon: /Textures/Objects/Materials/materials.rsi/hide.png + spawn: MaterialHide1 + +- type: stack + id: Leather + name: leather + icon: /Textures/Objects/Materials/materials.rsi/leather.png + spawn: MaterialLeather1 diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml new file mode 100644 index 0000000000..6bbd4feeb7 --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/ore.yml @@ -0,0 +1,83 @@ +- type: stack + id: AdamantineOre + name: adamantine ore + icon: /Textures/Objects/Materials/ore.rsi/adamantine.png + spawn: AdamantineOre1 + +- type: stack + id: Ammonia + name: ammonia + icon: /Textures/Objects/Materials/ore.rsi/ammonia.png + spawn: Ammonia1 + +- type: stack + id: BananiumOre + name: bananium ore + icon: /Textures/Objects/Materials/ore.rsi/bananium.png + spawn: BananiumOre1 + +- type: stack + id: DiamondOre + name: diamond ore + icon: /Textures/Objects/Materials/ore.rsi/diamond.png + spawn: DiamondOre1 + +- type: stack + id: GoldOre + name: gold ore + icon: /Textures/Objects/Materials/ore.rsi/gold.png + spawn: GoldOre1 + +- type: stack + id: IronOre + name: iron ore + icon: /Textures/Objects/Materials/ore.rsi/iron.png + spawn: IronOre1 + +- type: stack + id: PhoronOre + name: phoron ore + icon: /Textures/Objects/Materials/ore.rsi/phoron.png + spawn: PhoronOre1 + +- type: stack + id: PlasmaOre + name: plasma ore + icon: /Textures/Objects/Materials/ore.rsi/plasma.png + spawn: PlasmaOre1 + +- type: stack + id: Sand + name: sand + icon: /Textures/Objects/Materials/ore.rsi/sand.png + spawn: Sand1 + +- type: stack + id: BlackSand + name: black sand + icon: /Textures/Objects/Materials/ore.rsi/sand_black.png + spawn: SandBlack1 + +- type: stack + id: SilverOre + name: silver ore + icon: /Textures/Objects/Materials/ore.rsi/silver.png + spawn: SilverOre1 + +- type: stack + id: Slag + name: slag + icon: /Textures/Objects/Materials/ore.rsi/slag.png + spawn: Slag1 + +- type: stack + id: TitaniumOre + name: titanium ore + icon: /Textures/Objects/Materials/ore.rsi/titanium.png + spawn: TitaniumOre1 + +- type: stack + id: UraniumOre + name: uranium ore + icon: /Textures/Objects/Materials/ore.rsi/titanium.png + spawn: UraniumOre1 diff --git a/Resources/Prototypes/Stacks/Materials/parts.yml b/Resources/Prototypes/Stacks/Materials/parts.yml new file mode 100644 index 0000000000..f8aa08aa2c --- /dev/null +++ b/Resources/Prototypes/Stacks/Materials/parts.yml @@ -0,0 +1,5 @@ +- type: stack + id: MetalRod + name: rods + icon: /Textures/Objects/Materials/parts.rsi/rods.png + spawn: PartRodMetal1 diff --git a/Resources/Prototypes/Stacks/material_stacks.yml b/Resources/Prototypes/Stacks/material_stacks.yml deleted file mode 100644 index d24a8cbe07..0000000000 --- a/Resources/Prototypes/Stacks/material_stacks.yml +++ /dev/null @@ -1,61 +0,0 @@ -- type: stack - id: Steel - name: steel - icon: "/Textures/Objects/Materials/sheets.rsi/metal.png" - spawn: SteelSheet1 - -- type: stack - id: Glass - name: glass - icon: "/Textures/Objects/Materials/sheets.rsi/glass.png" - spawn: GlassSheet1 - -- type: stack - id: ReinforcedGlass - name: reinforced glass - -- type: stack - id: Plasteel - name: plasteel - icon: "/Textures/Objects/Materials/sheets.rsi/plasteel.png" - spawn: PlasteelSheet1 - -- type: stack - id: Wood - name: wood - -- type: stack - id: Plastic - name: plastic - -- type: stack - id: Gold - name: gold - -- type: stack - id: Plasma - name: plasma - icon: "/Textures/Objects/Materials/sheets.rsi/phoron.png" - spawn: PlasmaStack1 - -- type: stack - id: MetalRod - name: metal rod - icon: "/Textures/Objects/Materials/materials.rsi/rods.png" - spawn: MetalRodStack1 - -- type: stack - id: GoldStack1 - name: gold - -- type: stack - id: PlasmaStack1 - name: plasma - -- type: stack - id: WoodPlank1 - name: wood - -- type: stack - id: PlasticSheet1 - name: plastic diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 081d527a4d..538f6e920c 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -22,9 +22,18 @@ - type: Tag id: Hoe +- type: Tag + id: Ingot + +- type: Tag + id: Ore + - type: Tag id: PlantSampleTaker +- type: Tag + id: Sheet + - type: Tag id: Shovel diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET.png new file mode 100644 index 0000000000..33b781b5de Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET.png new file mode 100644 index 0000000000..ba89037a67 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json similarity index 59% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json rename to Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json index a470e00944..8ed6b60c1f 100644 --- a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json @@ -8,18 +8,23 @@ }, "states": [ { - "name": "icon" - }, - { - "name": "equipped-HELMET", + "name": "bear-equipped-HELMET", "directions": 4 }, { - "name": "inhand-left", + "name": "bear-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "bear-inhand-right", + "directions": 4 + }, + { + "name": "corgi-equipped-HELMET", + "directions": 4 + }, + { + "name": "corgi2-equipped-HELMET", "directions": 4 } ] diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png new file mode 100644 index 0000000000..175208bb8d Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png new file mode 100644 index 0000000000..508d44ee0a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png new file mode 100644 index 0000000000..bee5df405a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json new file mode 100644 index 0000000000..84cb316cef --- /dev/null +++ b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json @@ -0,0 +1,109 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "glass" + }, + { + "name": "glass_2" + }, + { + "name": "glass_3" + }, + { + "name": "glass-inhand-left", + "directions": 4 + }, + { + "name": "pglass" + }, + { + "name": "pglass_2" + }, + { + "name": "pglass_3" + }, + { + "name": "pglass-inhand-left", + "directions": 4 + }, + { + "name": "pglass-inhand-right", + "directions": 4 + }, + { + "name": "plastitaniumglass" + }, + { + "name": "plastitaniumglass_2" + }, + { + "name": "plastitaniumglass_3" + }, + { + "name": "plastitaniumglass-inhand-left", + "directions": 4 + }, + { + "name": "plastitaniumglass-inhand-right", + "directions": 4 + }, + { + "name": "rpglass" + }, + { + "name": "rpglass_2" + }, + { + "name": "rpglass_3" + }, + { + "name": "rpglass-inhand-left", + "directions": 4 + }, + { + "name": "rpglass-inhand-right", + "directions": 4 + }, + { + "name": "rglass" + }, + { + "name": "rglass_2" + }, + { + "name": "rglass_3" + }, + { + "name": "rglass-inhand-left", + "directions": 4 + }, + { + "name": "rglass-inhand-right", + "directions": 4 + }, + { + "name": "titaniumglass" + }, + { + "name": "titaniumglass_2" + }, + { + "name": "titaniumglass_3" + }, + { + "name": "titaniumglass-inhand-left", + "directions": 4 + }, + { + "name": "titaniumglass-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png new file mode 100644 index 0000000000..fb03eb65e2 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png new file mode 100644 index 0000000000..4435e8cba2 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plasmaglass.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png new file mode 100644 index 0000000000..46756cff7a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png new file mode 100644 index 0000000000..a876266fdf Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-left.png new file mode 100644 index 0000000000..117e244c56 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-right.png new file mode 100644 index 0000000000..f2423bc9b1 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png new file mode 100644 index 0000000000..604143baa9 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png new file mode 100644 index 0000000000..91828137c6 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png new file mode 100644 index 0000000000..fcfe607e0c Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/plastitaniumglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/rglass-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/rglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/rglass.png rename to Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png new file mode 100644 index 0000000000..fb988da214 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png new file mode 100644 index 0000000000..e3ad6ed7da Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png new file mode 100644 index 0000000000..8fcd8e2211 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png new file mode 100644 index 0000000000..dbf0e470f3 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png new file mode 100644 index 0000000000..17d66b196a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png new file mode 100644 index 0000000000..59fc92332c Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png new file mode 100644 index 0000000000..672d8be1d9 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-left.png new file mode 100644 index 0000000000..31755595bb Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-right.png new file mode 100644 index 0000000000..65a1b37a27 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png new file mode 100644 index 0000000000..c3e391285f Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png new file mode 100644 index 0000000000..35599f906d Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png new file mode 100644 index 0000000000..c97d695c55 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/titaniumglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-left.png new file mode 100644 index 0000000000..7577ddadd5 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-right.png new file mode 100644 index 0000000000..54d2133954 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png new file mode 100644 index 0000000000..aa63620f24 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png new file mode 100644 index 0000000000..65be22f71a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png new file mode 100644 index 0000000000..262094c05a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/brass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json new file mode 100644 index 0000000000..40a70704aa --- /dev/null +++ b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json @@ -0,0 +1,96 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brass" + }, + { + "name": "brass_2" + }, + { + "name": "brass_3" + }, + { + "name": "brass-inhand-left", + "directions": 4 + }, + { + "name": "brass-inhand-right", + "directions": 4 + }, + { + "name": "plasteel" + }, + { + "name": "plasteel_2" + }, + { + "name": "plasteel_3" + }, + { + "name": "plasteel-inhand-left", + "directions": 4 + }, + { + "name": "plasteel-inhand-right", + "directions": 4 + }, + { + "name": "plastitanium" + }, + { + "name": "plastitanium_2" + }, + { + "name": "plastitanium_3" + }, + { + "name": "plastitanium-inhand-left", + "directions": 4 + }, + { + "name": "plastitanium-inhand-right", + "directions": 4 + }, + { + "name": "steel" + }, + { + "name": "steel_2" + }, + { + "name": "steel_3" + }, + { + "name": "steel-inhand-left", + "directions": 4 + }, + { + "name": "steel-inhand-right", + "directions": 4 + }, + { + "name": "titanium" + }, + { + "name": "titanium_2" + }, + { + "name": "titanium_3" + }, + { + "name": "titanium-inhand-left", + "directions": 4 + }, + { + "name": "titanium-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasteel-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plasteel-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasteel-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plasteel-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasteel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plasteel.png rename to Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png new file mode 100644 index 0000000000..8422a49bb9 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png new file mode 100644 index 0000000000..d4cb88660d Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-left.png new file mode 100644 index 0000000000..58d6b1978a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-right.png new file mode 100644 index 0000000000..9056c62d86 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png new file mode 100644 index 0000000000..3471bfae23 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png new file mode 100644 index 0000000000..4f49bf95a5 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png new file mode 100644 index 0000000000..d4ac3c6071 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plastitanium_3.png differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png new file mode 100644 index 0000000000..223a7a9ef4 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png new file mode 100644 index 0000000000..f4c4259ec4 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png new file mode 100644 index 0000000000..06d6533117 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-left.png new file mode 100644 index 0000000000..a626b143a3 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-right.png new file mode 100644 index 0000000000..d6fa6b611b Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png new file mode 100644 index 0000000000..c5abe3cf60 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png new file mode 100644 index 0000000000..1c18406f68 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png new file mode 100644 index 0000000000..6d8116a9a4 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/titanium_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json new file mode 100644 index 0000000000..7b17efcd45 --- /dev/null +++ b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json @@ -0,0 +1,84 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "phoron" + }, + { + "name": "phoron-inhand-left", + "directions": 4 + }, + { + "name": "phoron-inhand-right", + "directions": 4 + }, + { + "name": "paper" + }, + { + "name": "paper_2" + }, + { + "name": "paper_3" + }, + { + "name": "paper-inhand-left", + "directions": 4 + }, + { + "name": "paper-inhand-right", + "directions": 4 + }, + { + "name": "plastic" + }, + { + "name": "plastic_2" + }, + { + "name": "plastic_3" + }, + { + "name": "plastic-inhand-left", + "directions": 4 + }, + { + "name": "plastic-inhand-right", + "directions": 4 + }, + { + "name": "plasma" + }, + { + "name": "plasma_2" + }, + { + "name": "plasma_3" + }, + { + "name": "plasma-inhand-left", + "directions": 4 + }, + { + "name": "plasma-inhand-right", + "directions": 4 + }, + { + "name": "uranium" + }, + { + "name": "uranium-inhand-left", + "directions": 4 + }, + { + "name": "uranium-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-left.png new file mode 100644 index 0000000000..c213d91a21 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-right.png new file mode 100644 index 0000000000..349787f816 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper.png new file mode 100644 index 0000000000..3d0854b926 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_2.png new file mode 100644 index 0000000000..8110e86abb Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_3.png new file mode 100644 index 0000000000..ec4086249a Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/paper_3.png differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/phoron.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/phoron.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron.png diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-left.png new file mode 100644 index 0000000000..1116634e7f Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png new file mode 100644 index 0000000000..c24afc4eaa Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plasma.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plasma.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png new file mode 100644 index 0000000000..d306182008 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png new file mode 100644 index 0000000000..0b632b9c47 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plastic-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plastic-inhand-left.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic-inhand-left.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plastic-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/plastic-inhand-right.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic-inhand-right.png diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png new file mode 100644 index 0000000000..d4b3de2930 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png new file mode 100644 index 0000000000..f853b02f07 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png new file mode 100644 index 0000000000..841d843768 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-left.png new file mode 100644 index 0000000000..6f7a4d8769 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-right.png new file mode 100644 index 0000000000..7e5910d747 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/uranium.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/uranium.png rename to Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png b/Resources/Textures/Objects/Materials/Sheets/researchicon.png similarity index 100% rename from Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png rename to Resources/Textures/Objects/Materials/Sheets/researchicon.png diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-left.png new file mode 100644 index 0000000000..22a1a447ad Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-right.png new file mode 100644 index 0000000000..d1565faddf Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine.png new file mode 100644 index 0000000000..e3192438b6 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_2.png new file mode 100644 index 0000000000..3619c2d794 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_3.png new file mode 100644 index 0000000000..6ad97e28b3 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/adamantine_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png new file mode 100644 index 0000000000..b21f768cf0 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/alpha.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png new file mode 100644 index 0000000000..4f02918bb6 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png new file mode 100644 index 0000000000..7fe5dfb514 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/alpha_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-left.png new file mode 100644 index 0000000000..86886f1018 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-right.png new file mode 100644 index 0000000000..f3dfbbc3fa Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/copper-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/copperbar_single.png b/Resources/Textures/Objects/Materials/ingots.rsi/copper.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/copperbar_single.png rename to Resources/Textures/Objects/Materials/ingots.rsi/copper.png diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/copper_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/copper_2.png new file mode 100644 index 0000000000..48c6fce84a Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/copper_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/copper_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/copper_3.png new file mode 100644 index 0000000000..dc9a1a6308 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/copper_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-left.png new file mode 100644 index 0000000000..9077761498 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-right.png new file mode 100644 index 0000000000..c00f30b21e Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/gold-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png new file mode 100644 index 0000000000..fca33d1900 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png new file mode 100644 index 0000000000..44d579ae17 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png new file mode 100644 index 0000000000..f4c088b762 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-left.png new file mode 100644 index 0000000000..74b4a930cc Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-right.png new file mode 100644 index 0000000000..f03610c17b Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen.png b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen.png new file mode 100644 index 0000000000..23cd32ee34 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_2.png new file mode 100644 index 0000000000..8764c9af30 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_3.png new file mode 100644 index 0000000000..763eb55ce3 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/hydrogen_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-left.png new file mode 100644 index 0000000000..72a804ad4c Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-right.png new file mode 100644 index 0000000000..c6d26ff66d Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/iron-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/iron.png b/Resources/Textures/Objects/Materials/ingots.rsi/iron.png new file mode 100644 index 0000000000..b90ed9e2e3 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/iron.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/iron_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/iron_2.png new file mode 100644 index 0000000000..ab6bd17892 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/iron_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/iron_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/iron_3.png new file mode 100644 index 0000000000..1c0593a4cf Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/iron_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json new file mode 100644 index 0000000000..10997202ef --- /dev/null +++ b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json @@ -0,0 +1,122 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "adamantine" + }, + { + "name": "adamantine_2" + }, + { + "name": "adamantine_3" + }, + { + "name": "adamantine-inhand-left", + "directions": 4 + }, + { + "name": "adamantine-inhand-right", + "directions": 4 + }, + { + "name": "alpha" + }, + { + "name": "alpha_2" + }, + { + "name": "alpha_3" + }, + { + "name": "copper" + }, + { + "name": "copper_2" + }, + { + "name": "copper_3" + }, + { + "name": "copper-inhand-left", + "directions": 4 + }, + { + "name": "copper-inhand-right", + "directions": 4 + }, + { + "name": "gold" + }, + { + "name": "gold_2" + }, + { + "name": "gold_3" + }, + { + "name": "gold-inhand-left", + "directions": 4 + }, + { + "name": "gold-inhand-right", + "directions": 4 + }, + { + "name": "hydrogen" + }, + { + "name": "hydrogen_2" + }, + { + "name": "hydrogen_3" + }, + { + "name": "hydrogen-inhand-left", + "directions": 4 + }, + { + "name": "hydrogen-inhand-right", + "directions": 4 + }, + { + "name": "iron" + }, + { + "name": "iron_2" + }, + { + "name": "iron_3" + }, + { + "name": "iron-inhand-left", + "directions": 4 + }, + { + "name": "iron-inhand-right", + "directions": 4 + }, + { + "name": "silver" + }, + { + "name": "silver_2" + }, + { + "name": "silver_3" + }, + { + "name": "silver-inhand-left", + "directions": 4 + }, + { + "name": "silver-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-left.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-left.png new file mode 100644 index 0000000000..1d8f0b860d Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-right.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-right.png new file mode 100644 index 0000000000..44cadf5ca5 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/silver-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png new file mode 100644 index 0000000000..bff6acfa4f Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png new file mode 100644 index 0000000000..880370e663 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png new file mode 100644 index 0000000000..d5160c6ed2 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/banananium.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/banananium.png rename to Resources/Textures/Objects/Materials/materials.rsi/bananium.png diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/icon.png b/Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png similarity index 100% rename from Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/icon.png rename to Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth.png new file mode 100644 index 0000000000..a6e953c707 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cloth.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png new file mode 100644 index 0000000000..cbaaa6cd7a Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png new file mode 100644 index 0000000000..5d2db38b70 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton.png new file mode 100644 index 0000000000..959c571df6 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cotton.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton_2.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton_2.png new file mode 100644 index 0000000000..80e2ad77fd Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cotton_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cotton_3.png b/Resources/Textures/Objects/Materials/materials.rsi/cotton_3.png new file mode 100644 index 0000000000..ffe0941d2a Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/cotton_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png new file mode 100644 index 0000000000..c9b55e9daa Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png new file mode 100644 index 0000000000..295c2c4eca Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread.png new file mode 100644 index 0000000000..3bd0660f7d Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathread.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread_2.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread_2.png new file mode 100644 index 0000000000..932f3d2f4f Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathread_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathread_3.png b/Resources/Textures/Objects/Materials/materials.rsi/durathread_3.png new file mode 100644 index 0000000000..298b971a7b Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathread_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw.png b/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw.png new file mode 100644 index 0000000000..fb9b6459c7 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_2.png b/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_2.png new file mode 100644 index 0000000000..561edede84 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_3.png b/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_3.png new file mode 100644 index 0000000000..805978f3bd Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/durathreadraw_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/goldbar_10.png b/Resources/Textures/Objects/Materials/materials.rsi/goldbar_10.png deleted file mode 100644 index 3c88530bca..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/goldbar_10.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/goldbar_20.png b/Resources/Textures/Objects/Materials/materials.rsi/goldbar_20.png deleted file mode 100644 index a923885456..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/goldbar_20.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/goldbar_30.png b/Resources/Textures/Objects/Materials/materials.rsi/goldbar_30.png deleted file mode 100644 index 2c39645665..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/goldbar_30.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/hide.png b/Resources/Textures/Objects/Materials/materials.rsi/hide.png new file mode 100644 index 0000000000..08c82ae6c7 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/hide.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/hide_2.png b/Resources/Textures/Objects/Materials/materials.rsi/hide_2.png new file mode 100644 index 0000000000..4db94c3566 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/hide_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/hide_3.png b/Resources/Textures/Objects/Materials/materials.rsi/hide_3.png new file mode 100644 index 0000000000..0653a02ed5 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/hide_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/leadbar_single.png b/Resources/Textures/Objects/Materials/materials.rsi/leadbar_single.png deleted file mode 100644 index c0403f6aed..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/leadbar_single.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/leather.png b/Resources/Textures/Objects/Materials/materials.rsi/leather.png new file mode 100644 index 0000000000..4ccddcf4b5 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/leather.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/leather_2.png b/Resources/Textures/Objects/Materials/materials.rsi/leather_2.png new file mode 100644 index 0000000000..22c4fc77e6 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/leather_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/leather_3.png b/Resources/Textures/Objects/Materials/materials.rsi/leather_3.png new file mode 100644 index 0000000000..2c9b4b5637 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/leather_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index 2f2e9c6d2d..47b129849a 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -1,80 +1,114 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/37f849fb17014f689346f7a9a49fab5f5562cf18", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "alienhide" }, - "states": [ - { - "name": "alienhide" - }, - { - "name": "cathide" - }, - { - "name": "corgihide" - }, - { - "name": "liggerhide" - }, - { - "name": "monkeyhide" - }, - { - "name": "banananium" - }, - { - "name": "diamond" - }, - { - "name": "uranium" - }, - { - "name": "wood" - }, - { - "name": "wool" - }, - { - "name": "copperbar_single" - }, - { - "name": "goldbar_10" - }, - { - "name": "goldbar_20" - }, - { - "name": "goldbar_30" - }, - { - "name": "leadbar_single" - }, - { - "name": "steelbar_single" - }, - { - "name": "tinbar_single" - }, - { - "name": "plasma_ore" - }, - { - "name": "phoron_ore" - }, - { - "name": "phoron_sheet" - }, - { - "name": "phoron_gem" - }, - { - "name": "spent_phoron_gem" - }, - { - "name": "rods" - } - ] + { + "name": "bananium" + }, + { + "name": "bearpelt" + }, + { + "name": "cathide" + }, + { + "name": "cloth" + }, + { + "name": "cloth_2" + }, + { + "name": "cloth_3" + }, + { + "name": "corgihide" + }, + { + "name": "cotton" + }, + { + "name": "cotton_2" + }, + { + "name": "cotton_3" + }, + { + "name": "diamond" + }, + { + "name": "diamond-inhand-left", + "directions": 4 + }, + { + "name": "diamond-inhand-right", + "directions": 4 + }, + { + "name": "durathread" + }, + { + "name": "durathread_2" + }, + { + "name": "durathread_3" + }, + { + "name": "durathreadraw" + }, + { + "name": "durathreadraw_2" + }, + { + "name": "durathreadraw_3" + }, + { + "name": "hide" + }, + { + "name": "hide_2" + }, + { + "name": "hide_3" + }, + { + "name": "leather" + }, + { + "name": "leather_2" + }, + { + "name": "leather_3" + }, + { + "name": "liggerhide" + }, + { + "name": "monkeyhide" + }, + { + "name": "phoron_gem" + }, + { + "name": "phoron_gem_spent" + }, + { + "name": "wood" + }, + { + "name": "wood-inhand-left", + "directions": 4 + }, + { + "name": "wood-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Materials/materials.rsi/spent_phoron_gem.png b/Resources/Textures/Objects/Materials/materials.rsi/phoron_gem_spent.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/spent_phoron_gem.png rename to Resources/Textures/Objects/Materials/materials.rsi/phoron_gem_spent.png diff --git a/Resources/Textures/Objects/Materials/materials.rsi/phoron_sheet.png b/Resources/Textures/Objects/Materials/materials.rsi/phoron_sheet.png deleted file mode 100644 index e226d3fdb7..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/phoron_sheet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/plastic.png b/Resources/Textures/Objects/Materials/materials.rsi/plastic.png deleted file mode 100644 index 87153bca44..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/plastic.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/rods.png b/Resources/Textures/Objects/Materials/materials.rsi/rods.png deleted file mode 100644 index 853ecb2da5..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/rods.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/steelbar_single.png b/Resources/Textures/Objects/Materials/materials.rsi/steelbar_single.png deleted file mode 100644 index c857b6f924..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/steelbar_single.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/tinbar_single.png b/Resources/Textures/Objects/Materials/materials.rsi/tinbar_single.png deleted file mode 100644 index c38ac35e14..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/tinbar_single.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-left.png new file mode 100644 index 0000000000..3af74a4b1e Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-right.png new file mode 100644 index 0000000000..9b9f035c02 Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/wood-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/wool.png b/Resources/Textures/Objects/Materials/materials.rsi/wool.png deleted file mode 100644 index 6f53643483..0000000000 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/wool.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png b/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png new file mode 100644 index 0000000000..72a1e938c1 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png b/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png new file mode 100644 index 0000000000..f7689b1e85 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png new file mode 100644 index 0000000000..a8b3325f41 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png new file mode 100644 index 0000000000..5a6de137f4 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold.png b/Resources/Textures/Objects/Materials/ore.rsi/gold.png new file mode 100644 index 0000000000..6ac90a19ed Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron.png b/Resources/Textures/Objects/Materials/ore.rsi/iron.png new file mode 100644 index 0000000000..2f5ad0a16e Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/iron.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json new file mode 100644 index 0000000000..c4b3f33488 --- /dev/null +++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "adamantine" + }, + { + "name": "ammonia" + }, + { + "name": "bananium" + }, + { + "name": "diamond" + }, + { + "name": "gold" + }, + { + "name": "iron" + }, + { + "name": "phoron" + }, + { + "name": "plasma" + }, + { + "name": "sand" + }, + { + "name": "sand_black" + }, + { + "name": "silver" + }, + { + "name": "slag" + }, + { + "name": "titanium" + }, + { + "name": "uranium" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/materials.rsi/phoron_ore.png b/Resources/Textures/Objects/Materials/ore.rsi/phoron.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/phoron_ore.png rename to Resources/Textures/Objects/Materials/ore.rsi/phoron.png diff --git a/Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma.png similarity index 100% rename from Resources/Textures/Objects/Materials/materials.rsi/plasma_ore.png rename to Resources/Textures/Objects/Materials/ore.rsi/plasma.png diff --git a/Resources/Textures/Objects/Materials/ore.rsi/sand.png b/Resources/Textures/Objects/Materials/ore.rsi/sand.png new file mode 100644 index 0000000000..87c1be5e7d Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/sand.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/sand_black.png b/Resources/Textures/Objects/Materials/ore.rsi/sand_black.png new file mode 100644 index 0000000000..cb5732ce21 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/sand_black.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/silver.png b/Resources/Textures/Objects/Materials/ore.rsi/silver.png new file mode 100644 index 0000000000..0e107bc45d Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/slag.png b/Resources/Textures/Objects/Materials/ore.rsi/slag.png new file mode 100644 index 0000000000..18f3a8e4da Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/slag.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/titanium.png b/Resources/Textures/Objects/Materials/ore.rsi/titanium.png new file mode 100644 index 0000000000..bb9de5bda3 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/titanium.png differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png new file mode 100644 index 0000000000..89fbaef427 Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/meta.json b/Resources/Textures/Objects/Materials/parts.rsi/meta.json new file mode 100644 index 0000000000..290b7dd91c --- /dev/null +++ b/Resources/Textures/Objects/Materials/parts.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rods" + }, + { + "name": "rods_2" + }, + { + "name": "rods_3" + }, + { + "name": "rods_4" + }, + { + "name": "rods_5" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods.png b/Resources/Textures/Objects/Materials/parts.rsi/rods.png new file mode 100644 index 0000000000..9b88ebb996 Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png new file mode 100644 index 0000000000..f3a53194fd Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png new file mode 100644 index 0000000000..eef57cbfe9 Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png new file mode 100644 index 0000000000..3ac8d6bb16 Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png new file mode 100644 index 0000000000..ea5f8ea4ea Binary files /dev/null and b/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass.png b/Resources/Textures/Objects/Materials/sheets.rsi/glass.png deleted file mode 100644 index 534d188b29..0000000000 Binary files a/Resources/Textures/Objects/Materials/sheets.rsi/glass.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json deleted file mode 100644 index 0b615bbde6..0000000000 --- a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "metal-inhand-left", - "directions": 4 - }, - { - "name": "metal-inhand-right", - "directions": 4 - }, - { - "name": "glass-inhand-left", - "directions": 4 - }, - { - "name": "glass-inhand-right", - "directions": 4 - }, - { - "name": "glass" - }, - { - "name": "phoron-inhand-left", - "directions": 4 - }, - { - "name": "phoron-inhand-right", - "directions": 4 - }, - { - "name": "phoron" - }, - { - "name": "plasmaglass" - }, - { - "name": "plasma" - }, - { - "name": "metal" - }, - { - "name": "plasteel-inhand-left", - "directions": 4 - }, - { - "name": "plasteel-inhand-right", - "directions": 4 - }, - { - "name": "plasteel" - }, - { - "name": "rglass" - }, - { - "name": "rglass-inhand-left", - "directions": 4 - }, - { - "name": "rglass-inhand-right", - "directions": 4 - }, - { - "name": "researchicon" - }, - { - "name": "plastic" - }, - { - "name": "plastic-inhand-left", - "directions": 4 - }, - { - "name": "plastic-inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal.png b/Resources/Textures/Objects/Materials/sheets.rsi/metal.png deleted file mode 100644 index 999b6e2927..0000000000 Binary files a/Resources/Textures/Objects/Materials/sheets.rsi/metal.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/plastic.png b/Resources/Textures/Objects/Materials/sheets.rsi/plastic.png deleted file mode 100644 index 87153bca44..0000000000 Binary files a/Resources/Textures/Objects/Materials/sheets.rsi/plastic.png and /dev/null differ diff --git a/RobustToolbox b/RobustToolbox index 91391e1205..7f540e741c 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 91391e12050daf78411c61a2776f44ccd6254453 +Subproject commit 7f540e741c030764cd08d50c4edb3d37743a299b