Ивент Cult of the Lamb

Content.Server/Atmos/EntitySystems/FirestarterSystem.cs

@@ -54,9 +54,13 @@ public void IgniteNearby(EntityUid uid, EntityCoordinates coordinates, float sev
         foreach (var flammable in _flammables)
         {
             var ent = flammable.Owner;
-            var stackAmount = 2 + (int) (severity / 0.15f);
-            _flammable.AdjustFireStacks(ent, stackAmount, flammable);
-            _flammable.Ignite(ent, uid, flammable);
+            if (ent != uid)
+            {
+                var stackAmount = 2 + (int) (severity / 0.15f);
+                _flammable.AdjustFireStacks(ent, stackAmount, flammable);
+                _flammable.Ignite(ent, uid, flammable);
+            }
+
         }
     }
 }

Resources/Changelog/ChangelogADT.yml

@@ -1537,17 +1537,24 @@ Entries:
   - { message: "Добавил книжку с СРП ОЦк.", type: Add}
   - { message: "Изменил снаряжение ОЦК", type: Tweak}
   - { message: "Заменил обычную консоль объявлений на центкомовскую на СЦК.", type: Tweak}
-  id: 55713
+  id: 55713 #костыль отображения в Обновлениях
   time: '2024-03-24T08:20:00.0000000+00:00'
 
 - author: Крыса
   changes:
   - { message: "Удалён скафандр чемпиона.", type: Remove}
-  id: 55714
+  id: 55714 #костыль отображения в Обновлениях
   time: '2024-03-28T08:20:00.0000000+00:00'
 
 - author: Котя
   changes:
   - {message: "Добавлена система коллективного разума для дион, боргов, генокрадов и ксеноморфов.", type: Add}
   id: 55715 #костыль отображения в Обновлениях
   time: '2024-03-25T08:20:00.0000000+00:00'
+
+- author: Шрёдингер
+  changes:
+  - { message: "Cult of the Lamb.", type: Add}
+  - { message: "Починка - type: Firestarter", type: Fix}
+  id: 55716 #костыль отображения в Обновлениях
+  time: '2024-03-29T08:20:00.0000000+00:00'

Resources/Locale/ru-RU/ADT/Objects/Misc/misc.ftl

@@ -25,3 +25,24 @@ ent-ADTBoxValentineWhite = белый конверт для валентинки
 ent-ADTBoxValentineRed = красный конверт для валентинки
     .desc = Конверт из красной бумаги в виде сердечка.
     .suffix = { "День Святого Валентина" }
+
+#START-Event-Cult-of-the-Lamb
+ent-ADTUnlimitedLithing = светильник
+    .desc = ""
+    .suffix = { "Cult of the Lamb, Невидимый источник света" }
+ent-ADTExplosionRuneCult = руна
+    .desc = ""
+    .suffix = { "Cult of the Lamb, Декор Руна" }
+ent-ADTRandomHumanoidSpawnerCluwneCult = Моргорт
+    .desc = ""
+    .suffix = { "Cult of the Lamb, Босс" }
+ent-ADTMobCult = культист
+    .desc = ""
+    .suffix = { "Cult of the Lamb, Костяной нож" }
+ent-ADTMobCult3 = {ent-ADTMobCult}
+    .desc = ""
+    .suffix = { "Cult of the Lamb, Улучшенное Копьё" }
+ent-ADTMobCult2 = {ent-ADTMobCult}
+    .desc = ""
+    .suffix = { "Cult of the Lamb, Копьё" }
+#END-Event-Cult-of-the-Lamb

Resources/Prototypes/ADT/Entities/Mobs/player/humanoid.yml

@@ -54,20 +54,186 @@
   underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
 
