From 15797bf962c7fb1dc80bd7b03b80b256f673ee6f Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 16:06:48 +0300 Subject: [PATCH 1/8] Update migration.yml --- Resources/migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index f4eb87b0f03..fd57e214ea4 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -21,7 +21,7 @@ BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice BoxMagazineMagnumSubMachineGunRubber: BoxMagazinePistolSubMachineGunRubber MagazineMagnumSubMachineGun: MagazinePistolSubMachineGun -MagazineMagnumSubMachineGunHighVelocity: MagazinePistolSubMachineGunHighVelocity +#MagazineMagnumSubMachineGunHighVelocity: MagazinePistolSubMachineGunHighVelocity MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber WeaponSubMachineGunVector: WeaponSubMachineGunDrozd From cdd4630d88617ef7b36a21a3b98686242290df41 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:09:10 +0300 Subject: [PATCH 2/8] Update migration.yml No need to keep the line --- Resources/migration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index fd57e214ea4..506e6d74f46 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -21,7 +21,6 @@ BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice BoxMagazineMagnumSubMachineGunRubber: BoxMagazinePistolSubMachineGunRubber MagazineMagnumSubMachineGun: MagazinePistolSubMachineGun -#MagazineMagnumSubMachineGunHighVelocity: MagazinePistolSubMachineGunHighVelocity MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber WeaponSubMachineGunVector: WeaponSubMachineGunDrozd From 75531ec28edd618d17dcdb0b4e5126d5ad3ddb95 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:12:21 +0300 Subject: [PATCH 3/8] Update migration.yml Fuck it we use the original, no errors --- Resources/migration.yml | 70 +---------------------------------------- 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 506e6d74f46..9234ce54974 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -7,75 +7,6 @@ # Window: WallSolid # WallSolid: Window # Table: null -# -chem_dispenser: ChemDispenser -KvassTankFull: null -DrinkKvassGlass: null -KvassTank: null - -# 2023-05-03 - -# 2023-05-04 -BoxMagazineMagnumSubMachineGun: BoxMagazinePistolSubMachineGun -BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice -BoxMagazineMagnumSubMachineGunRubber: BoxMagazinePistolSubMachineGunRubber - -MagazineMagnumSubMachineGun: MagazinePistolSubMachineGun -MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice -MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber -WeaponSubMachineGunVector: WeaponSubMachineGunDrozd -WeaponSubMachineGunVectorRubber: WeaponSubMachineGunDrozdRubber - -MagazineBoxAntiMaterial: MagazineBoxAntiMateriel -CartridgeAntiMaterial: CartridgeAntiMateriel -BulletAntiMaterial: BulletAntiMateriel - -# 2023-05-10 -FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce -FoodBakedCookieFortune: FoodSnackCookieFortune -GunSafeSubMachineGunVector: GunSafeSubMachineGunDrozd - -# 2023-05-24 -AMEController: AmeController -AMEJar: AmeJar -AMEPart: AmePart -AMEShielding: AmeShielding - -# 2023-05-29 -OrGate: null - -# 2023-05-31 -IHSVoidsuit: null -ClothingHeadHelmetIHSVoidHelm: null -ClothingHandsGlovesIhscombat: null - -# 2023-06-02 -# Yes, this is right. They were, in fact, reversed because the default orientation of the particle accelerator was _down_ relative to the screen. -# This resulted in the parts being named assuming that the person building the accelerator treated it like a rocket with the particles coming out the _back_. -# As this was confusing they were converted to nautical orientation with forward being towards the emitters. -MachineParticleAcceleratorEmitterCenterCircuitboard: MachineParticleAcceleratorEmitterForeCircuitboard -MachineParticleAcceleratorEmitterLeftCircuitboard: MachineParticleAcceleratorEmitterStarboardCircuitboard -MachineParticleAcceleratorEmitterRightCircuitboard: MachineParticleAcceleratorEmitterPortCircuitboard -ParticleAcceleratorEmitterCenter: ParticleAcceleratorEmitterFore -ParticleAcceleratorEmitterCenterUnfinished: ParticleAcceleratorEmitterForeUnfinished -ParticleAcceleratorEmitterLeft: ParticleAcceleratorEmitterStarboard -ParticleAcceleratorEmitterLeftUnfinished: ParticleAcceleratorEmitterStarboardUnfinished -ParticleAcceleratorEmitterRight: ParticleAcceleratorEmitterPort -ParticleAcceleratorEmitterRightUnfinished: ParticleAcceleratorEmitterPortUnfinished - -# 2023-06-21 -WindoorArmoryLocked: WindoorSecureArmoryLocked -WindoorBrigLocked: WindoorSecureBrigLocked -WindoorChemistryLocked: WindoorSecureChemistryLocked -WindoorCommandLocked: WindoorSecureCommandLocked -WindoorEngineeringLocked: WindoorSecureEngineeringLocked -WindoorExternalLocked: WindoorSecureExternalLocked -WindoorMedicalLocked: WindoorSecureMedicalLocked -WindoorSecurityLocked: WindoorSecureSecurityLocked -WindoorScienceLocked: WindoorSecureScienceLocked -WindoorHeadOfPersonnelLocked: WindoorSecureHeadOfPersonnelLocked -WindoorAtmosphericsLocked: WindoorSecureAtmosphericsLocked -WindoorParamedicLocked: WindoorSecureParamedicLocked # 2023-07-03 ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic @@ -127,6 +58,7 @@ MagazineBoxRifleHighVelocity: MagazineBoxRifle MagazineCaselessRifleHighVelocity: MagazineCaselessRifle MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort MagazineLightRifleHighVelocity: MagazineLightRifle +MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity MagazinePistolHighVelocity: MagazinePistol From 74e5c620a2a4d9ac3a6656deebd38eb2ba1dad35 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:14:49 +0300 Subject: [PATCH 4/8] Update migration.yml Errors Were real --- Resources/migration.yml | 70 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 9234ce54974..506e6d74f46 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -7,6 +7,75 @@ # Window: WallSolid # WallSolid: Window # Table: null +# +chem_dispenser: ChemDispenser +KvassTankFull: null +DrinkKvassGlass: null +KvassTank: null + +# 2023-05-03 + +# 2023-05-04 +BoxMagazineMagnumSubMachineGun: BoxMagazinePistolSubMachineGun +BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice +BoxMagazineMagnumSubMachineGunRubber: BoxMagazinePistolSubMachineGunRubber + +MagazineMagnumSubMachineGun: MagazinePistolSubMachineGun +MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice +MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber +WeaponSubMachineGunVector: WeaponSubMachineGunDrozd +WeaponSubMachineGunVectorRubber: WeaponSubMachineGunDrozdRubber + +MagazineBoxAntiMaterial: MagazineBoxAntiMateriel +CartridgeAntiMaterial: CartridgeAntiMateriel +BulletAntiMaterial: BulletAntiMateriel + +# 2023-05-10 +FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce +FoodBakedCookieFortune: FoodSnackCookieFortune +GunSafeSubMachineGunVector: GunSafeSubMachineGunDrozd + +# 2023-05-24 +AMEController: AmeController +AMEJar: AmeJar +AMEPart: AmePart +AMEShielding: AmeShielding + +# 2023-05-29 +OrGate: null + +# 2023-05-31 +IHSVoidsuit: null +ClothingHeadHelmetIHSVoidHelm: null +ClothingHandsGlovesIhscombat: null + +# 2023-06-02 +# Yes, this is right. They were, in fact, reversed because the default orientation of the particle accelerator was _down_ relative to the screen. +# This resulted in the parts being named assuming that the person building the accelerator treated it like a rocket with the particles coming out the _back_. +# As this was confusing they were converted to nautical orientation with forward being towards the emitters. +MachineParticleAcceleratorEmitterCenterCircuitboard: MachineParticleAcceleratorEmitterForeCircuitboard +MachineParticleAcceleratorEmitterLeftCircuitboard: MachineParticleAcceleratorEmitterStarboardCircuitboard +MachineParticleAcceleratorEmitterRightCircuitboard: MachineParticleAcceleratorEmitterPortCircuitboard +ParticleAcceleratorEmitterCenter: ParticleAcceleratorEmitterFore +ParticleAcceleratorEmitterCenterUnfinished: ParticleAcceleratorEmitterForeUnfinished +ParticleAcceleratorEmitterLeft: ParticleAcceleratorEmitterStarboard +ParticleAcceleratorEmitterLeftUnfinished: ParticleAcceleratorEmitterStarboardUnfinished +ParticleAcceleratorEmitterRight: ParticleAcceleratorEmitterPort +ParticleAcceleratorEmitterRightUnfinished: ParticleAcceleratorEmitterPortUnfinished + +# 2023-06-21 +WindoorArmoryLocked: WindoorSecureArmoryLocked +WindoorBrigLocked: WindoorSecureBrigLocked +WindoorChemistryLocked: WindoorSecureChemistryLocked +WindoorCommandLocked: WindoorSecureCommandLocked +WindoorEngineeringLocked: WindoorSecureEngineeringLocked +WindoorExternalLocked: WindoorSecureExternalLocked +WindoorMedicalLocked: WindoorSecureMedicalLocked +WindoorSecurityLocked: WindoorSecureSecurityLocked +WindoorScienceLocked: WindoorSecureScienceLocked +WindoorHeadOfPersonnelLocked: WindoorSecureHeadOfPersonnelLocked +WindoorAtmosphericsLocked: WindoorSecureAtmosphericsLocked +WindoorParamedicLocked: WindoorSecureParamedicLocked # 2023-07-03 ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic @@ -58,7 +127,6 @@ MagazineBoxRifleHighVelocity: MagazineBoxRifle MagazineCaselessRifleHighVelocity: MagazineCaselessRifle MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort MagazineLightRifleHighVelocity: MagazineLightRifle -MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity MagazinePistolHighVelocity: MagazinePistol From 855031255a26e6964168a9afa5498e665f0402b1 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 16:24:40 +0300 Subject: [PATCH 5/8] Update PoweredLightSystem.cs --- Content.Server/Light/EntitySystems/PoweredLightSystem.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 3a0dc3ee8ce..fc008d2b86e 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -35,7 +35,7 @@ public sealed class PoweredLightSystem : EntitySystem [Dependency] private readonly SharedAmbientSoundSystem _ambientSystem = default!; [Dependency] private readonly LightBulbSystem _bulbSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger= default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!; @@ -131,7 +131,7 @@ private void OnInteractHand(EntityUid uid, PoweredLightComponent light, Interact //removing a broken/burned bulb, so allow instant removal - if(TryComp(bulbUid.Value, out var bulb) && bulb.State != LightBulbState.Normal) + if (TryComp(bulbUid.Value, out var bulb) && bulb.State != LightBulbState.Normal) { args.Handled = EjectBulb(uid, userUid, light) != null; return; @@ -429,8 +429,8 @@ private void OnDoAfter(EntityUid uid, PoweredLightComponent component, DoAfterEv private void OnEmpPulse(EntityUid uid, PoweredLightComponent component, ref EmpPulseEvent args) { - // if (TryDestroyBulb(uid, component)) // Make it so EMP isnt exploding lights - // args.Affected = true; // Make it so EMP isnt exploding lights + if (TryDestroyBulb(uid, component)) + args.Affected = true; } } } From a31aa0686df513be8f7cf67aeff4f95062c1678d Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 16:31:45 +0300 Subject: [PATCH 6/8] Update PoweredLightSystem.cs --- Content.Server/Light/EntitySystems/PoweredLightSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index fc008d2b86e..c5c32884bfc 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -429,8 +429,8 @@ private void OnDoAfter(EntityUid uid, PoweredLightComponent component, DoAfterEv private void OnEmpPulse(EntityUid uid, PoweredLightComponent component, ref EmpPulseEvent args) { - if (TryDestroyBulb(uid, component)) - args.Affected = true; + // if (TryDestroyBulb(uid, component)) + // args.Affected = true; } } } From 2d7eb2f2ccc4908e11dc1fcb1c5f2b93c4402bba Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 16:40:40 +0300 Subject: [PATCH 7/8] Update PoweredLightSystem.cs --- Content.Server/Light/EntitySystems/PoweredLightSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index c5c32884bfc..ea4a285e006 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -35,7 +35,7 @@ public sealed class PoweredLightSystem : EntitySystem [Dependency] private readonly SharedAmbientSoundSystem _ambientSystem = default!; [Dependency] private readonly LightBulbSystem _bulbSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly IAdminLogManager _adminLogger= default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!; @@ -131,7 +131,7 @@ private void OnInteractHand(EntityUid uid, PoweredLightComponent light, Interact //removing a broken/burned bulb, so allow instant removal - if (TryComp(bulbUid.Value, out var bulb) && bulb.State != LightBulbState.Normal) + if(TryComp(bulbUid.Value, out var bulb) && bulb.State != LightBulbState.Normal) { args.Handled = EjectBulb(uid, userUid, light) != null; return; From 512cc93aca9b39c34c3bbacb02e6f1df04c69682 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 17:06:34 +0300 Subject: [PATCH 8/8] Update PoweredLightSystem.cs --- Content.Server/Light/EntitySystems/PoweredLightSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index ea4a285e006..7c0225579a6 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -429,8 +429,8 @@ private void OnDoAfter(EntityUid uid, PoweredLightComponent component, DoAfterEv private void OnEmpPulse(EntityUid uid, PoweredLightComponent component, ref EmpPulseEvent args) { - // if (TryDestroyBulb(uid, component)) - // args.Affected = true; + // if (TryDestroyBulb(uid, component)) // Make it so EMP isnt exploding lights + // args.Affected = true; // Make it so EMP isnt exploding lights } } }