diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml index 720b92839b..69a5b4629c 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml @@ -71,4 +71,16 @@ - state: forest - state: frame - type: CP14BiomeSpawner - biome: CP14GrasslandHills \ No newline at end of file + biome: CP14GrasslandHills + +- type: entity + id: CP14BiomeSpawnerSnowland + parent: CP14BaseBiomeSpawner + suffix: Snowland + components: + - type: Sprite + layers: + - state: snow + - state: frame + - type: CP14BiomeSpawner + biome: CP14Snowland \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/snowdrift.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/snowdrift.yml new file mode 100644 index 0000000000..b1e3635e44 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/snowdrift.yml @@ -0,0 +1,47 @@ +- type: entity + parent: BaseStructure + id: CP14Snowdrift + name: snowdrift + description: A big, cold pile of snow. + categories: [ ForkFiltered ] + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: PlacementReplacement + key: floorTile + - type: Sprite + sprite: _CP14/Structures/Flora/snowdrift.rsi + drawdepth: BelowFloor + - type: Icon + sprite: _CP14/Structures/Flora/snowdrift.rsi + state: full + - type: IconSmooth + key: CP14Snowdrift + base: state + - type: FloorOccluder + - type: Transform + anchored: true + - type: SpeedModifierContacts + walkSpeedModifier: 0.5 + sprintSpeedModifier: 0.5 + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + layer: + - SlipLayer + mask: + - ItemMask + density: 1000 + hard: false + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepSnow + params: + volume: 8 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml b/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml index a79d013a24..5b10dc4cd9 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml @@ -30,6 +30,12 @@ gain: 0.7 domainWarpType: OpenSimplex2 domainWarpAmp: 120 + +- type: biomeTemplate + id: CP14Snowland + layers: + - !type:BiomeMetaLayer + template: CP14SnowFill - !type:BiomeEntityLayer # More Trees threshold: 0.4 noise: @@ -43,4 +49,22 @@ - CP14FloorSnowDeepDeep entities: - CP14FloraTreeSnow - #- CP14FloraTreeGreenLarge \ No newline at end of file + #- CP14FloraTreeGreenLarge + - !type:BiomeEntityLayer # Snowdrifts + threshold: 0.3 + noise: + seed: 23 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.05 + octaves: 3 + lacunarity: 1.8 + gain: 0.7 + domainWarpType: OpenSimplex2 + domainWarpAmp: 120 + allowedTiles: + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep + entities: + - CP14Snowdrift \ No newline at end of file diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png index 9696494dd5..9dda5ac333 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/Fire/fire.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json index 937b018bf1..b2412dd47f 100644 --- a/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, "size": { - "x": 48, - "y": 48 + "x": 32, + "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": " by vladimir.s", + "copyright": "Edited by Flareguy for Space Station 14, original sprite taken from https://github.com/tgstation/tgstation/blob/master/icons/effects/bleed.dmi", "states": [ { "name": "bleed0" diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json index b88292e75c..21122621e0 100644 --- a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, modified by vladimir.s", + "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0", "size": { - "x": 48, - "y": 48 + "x": 32, + "y": 32 }, "states": [ { diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png index ba5f10a057..10e3e8c956 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina0.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png index 0cda742899..a34d57cf26 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina1.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png index 3f5ca0ca0b..a3d263d751 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina2.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png index 5742e6c7c4..356916dfe0 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina3.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png index bcb3e28736..d0645f4ebd 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina4.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png index 60543add68..46f439dfd5 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina5.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png index 4986b279b6..60a536643d 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/stamina6.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold1.png index 0592f46c56..3079764cfc 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold1.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold1.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold2.png index 9003fa24c6..67bf794cd9 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold2.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold2.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold3.png index 452be4d684..d61aeb6dd9 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold3.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/cold3.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot1.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot1.png index f02d8daea1..b88bf875d3 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot1.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot1.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot2.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot2.png index dee5c22f25..410ca2dfc1 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot2.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot2.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot3.png b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot3.png index 98ac8546ec..45478ed2f3 100644 Binary files a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot3.png and b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/hot3.png differ diff --git a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json index eb3b30e933..6ecfe4d763 100644 --- a/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 48, "y": 48}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 1c7401722f397d8ac8afdd10e550c5962e0f38d4, modified by vladimir.s", "states": [{"name": "cold1", "directions": 1, "delays": [[1.0]]}, {"name": "cold2", "directions": 1, "delays": [[1.0]]}, {"name": "cold3", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "hot1", "directions": 1, "delays": [[1.0]]}, {"name": "hot2", "directions": 1, "delays": [[1.0]]}, {"name": "hot3", "directions": 1, "delays": [[0.3, 0.3]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 1c7401722f397d8ac8afdd10e550c5962e0f38d4", "states": [{"name": "cold1", "directions": 1, "delays": [[1.0]]}, {"name": "cold2", "directions": 1, "delays": [[1.0]]}, {"name": "cold3", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "hot1", "directions": 1, "delays": [[1.0]]}, {"name": "hot2", "directions": 1, "delays": [[1.0]]}, {"name": "hot3", "directions": 1, "delays": [[0.3, 0.3]]}]} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Markers/biome.rsi/meta.json b/Resources/Textures/_CP14/Markers/biome.rsi/meta.json index f108fabb7a..a40ac33a97 100644 --- a/Resources/Textures/_CP14/Markers/biome.rsi/meta.json +++ b/Resources/Textures/_CP14/Markers/biome.rsi/meta.json @@ -18,6 +18,9 @@ }, { "name": "forest" + }, + { + "name": "snow" } ] } diff --git a/Resources/Textures/_CP14/Markers/biome.rsi/snow.png b/Resources/Textures/_CP14/Markers/biome.rsi/snow.png new file mode 100644 index 0000000000..6f2938091c Binary files /dev/null and b/Resources/Textures/_CP14/Markers/biome.rsi/snow.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/full.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/full.png new file mode 100644 index 0000000000..abbba12e74 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/meta.json new file mode 100644 index 0000000000..d900a07359 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Github) ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "state0", + "directions": 4 + }, + { + "name": "state1", + "directions": 4 + }, + { + "name": "state2", + "directions": 4 + }, + { + "name": "state3", + "directions": 4 + }, + { + "name": "state4", + "directions": 4 + }, + { + "name": "state5", + "directions": 4 + }, + { + "name": "state6", + "directions": 4 + }, + { + "name": "state7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state0.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state0.png new file mode 100644 index 0000000000..a7d6c439f7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state0.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state1.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state1.png new file mode 100644 index 0000000000..a0dc731db9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state2.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state2.png new file mode 100644 index 0000000000..a7d6c439f7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state3.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state3.png new file mode 100644 index 0000000000..9bec5b3510 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state4.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state4.png new file mode 100644 index 0000000000..cbd8d579e9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state5.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state5.png new file mode 100644 index 0000000000..55bd482f0c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state5.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state6.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state6.png new file mode 100644 index 0000000000..d20357b802 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state6.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state7.png b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state7.png new file mode 100644 index 0000000000..dd1def6500 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/state7.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png index 58f1d53023..b493346d62 100644 Binary files a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png and b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Blacksmith/furnace.rsi/fire.png b/Resources/Textures/_CP14/Structures/Specific/Blacksmith/furnace.rsi/fire.png index 87e268f041..32e7d4bed4 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Blacksmith/furnace.rsi/fire.png and b/Resources/Textures/_CP14/Structures/Specific/Blacksmith/furnace.rsi/fire.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks5.png b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks5.png index 8cd0069f86..a69e88b5f6 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks5.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks6.png b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks6.png index b738aac267..bbdc052875 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks6.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks7.png b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks7.png index cd63b33ec0..bd9eadbc10 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks7.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/stonebricks7.png differ