diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs index 5a8a295277..c4ac29947a 100644 --- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs @@ -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(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 } } } diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs index 27fc45baea..6e0abb5d7e 100644 --- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs @@ -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(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) diff --git a/Content.Shared/_Fish/KillTome/KillTomeSystem.cs b/Content.Shared/_Fish/KillTome/KillTomeSystem.cs index e6dd4e2568..970c351322 100644 --- a/Content.Shared/_Fish/KillTome/KillTomeSystem.cs +++ b/Content.Shared/_Fish/KillTome/KillTomeSystem.cs @@ -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; diff --git a/Resources/Prototypes/_Fish/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/_Fish/Entities/Objects/Consumable/Food/Baked/misc.yml index 969579f04f..fc15221832 100644 --- a/Resources/Prototypes/_Fish/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/_Fish/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -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 diff --git a/Resources/Prototypes/_Fish/Entities/Objects/Misc/killtome.yml b/Resources/Prototypes/_Fish/Entities/Objects/Misc/killtome.yml index 21a9940b6d..0e20324a25 100644 --- a/Resources/Prototypes/_Fish/Entities/Objects/Misc/killtome.yml +++ b/Resources/Prototypes/_Fish/Entities/Objects/Misc/killtome.yml @@ -107,10 +107,6 @@ - type: Tag tags: - KillTomeScrap - - type: Food - solution: food - delay: 7 - forceFeedDelay: 7 - type: FlavorProfile flavors: - paper diff --git a/Resources/Prototypes/_Fish/Maps/Case.yml b/Resources/Prototypes/_Fish/Maps/Case.yml index d822f98423..f8fa85e8b5 100644 --- a/Resources/Prototypes/_Fish/Maps/Case.yml +++ b/Resources/Prototypes/_Fish/Maps/Case.yml @@ -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 ] diff --git a/Resources/Prototypes/_Fish/Maps/PlasmaFishMeta.yml b/Resources/Prototypes/_Fish/Maps/PlasmaFishMeta.yml index f2ac8993a4..e02835e542 100644 --- a/Resources/Prototypes/_Fish/Maps/PlasmaFishMeta.yml +++ b/Resources/Prototypes/_Fish/Maps/PlasmaFishMeta.yml @@ -39,7 +39,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 3, 3 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Maps/barratry.yml b/Resources/Prototypes/_Fish/Maps/barratry.yml index c4105ffa85..3966c4d25f 100644 --- a/Resources/Prototypes/_Fish/Maps/barratry.yml +++ b/Resources/Prototypes/_Fish/Maps/barratry.yml @@ -38,7 +38,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Maps/box.yml b/Resources/Prototypes/_Fish/Maps/box.yml index ff636f9560..20b1379d01 100644 --- a/Resources/Prototypes/_Fish/Maps/box.yml +++ b/Resources/Prototypes/_Fish/Maps/box.yml @@ -39,7 +39,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Maps/delta.yml b/Resources/Prototypes/_Fish/Maps/delta.yml index 63eaa83f19..2aceed4542 100644 --- a/Resources/Prototypes/_Fish/Maps/delta.yml +++ b/Resources/Prototypes/_Fish/Maps/delta.yml @@ -38,7 +38,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Maps/fland.yml b/Resources/Prototypes/_Fish/Maps/fland.yml index 96b8202426..0bcf19338e 100644 --- a/Resources/Prototypes/_Fish/Maps/fland.yml +++ b/Resources/Prototypes/_Fish/Maps/fland.yml @@ -38,7 +38,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Maps/gate.yml b/Resources/Prototypes/_Fish/Maps/gate.yml index 8f02ccdbbc..6c71504b87 100644 --- a/Resources/Prototypes/_Fish/Maps/gate.yml +++ b/Resources/Prototypes/_Fish/Maps/gate.yml @@ -36,7 +36,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Maps/oasis.yml b/Resources/Prototypes/_Fish/Maps/oasis.yml index 6efa5f4de9..1162c44b99 100644 --- a/Resources/Prototypes/_Fish/Maps/oasis.yml +++ b/Resources/Prototypes/_Fish/Maps/oasis.yml @@ -38,7 +38,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 3, 3 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Maps/packed.yml b/Resources/Prototypes/_Fish/Maps/packed.yml index 7ea81e461f..40d4d7c1e8 100644 --- a/Resources/Prototypes/_Fish/Maps/packed.yml +++ b/Resources/Prototypes/_Fish/Maps/packed.yml @@ -39,7 +39,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 3, 3 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Fish/Reagents/medicine.yml b/Resources/Prototypes/_Fish/Reagents/medicine.yml index 75a3dca6d4..139597f9cb 100644 --- a/Resources/Prototypes/_Fish/Reagents/medicine.yml +++ b/Resources/Prototypes/_Fish/Reagents/medicine.yml @@ -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 diff --git a/Resources/Prototypes/_Fish/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_Fish/Recipes/Reactions/medicine.yml index e1494e9be5..e69de29bb2 100644 --- a/Resources/Prototypes/_Fish/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_Fish/Recipes/Reactions/medicine.yml @@ -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 - diff --git a/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/blueshield_officer.yml b/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/blueshield_officer.yml index 9caa29a747..0aae8ae520 100644 --- a/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/blueshield_officer.yml +++ b/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/blueshield_officer.yml @@ -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 diff --git a/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/representative_blueshield.yml b/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/representative_blueshield.yml index bc34c70599..e880a4ea38 100644 --- a/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/representative_blueshield.yml +++ b/Resources/Prototypes/_Fish/Roles/Jobs/Blueshield/representative_blueshield.yml @@ -52,7 +52,6 @@ id: BlueShieldOperativePDA ears: ClothingHeadsetCommand gloves: ClothingHandsGlovesCombat - pocket1: BaseUplinkNTERTBlueShield storage: back: - HandheldBSOCrewMonitor diff --git a/Resources/Prototypes/_Fish/Roles/play_time_trackers.yml b/Resources/Prototypes/_Fish/Roles/play_time_trackers.yml index 2b1017bb18..ce859f8fc9 100644 --- a/Resources/Prototypes/_Fish/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Fish/Roles/play_time_trackers.yml @@ -33,3 +33,6 @@ - type: playTimeTracker id: JobCBURNLeader + +- type: playTimeTracker + id: JobBlueShieldFish diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml index 8ab5cf6626..bda2193a37 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml @@ -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 diff --git a/Resources/Prototypes/_Sunrise/FleshCult/toxins.yml b/Resources/Prototypes/_Sunrise/FleshCult/toxins.yml index 9de3d6d88c..58cac4182f 100644 --- a/Resources/Prototypes/_Sunrise/FleshCult/toxins.yml +++ b/Resources/Prototypes/_Sunrise/FleshCult/toxins.yml @@ -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 diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_ensign.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_ensign.yml index 27747cc89a..7de7153124 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_ensign.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_ensign.yml @@ -36,7 +36,6 @@ ears: ClothingHeadsetBlueShieldEnsign belt: ClothingBeltBlueShieldWebbingFilled gloves: ClothingHandsGlovesCombat - pocket1: BaseUplinkNTERTBlueShield # fish-add pocket2: WeaponTaser # fish-add storage: back: diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml index 23f4c05ffd..ec3b4ad1e6 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml @@ -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 diff --git a/Resources/ServerInfo/Guidebook/Medical/Mangleness.xml b/Resources/ServerInfo/Guidebook/Medical/Mangleness.xml index bf008da445..24d5b3a32a 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Mangleness.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Mangleness.xml @@ -41,11 +41,8 @@ [color=#dddddd]Большинство медицинских препаратов вызывают истощение как побочный эффект. Количество вызываемого истощения пропорционально их лечебному эффекту - чем сильнее препарат, тем больше истощение.[/color] [color=#dddddd]Для прямого лечения истощения существуют специализированные препараты:[/color] - - - - + [head=2][color=#ffaa66]Важные замечания[/color][/head]