diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs index c76c19d847..0b01b6bc1a 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs @@ -48,27 +48,6 @@ public sealed partial class DeepFryerSystem if (oilVolume > FixedPoint2.Zero) { - //JJ Comment - this code block makes the Linter fail, and doesn't seem to be necessary with the changes I made. - foreach (var reagent in component.Solution.Contents.ToArray()) - { - _prototypeManager.TryIndex(reagent.Reagent.ToString(), out var proto); - - foreach (var effect in component.UnsafeOilVolumeEffects) - { - // TODO: October - Fix this - /*effect.Effect(new EntityEffectReagentArgs(uid, - EntityManager, - null, - component.Solution, - reagent.Quantity, - proto!, - null, - 1f)); - */ - } - - } - component.Solution.RemoveAllSolution(); _popupSystem.PopupEntity( diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs index ac2fe33d86..ab601cd7ae 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs @@ -382,28 +382,6 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem if (!solutionExisted) _sawmill.Warning( $"{ToPrettyString(uid)} did not have a {component.SolutionName} solution container. It has been created."); - foreach (var reagent in component.Solution.Contents.ToArray()) - { - //JJ Comment - not sure this works. Need to check if Reagent.ToString is correct. - _prototypeManager.TryIndex(reagent.Reagent.ToString(), out var proto); - - // TODO: October - Fix this - /*var effectsArgs = new EntityEffectReagentArgs(uid, - EntityManager, - null, - component.Solution, - reagent.Quantity, - proto!, - null, - 1f); - - foreach (var effect in component.UnsafeOilVolumeEffects) - { - if (!effect.ShouldApply(effectsArgs, _random)) - continue; - effect.Effect(effectsArgs); - }*/ - } } /// diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index 161b62e2c6..0f59d015fb 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -404,7 +404,7 @@ public partial class SharedBodySystem { // TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly var damage = new DamageSpecifier(Prototypes.Index(BloodlossDamageType), 300); - Damageable.ChangeDamage(bodyEnt.Owner, damage); // TODO: October - Do we need this? This was added. + Damageable.ChangeDamage(bodyEnt.Owner, damage); } } diff --git a/Content.Shared/Damage/Systems/DamageableSystem.API.cs b/Content.Shared/Damage/Systems/DamageableSystem.API.cs index 9bff1e19d8..c35f645186 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.API.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.API.cs @@ -149,7 +149,7 @@ public sealed partial class DamageableSystem RaiseLocalEvent(ent.Owner, ref partDamage); if (partDamage.Evaded || partDamage.Cancelled) - return damageDone; // TODO: October - Was null + return damageDone; } // END Shitmed @@ -173,7 +173,7 @@ public sealed partial class DamageableSystem } if (onlyDamageParts) // DeltaV - Fix EvenHealing with Limbs. - return damageDone; // TODO: October - Was null + return damageDone; if (!ignoreGlobalModifiers) damage = ApplyUniversalAllModifiers(damage); diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 1817916129..6fe33f080b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -50,11 +50,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtSecGrey -- type: loadout - id: TrooperUniform - equipment: - jumpsuit: ClothingUniformSecurityTrooper - - type: loadout id: SeniorOfficerJumpsuit effects: diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml index 8a474d359a..d3389c475b 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -14,7 +14,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement - department: Cargo + department: Logistics # DeltaV time: 10h # 10 hours of being a space trucker # Basic options diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml index b5e3f6bdd7..a4f550b967 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml @@ -291,7 +291,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement - department: Science + department: Epistemics # DeltaV time: 72000 # 20hr storage: back: diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/smartfridge.yml index 35f45c1161..ffcd95616a 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Machines/smartfridge.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/smartfridge.yml @@ -87,7 +87,8 @@ - type: Dumpable - type: AccessReader - type: ExplosionResistance - damageCoefficient: 0.6 + damageCoefficient: 0.1 + - type: Airtight - type: entity parent: DVSmartFridge diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml index 74f825b02e..4210183777 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml @@ -53,7 +53,8 @@ - CrowbarGreen - Multitool - Welder - - WeldingMask + - ClothingHeadHatWelding + - CableStack - HandheldGPSBasic - HandheldStationMap - MicroManipulatorStockPart # Heads start with machine boards