diff --git a/Content.Server/_CP14/Temperature/CP14TemperatureSystem.cs b/Content.Server/_CP14/Temperature/CP14TemperatureSystem.cs index 549229fc5c..6588eb5b38 100644 --- a/Content.Server/_CP14/Temperature/CP14TemperatureSystem.cs +++ b/Content.Server/_CP14/Temperature/CP14TemperatureSystem.cs @@ -1,4 +1,3 @@ -using System.Linq; using Content.Server.Atmos.Components; using Content.Server.Temperature.Systems; using Content.Shared._CP14.Temperature; @@ -7,8 +6,6 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.FixedPoint; using Content.Shared.Placeable; using Content.Shared.Temperature; -using Robust.Server.GameObjects; -using Robust.Shared.Containers; using Robust.Shared.Timing; namespace Content.Server._CP14.Temperature; @@ -18,8 +15,6 @@ public sealed partial class CP14TemperatureSystem : EntitySystem [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly TemperatureSystem _temperature = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; private readonly TimeSpan _updateTick = TimeSpan.FromSeconds(1f); private TimeSpan _timeToNextUpdate = TimeSpan.Zero; @@ -29,29 +24,6 @@ public sealed partial class CP14TemperatureSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnTemperatureChanged); - SubscribeLocalEvent(OnTemperatureTransmite); - } - - /// - /// The main idea is that we do not simulate the interaction between the temperature of the container and its contents. - /// We directly change the temperature of the entire contents of the container. - /// - private void OnTemperatureTransmite(Entity ent, - ref OnTemperatureChangeEvent args) - { - if (!_container.TryGetContainer(ent, ent.Comp.ContainerId, out var container)) - return; - - var heatAmount = args.TemperatureDelta * _temperature.GetHeatCapacity(ent); - - // copy the list to avoid modifying it while iterating - var containedEntities = container.ContainedEntities.ToList(); - - var entityCount = containedEntities.Count; - foreach (var contained in containedEntities) - { - _temperature.ChangeHeat(contained, heatAmount / entityCount); - } } private void OnTemperatureChanged(Entity start, diff --git a/Content.Server/_CP14/Temperature/CP14TemperatureTransmissionComponent.cs b/Content.Server/_CP14/Temperature/CP14TemperatureTransmissionComponent.cs deleted file mode 100644 index 3faf8a2199..0000000000 --- a/Content.Server/_CP14/Temperature/CP14TemperatureTransmissionComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Content.Server._CP14.Temperature; - -/// -/// when it receives the temperature, it distributes it among all objects inside the specified container -/// -[RegisterComponent, Access(typeof(CP14TemperatureSystem))] -public sealed partial class CP14TemperatureTransmissionComponent : Component -{ - [DataField("containerId", required: true)] - public string ContainerId = string.Empty; -} diff --git a/Content.Shared/Verbs/VerbCategory.cs b/Content.Shared/Verbs/VerbCategory.cs index 8e4665352a..322e18f773 100644 --- a/Content.Shared/Verbs/VerbCategory.cs +++ b/Content.Shared/Verbs/VerbCategory.cs @@ -46,8 +46,6 @@ namespace Content.Shared.Verbs public static readonly VerbCategory CP14ModularCraft = new("verb-categories-modular-craft", "/Textures/Interface/AdminActions/unbolt.png"); - public static readonly VerbCategory CP14RitualBook = new("cp14-verb-categories-ritual-book", null); - public static readonly VerbCategory CP14CurrencyConvert = new("cp14-verb-categories-currency-converter", null); //CP14 //CP14 verbs diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.Checks.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.Checks.cs index 0c72174212..69836144c5 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.Checks.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.Checks.cs @@ -1,23 +1,19 @@ using Content.Shared._CP14.MagicSpell.Components; using Content.Shared._CP14.MagicSpell.Events; using Content.Shared._CP14.Religion.Components; -using Content.Shared._CP14.Religion.Prototypes; using Content.Shared._CP14.Religion.Systems; using Content.Shared.CombatMode.Pacification; using Content.Shared.Damage.Components; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Mobs.Components; -using Content.Shared.Mobs.Systems; using Content.Shared.Popups; using Content.Shared.Speech.Muting; -using Robust.Shared.Prototypes; namespace Content.Shared._CP14.MagicSpell; public abstract partial class CP14SharedMagicSystem { - [Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly CP14SharedReligionGodSystem _god = default!; [Dependency] private readonly SharedHandsSystem _hand = default!; diff --git a/Resources/Locale/en-US/_CP14/magicRitual/base.ftl b/Resources/Locale/en-US/_CP14/magicRitual/base.ftl deleted file mode 100644 index fb1a4b09df..0000000000 --- a/Resources/Locale/en-US/_CP14/magicRitual/base.ftl +++ /dev/null @@ -1,19 +0,0 @@ -cp14-verb-categories-ritual-book = Choose a page: -cp14-ritual-describer-verb-item = Turn the page: {$name} -cp14-ritual-describer-verb-hyperlink = Quick navigate: {$name} -cp14-ritual-describer-verb-back = Back - -cp14-ritual-verb-text = Activate the ritual - -cp14-ritual-category-all-living = any living thing - -cp14-ritual-intro = The following neighboring nodes are known to be available for transition: - -cp14-ritual-range = In a radius {$range}, - -cp14-ritual-orb-examine = {$name} contains the following energies: -cp14-ritual-entry-item = - - { $count -> - [1] {$name} - *[other] {$name} ({$count} pcs.) - } \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/magicRitual/effects.ftl b/Resources/Locale/en-US/_CP14/magicRitual/effects.ftl deleted file mode 100644 index 1ad3448d0b..0000000000 --- a/Resources/Locale/en-US/_CP14/magicRitual/effects.ftl +++ /dev/null @@ -1,20 +0,0 @@ -cp14-ritual-effect-header = The moment of transition will cause the following effects: - -## - -cp14-ritual-effect-apply-effect = - { $count -> - [1] From the nearest entity - *[other] At the {$count} closest entity - } - -cp14-ritual-effect-spawn-entity = Incorporates the following objects into reality: - -cp14-ritual-effect-consume-resource = Within a radius of {$range}, absorbs the following entities: - -cp14-ritual-effect-stability-add = Stabilizes the ritual by [color=#34eb89]{$count}%[/color] -cp14-ritual-effect-stability-minus = Destabilizes the ritual by [color=#eb4034]{$count}%[/color] - -cp14-ritual-effect-add-orb = Ritual receives: - -cp14-ritual-effect-consume-orb = The ritual consumes the {$name} spheres: {$count} \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/magicRitual/requirements.ftl b/Resources/Locale/en-US/_CP14/magicRitual/requirements.ftl deleted file mode 100644 index d77752fde1..0000000000 --- a/Resources/Locale/en-US/_CP14/magicRitual/requirements.ftl +++ /dev/null @@ -1,17 +0,0 @@ -cp14-ritual-req-header = The following conditions must be met for the transition to take place: - -# - -cp14-ritual-required-stability-min = The stability of the ritual should be higher than {$min}% -cp14-ritual-required-stability-max = The stability of the ritual must be lower than {$max}% -cp14-ritual-required-stability-minmax = The stability of the ritual should be within the range of {$min} to {$max}% - -cp14-ritual-required-resource = The following items must be within the {$range} radius: - -cp14-ritual-required-time = It must be {$period} outside - - -cp14-ritual-required-orbs = Energies like “{$name}” should be -cp14-ritual-required-orbs-item-min = at least {$min} -cp14-ritual-required-orbs-item-max = no more than {$max} -cp14-ritual-required-orbs-item-minmax = from {$min} to {$max} \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/magicRitual/triggers.ftl b/Resources/Locale/en-US/_CP14/magicRitual/triggers.ftl deleted file mode 100644 index 5f49f584a0..0000000000 --- a/Resources/Locale/en-US/_CP14/magicRitual/triggers.ftl +++ /dev/null @@ -1,15 +0,0 @@ -cp14-ritual-trigger-header = The transition to this node can take place: - -# - -cp14-ritual-trigger-timer-stable = Automatically in {$time} seconds. - -cp14-ritual-trigger-voice = After casting the spell “{$phrase}” - { $count -> - [1]. - *[other], by at least {$count} different entities at the same time - } - -cp14-ritual-trigger-failure = As a result of various errors. - -cp14-ritual-trigger-sacrifice = When {$name} dies painfully within a {$range} radius of the ritual site. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/magicRitual/base.ftl b/Resources/Locale/ru-RU/_CP14/magicRitual/base.ftl deleted file mode 100644 index b0916ef817..0000000000 --- a/Resources/Locale/ru-RU/_CP14/magicRitual/base.ftl +++ /dev/null @@ -1,19 +0,0 @@ -cp14-verb-categories-ritual-book = Выбрать страницу -cp14-ritual-describer-verb-item = Перелистнуть: {$name} -cp14-ritual-describer-verb-hyperlink = Быстрый переход: {$name} -cp14-ritual-describer-verb-back = Назад - -cp14-ritual-verb-text = Активировать ритуал - -cp14-ritual-category-all-living = любое живое существо - -cp14-ritual-intro = Известны следующие соседние узлы, доступные для перехода: - -cp14-ritual-range = В радиусе {$range}, - -cp14-ritual-orb-examine = {$name} содержит в себе следующие энергии: -cp14-ritual-entry-item = - - { $count -> - [1] {$name} - *[other] {$name} ({$count} шт.) - } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/magicRitual/effects.ftl b/Resources/Locale/ru-RU/_CP14/magicRitual/effects.ftl deleted file mode 100644 index bbb1046b32..0000000000 --- a/Resources/Locale/ru-RU/_CP14/magicRitual/effects.ftl +++ /dev/null @@ -1,20 +0,0 @@ -cp14-ritual-effect-header = Момент перехода вызовет следующие эффекты: - -## - -cp14-ritual-effect-apply-effect = - у { $count -> - [1] ближайшей сущности - *[other] {$count} ближайших сущностей - } - -cp14-ritual-effect-spawn-entity = Воплощает в реальность следующие объекты: - -cp14-ritual-effect-consume-resource = В радиусе {$range} поглощает следующие сущности: - -cp14-ritual-effect-stability-add = Стабилизирует ритуал на [color=#34eb89]{$count}%[/color] -cp14-ritual-effect-stability-minus = Дестабилизирует ритуал на [color=#eb4034]{$count}%[/color] - -cp14-ritual-effect-add-orb = Ритуал получает: - -cp14-ritual-effect-consume-orb = Ритуал поглощает сфер {$name}: {$count} \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/magicRitual/requirements.ftl b/Resources/Locale/ru-RU/_CP14/magicRitual/requirements.ftl deleted file mode 100644 index 1329d6d5bf..0000000000 --- a/Resources/Locale/ru-RU/_CP14/magicRitual/requirements.ftl +++ /dev/null @@ -1,17 +0,0 @@ -cp14-ritual-req-header = Для перехода необходимо соблюсти следующие условия: - -# - -cp14-ritual-required-stability-min = Стабильность ритуала должна быть выше {$min}% -cp14-ritual-required-stability-max = Стабильность ритуала должна быть ниже {$max}% -cp14-ritual-required-stability-minmax = Стабильность ритуала должна быть в рамках от {$min} до {$max}% - -cp14-ritual-required-resource = В радиусе {$range} должны находиться следующие предметы: - -cp14-ritual-required-time = На улице должен быть {$period} - - -cp14-ritual-required-orbs = Энергии типа "{$name}" должно быть -cp14-ritual-required-orbs-item-min = как минимум {$min} -cp14-ritual-required-orbs-item-max = не больше {$max} -cp14-ritual-required-orbs-item-minmax = от {$min} до {$max} \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/magicRitual/triggers.ftl b/Resources/Locale/ru-RU/_CP14/magicRitual/triggers.ftl deleted file mode 100644 index ca77de24a6..0000000000 --- a/Resources/Locale/ru-RU/_CP14/magicRitual/triggers.ftl +++ /dev/null @@ -1,15 +0,0 @@ -cp14-ritual-trigger-header = Переход в этот узел может состояться: - -# - -cp14-ritual-trigger-timer-stable = Автоматически через {$time} секунд. - -cp14-ritual-trigger-voice = После произнесения заклинания "{$phrase}" - { $count -> - [1]. - *[other], как минимум {$count} разными сущностями одновременно - } - -cp14-ritual-trigger-failure = В результате различных ошибок. - -cp14-ritual-trigger-sacrifice = Когда {$name} мучительно погибает в радиусе {$range} от места проведения ритуала. \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/dead.png b/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/dead.png deleted file mode 100644 index e39f74638b..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/dead.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/meta.json deleted file mode 100644 index 8d680fb824..0000000000 --- a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "All right reserved", - "copyright": "Created by Jaraten (discord/Github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "sheep", - "directions": 4 - }, - { - "name": "dead" - } - ] -} diff --git a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/sheep.png b/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/sheep.png deleted file mode 100644 index 58f2cf719f..0000000000 Binary files a/Resources/Textures/_CP14/Mobs/Pets/sheep.rsi/sheep.png and /dev/null differ