-
Notifications
You must be signed in to change notification settings - Fork 32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add double mattress #339
Open
FuchsiaThePhoenix
wants to merge
7
commits into
Lost-Paradise-Project:master
Choose a base branch
from
FuchsiaThePhoenix:MattressDouble
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add double mattress #339
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
31e1589
Add double mattress
FuchsiaThePhoenix fbb36b4
Update meta.json
FuchsiaThePhoenix af24ca6
Add translation
FuchsiaThePhoenix 50a95ec
Update mattress_double.yml
FuchsiaThePhoenix 4eba3ca
Merge branch 'master' into MattressDouble
Evgencheg dfabe64
Merge branch 'Lost-Paradise-Project:master' into MattressDouble
FuchsiaThePhoenix 1c5f2b7
Merge branch 'master' into MattressDouble
FuchsiaThePhoenix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4 changes: 4 additions & 0 deletions
4
...s/Locale/ru-RU/_LostParadise/prototypes/entities/structures/furniture/mattress_double.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-LPPMattressDoubleUp = Двойной матрас | ||
.desc = Лучше спать на полу, чем так, я думаю. | ||
ent-LPPMattressDoubleDown = Двойной матрас | ||
.desc = Лучше спать на полу, чем так, я думаю. | ||
73 changes: 73 additions & 0 deletions
73
Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/mattress_double.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,73 @@ | ||
# UP SIDE: | ||
|
||
- type: entity | ||
name: mattress double up | ||
id: LPPMattressDoubleUp | ||
parent: BaseStructure | ||
description: Better to sleep on the floor than this, I think. | ||
components: | ||
- type: HealOnBuckle | ||
damage: | ||
types: | ||
Poison: -0.5 | ||
Blunt: -0.2 | ||
- type: Physics | ||
bodyType: Static | ||
- type: Fixtures | ||
fixtures: | ||
fix1: | ||
shape: | ||
!type:PhysShapeAabb | ||
bounds: "-0.45,-0.45,0.45,0.55" | ||
density: 190 | ||
mask: | ||
- TableMask | ||
- type: Sprite | ||
sprite: _LostParadise/Structures/Furniture/double_mattress.rsi | ||
state: mattress_double_up | ||
noRot: true | ||
- type: Strap | ||
position: Down | ||
rotation: -90 | ||
buckleOffset: "0,0.20" | ||
- type: PlaceableSurface | ||
placeCentered: true | ||
- type: Damageable | ||
damageContainer: Inorganic | ||
damageModifierSet: Metallic | ||
- type: Destructible | ||
thresholds: | ||
- trigger: | ||
!type:DamageTrigger | ||
damage: 75 | ||
behaviors: | ||
- !type:DoActsBehavior | ||
acts: ["Destruction"] | ||
- !type:SpawnEntitiesBehavior | ||
spawn: | ||
SheetSteel1: | ||
min: 1 | ||
max: 2 | ||
- type: Transform | ||
anchored: true | ||
noRot: true | ||
- type: Anchorable | ||
- type: Pullable | ||
|
||
|
||
# DOWN SIDE: | ||
|
||
- type: entity | ||
parent: LPPMattressDoubleUp | ||
id: LPPMattressDoubleDown | ||
name: mattress double down | ||
description: Better to sleep on the floor than this, I think. | ||
components: | ||
- type: Sprite | ||
state: mattress_double_down | ||
- type: Damageable | ||
damageModifierSet: Inflatable | ||
- type: Strap | ||
position: Down | ||
rotation: -90 | ||
buckleOffset: "0,-0.2" |
Binary file added
BIN
+1.42 KB
...ures/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.07 KB
..._LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+548 Bytes
...s/_LostParadise/Structures/Furniture/double_mattress.rsi/mattress_double_up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions
20
Resources/Textures/_LostParadise/Structures/Furniture/double_mattress.rsi/meta.json
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,20 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Draw by Fuchsia: https://github.com/FuchsiaThePhoenix", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "mattress_double" | ||
}, | ||
{ | ||
"name": "mattress_double_down" | ||
}, | ||
{ | ||
"name": "mattress_double_up" | ||
} | ||
] | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Оптимизируйте повторяющиеся переводы
Согласно руководству по локализации, повторяющиеся переводы должны использовать ссылки на оригинальный перевод. Предлагаю следующую оптимизацию:
📝 Committable suggestion