diff --git a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs index 6ca7c8cc44..9cc708c10c 100644 --- a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs +++ b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs @@ -121,7 +121,7 @@ namespace Content.Server.Chemistry.ReagentEffects } public override void Effect(ReagentEffectArgs args) - { + { // TODO Make something out of this acid system if (!PierceHardsuit && args.EntityManager.System().TryGetSlotEntity(args.SolutionEntity, "outerClothing", out var suit) && args.EntityManager.System().HasTag(suit.Value, "Hardsuit")) diff --git a/Resources/Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg b/Resources/Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg index 4026418d47..d578580eef 100644 Binary files a/Resources/Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg and b/Resources/Audio/_Honk/Jukebox/blinch_Golden_Win_Piano.ogg differ diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 8d28c66abe..539ea6887d 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,15 +1,4 @@ Entries: -- author: Remuchi - changes: - - message: "\u0424\u0438\u043A\u0441 \u0432\u0441\u043A\u0440\u044B\u0442\u0438\u044F\ - \ \u043B\u044E\u0431\u044B\u0445 \u0434\u0432\u0435\u0440\u0435\u0439 \u043B\ - \u043E\u043C\u043E\u043C. \u0412 \u043B\u044E\u0431\u043E\u043C \u0441\u043E\ - \u0441\u0442\u043E\u044F\u043D\u0438\u0438. \u0414\u0430\u0436\u0435 \u043D\u0430\ - \ \u0431\u043E\u043B\u0442\u0430\u0445" - type: Fix - id: 155 - time: '2024-02-26T17:04:32.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/125 - author: ThereDrD changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\ @@ -8911,3 +8900,19 @@ id: 654 time: '2025-01-07T19:14:55.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/876 +- author: Hero_010 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0441\u0430\u043C\ + \u043E\u0434\u0435\u043B\u044C\u043D\u0430\u044F \u0433\u0440\u044F\u0434\u043A\ + \u0430." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0443\u043F\u0430\ + \u043A\u043E\u0432\u043A\u0430 \u0437\u0435\u043C\u043B\u0438, \u0435\u0451\ + \ \u043C\u043E\u0436\u043D\u043E \u043D\u0430\u0439\u0442\u0438 \u0432 \u0442\ + \u0435\u0445\u0430\u0445, \u0432 \u0411\u043E\u0442\u0430\u041C\u0430\u043A\u0441\ + \ \u0438 \u0432 \u0437\u0430\u043A\u0430\u0437\u0430\u0445 \u043A\u0430\u0440\ + \u0433\u043E." + type: Add + id: 655 + time: '2025-01-08T19:42:41.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/868 diff --git a/Resources/Locale/ru-RU/_white/structures/growingpot.ftl b/Resources/Locale/ru-RU/_white/structures/growingpot.ftl new file mode 100644 index 0000000000..fcea7f4a72 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/structures/growingpot.ftl @@ -0,0 +1,2 @@ +ent-GrowingPot = самодельная грядка + .desc = Деревнянная грядка для выращивания. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index 297dc7da08..a40ad977f1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -1,51 +1,71 @@ -ent-ClothingBackpackDuffelSurgeryFilled = { ent-ClothingBackpackDuffelSyndicate } - .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор хирургических инструментов. +ent-ClothingBackpackDuffelSurgeryFilled = хирургический вещмешок + .desc = Большой вещмешок для хранения дополнительного медицинского снаряжения - похоже, этот мешок предназначен для хранения хирургических инструментов. ent-ClothingBackpackDuffelSyndicateFilledMedical = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор хирургических инструментов. + .suffix = Medical ent-ClothingBackpackDuffelSyndicateFilledShotgun = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Бульдог". + .suffix = Shotgun ent-ClothingBackpackDuffelSyndicateFilledSMG = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "C-20r". + .suffix = SMG ent-ClothingBackpackDuffelSyndicateFilledRevolver = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Питон". + .suffix = Revolver ent-ClothingBackpackDuffelSyndicateFilledLMG = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "L6 Saw". + .suffix = LMG ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Крайт". + .suffix = GrenadeLauncher ent-ClothingBackpackDuffelSyndicateFilledCarbine = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "М-90gl". + .suffix = Carbine ent-ClothingBackpackDuffelSyndicateAmmoFilled = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор боеприпасов. + .suffix = Ammo ent-ClothingBackpackDuffelSyndicateCostumeCentcom = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: костюм представителя Центкома. - .suffix = НЕ МАППИТЬ + .suffix = НЕ МАППИТЬ, CostumeCentcom ent-ClothingBackpackDuffelSyndicateCostumeClown = { ent-ClothingBackpackDuffelClown } .desc = { ent-ClothingBackpackDuffelClown.desc } - .suffix = Синдикат + .suffix = CostumeClown ent-ClothingBackpackDuffelSyndicateCarpSuit = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор костюма карпа. + .suffix = CarpSuit ent-ClothingBackpackDuffelSyndicatePyjamaBundle = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор пижам. + .suffix = PyjamaBundle ent-ClothingBackpackDuffelSyndicateC4tBundle = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор C-4. + .suffix = C4tBundle ent-ClothingBackpackChameleonFill = { ent-ClothingBackpackChameleon } .suffix = Заполненный, Хамелеон .desc = { ent-ClothingBackpackChameleon.desc } ent-ClothingBackpackDuffelSyndicateEVABundle = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор EVA синдиката. + .suffix = EVABundle ent-ClothingBackpackDuffelSyndicateHardsuitBundle = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор скафандра синдиката. + .suffix = HardsuitBundle ent-ClothingBackpackDuffelZombieBundle = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: зомби набор синдиката. + .suffix = ZombieBundle ent-ClothingBackpackDuffelSyndicateOperative = { ent-ClothingBackpackDuffelSyndicate } .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc } + .suffix = SyndicateOperative ent-ClothingBackpackDuffelSyndicateOperativeMedic = { ent-ClothingBackpackDuffelSyndicate } .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc } + .suffix = SyndicateOperativeMedic ent-ClothingBackpackDuffelSyndicateMedicalBundleFilled = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор медикаментов. + .suffix = MedicalBundle ent-ClothingBackpackDuffelSyndicateDecoyKitFilled = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор приманок. + .suffix = DecoyKit ent-ClothingBackpackDuffelSyndicateEliteHardsuitBundle = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор элитного скафандра синдиката. + .suffix = EliteHardsuit ent-ClothingBackpackDuffelSyndicateHardsuitExtrasBundle = { ent-ClothingBackpackDuffelSyndicate } .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор принадлежностей для скафандра. + .suffix = HardsuitExtras diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl index 003f3d8431..66ac65d9e4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl @@ -26,15 +26,13 @@ ent-ClothingBackpackDuffelSyndicateBundle = { ent-ClothingBackpackDuffelSyndicat .desc = { ent-ClothingBackpackDuffelSyndicate.desc } ent-ClothingBackpackDuffelSyndicateAmmo = вещмешок синдиката .desc = { ent-ClothingBackpackDuffelSyndicate.desc } + .suffix = Ammo ent-ClothingBackpackDuffelSyndicateAmmoBundle = { ent-ClothingBackpackDuffelSyndicate } .desc = { ent-ClothingBackpackDuffelSyndicate.desc } -ent-ClothingBackpackDuffelSyndicateMedical = вещмешок синдиката - .desc = { ent-ClothingBackpackDuffelSyndicate.desc } -ent-ClothingBackpackDuffelSyndicateMedicalBundle = { ent-ClothingBackpackDuffelSyndicate } - .desc = { ent-ClothingBackpackDuffelSyndicate.desc } ent-ClothingBackpackDuffelHolding = бездонный вещмешок .desc = Вещмешок, открывающийся в локальный карман блюспейса. ent-ClothingBackpackDuffelCBURN = вещмешок РХБЗЗ .desc = Вещмешок, содержащий разнообразное оборудование для биологической защиты. ent-ClothingBackpackDuffelSyndicateLonelyOperative = { ent-ClothingBackpackDuffelSyndicate } .desc = { ent-ClothingBackpackDuffelSyndicate.desc } + .suffix = LonelyOperative diff --git a/Resources/Maps/White/DryDock.yml b/Resources/Maps/White/DryDock.yml index 0f151ac43d..7bc3f5e310 100644 --- a/Resources/Maps/White/DryDock.yml +++ b/Resources/Maps/White/DryDock.yml @@ -56546,88 +56546,88 @@ entities: pos: -156.5,-24.5 parent: 2 - type: FaxMachine - destinationAddress: Перма name: Перма + destinationAddress: Перма - uid: 7862 components: - type: Transform pos: -58.5,18.5 parent: 2 - type: FaxMachine - destinationAddress: Атмос name: Атмос + destinationAddress: Атмос - uid: 7863 components: - type: Transform pos: -19.5,0.5 parent: 2 - type: FaxMachine - destinationAddress: Глава Персонала name: Глава Персонала + destinationAddress: Глава Персонала - uid: 7864 components: - type: Transform pos: 1.5,-3.5 parent: 2 - type: FaxMachine - destinationAddress: Мостик name: Мостик + destinationAddress: Мостик - uid: 7865 components: - type: Transform pos: -68.5,-18.5 parent: 2 - type: FaxMachine - destinationAddress: Квартирмейстер name: Квартирмейстер + destinationAddress: Квартирмейстер - uid: 7866 components: - type: Transform pos: -8.5,-9.5 parent: 2 - type: FaxMachine - destinationAddress: Капитан name: Капитан + destinationAddress: Капитан - uid: 7867 components: - type: Transform pos: -61.5,3.5 parent: 2 - type: FaxMachine - destinationAddress: Старший Инженер name: Старший Инженер + destinationAddress: Старший Инженер - uid: 7868 components: - type: Transform pos: -144.5,3.5 parent: 2 - type: FaxMachine - destinationAddress: Юриспруденция name: Юриспруденция + destinationAddress: Юриспруденция - uid: 7869 components: - type: Transform pos: -163.5,8.5 parent: 2 - type: FaxMachine - destinationAddress: Смотряшка name: Смотряшка + destinationAddress: Смотряшка - uid: 7870 components: - type: Transform pos: -156.5,16.5 parent: 2 - type: FaxMachine - destinationAddress: Глава Охранной Службы name: Глава Охранной Службы + destinationAddress: Глава Охранной Службы - uid: 7871 components: - type: Transform pos: -47.5,-19.5 parent: 2 - type: FaxMachine - destinationAddress: Библиотека name: Библиотека + destinationAddress: Библиотека - proto: FenceMetalGate entities: - uid: 7872 @@ -80743,6 +80743,16 @@ entities: - type: Transform pos: -195.02905,1.4667006 parent: 2 +- proto: HOPSpeaker + entities: + - uid: 17284 + components: + - type: Transform + pos: -16.5,1.5 + parent: 2 + - type: DeviceLinkSink + links: + - 17285 - proto: HotplateMachineCircuitboard entities: - uid: 11380 @@ -92700,6 +92710,16 @@ entities: - Pressed: Toggle 13120: - Pressed: Toggle + - uid: 17285 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.466427,0.33086193 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 17284: + - Pressed: Trigger - proto: SignArmory entities: - uid: 13200 @@ -114123,18 +114143,6 @@ entities: rot: 1.5707963267948966 rad pos: -149.58974,10.572603 parent: 2 -- proto: WeaponRubberShotgun - entities: - - uid: 17280 - components: - - type: Transform - pos: -154.60992,7.8289695 - parent: 2 - - uid: 17281 - components: - - type: Transform - pos: -154.48492,7.495636 - parent: 2 - proto: WeaponRevolverMateba entities: - uid: 11349 @@ -114175,6 +114183,18 @@ entities: parent: 2 - type: Gun fireRate: 6.5 +- proto: WeaponRubberShotgun + entities: + - uid: 17280 + components: + - type: Transform + pos: -154.60992,7.8289695 + parent: 2 + - uid: 17281 + components: + - type: Transform + pos: -154.48492,7.495636 + parent: 2 - proto: WeaponShotgunEnforcer entities: - uid: 16804 diff --git a/Resources/Maps/White/WhiteMoose.yml b/Resources/Maps/White/WhiteMoose.yml index 7c46de9f83..c1b7d94d40 100644 --- a/Resources/Maps/White/WhiteMoose.yml +++ b/Resources/Maps/White/WhiteMoose.yml @@ -11658,7 +11658,7 @@ entities: pos: 23.5,13.5 parent: 2 - type: Door - secondsUntilStateChange: -13437.97 + secondsUntilStateChange: -13636.046 state: Opening - proto: AirlockExternalGlassShuttleCargo entities: @@ -13425,12 +13425,6 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,1.5 parent: 2 - - uid: 13024 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,2.5 - parent: 2 - uid: 13025 components: - type: Transform @@ -75279,6 +75273,17 @@ entities: - type: Transform pos: -45.404816,2.6740484 parent: 2 +- proto: HOPSpeaker + entities: + - uid: 13024 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,2.5 + parent: 2 + - type: DeviceLinkSink + links: + - 16330 - proto: HospitalCurtainsOpen entities: - uid: 6375 @@ -83055,7 +83060,7 @@ entities: - type: Transform parent: 14573 - type: RCDAmmo - charges: 150 + charges: 225 - type: Physics canCollide: False - type: InsideEntityStorage @@ -83064,7 +83069,7 @@ entities: - type: Transform parent: 14573 - type: RCDAmmo - charges: 150 + charges: 225 - type: Physics canCollide: False - type: InsideEntityStorage @@ -83073,7 +83078,7 @@ entities: - type: Transform parent: 14634 - type: RCDAmmo - charges: 150 + charges: 225 - type: Physics canCollide: False - type: InsideEntityStorage @@ -83082,7 +83087,7 @@ entities: - type: Transform parent: 14634 - type: RCDAmmo - charges: 150 + charges: 225 - type: Physics canCollide: False - type: InsideEntityStorage @@ -83091,7 +83096,7 @@ entities: - type: Transform parent: 6372 - type: RCDAmmo - charges: 150 + charges: 225 - type: Physics canCollide: False - type: InsideEntityStorage @@ -83100,7 +83105,7 @@ entities: - type: Transform parent: 6372 - type: RCDAmmo - charges: 150 + charges: 225 - type: Physics canCollide: False - type: InsideEntityStorage @@ -86945,6 +86950,16 @@ entities: - Pressed: Toggle 15194: - Pressed: Toggle + - uid: 16330 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.532192,3.6885402 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 13024: + - Pressed: Trigger - proto: SignalButtonWindows entities: - uid: 13356 @@ -106899,18 +106914,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponRubberShotgun - entities: - - uid: 14524 - components: - - type: Transform - pos: 3.4590678,15.842787 - parent: 2 - - uid: 14531 - components: - - type: Transform - pos: 3.4746928,15.608412 - parent: 2 - proto: WeaponRifleAk entities: - uid: 8783 @@ -106936,6 +106939,18 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: WeaponRubberShotgun + entities: + - uid: 14524 + components: + - type: Transform + pos: 3.4590678,15.842787 + parent: 2 + - uid: 14531 + components: + - type: Transform + pos: 3.4746928,15.608412 + parent: 2 - proto: WeaponShotgunHandmade entities: - uid: 12244 @@ -107123,7 +107138,7 @@ entities: pos: -6.5,-20.5 parent: 2 - type: Door - secondsUntilStateChange: -98991.91 + secondsUntilStateChange: -99189.984 state: Opening - proto: WindoorAssembly entities: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 377c29f1ba..5d1ade6b2c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -188,6 +188,8 @@ prob: 0.05 - id: FoodSnackSuhariki # WD from Engi to Amour prob: 0.10 + - id: PackedSoil # WD + prob: 0.05 # Syndicate loot - id: null prob: 0.95 @@ -598,6 +600,8 @@ prob: 0.05 - id: FoodSnackSuhariki # WD from Engi to Amour prob: 0.10 + - id: PackedSoil # WD + prob: 0.05 # Syndicate loot - id: null prob: 0.95 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml index 1dd893507d..9d0d364bb5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml @@ -18,6 +18,7 @@ HandheldSeedAnalyzer: 2 EZNutrientChemistryBottle: 3 Eftpos: 4 + PackedSoil: 5 #WD edit emaggedInventory: Left4ZedChemistryBottle: 1 diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 8030597b8d..ccf029020a 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -296,3 +296,13 @@ cost: 2000 category: Security group: market + +- type: cargoProduct + id: cargoPackedSoil + icon: + sprite: White/Structures/growingpot.rsi + state: packed_soil + product: CratePackedSoil + cost: 500 + category: cargoproduct-category-name-hydroponics + group: market diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml new file mode 100644 index 0000000000..986229067a --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/misc.yml @@ -0,0 +1,10 @@ +- type: entity + parent: CrateHydroponics + id: CratePackedSoil + name: ящик с почвой + description: Ящик, содержащий пять упаковок с почвой. + components: + - type: StorageFill + contents: + - id: PackedSoil + amount: 5 diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml new file mode 100644 index 0000000000..74b9712e62 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/packed_soil.yml @@ -0,0 +1,16 @@ +- type: entity + name: упаковка почвы + description: Можно засыпать в каркас грядки. + id: PackedSoil + parent: BaseItem + components: + - type: Item + size: Normal + - type: Sprite + sprite: White/Structures/growingpot.rsi + state: packed_soil + - type: Tag + tags: + - PackedSoilTag + - type: StaticPrice + price: 10 diff --git a/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml new file mode 100644 index 0000000000..83ec7ba420 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/GrowingPot.yml @@ -0,0 +1,88 @@ +- type: entity + name: самодельная грядка + parent: [GrowingPotNoSoil, hydroponicsSoil] + id: GrowingPot + description: Позволяет выращивать различные культуры. + components: + - type: Sprite + sprite: White/Structures/growingpot.rsi + state: pot_filled + - type: Transform + anchored: true + - type: Construction + graph: growingPot + node: growingPot + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 5 + max: 10 + +- type: entity + id: GrowingPotEmpty + parent: GrowingPot + suffix: Empty + components: + - type: PlantHolder + waterLevel: 0 + nutritionLevel: 0 + +- type: entity + name: каркас самодельной грядки + id: GrowingPotNoSoil + parent: BaseStructure + placement: + mode: SnapgridCenter + description: Позволяет выращивать различные культуры, однако не хватает земли... + components: + - type: InteractionOutline + - type: Sprite + sprite: White/Structures/growingpot.rsi + state: pot_empty + noRot: true + - type: Tag + tags: + - Structure + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.1" + density: 60 + hard: true + mask: + - MachineMask + - type: Appearance + - type: Clickable + - type: Transform + noRot: true + - type: Construction + graph: growingPot + node: growingPotNoSoil + - type: Anchorable + - type: Damageable + DamageContainer: StructuralInorganic + DamageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 5 + max: 10 + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml index e69ca79243..12a006896f 100644 --- a/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml +++ b/Resources/Prototypes/_White/JukeboxSongs/LobbySongs.yml @@ -81,7 +81,7 @@ id: MusicMessagesfromtheStars name: "[NEW] Song - Messages from the Stars" path: - path: /Audio/White/Jukebox/Music_Messages_from_the_Stars.ogg + path: /Audio/White/Jukebox/Music/Messages_from_the_Stars.ogg # Music @@ -161,7 +161,7 @@ id: CosmicTemperance name: "Music - Cosmic Temperance" path: - path: /Audio/_Honk//blinch_Cosmic_Temperance.ogg + path: /Audio/_Honk/Jukebox/blinch_Cosmic_Temperance.ogg - type: jukebox # WD id: LibetsDelay @@ -323,7 +323,7 @@ id: ANeonGlowLightstheWay name: "[NEW] Music - A Neon Glow Lights the Way" path: - path: /Audio/White/Juskebox/Music/A_Neon_Glow_Lights_the_Way.ogg + path: /Audio/White/Jukebox/Music/A_Neon_Glow_Lights_the_Way.ogg - type: jukebox # WD id: AnotherMedium diff --git a/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml new file mode 100644 index 0000000000..1b3f921780 --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/Construction/Graphs/growingPot.yml @@ -0,0 +1,61 @@ +- type: constructionGraph + id: growingPot + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: growingPotNoSoil + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WoodPlank + amount: 15 + doAfter: 4 + - material: MetalRod + amount: 4 + doAfter: 1 + + - node: growingPotNoSoil + entity: GrowingPotNoSoil + edges: + - to: growingPot + conditions: + - !type:EntityAnchored + completed: + - !type:SnapToGrid + southRotation: true + steps: + - tag: PackedSoilTag + name: упаковка почвы + icon: + sprite: White/Structures/growingpot.rsi + state: packed_soil + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 15 + - !type:SpawnPrototype + prototype: PartRodMetal1 + amount: 4 + steps: + - tool: Screwing + doAfter: 1 + + - node: growingPot + entity: GrowingPotEmpty + edges: + - to: growingPotNoSoil + conditions: + - !type:EntityAnchored + completed: + - !type:SpawnPrototype + prototype: PackedSoil + amount: 1 + - !type:EmptyAllContainers + steps: + - tool: Prying + doAfter: 5 diff --git a/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml new file mode 100644 index 0000000000..3b76e3e1e0 --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/Construction/GrowingPot.yml @@ -0,0 +1,16 @@ +- type: construction + id: GrowingPot + name: самодельная грядка + description: Деревнянная грядка для выращивания. + graph: growingPot + startNode: start + targetNode: growingPot + category: construction-category-furniture + icon: + sprite: White/Structures/growingpot.rsi + state: pot_filled + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index de4f84d435..7fd259942a 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -150,3 +150,6 @@ - type: Tag id: MagazineKalashLightRifleBox + +- type: Tag + id: PackedSoilTag diff --git a/Resources/Textures/White/Structures/growingpot.rsi/meta.json b/Resources/Textures/White/Structures/growingpot.rsi/meta.json new file mode 100644 index 0000000000..cc817e7473 --- /dev/null +++ b/Resources/Textures/White/Structures/growingpot.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "dosharus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pot_filled" + }, + { + "name": "pot_empty" + }, + { + "name": "packed_soil" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png new file mode 100644 index 0000000000..9368408eeb Binary files /dev/null and b/Resources/Textures/White/Structures/growingpot.rsi/packed_soil.png differ diff --git a/Resources/Textures/White/Structures/growingpot.rsi/pot_empty.png b/Resources/Textures/White/Structures/growingpot.rsi/pot_empty.png new file mode 100644 index 0000000000..b06810c9a4 Binary files /dev/null and b/Resources/Textures/White/Structures/growingpot.rsi/pot_empty.png differ diff --git a/Resources/Textures/White/Structures/growingpot.rsi/pot_filled.png b/Resources/Textures/White/Structures/growingpot.rsi/pot_filled.png new file mode 100644 index 0000000000..1d51f2df2c Binary files /dev/null and b/Resources/Textures/White/Structures/growingpot.rsi/pot_filled.png differ