diff --git a/Content.Server/_CP14/Currency/CP14CurrencySystem.cs b/Content.Server/_CP14/Currency/CP14CurrencySystem.cs index ea551a100b..b30c185541 100644 --- a/Content.Server/_CP14/Currency/CP14CurrencySystem.cs +++ b/Content.Server/_CP14/Currency/CP14CurrencySystem.cs @@ -26,8 +26,8 @@ public sealed partial class CP14CurrencySystem : CP14SharedCurrencySystem SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(OnGetCurrency); - SubscribeLocalEvent(OnEntityStorageGetCurrency); - SubscribeLocalEvent(OnStorageGetCurrency); + //SubscribeLocalEvent(OnEntityStorageGetCurrency); + //SubscribeLocalEvent(OnStorageGetCurrency); } private void OnGetCurrency(Entity ent, ref CP14GetCurrencyEvent args) @@ -41,27 +41,27 @@ public sealed partial class CP14CurrencySystem : CP14SharedCurrencySystem args.Currency += total; } - private void OnEntityStorageGetCurrency(Entity ent, ref CP14GetCurrencyEvent args) - { - var total = 0; - foreach (var entity in ent.Comp.Contents.ContainedEntities) - { - total += GetTotalCurrency(entity); - } - - args.Currency += total; - } - - private void OnStorageGetCurrency(Entity ent, ref CP14GetCurrencyEvent args) - { - var total = 0; - foreach (var entity in ent.Comp.StoredItems) - { - total += GetTotalCurrency(entity.Key); - } - - args.Currency += total; - } + //private void OnEntityStorageGetCurrency(Entity ent, ref CP14GetCurrencyEvent args) + //{ + // var total = 0; + // foreach (var entity in ent.Comp.Contents.ContainedEntities) + // { + // total += GetTotalCurrency(entity); + // } +// + // args.Currency += total; + //} +// + //private void OnStorageGetCurrency(Entity ent, ref CP14GetCurrencyEvent args) + //{ + // var total = 0; + // foreach (var entity in ent.Comp.StoredItems) + // { + // total += GetTotalCurrency(entity.Key); + // } +// + // args.Currency += total; + //} private void OnExamine(Entity currency, ref ExaminedEvent args) { diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 47abb40439..9f432dfd31 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -75,7 +75,7 @@ namespace Content.Shared.Maps [DataField("heatCapacity")] public float HeatCapacity = Atmospherics.MinimumHeatCapacity; [DataField("itemDrop", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string ItemDropPrototypeName { get; private set; } = "FloorTileItemSteel"; + public string? ItemDropPrototypeName { get; private set; } = null; //CP14 default null // TODO rename data-field in yaml /// diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml deleted file mode 100644 index 555b75f9d6..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml +++ /dev/null @@ -1,43 +0,0 @@ -- type: entity - id: CP14FlowersBase - parent: FoodProduceBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Tag - tags: - - CP14FitInMortar - - type: BadFood - - type: Item - size: Tiny - - type: Produce - - type: Sprite - layers: - - state: base1 - map: ["random"] - - type: RandomSprite - available: - - random: - base1: "" - base2: "" - -- type: entity - id: CP14FlowersYellow - parent: CP14FlowersBase - name: yellow dayflin - description: A yellow sun flower that smells like melted milk. Can be processed into a yellow dye. - components: - - type: Sprite - sprite: _CP14/Objects/Flora/Flowers/yellow_dayflin.rsi - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14YellowDayflinPulp - Quantity: 4 - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: - - ReagentId: CP14YellowDayflinPulp - Quantity: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index d3f52e29c3..f064c09924 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -18,7 +18,7 @@ description: Scarlet flowers growing where blood has been spilled. components: - type: Sprite - sprite: _CP14/Objects/Flora/Flowers/red_rose.rsi + sprite: _CP14/Objects/Flora/Wild/red_rose.rsi layers: - state: base1 map: ["random"] @@ -245,3 +245,31 @@ - ReagentId: CP14BlueAmanita Quantity: 5 +- type: entity + id: CP14Dayflin + parent: CP14WildProduceBase + name: yellow dayflin + description: A yellow sun flower that smells like melted milk. Can be processed into a yellow dye. + components: + - type: Sprite + sprite: _CP14/Objects/Flora/Wild/yellow_dayflin.rsi + layers: + - state: base1 + map: ["random"] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 4 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml new file mode 100644 index 0000000000..504cb05814 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/crowbar.yml @@ -0,0 +1,38 @@ +- type: entity + id: CP14BaseCrowbar + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponChemical + name: crowbar + description: A versatile and useful iron, for taking apart floors or other objects. + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/crowbar_drop.ogg + - type: Tag + tags: + - Crowbar + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 4 + soundHit: + collection: MetalThud + - type: Tool + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: ToolTileCompatible + - type: Prying + - type: Sprite + sprite: _CP14/Objects/Tools/crowbar.rsi + layers: + - state: icon + - type: Item + sprite: _CP14/Objects/Tools/crowbar.rsi + size: Normal + shape: + - 0,0,0,1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml index 2a39c4dcd0..98e9149dba 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml @@ -15,8 +15,6 @@ bodyType: Static - type: Transform anchored: true - - type: Climbable - delay: 3.0 - type: entity parent: CP14BaseFence diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/wooden_fence.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/wooden_fence.yml index 0aa18d16c7..a59953d195 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/wooden_fence.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/wooden_fence.yml @@ -30,8 +30,6 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Climbable - delay: 5 - type: entity parent: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml index 21b0da770f..1061c3af3c 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml @@ -1,5 +1,5 @@ - type: entity - id: CP14GatherableFlowersYellow + id: CP14GatherableDayflin parent: CP14GatherableWildBase name: yellow dayflin description: A yellow sun flower that smells like melted milk. Can be processed into a yellow dye. @@ -17,9 +17,11 @@ world1: "" world2: "" world3: "" + world4: "" + world5: "" - type: Gatherable loot: - All: CP14GatherFlowersYellow + All: CP14GatherDayflin toolWhitelist: tags: - CP14HerbalGathering @@ -27,8 +29,8 @@ - Hands - type: entityLootTable - id: CP14GatherFlowersYellow + id: CP14GatherDayflin entries: - - id: CP14FlowersYellow + - id: CP14Dayflin amount: 1 maxAmount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index a38e6b086f..aab45a1f2b 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -300,6 +300,7 @@ - CP14PenFeather - CP14Paper - CP14CopperCoin10 + - CP14BaseCrowbar - type: loadout id: CP14ClothingRingCureWounds @@ -323,4 +324,10 @@ id: CP14CopperCoin10 storage: back: - - CP14CopperCoin \ No newline at end of file + - CP14CopperCoin + +- type: loadout + id: CP14BaseCrowbar + storage: + back: + - CP14BaseCrowbar \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml index 6379957667..1991f03e88 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml @@ -115,7 +115,7 @@ - CP14FloorGrassLight - CP14FloorGrassTall entities: - - CP14GatherableFlowersYellow + - CP14GatherableDayflin - !type:BiomeEntityLayer # BLue amanita threshold: 0.7 noise: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Farming/seedbed.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Farming/seedbed.yml index 2d674ec1bc..7b36a91c0c 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Farming/seedbed.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Farming/seedbed.yml @@ -9,10 +9,10 @@ - to: CP14SeedbedWooden steps: - material: CP14Dirt - amount: 2 + amount: 1 doAfter: 2 - material: CP14WoodenPlanks - amount: 2 + amount: 1 doAfter: 2 - node: CP14SeedbedWooden @@ -25,8 +25,8 @@ completed: - !type:SpawnPrototype prototype: CP14WoodenPlanks1 - amount: 2 + amount: 1 - !type:SpawnPrototype prototype: CP14DirtBlock1 - amount: 2 + amount: 1 - !type:DeleteEntity {} \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml index 5d04db29a1..7a5684332a 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml @@ -79,6 +79,14 @@ CP14IronBar: 3 result: CP14BaseSword +- type: CP14Recipe + id: CP14BaseCrowbar + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 2 + result: CP14BaseCrowbar + - type: CP14Recipe id: CP14BaseTwoHandedSword tag: CP14RecipeAnvil diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 023f35abd6..31cb27e92f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -258,7 +258,7 @@ craftTime: 2 entities: CP14BloodFlower: 2 - CP14FlowersYellow: 2 + CP14Dayflin: 2 result: CP14ClothingHeadWreath # Wallpaper (TODO: Move to separate workbench?) diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index b20f4af894..78db22303e 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -98,7 +98,7 @@ West: /Textures/_CP14/Tiles/Grass/double_edge_W.png baseTurf: CP14FloorDirt deconstructTools: [ CP14Digging ] - itemDrop: CP14DirtEffect + itemDrop: CP14RandomDirtLootSpawner isSubfloor: false footstepSounds: collection: FootstepGrass @@ -131,7 +131,7 @@ West: /Textures/_CP14/Tiles/GrassLight/double_edge_W.png baseTurf: CP14FloorDirt deconstructTools: [ CP14Digging ] - itemDrop: CP14DirtEffect + itemDrop: CP14RandomDirtLootSpawner isSubfloor: false footstepSounds: collection: FootstepGrass @@ -164,7 +164,7 @@ West: /Textures/_CP14/Tiles/GrassTall/double_edge_W.png baseTurf: CP14FloorDirt deconstructTools: [ CP14Digging ] - itemDrop: CP14DirtEffect + itemDrop: CP14RandomDirtLootSpawner isSubfloor: false footstepSounds: collection: FootstepGrass diff --git a/Resources/Prototypes/_CP14/Tiles/produced.yml b/Resources/Prototypes/_CP14/Tiles/produced.yml index 4a34efc23b..387234c38d 100644 --- a/Resources/Prototypes/_CP14/Tiles/produced.yml +++ b/Resources/Prototypes/_CP14/Tiles/produced.yml @@ -2,8 +2,8 @@ editorHidden: false id: CP14FloorFoundation name: cp14-tiles-foundation - sprite: /Textures/_CP14/Tiles/Foundation/foundation.png - variants: 6 + sprite: /Textures/_CP14/Tiles/foundation.png + variants: 14 placementVariants: - 1.0 - 1.0 @@ -11,22 +11,21 @@ - 1.0 - 1.0 - 1.0 - edgeSpritePriority: 99 - edgeSprites: - SouthEast: /Textures/_CP14/Tiles/Foundation/single_edge.png - NorthEast: /Textures/_CP14/Tiles/Foundation/single_edge.png - NorthWest: /Textures/_CP14/Tiles/Foundation/single_edge.png - SouthWest: /Textures/_CP14/Tiles/Foundation/single_edge.png - South: /Textures/_CP14/Tiles/Foundation/double_edge_down.png - East: /Textures/_CP14/Tiles/Foundation/double_edge_right.png - North: /Textures/_CP14/Tiles/Foundation/double_edge_top.png - West: /Textures/_CP14/Tiles/Foundation/double_edge_left.png + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 99 #Dont have edges, but block natural ones baseTurf: CP14FloorBase isSubfloor: true footstepSounds: collection: FootstepAsteroid heatCapacity: 10000 - weather: false + weather: true - type: tile editorHidden: false diff --git a/Resources/Prototypes/_CP14/Tiles/woodplanks.yml b/Resources/Prototypes/_CP14/Tiles/woodplanks.yml index f9e7566896..30c1777b21 100644 --- a/Resources/Prototypes/_CP14/Tiles/woodplanks.yml +++ b/Resources/Prototypes/_CP14/Tiles/woodplanks.yml @@ -22,6 +22,8 @@ North: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_N.png West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 isSubfloor: false footstepSounds: collection: FootstepWood @@ -52,6 +54,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -81,6 +85,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -110,6 +116,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -141,6 +149,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -170,6 +179,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -199,6 +209,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -228,6 +239,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/RedWood/red_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -263,6 +275,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -292,6 +306,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -321,6 +337,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -350,6 +368,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -381,6 +401,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -410,6 +431,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -439,6 +461,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -468,6 +491,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/BirchWood/birch_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -503,6 +527,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -532,6 +558,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -561,6 +589,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -590,6 +620,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -621,6 +653,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -650,6 +683,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -679,6 +713,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -708,6 +743,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/OakWood/oak_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -743,6 +779,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -772,6 +810,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -801,6 +841,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -830,6 +872,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -861,6 +905,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -890,6 +935,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -919,6 +965,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -948,6 +995,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/DarkWood/dark_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -983,6 +1031,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/AcaciaWood/acacia_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1012,6 +1062,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/AcaciaWood/acacia_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1044,6 +1096,8 @@ footstepSounds: collection: FootstepWood heatCapacity: 10000 + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 weather: false burnedTile: CP14FloorWoodPlanksCruciformBurned @@ -1070,6 +1124,8 @@ West: /Textures/_CP14/Tiles/WoodPlanks/AcaciaWood/acacia_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: CP14WoodenPlanks1 footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1101,6 +1157,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/AcaciaWood/acacia_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1130,6 +1187,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/AcaciaWood/acacia_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1159,6 +1217,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/AcaciaWood/acacia_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1188,6 +1247,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/AcaciaWood/acacia_double_edge_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1216,6 +1276,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/Burned/double_edge_burned_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1239,6 +1300,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/Burned/double_edge_burned_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1262,6 +1324,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/Burned/double_edge_burned_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 @@ -1285,6 +1348,7 @@ West: /Textures/_CP14/Tiles/WoodPlanks/Burned/double_edge_burned_W.png baseTurf: CP14FloorFoundation isSubfloor: false + deconstructTools: [ Prying ] footstepSounds: collection: FootstepWood heatCapacity: 10000 diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base1.png deleted file mode 100644 index dc2c3c471e..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base2.png deleted file mode 100644 index 55f9e97c05..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/base2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/base1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base1.png rename to Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/base1.png diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/base2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/base2.png rename to Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/base2.png diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Flora/Wild/red_rose.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/base1.png new file mode 100644 index 0000000000..000b5e92cd Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/base2.png new file mode 100644 index 0000000000..d222c56157 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/meta.json similarity index 71% rename from Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/meta.json index 08bb0550ec..060b5e844a 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/yellow_dayflin.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CLA", - "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "copyright": "Created by Max Gab (Github) for CrystallPunk14", "states": [ { "name": "base1" diff --git a/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/icon.png new file mode 100644 index 0000000000..798769a444 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-left.png new file mode 100644 index 0000000000..99245971ed Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-right.png new file mode 100644 index 0000000000..6bc384926e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/meta.json new file mode 100644 index 0000000000..d0e8427409 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/crowbar.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json index a6a1aad1b3..07332436b4 100644 --- a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CLA", - "copyright": "Created by TheShuEd for CrystallPunk14", + "copyright": "Created by Max Gab for CrystallPunk14", "states": [ { "name": "world1" @@ -15,6 +15,12 @@ }, { "name": "world3" + }, + { + "name": "world4" + }, + { + "name": "world5" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png index 6c2082eb64..e1ed058d03 100644 Binary files a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png and b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png index 3c4873fafa..f1af244f7e 100644 Binary files a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png and b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world3.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world3.png index 0069ab9eb9..13b8b1554d 100644 Binary files a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world3.png and b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world4.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world4.png new file mode 100644 index 0000000000..868ee3a06e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world5.png b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world5.png new file mode 100644 index 0000000000..9070dd1347 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world5.png differ diff --git a/Resources/Textures/_CP14/Tiles/Foundation/attributions.yml b/Resources/Textures/_CP14/Tiles/Foundation/attributions.yml deleted file mode 100644 index 05effb1731..0000000000 --- a/Resources/Textures/_CP14/Tiles/Foundation/attributions.yml +++ /dev/null @@ -1,4 +0,0 @@ -- files: ["double_edge_down.png", "double_edge_left.png", "double_edge_right.png", "double_edge_top.png", "foundation.png", "single_edge.png"] - license: "CLA" - copyright: "Created by TheShuEd" - source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_down.png b/Resources/Textures/_CP14/Tiles/Foundation/double_edge_down.png deleted file mode 100644 index 429b04c006..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_down.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_left.png b/Resources/Textures/_CP14/Tiles/Foundation/double_edge_left.png deleted file mode 100644 index 42526ba0ac..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_right.png b/Resources/Textures/_CP14/Tiles/Foundation/double_edge_right.png deleted file mode 100644 index b82c33a0cb..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_top.png b/Resources/Textures/_CP14/Tiles/Foundation/double_edge_top.png deleted file mode 100644 index 1fb498d0c2..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Foundation/double_edge_top.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Foundation/foundation.png b/Resources/Textures/_CP14/Tiles/Foundation/foundation.png deleted file mode 100644 index 7ea0615bc4..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Foundation/foundation.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Foundation/single_edge.png b/Resources/Textures/_CP14/Tiles/Foundation/single_edge.png deleted file mode 100644 index 943c066b2d..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Foundation/single_edge.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/foundation.png b/Resources/Textures/_CP14/Tiles/foundation.png new file mode 100644 index 0000000000..c6212531d5 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/foundation.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 616ecef60e..f259416cee 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -115,6 +115,10 @@ CP14WallWhitebrick: CP14WallMarbleBrick #2024-10-24 CP14SpawnPointQuartermaster: CP14SpawnPointCommandant CP14SpawnPointMerchant: CP14SpawnPointBanker + +#2024-10-27 +CP14GatherableFlowersYellow: CP14GatherableDayflin +CP14FlowersYellow: CP14Dayflin # <---> CrystallPunk migration zone end