-    # - !type:OverallPlaytimeRequirement
-    #   time: 324000 #90 hrs
-    # - !type:DepartmentTimeRequirement
-    #   department: Security
-    #   time: 324000 #90 hrs
-    # - !type:RoleTimeRequirement
-    #   role: JobSecurityOfficer
-    #   time: 21600 #6 hrs 21600
-    # - !type:RoleTimeRequirement
-    #   role: JobWarden
-    #   time: 21600 #6 hrs 21600
-    # - !type:RoleTimeRequirement
-    #   role: JobDetective
-    #   time: 7200 #2 hrs 7200
-    # - !type:DepartmentTimeRequirement
-    #   department: Command
-    #   time: 72000
+#START-Event-Cult-of-the-Lamb
+- type: entity
+  name: Cultist
+  parent: BaseMobHuman
+  id: ADTMobCult
+  suffix: "Cult, BoneKnife, Cult of the Lamb"
+  components:
+  - type: NpcFactionMember
+    factions:
+      - SimpleHostile
+  - type: Loadout
+    prototypes:
+      - ADTMobCult1Gear
+  - type: InputMover
+  - type: MobMover
+  - type: HTN
+    rootTask:
+      task: SimpleHumanoidHostileCompound
+
+- type: startingGear
+  id: ADTMobCult1Gear
+  equipment:
+    mask: ClothingMaskPlague
+    jumpsuit: ADTClothingUniformJumpsuitOldDarkSuit
+    shoes: ClothingShoesBootsWinter
+    head: ClothingHeadHatPlaguedoctor
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesColorBlack
+    outerClothing: ClothingOuterPlagueSuit
+    #id: CentcomPDA
+    #ears: ClothingHeadsetAltCentCom
+    belt: ADTBoneKnife
+    pocket1: Brutepack
+    pocket2: Ointment
+    underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
+    socks: ClothingUnderwearSocksNormal
+  underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
+
+- type: entity
+  name: Cultist1
+  parent: ADTMobCult
+  id: ADTMobCult2
+  suffix: "Cult, Spear, Cult of the Lamb"
+  components:
+  - type: Loadout
+    prototypes:
+      - ADTMobCult2Gear
+
+- type: startingGear
+  id: ADTMobCult2Gear
+  equipment:
+    mask: ClothingMaskPlague
+    jumpsuit: ADTClothingUniformJumpsuitOldDarkSuit
+    shoes: ClothingShoesBootsWinter
+    head: ClothingHeadHatPlaguedoctor
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesColorBlack
+    outerClothing: ClothingOuterPlagueSuit
+    #id: CentcomPDA
+    #ears: ClothingHeadsetAltCentCom
+    #belt: BoxFolderCentComClipboard
+    pocket1: Brutepack
+    pocket2: Ointment
+    underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
+    socks: ClothingUnderwearSocksNormal
+    back: Spear
+  underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
+
+- type: entity
+  name: Cultist2
+  parent: ADTMobCult
+  id: ADTMobCult3
+  suffix: "Cult, Update Spear, Cult of the Lamb"
+  components:
+  - type: Loadout
+    prototypes:
+      - ADTMobCult3Gear
+
+- type: startingGear
+  id: ADTMobCult3Gear
+  equipment:
+    mask: ClothingMaskPlague
+    jumpsuit: ADTClothingUniformJumpsuitOldDarkSuit
+    shoes: ClothingShoesBootsWinter
+    head: ClothingHeadHatPlaguedoctor
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesColorBlack
+    outerClothing: ClothingOuterPlagueSuit
+    #id: CentcomPDA
+    #ears: ClothingHeadsetAltCentCom
+    #belt: BoxFolderCentComClipboard
+    pocket1: Brutepack
+    pocket2: Ointment
+    underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
+    socks: ClothingUnderwearSocksNormal
+    back: SpearReinforced
+  underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
+
+
+- type: entity
+  parent: BaseMobHuman
+  id: ADTRandomHumanoidSpawnerCluwneCult
+  name: Morgort
+  suffix: "Cult of the Lamb"
+  components:
+    - type: Firestarter
+    - type: HealAct
+      healAction: CompActionHealAbomination
+    - type: ProjectileAct
+      projAction: CompActionShoot
+      prototype: BulletKinetic
+    - type: TeleportAct
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: cluwne
+    - type: NpcFactionMember
+      factions:
+        - SimpleHostile
+    - type: Cluwne
+    - type: Damageable
+      damageContainer: Biological
+      damageModifierSet: HellSpawn
+    - type: MovementSpeedModifier
+      baseWalkSpeed: 2
+      baseSprintSpeed: 3
+    - type: MobThresholds
+      thresholds:
+        0: Alive
+        550: Critical
+        600: Dead
+    - type: Destructible #процесс разрушения на органы
+      thresholds:
+      - trigger:
+          !type:DamageTypeTrigger
+          damageType: Blunt #при каком дамаге это происходит
+          damage: 610
+        behaviors:
+        - !type:GibBehavior { }
+    - type: HealthExaminable
+      examinableTypes:
+        - Blunt
+        - Slash
+        - Piercing
+        - Shock
+    - type: Blindable
+    - type: Stamina
+      decay: 1
+      cooldown: 1
+      critThreshold: 4000
+
+- type: entity
+  parent: CollideRune
+  id: ADTExplosionRuneCult
+  name: "explosion rune"
+  suffix: "Cult of the Lamb, NOT explosion, it`s Decoration"
+  components:
+    - type: Sprite
+      sprite: Structures/Magic/Cult/trap.rsi
+      layers:
+        - state: trap
+          color: '#cc1b00'
+
+- type: entity
+  parent: CollideRune
+  id: ADTUnlimitedLithing
+  name: "explosion rune"
+  suffix: "Cult of the Lamb, NOT explosion, it`s Decoration"
+  components:
+    - type: Sprite
+      sprite: ADT/Objects/Misc/empity.rsi
+      layers:
+        - state: icon
+          #color: '#FF00FF'
+          #color: '#cc1b00'
+    - type: PointLight
+      radius: 14
+      energy: 3.5
+      color: "#ff3333"
+      castShadows: false
+#END-Event-Cult-of-the-Lamb

Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/BoneKnife.yml

@@ -22,4 +22,7 @@
   - type: Item
     sprite: ADT/Objects/Weapons/Melee/bone_knife.rsi
   - type: DisarmMalus
-    malus: 0.225
+    malus: 0.225
+  - type: Clothing
+    slots:
+    - Belt

Resources/Textures/ADT/Objects/Misc/empity.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "made by Schrodinger71",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}