-
-
Notifications
You must be signed in to change notification settings - Fork 88
Добавление SCP-059 "Радиоактивный минерал" #1076
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
Merged
WardexOfficial
merged 15 commits into
makura-games:master
from
666XxttimurkaxX666:add-scp-059
Aug 26, 2026
Merged
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
dd21790
059
666XxttimurkaxX666 8718ad9
у
666XxttimurkaxX666 47fd444
Update scp059.yml
666XxttimurkaxX666 c1b699f
Update scp059.yml
666XxttimurkaxX666 0ea0e02
Update scp059.yml
666XxttimurkaxX666 08ffbd1
Update scp427.yml
666XxttimurkaxX666 00428fb
Update scp059.yml
666XxttimurkaxX666 9ad37fc
Merge branch 'master' into add-scp-059
666XxttimurkaxX666 3fedd34
Merge branch 'master' into add-scp-059
WardexOfficial 4236a34
фиксы
666XxttimurkaxX666 8ecde5c
e
666XxttimurkaxX666 804ec5b
у
666XxttimurkaxX666 d4ceb34
у
666XxttimurkaxX666 25ee438
Update bio.yml
666XxttimurkaxX666 8827fb9
e
666XxttimurkaxX666 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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,9 @@ | ||
| using Robust.Shared.GameStates; | ||
|
|
||
| namespace Content.Shared._Scp.Scp059; | ||
|
|
||
| [RegisterComponent, NetworkedComponent] | ||
| public sealed partial class Scp059ProtectionComponent : Component | ||
| { | ||
|
|
||
| } |
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-Scp059Crystal = infect tile | ||
| .desc = You leave a piece of mineral on the floor. |
1 change: 1 addition & 0 deletions
1
Resources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp059.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 @@ | ||
| ent-Scp059 = ??? | ||
8 changes: 8 additions & 0 deletions
8
Resources/Locale/en-US/_prototypes/_scp/entities/objects/scp/scp059.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,8 @@ | ||
| ent-Scp059CrystalStructure = blue mineral | ||
| .desc = A dark blue, shiny mineral. Being near it makes you feel sick. | ||
|
|
||
| ent-Scp059CrystalItem = { ent-Scp059CrystalStructure } | ||
| .desc = { ent-Scp059CrystalStructure.desc } | ||
|
|
||
| ent-Scp059Rock = { ent-Scp059CrystalStructure } | ||
| .desc = { ent-Scp059CrystalStructure.desc } |
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
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
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
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 @@ | ||
| reagent-effect-scp059-infect = I should be closer to uninfected people... |
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-Scp059Crystal = заразить тайл | ||
| .desc = Вы оставляете от себя частичку минерала на полу. |
1 change: 1 addition & 0 deletions
1
Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp059.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 @@ | ||
| ent-Scp059 = ??? | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
Outdated
|
||
8 changes: 8 additions & 0 deletions
8
Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp059.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,8 @@ | ||
| ent-Scp059CrystalStructure = синий минерал | ||
| .desc = Тёмно-синий и блестящий минерал. Рядом с ним становится дурно. | ||
|
|
||
| ent-Scp059CrystalItem = { ent-Scp059CrystalStructure } | ||
| .desc = { ent-Scp059CrystalStructure.desc } | ||
|
|
||
| ent-Scp059Rock = { ent-Scp059CrystalStructure } | ||
| .desc = { ent-Scp059CrystalStructure.desc } |
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
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
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
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 @@ | ||
| reagent-effect-scp059-infect = Мне стоит находиться ближе к незаражённым людям... |
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
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,17 @@ | ||
| - type: entity | ||
| id: Scp059Crystal | ||
| name: infect tile | ||
| description: You leave a piece of mineral on the floor. | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Action | ||
| useDelay: 180 | ||
| icon: | ||
| sprite: _Scp/Objects/Scp/scp-059/crystal.rsi | ||
| state: kudzu_21 | ||
| itemIconStyle: BigAction | ||
| raiseOnUser: true | ||
| - type: InstantAction | ||
| event: !type:InstantSpawnSpellEvent | ||
| prototype: Scp059CrystalStructure | ||
| posData: !type:TargetCasterPos |
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
93 changes: 93 additions & 0 deletions
93
Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp059.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,93 @@ | ||
| - type: entity | ||
| id: Scp059Mob | ||
| name: ??? | ||
| suffix: SCP-059-1 | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
| parent: | ||
| - BaseScp | ||
| - SimpleMobBase | ||
| - MobCombat | ||
| components: | ||
| - type: ComplexInteraction | ||
| - type: Sprite | ||
| sprite: _Scp/Mobs/Scp/scp-059.rsi | ||
| drawdepth: Mobs | ||
| state: scp-059 | ||
| - type: Pacified # нужно чтобы больше заражали чем убивали | ||
| - type: Scp | ||
| class: Keter | ||
| - type: Fixtures | ||
| fixtures: | ||
| fix1: | ||
| shape: | ||
| !type:PhysShapeCircle | ||
| radius: 0.3 | ||
| density: 80 | ||
| mask: | ||
| - MobMask | ||
| layer: | ||
| - MobLayer | ||
| - type: MobThresholds | ||
| thresholds: | ||
| 0: Alive | ||
| - type: MeleeWeapon | ||
| altDisarm: false | ||
| angle: 0 | ||
| animation: WeaponArcBite | ||
| soundHit: | ||
| path: /Audio/Effects/bite.ogg | ||
| damage: | ||
| types: | ||
| Piercing: 6 | ||
| - type: Scp059Protection | ||
| - type: GuideHelp | ||
| guides: | ||
| - ScpResearch | ||
| - ScpFear | ||
| - type: ActionGrant | ||
| actions: | ||
| - Scp059Crystal | ||
| - type: TriggerOnInteractHand | ||
| - type: TriggerOnCollide | ||
| fixtureID: fix1 | ||
| ignoreOtherNonHard: false | ||
| - type: WhitelistTriggerCondition | ||
| userWhitelist: | ||
| components: | ||
| - MobState | ||
| - HumanoidAppearance | ||
| requireAll: true | ||
| userBlacklist: | ||
| components: | ||
| - Scp | ||
| - Scp059Protection | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
| - type: AddSolutionOnTrigger | ||
| targetUser: true | ||
| solution: bloodstream | ||
| addedSolution: | ||
| reagents: | ||
| - ReagentId: Scp059Reagent | ||
| Quantity: 2 | ||
| - type: DeleteOnTrigger | ||
| keysIn: | ||
| - timer | ||
| - type: Destructible | ||
| thresholds: | ||
| - trigger: | ||
| !type:DamageTrigger | ||
| damage: 200 | ||
| behaviors: | ||
| - !type:TriggerBehavior | ||
| keyOut: timer | ||
| - !type:SpawnEntitiesBehavior | ||
| spawn: | ||
| Scp059CrystalItem: | ||
| min: 1 | ||
| max: 1 | ||
| - type: ProjectileGrenade | ||
| fillPrototype: Scp059CrystalProjectile | ||
| capacity: 20 | ||
| - type: PointLight | ||
| color: LightBlue | ||
| radius: 2 | ||
| energy: 4 | ||
| netsync: false | ||
Oops, something went wrong.
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.