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-12-29 19:23:57 +01:00
parent 7eee898afc
commit 8e6bef725d
24 changed files with 17 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
View file

@ -285,25 +285,6 @@ public sealed class HungerSystem : EntitySystem
UpdateCurrentThreshold(uid, hunger);
DoContinuousHungerEffects(uid, hunger);
// Fish-start: Consume extra hunger to heal mangleness
if (TryComp<DamageableComponent>(uid, out var damageable))
{
if (damageable.Damage.DamageDict.TryGetValue("Mangleness", out var manglenessDamage) && manglenessDamage.Value > 0)
{
var currentHunger = GetHunger(hunger);
// Fish-Edit: Consume 0.1 extra points of hunger per tick to heal 0.01 mangleness
var normalizedConsumption = 0.1f * (float)hunger.ThresholdUpdateRate.TotalSeconds;
if (currentHunger > hunger.Thresholds[HungerThreshold.Dead] + normalizedConsumption)
{
ModifyHunger(uid, -normalizedConsumption, hunger);
var healAmount = new DamageSpecifier();
healAmount.DamageDict["Mangleness"] = -0.01f * (float)hunger.ThresholdUpdateRate.TotalSeconds;
_damageable.TryChangeDamage(uid, healAmount, true, false);
}
}
}
// Fish-End
}
}
}

19
Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
View file

@ -240,25 +240,6 @@ public sealed class ThirstSystem : EntitySystem
ModifyThirst(uid, thirst, -thirst.ActualDecayRate);
DoContinuousThirstEffects(uid, thirst);
// Fish-Start: Consume extra thirst to heal mangleness
if (TryComp<DamageableComponent>(uid, out var damageable))
{
if (damageable.Damage.DamageDict.TryGetValue("Mangleness", out var manglenessDamage) && manglenessDamage.Value > 0)
{
// Fish-Edit: Consume 0.1 extra points of thirst per tick to heal 0.01 mangleness
var normalizedConsumption = 0.1f * (float)thirst.UpdateRate.TotalSeconds;
if (thirst.CurrentThirst > thirst.ThirstThresholds[ThirstThreshold.Dead] + normalizedConsumption)
{
ModifyThirst(uid, thirst, -normalizedConsumption);
var healAmount = new DamageSpecifier();
healAmount.DamageDict["Mangleness"] = -0.01f * (float)thirst.UpdateRate.TotalSeconds;
_damageable.TryChangeDamage(uid, healAmount, true, false);
}
}
}
// Fish-End
var calculatedThirstThreshold = GetThirstThreshold(thirst, thirst.CurrentThirst);
if (calculatedThirstThreshold == thirst.CurrentThirstThreshold)

1
Content.Shared/_Fish/KillTome/KillTomeSystem.cs
View file

@ -1,6 +1,7 @@
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Administration.Logs;
using Content.Shared.Damage;
using Content.Shared.Damage.Systems;
using Content.Shared.Database;
using Content.Shared.Humanoid;
using Content.Shared.Mobs;

3
Resources/Prototypes/_Fish/Entities/Objects/Consumable/Food/Baked/misc.yml
View file

@ -34,9 +34,6 @@
id: FoodBakedMuffinMango
description: A delicious and spongy little cake.
components:
- type: Food
trash:
- FoodPlateMuffinTin
- type: Sprite
sprite: _Fish/Objects/Consumable/Food/Baked/muffinmango.rsi
state: bakedmuffinmango

4
Resources/Prototypes/_Fish/Entities/Objects/Misc/killtome.yml
View file

@ -107,10 +107,6 @@
- type: Tag
tags:
- KillTomeScrap
- type: Food
solution: food
delay: 7
forceFeedDelay: 7
- type: FlavorProfile
flavors:
- paper

2
Resources/Prototypes/_Fish/Maps/Case.yml
View file

@ -78,8 +78,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 4, 4 ]
Reporter: [ 1, 1 ]
Zookeeper: [ 1, 1 ]
Boxer: [ 1, 1 ]
#blueshield
BlueShieldEnsign: [ 1, 1 ]
BlueShieldOfficer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/PlasmaFishMeta.yml
View file

@ -39,7 +39,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/barratry.yml
View file

@ -38,7 +38,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 5, 5 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/box.yml
View file

@ -39,7 +39,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 5, 5 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/delta.yml
View file

@ -38,7 +38,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 5, 5 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/fland.yml
View file

@ -38,7 +38,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 5, 5 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/gate.yml
View file

@ -36,7 +36,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 5, 5 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/oasis.yml
View file

