Skip to content

Add scp delivery #992

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.

Sign up for GitHub

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 5 commits into
base: master
Choose a base branch
from
Draft

Add scp delivery #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b7fdbb
Add delivery scp
666XxttimurkaxX666 May 3, 2026
6a667e8
eee
666XxttimurkaxX666 May 4, 2026
be69fb1
e
666XxttimurkaxX666 May 4, 2026
4d62669
Update cargo_delivery.yml
666XxttimurkaxX666 May 7, 2026
1a385fd
Merge branch 'master' into add-scp-delivery
WardexOfficial May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/crates/scp.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-CrateScp2263 = ящик СЦП
.desc = Защищённый ящик, содержащий в себе аномальный объект.
ent-CrateScp124 = { ent-CrateScp2263 }
.desc = { ent-CrateScp2263.desc }
ent-CrateScp427 = { ent-CrateScp2263 }
.desc = { ent-CrateScp2263.desc }
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-Scp226362 = скульптура скелета
.desc = Необыкновенная скульптура в виде скелета человека.
ent-Scp226360 = { ent-Scp226362 }
.desc = { ent-Scp226362.desc }
ent-Scp226318 = { ent-Scp226362 }
.desc = { ent-Scp226362.desc }
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/_strings/_scp/station-events/events/cargo-delivery.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
cargo-delivery-event-announcement = Внимание логистическому и научно-исследовательскому отделам. На ваш участок был доставлен аномальный объект { $description } для изучения и содержания. Всё прибудет со следующей партией груза.
cargo-delivery-sender = Региональное управление

cargo-delivery-description-scp2263 = SCP-2263
cargo-delivery-description-scp124 = SCP-124
cargo-delivery-description-scp427 = SCP-427
2 changes: 2 additions & 0 deletions Resources/Prototypes/_Scp/Catalog/Cargo/markets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- type: cargoMarket
id: scp
Comment on lines +1 to +2

@coderabbitai coderabbitai Bot May 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Приведите id рынка к CamelCase.

id: scp нарушает обязательный формат идентификаторов прототипов. Также нужно синхронно обновить group в связанных cargoProduct.

💡 Предлагаемое исправление 
-  id: scp
+  id: Scp
# Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml
-  group: scp
+  group: Scp

As per coding guidelines: "Prototype ID format MUST be CamelCase".

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- type: cargoMarket
id: scp
- type: cargoMarket
id: Scp
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Resources/Prototypes/_Scp/Catalog/Cargo/markets.yml` around lines 1 - 2, The
market prototype's id "scp" must be converted to CamelCase (e.g., "Scp") in the
markets.yml entry for the cargoMarket so it conforms to Prototype ID format, and
you must also update the corresponding cargoProduct prototypes' group fields to
match that new CamelCase id (search for cargoProduct entries referencing group:
scp and change them to group: Scp); ensure the type remains cargoMarket and
verify all references are updated consistently.

26 changes: 26 additions & 0 deletions Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- type: cargoProduct
id: cargoScp2263
product: CrateScp2263
cost: 999999999

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Очень плохая реализация через очень огромную цену в карго.
Ну а так же их бесконечное количество...
Там разве нельзя скрыть продукт?

icon:
sprite: Markers/cross.rsi
state: red
group: scp

- type: cargoProduct
id: cargoScp124
product: CrateScp124
cost: 999999999
icon:
sprite: Markers/cross.rsi
state: red
group: scp

- type: cargoProduct
id: cargoScp427
product: CrateScp427
cost: 999999999
icon:
sprite: Markers/cross.rsi
state: red
group: scp
Comment on lines +2 to +26

@coderabbitai coderabbitai Bot May 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Используйте CamelCase для cargoProduct идентификаторов.

cargoScp2263, cargoScp124, cargoScp427 не соответствуют обязательному формату ID. После переименования обязательно обновите ссылки в CargoGiftsRule.gifts.

💡 Предлагаемое исправление 
-  id: cargoScp2263
+  id: CargoScp2263
@@
-  id: cargoScp124
+  id: CargoScp124
@@
-  id: cargoScp427
+  id: CargoScp427
# Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml
-      cargoScp2263: 1
+      CargoScp2263: 1
@@
-      cargoScp124: 1
+      CargoScp124: 1
@@
-      cargoScp427: 1
+      CargoScp427: 1

As per coding guidelines: "Prototype ID format MUST be CamelCase".

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml` around lines 2 - 26, The
prototype IDs "cargoScp2263", "cargoScp124", and "cargoScp427" use
snake/lowercase style and must be renamed to CamelCase (e.g.,
CargoScp2263-style) in the scp.yml entries (the type: cargoProduct blocks) to
meet the prototype ID format, and then update all places that reference
them—specifically the CargoGiftsRule.gifts mapping—so the renamed IDs are used
everywhere to avoid broken references.

36 changes: 36 additions & 0 deletions Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: entity
id: CrateScp2263
suffix: SCP-2263 crate
parent: CrateAdministrationSecure
components:
- type: RadiationBlockingContainer
resistance: 3
- type: EntityTableContainerFill
containers:
entity_storage: !type:GroupSelector
children:
- id: Scp226362
- id: Scp226360
- id: Scp226318

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Все сразу в одном ящике?

@666XxttimurkaxX666 666XxttimurkaxX666 May 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

там рандомно спавнится один скелет какого либо вида

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

там рандомно спавнится один скелет какого либо вида

Поставки скорее всего нужно реализовывать через C#, потому что в прототипах это выглядит ужасно, по крайней мере на текущий момент


