diff --git a/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs b/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs index a9b951cb99..190e7037e1 100644 --- a/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs +++ b/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs @@ -8,6 +8,7 @@ using Content.Shared._CP14.MagicSpell.Components; using Content.Shared._CP14.MagicSpell.Events; using Content.Shared._CP14.MagicSpell.Spells; using Content.Shared.Actions; +using Content.Shared.CombatMode.Pacification; using Content.Shared.FixedPoint; using Content.Shared.Projectiles; using Content.Shared.Throwing; @@ -62,6 +63,12 @@ public sealed class CP14MagicSystem : CP14SharedMagicSystem private void OnMeleeHit(Entity ent, ref MeleeHitEvent args) { + if (HasComp(args.User)) //IDK how to check if the user is pacified in a better way + return; + + if (!args.IsHit) + return; + if (!_random.Prob(ent.Comp.Prob)) return; diff --git a/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs b/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs index 11b5976ec4..ecf30fa109 100644 --- a/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs +++ b/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs @@ -71,6 +71,7 @@ public abstract partial class CP14SharedFarmingSystem { BreakOnDamage = true, BlockDuplicate = false, + CancelDuplicate = false, BreakOnMove = true, BreakOnHandChange = true, }; @@ -156,6 +157,7 @@ public abstract partial class CP14SharedFarmingSystem { BreakOnDamage = true, BlockDuplicate = false, + CancelDuplicate = false, BreakOnMove = true, BreakOnHandChange = true, }; diff --git a/Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs b/Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs index 5b110fc5a6..efb0fa282c 100644 --- a/Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs +++ b/Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs @@ -37,6 +37,7 @@ public sealed class CP14EditTileToolSystem : EntitySystem { BreakOnDamage = true, BlockDuplicate = false, + CancelDuplicate = false, BreakOnMove = true, BreakOnHandChange = true, }; @@ -65,7 +66,7 @@ public sealed class CP14EditTileToolSystem : EntitySystem return; args.Handled = true; - + _map.SetTile((map.Value, gridComp), location, new Tile(_proto.Index(replaceTile).TileId)); _audio.PlayPredicted(ent.Comp.Sound, location, args.User); } diff --git a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl index ec5f29f15e..6981cfd8c9 100644 --- a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl @@ -11,6 +11,7 @@ cp14-tiles-snow = snow cp14-tiles-snow-deep = deep snow cp14-tiles-snow-deep-deep = deep deep snow cp14-tiles-marble-cave = marble floor +cp14-tiles-cobblestone = cobblestone # Produced cp14-tiles-foundation = foundation diff --git a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl index e3ef7e6390..67fda911eb 100644 --- a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl @@ -11,6 +11,7 @@ cp14-tiles-snow = снег cp14-tiles-snow-deep = глубокий снег cp14-tiles-snow-deep-deep = очень глубокий снег cp14-tiles-marble-cave = мраморный пол +cp14-tiles-cobblestone = булыжник # Produced cp14-tiles-foundation = фундамент diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml index df99828917..25ef1d7300 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml @@ -10,6 +10,18 @@ chance: 1 deleteSpawnerAfterSpawn: false +- type: entity + id: CP14RandomStoneLootSpawner + name: dirt spawner + parent: CP14DirtEffect + categories: [ ForkFiltered ] + components: + - type: RandomSpawner + prototypes: + - CP14StoneBlock1 + chance: 1 + deleteSpawnerAfterSpawn: false + - type: entity id: CP14RandomSnowLootSpawner name: snow spawner diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml index 9088da3ae2..9200f11d34 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml @@ -77,6 +77,14 @@ - type: CP14MagicEssenceContainer essences: Earth: 1 + - type: FloorTile + placeTileSound: + collection: CP14Digging #TODO + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorCobblestone - type: entity id: CP14StoneBlock10 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/chasm.yml b/Resources/Prototypes/_CP14/Entities/Structures/Floor/chasm.yml similarity index 85% rename from Resources/Prototypes/_CP14/Entities/Structures/chasm.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Floor/chasm.yml index 12f14c00aa..758e731c9c 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/chasm.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Floor/chasm.yml @@ -45,6 +45,13 @@ - ItemMask density: 1000 hard: false + fix2: # For block AI movement + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + density: 30 + mask: + - ItemMask - type: Tag tags: - HideContextMenu \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorLava.yml b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorLava.yml index 5743342506..91587f4b9b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorLava.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorLava.yml @@ -55,6 +55,15 @@ - ItemMask density: 1000 hard: false + fix2: # For block AI movement + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + density: 30 + mask: + - ItemMask + - type: CollisionWake + enabled: false - type: Tag tags: - HideContextMenu \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml index c68dbe0547..1387e6b07a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml @@ -39,15 +39,6 @@ - TableMask layer: - TableLayer - fix2: #For melee or laser - hard: true - shape: - !type:PhysShapeAabb - bounds: "-0.35,-0.35,0.35,0.35" - mask: - - FullTileMask - layer: - - Opaque - type: Damageable damageContainer: Inorganic damageModifierSet: Wood diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index dfc5fa5346..519a3b6a8d 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -40,6 +40,37 @@ heatCapacity: 10000 weather: true +- type: tile + editorHidden: false + id: CP14FloorCobblestone + name: cp14-tiles-cobblestone + sprite: /Textures/_CP14/Tiles/Cobblestone/cobble.png + variants: 5 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 2 + edgeSprites: + SouthEast: /Textures/_CP14/Tiles/Cobblestone/single_edge_SE.png + NorthEast: /Textures/_CP14/Tiles/Cobblestone/single_edge_NE.png + NorthWest: /Textures/_CP14/Tiles/Cobblestone/single_edge_NW.png + SouthWest: /Textures/_CP14/Tiles/Cobblestone/single_edge_SW.png + South: /Textures/_CP14/Tiles/Cobblestone/double_edge_S.png + East: /Textures/_CP14/Tiles/Cobblestone/double_edge_E.png + North: /Textures/_CP14/Tiles/Cobblestone/double_edge_N.png + West: /Textures/_CP14/Tiles/Cobblestone/double_edge_W.png + baseTurf: CP14FloorDirt + deconstructTools: [ CP14Digging ] + itemDrop: CP14RandomStoneLootSpawner + isSubfloor: true + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + weather: true + - type: tile editorHidden: false id: CP14FloorMarbleCave @@ -83,7 +114,7 @@ - 1.0 - 1.0 - 1.0 - edgeSpritePriority: 2 + edgeSpritePriority: 3 edgeSprites: SouthEast: /Textures/_CP14/Tiles/Sand/single_edge_SE.png NorthEast: /Textures/_CP14/Tiles/Sand/single_edge_NE.png @@ -115,7 +146,7 @@ - 1.0 - 1.0 - 1.0 - edgeSpritePriority: 3 + edgeSpritePriority: 4 edgeSprites: SouthEast: /Textures/_CP14/Tiles/Grass/single_edge_SE.png NorthEast: /Textures/_CP14/Tiles/Grass/single_edge_NE.png @@ -147,7 +178,7 @@ - 1.0 - 1.0 - 1.0 - edgeSpritePriority: 4 + edgeSpritePriority: 5 edgeSprites: SouthEast: /Textures/_CP14/Tiles/GrassLight/single_edge_SE.png NorthEast: /Textures/_CP14/Tiles/GrassLight/single_edge_NE.png @@ -179,7 +210,7 @@ - 1.0 - 1.0 - 1.0 - edgeSpritePriority: 5 + edgeSpritePriority: 6 edgeSprites: SouthEast: /Textures/_CP14/Tiles/GrassTall/single_edge_SE.png NorthEast: /Textures/_CP14/Tiles/GrassTall/single_edge_NE.png diff --git a/Resources/Prototypes/_CP14/Tiles/produced.yml b/Resources/Prototypes/_CP14/Tiles/produced.yml index e5ca26932e..adeb8ede62 100644 --- a/Resources/Prototypes/_CP14/Tiles/produced.yml +++ b/Resources/Prototypes/_CP14/Tiles/produced.yml @@ -158,9 +158,12 @@ id: CP14FloorStonebricksSquareCarved name: cp14-tiles-stonebricks-square-carved sprite: /Textures/_CP14/Tiles/Stonebricks/stonebricks_square_carved.png - variants: 1 + variants: 4 placementVariants: - 1.0 + - 1.0 + - 1.0 + - 1.0 edgeSpritePriority: 101 edgeSprites: SouthEast: /Textures/_CP14/Tiles/Stonebricks/single_edge_SE.png diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/attributions.yml b/Resources/Textures/_CP14/Tiles/Cobblestone/attributions.yml new file mode 100644 index 0000000000..1ad4d226b3 --- /dev/null +++ b/Resources/Textures/_CP14/Tiles/Cobblestone/attributions.yml @@ -0,0 +1,4 @@ +- files: ["cobble.png", "double_edge_E.png", "double_edge_N.png", "double_edge_S.png", "double_edge_W.png", "single_edge_NE.png", "single_edge_NW.png", "single_edge_SE.png", "single_edge_SW.png"] + license: "CC-BY-SA-4.0" + copyright: "Created by .vladimirs" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/cobble.png b/Resources/Textures/_CP14/Tiles/Cobblestone/cobble.png new file mode 100644 index 0000000000..fb3551e52f Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/cobble.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_E.png b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_E.png new file mode 100644 index 0000000000..daa0e983ec Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_E.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_N.png b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_N.png new file mode 100644 index 0000000000..1f7315bc86 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_N.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_S.png b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_S.png new file mode 100644 index 0000000000..62cf0dd7ff Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_S.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_W.png b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_W.png new file mode 100644 index 0000000000..aaee3ad6b3 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/double_edge_W.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_NE.png b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_NE.png new file mode 100644 index 0000000000..6089dfda09 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_NE.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_NW.png b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_NW.png new file mode 100644 index 0000000000..05bf7e2cc1 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_NW.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_SE.png b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_SE.png new file mode 100644 index 0000000000..6510f44530 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_SE.png differ diff --git a/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_SW.png b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_SW.png new file mode 100644 index 0000000000..d8d68ff7c2 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Cobblestone/single_edge_SW.png differ diff --git a/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks.png b/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks.png index 5d2467000f..d817c104d2 100644 Binary files a/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks.png and b/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks.png differ diff --git a/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks_square_carved.png b/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks_square_carved.png index 2386f9073a..90557d33a6 100644 Binary files a/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks_square_carved.png and b/Resources/Textures/_CP14/Tiles/Stonebricks/stonebricks_square_carved.png differ