diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml index e7aaac5a88..b7e7459335 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml @@ -61,8 +61,7 @@ - HydrosophistryT1 - HydrosophistryT2 - PyrokineticT1 - - PyrokineticT2 - - CP14ActionSpellFireball + - CP14ActionSpellFlameCreation - CP14ActionSpellFreeze - CP14ActionSpellIceShards - CP14ActionSpellManaConsumeElf diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml index 1030bc0f89..030c803dc8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml @@ -12,35 +12,3 @@ - type: CP14ModularCraftAutoAssemble details: - BladeIronDagger - -- type: entity - id: CP14ModularIronDaggerTundra - parent: CP14ModularGripWooden - name: Dagger Tundra - description: A small, multi-purpose, sharp blade. You can cut meat or throw it at a goblin. It has "tundra" engraved on it. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - BladeIronDagger - - InlayQuartzWater - -- type: entity - id: CP14ModularIronDaggerAgony - parent: CP14ModularGripWooden - name: Dagger Agony - description: A small, multi-purpose, sharp blade. You can cut meat or throw it at a goblin. It has "agony" engraved on it. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - BladeIronDagger - - InlayQuartzElectric \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml index a96e33eb95..0ea44b359e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml @@ -29,7 +29,7 @@ - BladeCopperSkimitar - type: entity - id: CP14ModularIronSkimitarTundra + id: CP14ModularCopperSkimitarTundra parent: CP14ModularGripWooden name: Skimitar Tundra description: the gold standard of edged weapons. Medium length, comfortable grip. It has "tundra" engraved on it. @@ -37,11 +37,11 @@ - type: Sprite layers: - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi + - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi state: icon - type: CP14ModularCraftAutoAssemble details: - - BladeIronSkimitar + - BladeCopperSkimitar - InlayQuartzWater - type: entity @@ -53,7 +53,7 @@ - type: Sprite layers: - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi + - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi state: icon - type: CP14ModularCraftAutoAssemble details: diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml index 344ca979c9..851a3bd3f6 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml @@ -47,7 +47,7 @@ equipment: mask: CP14ClothingMaskSinner pants: CP14ClothingPantsLoincloth - belt: CP14ModularIronDagger + belt: CP14ModularCopperSkimitar belt2: CP14ModularIronDagger - type: startingGear @@ -89,8 +89,8 @@ outerClothing: CP14ClothingOuterClothingBoneArmor mask: CP14ClothingMaskBoneHornedMask pants: CP14ClothingPantsLoincloth - belt: CP14ModularIronDaggerTundra - belt2: CP14ModularIronDaggerAgony + belt: CP14ModularCopperSkimitarTundra + belt2: CP14ModularGoldSkimitarAgony shoes: CP14ClothingShoesSandals - type: startingGear