- type: entity
id: CrateScp124
suffix: SCP-124 crate
parent: CrateAdministrationSecure
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:AllSelector
children:
- id: Scp124

- type: entity
id: CrateScp427
suffix: SCP-427 crate
parent: CrateAdministrationSecure
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:AllSelector
children:
- id: Scp427
Comment thread
666XxttimurkaxX666 marked this conversation as resolved.
75 changes: 75 additions & 0 deletions Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
- type: entity
id: Scp2263Base
abstract: true
parent: BaseScpArtifactMinor
name: skeleton sculpture
description: Unusual model of a human skeleton.
suffix: SCP-2263
components:
- type: Sprite
sprite: _Scp/Objects/Scp/scp-2263.rsi

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Раздели это на подпапки.
Создай папку scp-2663, а внутри неё папки:
-> scp-2663-62.rsi
-> scp-2663-60.rsi
-> scp-2663-18.rsi

И туда уже помести спрайты различных состояний и направлений.

@666XxttimurkaxX666 666XxttimurkaxX666 May 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а зачем там разные направления и состояния

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а зачем там разные направления и состояния

Потому что у тебя скелеты могут повырачиваться, вот это да, согласен? Чудо

- type: Physics
bodyType: Dynamic
- type: Transform
anchored: false
noRot: true
- type: Pullable
- type: Clickable
- type: InteractionOutline
- type: Damageable
- type: DamageOverlay
damagePopupType: SmallFloating
isStructure: true
- type: Scp
class: Safe
- type: GuideHelp
guides:
- ScpResearch
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.45,0.25,0.45"
mask:
- MachineMask
layer:
- MachineLayer
density: 200

- type: entity
id: Scp226362
parent: Scp2263Base
suffix: SCP-2263-62
components:
- type: Sprite
state: scp2263-62
- type: PointLight
color: LightGreen
radius: 5
energy: 5
netsync: false
- type: RadiationSource
intensity: 3

- type: entity
id: Scp226360
parent: Scp2263Base
suffix: SCP-2263-60
components:
- type: Sprite
state: scp2263-60
- type: AnyDamageSound
sound:
collection: ArcadeNoise
params:
volume: 4
maxDistance: 8

- type: entity
id: Scp226318
parent: Scp2263Base
suffix: SCP-2263-18
components:
- type: Sprite
state: scp2263-18
61 changes: 61 additions & 0 deletions Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
- type: entity
id: CargoScpDeliveryBase
parent: BaseGameRule
abstract: true
components:
- type: GameRule
delay:
min: 10
max: 10
- type: StationEvent
startColor: "#18abf5"
- type: CargoGiftsRule
sender: cargo-delivery-sender
announce: cargo-delivery-event-announcement

- type: entityTable
id: ScpCargoDeliveryTable
table: !type:GroupSelector
children:
- id: DeliveryScp2263
- id: DeliveryScp124
- id: DeliveryScp427

Comment thread
666XxttimurkaxX666 marked this conversation as resolved.
- type: entity
id: DeliveryScp2263
parent: CargoScpDeliveryBase
components:
- type: StationEvent
weight: 3
duration: 120
earliestStart: 20
- type: CargoGiftsRule
description: cargo-delivery-description-scp2263
gifts:
cargoScp2263: 1

- type: entity
id: DeliveryScp124
parent: CargoScpDeliveryBase
components:
- type: StationEvent
weight: 3
duration: 120
earliestStart: 20
- type: CargoGiftsRule
description: cargo-delivery-description-scp124
gifts:
cargoScp124: 1

- type: entity
id: DeliveryScp427
parent: CargoScpDeliveryBase
components:
- type: StationEvent
weight: 3
duration: 120
earliestStart: 20
- type: CargoGiftsRule
description: cargo-delivery-description-scp427
gifts:
cargoScp427: 1
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Scp/GameRules/roundstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
tableId: CargoGiftsTable
- !type:NestedSelector
tableId: CalmPestEventsTable
- !type:NestedSelector
tableId: ScpCargoDeliveryTable

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ты уверен, что это нужно добавлять в ротацию базовых ивентов?
Стоит под вопросом в связи со способом реализации доставки, его нужно менять, в карго не должны быть ящики объектов по космической цене.

@666XxttimurkaxX666 666XxttimurkaxX666 May 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cargoproducts это за какую стоимость персонал может купить предмет

продать за ту же цену они не могут

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cargoproducts это за какую стоимость персонал может купить предмет

продать за ту же цену они не могут

Я в курсе, но это не должно так выглядеть


- type: entityTable
id: ScpBasicChillGameRulesTable
Expand All @@ -142,6 +144,8 @@
tableId: CargoGiftsTable
- !type:NestedSelector
tableId: CalmPestEventsTable
- !type:NestedSelector
tableId: ScpCargoDeliveryTable

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

То-же самое, под вопросом.


- type: entityTable
id: ScpBasicCalmEventsTable
Expand Down
20 changes: 20 additions & 0 deletions Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by timur",
"size": {
"x": 32,
"y": 32
},
"states": [

@WardexOfficial WardexOfficial May 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нужно разделить на разные meta.json файлы в разных папках и туда вписать различные состояния объекта, а так же его направления во все стороны света.

{
"name": "scp2263-62"
},
{
"name": "scp2263-18"
},
{
"name": "scp2263-60"
}
]
}
Binary file added Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-18.png
View file
Open in desktop
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 Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-60.png
View file
Open in desktop
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 Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-62.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading