Merge branch 'master' into ed-10-06-2025-upstream-sync

2025-06-15 21:44:16 +03:00
parent 5328714752 5046ad1aeb
commit 62cd6bfe9b
230 changed files with 4770 additions and 400 deletions
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -88,6 +88,7 @@
  #- type: WirelessNetworkConnection
  #  range: 500
  #- type: StationLimitedNetwork
+  - type: CP14SkillScanner
  - type: Thieving
    stripTimeReduction: 9999
    stealthy: true
--- a/Resources/Prototypes/_CP14/Alerts/alerts.yml
+++ b/Resources/Prototypes/_CP14/Alerts/alerts.yml
@@ -48,3 +48,11 @@
  name: alerts-hunger-name
  description: alerts-hunger-desc

+- type: alert
+  id: CP14DivineOffer
+  icons:
+  - sprite: /Textures/_CP14/Interface/Alerts/divine_offer.rsi
+    state: offer
+  name: cp14-alert-offer
+  description: cp14-alert-offer-desc
+  clickEvent: !type:CP14BreakDivineOfferEvent
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -47,7 +47,6 @@
      - id: CP14StampDenied
      - id: CP14StampApproved
      - id: CP14ManaOperationGlove
-      - id: AppraisalTool
      - id: CP14PaperFolderRed
        amount: 2
      - id: CP14PaperFolderBlue
--- a/Resources/Prototypes/_CP14/Damage/containers.yml
+++ b/Resources/Prototypes/_CP14/Damage/containers.yml
@@ -16,3 +16,8 @@
  - Toxin
  - Genetic
  - CP14Magic
+
+- type: damageContainer
+  id: CP14Spectral
+  supportedGroups:
+  - CP14Magic
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml
@@ -0,0 +1,73 @@
+- type: entity
+  id: CP14ActionSpellGodLumeraDarkmist
+  name: Impenetrable darkness
+  description: You summon a thick fog that obscures vision and disorients mortals.
+  components:
+  - type: CP14MagicEffectReligionRestricted
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
+  - type: CP14MagicEffect
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectFlashLight
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14LumeraDarkMist
+  - type: WorldTargetAction
+    repeat: true
+    checkCanAccess: false
+    range: 100
+    itemIconStyle: BigAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/Eldritch/voidblink.ogg
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+      state: mist
+    event: !type:CP14WorldTargetActionEvent
+      cooldown: 0.15
+
+- type: entity
+  parent: 
+  - BaseStructure
+  - BaseShadow
+  id: CP14LumeraDarkMist
+  categories: [ HideSpawnMenu ] 
+  components:
+  - type: SyncSprite
+  - type: TimedDespawn
+    lifetime: 60
+  - type: Occluder
+  - type: Sprite
+    drawdepth: Effects
+    sprite: Effects/spookysmoke.rsi
+    layers:
+    - state: spookysmoke
+      color: "#3266a8"
+      map: [base]
+  - type: OptionsVisualizer
+    visuals:
+      base:
+      - options: Default
+        data: { state: spookysmoke }
+      - options: ReducedMotion
+        data: { state: spookysmoke_static }
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        layer:
+          - SlipLayer
+        mask:
+          - ItemMask
+        density: 1000
+        hard: false
+  - type: Tag
+    tags:
+      - HideContextMenu
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml
@@ -0,0 +1,126 @@
+- type: entity
+  id: CP14ActionSpellGodLumeraMindDegrade
+  name: The Wrath of Lumera
+  description: "You unleash your anger on the creature, stunning it, inflicting damage, and burning its mind, removing 0.5 memory points."
+  components:
+  - type: CP14MagicEffectReligionRestricted
+  - type: CP14MagicEffectManaCost
+    manaCost: 300
+  - type: CP14MagicEffect
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14RuneMindDegrade
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:ChemVomit
+      - !type:Jitter
+        time: 16
+      - !type:HealthChange
+        damage:
+          types:
+            Slash: 10
+            Blunt: 10
+            Piercing: 10
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.02
+        sprintSpeedModifier: 0.02
+        statusLifetime: 19
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14LumeraMindDegradeImpact
+    - !type:CP14SpellRemoveMemoryPoint
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:Jitter
+        time: 16
+      - !type:Paralyze
+        paralyzeTime: 16
+      - !type:Drunk
+        boozePower: 20
+      - !type:HealthChange
+        damage:
+          types:
+            Slash: 10
+            Blunt: 10
+            Piercing: 10
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.5
+        sprintSpeedModifier: 0.5
+        statusLifetime: 30
+  - type: EntityTargetAction
+    canTargetSelf: false
+    blacklist:
+      components:
+      - CP14ReligionEntity
+    whitelist:
+      components:
+      - CP14SkillStorage
+    range: 100
+    itemIconStyle: BigAction
+    checkCanAccess: false
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+      state: wrath
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 300
+      castDelay: 16
+      breakOnMove: false
+      breakOnDamage: false
+
+- type: entity
+  id: CP14RuneMindDegrade
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: TimedDespawn
+    lifetime: 16
+  - type: PointLight
+    color: "#ae424d"
+    radius: 5
+    energy: 8
+  - type: LightFade
+    duration: 10
+  - type: Sprite
+    layers:
+    - state: medium_circle
+      scale: 1.5, 1.5
+      color: "#ae424d"
+      shader: unshaded
+  - type: EmitSoundOnSpawn
+    sound:
+      path: /Audio/_CP14/Effects/ritual_begin.ogg
+      params:
+        pitch: 1
+
+- type: entity
+  id: CP14LumeraMindDegradeImpact
+  categories: [ HideSpawnMenu ]
+  parent: CP14BaseMagicImpact
+  save: false
+  components:
+  - type: PointLight
+    color: "#ae424d"
+    enabled: true
+    radius: 15
+    energy: 8
+    netsync: false
+  - type: Sprite
+    layers:
+    - state: stars
+      scale: 2, 2
+      color: "#ae424d"
+      shader: unshaded
+  - type: LightFade
+    duration: 1
+  - type: TimedDespawn
+    lifetime: 3
+  - type: EmitSoundOnSpawn
+    sound:  
+      path: /Audio/Effects/inneranomaly.ogg
+      params:
+        pitch: 1
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml
@@ -0,0 +1,123 @@
+- type: entity
+  id: CP14ActionSpellGodLumeraMindUpgrade
+  name: Expansion of consciousness
+  description: "You expand the boundaries of what is possible for the chosen creature, revealing to it the secrets of the universe. The target gains +0.5 memory points, up to a maximum of 6.5"
+  components:
+  - type: CP14MagicEffectReligionRestricted
+    onlyOnFollowers: true
+  - type: CP14MagicEffectManaCost
+    manaCost: 300
+  - type: CP14MagicEffect
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14RuneMindImprove
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:ChemVomit
+      - !type:Jitter
+        time: 16
+      - !type:HealthChange
+        damage:
+          types:
+            Slash: 10
+            Blunt: 10
+            Piercing: 10
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.02
+        sprintSpeedModifier: 0.02
+        statusLifetime: 19
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14LumeraMindImproveImpact
+    - !type:CP14SpellAddMemoryPoint
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:Jitter
+        time: 16
+      - !type:Paralyze
+        paralyzeTime: 16
+      - !type:Drunk
+        boozePower: 20
+      - !type:HealthChange
+        damage:
+          types:
+            Slash: 10
+            Blunt: 10
+            Piercing: 10
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.5
+        sprintSpeedModifier: 0.5
+        statusLifetime: 30
+  - type: EntityTargetAction
+    canTargetSelf: false
+    blacklist:
+      components:
+      - CP14ReligionEntity
+    whitelist:
+      components:
+      - CP14SkillStorage
+    range: 100
+    itemIconStyle: BigAction
+    checkCanAccess: false
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+      state: mind_upgrade
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 300
+      castDelay: 16
+      breakOnMove: false
+      breakOnDamage: false
+
+- type: entity
+  id: CP14RuneMindImprove
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: TimedDespawn
+    lifetime: 16
+  - type: PointLight
+    color: "#586dcc"
+    radius: 5
+    energy: 8
+  - type: LightFade
+    duration: 10
+  - type: Sprite
+    layers:
+    - state: medium_circle
+      scale: 1.5, 1.5
+      color: "#586dcc"
+      shader: unshaded
+  - type: EmitSoundOnSpawn
+    sound:
+      path: /Audio/_CP14/Effects/ritual_begin.ogg
+
+- type: entity
+  id: CP14LumeraMindImproveImpact
+  categories: [ HideSpawnMenu ]
+  parent: CP14BaseMagicImpact
+  save: false
+  components:
+  - type: PointLight
+    color: "#3843a8"
+    enabled: true
+    radius: 15
+    energy: 8
+    netsync: false
+  - type: Sprite
+    layers:
+    - state: stars
+      scale: 2, 2
+      color: "#9fb0fc"
+      shader: unshaded
+  - type: LightFade
+    duration: 1
+  - type: TimedDespawn
+    lifetime: 3
+  - type: EmitSoundOnSpawn
+    sound:  
+      path: /Audio/_CP14/Effects/ritual_end.ogg
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml
@@ -0,0 +1,71 @@
+- type: entity
+  id: CP14ActionSpellGodLumeraMoonStrike
+  name: Lunar strike
+  description: You focus the concentrated light of the stars into a single point, blinding and damaging everything that comes within reach of the angry goddess.
+  components:
+  - type: CP14MagicEffectReligionRestricted
+  - type: CP14MagicEffectManaCost
+    manaCost: 30
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14SkyLumeraStrike
+  - type: WorldTargetAction
+    repeat: true
+    checkCanAccess: false
+    range: 100
+    itemIconStyle: BigAction
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+      state: moon_beam
+    event: !type:CP14WorldTargetActionEvent
+      cooldown: 0.5
+
+- type: entity
+  id: CP14SkyLumeraStrike
+  categories: [ ForkFiltered ]
+  name: lumera strike
+  save: false
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/lumera_strike.rsi
+    drawdepth: Mobs
+    noRot: true
+    offset: 0,3
+    layers:
+      - state: pewpew
+        shader: unshaded
+  - type: TimedDespawn
+    lifetime: 2
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: PointLight
+    color: "#7ca5d8"
+    enabled: true
+    radius: 10
+    energy: 8
+    netsync: false
+  - type: LightFade
+    duration: 1
+  - type: CP14AreaEntityEffect
+    range: 1
+    effects:
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:Jitter
+      - !type:HealthChange
+        damage:
+          types:
+            Heat: 10
+  - type: TriggerOnSpawn
+  - type: FlashOnTrigger
+    range: 2
+  - type: CP14FarSound
+    closeSound:
+      collection: CP14MoonStrike
+      params:
+        variation: 0.2
+        maxDistance: 20
+        volume: 20
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml
@@ -0,0 +1,45 @@
+- type: entity
+  id: CP14ActionSpellGodLumeraRenounce
+  name: Renunciation of a follower
+  description: You are rejecting the chosen follower. They lose the opportunity to become your follower at any time.
+  components:
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14LumeraRenounceImpact
+    - !type:CP14SpellGodRenounce
+  - type: ConfirmableAction
+    popup: cp-renounce-action-god-popup
+  - type: EntityWorldTargetAction
+    repeat: true
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    range: 100
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+      state: renounce
+    event: !type:CP14EntityWorldTargetActionEvent
+      cooldown: 0.5
+
+- type: entity
+  id: CP14LumeraRenounceImpact
+  categories: [ HideSpawnMenu ]
+  parent: CP14BaseMagicImpact
+  save: false
+  components:
+  - type: PointLight
+    color: "#94154e"
+    enabled: true
+    radius: 5
+    energy: 4
+    netsync: false
+  - type: Sprite
+    layers:
+    - state: stars
+      color: "#94154e"
+      shader: unshaded
+  - type: LightFade
+    duration: 1
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/speak.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/speak.yml
@@ -0,0 +1,21 @@
+- type: entity
+  id: CP14LumeraSpeakImpact
+  categories: [ HideSpawnMenu ]
+  parent: CP14BaseMagicImpact
+  save: false
+  components:
+  - type: PointLight
+    color: "#3843a8"
+    enabled: true
+    radius: 5
+    energy: 4
+    netsync: false
+  - type: Sprite
+    layers:
+    - state: stars
+      color: "#3843a8"
+      shader: unshaded
+  - type: LightFade
+    duration: 1
+  - type: TimedDespawn
+    lifetime: 2
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml
@@ -0,0 +1,49 @@
+- type: entity
+  id: CP14ActionSpellGodLumeraTouch
+  name: Touch of Lumera
+  description: "Multitasking effects on the world: depending on what you click on, the effect may vary. Using it on an empty space will create a glowing sign that attracts the attention of mortals."
+  components:
+  - type: CP14MagicEffectReligionRestricted
+  - type: CP14MagicEffectManaCost
+    manaCost: 5
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14LumeraTouchImpact
+    - !type:CP14SpellGodTouch
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:Jitter
+  - type: EntityWorldTargetAction
+    repeat: true
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    range: 100
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+      state: touch
+    event: !type:CP14EntityWorldTargetActionEvent
+      cooldown: 0.5
+
+- type: entity
+  id: CP14LumeraTouchImpact
+  categories: [ HideSpawnMenu ]
+  parent: CP14BaseMagicImpact
+  save: false
+  components:
+  - type: PointLight
+    color: "#3843a8"
+    enabled: true
+    radius: 5
+    energy: 4
+    netsync: false
+  - type: Sprite
+    layers:
+    - state: stars
+      color: "#3843a8"
+      shader: unshaded
+  - type: LightFade
+    duration: 1
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/warp.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/warp.yml
@@ -0,0 +1,12 @@
+- type: entity
+  id: CP14ActionSpellGodLumeraWarp
+  name: Fast travel
+  description: Allows you to quickly teleport to your altars and followers.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+      state: warp
+    priority: -8
+    event: !type:ToggleIntrinsicUIEvent 
+      key: enum.CP14ReligionEntityUiKey.Key
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml
@@ -0,0 +1,41 @@
+- type: entity
+  id: CP14ActionRenounceFromGod
+  name: Renounce patron
+  description: You renounce your patron by severing your connection with him. After that, you can never become his follower again, but you can become a follower of another patron.
+  components:
+  - type: InstantAction
+    checkCanInteract: false
+    checkConsciousness: false
+    icon:
+      sprite: _CP14/Interface/Alerts/divine_offer.rsi
+      state: unoffer
+    priority: -8
+    event: !type:CP14RenounceFromGodEvent
+  - type: ConfirmableAction
+    popup: cp14-renounce-action-popup
+
+- type: entity
+  id: CP14ActionAppealToGod
+  name: Appeal to god
+  description: You call upon your patron! He will hear your call wherever he may be.
+  components:
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectSphereOfLight
+    - !type:CP14SpellTransferManaToGod
+      amount: 20
+      safe: true
+    - !type:CP14SpellSendMessageToGod
+  - type: InstantAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/DemigodSpells/generic.rsi
+      state: appeal
+    priority: -8
+    event: !type:CP14DelayedInstantActionEvent
+      cooldown: 15
+      castDelay: 1.5
+      breakOnMove: true
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml
@@ -0,0 +1,104 @@
+- type: entity
+  id: CP14ActionSpellFirewave
+  name: Firewave
+  description: You release a wave of hot fire that strikes multiple targets in an area.
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: firewave
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.75
+  - type: CP14MagicEffectManaCost
+    manaCost: 10
+  - type: CP14MagicEffect
+    magicType: Fire
+    effects:
+    - !type:CP14SpellProjectile
+      prototype: CP14Firebolt
+      spread: 2
+      projectileSpeed: 5
+      projectileCount: 6
+  - type: CP14MagicEffectVerbalAspect
+    endSpeech: "Ignis acus!"
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneFirebolt
+  - type: CP14MagicEffectPacifiedBlock
+  - type: EntityWorldTargetAction
+    repeat: true
+    checkCanAccess: false
+    raiseOnUser: true
+    range: 60
+    itemIconStyle: BigAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/Spells/fire.rsi
+      state: firewave
+    event: !type:CP14EntityWorldTargetActionEvent
+      cooldown: 1.0
+
+- type: entity
+  id: CP14RuneFirebolt
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: PointLight
+    color: "#eea911"
+  - type: Sprite
+    layers:
+    - state: medium_circle
+      color: "#fdda5d"
+      shader: unshaded
+
+- type: entity
+  id: CP14ImpactEffectFirebolt
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: PointLight
+    color: "#E25822"
+    radius: 2.0
+    energy: 2.0
+  - type: LightFade
+
+- type: entity
+  id: CP14Firebolt
+  parent: BaseBullet
+  name: firebolt
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: TimedDespawn
+    lifetime: 1
+  - type: SpawnOnDespawn
+    prototype: CP14ImpactEffectFirebolt
+  - type: PointLight
+    color: "#E25822"
+    radius: 2.0
+    energy: 2.0
+  - type: Projectile
+    impactEffect: CP14ImpactEffectFirebolt
+    damage:
+      types:
+        Heat: 2
+    soundHit:
+      path: /Audio/Weapons/Guns/Hits/energy_metal1.ogg
+  - type: Sprite
+    sprite: _CP14/Effects/fire.rsi
+    layers:
+    - state: small
+      shader: unshaded
+  - type: ChangeTemperatureOnCollide
+    heat: 10000
+
+- type: entity
+  parent: CP14BaseSpellScrollFire
+  id: CP14SpellScrollFirewave
+  name: firewave spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellFirewave
+
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml
@@ -26,6 +26,7 @@
      tags:
      - CP14CrossbowBolt
      - CP14Arrow
