diff --git a/Content.IntegrationTests/Tests/Materials/MaterialTests.cs b/Content.IntegrationTests/Tests/Materials/MaterialTests.cs index b0a96a98cd..b144d382ca 100644 --- a/Content.IntegrationTests/Tests/Materials/MaterialTests.cs +++ b/Content.IntegrationTests/Tests/Materials/MaterialTests.cs @@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests.Materials { foreach (var proto in allMaterialProtos) { - if (proto.StackEntity == "") + if (proto.StackEntity == null) continue; var spawned = entityManager.SpawnEntity(proto.StackEntity, coords); diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs index 63eeaf2fe5..f7029c96d2 100644 --- a/Content.Server/Materials/MaterialStorageSystem.cs +++ b/Content.Server/Materials/MaterialStorageSystem.cs @@ -117,7 +117,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem { overflowMaterial = 0; - if (amount <= 0) + if (amount <= 0 || materialProto.StackEntity == null) return new List(); var entProto = _prototypeManager.Index(materialProto.StackEntity); diff --git a/Content.Shared/Materials/MaterialPrototype.cs b/Content.Shared/Materials/MaterialPrototype.cs index 0b470ed6f7..1418ed2182 100644 --- a/Content.Shared/Materials/MaterialPrototype.cs +++ b/Content.Shared/Materials/MaterialPrototype.cs @@ -30,7 +30,7 @@ namespace Content.Shared.Materials /// include which stack we should spawn by default. /// [DataField("stackEntity", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string StackEntity { get; } = ""; + public string? StackEntity; [DataField("name")] public string Name = ""; diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index 70fb991c24..41052e5727 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -19,6 +19,7 @@ materials-plastic = plastic materials-wood = wood materials-uranium = uranium materials-bananium = bananium +materials-meat = meat # Material Reclaimer material-reclaimer-upgrade-process-rate = process rate diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 01e7356f50..c56816dbdd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -28,6 +28,10 @@ size: 5 - type: Temperature currentTemperature: 290 + - type: Material + - type: PhysicalComposition + materialComposition: + Meaterial: 300 - type: Tag id: Raw diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 2bb112f83f..29324a65b1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -708,6 +708,17 @@ materialRequirements: Glass: 1 +- type: entity + id: SheetifierMachineCircuitboard + parent: BaseMachineCircuitboard + name: sheet-meister 2000 machine board + components: + - type: MachineBoard + prototype: Sheetifier + requirements: + MatterBin: 1 + Manipulator: 1 + - type: entity id: MicrowaveMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index cb498ab433..b2168a7d45 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -191,3 +191,44 @@ components: - type: Stack count: 1 + +- type: entity + parent: SheetOtherBase + id: MaterialSheetMeat + name: meat sheet + suffix: Full + components: + - type: Sprite + sprite: Objects/Materials/Sheets/meaterial.rsi + layers: + - state: meat_3 + map: [ "base" ] + - type: Tag + tags: + - Sheet + - DroneUsable + - type: Material + - type: PhysicalComposition + materialComposition: + Meaterial: 100 + - type: Stack + stackType: MeatSheets + baseLayer: base + layerStates: + - meat + - meat_2 + - meat_3 + - type: Item + sprite: Objects/Materials/Sheets/meaterial.rsi + heldPrefix: meat + - type: Appearance + +- type: entity + parent: MaterialSheetMeat + id: MaterialSheetMeat1 + suffix: Single + components: + - type: Sprite + state: meat + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index b17b35eb73..b3970f760e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -735,6 +735,25 @@ - type: Stack stackType: FloorTileWoodPattern +- type: entity + id: FloorTileItemFlesh + parent: FloorTileItemBase + name: flesh floor + components: + - type: Sprite + state: meat + - type: Item + heldPrefix: meat + - type: FloorTile + outputs: + - Plating + - FloorFlesh + - type: Stack + stackType: FloorTileFlesh + - type: Construction + graph: TileFlesh + node: fleshTile + - type: entity name: steel maint floor parent: FloorTileItemBase diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index f697558104..5bbc10f0dd 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -206,6 +206,20 @@ graph: RitualSeat node: chairRitual +- type: entity + id: ChairMeat + parent: SeatBase + name: meat chair + description: Uncomfortably sweaty. + components: + - type: Anchorable + - type: Rotatable + - type: Sprite + state: meat + - type: Construction + graph: Seat + node: chairMeat + - type: entity name: cursed chair id: ChairCursed diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e34ad45f15..2c54578e1b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -301,6 +301,7 @@ - HotplateMachineCircuitboard - MicrowaveMachineCircuitboard - FatExtractorMachineCircuitboard + - SheetifierMachineCircuitboard - UniformPrinterMachineCircuitboard - ShuttleConsoleCircuitboard - RadarConsoleCircuitboard @@ -680,3 +681,31 @@ - IngotGold1 - IngotSilver1 - MaterialBananium1 + +- type: entity + parent: Autolathe + id: Sheetifier + name: sheet-meister 2000 + description: A very sheety machine. + components: + - type: Sprite + sprite: Structures/Machines/sheetifier.rsi + layers: + - state: base_machine + map: ["enum.LatheVisualLayers.IsRunning"] + - state: buttons_on + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - type: Machine + board: SheetifierMachineCircuitboard + - type: MaterialStorage + dropOnDeconstruct: false #should drop ores instead of ingots/sheets + ignoreColor: true + whitelist: + tags: + - Raw + - type: Lathe + idleState: base_machine + runningState: base_machine_processing + staticRecipes: + - MaterialSheetMeat diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index eef4088383..e6faa23a1b 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -144,6 +144,40 @@ key: walls base: clown +- type: entity + parent: BaseWall + id: WallMeat + name: meat wall + description: Sticky. + components: + - type: Tag + tags: + - RCDDeconstructWhitelist + - Wall + - Structure + - type: Sprite + sprite: Structures/Walls/meat.rsi + - type: Icon + sprite: Structures/Walls/meat.rsi + - type: Construction + graph: Girder + node: bananiumWall + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 # weak + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Girder: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: IconSmooth + key: walls + base: meat - type: entity parent: BaseWall diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index 1b8181082b..f3ddc4d082 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -69,3 +69,10 @@ icon: { sprite: Objects/Materials/materials.rsi, state: bananium } color: "#32a852" price: 0.2 + +- type: material + id: Meaterial # you can't take this pun from me + name: materials-meat + icon: { sprite: Objects/Materials/Sheets/meaterial.rsi, state: meat } + color: "#c53648" + price: 0.05 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index e9034a295b..30a988cb8f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -46,6 +46,11 @@ - material: WoodPlank amount: 3 doAfter: 1 + - to: chairMeat + steps: + - material: MeatSheets + amount: 2 + doAfter: 1 - to: chairFolding steps: - material: Plastic @@ -147,6 +152,18 @@ - tool: Screwing doAfter: 1 + - node: chairMeat + entity: ChairMeat + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialSheetMeat1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + - node: chairFolding entity: ChairFolding edges: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml index e133535a06..e652cfbec8 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml @@ -134,6 +134,17 @@ - tool: Welding doAfter: 20 + - to: meatWall + completed: + - !type:SnapToGrid + southRotation: true + conditions: + - !type:EntityAnchored {} + steps: + - material: MeatSheets + amount: 2 + doAfter: 2 + - node: wall entity: WallSolid edges: @@ -240,6 +251,18 @@ - tool: Prying doAfter: 10 + - node: meatWall + entity: WallMeat + edges: + - to: girder + completed: + - !type:GivePrototype + prototype: MaterialSheetMeat1 + amount: 2 + steps: + - tool: Prying + doAfter: 5 + - node: reinforcedGirder entity: ReinforcedGirder edges: diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 1c7afe46e0..e0b3a9d7bc 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -135,6 +135,23 @@ conditions: - !type:TileNotBlocked +- type: construction + name: meat chair + id: ChairMeat + graph: Seat + startNode: start + targetNode: chairMeat + category: construction-category-furniture + description: Uncomfortably sweaty. + icon: + sprite: Structures/Furniture/chairs.rsi + state: meat + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction name: ritual chair id: ChairRitual diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index f1afe2768e..d44977ae37 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -196,6 +196,24 @@ conditions: - !type:TileNotBlocked +- type: construction + name: meat wall + id: MeatWall + graph: Girder + startNode: start + targetNode: meatWall + category: construction-category-structures + description: Sticky. + icon: + sprite: Structures/Walls/meat.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction name: grille id: Grille diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml index 329037efb2..caff139192 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml @@ -62,3 +62,19 @@ amount: 1 - node: darktile entity: FloorTileItemDark + +- type: constructionGraph + id: TileFlesh + start: start + graph: + - node: start + edges: + - to: fleshTile + completed: + - !type:SetStackCount + amount: 4 + steps: + - material: MeatSheets + amount: 1 + - node: fleshTile + entity: FloorTileItemFlesh diff --git a/Resources/Prototypes/Recipes/Crafting/tiles.yml b/Resources/Prototypes/Recipes/Crafting/tiles.yml index 590a1988c3..6050306597 100644 --- a/Resources/Prototypes/Recipes/Crafting/tiles.yml +++ b/Resources/Prototypes/Recipes/Crafting/tiles.yml @@ -44,6 +44,17 @@ icon: { sprite: Objects/Tiles/tile.rsi, state: dark } objectType: Item +- type: construction + name: flesh tile + id: TileFlesh + graph: TileFlesh + startNode: start + targetNode: fleshTile + category: construction-category-tiles + description: "Four fleshy tiles." + icon: { sprite: Objects/Tiles/tile.rsi, state: meat } + objectType: Item + # - type: construction # name: techmaint floor # id: tileTechmaint diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 9d83b40c8e..a7badb03e5 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -501,6 +501,14 @@ Steel: 100 Glass: 900 +- type: latheRecipe + id: SheetifierMachineCircuitboard + result: SheetifierMachineCircuitboard + completetime: 4 + materials: + Steel: 100 + Glass: 900 + - type: latheRecipe id: SurveillanceCameraRouterCircuitboard result: SurveillanceCameraRouterCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index 7dbbb12aa4..ea17d46129 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -5,7 +5,7 @@ completetime: 2 materials: Steel: 100 - + - type: latheRecipe id: SheetSteel30 result: SheetSteel @@ -20,7 +20,7 @@ completetime: 2 materials: Glass: 100 - + - type: latheRecipe id: SheetGlass30 result: SheetGlass @@ -36,7 +36,7 @@ materials: Glass: 100 Steel: 50 - + - type: latheRecipe id: SheetRGlass30 result: SheetRGlass @@ -52,7 +52,7 @@ materials: Glass: 3000 Plasma: 3000 - + - type: latheRecipe id: SheetRPGlass30 result: SheetRPGlass @@ -61,7 +61,7 @@ Glass: 3000 Plasma: 3000 Steel: 1500 - + - type: latheRecipe id: SheetPlasma30 result: SheetPlasma @@ -75,7 +75,7 @@ completetime: 2 materials: Uranium: 500 - + - type: latheRecipe id: IngotGold1 result: IngotGold1 @@ -104,3 +104,10 @@ completetime: 2 materials: Bananium: 500 + +- type: latheRecipe + id: MaterialSheetMeat + result: MaterialSheetMeat1 + completetime: 6.4 + materials: + Meaterial: 200 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index b39b85b26d..7bad53a08d 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -116,6 +116,7 @@ cost: 5000 recipeUnlocks: - FatExtractorMachineCircuitboard + - SheetifierMachineCircuitboard - type: technology id: HONKMech diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml index ad22391a72..6c67fb991f 100644 --- a/Resources/Prototypes/Stacks/Materials/materials.yml +++ b/Resources/Prototypes/Stacks/Materials/materials.yml @@ -53,3 +53,10 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium } spawn: MaterialBananium1 maxCount: 10 + +- type: stack + id: MeatSheets + name: meat sheet + icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat } + spawn: MaterialSheetMeat1 + maxCount: 30 diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 0d6e701837..efa6eb3084 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -3,7 +3,7 @@ name: steel tile spawn: FloorTileItemSteel maxCount: 30 - + - type: stack id: FloorTileMetalDiamond name: steel tile @@ -129,7 +129,7 @@ name: blue arcade tile spawn: FloorTileItemArcadeBlue maxCount: 30 - + - type: stack id: FloorTileStackArcadeBlue2 name: blue arcade tile @@ -189,7 +189,7 @@ name: pink carpet tile spawn: FloorCarpetItemPink maxCount: 30 - + - type: stack id: FloorTileStackCarpetClown name: clown carpet tile @@ -201,13 +201,13 @@ name: office carpet tile spawn: FloorTileItemCarpetOffice maxCount: 30 - + - type: stack id: FloorTileStackBoxing name: boxing ring tile spawn: FloorTileItemBoxing maxCount: 30 - + - type: stack id: FloorTileStackGym name: gym floor tile @@ -298,6 +298,12 @@ spawn: FloorTileItemWoodPattern maxCount: 30 +- type: stack + id: FloorTileFlesh + name: flesh floor + spawn: FloorTileItemFlesh + maxCount: 30 + - type: stack id: FloorTileSteelMaint name: steel maint floor diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 0df9978782..9c755fb240 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1135,6 +1135,7 @@ canCrowbar: true footstepSounds: collection: BarestepCarpet + itemDrop: FloorTileItemFlesh friction: 0.20 #slippy heatCapacity: 10000 diff --git a/Resources/Textures/Mobs/Aliens/flesh.rsi/lover.png b/Resources/Textures/Mobs/Aliens/flesh.rsi/lover.png index 0b5229c37f..d5680e1f81 100644 Binary files a/Resources/Textures/Mobs/Aliens/flesh.rsi/lover.png and b/Resources/Textures/Mobs/Aliens/flesh.rsi/lover.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat-inhand-left.png new file mode 100644 index 0000000000..720713ecca Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat-inhand-left.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat-inhand-right.png new file mode 100644 index 0000000000..7595ad686d Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat.png b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat.png new file mode 100644 index 0000000000..f6d01f8add Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat_2.png b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat_2.png new file mode 100644 index 0000000000..5d8ca937e6 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat_3.png b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat_3.png new file mode 100644 index 0000000000..c55497808f Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meat_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meta.json new file mode 100644 index 0000000000..22d12d0637 --- /dev/null +++ b/Resources/Textures/Objects/Materials/Sheets/meaterial.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "meat-inhand-left", + "directions": 4 + }, + { + "name": "meat-inhand-right", + "directions": 4 + }, + { + "name": "meat" + }, + { + "name": "meat_2" + }, + { + "name": "meat_3" + } + ] +} diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meat-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/meat-inhand-left.png new file mode 100644 index 0000000000..eeb14752fc Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/meat-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meat-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/meat-inhand-right.png new file mode 100644 index 0000000000..2f10d57077 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/meat-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meat.png b/Resources/Textures/Objects/Tiles/tile.rsi/meat.png new file mode 100644 index 0000000000..5403a4c3f8 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/meat.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index f19df39b22..0dcf9a0b7e 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -40,6 +40,17 @@ { "name": "lino" }, + { + "name": "meat" + }, + { + "name": "meat-inhand-right", + "directions": 4 + }, + { + "name": "meat-inhand-left", + "directions": 4 + }, { "name": "mime" }, diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meat.png b/Resources/Textures/Structures/Furniture/chairs.rsi/meat.png new file mode 100644 index 0000000000..86330d1378 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/meat.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json index 18c588b280..42085448d1 100644 --- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14", "size": { "x": 32, "y": 32 @@ -39,6 +39,10 @@ "name": "comfy-overlay", "directions": 4 }, + { + "name": "meat", + "directions": 4 + }, { "name": "office-dark", "directions": 4 diff --git a/Resources/Textures/Structures/Machines/sheetifier.rsi/base_machine.png b/Resources/Textures/Structures/Machines/sheetifier.rsi/base_machine.png new file mode 100644 index 0000000000..95e6702830 Binary files /dev/null and b/Resources/Textures/Structures/Machines/sheetifier.rsi/base_machine.png differ diff --git a/Resources/Textures/Structures/Machines/sheetifier.rsi/base_machine_processing.png b/Resources/Textures/Structures/Machines/sheetifier.rsi/base_machine_processing.png new file mode 100644 index 0000000000..667e8d39b2 Binary files /dev/null and b/Resources/Textures/Structures/Machines/sheetifier.rsi/base_machine_processing.png differ diff --git a/Resources/Textures/Structures/Machines/sheetifier.rsi/buttons_on.png b/Resources/Textures/Structures/Machines/sheetifier.rsi/buttons_on.png new file mode 100644 index 0000000000..3b4fe8b151 Binary files /dev/null and b/Resources/Textures/Structures/Machines/sheetifier.rsi/buttons_on.png differ diff --git a/Resources/Textures/Structures/Machines/sheetifier.rsi/meta.json b/Resources/Textures/Structures/Machines/sheetifier.rsi/meta.json new file mode 100644 index 0000000000..d812ec569a --- /dev/null +++ b/Resources/Textures/Structures/Machines/sheetifier.rsi/meta.json @@ -0,0 +1,88 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4b2a8aebe52199bcc60ee11d80482dcd61bf605c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base_machine" + }, + { + "name": "base_machine_processing", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "buttons_on" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Walls/meat.rsi/full.png b/Resources/Textures/Structures/Walls/meat.rsi/full.png new file mode 100644 index 0000000000..97d47de2c1 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat0.png b/Resources/Textures/Structures/Walls/meat.rsi/meat0.png new file mode 100644 index 0000000000..be7fba07f2 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat0.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat1.png b/Resources/Textures/Structures/Walls/meat.rsi/meat1.png new file mode 100644 index 0000000000..bce3ecf445 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat1.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat2.png b/Resources/Textures/Structures/Walls/meat.rsi/meat2.png new file mode 100644 index 0000000000..be7fba07f2 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat2.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat3.png b/Resources/Textures/Structures/Walls/meat.rsi/meat3.png new file mode 100644 index 0000000000..bce3ecf445 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat3.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat4.png b/Resources/Textures/Structures/Walls/meat.rsi/meat4.png new file mode 100644 index 0000000000..234be652b9 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat4.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat5.png b/Resources/Textures/Structures/Walls/meat.rsi/meat5.png new file mode 100644 index 0000000000..fdebb65b35 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat5.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat6.png b/Resources/Textures/Structures/Walls/meat.rsi/meat6.png new file mode 100644 index 0000000000..234be652b9 Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat6.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meat7.png b/Resources/Textures/Structures/Walls/meat.rsi/meat7.png new file mode 100644 index 0000000000..8c51efe01b Binary files /dev/null and b/Resources/Textures/Structures/Walls/meat.rsi/meat7.png differ diff --git a/Resources/Textures/Structures/Walls/meat.rsi/meta.json b/Resources/Textures/Structures/Walls/meat.rsi/meta.json new file mode 100644 index 0000000000..6d0a34fbf3 --- /dev/null +++ b/Resources/Textures/Structures/Walls/meat.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC0-1.0", "copyright": "Created by EmoGarbage404 (github) for Space Station 14", "states": [{"name": "meat0", "directions": 4}, {"name": "meat1", "directions": 4}, {"name": "meat2", "directions": 4}, {"name": "meat3", "directions": 4}, {"name": "meat4", "directions": 4}, {"name": "meat5", "directions": 4}, {"name": "meat6", "directions": 4}, {"name": "meat7", "directions": 4}, {"name": "full"}]} \ No newline at end of file