Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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 = электрический лазерный заряд
22 changes: 12 additions & 10 deletions Resources/Prototypes/ADT/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +713 to +723

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не удаляй, но повысь стоимость.
Подбери число от 7 до 10

Suggested change
# 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
id: ADTUplinkInvisibleCloak
name: uplink-invisible-cloak-name
description: uplink-invisible-cloak-desc
productEntity: ADTClothingNeckInvisibleCloak
cost:
Telecrystal: 8 # Ganimed-Tweak (5)
categories:
- UplinkWearables


- type: listing
id: ADTUplinkNightVision
Expand All @@ -736,7 +738,7 @@
description: uplink-thermal-desc
productEntity: ADTClothingEyesGlassesThermalChameleon
cost:
Telecrystal: 2
Telecrystal: 5 # Ganimed-edit 2>5

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Изменения цифр Tweak

Suggested change
Telecrystal: 5 # Ganimed-edit 2>5
Telecrystal: 5 # Ganimed-Tweak (2 -> 5)

categories:
- UplinkWearables

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +337 to +338

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Другие части этого МОДа не имеют замедления?

Изменения цифр Tweak

Suggested change
walkModifier: 0.9 # Ganimed-Edit
sprintModifier: 0.9 # Ganimed-Edit
walkModifier: 0.9 # Ganimed-Tweak
sprintModifier: 0.9 # Ganimed-Tweak

- type: ExplosionResistance
damageCoefficient: 0.6
- type: FireProtection
reduction: 0.3
Comment on lines -341 to -342

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Здесь вроде норм, можно оставить. Но то, что удаляешь комментируй:

  # - type: FireProtection # Ganimed-Remove
  #   reduction: 0.3


- type: entity
parent: ADTClothingOuterModsuitBodyBase
Expand Down Expand Up @@ -410,8 +408,6 @@
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 1
- type: FireProtection
reduction: 0.7
Comment on lines -413 to -414

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тоже самое, комментируй

- type: ModifyGrabStageTime
modifiers:
Hard: 2.25
Expand Down Expand Up @@ -453,7 +449,7 @@
- type: ExplosionResistance
damageCoefficient: 0.1
- type: FireProtection
reduction: 1
reduction: 0.8

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Там вроде у шлема тоже должна была быть защита.

Suggested change
reduction: 0.8
reduction: 0.8 # Ganimed-Tweak (1)

- type: ModifyGrabStageTime
modifiers:
Hard: 1.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +483 to +487

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ещё думаю над балансом этой штуки, удалять не будем, так как этот проджектайл ионный и может использоваться ещё где-то.

Suggested change
# Ganimed-edit start
#- type: EmpOnCollide
# energyConsumption: 20
# disableDuration: 2
# Ganimed-edit end
- type: EmpOnCollide
energyConsumption: 20
disableDuration: 2

Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
- type: loadout
id: ADTParamedicBackpack
equipment:
back: ADTClothingBackpackParamedicFilled
back: ADTClothingBackpackParamedic # Ganimed-edit Криворукий гугу гага разраб АДТ, почему у тебя челюсти жизни привязаны к рюкзаку а не к самой роли?
Comment thread
Gorox221 marked this conversation as resolved.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:trollface:

Suggested change
back: ADTClothingBackpackParamedic # Ganimed-edit Криворукий гугу гага разраб АДТ, почему у тебя челюсти жизни привязаны к рюкзаку а не к самой роли?
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
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/ADT/Reagents/medicine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@
physicalDesc: reagent-physical-desc-murky
flavor: medicine
color: "#9575c7"
worksOnTheDead: true
worksOnTheDead: false # Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Откат

Suggested change
worksOnTheDead: false # Ganimed-edit
worksOnTheDead: true

metabolisms:
Medicine:
metabolismRate : 0.75
Expand All @@ -519,7 +519,7 @@
physicalDesc: reagent-physical-desc-fizzy
flavor: medicine
color: "#ff6d05"
worksOnTheDead: true
worksOnTheDead: false # Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Откат

Suggested change
worksOnTheDead: false # Ganimed-edit
worksOnTheDead: true

metabolisms:
Medicine:
metabolismRate : 0.5

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Думаю вот тут стоит замедлить в 2 раза

Suggested change
metabolismRate : 0.5
metabolismRate : 0.25 # Ganimed-Tweak (0.5)

Expand All @@ -540,7 +540,7 @@
physicalDesc: reagent-physical-desc-acrid
flavor: medicine
color: "#47061a"
worksOnTheDead: true
worksOnTheDead: false # Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тут ок

metabolisms:
Medicine:
metabolismRate : 0.5
Expand Down Expand Up @@ -568,7 +568,7 @@
physicalDesc: reagent-physical-desc-exotic-smelling
flavor: medicine
color: "#b315c2"
worksOnTheDead: true
worksOnTheDead: false # Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Думаю, ок

metabolisms:
Medicine:
metabolismRate : 0.5
Expand All @@ -595,7 +595,7 @@
physicalDesc: reagent-physical-desc-strong-smelling
flavor: medicine
color: "#111b30"
worksOnTheDead: true
worksOnTheDead: false # Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Откат, так как очень специфичное лекарство

Suggested change
worksOnTheDead: false # Ganimed-edit
worksOnTheDead: true

