Фиксы говна с ПРов
This commit is contained in:
parent
522300372c
commit
fed38d22b3
7 changed files with 18 additions and 7 deletions
|
|
@ -191,7 +191,7 @@ namespace Content.Shared.CCVar
|
|||
/// Prototype to use for map pool.
|
||||
/// </summary>
|
||||
public static readonly CVarDef<string>
|
||||
GameMapPool = CVarDef.Create("game.map_pool", "DefaultMapPool", CVar.SERVERONLY);
|
||||
GameMapPool = CVarDef.Create("game.map_pool", "SunriseMapPool", CVar.SERVERONLY); // Sunrise-Edit
|
||||
|
||||
/// <summary>
|
||||
/// 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.
|
||||
/// </summary>
|
||||
public static readonly CVarDef<string> SecretWeightPrototype =
|
||||
CVarDef.Create("game.secret_weight_prototype", "Secret", CVar.SERVERONLY);
|
||||
CVarDef.Create("game.secret_weight_prototype", "SunriseSecret", CVar.SERVERONLY); // Sunrise-Edit
|
||||
|
||||
/// <summary>
|
||||
/// The id of the sound collection to randomly choose a sound from and play when the round ends.
|
||||
/// </summary>
|
||||
public static readonly CVarDef<string> RoundEndSoundCollection =
|
||||
CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY);
|
||||
CVarDef.Create("game.round_end_sound_collection", "SunriseRoundEnd", CVar.SERVERONLY); // Sunrise-Edit
|
||||
|
||||
/// <summary>
|
||||
/// Whether or not to add every player as a global override to PVS at round end.
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
flavor-complex-fourteen-loko-soda-plus = как говно
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
- type: vendingMachineInventory
|
||||
id: MaysonYanInventory
|
||||
startingInventory:
|
||||
FoodSnackMaysonEnergy: 10
|
||||
DrinkLukin: 10
|
||||
DrinkFourteenLokoPlusCan: 10
|
||||
|
|
@ -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
|
||||
- type: PlayerCountDependentStock # Sunrise-vend
|
||||
|
|
|
|||
4
Resources/Prototypes/_Sunrise/Flavors/flavors.yml
Normal file
4
Resources/Prototypes/_Sunrise/Flavors/flavors.yml
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
- type: flavor
|
||||
id: fourteen_loko_soda_plus
|
||||
flavorType: Complex
|
||||
description: flavor-complex-fourteen-loko-soda-plus
|
||||
|
|
@ -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
|
||||
Poison: 1.5
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue