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

РАБОТА ДЛЯ РАЗРАБОТЧИКОВ #99

Merged
merged 4 commits into from
Apr 7, 2024
Merged
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
11 changes: 11 additions & 0 deletions Content.Server/Administration/Systems/AdminNotifySystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
using Robust.Shared.Audio.Systems;
using Content.Server.Administration;
using Content.Server.Administration.Managers;
using Content.Server.Guardian; //A-13 Fix AdminNotifySystem
using Content.Server.GameTicking.Rules.Components; //A-13 Fix AdminNotifySystem
using System.Linq; //A-13 Fix AdminNotifySystem

namespace Content.Server.Administration.Systems;

Expand All @@ -30,6 +33,14 @@ private void OnMobStateChanged(MobStateChangedEvent ev)
if (!TryComp(ev.Target, out ActorComponent? actorComponent))
return;

//A-13 Fix AdminNotifySystem start
if (!HasComp<CanHostGuardianComponent>(ev.Target))
return;

if (EntityQuery<NukeopsRuleComponent>().Any())
return;
//A-13 Fix AdminNotifySystem end

if (actorComponent.PlayerSession.AttachedEntity == null || ev.NewMobState == MobState.Alive)
return;

Expand Down
91 changes: 91 additions & 0 deletions Resources/Prototypes/Andromeda/Lemird Prototype's/wedding.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatWeddingVeill
name: cвадебный венок
description: Красивый венок, созданный для роскошных свадеб.
components:
- type: Sprite
sprite: Andromeda/Clothing/Head/weddingveil.rsi
- type: Clothing
sprite: Andromeda/Clothing/Head/weddingveil.rsi


- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtWeddingDress
name: платье невесты
description: Роскошное платье невесты, она всегда должна выглядеть прекрасно.
components:
- type: Sprite
sprite: Andromeda/Clothing/Uniforms/weddingdress.rsi
- type: Clothing
sprite: Andromeda/Clothing/Uniforms/weddingdress.rsi


- type: entity
parent: ClothingShoesBaseButcherable
id: ClothingShoesWeddingShoes
name: свадебные туфельки
description: Прекрасная обувь, что прекрасно подчёркивает походку невесты.
components:
- type: Sprite
sprite: Andromeda/Clothing/Shoes/weddingshoes.rsi
- type: Clothing
sprite: Andromeda/Clothing/Shoes/weddingshoes.rsi


- type: entity
parent: ClothingUniformBase
id: ClothingUniformWeddingtuxedo
name: свадебный смокинг
description: Не верится, что нужно надеть именно вам, верно?
components:
- type: Sprite
sprite: Andromeda/Clothing/Uniforms/weddingtuxedo.rsi
- type: Clothing
sprite: Andromeda/Clothing/Uniforms/weddingtuxedo.rsi


- type: entity
parent: ClothingShoesBaseButcherable
id: ClothingShoesWeddingGlaceups
name: свадебные туфли
description: На самом деле универсальны, но с костюмом смотрятся лучше.
components:
- type: Sprite
sprite: Andromeda/Clothing/Shoes/weddinglaceups.rsi
- type: Clothing
sprite: Andromeda/Clothing/Shoes/weddinglaceups.rsi


- type: entity
parent: ClothingHandsBase
id: ClothingHandsWeddingRing
name: обручальное кольцо
description: Главное не уронить в важный момент, или потерять палец.
components:
- type: Sprite
sprite: Andromeda/Clothing/Hands/weddingring.rsi
- type: Clothing
sprite: Andromeda/Clothing/Hands/weddingring.rsi
- type: FingerprintMask


- type: entity
parent: BaseItem
id: Bouquet
name: букет
description: Стоит дарить это даме чаще.
components:
- type: Sharp
- type: Sprite
sprite: Andromeda/Objects/Weapons/bouquet.rsi
state: icon
- type: MeleeWeapon
damage:
types:
Slash: 1
- type: Item
size: Small
sprite: Objects/Weapons/Melee/bouquet.rsi
- type: DisarmMalus
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
ClothingMaskPlague: 1
ClothingHeadsetService: 2
ClothingHandsWeddingRing: 2 # A-13
bouquet: 1 # A-13
ClothingHeadHatWeddingVeill: 2 # A-13
ClothingUniformJumpskirtWeddingDress: 2 # A-13
ClothingShoesWeddingShoes: 2 # A-13
ClothingUniformWeddingtuxedo: 2 # A-13
ClothingShoesWeddingGlaceups: 2 # A-13
Bouquet: 1 # A-13
BoxCandle: 2
BoxCandleSmall: 2
Urn: 5
Expand Down
Loading