+      - CP14BigCrossbowBolt
  - type: Appearance
  - type: StorageContainerVisuals
    maxFillLevels: 3
@@ -74,3 +75,14 @@
    contents:
      - id: CP14CrossboltIron
        amount: 32
+
+- type: entity
+  parent: CP14ClothingBeltQuiver
+  id: CP14ClothingBeltQuiverBigCrossbolt
+  categories: [ ForkFiltered ]
+  suffix: Full. Iron. BigCrossbolt
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14BigCrossboltIron
+      amount: 16
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml
@@ -62,6 +62,8 @@
  - type: Clothing
    sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi
  - type: SolutionScanner
+  - type: StaticPrice
+    price: 30
  - type: GuideHelp
    guides:
    - CP14_RU_Alchemy
@@ -79,6 +81,8 @@
  - type: Clothing
    sprite: _CP14/Clothing/Eyes/alchemy_monocle.rsi
  - type: SolutionScanner
+  - type: StaticPrice
+    price: 30
  - type: GuideHelp
    guides:
    - CP14_RU_Alchemy
@@ -122,3 +126,18 @@
    sprite: _CP14/Clothing/Eyes/eye_patch.rsi
  - type: Clothing
    sprite: _CP14/Clothing/Eyes/eye_patch.rsi
+
+- type: entity
+  parent: CP14ClothingEyesBase
+  id: CP14ClothingEyesMerchantMonocle
+  name: merchant's monocle
+  description: High-quality magnifiyng monocle infused with magic to help you determine the exact price of any item.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Eyes/merchant_monocle.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Eyes/merchant_monocle.rsi
+  - type: CP14PriceScanner
+  - type: StaticPrice
+    price: 30
+  - type: VisionCorrection
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Produced/armor.yml
@@ -17,3 +17,28 @@
  - type: ClothingSpeedModifier
    walkModifier: 0.95
    sprintModifier: 0.95
+
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadFishMask
+  name: fish mask
+  description: SALUTATIONS!!!
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/Produced/Armor/fish_mask.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/Produced/Armor/fish_mask.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Cold: 0.92
+  - type: FactionClothing
+    faction: CP14Fishies
+  - type: HideLayerClothing
+    slots:
+    - Hair
+  - type: TypingIndicatorClothing
+    proto: alien
+  - type: IdentityBlocker
+  - type: IngestionBlocker
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml
@@ -121,3 +121,4 @@
  #- type: Construction
  #  graph: CP14StrawHat
  #  node: cp14headstrawhat
+
--- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml
@@ -102,3 +102,5 @@
  - type: Clothing
    sprite: _CP14/Clothing/OuterClothing/Roles/General/purple.rsi

+
+
--- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml
@@ -55,3 +55,22 @@
        Slash: 0.80
        Piercing: 0.90

+- type: entity
+  parent: CP14ClothingOuterClothingBase
+  id: CP14ClothingOuterClothingFish
+  name: fish suit
+  description: smells horible....
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/fish_suit.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/fish_suit.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Cold: 0.9
+        Slash: 0.92
+  - type: FactionClothing
+    faction: CP14Fishies
+
--- a/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml
+++ b/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml
@@ -89,5 +89,4 @@
      collection: CP14LightningFar
      params:
        variation: 0.2
-        volume: -5
-
+        volume: -5
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml
@@ -209,3 +209,17 @@
        range: 2, 3
      children:
      - id: CP14MobSlimeBase
+
+- type: entity
+  parent: CP14BaseMobGroupSpawner
+  id: CP14MobGroupSpawnerFlem
+  suffix: 2-3 Flems
+  components:
+  - type: EntityTableSpawner
+    deleteSpawnerAfterSpawn: false
+    offset: 1
+    table: !type:GroupSelector
+      rolls: !type:RangeNumberSelector
+        range: 1, 3
+      children:
+      - id: CP14MobMonsterFlem
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml
@@ -188,3 +188,19 @@
  - type: ConditionalSpawner
    prototypes:
    - CP14MobMonsterInvisibleWhistler
+
+- type: entity
+  name: flem spawner
+  id: CP14SpawnMobMonsterFlem
+  parent: MarkerBase
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Markers/cross.rsi
+      state: green
+    - sprite: _CP14/Mobs/Monster/flem.rsi
+      state: flem_live
+  - type: ConditionalSpawner
+    prototypes:
+    - CP14MobMonsterFlem
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Flem.yml
@@ -0,0 +1,100 @@
+- type: entity
+  id: CP14MobMonsterFlem
+  parent: CP14SimpleMobBase
+  name: Flem
+  description: an odd looking fish standing on two stubby legs. you know what that means...
+  categories: [ ForkFiltered ]
+  components:
+  - type: HTN
+    rootTask:
+      task: CP14MonsterCompound
+    blackboard:
+      NavSmash: !type:Bool
+        true
+      VisionRadius: !type:Single
+        3
+      AggroVisionRadius: !type:Single
+        1
+  - type: NpcFactionMember
+    factions:
+    - CP14Fishies
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      sprite: _CP14/Mobs/Monster/flem.rsi
+      state: flem_live
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.20
+        density: 100
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Appearance
+  - type: Body
+    prototype: Animal
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      30: Dead
+  - type: Stamina
+    critThreshold: 200
+  - type: CombatMode
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Blunt: 8
+        Structural: 20
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2.6
+    baseSprintSpeed: 2.6
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: flem_live
+      Dead:
+        Base: flem_dead
+  - type: Butcherable
+    spawned:
+    - id: CP14FoodMeatFlemHead
+      amount: 1
+    - id: CP14FoodMeatFlemTorso
+      amount: 1
+    - id: CP14FoodMeatFlemLeg
+      amount: 2
+      prob: 0.6
+  - type: Bloodstream
+    bloodMaxVolume: 200
+    bloodReagent: CP14BloodAnimal
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: TypingIndicator
+    proto: alien
+  - type: CP14MagicCasterSlowdown
+  - type: CP14MagicEnergyContainer
+    magicAlert: CP14MagicEnergy
+    maxEnergy: 100
+    energy: 100
+  - type: CP14MagicEnergyDraw
+    energy: 2
+    delay: 4
+  - type: SpamEmitSound
+    minInterval: 10
+    maxInterval: 30
+    sound:
+      collection: CP14Flem
+      params:
+        variation: 0.125
+  - type: SoundWhileAlive
+  - type: Tag
+    tags:
+      - FootstepSound
+      - CP14Mosquito
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml
@@ -49,7 +49,7 @@
  - type: MobThresholds
    thresholds:
      0: Alive
