diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/crates/scp.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/crates/scp.ftl new file mode 100644 index 00000000000..26f8a791263 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/crates/scp.ftl @@ -0,0 +1,6 @@ +ent-CrateScp2263 = ящик СЦП + .desc = Защищённый ящик, содержащий в себе аномальный объект. +ent-CrateScp124 = { ent-CrateScp2263 } + .desc = { ent-CrateScp2263.desc } +ent-CrateScp427 = { ent-CrateScp2263 } + .desc = { ent-CrateScp2263.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl new file mode 100644 index 00000000000..79e93c62ff2 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl @@ -0,0 +1,6 @@ +ent-Scp226362 = скульптура скелета + .desc = Необыкновенная скульптура в виде скелета человека. +ent-Scp226360 = { ent-Scp226362 } + .desc = { ent-Scp226362.desc } +ent-Scp226318 = { ent-Scp226362 } + .desc = { ent-Scp226362.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_scp/station-events/events/cargo-delivery.ftl b/Resources/Locale/ru-RU/_strings/_scp/station-events/events/cargo-delivery.ftl new file mode 100644 index 00000000000..c7b0ff4d08f --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_scp/station-events/events/cargo-delivery.ftl @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_Scp/Catalog/Cargo/markets.yml b/Resources/Prototypes/_Scp/Catalog/Cargo/markets.yml new file mode 100644 index 00000000000..b4688778091 --- /dev/null +++ b/Resources/Prototypes/_Scp/Catalog/Cargo/markets.yml @@ -0,0 +1,2 @@ +- type: cargoMarket + id: scp \ No newline at end of file diff --git a/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml b/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml new file mode 100644 index 00000000000..86f257b4ab6 --- /dev/null +++ b/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml @@ -0,0 +1,26 @@ +- type: cargoProduct + id: cargoScp2263 + product: CrateScp2263 + cost: 999999999 + 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 diff --git a/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml b/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml new file mode 100644 index 00000000000..de4a31f96a7 --- /dev/null +++ b/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml @@ -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 + +- 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 diff --git a/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml new file mode 100644 index 00000000000..ad859dd5805 --- /dev/null +++ b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml @@ -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 + - 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 diff --git a/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml new file mode 100644 index 00000000000..6bf404dbef7 --- /dev/null +++ b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml @@ -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 + +- 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 diff --git a/Resources/Prototypes/_Scp/GameRules/roundstart.yml b/Resources/Prototypes/_Scp/GameRules/roundstart.yml index f9340c76c08..95a5ea41612 100644 --- a/Resources/Prototypes/_Scp/GameRules/roundstart.yml +++ b/Resources/Prototypes/_Scp/GameRules/roundstart.yml @@ -129,6 +129,8 @@ tableId: CargoGiftsTable - !type:NestedSelector tableId: CalmPestEventsTable + - !type:NestedSelector + tableId: ScpCargoDeliveryTable - type: entityTable id: ScpBasicChillGameRulesTable @@ -142,6 +144,8 @@ tableId: CargoGiftsTable - !type:NestedSelector tableId: CalmPestEventsTable + - !type:NestedSelector + tableId: ScpCargoDeliveryTable - type: entityTable id: ScpBasicCalmEventsTable diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json new file mode 100644 index 00000000000..a2764547bdd --- /dev/null +++ b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by timur", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scp2263-62" + }, + { + "name": "scp2263-18" + }, + { + "name": "scp2263-60" + } + ] +} diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-18.png b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-18.png new file mode 100644 index 00000000000..0591efabf7f Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-18.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-60.png b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-60.png new file mode 100644 index 00000000000..90bb5d5c062 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-60.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-62.png b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-62.png new file mode 100644 index 00000000000..0696e194a43 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-62.png differ