From fed38d22b3d5de08abcbd533d7466fd25944d48f Mon Sep 17 00:00:00 2001 From: VigersRay Date: Sat, 17 Aug 2024 17:26:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B3=D0=BE?= =?UTF-8?q?=D0=B2=D0=BD=D0=B0=20=D1=81=20=D0=9F=D0=A0=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Shared/CCVar/CCVars.cs | 6 +++--- Resources/Locale/ru-RU/_sunrise/flavors/flavor-profiles.ftl | 1 + .../Catalog/VendingMachines/{ => Inventories}/barber.yml | 0 .../Catalog/VendingMachines/Inventories/mayson_yan.yml | 6 ++++++ .../Entities/Structures/Machines/vending_machines.yml | 4 ++-- Resources/Prototypes/_Sunrise/Flavors/flavors.yml | 4 ++++ .../Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml | 4 ++-- 7 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 Resources/Locale/ru-RU/_sunrise/flavors/flavor-profiles.ftl rename Resources/Prototypes/_Sunrise/Catalog/VendingMachines/{ => Inventories}/barber.yml (100%) create mode 100644 Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml create mode 100644 Resources/Prototypes/_Sunrise/Flavors/flavors.yml diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index f05d833772..773841bcaa 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -191,7 +191,7 @@ namespace Content.Shared.CCVar /// Prototype to use for map pool. /// public static readonly CVarDef - GameMapPool = CVarDef.Create("game.map_pool", "DefaultMapPool", CVar.SERVERONLY); + GameMapPool = CVarDef.Create("game.map_pool", "SunriseMapPool", CVar.SERVERONLY); // Sunrise-Edit /// /// The depth of the queue used to calculate which map is next in rotation. @@ -398,13 +398,13 @@ namespace Content.Shared.CCVar /// The prototype to use for secret weights. /// public static readonly CVarDef SecretWeightPrototype = - CVarDef.Create("game.secret_weight_prototype", "Secret", CVar.SERVERONLY); + CVarDef.Create("game.secret_weight_prototype", "SunriseSecret", CVar.SERVERONLY); // Sunrise-Edit /// /// The id of the sound collection to randomly choose a sound from and play when the round ends. /// public static readonly CVarDef RoundEndSoundCollection = - CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY); + CVarDef.Create("game.round_end_sound_collection", "SunriseRoundEnd", CVar.SERVERONLY); // Sunrise-Edit /// /// Whether or not to add every player as a global override to PVS at round end. diff --git a/Resources/Locale/ru-RU/_sunrise/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_sunrise/flavors/flavor-profiles.ftl new file mode 100644 index 0000000000..99427a0f00 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/flavors/flavor-profiles.ftl @@ -0,0 +1 @@ +flavor-complex-fourteen-loko-soda-plus = как говно diff --git a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/barber.yml b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/barber.yml similarity index 100% rename from Resources/Prototypes/_Sunrise/Catalog/VendingMachines/barber.yml rename to Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/barber.yml diff --git a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml new file mode 100644 index 0000000000..a0e1820b7e --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/mayson_yan.yml @@ -0,0 +1,6 @@ +- type: vendingMachineInventory + id: MaysonYanInventory + startingInventory: + FoodSnackMaysonEnergy: 10 + DrinkLukin: 10 + DrinkFourteenLokoPlusCan: 10 diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml index bd07dd815a..0b414895c6 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml @@ -55,10 +55,10 @@ - state: "off" map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] shader: unshaded - - texture: _Sunrise/Structures/Machines/VendingMachines/maintenance_panel.png + - texture: Structures/Machines/VendingMachines/maintenance_panel.png map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: PointLight radius: 1.5 energy: 1.6 color: "#6148c7" - - type: PlayerCountDependentStock # Sunrise-vend \ No newline at end of file + - type: PlayerCountDependentStock # Sunrise-vend diff --git a/Resources/Prototypes/_Sunrise/Flavors/flavors.yml b/Resources/Prototypes/_Sunrise/Flavors/flavors.yml new file mode 100644 index 0000000000..b4f736dbe2 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: fourteen_loko_soda_plus + flavorType: Complex + description: flavor-complex-fourteen-loko-soda-plus diff --git a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml index d5536053be..7f2c00df40 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml @@ -4,7 +4,7 @@ parent: BaseSoda desc: reagent-desc-fourteen-loko-plus physicalDesc: reagent-physical-desc-fizzy - flavor: fourteenlokosodaplus + flavor: fourteen_loko_soda_plus color: "#fcf6de" metabolisms: Drink: @@ -21,4 +21,4 @@ - !type:HealthChange damage: types: - Poison: 1.5 \ No newline at end of file + Poison: 1.5