-      90: Dead
+      40: Dead
  #- type: SolutionContainerManager
  #  solutions:
  #    melee:
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/Patrons/gods.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/Patrons/gods.yml
@@ -0,0 +1,127 @@
+- type: entity
+  id: CP14MobGodBase
+  parent:
+  - Incorporeal
+  - BaseMob
+  - CP14MobMagical
+  name: god
+  description: The supreme entity formed from the beliefs, desires, and fears of the human race.
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _CP14/Mobs/Demigods/temp_icons.rsi
+    color: "#ffffff99"
+  - type: PointLight
+    radius: 10
+    softness: 1
+    castShadows: false
+  - type: Input
+    context: "ghost"
+  - type: Spectral
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 3
+    baseSprintSpeed: 6
+    friction: 0.5
+    acceleration: 3
+  - type: NoSlip
+  - type: Eye
+    drawFov: false
+    visMask:
+      - Normal
+      - Ghost
+  - type: Visibility
+    layer: 2 #ghost vis layer
+  - type: ContentEye
+    maxZoom: 1.2, 1.2
+  - type: Speech
+    speechVerb: Ghost
+  - type: CP14ReligionVision
+  - type: CP14MagicEnergyContainer
+    magicAlert: CP14MagicEnergy
+    maxEnergy: 500
+    energy: 500
+    unsafeSupport: true
+  - type: Damageable
+    damageContainer: CP14Spectral
+  - type: MobState
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      100: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/eye_close.ogg
+          params:
+            volume: -6
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: CP14MagicUnsafeDamage
+    damagePerEnergy:
+      types:
+        CP14ManaDepletion: 1
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
+    - CP14ActionZLevelUp
+    - CP14ActionZLevelDown
+    - ActionToggleLighting
+    - ActionToggleFov
+  - type: CP14DemiplaneStabilizer # teleports gods outside when the demiplane closes
+    enabled: false
+  - type: UserInterface
+    interfaces:
+      enum.CP14ReligionEntityUiKey.Key:
+        type: CP14ReligionEntityBoundUserInterface
+
+- type: entity
+  parent: CP14MobGodBase
+  id: CP14MobGodMerkas
+  name: Merkas
+  categories: [ HideSpawnMenu ]
+  description: Merkas is the god of purity and healing. In his presence, decay is destroyed. He does not save — he purifies. Those who remain can start anew.
+  components:
+  - type: Sprite
+    layers:
+    - state: merkas
+      shader: unshaded
+  - type: PointLight
+    color: "#9bf2b5"
+  - type: CP14SkillStorage
+    availableSkillTrees:
+    - GodMerkas
+  - type: CP14ReligionEntity
+    religion: Merkas
+  - type: CP14ReligionVision 
+    shaderColor:  0.02, 0.36, 0.05
+
+- type: entity
+  parent: CP14MobGodBase
+  id: CP14MobGodLumera
+  name: Lumera
+  description: The goddess of the night and the night sky. Her stars hold so many secrets, which she protects with her wings.
+  components:
+  - type: Sprite
+    layers:
+    - state: lumera
+      shader: unshaded
+  - type: PointLight
+    color: "#4367ba"
+  - type: CP14SkillStorage
+    availableSkillTrees:
+    - GodLumera
+  - type: CP14ReligionEntity
+    religion: Lumera
+  - type: CP14ReligionVision
+    shaderColor:  0.29, 0.66, 0.87
+  - type: IntrinsicUI
+    uis:
+      enum.CP14ReligionEntityUiKey.Key:
+        toggleAction: CP14ActionSpellGodLumeraWarp
+  - type: CP14ReligionSpeaker
+    speaker: CP14LumeraSpeakImpact
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -231,7 +231,6 @@
      types:
        Cold: 0.25
        Bloodloss: 0.25
-  - type: CP14SkillStorage
  - type: CP14TradingReputation


--- a/Resources/Prototypes/_CP14/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/base.yml
@@ -57,6 +57,16 @@
    delay: 3 # 5m to full restore
  - type: CP14MagicUnsafeDamage
  - type: CP14MagicUnsafeSleep
+  - type: CP14SkillStorage
+    availableSkillTrees:
+    - Pyrokinetic
+    - Hydrosophistry
+    - Illusion
+    - Metamagic
+    - Healing
+    - Atlethic
+    - MartialArts
+    - Craftsmanship


 - type: entity
--- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml
@@ -930,3 +930,235 @@
    entries:
    - temperatureRange: 400, 500
      transformTo: CP14Ash1
+
+  #Flem meat
+
+- type: entity
+  id: CP14FoodMeatFlemHead
+  parent: CP14FoodMeatBase
+  name: raw flem head
+  description: honestly looks quite tasty
+  components:
+  - type: FlavorProfile
+    flavors:
+      - fishy
+  - type: Sprite
+    sprite: _CP14/Objects/Consumable/Food/meat.rsi
+    state: flem_head
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,1,1
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 7
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 18
+        - ReagentId: Fat
+          Quantity: 5
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14FoodMeatFlemHeadCooked
+
+- type: entity
+  id: CP14FoodMeatFlemHeadCooked
+  parent: CP14FoodMeatFlemHead
+  name: cooked flem head
+  components:
+  - type: Sprite
+    state: flem_head_cooked
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 7
+        - ReagentId: Protein
+          Quantity: 18
+        - ReagentId: Fat
+          Quantity: 5
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14Ash1
+
+- type: entity
+  id: CP14FoodMeatFlemTorso
+  parent: CP14FoodMeatBase
+  name: raw flem torso
+  description: seems to be hollow
+  components:
+  - type: FlavorProfile
+    flavors:
+      - fishy
+  - type: Sprite
+    sprite: _CP14/Objects/Consumable/Food/meat.rsi
+    state: flem_torso
+  - type: SliceableFood
+    count: 3
+    slice: CP14FoodMeatFlemTorsoCut
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,1,1
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 35
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 24
+        - ReagentId: Fat
+          Quantity: 2
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14FoodMeatFlemTorsoCooked
+
+- type: entity
+  id: CP14FoodMeatFlemTorsoCooked
+  parent: CP14FoodMeatFlemTorso
+  name: cooked flem torso
+  components:
+  - type: Sprite
+    state: flem_torso_cooked
+  - type: SliceableFood
+    count: 3
+    slice: CP14FoodMeatFlemTorsoCookedCut
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 35
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Protein
+          Quantity: 24
+        - ReagentId: Fat
+          Quantity: 2
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14Ash1
+
+- type: entity
+  id: CP14FoodMeatFlemTorsoCut
+  parent: CP14FoodMeatSliceBase
+  name: raw flem ring
+  description: onions not included
+  components:
+  - type: FlavorProfile
+    flavors:
+      - fishy
+  - type: Item
+    size: Small
+  - type: Sprite
+    sprite: _CP14/Objects/Consumable/Food/meat.rsi
+    layers:
+      - state: flem_torso_cut
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+        - ReagentId: Fat
+          Quantity: 0.5
+  - type: Tag
+    tags:
+    - CP14RawMeatSlice
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14FoodMeatFlemTorsoCookedCut
+
+- type: entity
+  id: CP14FoodMeatFlemTorsoCookedCut
+  parent: CP14FoodMeatFlemTorsoCut
+  name: fishy rings
+  components:
+  - type: Sprite
+    layers:
+      - state: flem_torso_cut_cooked
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Protein
+          Quantity: 5
+        - ReagentId: Fat
+          Quantity: 0.5
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14Ash1
+
+- type: entity
+  id: CP14FoodMeatFlemLeg
+  parent: CP14FoodMeatBase
+  name: raw flem leg
+  description: probally not the best part to eat. but you never know until you try
+  components:
+  - type: FlavorProfile
+    flavors:
+      - fishy
+  - type: Sprite
+    sprite: _CP14/Objects/Consumable/Food/meat.rsi
+    state: flem_leg
+  - type: Item
+    size: Tiny
+    shape:
+    - 0,0,0,0
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 0.2
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+        - ReagentId: Fat
+          Quantity: 0.1
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14FoodMeatFlemLegCooked
+
+- type: entity
+  id: CP14FoodMeatFlemLegCooked
+  parent: CP14FoodMeatFlemLeg
+  name: fish sticks
+  description: like freis. but fish!
+  components:
+  - type: Sprite
+    state: flem_leg_cooked
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 0.2
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+        - ReagentId: Fat
+          Quantity: 0.1
+  - type: CP14TemperatureTransformation
+    entries:
+    - temperatureRange: 400, 500
+      transformTo: CP14Ash1
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
@@ -24,6 +24,7 @@
    - state: icon
    - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
      state: icon