@ -38,7 +38,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

1
Resources/Prototypes/_Fish/Maps/packed.yml
View file

@ -39,7 +39,6 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
Reporter: [ 2, 2 ]
Zookeeper: [ 1, 1 ]
Barber: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]

48
Resources/Prototypes/_Fish/Reagents/medicine.yml
View file

@ -1,50 +1,2 @@
- type: reagent
id: Vitera
name: reagent-name-vitera
group: Medicine
desc: reagent-desc-vitera
physicalDesc: reagent-physical-desc-viscous
flavor: medicine
color: "#a0a0ff"
metabolisms:
Medicine:
effects:
- !type:HealthChange
damage:
types:
Mangleness: -1
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 16
damage:
types:
Cellular: 1
Poison: 1
- type: reagent
id: GenesisUltra
name: reagent-name-genesis-ultra
group: Medicine
desc: reagent-desc-genesis-ultra
physicalDesc: reagent-physical-desc-fizzy
flavor: medicine
color: "#ff5050"
metabolisms:
Medicine:
effects:
- !type:HealthChange
damage:
types:
Radiation: 1
Mangleness: -2
- !type:HealthChange
conditions:
- !type:ReagentThreshold
min: 6
damage:
types:
Radiation: 5
Cellular: 1

87
Resources/Prototypes/_Fish/Recipes/Reactions/medicine.yml
View file

@ -1,87 +0,0 @@
- type: reaction
id: AlphaSynthesisSugar
name: reaction-alpha-synthesis-sugar
reactants:
Sugar:
amount: 1
Carbon:
amount: 1
Water:
amount: 1
Tricordrazine:
amount: 1
products:
Vitera: 2
- type: reaction
id: ViteraSynthesisMetals
name: reaction-vitera-synthesis-metals
reactants:
Sugar:
amount: 1
Iron:
amount: 1
Copper:
amount: 1
Water:
amount: 1
Tricordrazine:
amount: 1
products:
Vitera: 2
- type: reaction
id: ViteraSynthesisNutriment
name: reaction-vitera-synthesis-nutriment
reactants:
Nutriment:
amount: 1
Water:
amount: 1
Tricordrazine:
amount: 1
products:
Vitera: 5
- type: reaction
id: ViteraSynthesisProtein
name: reaction-vitera-synthesis-protein
reactants:
Protein:
amount: 1
Water:
amount: 1
Tricordrazine:
amount: 1
products:
Vitera: 5
- type: reaction
id: ViteraSynthesisVitamin
name: reaction-vitera-synthesis-vitamin
reactants:
Water:
amount: 5
Vitamin:
amount: 1
Tricordrazine:
amount: 1
products:
Vitera: 25
- type: reaction
id: GenesisUltraSynthesis
name: reaction-genesis-ultra-synthesis
reactants:
Vitera:
amount: 1
Benzene:
amount: 1
Radium:
amount: 1
Plasma:
amount: 1
catalyst: true
products:
GenesisUltra: 1

9
Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/blueshield_officer.yml
View file

@ -1,15 +1,15 @@
- type: job
id: BlueShieldOfficer
id: BlueShieldOfficerFish
name: job-name-blueshield-officer
description: job-description-blueshield-officer
playTimeTracker: JobBlueShield
playTimeTracker: JobBlueShieldFish
requirements:
- !type:DepartmentTimeRequirement
department: Security
time: 62000 # 20 hrs
- !type:AgeRequirement
requiredAge: 20
startingGear: BlueShieldOfficerGear
startingGear: BlueShieldOfficerGearFish
icon: JobIconBlueShield
supervisors: job-supervisors-centcom
canBeAntag: false
@ -38,7 +38,7 @@
implants: [ MindShieldImplant ]
- type: startingGear
id: BlueShieldOfficerGear
id: BlueShieldOfficerGearFish
equipment:
shoes: ClothingShoesBootsBlueShieldFilled
eyes: ClothingEyesGlassesBlueShield
@ -47,7 +47,6 @@
id: BlueShieldOfficerPDA
ears: ClothingHeadsetBlueShield
gloves: ClothingHandsGlovesCombat
pocket1: BaseUplinkNTERTBlueShield
storage:
back:
- HandheldBSOCrewMonitor

1
Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/representative_blueshield.yml
View file

@ -52,7 +52,6 @@
id: BlueShieldOperativePDA
ears: ClothingHeadsetCommand
gloves: ClothingHandsGlovesCombat
pocket1: BaseUplinkNTERTBlueShield
storage:
back:
- HandheldBSOCrewMonitor

