From 9fce261ed8ff2808a9335a02625e6a6e5593fc66 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Sat, 6 Apr 2024 11:53:05 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BD=D1=83=20=D1=87=D0=B5=D1=82=D0=BE=20?= =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BF=D0=BE=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D0=BB=D0=BE=D1=81=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IncorporealSystem/IncorporealSystem.cs | 15 +++++++-------- Content.Shared/Atmos/Atmospherics.cs | 2 +- .../Catalog/Cargo/cargo_atmospherics.yml | 6 +++--- .../Prototypes/Catalog/Cargo/cargo_security.yml | 2 +- .../Prototypes/Catalog/Cargo/cargo_vending.yml | 16 ++++++++-------- .../Catalog/Fills/Items/briefcases.yml | 1 - .../Catalog/Fills/Lockers/dressers.yml | 1 - .../Objects/Misc/identification_cards.yml | 2 +- .../Entities/Structures/Furniture/dresser.yml | 2 +- .../Prototypes/Recipes/Crafting/improvised.yml | 13 ------------- 10 files changed, 22 insertions(+), 38 deletions(-) diff --git a/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs b/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs index 3231e4420b..50839db10d 100644 --- a/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs +++ b/Content.Server/_White/IncorporealSystem/IncorporealSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Shared.Eye; using Content.Shared.Movement.Systems; using Content.Shared.Physics; @@ -16,13 +16,13 @@ public sealed class IncorporealSystem : EntitySystem [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; [Dependency] private readonly SharedStealthSystem _stealth = default!; + [Dependency] private readonly TransformSystem _transform = default!; public override void Initialize() { SubscribeLocalEvent(OnComponentInit); SubscribeLocalEvent(OnComponentRemoved); SubscribeLocalEvent(OnRefresh); - } private void OnComponentInit(EntityUid uid, IncorporealComponent component, ComponentStartup args) @@ -37,8 +37,8 @@ public sealed class IncorporealSystem : EntitySystem if (TryComp(uid, out var visibility)) { - _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Ghost, false); - _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false); + _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Ghost, false); + _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Normal, false); _visibilitySystem.RefreshVisibility(uid); } @@ -60,14 +60,13 @@ public sealed class IncorporealSystem : EntitySystem if (TryComp(uid, out var visibility)) { - _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Ghost, false); - _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false); + _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Ghost, false); + _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Normal, false); _visibilitySystem.RefreshVisibility(uid); } component.MovementSpeedBuff = 1; - - Spawn("EffectEmpPulse", Transform(uid).Coordinates); + Spawn("EffectEmpPulse", _transform.GetMapCoordinates(uid)); _stealth.SetVisibility(uid, 1); RemComp(uid); _movement.RefreshMovementSpeedModifiers(uid); diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index 6230e0934e..e93ae92e39 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -202,7 +202,7 @@ namespace Content.Shared.Atmos /// /// This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs) /// - public const float MinimumTritiumOxyburnEnergy = 430000f; + public const float MinimumTritiumOxyburnEnergy = 143000f; public const float TritiumBurnOxyFactor = 100f; public const float TritiumBurnTritFactor = 10f; diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml index b0951ac6bc..f234a0a8c7 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml @@ -118,7 +118,7 @@ sprite: Structures/Storage/canister.rsi state: redws product: NitrousOxideCanister - cost: 1300 + cost: 3000 category: Atmospherics group: market @@ -128,7 +128,7 @@ sprite: Structures/Storage/canister.rsi state: purple product: BZCanister - cost: 3500 + cost: 7000 category: Atmospherics group: market @@ -138,6 +138,6 @@ sprite: Structures/Storage/canister.rsi state: darkblue product: PluoxiumCanister - cost: 3500 + cost: 10500 category: Atmospherics group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 14046291b2..6895967732 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -4,7 +4,7 @@ sprite: Clothing/OuterClothing/Armor/security.rsi state: icon product: CrateSecurityArmor - cost: 700 + cost: 750 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index dda462abec..b9d369354f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 6000 + cost: 130000 category: cargoproduct-category-name-service group: market @@ -54,7 +54,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockCondimentStationFilled - cost: 300 + cost: 400 category: cargoproduct-category-name-service group: market @@ -94,7 +94,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockMedicalFilled - cost: 1750 + cost: 2200 category: cargoproduct-category-name-medical group: market @@ -134,7 +134,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockRobustSoftdrinksFilled - cost: 1200 + cost: 1700 category: cargoproduct-category-name-service group: market @@ -164,7 +164,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3375 + cost: 3600 category: cargoproduct-category-name-hydroponics group: market @@ -194,7 +194,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockRoboticsFilled - cost: 1600 + cost: 1800 category: cargoproduct-category-name-science group: market @@ -224,7 +224,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockGetmoreChocolateCorpFilled - cost: 1200 + cost: 1450 category: cargoproduct-category-name-service group: market @@ -244,7 +244,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockDiscountDansFilled - cost: 1200 + cost: 1300 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index d5c04e2e86..f2c5776fce 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -29,7 +29,6 @@ - id: ClothingUniformJumpsuitLawyerBlack - id: ClothingShoesBootsLaceup - id: ClothingHandsGlovesCombat # WD edit - - id: BarberScissors - type: entity id: BriefcaseSyndieLobbyingBundleFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 72f4c0a170..53345e2a60 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -73,7 +73,6 @@ - id: ClothingUniformJumpsuitHoSAlt - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal - - id: ClothingMaskNeckGaiter - id: ClothingHandsGlovesCombat - id: ClothingOuterWinterHoS diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index ec338427fd..44b98bbf44 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -602,7 +602,7 @@ suffix: Agent components: - type: PresetIdCard - job: ассистент + job: Passenger - type: Access tags: - Maintenance diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index 46c5045ed5..c3688f6e2b 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -26,7 +26,7 @@ acts: [ "Destruction" ] - type: Storage grid: - - 0,0,6,3 + - 0,0,6,4 maxItemSize: Normal - type: ContainerContainer containers: diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 44dbc53868..eac90f7b48 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -176,19 +176,6 @@ sprite: Objects/Misc/rifle_stock.rsi state: icon -- type: construction - name: improvised explosive device - id: improvisedexplosive - graph: ImprovisedExplosive - startNode: start - targetNode: ied - category: construction-category-weapons - objectType: Item - description: A weak, improvised incendiary device. - icon: - sprite: Objects/Weapons/Bombs/ied.rsi - state: icon - - type: construction name: cotton woven cloth id: CottonWovenCloth