+      color: "#e28f08"
  - type: CP14ModularCraftAutoAssemble
    details:
    - BladeCopperPickaxe
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml
@@ -16,7 +16,7 @@
 - type: entity
  id: CP14ModularCopperRapier
  parent: CP14ModularGripWooden
-  name: iron rapier
+  name: copper rapier
  description: You'll be lucky if it even pierces the paper.
  components:
  - type: Sprite
@@ -24,6 +24,7 @@
    - state: icon
    - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
      state: icon
+      color: "#e28f08"
  - type: CP14ModularCraftAutoAssemble
    details:
    - BladeCopperRapier
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
@@ -24,6 +24,7 @@
    - state: icon
    - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
      state: icon
+      color: "#e28f08"
  - type: CP14ModularCraftAutoAssemble
    details:
    - BladeCopperSkimitar
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
@@ -16,7 +16,7 @@
 - type: entity
  id: CP14ModularCopperSword
  parent: CP14ModularGripWooden
-  name: iron sword
+  name: copper sword
  description: You'll be lucky if it even pierces the paper.
  components:
  - type: Sprite
@@ -24,6 +24,7 @@
    - state: icon
    - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
      state: icon
+      color: "#e28f08"
  - type: CP14ModularCraftAutoAssemble
    details:
    - BladeCopperSword
--- a/Resources/Prototypes/_CP14/Entities/Stations/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Stations/base.yml
@@ -10,6 +10,7 @@
  - CP14BaseStationCommonObjectives
  - CP14BaseStationDemiplaneMap
  - CP14BaseStationEconomy
+  #- CP14BaseStationGods

 - type: entity
  id: CP14BaseStationCommonObjectives
@@ -35,3 +36,16 @@
  abstract: true
  components:
    - type: CP14StationEconomy
+
+#- type: entity
+#  id: CP14BaseStationGods
+#  abstract: true
+#  components:
+#    - type: CP14StationRandomJobs
+#      entries:
+#      - jobs:
+#        - CP14GodMerkas
+#        - CP14GodLumera
+#        count:
+#          min: 2
+#          max: 2
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml
@@ -470,4 +470,3 @@
          CP14BirchWoodLog:
            min: 3
            max: 6
-
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Religion/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Religion/base.yml
@@ -0,0 +1,43 @@
+- type: entity
+  id: CP14BaseAltar
+  parent: BaseStructure
+  abstract: true
+  name: altar
+  description: TODO
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    noRot: true
+    #drawdepth: Mobs
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 60
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: CP14ReligionAltar
+  - type: ActiveListener
+    range: 1
+  - type: InteractionOutline
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Rock
+  - type: GuideHelp
+    guides:
+    - CP14_RU_Patrons
+    - CP14_EN_Patrons
+
+- type: entity
+  parent: CP14BaseAltar
+  id: CP14BaseAltarPrimordial
+  abstract: true
+  components:
+  - type: CP14ReligionAltar
+    canBeConverted: false
+  - type: SpawnPoint
+    spawn_type: Unset
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Religion/primordial.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Religion/primordial.yml
@@ -0,0 +1,37 @@
+- type: entity
+  parent: CP14BaseAltarPrimordial
+  id: CP14AltarPrimordialGodLumera
+  name: primordial statue of Lumera
+  description: "The enchanting statue of Lumera, patroness of the starry sky, night, and mysteries. She does not demand worship—she simply observes. And waits for you to ask."
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    offset: "0.0,0.8"
+    sprite: _CP14/Structures/Specific/Religion/lumera_statue.rsi
+    layers:
+    - state: statue1
+  - type: CP14ReligionAltar
+    religion: Lumera
+  - type: CP14ReligionObserver
+    observation:
+      Lumera: 10
+  - type: SpawnPoint
+    job_id: CP14GodLumera
+
+#- type: entity
+#  parent: CP14BaseAltarPrimordial
+#  id: CP14AltarPrimordialGodMerkas
+#  name: primordial statue of Merkas
+#  description: A beautiful, overgrown statue of Sylvania, revered as a goddess of nature.
+#  components:
+#  - type: Sprite
+#    sprite: Structures/Furniture/Altars/Gods/nanotrasen.rsi
+#    layers:
+#    - state: druid
+#  - type: CP14ReligionAltar
+#    religion: Merkas
+#  - type: CP14ReligionObserver
+#    observation:
+#      Merkas: 10
+#  - type: SpawnPoint
+#    job_id: CP14GodMerkas
--- a/Resources/Prototypes/_CP14/Guidebook/Eng/jobs.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Eng/jobs.yml
@@ -7,6 +7,7 @@
  - CP14_EN_JobAdventurer
  - CP14_EN_JobAlchemist
  - CP14_EN_JobInnkeeper
+  - CP14_EN_Patrons
  filterEnabled: True


@@ -34,3 +35,10 @@
  name: Innkeepers
  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml"
  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_Patrons
+  name: Patrons
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Patrons.xml" 
+  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/Ru/jobs.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Ru/jobs.yml
@@ -7,6 +7,7 @@
  - CP14_RU_JobAdventurer
  - CP14_RU_JobAlchemist
  - CP14_RU_JobInnkeeper
+  - CP14_RU_Patrons
  filterEnabled: True


@@ -32,6 +33,13 @@
 - type: guideEntry
  crystallPunkAllowed: true
  id: CP14_RU_JobInnkeeper
-  name: Innkeepers
+  name: Трактирщик
  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml"
  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_Patrons
+  name: Покровители
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Patrons.xml"
+  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/alchemist.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/alchemist.yml
@@ -37,25 +37,6 @@
  equipment:
    cloak: CP14ClothingCloakAlchemistMantle

-# Eyes
-
- type: loadoutGroup
-  id: CP14AlchemistEyes
-  name: cp14-loadout-alchemist-eyes
-  loadouts:
-  - CP14ClothingEyesAlchemyGlasses
-  - CP14ClothingEyesAlchemyMonocle
-
- type: loadout
-  id: CP14ClothingEyesAlchemyGlasses
-  equipment:
-    eyes: CP14ClothingEyesAlchemyGlasses
-
- type: loadout
-  id: CP14ClothingEyesAlchemyMonocle
-  equipment:
-    eyes: CP14ClothingEyesAlchemyMonocle
-
 # Belt

 - type: loadoutGroup
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -34,7 +34,7 @@
  groups:
  - CP14AlchemistHead #
  - CP14GeneralOuterClothing
-  - CP14AlchemistEyes #
+  - CP14GeneralEyes #
  - CP14AlchemistCloak #
  - CP14GeneralGloves
  - CP14GeneralShirt
--- a/Resources/Prototypes/_CP14/Maps/comoss.yml
+++ b/Resources/Prototypes/_CP14/Maps/comoss.yml
@@ -13,6 +13,8 @@
          mapNameTemplate: "Comoss island"
        - type: StationJobs
          availableJobs:
+            #Demigods
+            CP14GodLumera: [ 1, 1 ]
            #Mercenary
            #CP14Guildmaster: [1, 1]
            CP14Adventurer: [ -1, -1 ]
--- a/Resources/Prototypes/_CP14/Maps/venicialis.yml
+++ b/Resources/Prototypes/_CP14/Maps/venicialis.yml
@@ -13,6 +13,8 @@
          mapNameTemplate: "Venicialis fort"
        - type: StationJobs
          availableJobs:
+            #Demigods
+            CP14GodLumera: [ 1, 1 ]
            #Mercenary
            #CP14Guildmaster: [1, 1]
            CP14Adventurer: [ -1, -1 ]
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -72,6 +72,25 @@
      minGroupSize: 2
      maxGroupSize: 3