3
Resources/Prototypes/_Fish/Roles/play_time_trackers.yml
View file

@ -33,3 +33,6 @@
- type: playTimeTracker
id: JobCBURNLeader
- type: playTimeTracker
id: JobBlueShieldFish

51
Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml
View file

@ -187,54 +187,3 @@
reagents:
- ReagentId: Saline
Quantity: 200
# Fish-start: Medical Chemistry Bottles for ERT and Medics
- type: entity
id: ChemistryBottleBicaridine
name: bicaridine bottle # Fish-edit: Proper name with label
suffix: bicaridine
parent: BaseChemistryBottleFilled
components:
- type: Label
currentLabel: reagent-name-bicaridine
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Bicaridine
Quantity: 30
- type: entity
id: ChemistryBottleDermaline
name: dermaline bottle # Fish-edit: Proper name with label
suffix: dermaline
parent: BaseChemistryBottleFilled
components:
- type: Label
currentLabel: reagent-name-dermaline
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Dermaline
Quantity: 30
# Fish-edit: ChemistryBottleStimulants for NukeOps medic belt
- type: entity
id: ChemistryBottleStimulants
name: stimulants bottle # Fish-edit: Proper name with label
suffix: stimulants
parent: BaseChemistryBottleFilled
components:
- type: Label
currentLabel: reagent-name-stimulants
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Stimulants
Quantity: 30
# Fish-end

18
Resources/Prototypes/_Sunrise/FleshCult/toxins.yml
View file

@ -63,7 +63,7 @@
conditions:
- !type:TagCondition
tag: "Flesh"
amount: 0.1 # Fish-edit
amount: 5
- !type:SatiateThirst
conditions:
- !type:TagCondition
@ -74,24 +74,22 @@
- !type:TagCondition
tag: "Flesh"
factor: 2.5
- !type:EvenHealthChange # Fish-edit
conditions:
- !type:HasTag
tag: "Flesh"
damage:
Brute: -4
Toxin: -4
Airloss: -4
- !type:HealthChange
conditions:
- !type:TagCondition
tag: "Flesh"
damage:
groups:
Airloss: -8
types:
Heat: -2
Cold: -4
Shock: -4
Cold: -4
Poison: -4
Piercing: -4
Blunt: -4
Caustic: -4
Slash: -4

1
Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_ensign.yml
View file

@ -36,7 +36,6 @@
ears: ClothingHeadsetBlueShieldEnsign
belt: ClothingBeltBlueShieldWebbingFilled
gloves: ClothingHandsGlovesCombat
pocket1: BaseUplinkNTERTBlueShield # fish-add
pocket2: WeaponTaser # fish-add
storage:
back:

27
Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml
View file

@ -421,33 +421,6 @@
- type: Loadout
prototypes: [ ERTMedicalGearAmber ]
# Fish-start
- type: entity
id: RandomHumanoidSpawnerERTMedicalRed
parent: RandomHumanoidSpawnerERTMedicalAmber
name: ERT medic
suffix: ERTRole, Red
components:
- type: Sprite
sprite: Markers/jobs.rsi
state: ertmedical
- type: RandomHumanoidSpawner
settings: ERTMedicalRed
- type: randomHumanoidSettings
id: ERTMedicalRed
parent: ERTMedicalAmber
components:
- type: GhostRole
name: ghost-role-information-ert-medical-name
description: ghost-role-information-ert-medical-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
job: ERTMedical
- type: Loadout
prototypes: [ ERTMedicalGearRed ]
# Fish-end
- type: entity
id: RandomHumanoidSpawnerERTMedicalGamma
parent: RandomHumanoidSpawnerERTMedicalAmber

5
Resources/ServerInfo/Guidebook/Medical/Mangleness.xml
View file

@ -41,11 +41,8 @@
[color=#dddddd]Большинство медицинских препаратов вызывают истощение как побочный эффект. Количество вызываемого истощения пропорционально их лечебному эффекту - чем сильнее препарат, тем больше истощение.[/color]
[color=#dddddd]Для прямого лечения истощения существуют специализированные препараты:[/color]
<GuideReagentEmbed Reagent="Cryoxadone"/>
<GuideReagentEmbed Reagent="Vitera"/>
<GuideReagentEmbed Reagent="GenesisUltra"/>
<GuideReagentEmbed Reagent="Omnizine"/>
<GuideReagentEmbed Reagent="Omnizine"/>
[head=2][color=#ffaa66]Важные замечания[/color][/head]