From aa9dc40c8dfefc8e896c0bb9628bc92a218c481d Mon Sep 17 00:00:00 2001 From: Armorkillerd Date: Sun, 15 Mar 2026 23:47:27 +0300 Subject: [PATCH] MESI MESI --- .../Objects/Specific/material_args.yml | 2 +- .../ADT/Reagents/Consumable/Drink/drinks.yml | 13 ++++--- .../Guns/Ammunition/Projectiles/grenade.yml | 12 ++++++ .../Guns/Ammunition/Projectiles/shotgun.yml | 37 +++++++++++++++++-- .../Weapons/Throwable/projectile_grenades.yml | 28 ++++++++------ .../Reagents/Consumable/Drink/alcohol.yml | 14 +++---- Resources/Prototypes/Reagents/biological.yml | 15 ++------ 7 files changed, 79 insertions(+), 42 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/material_args.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/material_args.yml index b35807fc5f3..d30d080db24 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/material_args.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/material_args.yml @@ -169,7 +169,7 @@ - !type:ComboFallEffect dropItems: false - !type:ComboEffectSleep - time: 2 + time: 1 - !type:ComboSpeechEffect speech: speech-carp-throw - !type:ComboTrowTargetEffect diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml index 2487bbcd5c2..75b9b6625ee 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml @@ -55,7 +55,7 @@ - type: reagent id: ADTHungoverAngel name: hungover-angel-name - parent: ADTSummerShade + parent: BaseDrink desc: hungover-angel-desc physicalDesc: reagent-physical-desc-exhilarating flavor: adt_hungoverangel @@ -66,12 +66,15 @@ effects: - !type:SatiateThirst factor: 3 - Medicine: - effects: + - !type:AdjustTemperature + conditions: + - !type:TemperatureCondition + min: 290 #дает легкую прохладу + amount: -2500 - !type:HealthChange damage: - types: - Poison: -1 + groups: + Toxin: -1 - !type:PopupMessage type: Local visualType: Small diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml index 367564ddf08..26a2f32c556 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml @@ -26,6 +26,12 @@ categories: [ HideSpawnMenu ] parent: BaseBullet components: + # ADT-Tweak-Start + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: buckshot + # ADT-Tweak-End - type: Projectile deleteOnCollide: false damage: @@ -40,6 +46,12 @@ categories: [ HideSpawnMenu ] parent: BaseBulletIncendiary components: + # ADT-Tweak-Start + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Projectiles/shotgun-ammo.rsi + layers: + - state: buckshot-incendiary + # ADT-Tweak-End - type: Projectile deleteOnCollide: false damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index 0a18b5bff7b..bf70a798f90 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -26,8 +26,7 @@ - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi layers: - - state: bullet #just reapplying to here so it can be shaded - + - state: rubber # ADT-Tweak bullet -> rubber - type: Projectile damage: types: @@ -41,6 +40,12 @@ categories: [ HideSpawnMenu ] parent: BaseBullet components: + # ADT-Tweak-Start + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: buckshot + # ADT-Tweak-End - type: Projectile damage: types: @@ -64,13 +69,17 @@ categories: [ HideSpawnMenu ] parent: BaseBulletIncendiary components: + # ADT-Tweak-Start + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Projectiles/shotgun-ammo.rsi + layers: + - state: buckshot-incendiary + # ADT-Tweak-End - type: Projectile damage: types: Piercing: 7 Structural: 15 #ADT tweak Structural 0 -> 15 - # Blunt: 3 ADT tweak - # Heat: 7 ADT tweak - type: IgnitionSource ignited: true @@ -90,6 +99,12 @@ categories: [ HideSpawnMenu ] parent: BaseBulletPractice components: + # ADT-Tweak-Start + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: practice + # ADT-Tweak-End - type: Projectile damage: types: @@ -113,8 +128,10 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + # ADT-Tweak-Start layers: - state: shard + # ADT-Tweak-End shader: unshaded - type: Projectile damage: @@ -138,6 +155,12 @@ categories: [ HideSpawnMenu ] parent: BaseBulletPractice components: + # ADT-Tweak-Start + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: piercing + # ADT-Tweak-End - type: Projectile damage: types: @@ -206,6 +229,12 @@ categories: [ HideSpawnMenu ] parent: BaseBulletUranium components: + #ADT-Tweak-Start + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: uranium + #ADT-Tweak-End - type: Projectile damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml index 5a3cedb9014..2164eefbe19 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml @@ -99,12 +99,14 @@ initialBeepDelay: 0 beepInterval: 2 delay: 3.5 - - type: EmitSoundOnTrigger - keysIn: - - timer - sound: - path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg" - positional: true + # ADT-Tweak-Start Лудше вобще без звука чем с этим. + #- type: EmitSoundOnTrigger + # keysIn: + # - timer + # sound: + # path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg" + # positional: true + # ADT-Tweak-End - type: StaticPrice price: 1500 @@ -131,11 +133,13 @@ initialBeepDelay: 0 beepInterval: 2 delay: 3.5 - - type: EmitSoundOnTrigger - keysIn: - - timer - sound: - path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg" - positional: true + # ADT-Tweak-Start Лудше вобще без звука чем с этим. + #- type: EmitSoundOnTrigger + # keysIn: + # - timer + # sound: + # path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg" + # positional: true + # ADT-Tweak-End - type: StaticPrice price: 1500 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index c9fa895d211..80859d94724 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1167,16 +1167,12 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.05 - - !type:HealthChange + - !type:EvenHealthChange # ADT-Tweak: HealthChange -> EvenHealthChange damage: - groups: - Brute: -1 - # ADT-Tweak start - types: - Poison: -0.5 - Shock: -0.33 - Cold: -0.33 - # ADT-Tweak end + Burn: -1 + Brute: -1 + Airloss: -1 + Toxin: -1 - type: reagent id: DriestMartini diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 0663ef259f2..4e67ee579f0 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -184,21 +184,14 @@ - !type:MetabolizerTypeCondition type: [ Dragon ] # ADT tweak end - - !type:EvenHealthChange - damage: - Burn: -3 - Brute: -3 - Toxin: -2 - !type:HealthChange damage: groups: - # ADT-Tweak start - Burn: -20 # Лечит все физические повреждение на 5 (20/4) - Brute: -15 # Лечит все механические повреждение на 5 (15/3) - Toxin: -4 # Лечит радиацию и токсины на 2 (4/2) - # ADT-Tweak end + Burn: -5 + Brute: -5 + Toxin: -2 types: - Bloodloss: -3 + Bloodloss: -5 - !type:ModifyBleed amount: -1.5 # Just in case you REALLY want to water your plants