+- type: cp14DemiplaneModifier
+  id: EnemyFlem
+  levels:
+    min: 1
+    max: 8
+  name: cp14-modifier-flem
+  generationWeight: 0.33
+  categories:
+    Danger: 0.25
+  requiredTags:
+  - CP14DemiplaneOpenSky
+  - CP14DemiplaneHerbals
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14MobMonsterFlem
+      count: 3
+      minGroupSize: 3
+      maxGroupSize: 4
+
 # TIER 2

 - type: cp14DemiplaneModifier
@@ -256,3 +275,4 @@
      maxGroupSize: 15


+
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/pies.yml
@@ -43,3 +43,21 @@
    protoId: CP14FoodPumpkinSlice
    count: 5
  result: CP14FoodPiePumpkinRaw
+
+# preobaly just a placeholder until we get actaul fish
+
+- type: CP14Recipe
+  id: CP14FoodPieFishRaw
+  tag: CP14RecipeCooking
+  craftTime: 5
+  requirements:
+  - !type:ProtoIdResource
+    protoId: CP14PlatePie
+  - !type:ProtoIdResource
+      protoId: CP14FoodDoughMediumFlat
+  - !type:ProtoIdResource
+    protoId: CP14FoodMeatFlemTorso
+  - !type:ProtoIdResource
+    protoId: CP14FoodMeatFlemLeg
+    count: 2
+  result: CP14FoodPieFishRaw
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
@@ -251,6 +251,34 @@
    count: 2
  result: CP14ClothingPantsMercenaryTrousers

+- type: CP14Recipe
+  id: CP14ClothingOuterClothingFish
+  tag: CP14RecipeSewing
+  craftTime: 4
+  requirements:
+  - !type:ProtoIdResource
+    protoId: CP14FoodMeatFlemTorso
+  - !type:ProtoIdResource
+    protoId: CP14String
+  - !type:StackResource
+    stack: CP14Cloth
+    count: 3
+  result: CP14ClothingOuterClothingFish
+
+- type: CP14Recipe
+  id: CP14ClothingHeadFishMask
+  tag: CP14RecipeSewing
+  craftTime: 5
+  requirements:
+  - !type:ProtoIdResource
+    protoId: CP14FoodMeatFlemHead
+  - !type:ProtoIdResource
+    protoId: CP14String
+  - !type:StackResource
+    stack: CP14Cloth
+    count: 2
+  result: CP14ClothingHeadFishMask
+
 # Misc

 - type: CP14Recipe
--- a/Resources/Prototypes/_CP14/Religion/religions.yml
+++ b/Resources/Prototypes/_CP14/Religion/religions.yml
@@ -0,0 +1,5 @@
+- type: cp14Religion
+  id: Merkas
+
+- type: cp14Religion
+  id: Lumera
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/lumera.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/lumera.yml
@@ -0,0 +1,16 @@
+- type: job
+  id: CP14GodLumera
+  name: cp14-job-name-god-lumera
+  description: cp14-job-desc-god-lumera
+  setPreference: true
+  playTimeTracker: CP14GodLumera
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 36000 # 10 hrs
+  canBeAntag: false
+  icon: CP14JobIconGodLumera
+  jobEntity: CP14MobGodLumera
+  joinNotifyCrew: false
+  requireAdminNotify: true
+  jobPreviewEntity: CP14MobGodLumera
+  applyTraits: false
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/merkas.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Demigods/merkas.yml
@@ -0,0 +1,16 @@
+- type: job
+  id: CP14GodMerkas
+  name: cp14-job-name-god-merkas
+  description: cp14-job-desc-god-merkas
+  setPreference: false
+  playTimeTracker: CP14GodMerkas
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 36000 # 10 hrs
+  canBeAntag: false
+  icon: CP14JobIconGodMerkas
+  jobEntity: CP14MobGodMerkas
+  joinNotifyCrew: false
+  requireAdminNotify: true
+  jobPreviewEntity: CP14MobGodMerkas
+  applyTraits: false
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
@@ -12,6 +12,9 @@
      time: 3600 # 1 hours
  special:
    - !type:CP14AddGlobalReputationSpecial
+    - !type:CP14LearnSkillsSpecial
+      skills:
+      - TraderWit

 - type: startingGear
  id: CP14MerchantGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
@@ -1,3 +1,14 @@
+- type: department
+  id: CP14Demigods
+  name: department-CP14Demigods
+  description: department-CP14Demigods-desc
+  weight: 666 # >:)
+  color: "#ffffff"
+  editorHidden: false
+  roles:
+  - CP14GodLumera
+  - CP14GodMerkas
+
 - type: department
  id: CP14Command
  name: department-CP14Command
@@ -5,6 +16,7 @@
  primary: false
  weight: 10
  color: "#3ec8fa"
+  editorHidden: true #temp
  roles:
  - CP14GuardCommander
  - CP14Guildmaster
@@ -15,6 +27,7 @@
  description: department-CP14Guard-desc
  weight: 9
  color: "#576384"
+  editorHidden: true #temp
  roles:
  - CP14GuardCommander
  - CP14Guard
@@ -40,5 +53,4 @@
  color: "#588151"
  roles:
  - CP14Guildmaster
-  - CP14Adventurer
-
+  - CP14Adventurer
--- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml
+++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml
@@ -37,3 +37,9 @@
 - type: playTimeTracker
  id: CP14JobMerchant

+# Gods
+- type: playTimeTracker
+  id: CP14GodMerkas
+
+- type: playTimeTracker
+  id: CP14GodLumera
--- a/Resources/Prototypes/_CP14/Shaders/shaders.yml
+++ b/Resources/Prototypes/_CP14/Shaders/shaders.yml
@@ -19,3 +19,8 @@
    FalloffStrength: 0.75
    FalloffPow: 3.0
    HDR: 1.5
+
+- type: shader
+  id: CP14ReligionVision
+  kind: source
+  path: "/Textures/_CP14/Shaders/religion.swsl"
--- a/Resources/Prototypes/_CP14/Skill/Basic/atlethic.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/atlethic.yml
--- a/Resources/Prototypes/_CP14/Skill/Basic/craftsmanship.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/craftsmanship.yml
@@ -1,7 +1,22 @@
+- type: cp14Skill
+  id: TraderWit
+  skillUiPosition: 0, 0
+  tree: Craftsmanship
+  name: cp14-skill-trader-wit-name
+  desc: cp14-skill-trader-wit-desc
+  learnCost: 1
+  icon:
+    sprite: _CP14/Objects/Economy/pp_coin.rsi
+    state: coin8
+  effects:
+  - !type:AddComponents
+    components:
+    - type: CP14PriceScanner
+
 - type: cp14Skill
  id: CopperMelting
-  skillUiPosition: 1, 0
-  tree: Blacksmithing
+  skillUiPosition: 4, 0
+  tree: Craftsmanship
  name: cp14-skill-copper-melt-name
  learnCost: 0.5
  icon:
@@ -12,8 +27,8 @@

 - type: cp14Skill
  id: IronMelting
-  skillUiPosition: 1, 2
-  tree: Blacksmithing
+  skillUiPosition: 4, 2
+  tree: Craftsmanship
  name: cp14-skill-iron-melt-name
  learnCost: 0.5
  icon:
@@ -27,8 +42,8 @@

 - type: cp14Skill
  id: GoldMelting
-  skillUiPosition: 0, 4
-  tree: Blacksmithing
+  skillUiPosition: 3, 4
+  tree: Craftsmanship
  name: cp14-skill-gold-melt-name
  learnCost: 0.5
  icon:
@@ -42,8 +57,8 @@

 - type: cp14Skill
  id: MithrilMelting
-  skillUiPosition: 2, 4
-  tree: Blacksmithing
+  skillUiPosition: 5, 4
+  tree: Craftsmanship
  name: cp14-skill-mithril-melt-name
  learnCost: 0.5
  icon:
@@ -57,8 +72,8 @@

 - type: cp14Skill
  id: GlassMelting
-  skillUiPosition: 3, 0
-  tree: Blacksmithing
+  skillUiPosition: 6, 0
+  tree: Craftsmanship
  name: cp14-skill-glass-melt-name
  learnCost: 0.5
  icon:
@@ -67,3 +82,17 @@
  effects:
  - !type:UnlockRecipes

+- type: cp14Skill
+  id: AlchemyVision
+  skillUiPosition: 10, 0
+  tree: Craftsmanship
+  name: cp14-skill-alchemy-vision-name
+  desc: cp14-skill-alchemy-vision-desc
+  learnCost: 1
+  icon:
+    sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi
+    state: icon
+  effects:
+  - !type:AddComponents
+    components:
+    - type: SolutionScanner
--- a/Resources/Prototypes/_CP14/Skill/Basic/dimension.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/dimension.yml
--- a/Resources/Prototypes/_CP14/Skill/Basic/healing.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/healing.yml
--- a/Resources/Prototypes/_CP14/Skill/Basic/hydrosophistry.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/hydrosophistry.yml
--- a/Resources/Prototypes/_CP14/Skill/Basic/illusion.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/illusion.yml
--- a/Resources/Prototypes/_CP14/Skill/Basic/martial_arts.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/martial_arts.yml
--- a/Resources/Prototypes/_CP14/Skill/Basic/metamagic.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/metamagic.yml
--- a/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml
@@ -102,6 +102,20 @@
  - !type:NeedPrerequisite
    prerequisite: PyrokineticT2

+- type: cp14Skill
+  id: CP14ActionSpellFirewave
+  skillUiPosition: 8, 4
+  tree: Pyrokinetic
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: firewave
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellFirewave
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: PyrokineticT2
+
 # T3

 - type: cp14Skill
--- a/Resources/Prototypes/_CP14/Skill/Basic/trees.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/trees.yml
@@ -3,84 +3,71 @@
  name: cp14-skill-tree-pyrokinetic-name
  desc: cp14-skill-tree-pyrokinetic-desc
  color: "#d6933c"
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: pyro

 - type: cp14SkillTree
  id: Hydrosophistry
  name: cp14-skill-tree-hydrosophistry-name
  desc: cp14-skill-tree-hydrosophistry-desc
  color: "#1554a1"
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: water

 - type: cp14SkillTree
  id: Illusion
  name: cp14-skill-tree-illusion-name
  desc: cp14-skill-tree-illusion-desc
  color: "#f55faf"
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: light

 - type: cp14SkillTree
  id: Metamagic
  name: cp14-skill-tree-metamagic-name
  desc: cp14-skill-tree-metamagic-desc
  color: "#56e5f5"
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: meta

 - type: cp14SkillTree
  id: Healing
  name: cp14-skill-tree-healing-name
  desc: cp14-skill-tree-healing-desc
  color: "#51cf72"
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: heal

 - type: cp14SkillTree
  id: Atlethic
  name: cp14-skill-tree-atlethic-name
  desc: cp14-skill-tree-atlethic-desc
  color: "#b32e37"
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: atlethic

 #- type: cp14SkillTree
 #  id: Dimension
 #  name: cp14-skill-tree-dimension-name
 #  desc: cp14-skill-tree-dimension-desc
 #  color: "#ac66be"
-#  icon:
-#    sprite: _CP14/Actions/skill_tree.rsi
-#    state: dimension

 - type: cp14SkillTree
  id: MartialArts
  name: cp14-skill-tree-martial-name
  desc: cp14-skill-tree-martial-desc
  color: "#f54242"
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: martial

 #

- type: cp14SkillTree
-  id: Thaumaturgy
-  name: cp14-skill-tree-thaumaturgy-name
-  desc: cp14-skill-tree-thaumaturgy-desc
-  color: "#7c52bf"
+#- type: cp14SkillTree
+#  id: Thaumaturgy
+#  name: cp14-skill-tree-thaumaturgy-name
+#  desc: cp14-skill-tree-thaumaturgy-desc
+#  color: "#7c52bf"
+
+#- type: cp14SkillTree
+#  id: Blacksmithing
+#  name: cp14-skill-tree-blacksmithing-name
+#  desc: cp14-skill-tree-blacksmithing-desc
+#  color: "#6b3200"
+
+#- type: cp14SkillTree
+#  id: Trading
+#  name: cp14-skill-tree-trading-name
+#  desc: cp14-skill-tree-trading-desc
+#  color: "#f5edaa"

 - type: cp14SkillTree
-  id: Blacksmithing
-  name: cp14-skill-tree-blacksmithing-name
-  desc: cp14-skill-tree-blacksmithing-desc
-  color: "#6b3200"
-
+  id: Craftsmanship
+  name: cp14-skill-tree-craftsman-name
+  desc: cp14-skill-tree-craftsman-desc
+  color: "#a04b00"
--- a/Resources/Prototypes/_CP14/Skill/Demigods/lumera.yml
+++ b/Resources/Prototypes/_CP14/Skill/Demigods/lumera.yml
@@ -0,0 +1,153 @@
+# T1
+
+- type: cp14Skill
+  id: LumeraT1
+  skillUiPosition: 1, 0
+  tree: GodLumera
+  name: cp14-skill-lumera-t1-name
+  learnCost: 0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: t1
+
+- type: cp14Skill
+  id: LumeraTouch
+  skillUiPosition: 0, 3
+  tree: GodLumera
+  learnCost: 0.0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: touch
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellGodLumeraTouch
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT1
+
+- type: cp14Skill
+  id: LumeraRenounce
+  skillUiPosition: 2, 3
+  tree: GodLumera
+  learnCost: 0.0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: renounce
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellGodLumeraRenounce
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT1
+
+- type: cp14Skill
+  id: LumeraMindScan
+  name: cp14-skill-lumera-mind-scan-name
+  desc: cp14-skill-lumera-mind-scan-desc
+  skillUiPosition: 0, 5
+  tree: GodLumera
+  learnCost: 0.5
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: mind_scan
+  effects:
+  - !type:AddComponents
+    components:
+    - type: CP14SkillScanner
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT1
+
+# T2
+
+- type: cp14Skill
+  id: LumeraT2
+  skillUiPosition: 7, 0
+  tree: GodLumera
+  name: cp14-skill-lumera-t2-name
+  learnCost: 0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: t2
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT1
+  - !type:GodFollowerPercentage
+    percentage: 0.25
+
+- type: cp14Skill
+  id: LumeraDarkMist
+  skillUiPosition: 6, 3
+  tree: GodLumera
+  learnCost: 1.0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: mist
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellGodLumeraDarkmist
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT2
+
+- type: cp14Skill
+  id: LumeraMoonStrike
+  skillUiPosition: 8, 3
+  tree: GodLumera
+  learnCost: 1.0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: moon_beam
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellGodLumeraMoonStrike
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT2
+
+# T3
+
+- type: cp14Skill
+  id: LumeraT3
+  skillUiPosition: 13, 0
+  tree: GodLumera
+  name: cp14-skill-lumera-t3-name
+  learnCost: 0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: t3
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT2
+  - !type:GodFollowerPercentage
+    percentage: 0.5
+
+- type: cp14Skill
+  id: LumeraMindUpgrade
+  skillUiPosition: 12, 3
+  tree: GodLumera
+  learnCost: 1.0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: mind_upgrade
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellGodLumeraMindUpgrade
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT3
+
+- type: cp14Skill
+  id: LumeraMindDegrade
+  skillUiPosition: 14, 3
+  tree: GodLumera
+  learnCost: 1.0
+  icon:
+    sprite: _CP14/Actions/DemigodSpells/lumera.rsi
+    state: wrath
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellGodLumeraMindDegrade
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT3
--- a/Resources/Prototypes/_CP14/Skill/Demigods/merkas.yml
+++ b/Resources/Prototypes/_CP14/Skill/Demigods/merkas.yml
@@ -0,0 +1,12 @@
+- type: cp14Skill
+  id: NatureGodT1
+  skillUiPosition: 1, 0
+  tree: GodMerkas
+  name: cp14-skill-life-t1-name
+  learnCost: 0.5
+  icon:
+    sprite: _CP14/Actions/skill_tree.rsi
+    state: heal
+  effects:
+  - !type:AddAction
+    action: CP14ActionSpellBloodPurification
--- a/Resources/Prototypes/_CP14/Skill/Demigods/trees.yml
+++ b/Resources/Prototypes/_CP14/Skill/Demigods/trees.yml
@@ -0,0 +1,12 @@
+- type: cp14SkillTree
+  id: GodMerkas
+  name: cp14-job-name-god-merkas
+  desc: cp14-job-desc-god-merkas
+  color: "#51cf72"
+
+- type: cp14SkillTree
+  id: GodLumera
+  name: cp14-job-name-god-lumera
+  desc: cp14-job-desc-god-lumera
+  color: "#5632a8"
+  parallax: Default
--- a/Resources/Prototypes/_CP14/Skill/thaumaturgy.yml
+++ b/Resources/Prototypes/_CP14/Skill/thaumaturgy.yml
@@ -1,15 +0,0 @@
- type: cp14Skill
-  id: AlchemyVision
-  skillUiPosition: 0, 0
-  tree: Thaumaturgy
-  name: cp14-skill-alchemy-vision-name
-  desc: cp14-skill-alchemy-vision-desc
-  learnCost: 1
-  icon:
-    sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi
-    state: icon
-  effects:
-  - !type:AddComponents
-    components:
-    - type: SolutionScanner
-
--- a/Resources/Prototypes/_CP14/SoundCollections/animals.yml
+++ b/Resources/Prototypes/_CP14/SoundCollections/animals.yml
@@ -11,3 +11,11 @@
  - /Audio/_CP14/Animals/frog1.ogg
  - /Audio/_CP14/Animals/frog2.ogg
  - /Audio/_CP14/Animals/frog3.ogg
