diff --git a/Content.Server/ADT/Abilities/XenoQeen/XenoQeenComponent.cs b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenComponent.cs
new file mode 100644
index 00000000000..1e4b46a9c18
--- /dev/null
+++ b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Abilities.XenoQeen
+{
+ ///
+ /// Lets its owner entity use mime powers, like placing invisible walls.
+ ///
+ [RegisterComponent]
+ public sealed partial class XenoQeenComponent : Component
+ {
+ ///
+ /// Whether this component is active or not.
+ ///
+ [DataField("enabled")]
+ public bool Enabled = true;
+
+ ///
+ /// The wall prototype to use.
+ ///
+ [DataField("wallPrototype", customTypeSerializer: typeof(PrototypeIdSerializer))]
+ public string XenoTurret = "WeaponTurretXeno";
+
+ [DataField("xenoTurretAction", customTypeSerializer: typeof(PrototypeIdSerializer))]
+ public string? XenoTurretAction = "ActionXenoQeenTurret";
+
+ [DataField("xenoTurretActionEntity")] public EntityUid? XenoTurretActionEntity;
+ }
+}
diff --git a/Content.Server/ADT/Abilities/XenoQeen/XenoQeenSystem.cs b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenSystem.cs
new file mode 100644
index 00000000000..fb4f41abde3
--- /dev/null
+++ b/Content.Server/ADT/Abilities/XenoQeen/XenoQeenSystem.cs
@@ -0,0 +1,66 @@
+using Content.Server.Popups;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Maps;
+using Content.Shared.Physics;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+
+namespace Content.Server.Abilities.XenoQeen
+{
+ public sealed class XenoQeenSystem : EntitySystem
+ {
+ [Dependency] private readonly PopupSystem _popupSystem = default!;
+ [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+ [Dependency] private readonly TurfSystem _turf = default!;
+ [Dependency] private readonly IMapManager _mapMan = default!;
+ [Dependency] private readonly SharedContainerSystem _container = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnComponentInit);
+ SubscribeLocalEvent(OnCreateTurret);
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+ }
+ private void OnComponentInit(EntityUid uid, XenoQeenComponent component, ComponentInit args)
+ {
+ _actionsSystem.AddAction(uid, ref component.XenoTurretActionEntity, component.XenoTurretAction, uid);
+ }
+ private void OnCreateTurret(EntityUid uid, XenoQeenComponent component, InvisibleWallActionEvent args)
+ {
+ if (!component.Enabled)
+ return;
+
+ if (_container.IsEntityOrParentInContainer(uid))
+ return;
+
+ var xform = Transform(uid);
+ // Get the tile in front of the Qeen
+ var offsetValue = xform.LocalRotation.ToWorldVec();
+ var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
+ var tile = coords.GetTileRef(EntityManager, _mapMan);
+ if (tile == null)
+ return;
+
+ // Check if the tile is blocked by a wall or mob, and don't create the wall if so
+ if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
+ {
+ _popupSystem.PopupEntity(Loc.GetString("create-turret-failed"), uid, uid);
+ return;
+ }
+
+ _popupSystem.PopupEntity(Loc.GetString("create-turret"), uid);
+ // Make sure we set the invisible wall to despawn properly
+ Spawn(component.XenoTurret, _turf.GetTileCenter(tile.Value));
+ // Handle args so cooldown works
+ args.Handled = true;
+ }
+
+ }
+}
diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml
index 6b43b3267ce..e861591d1e3 100644
--- a/Resources/Changelog/1ChangelogADT.yml
+++ b/Resources/Changelog/1ChangelogADT.yml
@@ -4887,3 +4887,30 @@ Entries:
оперативников, type: Tweak}
time: '2024-12-18T14:30:01Z'
id: 608
+ - author: Шрёдька
+ changes:
+ - {message: Добавлена возможность взять нифму дионы в руки или надеть её в слот
+ для головного убора., type: Add}
+ time: '2024-12-19T21:39:25Z'
+ id: 609
+ - author: Sh4zik
+ changes:
+ - {message: Был добавлен снежок, type: Add}
+ - {message: 'Был добавлен огромный ящик, заполненным снегом', type: Add}
+ - {message: 'Были добавлены превосходные, зимние сани', type: Add}
+ - {message: 'Был добавлен ????? из слаймолюдов.', type: Add}
+ - {message: Было добавлено новогоднее настроение!, type: Add}
+ - {message: Была добавлены различные вариации кинжалов, type: Add}
+ - {message: Была добавлена возможность скрафтить новые виды вооружения - кинжалы,
+ type: Add}
+ - {message: 'Были починены крафты закалённых копей и заточек, а также их урон',
+ type: Fix}
+ time: '2024-12-20T14:30:35Z'
+ id: 610
+ - author: NameLunar
+ changes:
+ - {message: Ксеноморфы эволюционировали и стали намного опасней. В особенности
+ Королева!, type: Fix}
+ - {message: Добавлены некоторые способности для королевы ксеноморфов., type: Add}
+ time: '2024-12-21T13:42:16Z'
+ id: 611
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Actions/XenoQeen.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Actions/XenoQeen.ftl
new file mode 100644
index 00000000000..9a3337faeba
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Actions/XenoQeen.ftl
@@ -0,0 +1,14 @@
+ent-ActionXenoQeenTurret = Создать ксено турель.
+ .desc = Создаёт перед вами ксену турель, если хватает места.
+create-turret-failed = Найдите другое место.
+create-turret = Арргхсс. Шшшшш!
+ent-ActionSpawnMobXenoSpitter = Призвать Плевальщик
+ .desc = Родите Плевальщика, который будет плеваться!
+ent-ActionSpawnMobXenoPraetorian = Призвать Преторианеца
+ .desc = Родите Преторианеца, который будет сражаться за вас!
+ent-ActionSpawnMobXenoDrone = Просто Дрон. Кому он нужен?
+ .desc = Родите рабочего, Дрон.
+ent-ActionSpawnMobXenoRavager = Призвать Разрушителя
+ .desc = Родите смерть во плоти!
+ent-ActionSpawnMobXenoRunner = Призвать Бегуна
+ .desc = Родите самую быструю личинку!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl
new file mode 100644
index 00000000000..b1d21ec4c1f
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl
@@ -0,0 +1,5 @@
+ent-ADTShardGlassReinforcedPlasma = осколок закалённого плазменного стекла
+ .desc = Небольшой осколок плазменного стекла.
+
+ent-ADTShardGlassReinforcedUran = осколок закалённого уранового стекла
+ .desc = Небольшой осколок уранового стекла.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl
index 087f0d3319f..29d324396ff 100644
--- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl
@@ -44,3 +44,19 @@ ent-SpearReinforcedPlasma = копьё из закалённой плазмы
ent-ADTReinforcedPlasmaShiv = заточка из закалённой плазмы
.desc = Заточка, созданная из осколка закалённой плазмы, имеющий тканевую основу, для более удобной нарезки ваших оппонентов.
+
+ent-ADTGlassDagger = стеклянный кинжал
+ .desc = Стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTPlasmaDagger = плазменный кинжал
+ .desc = Плазменный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTGlassReinDagger = кинжал из закалённого стекла
+ .desc = Закалённый, стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTGlassUranDagger = урановый кинжал
+ .desc = Урановый самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие.
+
+ent-ADTWoodenSword = деревянный меч
+ .desc = Настоящий робаст нуждается в ежедневных тренировках.
+ .suffix = { "Тренировочное" }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl
index fab527195dc..828f6dd8e6d 100644
--- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl
@@ -32,3 +32,20 @@ ent-ADTHalloweenCarvedPumpkinCube = { ent-ADTHalloweenCarvedPumpkinSmile }
ent-ADTHalloweenCarvedPumpkinWily = { ent-ADTHalloweenCarvedPumpkinSmile }
.suffix = { ent-ADTHalloweenCarvedPumpkinSmile.suffix }
.desc = { ent-ADTHalloweenCarvedPumpkinSmile.desc }
+
+
+ent-ADTSnowballsCrate = телега со снегом
+ .suffix = New Year
+ .desc = Ради неё вовсе не разрушают чьи-то планеты... Вовсе нет.
+
+ent-ADTNewYearKatalka = зимние сани
+ .suffix = New Year
+ .desc = Такси бизнес-класса, потому что упряжка не рассчитана под стадо оленей.
+
+ent-ADTSnowball = снежок
+ .suffix = New Year
+ .desc = Снаряд опаснее всякой пули... БЕРЕГИСЬ!
+
+ent-ADTSlimeHappines = экстракт счастья
+ .suffix = New Year
+ .desc = Концентрация искреннего счастья слаймолюдов, полученная абсолютно гуманным путём
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
index d6fbec371b1..f1912d62683 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl
@@ -1,19 +1,19 @@
ent-MobXeno = Бурильщик
.desc = Обычно они приходят ночью. Обычно.
ent-MobXenoPraetorian = Преторианец
- .desc = { ent-MobXeno.desc }
+ .desc = Преторианец. Личная гвардия королевы, задача которого - защитить королеву. Стойкий воин ксено с хорошим уроном.
ent-MobXenoDrone = Дрон
- .desc = { ent-MobXeno.desc }
+ .desc = Дрон. Рядовой представитель ксеносов, задача которых - защищать улей и иногда охотиться. Не обладают выдающимися характеристиками. Самый типичный ксено.
ent-MobXenoQueen = Королева
- .desc = { ent-MobXeno.desc }
+ .desc = Королева. Предводительница стаи, невероятно сильная и живучая, если она оказалась перед вами - считайте, что вы мертвы.
ent-MobXenoRavager = Разрушитель
- .desc = { ent-MobXeno.desc }
+ .desc = Разрушитель. Самый сильный и живучий ксенос, после королевы.
ent-MobXenoRunner = Бегун
- .desc = { ent-MobXeno.desc }
+ .desc = Бегун. Обладает малым уроном, но отличается большой скоростью, так что быстро бегает и бьёт.
ent-MobXenoRouny = Руни
.desc = { ent-MobXenoRunner.desc }
ent-MobXenoSpitter = Плевальщик
- .desc = { ent-MobXeno.desc }
+ .desc = Плевальщик. Рядовой представитель ксеносов, который плюётся едкой кислотой, прожигающую даже броню. Однако слаб в ближнем бою.
ent-MobPurpleSnake = космическая гадюка
.desc = Грозная пурпурная змея с Kepler-283c.
ent-MobSmallPurpleSnake = космическая гадюка
diff --git a/Resources/Prototypes/ADT/Actions/XenoQeen.yml b/Resources/Prototypes/ADT/Actions/XenoQeen.yml
new file mode 100644
index 00000000000..2c853b949ad
--- /dev/null
+++ b/Resources/Prototypes/ADT/Actions/XenoQeen.yml
@@ -0,0 +1,109 @@
+# Спавн турелей у королевы
+- type: entity
+ id: ActionXenoQeenTurret
+ name: Create Xeno turret
+ description: Create an xeno turret in front of you, if placeable there.
+ components:
+ - type: InstantAction
+ priority: -1
+ useDelay: 180
+ icon:
+ sprite: Objects/Weapons/Guns/Turrets/xenoturret.rsi
+ state: icon
+ event: !type:InvisibleWallActionEvent
+# Я не смог сделать отдельный ивент для спавнта турели. Он не видел прототип ивента.
+
+- type: entity
+ id: ActionSpawnMobXenoSpitter
+ name: Spawn Spitter
+ description: Give birth to Spitter who will spit!
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: WorldTargetAction
+ useDelay: 240
+ range: 4
+ itemIconStyle: BigAction
+ icon:
+ sprite: Mobs/Aliens/Xenos/spitter.rsi
+ state: crit
+ event: !type:WorldSpawnSpellEvent
+ prototypes:
+ - id: MobXenoSpitter
+ amount: 1
+ offset: 0, 1
+
+- type: entity
+ id: ActionSpawnMobXenoPraetorian
+ name: Spawn Praetorian
+ description: Give birth to a Praetorian who will fight for you!
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: WorldTargetAction
+ useDelay: 300
+ range: 4
+ itemIconStyle: BigAction
+ icon:
+ sprite: Mobs/Aliens/Xenos/praetorian.rsi
+ state: crit
+ event: !type:WorldSpawnSpellEvent
+ prototypes:
+ - id: MobXenoPraetorian
+ amount: 1
+ offset: 0, 1
+
+- type: entity
+ id: ActionSpawnMobXenoDrone
+ name: Just a Drone. Who needs it?
+ description: Give birth to a worker, Drone.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: WorldTargetAction
+ useDelay: 80
+ range: 4
+ itemIconStyle: BigAction
+ icon:
+ sprite: Mobs/Aliens/Xenos/drone.rsi
+ state: crit
+ event: !type:WorldSpawnSpellEvent
+ prototypes:
+ - id: MobXenoDrone
+ amount: 1
+ offset: 0, 1
+
+- type: entity
+ id: ActionSpawnMobXenoRavager
+ name: Spawn Ravager
+ description: Give birth to death in the flesh!
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: WorldTargetAction
+ useDelay: 480
+ range: 4
+ itemIconStyle: BigAction
+ icon:
+ sprite: Mobs/Aliens/Xenos/ravager.rsi
+ state: crit
+ event: !type:WorldSpawnSpellEvent
+ prototypes:
+ - id: MobXenoRavager
+ amount: 1
+ offset: 0, 1
+
+- type: entity
+ id: ActionSpawnMobXenoRunner
+ name: Spawn Runner
+ description: Give birth to the fastest larva!
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: WorldTargetAction
+ useDelay: 120
+ range: 4
+ itemIconStyle: BigAction
+ icon:
+ sprite: Mobs/Aliens/Xenos/runner.rsi
+ state: crit
+ event: !type:WorldSpawnSpellEvent
+ prototypes:
+ - id: MobXenoRunner
+ amount: 1
+ offset: 0, 1
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
index 8e279c8bea9..5e7d11f74fe 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
@@ -2,7 +2,7 @@
- type: entity
parent: [BaseBallBat, ClothingHandsBase]
id: ADTHalloweenBroom
- name: witch broom
+ name: witch broom
description: time to fly
suffix: Halloween
components:
@@ -18,3 +18,85 @@
#- type: ClothingSpeedModifier
# walkModifier: 0.9
# sprintModifier: 1.2
+
+#New Year
+
+- type: entity
+ parent: BaseItem
+ id: ADTSnowball
+ name: Snowball
+ description: yeayea. Snow? Balls! I love balls!!
+ suffix: New Year
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Fun/snowball.rsi
+ state: snowball
+ - type: Damageable
+ damageContainer: Inorganic
+ damageModifierSet: Glass
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 5
+ behaviors:
+ - !type:PlaySoundBehavior
+ sound:
+ collection: FootstepSnow
+ params:
+ variation: 0.125
+ volume: 6
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - type: DamageOnLand
+ ignoreResistances: true
+ damage:
+ types:
+ Blunt: 5
+ - type: StaminaDamageOnCollide
+ damage: 5
+
+
+- type: entity
+ name: Slime Happines
+ parent: BaseItem
+ id: ADTSlimeHappines
+ description: Slimyy..
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Misc/slimehappines.rsi
+ state: icon
+
+
+
+- type: entity
+ name: New Year gurney
+ id: ADTNewYearKatalka
+ parent: BaseStructure
+ description: Yea.
+ placement:
+ mode: PlaceFree
+ components:
+ - type: Sprite
+ sprite: ADT/Structures/Specific/newyearkatalki.rsi
+ state: newyearkatalka
+ - type: Anchorable
+ - type: Rotatable
+ - type: Physics # ADT CHANGE START sleep
+ bodyType: Static
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ density: 10
+ mask:
+ - TableMask
+ - type: HealOnBuckle
+ damage:
+ types:
+ Poison: -0.1
+ Blunt: -0.1
+ - type: Strap
+ position: Down
+ rotation: 0 # ADT CHANGE END sleep
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml
@@ -0,0 +1 @@
+
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml
@@ -0,0 +1 @@
+
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml
index c25945c8734..855fe33fed7 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml
@@ -44,7 +44,7 @@
- type: HeldSpeedModifier
- type: Construction
graph: ADTShield
- node: start
+ node: ADTCompShield
- type: Destructible
thresholds:
- trigger:
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml
index b907baf3069..284356bd79a 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml
@@ -15,7 +15,7 @@
sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi
- type: Construction
graph: ADTPShiv
- node: start
+ node: ADTCompPlasmaShiv
- type: entity
name: reinforced uranium shiv
@@ -35,4 +35,4 @@
sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi
- type: Construction
graph: ADTUShiv
- node: start
+ node: ADTCompUraniumShiv
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml
index 86cf8957c9a..470020ae64c 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml
@@ -10,14 +10,14 @@
wideAnimationRotation: -135
damage:
types:
- Piercing: 15
+ Piercing: 25
- type: DamageOtherOnHit
damage:
types:
- Piercing: 18
+ Piercing: 28
- type: Construction
- graph: ADTPSpear
- node: start
+ graph: ADTPSpear
+ node: ADTCompPlasmaSpear
- type: entity
name: reinforced uranium spear
@@ -31,7 +31,7 @@
wideAnimationRotation: -135
damage:
types:
- Piercing: 18
+ Piercing: 12
Radiation: 9
- type: DamageOtherOnHit
damage:
@@ -40,4 +40,4 @@
Radiation: 9
- type: Construction
graph: ADTUraniumSpear
- node: start
+ node: ADTCompUraniumSpear
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
index d5f78576d5d..0ff1bec9869 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
@@ -88,6 +88,9 @@
id: ADTPlasmaDagger
description: Dogor
components:
+ - type: Construction
+ graph: ADTPDagger
+ node: ADTCompPlasmaDager
- type: Tag
tags:
- Knife
@@ -107,7 +110,31 @@
attackRate: 1.75
damage:
types:
- Slash: 6.3
+ Piercing: 8
+ - type: SolutionContainerManager
+ solutions:
+ melee:
+ maxVol: 1
+ - type: MeleeChemicalInjector
+ solution: melee
+ - type: RefillableSolution
+ solution: melee
+ - type: InjectableSolution
+ solution: melee
+ - type: SolutionInjectOnEmbed
+ transferAmount: 1
+ solution: melee
+ - type: SolutionTransfer
+ maxTransferAmount: 1
+ - type: DamageOtherOnHit
+ damage:
+ types:
+ Piercing: 15
+ - type: EmbeddableProjectile
+ offset: -0.15,0.0
+ - type: ThrowingAngle
+ angle: 225
+ - type: LandAtCursor
- type: entity
name: dagger reinforced
@@ -115,6 +142,9 @@
id: ADTGlassReinDagger
description: Dogor
components:
+ - type: Construction
+ graph: ADTGRDagger
+ node: ADTCompGlassRefDager
- type: Tag
tags:
- Knife
@@ -134,7 +164,31 @@
attackRate: 1.75
damage:
types:
- Slash: 6
+ Piercing: 7
+ - type: SolutionContainerManager
+ solutions:
+ melee:
+ maxVol: 1
+ - type: MeleeChemicalInjector
+ solution: melee
+ - type: RefillableSolution
+ solution: melee
+ - type: InjectableSolution
+ solution: melee
+ - type: SolutionInjectOnEmbed
+ transferAmount: 1
+ solution: melee
+ - type: SolutionTransfer
+ maxTransferAmount: 1
+ - type: DamageOtherOnHit
+ damage:
+ types:
+ Piercing: 12
+ - type: EmbeddableProjectile
+ offset: -0.15,0.0
+ - type: ThrowingAngle
+ angle: 225
+ - type: LandAtCursor
- type: entity
name: dagger glass
@@ -142,6 +196,9 @@
id: ADTGlassDagger
description: Dogor
components:
+ - type: Construction
+ graph: ADTGDagger
+ node: ADTCompGlassDager
- type: Tag
tags:
- Knife
@@ -161,7 +218,31 @@
attackRate: 1.75
damage:
types:
- Slash: 5
+ Piercing: 6
+ - type: SolutionContainerManager
+ solutions:
+ melee:
+ maxVol: 1
+ - type: MeleeChemicalInjector
+ solution: melee
+ - type: RefillableSolution
+ solution: melee
+ - type: InjectableSolution
+ solution: melee
+ - type: SolutionInjectOnEmbed
+ transferAmount: 1
+ solution: melee
+ - type: SolutionTransfer
+ maxTransferAmount: 1
+ - type: DamageOtherOnHit
+ damage:
+ types:
+ Piercing: 10
+ - type: EmbeddableProjectile
+ offset: -0.15,0.0
+ - type: ThrowingAngle
+ angle: 225
+ - type: LandAtCursor
- type: entity
name: dagger uranium
@@ -169,6 +250,9 @@
id: ADTGlassUranDagger
description: Dogor
components:
+ - type: Construction
+ graph: ADTUDagger
+ node: ADTCompUranDager
- type: Tag
tags:
- Knife
@@ -188,6 +272,60 @@
attackRate: 1.75
damage:
types:
- Slash: 9
+ Piercing: 5
+ Radiation: 5
+ - type: SolutionContainerManager
+ solutions:
+ melee:
+ maxVol: 1
+ - type: MeleeChemicalInjector
+ solution: melee
+ - type: RefillableSolution
+ solution: melee
+ - type: InjectableSolution
+ solution: melee
+ - type: SolutionInjectOnEmbed
+ transferAmount: 1
+ solution: melee
+ - type: SolutionTransfer
+ maxTransferAmount: 1
+ - type: DamageOtherOnHit
+ damage:
+ types:
+ Piercing: 9
+ Radiation: 9
+ - type: EmbeddableProjectile
+ offset: -0.15,0.0
+ - type: ThrowingAngle
+ angle: 225
+ - type: LandAtCursor
+
+- type: entity
+ name: wooden sword
+ parent: BaseItem
+ id: ADTWoodenSword
+ description: A true robust need training everyday.
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Weapons/Melee/wooden_sword.rsi
+ state: icon
+ - type: MeleeWeapon
+ attackRate: 1.2
+ angle: 75
+ damage:
+ types:
+ Blunt: 0.5
+ soundHit:
+ collection: BoxingHit
+ - type: StaminaDamageOnHit
+ damage: 12
+ #- type: Wieldable
+ - type: IncreaseDamageOnWield
+ damage:
+ types:
+ Blunt: 1
+ - type: Item
+ size: Huge
+ - type: DisarmMalus
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml
new file mode 100644
index 00000000000..11cf63d02ab
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml
@@ -0,0 +1,517 @@
+- type: entity
+ name: Snowballs crate
+ parent: BaseStructure
+ id: ADTSnowballsCrate
+ description: Mmm.. Crate full of BALLS!!!
+ suffix: New Year
+ components:
+ - type: Sprite
+ sprite: ADT/Objects/Specific/snowdispenser.rsi
+ state: icon
+ - type: Appearance
+ - type: ContainerContainer
+ containers:
+ bin-container: !type:Container
+ - type: Bin
+ maxItems: 500
+ initialContents:
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
+ - ADTSnowball
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
new file mode 100644
index 00000000000..04e9d3039ff
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
@@ -0,0 +1,83 @@
+- type: constructionGraph
+ id: ADTGDagger
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: ADTCompGlassDager
+ steps:
+ - material: MetalRod
+ amount: 1
+ - material: Cable
+ amount: 1
+ - tag: GlassShard
+ name: glass shard
+ icon:
+ sprite: Objects/Materials/Shards/shard.rsi
+ state: shard1
+ doAfter: 1
+ - node: ADTCompGlassDager
+ entity: ADTGlassDagger
+
+- type: constructionGraph
+ id: ADTGRDagger
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: ADTCompGlassRefDager
+ steps:
+ - material: MetalRod
+ amount: 1
+ - material: Cable
+ amount: 1
+ - tag: ReinforcedGlassShard
+ name: reinforced glass shard
+ icon:
+ sprite: Objects/Materials/Shards/shard.rsi
+ state: shard1
+ doAfter: 1
+ - node: ADTCompGlassRefDager
+ entity: ADTGlassReinDagger
+
+- type: constructionGraph
+ id: ADTUDagger
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: ADTCompUranDager
+ steps:
+ - material: MetalRod
+ amount: 1
+ - material: Cable
+ amount: 1
+ - tag: UraniumGlassShard
+ name: uranium glass shard
+ icon:
+ sprite: Objects/Materials/Shards/shard.rsi
+ state: shard1
+ doAfter: 1
+ - node: ADTCompUranDager
+ entity: ADTGlassUranDagger
+
+- type: constructionGraph
+ id: ADTPDagger
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: ADTCompPlasmaDager
+ steps:
+ - material: MetalRod
+ amount: 1
+ - material: Cable
+ amount: 1
+ - tag: PlasmaGlassShard
+ name: plasma glass shard
+ icon:
+ sprite: Objects/Materials/Shards/shard.rsi
+ state: shard1
+ doAfter: 1
+ - node: ADTCompPlasmaDager
+ entity: ADTPlasmaDagger
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml
index 20e5715883a..a366b76ee4a 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml
@@ -2,16 +2,18 @@
id: ADTShield
start: start
graph:
- - node: start
- edges:
- - to: ADTCompShield
- steps:
- - material: Steel
- amount: 20
- - material: ReinforcedGlass
- amount: 10
- - material: Cable
- amount: 2
- doAfter: 5
- - node: ADTCompShield
- entity: ADTFullRiotShield
+ - node: start
+ edges:
+ - to: ADTCompShield
+ steps:
+ - material: Steel
+ amount: 20
+ doAfter: 5
+ - material: ReinforcedGlass
+ amount: 10
+ doAfter: 5
+ - material: Cable
+ amount: 2
+ doAfter: 5
+ - node: ADTCompShield
+ entity: ADTFullRiotShield
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml
index 47f1153f3f2..49f25878c41 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml
@@ -7,7 +7,7 @@
- to: ADTCompPlasmaShiv
steps:
- tag: ADTRPlasmaShard
- name: "Осколок плазменного стекла"
+ name: "Осколок закалённого плазменного стекла"
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
@@ -27,7 +27,7 @@
- to: ADTCompUraniumShiv
steps:
- tag: ADTRUranShard
- name: "Осколок уранового стекла"
+ name: "Осколок закалённого уранового стекла"
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml
index 68fa4861e7c..1c9057cfd72 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml
@@ -13,7 +13,7 @@
amount: 3
doAfter: 1
- tag: ADTRPlasmaShard
- name: "Осколок плазменного стекла"
+ name: "Осколок закалённого плазменного стекла"
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
@@ -36,7 +36,7 @@
amount: 3
doAfter: 1
- tag: ADTRUranShard
- name: "Осколок уранового стекла"
+ name: "Осколок закалённого уранового стекла"
icon:
sprite: Objects/Materials/Shards/shard.rsi
state: shard1
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml
index 8221f94dfda..01797e4f6fc 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml
@@ -62,3 +62,55 @@
icon:
sprite: ADT/Objects/Weapons/Melee/Rplasma_spear.rsi
state: spear
+
+- type: construction
+ name: glass dagger
+ id: ADTDaggerGlass
+ graph: ADTGDagger
+ startNode: start
+ targetNode: ADTCompGlassDager
+ category: construction-category-weapons
+ objectType: Item
+ description: Dagger to cut your enemies.
+ icon:
+ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi
+ state: icon
+
+- type: construction
+ name: reinforced glass dagger
+ id: ADTDaggerRefGlass
+ graph: ADTGRDagger
+ startNode: start
+ targetNode: ADTCompGlassRefDager
+ category: construction-category-weapons
+ objectType: Item
+ description: Dagger to cut your enemies.
+ icon:
+ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi
+ state: icon
+
+- type: construction
+ name: plasma dagger
+ id: ADTDaggerPlasma
+ graph: ADTPDagger
+ startNode: start
+ targetNode: ADTCompPlasmaDager
+ category: construction-category-weapons
+ objectType: Item
+ description: Dagger to cut your enemies.
+ icon:
+ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi
+ state: icon
+
+- type: construction
+ name: uranium dagger
+ id: ADTDaggerUranium
+ graph: ADTUDagger
+ startNode: start
+ targetNode: ADTCompUranDager
+ category: construction-category-weapons
+ objectType: Item
+ description: Dagger to cut your enemies.
+ icon:
+ sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi
+ state: icon
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 5a1cab1b9e9..0b9b676ad1f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -3496,6 +3496,19 @@
reformTime: 10
popupText: diona-reform-attempt
reformPrototype: MobDionaReformed
+ # ADT Start Tweak Nimf
+ - type: Clothing
+ quickEquip: false
+ sprite: Mobs/Animals/nymph.rsi
+ equippedPrefix: nimf
+ slots:
+ - HEAD
+ - type: Appearance
+ - type: Item
+ size: Normal
+ sprite: Mobs/Animals/nymph.rsi
+ heldPrefix: nimf
+ # ADT End Tweak Nimf
- type: entity
parent: MobDionaNymph
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index a71adfc57cf..eacda126d91 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -146,12 +146,18 @@
- type: MobThresholds
thresholds:
0: Alive
- 100: Dead
+ 350: Dead # ADT Tweak
- type: Stamina
critThreshold: 300
- type: SlowOnDamage
speedModifierThresholds:
50: 0.7
+ #ADT Start: Xeno baff
+ - type: MeleeWeapon
+ damage:
+ groups:
+ Brute: 8
+ # ADT End
- type: Fixtures
fixtures:
fix1:
@@ -183,14 +189,14 @@
- type: MobThresholds
thresholds:
0: Alive
- 80: Dead
+ 100: Dead # ADT Tweak
- type: SlowOnDamage
speedModifierThresholds:
40: 0.7
- type: MeleeWeapon
damage:
groups:
- Brute: 6
+ Brute: 5 # ADT Tweak
- type: MovementSpeedModifier
baseSprintSpeed: 4
- type: Fixtures
@@ -214,6 +220,16 @@
parent: MobXeno
id: MobXenoQueen
components:
+ # ADT Start: Xeno buff
+ - type: XenoQeen # ADT Tweak: Способность спавнта турелей
+ - type: ActionGrant
+ actions:
+ - ActionSpawnMobXenoSpitter # Призыв Плевальщиков
+ - ActionSpawnMobXenoPraetorian # Призыв Преторианеца
+ - ActionSpawnMobXenoDrone # Призыв Дрона
+ - ActionSpawnMobXenoRavager # Призыв Разрушителя
+ - ActionSpawnMobXenoRunner # Призыв бегуна
+ #ADT End
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/Xenos/queen.rsi
@@ -224,7 +240,7 @@
- type: MobThresholds
thresholds:
0: Alive
- 300: Dead
+ 1000: Dead # ADT Tweak
- type: SlowOnDamage
speedModifierThresholds:
150: 0.7
@@ -232,7 +248,7 @@
- type: MeleeWeapon
damage:
groups:
- Brute: 12
+ Brute: 20 # ADT Tweak
- type: Fixtures
fixtures:
fix1:
@@ -252,7 +268,6 @@
rankName: collective-mind-queen-rank
# ADT-CollectiveMind-Tweak-End
-
- type: entity
name: ravager
parent: MobXeno
@@ -268,13 +283,13 @@
- type: MobThresholds
thresholds:
0: Alive
- 100: Dead
+ 750: Dead # ADT Tweak
- type: MovementSpeedModifier
- baseSprintSpeed: 4
+ baseSprintSpeed: 2 # ADT Tweak
- type: MeleeWeapon
damage:
groups:
- Brute: 10
+ Brute: 30 # ADT Tweak
- type: SlowOnDamage
speedModifierThresholds:
50: 0.7
@@ -306,8 +321,14 @@
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: running
+ # ADT Start: Xeno buff
+ - type: MobThresholds
+ thresholds:
+ 0: Alive
+ 100: Dead
+ # ADT End
- type: MovementSpeedModifier
- baseSprintSpeed: 6.0
+ baseSprintSpeed: 12.0 # ADT Tweak
- type: MeleeWeapon
damage:
groups:
@@ -362,7 +383,7 @@
- type: MobThresholds
thresholds:
0: Alive
- 50: Dead
+ 80: Dead # ADT Tweak
- type: SlowOnDamage
speedModifierThresholds:
25: 0.7
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index f4043820d0c..247d3dcb314 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -805,7 +805,7 @@
- type: Projectile
damage:
types:
- Caustic: 5
+ Caustic: 12 # ADT Tweak
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi
layers:
diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json
new file mode 100644
index 00000000000..76dfb6cb316
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by Pangaari, Discord - @pangaari",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "snowball"
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png
new file mode 100644
index 00000000000..de0566e0e3a
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png
new file mode 100644
index 00000000000..043a4fdabc5
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json
new file mode 100644
index 00000000000..d5603034a8b
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by Pangaari, Discord - @pangaari",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png
new file mode 100644
index 00000000000..f5b3a28ed51
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json
new file mode 100644
index 00000000000..a6d71cb4b1d
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by Pangaari, Discord - @pangaari",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ }
+ ]
+ }
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png
new file mode 100644
index 00000000000..6fc70d95455
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png
new file mode 100644
index 00000000000..d553d4185cc
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png
new file mode 100644
index 00000000000..e2e1896b22f
Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json
new file mode 100644
index 00000000000..aa1bde388e2
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Created by discord:m1and1b for Adventure Time MRP Server",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json
new file mode 100644
index 00000000000..f096a63f544
--- /dev/null
+++ b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by Pangaari, Discord - @pangaari",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "newyearkatalka",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png
new file mode 100644
index 00000000000..9b0af56d06c
Binary files /dev/null and b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
index c6bb6e0ac4e..2cda83c1bbe 100644
--- a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
@@ -58,6 +58,18 @@
},
{
"name": "icon"
+ },
+ {
+ "name": "nimf-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "nimf-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "nimf-equipped-HELMET",
+ "directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-equipped-HELMET.png
new file mode 100644
index 00000000000..f1040466582
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-equipped-HELMET.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-left.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-left.png
new file mode 100644
index 00000000000..143196ddeb5
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-right.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-right.png
new file mode 100644
index 00000000000..96b4dd0c93a
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nimf-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/icon.png
new file mode 100644
index 00000000000..7eef088dfb6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
index 3adb37ea5c3..071f869db31 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
@@ -7,6 +7,9 @@
"y": 32
},
"states": [
+ {
+ "name": "icon"
+ },
{
"name": "acid_turret",
"directions": 4,