diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml index 38fde5c540..b81cd445f0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml @@ -157,10 +157,10 @@ map: ["Base"] - state: primed map: ["enum.TriggerVisualLayers.Base"] - - type: ScatteringGrenade - fillPrototype: BulletFoam - capacity: 30 - velocity: 30 + #- type: ScatteringGrenade #CP14 disabled (type !ent0 in discord) + # fillPrototype: BulletFoam + # capacity: 30 + # velocity: 30 - type: OnUseTimerTrigger beepSound: path: "/Audio/Effects/beep1.ogg" diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml index 640764b0c9..18b05e42dd 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml @@ -153,6 +153,47 @@ tree05: "" tree06: "" +- type: entity + parent: CP14BaseTree + id: CP14FloraTreeDead + components: + - type: Sprite + offset: 0,1.1 + sprite: _CP14/Structures/Flora/tree_died.rsi + layers: + - state: tree01 + map: ["random"] + - type: RandomSprite + available: + - random: + tree01: "" + tree02: "" + tree03: "" + tree04: "" + - type: CP14WaveShader + speed: 0.3 + dis: 3 + +- type: entity + parent: CP14BaseTree + id: CP14FloraTreeDeadSmall + components: + - type: Sprite + sprite: _CP14/Structures/Flora/tree_died_small.rsi + layers: + - state: tree01 + map: ["random"] + - type: RandomSprite + available: + - random: + tree01: "" + tree02: "" + tree03: "" + tree04: "" + - type: CP14WaveShader + speed: 0.3 + dis: 3 + - type: entity parent: CP14BaseTreeLarge id: CP14FloraTreeGreenLarge diff --git a/Resources/Prototypes/_CP14/Procedural/grasslands.yml b/Resources/Prototypes/_CP14/Procedural/grasslands.yml index dbe6bf5ec8..65a6fea1f2 100644 --- a/Resources/Prototypes/_CP14/Procedural/grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/grasslands.yml @@ -126,12 +126,15 @@ - CP14FloorGrassLight - CP14FloorGrassTall entities: + - CP14FloraTreeBirchLarge + - CP14FloraTreeBirchSmall + - CP14FloraTreeBirchMedium + - CP14FloraTreeGreen - CP14FloraTreeGreen - CP14FloraTreeGreen - CP14FloraTreeGreenLarge - - CP14FloraTreeBirchSmall - - CP14FloraTreeBirchMedium - - CP14FloraTreeBirchLarge + - CP14FloraTreeDead + - CP14FloraTreeDeadSmall - !type:BiomeEntityLayer # More Rocks threshold: 0.7 noise: @@ -178,12 +181,14 @@ - CP14FloorGrassLight - CP14FloorGrassTall entities: + - CP14FloraTreeBirchLarge + - CP14FloraTreeBirchSmall + - CP14FloraTreeBirchMedium - CP14FloraTreeGreen - CP14FloraTreeGreen - CP14FloraTreeGreenLarge - - CP14FloraTreeBirchSmall - - CP14FloraTreeBirchMedium - - CP14FloraTreeBirchLarge + - CP14FloraTreeDead + - CP14FloraTreeDeadSmall - type: biomeTemplate id: CP14GrasslandHills # Холмы diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/meta.json index f76e9a9dee..0e3a6ddf9f 100644 --- a/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Flora/tree_birch_big.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd and Omsoyk", + "copyright": "Generated by ChatGPT + polished by TheShuEd and Omsoyk", "size": { "x": 80, "y": 204 diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/meta.json index aa435515e9..c05373a05e 100644 --- a/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Flora/tree_birch_medium.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd and Omsoyk", + "copyright": "Generated by ChatGPT + polished by TheShuEd and Omsoyk", "size": { "x": 64, "y": 156 diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/meta.json index c01f06b8f9..4e969ab4a6 100644 --- a/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Flora/tree_birch_small.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd and Omsoyk", + "copyright": "Generated by ChatGPT + polished by TheShuEd and Omsoyk", "size": { "x": 64, "y": 124 diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/meta.json new file mode 100644 index 0000000000..736d70676d --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Generated by ChatGPT + polished by TheShuEd and Omsoyk", + "size": { + "x": 96, + "y": 112 + }, + "states": [ + { + "name": "tree01" + }, + { + "name": "tree02" + }, + { + "name": "tree03" + }, + { + "name": "tree04" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree01.png b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree01.png new file mode 100644 index 0000000000..998d0b8135 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree01.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree02.png b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree02.png new file mode 100644 index 0000000000..5dac9dac92 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree02.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree03.png b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree03.png new file mode 100644 index 0000000000..7911cad850 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree03.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree04.png b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree04.png new file mode 100644 index 0000000000..7f6b6c44f6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died.rsi/tree04.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/meta.json new file mode 100644 index 0000000000..602eaeb972 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Generated by ChatGPT + polished by TheShuEd and Omsoyk", + "size": { + "x": 48, + "y": 80 + }, + "states": [ + { + "name": "tree01" + }, + { + "name": "tree02" + }, + { + "name": "tree03" + }, + { + "name": "tree04" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree01.png b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree01.png new file mode 100644 index 0000000000..2a294f4cf7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree01.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree02.png b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree02.png new file mode 100644 index 0000000000..6153e011f3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree02.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree03.png b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree03.png new file mode 100644 index 0000000000..0e27bfb5e6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree03.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree04.png b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree04.png new file mode 100644 index 0000000000..60c787c99b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/tree_died_small.rsi/tree04.png differ