-
-
Notifications
You must be signed in to change notification settings - Fork 54
Загрузка прототипов для SCP-3008 #865
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
Merged
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b4f1513
загрузка
WardexOfficial 2428560
обновление карты
WardexOfficial ae2a564
fix
WardexOfficial 44e83a8
фикси/изменения
WardexOfficial 2bbdea9
с => С
WardexOfficial 0d7cd32
Фиксы ошибок в линтере
WardexOfficial b05a4fd
Merge branch 'master' into load-scp3008
WardexOfficial 077d7f0
фиксы ошибок линтер
WardexOfficial 5f01eee
фикс
WardexOfficial e990d81
Merge branch 'master' into load-scp3008
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
Binary file not shown.
Binary file not shown.
10 changes: 10 additions & 0 deletions
10
Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/npcs/scp/events/scp-3008.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,10 @@ | ||
| ent-Scp3008MusicBox = радио IKEA | ||
| .desc = Из него доносится успокаивающая музыка. | ||
| ent-BaseScp3008 = Сотрудник IKEA | ||
| .desc = Непропорциональная и безликая персона в костюме сотрудника IKEA. | ||
| ent-BasicScp3008 = Сотрудник IKEA | ||
| ent-BasicScp3008Angry = { ent-BasicScp3008 } | ||
| ent-StrongScp3008 = Крепкий сотрудник IKEA | ||
| ent-StrongScp3008Angry = { ent-StrongScp3008 } | ||
| ent-TallScp3008 = Высокий сотрудник IKEA | ||
| ent-TallScp3008Angry = { ent-TallScp3008 } |
52,675 changes: 31,480 additions & 21,195 deletions
52,675
Resources/Maps/_Scp/Events/RJD1/Ikea_v5.yml → ...urces/Maps/_Scp/Events/RJD1/Ikea_v6.3.yml
Large diffs are not rendered by default.
Oops, something went wrong.
246 changes: 246 additions & 0 deletions
246
Resources/Prototypes/_Scp/Entities/Mobs/NPCs/Scp/Events/scp3008.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,246 @@ | ||
| - type: entity | ||
| parent: BaseItem | ||
| id: Scp3008MusicBox | ||
| name: radio IKEA | ||
| description: Soothing music comes from it. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Scp/Objects/Devices/radio.rsi | ||
| state: common | ||
| - type: Item | ||
| sprite: _Scp/Objects/Devices/radio.rsi | ||
| heldPrefix: walkietalkie | ||
| - type: AmbientSound | ||
| range: 75 | ||
| volume: -13 | ||
| sound: | ||
| path: /Audio/_Scp/Events/Scp3008/IKEA.ogg | ||
| - type: ContainerContainer | ||
| containers: | ||
| cell_slot: !type:ContainerSlot | ||
| - type: PowerCellSlot | ||
| cellSlotId: cell_slot | ||
| - type: ItemSlots | ||
| slots: | ||
| cell_slot: | ||
| name: power-cell-slot-component-slot-name-default | ||
| startingItem: PowerCellMedium | ||
|
|
||
| - type: entity | ||
| id: BaseScp3008 | ||
| suffix: BASE SCP-3008 | ||
| description: A disproportionate and faceless person in an IKEA employee suit. | ||
| parent: | ||
| - MobCombat | ||
| - SimpleMobBase | ||
| abstract: true | ||
| components: | ||
| - type: HTN | ||
| rootTask: | ||
| task: SimpleHostileCompound | ||
| blackboard: | ||
| NavClimb: !type:Bool | ||
| true | ||
| NavSmash: !type:Bool | ||
| true | ||
| NavPry: !type:Bool | ||
| true | ||
| - type: NPCRetaliation | ||
| attackMemoryLength: 10 | ||
| - type: FactionException | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - Passive | ||
| - type: Destructible | ||
| thresholds: | ||
| - trigger: | ||
| !type:DamageTrigger | ||
| damage: 250 | ||
| behaviors: | ||
| - !type:DoActsBehavior | ||
| acts: [ "Destruction" ] | ||
|
|
||
|
|
||
| - type: entity | ||
| id: BasicScp3008 | ||
| parent: BaseScp3008 | ||
| name: IKEA employee | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Scp/Mobs/Scp/Events/scp-3008/basic.rsi | ||
| state: Basic3008 | ||
| - type: MovementSpeedModifier | ||
| baseWalkSpeed: 2.5 | ||
| baseSprintSpeed: 2.5 | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - Neutral | ||
| - type: TimedDespawn | ||
| lifetime: 600.1 | ||
| - type: TimedSpawner | ||
| prototypes: | ||
| - BasicScp3008Angry | ||
| intervalSeconds: 600 | ||
| - type: MeleeWeapon | ||
| damage: | ||
| types: | ||
| Blunt: 5 | ||
| Structural: 20 | ||
|
|
||
| - type: entity | ||
| id: BasicScp3008Angry | ||
| parent: BasicScp3008 | ||
| name: IKEA employee | ||
| suffix: SCP-3008 ANGRY | ||
| components: | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - SCPs | ||
| - type: MovementSpeedModifier | ||
| baseWalkSpeed: 3 | ||
| baseSprintSpeed: 3 | ||
| - type: TimedDespawn | ||
| lifetime: 300.1 | ||
| - type: TimedSpawner | ||
| prototypes: | ||
| - BasicScp3008 | ||
| intervalSeconds: 300 | ||
| - type: AmbientSound | ||
| volume: -7 | ||
| range: 8 | ||
| sound: | ||
| params: | ||
| variation: 0.5 | ||
| path: /Audio/_Scp/Events/Scp3008/VOICE.ogg | ||
|
|
||
|
|
||
| - type: entity | ||
| id: StrongScp3008 | ||
| parent: BaseScp3008 | ||
| name: A tough IKEA employee | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Scp/Mobs/Scp/Events/scp-3008/basic.rsi | ||
| state: Strong3008 | ||
| - type: MovementSpeedModifier | ||
| baseWalkSpeed: 2 | ||
| baseSprintSpeed: 2 | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - Passive | ||
| - type: TimedDespawn | ||
| lifetime: 600.1 | ||
| - type: TimedSpawner | ||
| prototypes: | ||
| - StrongScp3008Angry | ||
| intervalSeconds: 600 | ||
| - type: MeleeWeapon | ||
| attackRate: 0.7 | ||
| damage: | ||
| types: | ||
| Blunt: 15 | ||
| Structural: 40 | ||
| - type: StaminaDamageOnHit | ||
| damage: 20 | ||
|
|
||
|
|
||
| - type: entity | ||
| id: StrongScp3008Angry | ||
| parent: StrongScp3008 | ||
| suffix: SCP-3008 ANGRY | ||
| name: A tough IKEA employee | ||
| components: | ||
| - type: MeleeWeapon | ||
| damage: | ||
| types: | ||
| Blunt: 15 | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Structural: 40 | ||
| - type: StaminaDamageOnHit | ||
| damage: 20 | ||
| - type: MovementSpeedModifier | ||
| baseWalkSpeed: 2.5 | ||
| baseSprintSpeed: 2.5 | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - SCPs | ||
| - type: TimedDespawn | ||
| lifetime: 300.1 | ||
| - type: TimedSpawner | ||
| prototypes: | ||
| - StrongScp3008 | ||
| intervalSeconds: 300 | ||
| - type: AmbientSound | ||
| volume: -7 | ||
| range: 8 | ||
| sound: | ||
| params: | ||
| variation: 0.15 | ||
| path: /Audio/_Scp/Events/Scp3008/VOICE.ogg | ||
|
|
||
|
|
||
| - type: entity | ||
| id: TallScp3008 | ||
| parent: BaseScp3008 | ||
| name: A tall IKEA employee | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Scp/Mobs/Scp/Events/scp-3008/tall.rsi | ||
| state: Tall3008 | ||
| - type: MovementSpeedModifier | ||
| baseWalkSpeed: 3.5 | ||
| baseSprintSpeed: 3.5 | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - Passive | ||
| - type: TimedDespawn | ||
| lifetime: 600.1 | ||
| - type: TimedSpawner | ||
| prototypes: | ||
| - TallScp3008Angry | ||
| intervalSeconds: 600 | ||
|
|
||
|
|
||
| - type: entity | ||
| id: TallScp3008Angry | ||
| parent: TallScp3008 | ||
| suffix: SCP-3008 ANGRY | ||
| name: A tall IKEA employee | ||
| components: | ||
| - type: MovementSpeedModifier | ||
| baseWalkSpeed: 3.5 | ||
| baseSprintSpeed: 3.5 | ||
| - type: UseDelay | ||
| delay: 5 | ||
| - type: UseDelayOnMeleeHit | ||
| - type: MeleeThrowOnHit | ||
| stunTime: 0.2 | ||
| activateOnThrown: true | ||
| distance: -1 | ||
| speed: 7 | ||
| - type: MeleeWeapon | ||
| angle: 0 | ||
| animation: WeaponArcClaw | ||
| attackRate: 0.5 | ||
| range: 2.5 | ||
| damage: | ||
| types: | ||
| Blunt: 3 | ||
| Structural: 5 | ||
| - type: NpcFactionMember | ||
| factions: | ||
| - SCPs | ||
| - type: TimedDespawn | ||
| lifetime: 300.1 | ||
| - type: TimedSpawner | ||
| prototypes: | ||
| - TallScp3008 | ||
| intervalSeconds: 300 | ||
| minimumEntitiesSpawned: 1 | ||
| maximumEntitiesSpawned: 1 | ||
| - type: AmbientSound | ||
| volume: -7 | ||
| range: 8 | ||
| sound: | ||
| params: | ||
| variation: 0.15 | ||
| path: /Audio/_Scp/Events/Scp3008/VOICE.ogg | ||
Binary file added
BIN
+1.69 KB
Resources/Textures/_Scp/Mobs/Scp/Events/scp-3008/basic.rsi/Basic3008.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.71 KB
Resources/Textures/_Scp/Mobs/Scp/Events/scp-3008/basic.rsi/Strong3008.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions
19
Resources/Textures/_Scp/Mobs/Scp/Events/scp-3008/basic.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,19 @@ | ||
| { | ||
| "version": 2, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "MIDUZKA", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "Basic3008", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "Strong3008", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+3.02 KB
Resources/Textures/_Scp/Mobs/Scp/Events/scp-3008/tall.rsi/Tall3008.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions
15
Resources/Textures/_Scp/Mobs/Scp/Events/scp-3008/tall.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,15 @@ | ||
| { | ||
| "version": 2, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "MIDUZKA", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 48 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "Tall3008", | ||
| "directions": 4 | ||
| } | ||
| ] | ||
| } |
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.