Merge branch 'master' into RemoveFrontier

AdventureTimeSS14 · Dec 22, 2024 · c445752 · c445752
2 parents 28810f8 + 2b6fe4a
commit c445752
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 10 deletions.
diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml
@@ -4907,3 +4907,10 @@ Entries:
         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/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:
@@ -72,9 +72,31 @@
 - type: entity
   name: New Year gurney
   id: ADTNewYearKatalka
-  parent: ChairBase
+  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/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
@@ -110,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
@@ -140,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
@@ -170,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
@@ -200,7 +272,33 @@
     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

diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
@@ -6,8 +6,15 @@
     edges:
     - to: ADTCompGlassDager
       steps:
-      - material: Cloth
+      - 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
@@ -20,8 +27,15 @@
     edges:
     - to: ADTCompGlassRefDager
       steps:
-      - material: Cloth
+      - 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
@@ -34,8 +48,15 @@
     edges:
     - to: ADTCompUranDager
       steps:
-      - material: Cloth
+      - 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
@@ -48,8 +69,15 @@
     edges:
     - to: ADTCompPlasmaDager
       steps:
-      - material: Cloth
+      - 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