metabolisms:
Medicine:
metabolismRate : 0.5
Expand Down Expand Up @@ -669,7 +669,7 @@
physicalDesc: reagent-physical-desc-sickly
flavor: acid
color: "#213200"
worksOnTheDead: true
worksOnTheDead: false # Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Откат, это лекарство применяется ТОЛЬКО на мёртвых

Suggested change
worksOnTheDead: false # Ganimed-edit
worksOnTheDead: true

metabolisms:
Medicine:
effects:
Expand Down
14 changes: 8 additions & 6 deletions Resources/Prototypes/ADT/Recipes/Lathes/Packs/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- ADTLauncherSyringe
- ADTMiniSyringe
- ADTTourniquet
- ADTPatchLepo
# - ADTPatchLepo Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# - ADTPatchLepo Ganimed-edit
# - ADTPatchLepo # Ganimed-Remove


- type: latheRecipePack
id: ADTAdvancedMedical
Expand All @@ -45,11 +45,13 @@
- type: latheRecipePack
id: ADTCryoTech
recipes:
- ADTPatchCryo
# - ADTPatchCryo Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# - ADTPatchCryo Ganimed-edit
# - ADTPatchCryo # Ganimed-Remove

- CryostasisBeaker
- SyringeCryostasis

- type: latheRecipePack
id: ADTThermoTech
recipes:
- ADTPatchThermo
# Ganimed-edit start
# - type: latheRecipePack
# id: ADTThermoTech
# recipes:
# - ADTPatchThermo
# Ganimed-edit end

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Перенос строки на конце файла забыл

Suggested change
# Ganimed-edit end
# Ganimed-edit end

44 changes: 23 additions & 21 deletions Resources/Prototypes/ADT/Recipes/Lathes/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
Gorox221 marked this conversation as resolved.
Comment on lines +63 to +87

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Можно не удалять рецепты, они в любом случае будут недоступны, а так хоть меньше шанс на то, что ошибки будут потом

Suggested change
# 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: 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: ADTPatchThermo
result: ADTPatchThermo
completetime: 0.5
materials:
Copper: 100
Glass: 50


- type: latheRecipe
id: ADTAutoSurgeon
Expand Down
40 changes: 23 additions & 17 deletions Resources/Prototypes/ADT/Research/biochemical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
recipeUnlocks:
- StasisBedMachineCircuitboard
- ADTAdvancedMedicalBedCircuitboard
- ADTPatchLepo
# - ADTPatchLepo Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# - ADTPatchLepo Ganimed-edit
# - ADTPatchLepo # Ganimed-Remove

- MedicalScannerMachineCircuitboard
position: 3,-1
requiredTech:
Expand Down Expand Up @@ -61,8 +61,12 @@
- CloningPodMachineCircuitboard
- CloningConsoleComputerCircuitboard
position: 1,-1
# Ganimed-edit start
# requiredTech:
# - ADTThermoTech Почему оно вообще требует технологию пластырей, а не крио, хоть в консоли и отображается требование технологии крио???
requiredTech:
- ADTThermoTech
- ADTCryoTech
# Ganimed-end
Comment on lines +64 to +69

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Лишние комментарии

Suggested change
# Ganimed-edit start
# requiredTech:
# - ADTThermoTech Почему оно вообще требует технологию пластырей, а не крио, хоть в консоли и отображается требование технологии крио???
requiredTech:
- ADTThermoTech
- ADTCryoTech
# Ganimed-end
requiredTech:
- ADTCryoTech # Ganimed-Edit (ADTThermoTech)


- type: technology
id: ADTIndustrialMedicine
Expand Down Expand Up @@ -110,25 +114,27 @@
- CryoPodMachineCircuitboard
- CryostasisBeaker
- SyringeCryostasis
- ADTPatchCryo
# - ADTPatchCryo Ganimed-edit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# - ADTPatchCryo Ganimed-edit
# - ADTPatchCryo # Ganimed-Remove

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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Ganimed-edit start
# Ganimed-Remove-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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Ganimed-edit end
# Ganimed-Remove-End


- type: technology
id: ADTMechanizedTreatment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1135,12 +1135,6 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
# ADT-Tweak-start
- type: ClothingGrantComponent
component:
- type: SupermatterImmune
- type: SupermatterImmune
# ADT-Tweak-end
Comment on lines -1138 to -1143

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Закомментируй


#CBURN Hardsuit
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@
- ADTAdvancedMedicalMiscPack
- ADTAdvancedMedicalCarePack
- ADTCryoTech
- ADTThermoTech

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Закомментируй (# Ganimed-Remove)

#ADT-Tweak End
- type: Machine
board: MedicalTechFabCircuitboard
Expand Down
10 changes: 4 additions & 6 deletions Resources/Prototypes/Reagents/medicine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@
physicalDesc: reagent-physical-desc-fizzy
flavor: medicine
color: "#0091ff"
worksOnTheDead: true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Коммент

plantMetabolism:
- !type:PlantAdjustToxins
amount: -5
Expand All @@ -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
Comment on lines +226 to +229

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не трогаем

# ADT-Tweak end
# Start ADT tweak
- !type:HealthChange
Expand All @@ -253,7 +252,6 @@
physicalDesc: reagent-physical-desc-bubbling
flavor: medicine
color: "#32cd32"
worksOnTheDead: true
metabolisms:
Medicine:
effects:
Expand Down
Loading
Loading