Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

хз пусть будет 1 #2711

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions Content.Server/_Silver/MordastJoinSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using System.Numerics;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Server.Nutrition.EntitySystems;
using Content.Server.Speech.Components;
using Content.Server.Speech.EntitySystems;
using Content.Server.Traits.Assorted;
using Content.Shared.Administration.Components;
using Content.Shared.Interaction.Components;
using Content.Shared.Nutrition.Components;
using Content.Shared.StatusEffect;
using Content.Shared.Traits.Assorted;
using Robust.Shared.Enums;
using Robust.Shared.Player;
using Robust.Shared.Timing;

namespace Content.Server.Silver.MorDastJoin;

public sealed class MorDastJoinSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly GameTicker _ticker = default!;

public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<VigersRayJoinEvent>(OnVigersRayJoin);
}

private void OnVigersRayJoin(VigersRayJoinEvent args)
{
_chatManager.DispatchServerAnnouncement("Морда зашел", Color.Red);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace Content.Server._Sunrise.NightDayMapLight
{
[RegisterComponent]
public sealed partial class NightDayMapLightComponent : Component
{
[ViewVariables]
[DataField]
public Color DayColor = Color.FromHex("#666666");

[ViewVariables]
[DataField]
public Color NightColor = Color.FromHex("#000000");

[ViewVariables]
[DataField]
public float DayDuration = 1200;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
using Robust.Shared.Map.Components;
using Robust.Shared.Timing;

namespace Content.Server._Sunrise.NightDayMapLight
{
public sealed class NightDayMapLightSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _gameTiming = default!;

public override void Initialize()
{
base.Initialize();
}

public override void Update(float frameTime)
{
base.Update(frameTime);

var query = EntityQueryEnumerator<NightDayMapLightComponent, MapLightComponent>();
while (query.MoveNext(out var uid, out var nightDayMapLight, out var mapLight))
{
var dayDuration = nightDayMapLight.DayDuration;
var transitionDuration = dayDuration / 2f;

var t = (float)_gameTiming.CurTime.TotalSeconds % dayDuration / dayDuration;

if (t <= 0.5f)
{
var dayColor = nightDayMapLight.DayColor;
if (t >= 0.5f - (transitionDuration / dayDuration))
{
var transitionT = (0.5f - t) / (transitionDuration / dayDuration);
dayColor = Color.InterpolateBetween(nightDayMapLight.NightColor, nightDayMapLight.DayColor, transitionT);
}
mapLight.AmbientLightColor = dayColor;
}
else
{
var nightColor = nightDayMapLight.NightColor;
if (t <= 0.5f + (transitionDuration / dayDuration))
{
var transitionT = (t - 0.5f) / (transitionDuration / dayDuration);
nightColor = Color.InterpolateBetween(nightDayMapLight.NightColor, nightDayMapLight.DayColor, transitionT);
}
mapLight.AmbientLightColor = nightColor;
}

Dirty(uid, mapLight);
}
}
}
}
27 changes: 27 additions & 0 deletions Content.Server/_Sunrise/Paws/PawsComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using Content.Shared.FixedPoint;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
namespace Content.Server.Sunrise.Paws
{
[RegisterComponent]
public sealed partial class PawsComponent : Component
{
[ViewVariables(VVAccess.ReadWrite)]
[DataField("screamInterval")]
public float ScreamInterval = 3;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("coughInterval")]
public float CoughInterval = 5;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("thresholdDamage")]
public FixedPoint2 ThresholdDamage = 5;
public List<string> EmotesTakeDamage = new()
{
"Scream",
"Crying"
};
[DataField("nextChargeTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
public TimeSpan NextScreamTime = TimeSpan.FromSeconds(0);
[DataField("nextCoughTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
public TimeSpan NextCoughTime = TimeSpan.FromSeconds(0);
}
}
57 changes: 57 additions & 0 deletions Content.Server/_Sunrise/Paws/PawsSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
using Content.Server.Chat.Systems;
using Content.Shared.Damage;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Robust.Shared.Random;
using Robust.Shared.Timing;
namespace Content.Server.Sunrise.Paws
{
public sealed class PawsSystem : EntitySystem
{
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly ChatSystem _chatSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!;
public override void Initialize()
{
base.Initialize();
// SubscribeLocalEvent<PawsComponent, MobStateChangedEvent>(OnMobStateChanged);
SubscribeLocalEvent<PawsComponent, DamageChangedEvent>(OnDamaged);
}
// private void OnMobStateChanged(EntityUid uid, PawsComponent component, MobStateChangedEvent args)
// {
// if (args.NewMobState == MobState.Dead)
// _audioSystem.PlayPvs(component.DeadSound, uid, component.DeadSound.Params);
// }
private void OnDamaged(EntityUid uid, PawsComponent component, DamageChangedEvent args)
{
if (!_mobStateSystem.IsAlive(uid))
return;
if (!args.DamageIncreased)
return;
var curTime = _timing.CurTime;
if (curTime < component.NextScreamTime)
return;
if (args.DamageDelta!.GetTotal() < component.ThresholdDamage)
return;
component.NextScreamTime = curTime + TimeSpan.FromSeconds(component.ScreamInterval);
_chatSystem.TryEmoteWithChat(uid, _random.Pick(component.EmotesTakeDamage));
}
public override void Update(float frameTime)
{
base.Update(frameTime);
var curTime = _timing.CurTime;
var query = EntityQueryEnumerator<PawsComponent, MobStateComponent>();
while (query.MoveNext(out var uid, out var comp, out var state))
{
if (state.CurrentState != MobState.Critical)
continue;
if (curTime < comp.NextCoughTime)
return;
comp.NextCoughTime = curTime + TimeSpan.FromSeconds(comp.CoughInterval);
_chatSystem.TryEmoteWithChat(uid, "Cough", ignoreActionBlocker: true);
}
}
}
}
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,10 @@
Asphyxiation: -1.0
- type: FireVisuals
alternateState: Standing
- type: Paws
screamInterval: 3
thresholdDamage: 5
coughInterval: 5

- type: entity
save: false
Expand Down
31 changes: 31 additions & 0 deletions Resources/ServerInfo/Rules.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[color=#228B22]На сервере действует LRP [/color]
[color=#8B0000] Незнание правил проекта не освобождает вас от ответственности! [/color]
Хост/Главный Администратор могут изменить правила в любой момент. 
Все правила указанные ниже действуют на всех без исключений.
Играя на данном сервере,вы соглашаетесь со всеми правилами данного сервера которые указаны ниже.
Хотите уточнить какое-либо из правил? Обращайтесь к администрации.

[color=#a4885c]0.[/color] [color=#ffd700]Не будь мудаком[/color]
Правила не могут покрыть все возможные ситуации. Администраторы должны иметь возможность решать ситуации, которые упущены в правилах.

[color=#a4885c]1.[/color] [color=#ffd700]Гриф[/color]
Умышленная порча игрового процесса другим игрокам запрещена. Выпуск сингулярности является поводом для перманентного бана. В случае, если вы антагонист, действуйте строго в рамках ваших задач.

[color=#a4885c]2.[/color] [color=#ffd700]Убийство[/color]
Неоправданные действия, направленные на причинение серьезного вреда здоровью или убийство другого человека запрещены. Помните, что для убийства должна быть очень веская РП причина. Если вы сомневаетесь, спросите в АХелп.
Вы имеете право на самооборону, однако она не должна перерастать в убийство. Иными словами, вы имеете право ответить обидчику на удар, но, когда он уже упал, вам не следует его добивать.

[color=#a4885c]3.[/color] [color=#ffd700]Мультиаккаунт[/color]
Использование нескольких аккаунтов SS14 для получения выгоды или каких-либо других целей. Запрещено в любом виде.

[color=#a4885c]4.[/color] [color=#ffd700]Логика персонажей[/color]
Ваш персонаж, кем бы он не был: человеком, или мышью, должен вести себя подобающе своей роли.
Имена и фамилии должны соответствовать контексту и стандартам РП. Запрещены имена и фамилии знаменитостей, актеров, персонажей из фильмов, сериалов, аниме, игр и т.д., а также схожие имена и фамилии.
Отыгрыш ролей антагонистов запрещена без разрешения администрации и будет нарушать данное правило. В том числе отыгрыш пиратов и т.п.
КП и КЗ являются внутриигровыми порядками, но их злостное нарушение из раунда в раунд может быть наказуемым.

[color=#a4885c]5.[/color] [color=#ffd700]ERP[/color]
Эротическая ролевая игра (Erotic Role Play) запрещена. Всё, что заходит дальше поцелуев и объятий, карается. Даже если вы и другой игрок состоите в отношениях в реальной жизни.

[color=#a4885c]6.[/color] [color=#ffd700]Нечестная игра[/color]
Использование программного обеспечения и недочетов игры для получения преимущества в игровом процессе запрещено.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Flareguy & EmoGarbage404 using assets taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, airlocks, camera resprited by @mishutka09 & canister1 resprited by @dreamlyjack",
"copyright": "Made by Flareguy & EmoGarbage404 using assets taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 7 additions & 58 deletions Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,64 +53,13 @@
"directions": 4
},
{
"name": "plasma",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "plasma_2",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "plasma_3",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
"name": "plasma"
},
{
"name": "plasma_2"
},
{
"name": "plasma_3"
},
{
"name": "plasma-inhand-left",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Materials/ingots.rsi/gold.png
Binary file modified Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png
Binary file modified Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png
Binary file modified Resources/Textures/Objects/Materials/ingots.rsi/silver.png
Binary file modified Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png
Binary file modified Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/cloth.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/diamond.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/wood.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/wood_2.png
Binary file modified Resources/Textures/Objects/Materials/materials.rsi/wood_3.png
Binary file modified Resources/Textures/Objects/Materials/parts.rsi/rods.png
Binary file modified Resources/Textures/Objects/Materials/parts.rsi/rods_2.png
Binary file modified Resources/Textures/Objects/Materials/parts.rsi/rods_3.png
Binary file modified Resources/Textures/Objects/Materials/parts.rsi/rods_4.png
Binary file modified Resources/Textures/Objects/Materials/parts.rsi/rods_5.png
Binary file modified Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png
Diff not rendered.
2 changes: 1 addition & 1 deletion Resources/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
defaultWindowTitle: Space Station 14 - Corvax Station [RU]
defaultWindowTitle: Silver Station FM
windowIconSet: /Textures/Logo/icon-ru # Corvax-Theme
splashLogo: /Textures/Logo/logo-ru.png # Corvax-Theme

Expand Down
Loading