diff --git a/Content.Client/ADT/Modsuits/UI/ModSuitMenu.xaml.cs b/Content.Client/ADT/Modsuits/UI/ModSuitMenu.xaml.cs index eea372a10ce..5000fd83a70 100644 --- a/Content.Client/ADT/Modsuits/UI/ModSuitMenu.xaml.cs +++ b/Content.Client/ADT/Modsuits/UI/ModSuitMenu.xaml.cs @@ -47,8 +47,13 @@ public void UpdateModStats() _buttonColors = modComp.ButtonColors; + // Ganimed-edit start + var attachedCount = _modsuit.GetAttachedToggleCount((_mod, modComp)); + var displayRate = attachedCount > 0 ? modComp.ModEnergyBaseUsing : 0f; + ModComplex.Text = Loc.GetString("mod-module-space", ("complexity", modComp.CurrentComplexity), ("maxcomplexity", modComp.MaxComplexity)) + Environment.NewLine + - Loc.GetString("mod-energy-waste", ("energy", modComp.ModEnergyBaseUsing.ToString("0.0"))); + Loc.GetString("mod-energy-waste", ("energy", displayRate.ToString("0.0"))); + // Ganimed-edit end var backpanelsStyle = new StyleBoxFlat(modComp.BackpanelsColor); var scrollStyle = new StyleBoxFlat(modComp.ScrollColor); diff --git a/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Modules.cs b/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Modules.cs index beb2239c283..2a36fa651e1 100644 --- a/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Modules.cs +++ b/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Modules.cs @@ -149,12 +149,15 @@ public void ActivateModule(Entity suit, Entity(suit, out var celldraw)) { suit.Comp.ModEnergyBaseUsing = (float)Math.Round(suit.Comp.ModEnergyBaseUsing + module.Comp.EnergyUsing, 3); var attachedCount = GetAttachedToggleCount(suit); - celldraw.DrawRate = suit.Comp.ModEnergyBaseUsing * attachedCount; + if (attachedCount > 0) + celldraw.DrawRate = suit.Comp.ModEnergyBaseUsing; } + // Ganimed-edit end } public void DeactivateModule(Entity suit, Entity module) @@ -176,8 +179,7 @@ public void DeactivateModule(Entity suit, Entity suit, Entity(suit, out var celldraw)) { suit.Comp.ModEnergyBaseUsing = (float)Math.Round(suit.Comp.ModEnergyBaseUsing - module.Comp.EnergyUsing, 3); var attachedCount = GetAttachedToggleCount(suit); - celldraw.DrawRate = suit.Comp.ModEnergyBaseUsing * attachedCount; + if (attachedCount > 0) + celldraw.DrawRate = suit.Comp.ModEnergyBaseUsing; } + // Ganimed-edit end } public string GetColor(ExamineColor color, string text) diff --git a/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Suit.cs b/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Suit.cs index 24440858dbe..a1b71dfd708 100644 --- a/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Suit.cs +++ b/Content.Shared/ADT/Modsuit/Systems/ModSuitSystem.Suit.cs @@ -397,8 +397,10 @@ private void UpdateCellDraw(Entity ent) } else { + // Ganimed-edit start _cell.SetDrawEnabled(ent.Owner, true); - draw.DrawRate = ent.Comp.ModEnergyBaseUsing * attachedCount; + draw.DrawRate = ent.Comp.ModEnergyBaseUsing; + // Ganimed-edit end } } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl index c15ca56ea7f..910cd570457 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.ftl @@ -1,8 +1,8 @@ -ent-ADTBulletIon = Ионный заряд -ent-ADTBulletLaser = Лазерный заряд -ent-ADTBulletDisabler = Оглушающий заряд -ent-BulletLaserHeavySpread = Узкий лазерный залп -ent-ADTBulletLaserGreenWeak = Лазер -ent-ADTBulletCutterWeak = Резак -ent-ADTBulletDisablerStrong = Оглушающий заряд -ent-ADTBulletYellowLaser = Электрический лазерный заряд +ent-ADTBulletIon = ионный заряд +ent-ADTBulletLaser = лазерный заряд +ent-ADTBulletDisabler = оглушающий заряд +ent-BulletLaserHeavySpread = узкий лазерный залп +ent-ADTBulletLaserGreenWeak = лазер +ent-ADTBulletCutterWeak = резак +ent-ADTBulletDisablerStrong = оглушающий заряд +ent-ADTBulletYellowLaser = электрический лазерный заряд diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index 1b0c0f25270..fad1bab7892 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -710,15 +710,17 @@ # tags: # - NukeOpsUplink -- type: listing - id: ADTUplinkInvisibleCloak - name: uplink-invisible-cloak-name - description: uplink-invisible-cloak-desc - productEntity: ADTClothingNeckInvisibleCloak - cost: - Telecrystal: 5 - categories: - - UplinkWearables +# Ganimed-edit start +# - type: listing +# id: ADTUplinkInvisibleCloak +# name: uplink-invisible-cloak-name +# description: uplink-invisible-cloak-desc +# productEntity: ADTClothingNeckInvisibleCloak +# cost: +# Telecrystal: 5 +# categories: +# - UplinkWearables +# Ganimed-edit end - type: listing id: ADTUplinkNightVision @@ -736,7 +738,7 @@ description: uplink-thermal-desc productEntity: ADTClothingEyesGlassesThermalChameleon cost: - Telecrystal: 2 + Telecrystal: 5 # Ganimed-edit 2>5 categories: - UplinkWearables diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/mods.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/mods.yml index 764987d7811..6e502e3a4e8 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/mods.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/mods.yml @@ -69,7 +69,7 @@ enabled: false drawRate: 1 useRate: 1 - delay: 50 + delay: 1 # Ganimed-tweak - type: PowerCellSlot cellSlotId: cell_slot fitsInCharger: false diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/modsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/modsuits.yml index c47136effb2..1a7bf686142 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/modsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/modsuits.yml @@ -334,12 +334,10 @@ - type: StaminaResistance damageCoefficient: 0.75 - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1 + walkModifier: 0.9 # Ganimed-Edit + sprintModifier: 0.9 # Ganimed-Edit - type: ExplosionResistance damageCoefficient: 0.6 - - type: FireProtection - reduction: 0.3 - type: entity parent: ADTClothingOuterModsuitBodyBase @@ -410,8 +408,6 @@ - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1 - - type: FireProtection - reduction: 0.7 - type: ModifyGrabStageTime modifiers: Hard: 2.25 @@ -453,7 +449,7 @@ - type: ExplosionResistance damageCoefficient: 0.1 - type: FireProtection - reduction: 1 + reduction: 0.8 - type: ModifyGrabStageTime modifiers: Hard: 1.5 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index 49c6b7c6279..a8a01665e43 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -234,8 +234,10 @@ fireCost: 30 - proto: ADTBulletLaser fireCost: 30 - - proto: ADTBulletIon - fireCost: 90 + # Ganimed-edit start + - proto: BulletTaser + fireCost: 200 + # Ganimed-edit end - type: Battery maxCharge: 900 startingCharge: 900 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 348b0c064cf..244e4fb1b37 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -473,11 +473,15 @@ impactEffect: ADTBulletImpactEffectIon damage: types: - Heat: 11 - Shock: 4 + # Ganimed-edit start + Heat: 7 + Shock: 8 + # Ganimed-edit end soundHit: collection: WeakHit forceSound: true - - type: EmpOnCollide - energyConsumption: 20 - disableDuration: 2 + # Ganimed-edit start + #- type: EmpOnCollide + # energyConsumption: 20 + # disableDuration: 2 + # Ganimed-edit end diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml index 3e35a05bcea..924d80f97da 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml @@ -12,17 +12,17 @@ - type: loadout id: ADTParamedicBackpack equipment: - back: ADTClothingBackpackParamedicFilled + back: ADTClothingBackpackParamedic # Ganimed-edit Криворукий гугу гага разраб АДТ, почему у тебя челюсти жизни привязаны к рюкзаку а не к самой роли? - type: loadout id: ADTParamedicSatchel equipment: - back: ADTClothingBackpackSatchelParamedicFilled + back: ADTClothingBackpackSatchelParamedic # Ganimed-edit - type: loadout id: ADTParamedicDuffel equipment: - back: ADTClothingBackpackDuffelParamedicFilled + back: ADTClothingBackpackDuffelParamedic # Ganimed-edit - type: loadout id: ADTParamedicBeltEMT diff --git a/Resources/Prototypes/ADT/Reagents/medicine.yml b/Resources/Prototypes/ADT/Reagents/medicine.yml index f84f3d70384..50a43dba34f 100644 --- a/Resources/Prototypes/ADT/Reagents/medicine.yml +++ b/Resources/Prototypes/ADT/Reagents/medicine.yml @@ -492,7 +492,7 @@ physicalDesc: reagent-physical-desc-murky flavor: medicine color: "#9575c7" - worksOnTheDead: true + worksOnTheDead: false # Ganimed-edit metabolisms: Medicine: metabolismRate : 0.75 @@ -519,7 +519,7 @@ physicalDesc: reagent-physical-desc-fizzy flavor: medicine color: "#ff6d05" - worksOnTheDead: true + worksOnTheDead: false # Ganimed-edit metabolisms: Medicine: metabolismRate : 0.5 @@ -540,7 +540,7 @@ physicalDesc: reagent-physical-desc-acrid flavor: medicine color: "#47061a" - worksOnTheDead: true + worksOnTheDead: false # Ganimed-edit metabolisms: Medicine: metabolismRate : 0.5 @@ -568,7 +568,7 @@ physicalDesc: reagent-physical-desc-exotic-smelling flavor: medicine color: "#b315c2" - worksOnTheDead: true + worksOnTheDead: false # Ganimed-edit metabolisms: Medicine: metabolismRate : 0.5 @@ -595,7 +595,7 @@ physicalDesc: reagent-physical-desc-strong-smelling flavor: medicine color: "#111b30" - worksOnTheDead: true + worksOnTheDead: false # Ganimed-edit metabolisms: Medicine: metabolismRate : 0.5 @@ -669,7 +669,7 @@ physicalDesc: reagent-physical-desc-sickly flavor: acid color: "#213200" - worksOnTheDead: true + worksOnTheDead: false # Ganimed-edit metabolisms: Medicine: effects: diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/ADT/Recipes/Lathes/Packs/medical.yml index dc997aa2638..312accfd319 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/Packs/medical.yml @@ -22,7 +22,7 @@ - ADTLauncherSyringe - ADTMiniSyringe - ADTTourniquet - - ADTPatchLepo + # - ADTPatchLepo Ganimed-edit - type: latheRecipePack id: ADTAdvancedMedical @@ -45,11 +45,13 @@ - type: latheRecipePack id: ADTCryoTech recipes: - - ADTPatchCryo + # - ADTPatchCryo Ganimed-edit - CryostasisBeaker - SyringeCryostasis -- type: latheRecipePack - id: ADTThermoTech - recipes: - - ADTPatchThermo +# Ganimed-edit start +# - type: latheRecipePack +# id: ADTThermoTech +# recipes: +# - ADTPatchThermo +# Ganimed-edit end \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/medical.yml b/Resources/Prototypes/ADT/Recipes/Lathes/medical.yml index f45e66eb162..f202b39868e 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/medical.yml @@ -60,29 +60,31 @@ Gold: 250 Silver: 400 -- type: latheRecipe - id: ADTPatchLepo - result: ADTPatchLepo - completetime: 0.5 - materials: - Copper: 20 - Glass: 20 +# Ganimed-edit start +# - type: latheRecipe +# id: ADTPatchLepo +# result: ADTPatchLepo +# completetime: 0.5 +# materials: +# Copper: 20 +# Glass: 20 -- type: latheRecipe - id: ADTPatchCryo - result: ADTPatchCryo - completetime: 0.5 - materials: - Copper: 50 - Glass: 100 +# - type: latheRecipe +# id: ADTPatchCryo +# result: ADTPatchCryo +# completetime: 0.5 +# materials: +# Copper: 50 +# Glass: 100 -- type: latheRecipe - id: ADTPatchThermo - result: ADTPatchThermo - completetime: 0.5 - materials: - Copper: 100 - Glass: 50 +# - type: latheRecipe +# id: ADTPatchThermo +# result: ADTPatchThermo +# completetime: 0.5 +# materials: +# Copper: 100 +# Glass: 50 +# Ganimed-edit end - type: latheRecipe id: ADTAutoSurgeon diff --git a/Resources/Prototypes/ADT/Research/biochemical.yml b/Resources/Prototypes/ADT/Research/biochemical.yml index cca6a657366..71c7f431bfd 100644 --- a/Resources/Prototypes/ADT/Research/biochemical.yml +++ b/Resources/Prototypes/ADT/Research/biochemical.yml @@ -27,7 +27,7 @@ recipeUnlocks: - StasisBedMachineCircuitboard - ADTAdvancedMedicalBedCircuitboard - - ADTPatchLepo +# - ADTPatchLepo Ganimed-edit - MedicalScannerMachineCircuitboard position: 3,-1 requiredTech: @@ -61,8 +61,12 @@ - CloningPodMachineCircuitboard - CloningConsoleComputerCircuitboard position: 1,-1 +# Ganimed-edit start +# requiredTech: +# - ADTThermoTech Почему оно вообще требует технологию пластырей, а не крио, хоть в консоли и отображается требование технологии крио??? requiredTech: - - ADTThermoTech + - ADTCryoTech +# Ganimed-end - type: technology id: ADTIndustrialMedicine @@ -110,25 +114,27 @@ - CryoPodMachineCircuitboard - CryostasisBeaker - SyringeCryostasis - - ADTPatchCryo +# - ADTPatchCryo Ganimed-edit requiredTech: - ADTAdvancedMedicalCare position: 2,-2 -- type: technology - id: ADTThermoTech - name: research-technology-thermo - icon: - sprite: ADT/Objects/Specific/Medical/patch.rsi - state: patch23 - discipline: Biochemical - tier: 3 - cost: 7500 - recipeUnlocks: - - ADTPatchThermo - requiredTech: - - ADTCryoTech - position: 2,0 +# Ganimed-edit start +#- type: technology +# id: ADTThermoTech +# name: research-technology-thermo +# icon: +# sprite: ADT/Objects/Specific/Medical/patch.rsi +# state: patch23 +# discipline: Biochemical +# tier: 3 +# cost: 7500 +# recipeUnlocks: +# - ADTPatchThermo +# requiredTech: +# - ADTCryoTech +# position: 2,0 +# Ganimed-edit end - type: technology id: ADTMechanizedTreatment diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 3626689f4d8..1b52b5d40c0 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -1135,12 +1135,6 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad - # ADT-Tweak-start - - type: ClothingGrantComponent - component: - - type: SupermatterImmune - - type: SupermatterImmune - # ADT-Tweak-end #CBURN Hardsuit - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 0f36ff13e25..b31979af9dc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -563,7 +563,6 @@ - ADTAdvancedMedicalMiscPack - ADTAdvancedMedicalCarePack - ADTCryoTech - - ADTThermoTech #ADT-Tweak End - type: Machine board: MedicalTechFabCircuitboard diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 52627207210..64976de59b3 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -201,7 +201,6 @@ physicalDesc: reagent-physical-desc-fizzy flavor: medicine color: "#0091ff" - worksOnTheDead: true plantMetabolism: - !type:PlantAdjustToxins amount: -5 @@ -224,10 +223,10 @@ damage: # todo scale with temp like SS13 # ADT-Tweak start (made HealthChange even) - Airloss: -1 - Brute: -1 - Burn: -1.2 - Toxin: -0.8 + Airloss: -3 + Brute: -2 + Burn: -2 + Toxin: -2 # ADT-Tweak end # Start ADT tweak - !type:HealthChange @@ -253,7 +252,6 @@ physicalDesc: reagent-physical-desc-bubbling flavor: medicine color: "#32cd32" - worksOnTheDead: true metabolisms: Medicine: effects: diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 78e2d034e59..d3143d7254a 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -58,29 +58,25 @@ id: Cryoxadone maxTemp: 175 # ADT tweak reactants: - Tricordrazine: # ADT tweak Не, нафиг растения для крио --QWERTY--(Может сделать новое особое растение для крио, но это лишь в планах + Dexalin: amount: 1 - DexalinPlus: # ADT tweak - amount: 2 # ADT tweak Water: - amount: 2 # ADT tweak + amount: 1 + Oxygen: + amount: 1 products: - Cryoxadone: 5 # ADT tweak + Cryoxadone: 3 - type: reaction id: Doxarubixadone maxTemp: 150 # ADT tweak reactants: - # ADT tweak Start Cryoxadone: amount: 1 UnstableMutagen: amount: 1 - Phalanximine: - amount: 2 - # ADT tweak End products: - Doxarubixadone: 4 # ADT tweak + Doxarubixadone: 2 - type: reaction id: Epinephrine diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index acb73ebed47..f6b0da93971 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -12,7 +12,7 @@ startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo - canBeAntag: false # ADT tweak? + canBeAntag: true access: - Medical - Maintenance