-
-
Notifications
You must be signed in to change notification settings - Fork 86
Добавление СЦП-1837 #1040
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
Open
666XxttimurkaxX666
wants to merge
8
commits into
space-sunrise:master
Choose a base branch
from
666XxttimurkaxX666:add-scp-1837
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
Добавление СЦП-1837 #1040
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
472d45a
Add scp 1837
666XxttimurkaxX666 e924770
Update scp1837.yml
666XxttimurkaxX666 ee9f780
Update scp1837.yml
666XxttimurkaxX666 491a2b2
Update events.yml
666XxttimurkaxX666 e245bca
Update events.yml
666XxttimurkaxX666 d186173
Merge branch 'master' into add-scp-1837
666XxttimurkaxX666 8d609d5
Merge branch 'master' into add-scp-1837
WardexOfficial 1e92fd7
Merge branch 'master' into add-scp-1837
WardexOfficial 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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/_prototypes/_scp/entities/objects/scp/scp1837.ftl
This file contains hidden or 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-Scp1837 = modern mop | ||
| .desc = A good quality mop with a wooden handle and wool cloth on the cleaning surface. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp1837.ftl
This file contains hidden or 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-Scp1837 = современная швабра | ||
| .desc = Швабра хорошего качества с деревянной ручкой и шерстяной тканью у моющей поверхности. |
50 changes: 50 additions & 0 deletions
50
Resources/Prototypes/_Scp/Entities/Objects/Scp/scp1837.yml
This file contains hidden or 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,50 @@ | ||
| - type: entity | ||
| id: Scp1837 | ||
| parent: MopItem | ||
| suffix: SCP-1837 | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Scp/Objects/Scp/scp-1837.rsi | ||
| layers: | ||
| - state: mop | ||
| - map: ["enum.SolutionContainerLayers.Fill"] | ||
| state: fill-3 | ||
| visible: false | ||
| - type: Appearance | ||
| - type: SolutionContainerVisuals | ||
| maxFillLevels: 3 | ||
| fillBaseName: fill- | ||
| inHandsFillBaseName: -fill- | ||
| inHandsMaxFillLevels: 2 | ||
| - type: Item | ||
| size: Large | ||
| sprite: _Scp/Objects/Scp/scp-1837.rsi | ||
| - type: Scp | ||
| class: Safe | ||
| - type: Absorbent | ||
| pickupAmount: 100 | ||
| useAbsorberSolution: true | ||
| - type: UseDelay | ||
| delay: 0.5 | ||
| - type: SolutionRegeneration | ||
| solution: absorbed | ||
| generated: | ||
| reagents: | ||
| - ReagentId: Water | ||
| Quantity: 5 | ||
| - ReagentId: PolytrinicAcid | ||
| Quantity: 10 | ||
| - type: SolutionPurge | ||
| solution: absorbed | ||
| preserve: | ||
| - Water | ||
| quantity: 10 | ||
| - type: MeleeWeapon | ||
| damage: | ||
| types: | ||
| Blunt: 10 | ||
| Structural: 40 | ||
| - type: IncreaseDamageOnWield | ||
| damage: | ||
| types: | ||
| Blunt: 5 | ||
This file contains hidden or 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
+145 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-1.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
+156 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
+147 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-1.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
+160 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 71 additions & 0 deletions
71
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/meta.json
This file contains hidden or 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,71 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "made by timur", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "mop" | ||
| }, | ||
| { | ||
| "name": "fill-1" | ||
| }, | ||
| { | ||
| "name": "fill-2" | ||
| }, | ||
| { | ||
| "name": "fill-3" | ||
| }, | ||
| { | ||
| "name": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-left-fill-1", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-left-fill-2", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right-fill-1", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right-fill-2", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "wielded-inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "wielded-inhand-right", | ||
| "directions": 4 | ||
| }, | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
| { | ||
| "name": "wielded-inhand-left-fill-1", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "wielded-inhand-left-fill-2", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "wielded-inhand-right-fill-1", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "wielded-inhand-right-fill-2", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } | ||
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
+153 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-1.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
+186 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-2.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
+549 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left.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
+151 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-1.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
+189 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-2.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
+540 Bytes
Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
Uh oh!
There was an error while loading. Please reload this page.