rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Конец блокады

Browse source
This commit is contained in:
Vigers Ray 2025-02-15 23:11:56 +03:00
parent 0ef86f58a6
commit 4fe7a77205
20 changed files with 82 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs
View file

@ -29,8 +29,7 @@ public sealed class StationDontSellingSystems : EntitySystem
private void OnStartup(EntityUid uid, DontSellingGridComponent component, ref ComponentStartup args)
{
var entities = new HashSet<Entity<StaticPriceComponent>>();
_lookup.GetChildEntities(uid, entities);
_lookup.GetGridEntities(uid, entities);
foreach (var entityUid in entities)
{
DepreciatePrice(entityUid);

2
Content.Shared/Nutrition/Components/HungerComponent.cs
View file

@ -34,7 +34,7 @@ public sealed partial class HungerComponent : Component
/// </summary>
/// <remarks>Any time this is modified, <see cref="HungerSystem.SetAuthoritativeHungerValue"/> should be called.</remarks>
[DataField("baseDecayRate"), ViewVariables(VVAccess.ReadWrite)]
public float BaseDecayRate = 0.15f; // Sunrise-Edit
public float BaseDecayRate = 0.03f; // Sunrise-Edit
/// <summary>
/// The actual amount at which <see cref="LastAuthoritativeHungerValue"/> decays.

2
Content.Shared/Nutrition/Components/ThirstComponent.cs
View file

@ -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]

2
Content.Shared/_Sunrise/VendingMachines/PlayerCountDependentStockComponent.cs
View file

@ -7,5 +7,5 @@
public sealed partial class PlayerCountDependentStockComponent : Component
{
[DataField("coefficient")]
public float Coefficient = 0.1f;
public float Coefficient = 0.5f;
}

36
Resources/Changelog/ChangelogSunrise.yml
View file

@ -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'

6
Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
View file

@ -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

8
Resources/Prototypes/Entities/Mobs/Species/diona.yml
View file

@ -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

5
Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
View file

@ -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

4
Resources/Prototypes/Entities/Mobs/Species/human.yml
View file

@ -13,8 +13,8 @@
- type: Thirst
dehydrationDamage:
types:
Bloodloss: 2
Asphyxiation: 2
Bloodloss: 0.5
Asphyxiation: 0.5
- type: Butcherable
butcheringType: Spike
spawned:

4
Resources/Prototypes/Entities/Mobs/Species/moth.yml
View file

@ -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

4
Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
View file

@ -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

5
Resources/Prototypes/Entities/Mobs/Species/slime.yml
View file

@ -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

4
Resources/Prototypes/Entities/Mobs/Species/vox.yml
View file

@ -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

1
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View file

@ -106,6 +106,7 @@
price: 100
- type: Appearance
- type: WiresVisuals
- type: DontSell # Sunrise-Edit
- type: entity
parent: VendingMachine

4
Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml
View file

@ -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

8
Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml
View file

@ -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:

8
Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml
View file

@ -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

4
Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml
View file

@ -13,8 +13,8 @@
- type: Thirst
dehydrationDamage:
types:
Bloodloss: 2
Asphyxiation: 2
Bloodloss: 0.5
Asphyxiation: 0.5
- type: Perishable
- type: HumanoidAppearance
species: Predator

7
Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml
View file

@ -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

4
Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml
View file

@ -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