From 9b7fdbbdc0b4793c64911917ab3e93bc9853fdbf Mon Sep 17 00:00:00 2001 From: 666XxttimurkaxX666 <666qwe3@gmail.com> Date: Mon, 4 May 2026 01:58:20 +0700 Subject: [PATCH 1/4] Add delivery scp --- .../station-events/events/cargo-delivery.ftl | 4 ++ .../Prototypes/_Scp/Catalog/Cargo/scp.yml | 8 +++ .../_Scp/Catalog/Fills/Crates/scp.yml | 9 +++ .../_Scp/Entities/Objects/Scp/scp2263.yml | 54 ++++++++++++++++++ .../_Scp/GameRules/cargo_delivery.yml | 35 ++++++++++++ .../Prototypes/_Scp/GameRules/roundstart.yml | 2 + .../_Scp/Objects/Scp/scp-2263.rsi/meta.json | 14 +++++ .../Objects/Scp/scp-2263.rsi/scp2263-62.png | Bin 0 -> 722 bytes 8 files changed, 126 insertions(+) create mode 100644 Resources/Locale/ru-RU/_strings/_scp/station-events/events/cargo-delivery.ftl create mode 100644 Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml create mode 100644 Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml create mode 100644 Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml create mode 100644 Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml create mode 100644 Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json create mode 100644 Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-62.png 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..e6f370229cb --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_scp/station-events/events/cargo-delivery.ftl @@ -0,0 +1,4 @@ +cargo-delivery-event-announcement = Внимание логистическому и научно-исследовательскому отделам. На ваш участок был доставлен аномальный объект { $description } для изучения и содержания. Всё прибудет со следующей партией груза. +cargo-gift-delivery-description-scp2263 = SCP-2263 +cargo-gift-delivery-sender = Региональное управление + diff --git a/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml b/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml new file mode 100644 index 00000000000..49717ca4dfa --- /dev/null +++ b/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml @@ -0,0 +1,8 @@ +- type: cargoProduct + id: cargoScp2263 + product: CrateScp226362 + cost: 999999999 + icon: + sprite: Markers/cross.rsi + state: red + group: contraband 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..ac6b14d3555 --- /dev/null +++ b/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml @@ -0,0 +1,9 @@ +- type: entity + id: CrateScp226362 + parent: CrateAdministrationSecure + name: crate + description: Crate for scp. + components: + - type: StorageFill + contents: + - id: Scp226362 \ No newline at end of file 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..27afe53f044 --- /dev/null +++ b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml @@ -0,0 +1,54 @@ +- type: entity + id: Scp2263Base + abstract: true + parent: + - BaseStructure + - BaseScpArtifactMinor + name: skeleton + description: Abnormal looking skeleton + suffix: SCP-2263 + components: + - type: Sprite + sprite: _Scp/Objects/Scp/scp-2263.rsi + - type: Physics + bodyType: Static + - type: Transform + anchored: false + noRot: true + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.45,0.25,0.45" + mask: + - MachineMask + layer: + - MachineLayer + density: 200 + - type: Anchorable + - type: Clickable + - type: InteractionOutline + - type: Damageable + - type: DamageOverlay + damagePopupType: SmallFloating + isStructure: true + - type: Scp + class: Safe + - type: GuideHelp + guides: + - ScpResearch + +- type: entity + id: Scp226362 + parent: Scp2263Base + components: + - type: Sprite + state: scp2263-62 + - type: PointLight + color: LightGreen + radius: 5 + energy: 5 + netsync: false + - type: RadiationSource + intensity: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml new file mode 100644 index 00000000000..e5c9ca5e30b --- /dev/null +++ b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml @@ -0,0 +1,35 @@ +- type: entity + id: CargoScpDeliveryBase + parent: BaseGameRule + abstract: true + components: + - type: GameRule + delay: + min: 10 + max: 10 + - type: StationEvent + startColor: "#18abf5" +# startAudio: Fire edit +# path: /Audio/_Sunrise/Announcements/announce_dig.ogg + - type: CargoGiftsRule + sender: cargo-gift-delivery-sender + announce: cargo-delivery-event-announcement + +- type: entityTable + id: ScpCargoDeliveryTable + table: !type:GroupSelector + children: + - id: DeliveryScp2263 + +- type: entity + id: DeliveryScp2263 + parent: CargoScpDeliveryBase + components: + - type: StationEvent + weight: 3 + duration: 120 + earliestStart: 20 + - type: CargoGiftsRule + description: cargo-gift-delivery-description-scp2263 + gifts: + cargoScp2263: 1 diff --git a/Resources/Prototypes/_Scp/GameRules/roundstart.yml b/Resources/Prototypes/_Scp/GameRules/roundstart.yml index f9340c76c08..be7f9ca2933 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 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..53df3747d77 --- /dev/null +++ b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by timur", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scp2263-62" + } + ] +} 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 0000000000000000000000000000000000000000..0696e194a437c6050fedb6ae24077523790bfc30 GIT binary patch literal 722 zcmV;@0xkWCP)pHgh@m}R9Hu~S3xU8Q53#2QHF$+D2vHNWPy^^u(VOiFW?XO2dwx9 z{s0?WrEDy*l47GoY8Don5|bFEjQMW9=gj5KdG|eTJ@eju_nz~e?|kRn$Cwl&-;=MU z*lxFG(-_G0}Lc!6|_A!c@PxJ-M^w;TO-65sg*(J_rCKw~o*6ZS?rX03%62w1lAL+VO=EgKK~D z$SkhS*=c}DGJ-Wg7A_8MB7c($!(JU|8VCjeuhc=IIA}G1G$a*a5CG;FqI<4XBL+IV za*-BXAb-XHoHO6eat&Qb5Pt%I&MyzHBj3IGZqq;BXYMb{=ArZy%~PBNks84ATG2+1 z$Ur?D_yzz%4_prr8h}`3h$uPaJsEHTNv5>Y%%a!(E=GU4cV+X+rUS>gFyuX}fh@#n zOtBbnqaX`D2DGTVLme1ExZU zssW!tFq3V~dXM3_KoSFhgO~D4TtD7*!2o1QcJy`F5@hKmK@$u>mKYfbse2b>FaQ|f z`40x<^S?6i+sXFv{_(?SoD)!Pip2noqVX`-{3t;cVBneBz`76+vHJkN38Ff8>YZ&m zNgq(ZipPe=>_4H^$Esn@K|P{}2sy`lrUmOuk0sUqC!y_qG?2AlTmS$707*qoM6N<$ Ef@8f%EdT%j literal 0 HcmV?d00001 From 6a667e86372b2638a6f1705feffd7acfbde10cec Mon Sep 17 00:00:00 2001 From: 666XxttimurkaxX666 <666qwe3@gmail.com> Date: Mon, 4 May 2026 15:22:55 +0700 Subject: [PATCH 2/4] eee --- .../_scp/entities/objects/scp/scp2263.ftl | 6 ++ .../station-events/events/cargo-delivery.ftl | 6 +- .../Prototypes/_Scp/Catalog/Cargo/scp.yml | 20 +++++- .../_Scp/Catalog/Fills/Crates/scp.yml | 39 ++++++++++-- .../_Scp/Entities/Objects/Scp/scp2263.yml | 59 ++++++++++++------ .../_Scp/GameRules/cargo_delivery.yml | 30 ++++++++- .../Prototypes/_Scp/GameRules/roundstart.yml | 2 + .../_Scp/Objects/Scp/scp-2263.rsi/meta.json | 6 ++ .../Objects/Scp/scp-2263.rsi/scp2263-18.png | Bin 0 -> 1479 bytes .../Objects/Scp/scp-2263.rsi/scp2263-60.png | Bin 0 -> 1419 bytes 10 files changed, 138 insertions(+), 30 deletions(-) create mode 100644 Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl create mode 100644 Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-18.png create mode 100644 Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/scp2263-60.png 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..f09a183de2f --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl @@ -0,0 +1,6 @@ +ent-Scp226362 = скульптура скелета + .desc = Необыкновенная скульптура в виде скелета человека. +ent-Scp226360 = скульптура скелета + .desc = Необыкновенная скульптура в виде скелета человека. +ent-Scp226318 = скульптура скелета + .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 index e6f370229cb..c7b0ff4d08f 100644 --- 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 @@ -1,4 +1,6 @@ cargo-delivery-event-announcement = Внимание логистическому и научно-исследовательскому отделам. На ваш участок был доставлен аномальный объект { $description } для изучения и содержания. Всё прибудет со следующей партией груза. -cargo-gift-delivery-description-scp2263 = SCP-2263 -cargo-gift-delivery-sender = Региональное управление +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/scp.yml b/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml index 49717ca4dfa..290a49f4e61 100644 --- a/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml +++ b/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml @@ -1,6 +1,24 @@ - type: cargoProduct id: cargoScp2263 - product: CrateScp226362 + product: CrateScp2263 + cost: 999999999 + icon: + sprite: Markers/cross.rsi + state: red + group: contraband + +- type: cargoProduct + id: cargoScp124 + product: CrateScp124 + cost: 999999999 + icon: + sprite: Markers/cross.rsi + state: red + group: contraband + +- type: cargoProduct + id: cargoScp427 + product: CrateScp427 cost: 999999999 icon: sprite: Markers/cross.rsi diff --git a/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml b/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml index ac6b14d3555..de4a31f96a7 100644 --- a/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml +++ b/Resources/Prototypes/_Scp/Catalog/Fills/Crates/scp.yml @@ -1,9 +1,36 @@ - type: entity - id: CrateScp226362 + id: CrateScp2263 + suffix: SCP-2263 crate parent: CrateAdministrationSecure - name: crate - description: Crate for scp. components: - - type: StorageFill - contents: - - id: Scp226362 \ No newline at end of file + - 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 index 27afe53f044..ad859dd5805 100644 --- a/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml +++ b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp2263.yml @@ -1,32 +1,19 @@ - type: entity id: Scp2263Base abstract: true - parent: - - BaseStructure - - BaseScpArtifactMinor - name: skeleton - description: Abnormal looking skeleton + 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: Static + bodyType: Dynamic - type: Transform anchored: false noRot: true - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.45,0.25,0.45" - mask: - - MachineMask - layer: - - MachineLayer - density: 200 - - type: Anchorable + - type: Pullable - type: Clickable - type: InteractionOutline - type: Damageable @@ -38,10 +25,22 @@ - 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 @@ -51,4 +50,26 @@ energy: 5 netsync: false - type: RadiationSource - intensity: 3 \ No newline at end of file + 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 index e5c9ca5e30b..937c7c6fd7e 100644 --- a/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml +++ b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml @@ -12,7 +12,7 @@ # startAudio: Fire edit # path: /Audio/_Sunrise/Announcements/announce_dig.ogg - type: CargoGiftsRule - sender: cargo-gift-delivery-sender + sender: cargo-delivery-sender announce: cargo-delivery-event-announcement - type: entityTable @@ -30,6 +30,32 @@ duration: 120 earliestStart: 20 - type: CargoGiftsRule - description: cargo-gift-delivery-description-scp2263 + 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 be7f9ca2933..95a5ea41612 100644 --- a/Resources/Prototypes/_Scp/GameRules/roundstart.yml +++ b/Resources/Prototypes/_Scp/GameRules/roundstart.yml @@ -144,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 index 53df3747d77..a2764547bdd 100644 --- a/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json +++ b/Resources/Textures/_Scp/Objects/Scp/scp-2263.rsi/meta.json @@ -9,6 +9,12 @@ "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 0000000000000000000000000000000000000000..0591efabf7f2eed56bd357545e8d064ca7f488bc GIT binary patch literal 1479 zcmV;&1vvVNP)pKc}YY;R9Hu~m;Fx@cO1vxcWv+bKxqrM1%x8lQy7TPDBGM*i4WPB zMp0Y{o7wzD?bpSke}v^afF$Om@S$ZoSAd`VJeD>y|y3^LZQ%JAL!Hd zZr37CGv#{XKFOuceee7EyuRb-Vi%R0 z5EJfzq5&@CLRm#MnvNZPBM3zR+ZvCv&YI02ND`sZIMO1A5$`z65g*K@tFi6i3B?eK z0BCvwy4Wx*Ochp@R>9}Khq^6I&@5&kgrTV7sJ!@ zH-up|!h?PI?ezDIQUXG5!mBEI%aL!`3Ude%(dL|vlkP}5gzl5yy)rmK%pF1zz^;~k zY(gjp?XV(WD!!*rd`|1KC2kFGhTrW*lF;JX#kQ9~-WtG;-7ReSp54&#V=#r2c*<7* zkFPrE^()-Q(Lw~vIA}Nu{e3slb?WqUh_?c;_h>U)T=pSSoC_h5hhYMU)~KKv5S<#M z+8q*2p!{y=XeaV(t+?IuE3Th9pM{VEkS)UPt)H@$Yqw+Y{uKo1017LuC~T-je!*%G zNg7nO9S(y7rgxp-r$^!Hxq>w{d$6x@Z%$iMEmwqeNW^%*2SlU{33UX4NT&byLL9Sz z6jMk&_F+Ub1>0aT)TL4A?uRjD>IG3+Cg*zQESRg0Hy-$!UAA)rhCM!XUi_Bf{-R(D zjbTB;27M6?W2qkcrORO|cEG2a0DHd|9T!eB;~oyy@&@ewWS^`Gb1D$E`jMOrgCeMz z)tE*QGOPpV8wE*LAgNElc()g!d^JimX~YfBPRAq<0+SHbdRZ0btO0Ys9b=>xFmhQ( z*Uz>yeXc%uhorPbdJuhh3lH5f@I$xZ9e#w)AJ1e9Ph|muQo0fd$pXx&Kw1n!M+hie zwG|&XH?x=8+nJkfGy8o1N3Cpv6rfX$p`-1>^KI93@CaM7c{5U~ewYS|<_8cb3SrAH zKp+r?eaBvGJJ!M?SO7vTrN&VV(x*krM4+*?g-uy35Ckn6n5~%b^uXk_qMwvkV9pfe zt0D+-1IQ~gYVhc>j2UhZnkW?c_NosZ&AH9EP|Rru9}>ELNziE2VD3gU=&DaRGGy z)W*16m(b(Ai(h`2X-0FIY#+GX^>1$%qAK`f_fV*=#A0C?u0HC*+Lq;@cmm;}NhB;1 zpk&==&&dX!g^~q$k=_`Ofi~2_bMJTXx+u8O2N=B}A|6x2-nawwodt3W{?E8*J<&zx@sUgvEzMY9Uc;snCr5FiHN?Rua5kfM%fw83n>r1e|vY;e`@diS(kN&~gT7 z+||l*_5wgd!ylYNN;E@A2{8I25XnjDge0JkiP*BgRrUmYkufKLolPfLd;LPxEv-W8 zi4V+*BB)hnWOe~*u7Jbd08gJAE9zImR#A%&nsfg?$f*zH*`o0F0aWlN=mHahgF#sH zg4u=WQ_~pe{S&-}!lPRg@J|TPQqpmlqshJ%S65bNzc6EgST^Sw%SfMDeWnO!@6GpJAnWI002ovPDHLkV1geKuV4TG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..90bb5d5c062e398b8bd908fdbd4680c43d39ae23 GIT binary patch literal 1419 zcmV;61$6p}P)pKJxN4CR9Hu~SNn4lRTTd2ZZ?}_vuPe}L(*r`Ld}3W0}M`OEVQBn zh{(f72L^Q<9sVQaM@9vHaMZz8hrtoX`sfcjgQX}G0;Hu)A9;1N&1rJo<3f(^F z&FpL@ch5QB{mwbx$pULw?VfhJ2J@OJw-yI>k9{rXHCtllfzrnxa&Pbug-wQ4p!j<1 zvnTo?Wa$vA0`OYk6}m033%sQQucqLe?4P)J_u^xHnE_aF3ifsEr<+|aDD*1otQI6n zx6xG>!O5;8tEz_;0XP~sMz{I;z_U*#S45$bL^L~xdMyFJyd6iw$5#x(VpanW?>qPe zWc@xw_cMr;7jQW}jGpEcFf9R#k+DHlCncL=}SjCEQ8fMuuiFaP!=%if}~$K4|NvIU0gPZh%i4LyFqr z60H!Z2b1%+p}~$Xx7N{oQZ!*5;InW%F}2v{BTM(G`O6QJCyX>S8lp27+*bsTO^8mGKF8FLCXikk`bl!%bJ&NCX zE6&7zs3qLW@Xityd8npoSh5Bv<{=Y`NJAgqZ|$kkc_}(b1}DxDiAisvq{E3hoQ@8Y zGh+{ep9~$M;ig?IMI0JMzbSwv8BpOxo8ZMvNkx0x5ghI6rJUwvt(8Q<8Gx76BQ3^o zqP>@DqK7r84R5&nFsY2d?QX>NwKCu%3rK3?a7#Q!<}Sce5V70ajfj6MJjHo5@C#@u z*s(p>hds_6kZBp8r!JwwZ-$xzY+A*f0h2x@$LImd&;Eh0rmm2~;R6&rfveJh#tkV1 zD*==^7K9imvqBWL6b2?Plh+v|CEbQglSAaZi4K^KKo|3y*W%cfy1eZA)?4S+}u3M>eTuINC-NU;Q+KswiYNi zm#f_a*?MSs2Q-&;eF0#B!jiv-o&FcFKlC=08YT3%9HbjJ^`Z;~b$b2!0+2}=yifj&W7U>{95 zJnY0)#7k*t)D5F-z*As)Pts`82_)UX;g*+8C*Z>OR&BtlGzZrer2uj&mY- Date: Mon, 4 May 2026 15:58:56 +0700 Subject: [PATCH 3/4] e --- .../ru-RU/_prototypes/_scp/catalog/fills/crates/scp.ftl | 6 ++++++ .../_prototypes/_scp/entities/objects/scp/scp2263.ftl | 8 ++++---- Resources/Prototypes/_Scp/Catalog/Cargo/markets.yml | 2 ++ Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml | 6 +++--- Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml | 2 ++ 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/crates/scp.ftl create mode 100644 Resources/Prototypes/_Scp/Catalog/Cargo/markets.yml 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 index f09a183de2f..79e93c62ff2 100644 --- a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp2263.ftl @@ -1,6 +1,6 @@ ent-Scp226362 = скульптура скелета .desc = Необыкновенная скульптура в виде скелета человека. -ent-Scp226360 = скульптура скелета - .desc = Необыкновенная скульптура в виде скелета человека. -ent-Scp226318 = скульптура скелета - .desc = Необыкновенная скульптура в виде скелета человека. \ No newline at end of file +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/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 index 290a49f4e61..86f257b4ab6 100644 --- a/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml +++ b/Resources/Prototypes/_Scp/Catalog/Cargo/scp.yml @@ -5,7 +5,7 @@ icon: sprite: Markers/cross.rsi state: red - group: contraband + group: scp - type: cargoProduct id: cargoScp124 @@ -14,7 +14,7 @@ icon: sprite: Markers/cross.rsi state: red - group: contraband + group: scp - type: cargoProduct id: cargoScp427 @@ -23,4 +23,4 @@ icon: sprite: Markers/cross.rsi state: red - group: contraband + group: scp diff --git a/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml index 937c7c6fd7e..6ee0e85785a 100644 --- a/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml +++ b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml @@ -20,6 +20,8 @@ table: !type:GroupSelector children: - id: DeliveryScp2263 + - id: DeliveryScp124 + - id: DeliveryScp427 - type: entity id: DeliveryScp2263 From 4d62669a51c4356ed97b76d07d566af608c16e14 Mon Sep 17 00:00:00 2001 From: 666XxttimurkaxX666 <666qwe3@gmail.com> Date: Thu, 7 May 2026 18:23:25 +0700 Subject: [PATCH 4/4] Update cargo_delivery.yml --- Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml index 6ee0e85785a..6bf404dbef7 100644 --- a/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml +++ b/Resources/Prototypes/_Scp/GameRules/cargo_delivery.yml @@ -9,8 +9,6 @@ max: 10 - type: StationEvent startColor: "#18abf5" -# startAudio: Fire edit -# path: /Audio/_Sunrise/Announcements/announce_dig.ogg - type: CargoGiftsRule sender: cargo-delivery-sender announce: cargo-delivery-event-announcement