-
-
Notifications
You must be signed in to change notification settings - Fork 81
Add scp 066 #961
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
Draft
666XxttimurkaxX666
wants to merge
17
commits into
space-sunrise:master
Choose a base branch
from
666XxttimurkaxX666:add-scp-066
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.
Draft
Add scp 066 #961
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
21eb1b1
Add scp 066
666XxttimurkaxX666 d652189
Delete gorizont (6).yml
666XxttimurkaxX666 be041d5
Update scp066.yml
666XxttimurkaxX666 751cfaf
фиксы
666XxttimurkaxX666 5c86186
фиксы 2
666XxttimurkaxX666 46c3ec8
фиксы 3
666XxttimurkaxX666 37f012e
фикс фикса бага звука
666XxttimurkaxX666 034e5db
фикс фикса бага 2
666XxttimurkaxX666 df9cb89
пидор
666XxttimurkaxX666 73e666b
Update Resources/Prototypes/_Scp/Entities/Mobs/NPCs/Scp/scp066.yml
666XxttimurkaxX666 8cc36e0
Update Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs…
666XxttimurkaxX666 81f29a6
фиксыы
666XxttimurkaxX666 6015153
у
666XxttimurkaxX666 6a069d0
e
666XxttimurkaxX666 64ed66a
баланс делеев
666XxttimurkaxX666 579906c
пекыпекрекркр
666XxttimurkaxX666 2be26b0
кпаукпауп
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
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,7 @@ | ||
| namespace Content.Shared._Scp.Scp066; | ||
|
|
||
| [RegisterComponent] | ||
| public sealed partial class Scp066FriendlyComponent : Component { } | ||
|
|
||
| [RegisterComponent] | ||
| public sealed partial class Scp066HostileComponent : Component { } | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
Outdated
|
||
Binary file not shown.
|
666XxttimurkaxX666 marked this conversation as resolved.
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
Resources/Locale/ru-RU/_prototypes/_scp/actions/scp066.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,12 @@ | ||
| ent-Scp066SpawnCake = предложить торт | ||
| .desc = Вы создаете кусочек праздничного торта для вечеринки! | ||
| ent-Scp066SpawnPlushieCat = подарить игрушку | ||
| .desc = Вы создаете красивую игрушку белой кошки. | ||
| ent-Scp066SpawnDelightGlass = здоровый напиток | ||
| .desc = Вы создаете стакан с лечащим напитком внутри. | ||
| ent-Scp066DisableLights = аномальные неполадки | ||
| .desc = Вы выводите из строя всю технику поблизости. | ||
| ent-Scp066OpenDoors = уроки взлома | ||
| .desc = Вы открываете все шлюзы поблизости. | ||
| ent-Scp066SpawnAngryBee = неожиданный удар | ||
| .desc = Из вашего тела вылетает агрессивная пчела. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/npcs/scp/scp066.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-Scp066Hostile = ??? | ||
| ent-Scp066Friendly = ??? | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
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
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,106 @@ | ||
| # Friendly 066 | ||
|
|
||
| - type: entity | ||
| parent: BaseAction | ||
| id: Scp066SpawnCake | ||
| name: offer a cake | ||
| description: You create a slice of birthday cake for the party! | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Action | ||
| useDelay: 90 | ||
| sound: /Audio/_Scp/Scp066/Party1.ogg | ||
| icon: | ||
| sprite: Objects/Consumable/Food/Baked/cake.rsi | ||
| state: birthday | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
| - type: InstantAction | ||
| event: !type:InstantSpawnSpellEvent | ||
| prototype: FoodCakeBirthdaySlice | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
| posData: !type:TargetCasterPos | ||
|
|
||
| - type: entity | ||
| parent: BaseAction | ||
| id: Scp066SpawnPlushieCat | ||
| name: give a toy | ||
| description: You create a beautiful white cat plushie. | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Action | ||
| useDelay: 90 | ||
| icon: | ||
| sprite: _Sunrise/Objects/Fun/toy_cats.rsi | ||
| state: plushie_whitecat | ||
| - type: InstantAction | ||
| event: !type:InstantSpawnSpellEvent | ||
| prototype: PlushieWhiteCat | ||
| posData: !type:TargetCasterPos | ||
|
|
||
| - type: entity | ||
| parent: BaseAction | ||
| id: Scp066SpawnDelightGlass | ||
| name: healthy drink | ||
| description: You create a glass with a healing beverage inside. | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Action | ||
| useDelay: 120 | ||
| icon: | ||
| sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi | ||
| state: icon_empty | ||
| - type: InstantAction | ||
| event: !type:InstantSpawnSpellEvent | ||
| prototype: DrinkDoctorsDelightGlass | ||
| posData: !type:TargetCasterPos | ||
|
|
||
| # Hostile 066 | ||
|
|
||
| - type: entity | ||
| parent: BaseAction | ||
| id: Scp066OpenDoors | ||
| name: lockpicking lessons | ||
| description: You force all nearby airlocks to open. | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Action | ||
| useDelay: 90 | ||
| icon: | ||
| sprite: _Scp/Actions/scp-066.rsi | ||
| state: airlock | ||
| itemIconStyle: BigAction | ||
| raiseOnUser: true | ||
| - type: InstantAction | ||
| event: !type:KnockSpellEvent | ||
|
|
||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| - type: entity | ||
| parent: BaseAction | ||
| id: Scp066SpawnAngryBee | ||
| name: unexpected strike | ||
| description: An aggressive bee flies out of your body. | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Action | ||
| useDelay: 90 | ||
| icon: | ||
| sprite: Objects/Fun/Plushies/bee.rsi | ||
| state: icon | ||
| - type: InstantAction | ||
| event: !type:InstantSpawnSpellEvent | ||
| prototype: MobAngryBee | ||
| posData: !type:TargetCasterPos | ||
|
|
||
| - type: entity | ||
| parent: BaseAction | ||
| id: Scp066DisableLights | ||
| name: anomalous malfunction | ||
| description: You disable all nearby electronics and lights. | ||
| categories: [ HideSpawnMenu ] | ||
| components: | ||
| - type: Action | ||
| useDelay: 90 | ||
| icon: | ||
| sprite: _Scp/Actions/scp-066.rsi | ||
| state: light | ||
| - type: InstantAction | ||
| event: !type:InstantSpawnSpellEvent | ||
| prototype: AdminInstantEffectEMP | ||
| 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
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.