From 4fe7a7720569c3f24e3bab5f95bdb548ac37692b Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Sat, 15 Feb 2025 23:11:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D0=B5=D1=86=20=D0=B1=D0=BB?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DontSellingGrid/DontSellingGridSystems.cs | 3 +- .../Nutrition/Components/HungerComponent.cs | 2 +- .../Nutrition/Components/ThirstComponent.cs | 2 +- .../PlayerCountDependentStockComponent.cs | 2 +- Resources/Changelog/ChangelogSunrise.yml | 36 +++++++++++++++++++ .../Entities/Mobs/Species/arachnid.yml | 6 ++-- .../Entities/Mobs/Species/diona.yml | 8 ++--- .../Entities/Mobs/Species/dwarf.yml | 5 +-- .../Entities/Mobs/Species/human.yml | 4 +-- .../Prototypes/Entities/Mobs/Species/moth.yml | 4 +-- .../Entities/Mobs/Species/reptilian.yml | 4 +-- .../Entities/Mobs/Species/slime.yml | 5 +-- .../Prototypes/Entities/Mobs/Species/vox.yml | 4 +-- .../Structures/Machines/vending_machines.yml | 1 + .../_Sunrise/Entities/Mobs/Species/demon.yml | 4 +-- .../Entities/Mobs/Species/felinid.yml | 8 +++-- .../Entities/Mobs/Species/humanoid_xeno.yml | 8 ++--- .../Entities/Mobs/Species/predator.yml | 4 +-- .../_Sunrise/Entities/Mobs/Species/swine.yml | 7 ++-- .../Entities/Mobs/Species/tajaran.yml | 4 +-- 20 files changed, 82 insertions(+), 39 deletions(-) diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs index 379fd1990a..7ea843dd57 100644 --- a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs +++ b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs @@ -29,8 +29,7 @@ public sealed class StationDontSellingSystems : EntitySystem private void OnStartup(EntityUid uid, DontSellingGridComponent component, ref ComponentStartup args) { var entities = new HashSet>(); - _lookup.GetChildEntities(uid, entities); - + _lookup.GetGridEntities(uid, entities); foreach (var entityUid in entities) { DepreciatePrice(entityUid); diff --git a/Content.Shared/Nutrition/Components/HungerComponent.cs b/Content.Shared/Nutrition/Components/HungerComponent.cs index c847c34d83..a7460defaa 100644 --- a/Content.Shared/Nutrition/Components/HungerComponent.cs +++ b/Content.Shared/Nutrition/Components/HungerComponent.cs @@ -34,7 +34,7 @@ public sealed partial class HungerComponent : Component /// /// Any time this is modified, should be called. [DataField("baseDecayRate"), ViewVariables(VVAccess.ReadWrite)] - public float BaseDecayRate = 0.15f; // Sunrise-Edit + public float BaseDecayRate = 0.03f; // Sunrise-Edit /// /// The actual amount at which decays. diff --git a/Content.Shared/Nutrition/Components/ThirstComponent.cs b/Content.Shared/Nutrition/Components/ThirstComponent.cs index d73ff909d7..f4a9bc72d7 100644 --- a/Content.Shared/Nutrition/Components/ThirstComponent.cs +++ b/Content.Shared/Nutrition/Components/ThirstComponent.cs @@ -15,7 +15,7 @@ public sealed partial class ThirstComponent : Component [ViewVariables(VVAccess.ReadWrite)] [DataField("baseDecayRate")] [AutoNetworkedField] - public float BaseDecayRate = 0.3f; // Sunrise-Edit + public float BaseDecayRate = 0.1f; [ViewVariables(VVAccess.ReadWrite)] [AutoNetworkedField] diff --git a/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs b/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs index d8d5792af3..7fa1c9ae11 100644 --- a/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs +++ b/Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs @@ -7,5 +7,5 @@ public sealed partial class PlayerCountDependentStockComponent : Component { [DataField("coefficient")] - public float Coefficient = 0.1f; + public float Coefficient = 0.5f; } diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index b2e2119404..0f5d079ade 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -12497,3 +12497,39 @@ id: 863 time: '2025-02-14T07:41:33.0000000+00:00' url: https://github.com/space-sunrise/space-station-14/pull/1362 +- author: VigersRay + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u043B\ + \u0430\u043D\u0441 \u0436\u0430\u0436\u0434\u044B \u0438 \u0433\u043E\u043B\u043E\ + \u0434\u0430." + type: Fix + - message: "\u0421\u043B\u0430\u0439\u043C\u044B \u0442\u0440\u0435\u0431\u0443\u044E\ + \u0442 \u0431\u043E\u043B\u044C\u0448\u0435 \u0432\u043E\u0434\u044B \u0447\u0435\ + \u043C \u0432\u0441\u0435 \u0440\u0430\u0441\u044B." + type: Tweak + - message: "\u0410\u0440\u0430\u0445\u043D\u0438\u0434\u044B, \u0442\u0440\u043E\ + \u0442\u0442\u0438\u043D\u044B \u0438 \u043A\u0441\u0435\u043D\u043E\u043C\u043E\ + \u0440\u0444\u044B \u0442\u0440\u0435\u0431\u0443\u044E\u0442 \u0431\u043E\u043B\ + \u044C\u0448\u0435 \u0432\u043E\u0434\u044B \u0438 \u0435\u0434\u044B \u0447\ + \u0435\u043C \u0434\u0440\u0443\u0433\u0438\u0435 \u0440\u0430\u0441\u044B." + type: Tweak + - message: "\u0424\u0435\u043B\u0438\u043D\u0438\u0434\u044B \u0438 \u0434\u0438\ + \u043E\u043D\u044B \u0442\u0440\u0435\u0431\u0443\u044E\u0442 \u043C\u0435\u043D\ + \u044C\u0448\u0435 \u0435\u0434\u044B \u0438 \u0432\u043E\u0434\u044B \u0447\ + \u0435\u043C \u0434\u0440\u0443\u0433\u0438\u0435 \u0440\u0430\u0441\u044B." + type: Tweak + - message: "\u0414\u0432\u043E\u0440\u0444\u0430\u043C \u043D\u0443\u0436\u043D\u043E\ + \ \u0431\u043E\u043B\u044C\u0448\u0435 \u0430\u043B\u043A\u043E\u0433\u043E\u043B\ + \u044F." + type: Tweak + - message: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u043A\u043E\u043B\ + \u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u0440\u043E\u0434\u0443\u043A\ + \u0442\u043E\u0432 \u0432 \u0432\u0435\u043D\u0434\u0438\u043D\u0433\u043E\u0432\ + \u044B\u0445 \u0430\u043F\u0430\u0440\u0430\u0442\u0430\u0445. \u0427\u0435\u043C\ + \ \u0431\u043E\u043B\u044C\u0448\u0435 \u0438\u0433\u0440\u043E\u043A\u043E\u0432\ + \ \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u0442\u0435\u043C\ + \ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0430\u043F\u043E\u043B\u043D\u0435\ + \u043D\u0438\u044F." + type: Tweak + id: 864 + time: '2025-02-15T19:58:07.500188+00:00' diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 2e89f44f3e..1ab52b5b84 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -12,11 +12,13 @@ - type: HumanoidAppearance species: Arachnid - type: Hunger + baseDecayRate: 0.04 - type: Thirst + baseDecayRate: 0.15 dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Sericulture action: ActionSericulture productionLength: 2 diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 7474c778ea..5be2cbb3f3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -9,13 +9,13 @@ - type: HumanoidAppearance species: Diona - type: Hunger - baseDecayRate: 0.3 + baseDecayRate: 0.015 - type: Thirst - baseDecayRate: 0.3 + baseDecayRate: 0.05 dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: Mobs/Species/Diona/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index d202c37b74..9185e589d8 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -8,10 +8,11 @@ - type: Absorbable - type: Hunger - type: Thirst + baseDecayRate: 0.2 dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: Mobs/Species/Slime/parts.rsi # It was like this beforehand, no idea why. state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 4b1540b944..8f6f319735 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -13,8 +13,8 @@ - type: Thirst dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 9fe28982d3..21f358166d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -14,8 +14,8 @@ - type: Thirst dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: Mobs/Species/Moth/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index f7cc92b13b..6522437f20 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -18,8 +18,8 @@ - type: Thirst dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: Mobs/Species/Reptilian/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 60c1e9224f..b0f06813f3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -7,10 +7,11 @@ - type: Absorbable - type: Hunger - type: Thirst + baseDecayRate: 0.3 dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: Mobs/Species/Slime/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index fb2cbc0f06..b271bcb12c 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -8,8 +8,8 @@ - type: Thirst dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: Mobs/Species/Vox/parts.rsi state: vox_m diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 10d4eda8e0..f59276d46d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -106,6 +106,7 @@ price: 100 - type: Appearance - type: WiresVisuals + - type: DontSell # Sunrise-Edit - type: entity parent: VendingMachine diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml index 19b7f2727a..32e4c93977 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml @@ -12,8 +12,8 @@ - type: Thirst dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: _Sunrise/Mobs/Species/Demon/parts.rsi state: full_m diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml index 9f1554af35..a608532e84 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml @@ -15,12 +15,14 @@ - type: Icon sprite: Mobs/Species/Human/parts.rsi state: full + - type: Hunger + baseDecayRate: 0.015 - type: Thirst + baseDecayRate: 0.05 dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 - - type: Hunger + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml index ae08fad2d4..de9cd9602c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml @@ -101,13 +101,13 @@ state: body-overlay-2 visible: false - type: Hunger - baseDecayRate: 0.07 + baseDecayRate: 0.04 - type: Thirst - baseDecayRate: 0.07 + baseDecayRate: 0.15 dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason. sprite: _Sunrise/Mobs/Species/HumanoidXeno/parts.rsi state: full diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml index 51dae311b3..e5c18018d6 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml @@ -13,8 +13,8 @@ - type: Thirst dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Perishable - type: HumanoidAppearance species: Predator diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml index 224858732d..c17aa734b0 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml @@ -8,12 +8,13 @@ - type: HumanoidAppearance species: Swine - type: Hunger - baseDecayRate: 0.020 + baseDecayRate: 0.04 - type: Thirst + baseDecayRate: 0.15 dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: _Sunrise/Mobs/Species/Swine/parts.rsi state: full diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml index 551539c0c7..b3bbebdf15 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml @@ -22,8 +22,8 @@ - type: Thirst dehydrationDamage: types: - Bloodloss: 2 - Asphyxiation: 2 + Bloodloss: 0.5 + Asphyxiation: 0.5 - type: Icon sprite: _Sunrise/Mobs/Species/Tajaran/parts.rsi state: tajaran_m