diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index 518c33b031..2195cfd92c 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -5,6 +5,7 @@ components: - type: StorageFill contents: + - id: CP14HandLabeler - id: CP14Lighter - id: CP14ManaOperationGlove - id: CP14Syringe @@ -24,6 +25,10 @@ amount: 1 - id: CP14VialSmall amount: 3 + - id: CP14VialSkullReinforced + prob: 0.3 + - id: CP14VialSkull + prob: 0.5 - id: CP14PaperFolderBlue - id: CP14PenFeather amount: 1 @@ -43,7 +48,7 @@ components: - type: StorageFill contents: - - id: HandLabeler #TODO custom cp14 labeler + - id: CP14HandLabeler - id: CP14StampDenied - id: CP14StampApproved - id: CP14ManaOperationGlove @@ -73,7 +78,7 @@ components: - type: StorageFill contents: - - id: HandLabeler #TODO custom cp14 labeler + - id: CP14HandLabeler - id: CP14WoodenPlanks20 - id: CP14CopperBar10 - id: CP14CopperBar10 @@ -131,7 +136,7 @@ - type: StorageFill contents: - id: CP14StampGuildmaster - - id: HandLabeler #TODO custom cp14 labeler + - id: CP14HandLabeler - id: CP14StampDenied - id: CP14StampApproved - id: CP14PaperFolderBlue diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml index d60631feca..f989ca6c88 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml @@ -317,3 +317,128 @@ CP14Glass: 40 CP14Copper: 10 +- type: entity + id: CP14VialStar + parent: CP14BaseVialFragile + name: star vial + description: A fragile glass vial in the shape of a star, an unusual but symbolic shape. + components: + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/vial_star.rsi + layers: + - state: vial + - state: liq-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] + - type: Item + size: Tiny + sprite: _CP14/Objects/Specific/Alchemy/vial_star.rsi + - type: SolutionContainerManager + solutions: + vial: + maxVol: 15 + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: liq- + - type: PhysicalComposition + materialComposition: + CP14Glass: 20 + +- type: entity + id: CP14VialStarReinforced + parent: CP14BaseVial + name: reinforced star vial + description: A reinforced glass star-shaped vial to hold a small amount of liquid. + components: + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/vial_star.rsi + layers: + - state: reinforcement_back + - state: vial + - state: liq-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: reinforcement + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] + - type: Item + size: Tiny + sprite: _CP14/Objects/Specific/Alchemy/vial_star.rsi + - type: SolutionContainerManager + solutions: + vial: + maxVol: 15 + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: liq- + - type: PhysicalComposition + materialComposition: + CP14Glass: 20 + CP14Copper: 10 + +- type: entity + id: CP14VialSkull + parent: CP14BaseVialFragile + name: skull vial + description: A fragile skull-shaped vial in which to conveniently store poisonous liquids. + components: + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/vial_skull.rsi + layers: + - state: vial + - state: liq-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] + - type: Item + size: Tiny + sprite: _CP14/Objects/Specific/Alchemy/vial_skull.rsi + - type: SolutionContainerManager + solutions: + vial: + maxVol: 20 + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: liq- + - type: PhysicalComposition + materialComposition: + CP14Glass: 25 + +- type: entity + id: CP14VialSkullReinforced + parent: CP14BaseVial + name: reinforced skull vial + description: A skull-shaped reinforced glass vial to hold a small amount of liquid, now the poison is sure not to accidentally spill onto your skin. + components: + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/vial_skull.rsi + layers: + - state: reinforcement_back + - state: vial + - state: liq-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: reinforcement + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] + - type: Item + size: Tiny + sprite: _CP14/Objects/Specific/Alchemy/vial_skull.rsi + - type: SolutionContainerManager + solutions: + vial: + maxVol: 20 + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: liq- + - type: PhysicalComposition + materialComposition: + CP14Glass: 25 + CP14Copper: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/hand_labeler.yml new file mode 100644 index 0000000000..7527abcd60 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/hand_labeler.yml @@ -0,0 +1,28 @@ +- type: entity + parent: BaseItem + id: CP14HandLabeler + name: hand labeler + description: A hand labeler, used to label items and objects. + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Objects/Tools/hand_labeler.rsi + state: hand_labeler + - type: Item + sprite: _CP14/Objects/Tools/hand_labeler.rsi + storedRotation: -90 + - type: UseDelay + delay: 2.0 + - type: ActivatableUI + key: enum.HandLabelerUiKey.Key + inHandsOnly: true + - type: UserInterface + interfaces: + enum.HandLabelerUiKey.Key: + type: HandLabelerBoundUserInterface + - type: HandLabeler + whitelist: + components: + - Item + tags: + - Structure diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml index 232a05033c..3f244e7a99 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml @@ -58,6 +58,46 @@ graph: CP14WoodenDoor node: CP14WoodenDoorFrameMirrored +- type: entity + parent: CP14BaseDoorFrame + id: CP14WoodenBirchDoorFrame + name: wooden birch door frame + description: An unfinished wooden birch door. + components: + - type: Sprite + sprite: _CP14/Structures/Doors/wooden_birch_frame.rsi + drawdepth: Mobs + state: closed + - type: Damageable + damageContainer: Inorganic + damageModifierSet: CP14WoodStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodenPlanks1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: CP14WoodenBirchDoor + node: CP14WoodenBirchDoorFrame + +- type: entity + parent: CP14WoodenBirchDoorFrame + id: CP14WoodenBirchDoorFrameMirrored + components: + - type: Sprite + state: closed_mirrored + - type: Construction + graph: CP14WoodenBirchDoor + node: CP14WoodenBirchDoorFrameMirrored + - type: entity parent: CP14BaseDoorFrame id: CP14IronDoorFrame diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_birch_doors.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_birch_doors.yml new file mode 100644 index 0000000000..e06e0ee12a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_birch_doors.yml @@ -0,0 +1,53 @@ +- type: entity + id: CP14WoodenBirchDoor + parent: + - CP14BaseDoor + - CP14BaseFlammableSpreading + name: wooden birch door + description: Not the most solid construction, but it's better than nothing. + suffix: Opened + components: + - type: Sprite + sprite: _CP14/Structures/Doors/wooden_birch_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Door + openSound: + path: /Audio/Effects/door_open.ogg + closeSound: + path: /Audio/Effects/door_close.ogg + - type: Damageable + damageContainer: Inorganic + damageModifierSet: CP14WoodStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodenPlanks1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WoodenBirchDoorFrame + - type: Construction + graph: CP14WoodenBirchDoor + node: CP14WoodenBirchDoor + +- type: entity + id: CP14WoodenBirchDoorMirrored + parent: CP14WoodenBirchDoor + suffix: Opened, Mirrored + components: + - type: Door + openSpriteState: open_mirrored + closedSpriteState: closed_mirrored + - type: Construction + graph: CP14WoodenBirchDoor + node: CP14WoodenBirchDoorMirrored + diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_birch_doors_windowed.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_birch_doors_windowed.yml new file mode 100644 index 0000000000..e3deda54e2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_birch_doors_windowed.yml @@ -0,0 +1,55 @@ +- type: entity + id: CP14WoodenBirchDoorWindowed + parent: + - CP14BaseDoor + - CP14BaseFlammableSpreading + name: wooden birch windowed door + description: Not the most solid construction, but it's better than nothing. + suffix: Opened + components: + - type: Sprite + sprite: _CP14/Structures/Doors/wooden_birch_windowed_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: Occluder + enabled: false + - type: Door + occludes: false + openSound: + path: /Audio/Effects/door_open.ogg + closeSound: + path: /Audio/Effects/door_close.ogg + - type: Damageable + damageContainer: Inorganic + damageModifierSet: CP14WoodStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodenPlanks1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WoodenDoorFrame + - type: Construction + graph: CP14WoodenBirchDoor + node: CP14WoodenBirchDoorWindowed + +- type: entity + id: CP14WoodenBirchDoorWindowedMirrored + parent: CP14WoodenBirchDoorWindowed + suffix: Opened, Mirrored + components: + - type: Door + openSpriteState: open_mirrored + closedSpriteState: closed_mirrored + - type: Construction + graph: CP14WoodenBirchDoor + node: CP14WoodenBirchDoorWindowedMirrored diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_birch_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_birch_doors.yml new file mode 100644 index 0000000000..e79767e791 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_birch_doors.yml @@ -0,0 +1,127 @@ +- type: constructionGraph + id: CP14WoodenBirchDoor + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WoodenBirchDoorFrame + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 2 + + - node: CP14WoodenBirchDoorFrame + entity: CP14WoodenBirchDoorFrame + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 4 + - to: CP14WoodenBirchDoorFrameMirrored + steps: + - tool: CP14Hammering + doAfter: 1 + - to: CP14WoodenBirchDoor + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 2 + - to: CP14WoodenBirchDoorWindowed + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 2 + + - node: CP14WoodenBirchDoorFrameMirrored + entity: CP14WoodenBirchDoorFrameMirrored + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 4 + - to: CP14WoodenBirchDoorFrame + steps: + - tool: CP14Hammering + doAfter: 1 + - to: CP14WoodenBirchDoorMirrored + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 2 + - to: CP14WoodenBirchDoorWindowedMirrored + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 2 + + - node: CP14WoodenBirchDoor + entity: CP14WoodenBirchDoor + edges: + - to: CP14WoodenBirchDoorFrame + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false + steps: + - tool: Prying + doAfter: 4 + + - node: CP14WoodenBirchDoorMirrored + entity: CP14WoodenBirchDoorMirrored + edges: + - to: CP14WoodenBirchDoorFrameMirrored + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false + steps: + - tool: Prying + doAfter: 4 + + - node: CP14WoodenBirchDoorWindowed + entity: CP14WoodenBirchDoorWindowed + edges: + - to: CP14WoodenBirchDoorFrame + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false + steps: + - tool: Prying + doAfter: 4 + + - node: CP14WoodenBirchDoorWindowedMirrored + entity: CP14WoodenBirchDoorWindowedMirrored + edges: + - to: CP14WoodenBirchDoorFrameMirrored + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false + steps: + - tool: Prying + doAfter: 4 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/doors.yml index aba29a5e70..4eed388979 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/doors.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/doors.yml @@ -54,6 +54,62 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + id: CP14WoodenBirchDoor + graph: CP14WoodenBirchDoor + startNode: start + targetNode: CP14WoodenBirchDoor + category: construction-category-structures + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14WoodenBirchDoorMirrored + graph: CP14WoodenBirchDoor + startNode: start + targetNode: CP14WoodenBirchDoorMirrored + category: construction-category-structures + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14WoodenBirchDoorWindowed + graph: CP14WoodenBirchDoor + startNode: start + targetNode: CP14WoodenBirchDoorWindowed + category: construction-category-structures + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + id: CP14WoodenBirchDoorWindowedMirrored + graph: CP14WoodenBirchDoor + startNode: start + targetNode: CP14WoodenBirchDoorWindowedMirrored + category: construction-category-structures + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true id: CP14IronDoor diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index cca6a40f0e..de45081aff 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -26,6 +26,29 @@ count: 1 result: CP14BucketLucens +- type: CP14Recipe + id: CP14HandLabeler + tag: CP14RecipeWorkbench + category: Tools + craftTime: 3 + requirements: + - !type:StackGroupResource + group: WoodenPlanks + count: 2 + - !type:ProtoIdResource + protoId: CP14CrayonWhite + count: 1 + - !type:ProtoIdResource + protoId: CP14CrayonBlack + count: 1 + - !type:ProtoIdResource + protoId: CP14String + count: 1 + - !type:ProtoIdResource + protoId: CP14PenFeather + count: 1 + result: CP14HandLabeler + - type: CP14Recipe id: CP14WoodenBeerMug tag: CP14RecipeWorkbench diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml index 9a76474aee..bb62f88f92 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml @@ -163,6 +163,35 @@ count: 4 result: CP14VialMediumReinforced +- type: CP14Recipe + id: CP14VialStar + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:SkillRequired + skills: + - GlassMelting + - !type:StackResource + stack: CP14GlassSheet + count: 2 + result: CP14VialStar + +- type: CP14Recipe + id: CP14VialStarReinforced + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:SkillRequired + skills: + - GlassMelting + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:StackResource + stack: CP14GlassSheet + count: 2 + result: CP14VialStarReinforced + - type: CP14Recipe id: CP14BaseAlchemyBomb tag: CP14RecipeMeltingFurnace diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/brad_potions.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/brad_potions.yml index 76bca77408..cb449d6cec 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/brad_potions.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/brad_potions.yml @@ -255,4 +255,28 @@ sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi state: vial service: !type:CP14BuyItemsService - product: CP14VialSmallRainbow \ No newline at end of file + product: CP14VialSmallRainbow + +- type: cp14TradingPosition + id: CP14VialSkull + reputationLevel: 3 + priceMarkup: 2 + faction: BradPotions + uiPosition: 2 + icon: + sprite: _CP14/Objects/Specific/Alchemy/vial_skull.rsi + state: vial + service: !type:CP14BuyItemsService + product: CP14VialSkull + +- type: cp14TradingPosition + id: CP14VialSkullReinforced + reputationLevel: 3 + priceMarkup: 3 + faction: BradPotions + uiPosition: 3 + icon: + sprite: _CP14/Objects/Specific/Alchemy/vial_skull.rsi + state: vial + service: !type:CP14BuyItemsService + product: CP14VialSkullReinforced diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/label.png index 023f5c6b01..1ac0a34faf 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/label.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-1.png index 971dd8b3d2..7413a6b7a0 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-1.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-2.png index 1ef46d8137..137d307888 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-2.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-3.png index aa4471240f..e5b748978d 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-3.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-4.png index 2ea27dda50..399821d647 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-4.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-5.png index 9b43def8fc..8a595150ab 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-5.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-5.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/meta.json index 641bba9d6e..342ae07ce3 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", + "copyright": "Created by .kreks (Discord) ", "states": [ { "name": "vial" @@ -30,6 +30,9 @@ }, { "name": "reinforcement" + }, + { + "name": "reinforcement_back" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement.png index e67b215265..2d788fd6f2 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement_back.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement_back.png new file mode 100644 index 0000000000..f8dc992288 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement_back.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/vial.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/vial.png index 6054350d84..1bde062210 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/vial.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/vial.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/label.png new file mode 100644 index 0000000000..05691450c8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-1.png new file mode 100644 index 0000000000..e4dca36b8b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-2.png new file mode 100644 index 0000000000..6e48aa28e4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-3.png new file mode 100644 index 0000000000..877a4f2d8c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-4.png new file mode 100644 index 0000000000..b641cf41a5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-5.png new file mode 100644 index 0000000000..adf122213f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/liq-5.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/meta.json new file mode 100644 index 0000000000..342ae07ce3 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by .kreks (Discord) ", + "states": [ + { + "name": "vial" + }, + { + "name": "label" + }, + { + "name": "liq-1" + }, + { + "name": "liq-2" + }, + { + "name": "liq-3" + }, + { + "name": "liq-4" + }, + { + "name": "liq-5" + }, + { + "name": "reinforcement" + }, + { + "name": "reinforcement_back" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/reinforcement.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/reinforcement.png new file mode 100644 index 0000000000..6349de552d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/reinforcement.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/reinforcement_back.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/reinforcement_back.png new file mode 100644 index 0000000000..9498dc759d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/reinforcement_back.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/vial.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/vial.png new file mode 100644 index 0000000000..475f214bbb Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_skull.rsi/vial.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/bomb.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/bomb.png index 2f124c3bc1..b797884b14 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/bomb.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/bomb.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/label.png index f50ce0a103..7e6af5454e 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/label.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-1.png index a0af350f3b..ccd264ea73 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-1.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-2.png index 5a90432953..ebd5b66362 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-2.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-3.png index 01ed290ee4..263b9525aa 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-3.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-4.png index 9c4f234cd9..255de53873 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-4.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-5.png index a510a956c9..d247025385 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-5.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/liq-5.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json index 2cf19aab61..f752236c19 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", + "copyright": "Created by .kreks. (Discord) ", "states": [ { "name": "vial" @@ -38,4 +38,4 @@ "name": "reinforcement_back" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement.png index 4c65748881..48fb4b000b 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement_back.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement_back.png index f9b1dee229..fadf660991 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement_back.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/reinforcement_back.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/vial.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/vial.png index 7fff0c2428..24938d0752 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/vial.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/vial.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/label.png new file mode 100644 index 0000000000..7e6af5454e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-1.png new file mode 100644 index 0000000000..79247adb6f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-2.png new file mode 100644 index 0000000000..44f644733f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-3.png new file mode 100644 index 0000000000..d973d0cec7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-4.png new file mode 100644 index 0000000000..03cc03a42f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-5.png new file mode 100644 index 0000000000..1bd53c4ab7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/liq-5.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/meta.json new file mode 100644 index 0000000000..342ae07ce3 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by .kreks (Discord) ", + "states": [ + { + "name": "vial" + }, + { + "name": "label" + }, + { + "name": "liq-1" + }, + { + "name": "liq-2" + }, + { + "name": "liq-3" + }, + { + "name": "liq-4" + }, + { + "name": "liq-5" + }, + { + "name": "reinforcement" + }, + { + "name": "reinforcement_back" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/reinforcement.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/reinforcement.png new file mode 100644 index 0000000000..1791d32321 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/reinforcement.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/reinforcement_back.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/reinforcement_back.png new file mode 100644 index 0000000000..11c4e335b6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/reinforcement_back.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/vial.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/vial.png new file mode 100644 index 0000000000..49f71c2e06 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_star.rsi/vial.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/label.png index 76cedd47e4..5ef08202e6 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/label.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-1.png index aef63848f1..c2d2729629 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-1.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-2.png index 2edda69cd8..2198b2f7c9 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-2.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-3.png index f3376bcf79..0543a7b7e3 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-3.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-4.png index 726cf864dd..c4d15e58d1 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-4.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-5.png index 680db5e95f..37e174bf15 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-5.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/liq-5.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json index 974cbd3c0f..342ae07ce3 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", + "copyright": "Created by .kreks (Discord) ", "states": [ { "name": "vial" @@ -35,4 +35,4 @@ "name": "reinforcement_back" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement.png index ca2fd1a61b..0200f678de 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement_back.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement_back.png index e49ed48797..3afc5240f6 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement_back.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/reinforcement_back.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/vial.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/vial.png index 32fea72740..411d9fcdf8 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/vial.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/vial.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/hand_labeler.png b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/hand_labeler.png new file mode 100644 index 0000000000..b7ccb6ccf3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/hand_labeler.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/inhand-left.png new file mode 100644 index 0000000000..6b2b706a15 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/inhand-right.png new file mode 100644 index 0000000000..f8c69c0b35 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/meta.json new file mode 100644 index 0000000000..84514a4397 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/hand_labeler.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Deenke/Deenkaide", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hand_labeler" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed.png index d85c694740..016963076e 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed.png and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed_mirrored.png index 91532b13c3..75375963c7 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/meta.json index 8bd7bf8624..661c16a9c3 100644 --- a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "By TheShuEd", + "copyright": "By TheShuEd & resprite by omsoyk", "size": { "x": 64, "y": 96 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open.png index 36b3666b8a..6978521edd 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open.png and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open_mirrored.png index 4bf14bca57..4740c7eea9 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/iron_door.rsi/open_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed.png index a8c8c7ad6a..d2392dff17 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed.png and b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed_mirrored.png index d58fc3b300..68e836ee2b 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/meta.json index 089fee6a93..8d18cf64de 100644 --- a/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Doors/iron_frame.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "By TheShuEd", + "copyright": "By TheShuEd & resprite by omsoyk", "size": { "x": 64, "y": 96 @@ -16,4 +16,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed.png index dc9cf82dd7..6309743d8b 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed.png and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed_mirrored.png index 07e43b3c3c..f660603298 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/meta.json index 8bd7bf8624..661c16a9c3 100644 --- a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "By TheShuEd", + "copyright": "By TheShuEd & resprite by omsoyk", "size": { "x": 64, "y": 96 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open.png index 03c35ea264..f488fda2a3 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open.png and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open_mirrored.png index 047603433f..d62204ee5f 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/iron_windowed_door.rsi/open_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/closed.png new file mode 100644 index 0000000000..3ed42e09f0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/closed_mirrored.png new file mode 100644 index 0000000000..f7b4bca5b4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/meta.json new file mode 100644 index 0000000000..15a2eb963e --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "By jaraten(discord), mirrored by TheShuEd & resprite by omsoyk", + "size": { + "x": 64, + "y": 96 + }, + "states": [ + { + "name": "closed", + "directions": 4 + }, + { + "name": "open", + "directions": 4 + }, + { + "name": "open_mirrored", + "directions": 4 + }, + { + "name": "closed_mirrored", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/open.png new file mode 100644 index 0000000000..eaeaf824d7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/open_mirrored.png new file mode 100644 index 0000000000..12480f7876 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_door.rsi/open_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/closed.png new file mode 100644 index 0000000000..d6d1993c8f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/closed_mirrored.png new file mode 100644 index 0000000000..c7f3c9c580 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/meta.json new file mode 100644 index 0000000000..8d18cf64de --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_frame.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "By TheShuEd & resprite by omsoyk", + "size": { + "x": 64, + "y": 96 + }, + "states": [ + { + "name": "closed", + "directions": 4 + }, + { + "name": "closed_mirrored", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/closed.png new file mode 100644 index 0000000000..e561486ea1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/closed_mirrored.png new file mode 100644 index 0000000000..ddc91c69f0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/meta.json new file mode 100644 index 0000000000..829c97c1a6 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "By jaraten(discord), add windows and mirrored by TheShuEd & resprite by omsoyk", + "size": { + "x": 64, + "y": 96 + }, + "states": [ + { + "name": "closed", + "directions": 4 + }, + { + "name": "open", + "directions": 4 + }, + { + "name": "open_mirrored", + "directions": 4 + }, + { + "name": "closed_mirrored", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/open.png new file mode 100644 index 0000000000..006e5b1054 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/open_mirrored.png new file mode 100644 index 0000000000..78aadcb4fb Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Doors/wooden_birch_windowed_door.rsi/open_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png index baedea16ad..747bd93f6a 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed_mirrored.png index 3514863750..bc2fb3e647 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/meta.json index 2af72139c5..15a2eb963e 100644 --- a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "By jaraten(discord), mirrored by TheShuEd", + "copyright": "By jaraten(discord), mirrored by TheShuEd & resprite by omsoyk", "size": { "x": 64, "y": 96 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png index b69b6def99..85e5244d01 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open_mirrored.png index a495a4a9dd..e51c7f6607 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_door.rsi/open_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed.png index 4bc9455636..4a0d8322e3 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed_mirrored.png index 1a2f9b05e6..252cf7153e 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/meta.json index 089fee6a93..8d18cf64de 100644 --- a/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Doors/wooden_frame.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "By TheShuEd", + "copyright": "By TheShuEd & resprite by omsoyk", "size": { "x": 64, "y": 96 @@ -16,4 +16,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed.png b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed.png index 2b86420c62..f6dbb5c97e 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed_mirrored.png index f6bcc4bb79..c0d4f378b3 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/closed_mirrored.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/meta.json b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/meta.json index fc7085e64e..829c97c1a6 100644 --- a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "By jaraten(discord), add windows and mirrored by TheShuEd", + "copyright": "By jaraten(discord), add windows and mirrored by TheShuEd & resprite by omsoyk", "size": { "x": 64, "y": 96 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open.png b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open.png index fd011c0157..5c5f1b1057 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open.png differ diff --git a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open_mirrored.png b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open_mirrored.png index 67673f58a2..0ab3a8edee 100644 Binary files a/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open_mirrored.png and b/Resources/Textures/_CP14/Structures/Doors/wooden_windowed_door.rsi/open_mirrored.png differ