diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/grips.yml deleted file mode 100644 index 0c44b34446..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/grips.yml +++ /dev/null @@ -1,96 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularFishingRodGripBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - shape: - - 0,0,0,0 - - type: Sprite - state: icon - - type: ExaminableDamage - messages: CP14WeaponMessages - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: CP14ModularCraftStartPoint - startSlots: - - FishingRodShaft - - type: CP14MeleeSelfDamage - damageToSelf: - types: - Blunt: 0.5 - - type: MeleeWeapon - angle: 45 - attackRate: 1 - wideAnimationRotation: 135 - wideAnimation: CP14WeaponArcSlash - damage: - types: - Blunt: 0 - soundHit: - collection: MetalThud - cPAnimationLength: 0.25 - - type: Clothing - equipDelay: 0.25 - unequipDelay: 0.25 - quickEquip: false - breakOnMove: false - slots: - - neck - -- type: entity - parent: CP14ModularFishingRodGripBase - id: CP14ModularFishingRodGripWooden - name: wooden fishing rod grip - description: A simple wooden grip for a modular fishing rod. Lightweight and easy to handle, perfect for beginners or casual fishing. - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Grips/wooden.rsi - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularFishingRodGripWooden - -- type: entity - parent: CP14ModularFishingRodGripBase - id: CP14ModularFishingRodGripCopper - name: copper fishing rod grip - description: A sturdy copper grip for a modular fishing rod. Durable and resistant to wear, ideal for intermediate anglers. - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Grips/copper.rsi - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularFishingRodGripCopper - -- type: entity - parent: CP14ModularFishingRodGripBase - id: CP14ModularFishingRodGripIron - name: iron fishing rod grip - description: A heavy-duty iron grip for a modular fishing rod. Provides excellent stability and control for tough fishing conditions. - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Grips/iron.rsi - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularFishingRodGripIron - -- type: entity - parent: CP14ModularFishingRodGripBase - id: CP14ModularFishingRodGripGold - name: gold fishing rod grip - description: A luxurious gold grip for a modular fishing rod. Beautifully crafted and highly durable, favored by elite anglers. - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Grips/gold.rsi - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularFishingRodGripGold diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/shafts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/shafts.yml deleted file mode 100644 index 36ccaa7df0..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/shafts.yml +++ /dev/null @@ -1,58 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14FishingRodShaftBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - - type: Sprite - state: icon - - type: CP14ModularCraftPart - -- type: entity - parent: CP14FishingRodShaftBase - id: CP14FishingRodShaftWooden - name: wooden fishing rod shaft - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Shafts/wooden.rsi - - type: CP14ModularCraftPart - possibleParts: - - FishingRodShaftWooden - -- type: entity - parent: CP14FishingRodShaftBase - id: CP14FishingRodShaftCopper - name: copper fishing rod shaft - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Shafts/copper.rsi - - type: CP14ModularCraftPart - possibleParts: - - FishingRodShaftCopper - -- type: entity - parent: CP14FishingRodShaftBase - id: CP14FishingRodShaftIron - name: iron fishing rod shaft - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Shafts/iron.rsi - - type: CP14ModularCraftPart - possibleParts: - - FishingRodShaftIron - -- type: entity - parent: CP14FishingRodShaftBase - id: CP14FishingRodShaftGold - name: gold fishing rod shaft - components: - - type: Sprite - sprite: _CP14/Objects/Fishing/Shafts/gold.rsi - - type: CP14ModularCraftPart - possibleParts: - - FishingRodShaftGold diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/fishing_rods.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/fishing_rods.yml new file mode 100644 index 0000000000..cc84124cb1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/fishing_rods.yml @@ -0,0 +1,49 @@ +- type: entity + parent: BaseItem + id: CP14FishingRod + name: fishing rod + description: Wooden stick with string attached. + categories: [ ForkFiltered ] + components: + - type: Item + shape: + - 0,0,0,1 + - type: Sprite + sprite: _CP14\Objects\Fishing\fishing_rod.rsi + state: icon + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + - type: CP14ModularCraftStartPoint + startSlots: + - FishingRodShaft + - type: MeleeWeapon + angle: 45 + attackRate: 1 + wideAnimationRotation: 135 + wideAnimation: CP14WeaponArcSlash + damage: + types: + Blunt: 0.1 + soundHit: + collection: MetalThud + cPAnimationLength: 0.25 + - type: Clothing + equipDelay: 0.25 + unequipDelay: 0.25 + quickEquip: false + breakOnMove: false + slots: + - neck + - type: CP14FishingRod \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/FishingRods/shafts.yml b/Resources/Prototypes/_CP14/ModularCraft/FishingRods/shafts.yml deleted file mode 100644 index f8363c4681..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/FishingRods/shafts.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: modularPart - id: FishingRodShaftWooden - targetSlot: FishingRodShaft - sourcePart: CP14FishingRodShaftWooden - rsiPath: _CP14/Objects/Fishing/Shafts/wooden.rsi - modifiers: - - !type:AddComponents - components: - # I like the idea of parrying with a fishing rod, - # it's too cool to take away - - type: CP14MeleeParriable - - type: CP14FishingRod - -- type: modularPart - id: FishingRodShaftCopper - targetSlot: FishingRodShaft - sourcePart: CP14FishingRodShaftCopper - rsiPath: _CP14/Objects/Fishing/Shafts/copper.rsi - modifiers: - - !type:AddComponents - components: - - type: CP14MeleeParriable - - type: CP14FishingRod - -- type: modularPart - id: FishingRodShaftIron - targetSlot: FishingRodShaft - sourcePart: CP14FishingRodShaftIron - rsiPath: _CP14/Objects/Fishing/Shafts/iron.rsi - modifiers: - - !type:AddComponents - components: - - type: CP14MeleeParriable - - type: CP14FishingRod - -- type: modularPart - id: FishingRodShaftGold - targetSlot: FishingRodShaft - sourcePart: CP14FishingRodShaftGold - rsiPath: _CP14/Objects/Fishing/Shafts/gold.rsi - modifiers: - - !type:AddComponents - components: - - type: CP14MeleeParriable - - type: CP14FishingRod diff --git a/Resources/Prototypes/_CP14/ModularCraft/FishingRods/slots.yml b/Resources/Prototypes/_CP14/ModularCraft/FishingRods/slots.yml deleted file mode 100644 index 70b11fba90..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/FishingRods/slots.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: modularSlot - # It's fucked up, - # but what the fuck else could it be? - id: FishingRodShaft - name: cp14-modular-slot-fishing-rod-rod diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/icon.png deleted file mode 100644 index f79a237b57..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/inhand-left.png deleted file mode 100644 index 4b39bc0a08..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/inhand-right.png deleted file mode 100644 index 971547768a..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/meta.json deleted file mode 100644 index 51d9397ad4..0000000000 --- a/Resources/Textures/_CP14/Objects/Fishing/Grips/copper.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/icon.png deleted file mode 100644 index cbaa7a6a34..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/inhand-left.png deleted file mode 100644 index 1c96a63d17..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/inhand-right.png deleted file mode 100644 index 54a9ca89fc..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/meta.json deleted file mode 100644 index 51d9397ad4..0000000000 --- a/Resources/Textures/_CP14/Objects/Fishing/Grips/gold.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/icon.png deleted file mode 100644 index b510967e41..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/inhand-left.png deleted file mode 100644 index c274271dd2..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/inhand-right.png deleted file mode 100644 index 940acdc10b..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/meta.json deleted file mode 100644 index 51d9397ad4..0000000000 --- a/Resources/Textures/_CP14/Objects/Fishing/Grips/iron.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/icon.png deleted file mode 100644 index 69af6c1e41..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/inhand-left.png deleted file mode 100644 index 205924a119..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/inhand-right.png deleted file mode 100644 index b36e29defa..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/meta.json deleted file mode 100644 index 51d9397ad4..0000000000 --- a/Resources/Textures/_CP14/Objects/Fishing/Grips/wooden.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "Created by omsoyk (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/icon.png deleted file mode 100644 index 2c92a462de..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/inhand-left.png deleted file mode 100644 index 486c566747..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/inhand-right.png deleted file mode 100644 index e912be7781..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/icon.png deleted file mode 100644 index cdfb4d2bc8..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/inhand-left.png deleted file mode 100644 index 166467bf79..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/inhand-right.png deleted file mode 100644 index 96f6fa9d37..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/meta.json deleted file mode 100644 index ff0451567b..0000000000 --- a/Resources/Textures/_CP14/Objects/Fishing/Shafts/gold.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "size": { - "x": 48, - "y": 48 - }, - "license": "CLA", - "copyright": "Created by omsoyk (Discord) ", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/icon.png deleted file mode 100644 index 7d37a7a27b..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/inhand-left.png deleted file mode 100644 index 1738059963..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/inhand-right.png deleted file mode 100644 index f72df6ee62..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/meta.json deleted file mode 100644 index ff0451567b..0000000000 --- a/Resources/Textures/_CP14/Objects/Fishing/Shafts/iron.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "size": { - "x": 48, - "y": 48 - }, - "license": "CLA", - "copyright": "Created by omsoyk (Discord) ", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/meta.json deleted file mode 100644 index ff0451567b..0000000000 --- a/Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "size": { - "x": 48, - "y": 48 - }, - "license": "CLA", - "copyright": "Created by omsoyk (Discord) ", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/anchovy.png b/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/anchovy.png deleted file mode 100644 index 2a33a9c643..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/anchovy.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/bream.png b/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/bream.png deleted file mode 100644 index 4fd33f9fd2..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/bream.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/eel.png b/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/eel.png deleted file mode 100644 index d6fab552c7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/eel.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/frog.png b/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/frog.png deleted file mode 100644 index aa41c40aad..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/frog.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/goldfish.png b/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/goldfish.png deleted file mode 100644 index 92b5e2f447..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/fish.rsi/goldfish.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/icon.png rename to Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Fishing/Shafts/wooden.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Fishing/Shafts/copper.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Fishing/fishing_rod.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Fishing/food.rsi/cooked_fish_meat.png b/Resources/Textures/_CP14/Objects/Fishing/food.rsi/cooked_fish_meat.png deleted file mode 100644 index 5abca40262..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/food.rsi/cooked_fish_meat.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Fishing/food.rsi/fish_meat.png b/Resources/Textures/_CP14/Objects/Fishing/food.rsi/fish_meat.png deleted file mode 100644 index e3845929dd..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Fishing/food.rsi/fish_meat.png and /dev/null differ