diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 5296df8dd2..767211ca4b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -96,6 +96,46 @@ graph: CP14WallDirt node: WallDirt +- type: entity + id: CP14WallSnow + name: snow wall + parent: CP14BaseWall + description: A tall pile of snow. Can a house be built from it? + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/snow_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/snow_wall.rsi + - type: IconSmooth + base: wall + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg #TODO + params: + volume: -6 + #- !type:SpawnEntitiesBehavior + # spawn: + # CP14DirtBlock1: + # min: 2 + # max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: entity id: CP14WallStoneCopperOre suffix: copper ore diff --git a/Resources/Prototypes/_CP14/Tiles/produced.yml b/Resources/Prototypes/_CP14/Tiles/produced.yml index 2ffcae5e2a..4a6bffd94a 100644 --- a/Resources/Prototypes/_CP14/Tiles/produced.yml +++ b/Resources/Prototypes/_CP14/Tiles/produced.yml @@ -60,6 +60,39 @@ heatCapacity: 10000 weather: true +- type: tile + editorHidden: false + id: CP14FloorStonebricksSnowed + name: cp14-tiles-stonebricks + sprite: /Textures/_CP14/Tiles/Stonebricks/snowstonebricks.png + variants: 9 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 101 + edgeSprites: + SouthEast: /Textures/_CP14/Tiles/Stonebricks/single_edge_SE.png + NorthEast: /Textures/_CP14/Tiles/Stonebricks/single_edge_NE.png + NorthWest: /Textures/_CP14/Tiles/Stonebricks/single_edge_NW.png + SouthWest: /Textures/_CP14/Tiles/Stonebricks/single_edge_SW.png + South: /Textures/_CP14/Tiles/Stonebricks/double_edge_S.png + East: /Textures/_CP14/Tiles/Stonebricks/double_edge_E.png + North: /Textures/_CP14/Tiles/Stonebricks/double_edge_N.png + West: /Textures/_CP14/Tiles/Stonebricks/double_edge_W.png + baseTurf: CP14FloorFoundation + isSubfloor: false + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + weather: true + - type: tile editorHidden: false id: CP14FloorStonebricksSmallCarved1 diff --git a/Resources/Prototypes/_CP14/weather.yml b/Resources/Prototypes/_CP14/weather.yml index a7202b93db..ddb3ee224a 100644 --- a/Resources/Prototypes/_CP14/weather.yml +++ b/Resources/Prototypes/_CP14/weather.yml @@ -28,3 +28,36 @@ sprite: sprite: /Textures/_CP14/Effects/parallax.rsi state: noise + +- type: weather + id: CP14SnowLight + sprite: + sprite: /Textures/_CP14/Effects/weather.rsi + state: snowfall_light + sound: + path: /Audio/Effects/Weather/snowstorm_weak.ogg + params: + loop: true + volume: -6 + +- type: weather + id: CP14SnowMedium + sprite: + sprite: /Textures/_CP14/Effects/weather.rsi + state: snowfall_med + sound: + path: /Audio/Effects/Weather/snowstorm_weak.ogg + params: + loop: true + volume: -6 + +- type: weather + id: CP14SnowHeavy + sprite: + sprite: /Textures/_CP14/Effects/weather.rsi + state: snowfall_heavy + sound: + path: /Audio/Effects/Weather/snowstorm.ogg + params: + loop: true + volume: -6 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/weather.rsi/meta.json b/Resources/Textures/_CP14/Effects/weather.rsi/meta.json index 8485314955..fc534dd2d8 100644 --- a/Resources/Textures/_CP14/Effects/weather.rsi/meta.json +++ b/Resources/Textures/_CP14/Effects/weather.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/tree/5781addfa1193c2811408f64d15176139395d670 and edited by vladimir.s (Discord)", + "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/tree/5781addfa1193c2811408f64d15176139395d670 and edited by vladimir.s (Discord). Snowfalls by vladimir.s", "license": "CC-BY-SA-3.0", "size": { "x": 32, @@ -44,6 +44,63 @@ 0.03 ] ] + }, + { + "name": "snowfall_light", + "delays": [ + [ + 0.11, + 0.11, + 0.11, + 0.11, + 0.11, + 0.11, + 0.11, + 0.11, + 0.11, + 0.11, + 0.11, + 0.11 + ] + ] + }, + { + "name": "snowfall_med", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "snowfall_heavy", + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_heavy.png b/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_heavy.png new file mode 100644 index 0000000000..a60549e672 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_heavy.png differ diff --git a/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_light.png b/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_light.png new file mode 100644 index 0000000000..0902122066 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_light.png differ diff --git a/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_med.png b/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_med.png new file mode 100644 index 0000000000..91ee241f19 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/weather.rsi/snowfall_med.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/snowball.rsi/ball.png b/Resources/Textures/_CP14/Objects/Materials/snowball.rsi/ball.png new file mode 100644 index 0000000000..a207f83a42 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/snowball.rsi/ball.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/snowball.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/snowball.rsi/meta.json new file mode 100644 index 0000000000..771e3686a7 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Materials/snowball.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created by TheShuEd (Github)", + "states": [ + { + "name": "meta" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/full.png new file mode 100644 index 0000000000..f70affd9fb Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/meta.json new file mode 100644 index 0000000000..cc80f18386 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "CLA", + "copyright": "Created by TheShuEd (Discord) ", + "states": [ + { + "name": "wall0", + "directions": 4 + }, + { + "name": "wall1", + "directions": 4 + }, + { + "name": "wall2", + "directions": 4 + }, + { + "name": "wall3", + "directions": 4 + }, + { + "name": "wall4", + "directions": 4 + }, + { + "name": "wall5", + "directions": 4 + }, + { + "name": "wall6", + "directions": 4 + }, + { + "name": "wall7", + "directions": 4 + }, + { + "name": "full" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall0.png new file mode 100644 index 0000000000..ce03371e82 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall1.png new file mode 100644 index 0000000000..f6f580652f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall2.png new file mode 100644 index 0000000000..d3176bbf96 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall3.png new file mode 100644 index 0000000000..74e6a84b30 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall4.png new file mode 100644 index 0000000000..dbb5a0560b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall5.png new file mode 100644 index 0000000000..05391c7a2d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall6.png new file mode 100644 index 0000000000..be9d9b6744 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall7.png new file mode 100644 index 0000000000..d5cbf40e2b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/snow_wall.rsi/wall7.png differ diff --git a/Resources/Textures/_CP14/Tiles/Stonebricks/attribution.yml b/Resources/Textures/_CP14/Tiles/Stonebricks/attribution.yml new file mode 100644 index 0000000000..c4d2a2c1d9 --- /dev/null +++ b/Resources/Textures/_CP14/Tiles/Stonebricks/attribution.yml @@ -0,0 +1,13 @@ +- files: + - snowstonebricks.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-3.0" + copyright: "Created by TheShuEd, midified by vladimir.s " + source: "https://github.com/crystallpunk-14/crystall-punk-14/pull/290" diff --git a/Resources/Textures/_CP14/Tiles/Stonebricks/snowstonebricks.png b/Resources/Textures/_CP14/Tiles/Stonebricks/snowstonebricks.png new file mode 100644 index 0000000000..e4f5b81cad Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Stonebricks/snowstonebricks.png differ