+
+- type: soundCollection
+  id: CP14Flem
+  files:
+  - /Audio/_CP14/Animals/flem1.ogg
+  - /Audio/_CP14/Animals/flem2.ogg
+  - /Audio/_CP14/Animals/flem3.ogg
+  - /Audio/_CP14/Effects/bubbles.ogg
--- a/Resources/Prototypes/_CP14/SoundCollections/misc.yml
+++ b/Resources/Prototypes/_CP14/SoundCollections/misc.yml
@@ -42,3 +42,11 @@
    - /Audio/_CP14/Effects/coin_impact2.ogg
    - /Audio/_CP14/Effects/coin_impact3.ogg

+- type: soundCollection
+  id: CP14MoonStrike
+  files:
+    - /Audio/_CP14/Effects/moon_strike1.ogg
+    - /Audio/_CP14/Effects/moon_strike2.ogg
+    - /Audio/_CP14/Effects/moon_strike3.ogg
+    - /Audio/_CP14/Effects/moon_strike4.ogg
+
--- a/Resources/Prototypes/_CP14/StatusIcon/god_job.yml
+++ b/Resources/Prototypes/_CP14/StatusIcon/god_job.yml
@@ -0,0 +1,15 @@
+- type: jobIcon
+  parent: CP14JobIcon
+  id: CP14JobIconGodMerkas
+  icon:
+    sprite: /Textures/_CP14/Interface/Misc/job_god_icons.rsi
+    state: Merkas
+  jobName: cp14-job-name-god-merkas
+
+- type: jobIcon
+  parent: CP14JobIcon
+  id: CP14JobIconGodLumera
+  icon:
+    sprite: /Textures/_CP14/Interface/Misc/job_god_icons.rsi
+    state: Lumera
+  jobName: cp14-job-name-god-lumera
--- a/Resources/Prototypes/_CP14/Trading/brad_potions.yml
+++ b/Resources/Prototypes/_CP14/Trading/brad_potions.yml
@@ -139,6 +139,28 @@
  service: !type:CP14BuyItemsService
    product: CP14Syringe

+- type: cp14TradingPosition
+  id: CP14ClothingEyesAlchemyGlasses
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14ClothingEyesAlchemyGlasses
+
+- type: cp14TradingPosition
+  id: CP14ClothingEyesAlchemyMonocle
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Clothing/Eyes/alchemy_monocle.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14ClothingEyesAlchemyMonocle
+
 # Rep 2

 - type: cp14TradingPosition
--- a/Resources/Prototypes/_CP14/Trading/contracts.yml
+++ b/Resources/Prototypes/_CP14/Trading/contracts.yml
@@ -51,4 +51,4 @@
    state: house
  service: !type:CP14BuyItemsService
    product: CP14TradeContractHomeDecor
-    count: 1
+    count: 1
--- a/Resources/Prototypes/_CP14/Trading/thaumaturgy.yml
+++ b/Resources/Prototypes/_CP14/Trading/thaumaturgy.yml
@@ -113,6 +113,17 @@

 # Rep 1

+- type: cp14TradingPosition
+  id: CP14ClothingEyesMerchantMonocle
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Clothing/Eyes/merchant_monocle.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14ClothingEyesMerchantMonocle
+
 - type: cp14TradingPosition
  id: CP14ManaOperationGlove
  faction: Thaumaturgy
--- a/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml
+++ b/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml
@@ -66,13 +66,24 @@
    product: CP14FoodOnion
    count: 3

+- type: cp14TradingPosition
+  id: CP14Wheat
+  faction: VictoriaGardens
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/wheat.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14Wheat
+    count: 3
+

 - type: cp14TradingPosition
  id: CP14FloorTileGrassBag
  faction: VictoriaGardens
  priceMarkup: 2
  reputationLevel: 0
-  uiPosition: 7
+  uiPosition: 8
  icon:
    sprite: _CP14/Objects/Specific/Farming/grass_seeds.rsi
    state: grass
@@ -85,7 +96,7 @@
  faction: VictoriaGardens
  priceMarkup: 2
  reputationLevel: 0
-  uiPosition: 8
+  uiPosition: 9
  icon:
    sprite: _CP14/Objects/Specific/Farming/grass_seeds.rsi
    state: grass2
@@ -98,7 +109,7 @@
  faction: VictoriaGardens
  priceMarkup: 2
  reputationLevel: 0
-  uiPosition: 9
+  uiPosition: 10
  icon:
    sprite: _CP14/Objects/Specific/Farming/grass_seeds.rsi
    state: grass3
@@ -130,4 +141,16 @@
    state: base1
  service: !type:CP14BuyItemsService
    product: CP14FoodPumpkin
+    count: 3
+
+- type: cp14TradingPosition
+  id: CP14Cotton
+  faction: VictoriaGardens
+  reputationLevel: 1
+  uiPosition: 2
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/cotton.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14Cotton
    count: 3
--- a/Resources/Prototypes/_CP14/ai_factions.yml
+++ b/Resources/Prototypes/_CP14/ai_factions.yml
@@ -7,6 +7,7 @@
  - CP14Monster
  - CP14Insects
  - CP14Slimes
+  - CP14Fishies

 - type: npcFaction
  id: CP14HostileEveryone
@@ -17,6 +18,7 @@
  - CP14AggressiveAnimals
  - CP14Monster
  - CP14Slimes
+  - CP14Fishies

 - type: npcFaction
  id: CP14Undead
@@ -25,6 +27,7 @@
  - CP14HostileEveryone
  - CP14PeacefulAnimals
  - CP14AggressiveAnimals
+  - CP14Fishies

 - type: npcFaction
  id: CP14PeacefulAnimals
@@ -41,6 +44,7 @@
  - CP14Monster
  - CP14Slimes
  - CP14HostileEveryone
+  - CP14Fishies

 - type: npcFaction
  id: CP14Monster
@@ -56,6 +60,7 @@
  - CP14Adventurers
  - CP14AggressiveAnimals
  - CP14PeacefulAnimals
+  - CP14Fishies

 - type: npcFaction
  id: CP14Slimes
@@ -64,3 +69,13 @@
  - CP14HostileEveryone
  - CP14PeacefulAnimals
  - CP14AggressiveAnimals
+
+- type: npcFaction
+  id: CP14Fishies
+  hostile:
+  - CP14Adventurers
+  - CP14HostileEveryone
+  - CP14PeacefulAnimals
+  - CP14AggressiveAnimals
+  - CP14Insects
+  - CP14Undead