-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Немного мебели, декалей, вещей и фиксы (#149)
* Some furniture * Doors, Decal Sprite fix * ой ой ой * Lygib где лицензия? * tapes meta fix * Where my overlay? * some cleanings in airlock * Delta Statue * centcom hatch open unlit texture fix * siding line add * add new floor * У меня плохая память? Или зачем я добавлял фтл... * glass hitting audio, Noooo my glass door was hitted * welding glasses * Delete Resources/Textures/Ligyb/disease.rsi/meta.json --------- Co-authored-by: Vigers Ray <[email protected]>
- Loading branch information
Showing
136 changed files
with
1,182 additions
and
3 deletions.
There are no files selected for viewing
Binary file not shown.
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/eyes/glasses.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ClothingEyesGlassesWelding = Сварочные Очки | ||
.desc = Это сварочные очки. Это небольшой предмет. Защищает глаза от сварщиков. |
1 change: 1 addition & 0 deletions
1
Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/ian.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ent-RandomIan = Спавнер случайный иан |
2 changes: 2 additions & 0 deletions
2
...urces/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/structures/decoration/statues.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-StatueDelta = Статуя дельты | ||
.desc = Статуя дельты. Большая и сильная. |
2 changes: 2 additions & 0 deletions
2
...-ru/prototypes/_sunrise/entities/structures/doors/airlocks/Glass/double_glass_airlock.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-DoubleGlassAirlock = Двойной Шлюз | ||
.desc = Он открывается, Он закрывается , и он может вас раздавить, но он больше, чем обычно. |
15 changes: 15 additions & 0 deletions
15
...es/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/structures/doors/airlocks/access.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
ent-AirlockHatchCentcommLocked = Шлюз ЦК | ||
.suffix = ЦентКом, Закрыт | ||
.desc = { ent-AirlockHatchCentcomm.desc } | ||
ent-AirlockHatchMaintLocked = Технический Шлюз | ||
.suffix = Обслуживание, Закрыт | ||
.desc = { ent-AirlockHatchMaint.desc } | ||
ent-AirlockHatchSyndicateLocked = Шлюз Синдиката | ||
.suffix = Синдикат, Закрыт | ||
.desc = { ent-AirlockHatchCentcomm.desc } | ||
ent-DoubleGlassAirlockCentcomLocked = Двойной Шлюз ЦК | ||
.suffix = ЦентКом, Закрыт | ||
.desc = { ent-DoubleGlassAirlock.desc } | ||
ent-DoubleGlassAirlockSyndicateLocked = Двойной Шлюз Синдиката | ||
.suffix = Синдикат, Закрыт | ||
.desc = { ent-DoubleGlassAirlock.desc } |
4 changes: 4 additions & 0 deletions
4
.../ru-RU/ss14-ru/prototypes/_sunrise/entities/structures/doors/airlocks/hatches/hatches.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
ent-AirlockHatchCentcomm = Шлюз ЦК | ||
.desc = Удерживает плохих снаружи, а хороших внутри. | ||
ent-AirlockHatchMaint = Технический Шлюз ЦК | ||
.desc = Защищает Тех.Тонели в безопасности. |
4 changes: 4 additions & 0 deletions
4
Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/structures/furniture/chairs.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
ent-ComfyBrownChair = коричневое удобное кресло | ||
.desc = { ent-ComfyChair.desc } | ||
ent-ChairOfficeGrey = серое офисное кресло | ||
.desc = { ent-ChairOfficeLight.desc } |
1 change: 1 addition & 0 deletions
1
Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/tiles/floors.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ent-FloorLightFancyWood = большой деревянный светлый пол |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
- type: decal | ||
id: LoadingArrow | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: loading_arrow | ||
|
||
- type: decal | ||
id: LoadingLine | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: loading_line | ||
|
||
- type: decal | ||
id: LoadingArrowGreyscale | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: loading_arrow_greyscale | ||
|
||
- type: decal | ||
id: LoadingLineGreyscale | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: loading_line_greyscale | ||
|
||
# siding line | ||
|
||
- type: decal | ||
id: SidingLineE | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_line_e | ||
|
||
- type: decal | ||
id: SidingLineN | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_line_n | ||
|
||
- type: decal | ||
id: SidingLineS | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_line_s | ||
|
||
- type: decal | ||
id: SidingLineW | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_line_w | ||
|
||
# siding end | ||
|
||
- type: decal | ||
id: SidingEndE | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_end_e | ||
|
||
- type: decal | ||
id: SidingEndN | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_end_n | ||
|
||
- type: decal | ||
id: SidingEndS | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_end_s | ||
|
||
- type: decal | ||
id: SidingEndW | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_end_w | ||
|
||
# siding small corner | ||
|
||
- type: decal | ||
id: SidingCornerSmallNE | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_small_ne | ||
|
||
- type: decal | ||
id: SidingCornerSmallNW | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_small_nw | ||
|
||
- type: decal | ||
id: SidingCornerSmallSE | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_small_se | ||
|
||
- type: decal | ||
id: SidingCornerSmallSW | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_small_sw | ||
|
||
# siding corner | ||
|
||
- type: decal | ||
id: SidingCornerNE | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_ne | ||
|
||
- type: decal | ||
id: SidingCornerNW | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_nw | ||
|
||
- type: decal | ||
id: SidingCornerSE | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_se | ||
|
||
- type: decal | ||
id: SidingCornerSW | ||
tags: ["station", "markings"] | ||
sprite: | ||
sprite: _Sunrise/Decals/markings.rsi | ||
state: siding_corner_sw |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/ian.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
- type: entity | ||
id: RandomIan | ||
name: random ian spawner | ||
parent: MarkerBase | ||
components: | ||
- type: Sprite | ||
layers: | ||
- state: green | ||
- sprite: Mobs/Pets/corgi.rsi | ||
state: corgi_dead | ||
- type: RandomSpawner | ||
prototypes: | ||
- MobCorgiLisa | ||
- MobCorgiIan | ||
chance: 0.95 | ||
rarePrototypes: | ||
- MobCorgiIanOld | ||
rareChance: 0.05 |
11 changes: 11 additions & 0 deletions
11
Resources/Prototypes/_Sunrise/Entities/Structures/Decoration/statues.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
- type: entity | ||
id: StatueDelta | ||
parent: BaseStructure | ||
name: delta statue | ||
description: A delta statue. Big and strong. | ||
components: | ||
- type: Sprite | ||
noRot: true | ||
sprite: _Sunrise/Structures/Decoration/statues.rsi | ||
state: delta_statue | ||
drawdepth: Mobs |
30 changes: 30 additions & 0 deletions
30
...ces/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/double_glass_airlock.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
- type: entity | ||
id: DoubleGlassAirlock | ||
parent: AirlockGlass | ||
name: Double Glass Airlock | ||
description: It opens, it closes, and maybe crushes you, but it bigger than normal door. | ||
components: | ||
- type: MeleeSound | ||
soundGroups: | ||
Brute: | ||
path: | ||
"/Audio/Effects/glass_hit.ogg" | ||
- type: Sprite | ||
sprite: _Sunrise/Structures/Doors/Airlocks/Glass/double_glass_airlock.rsi | ||
snapCardinals: false | ||
offset: 0.5,0 | ||
- type: Fixtures | ||
fixtures: | ||
fix1: | ||
shape: | ||
!type:PhysShapeAabb | ||
bounds: "-0.49,-0.49,1.49,0.49" # don't want this colliding with walls or they won't close | ||
density: 100 | ||
mask: | ||
- FullTileMask | ||
layer: #removed opaque from the layer, allowing lasers to pass through glass airlocks | ||
- GlassAirlockLayer | ||
- type: Rotatable | ||
rotateWhileAnchored: true | ||
- type: Transform | ||
noRot: false |
25 changes: 25 additions & 0 deletions
25
Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Hatches/hatches.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
- type: entity | ||
id: AirlockHatchMaint | ||
parent: HighSecDoor | ||
name: Maintenance Hatch | ||
description: Protects maintenance tunnels. | ||
placement: | ||
mode: SnapgridCenter | ||
components: | ||
- type: Sprite | ||
sprite: _Sunrise/Structures/Doors/Airlocks/Hatches/maintenance_hatch.rsi | ||
- type: Weldable | ||
time: 10 | ||
|
||
- type: entity | ||
id: AirlockHatchCentcomm | ||
parent: HighSecDoor | ||
name: CentCom Hatch | ||
description: Keeps the bad out and keeps the good in. | ||
placement: | ||
mode: SnapgridCenter | ||
components: | ||
- type: Sprite | ||
sprite: _Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi | ||
- type: Weldable | ||
time: 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.