diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 68bd2c962d..54991d73bb 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -49,17 +49,20 @@ - id: CP14BaseWrench weight: 2 - id: CP14Scissors + - id: CP14Torch + - id: CP14Lighter - id: CP14ManaOperationGlove - id: CP14BaseShovel - id: CP14BaseMop - id: CP14BaseBroom - id: CP14BasePickaxe - - id: CP14CrystalLampBlueEmpty - - id: CP14CrystalLampOrangeEmpty + - !type:GroupSelector + children: + - id: CP14CrystalLampBlueEmpty + - id: CP14CrystalLampOrangeEmpty - id: CP14Rope - id: CP14Nail10 - id: CP14EnergyCrystalSmall - - id: CP14Lighter - id: CP14BaseSharpeningStone - !type:NestedSelector tableId: CP14RandomVials diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml index 7d01108acd..fc0ab3c0d3 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml @@ -11,7 +11,10 @@ - state: torch-unlit map: ["fuel"] - type: Item - size: Small + size: Normal + shape: + - 0,0,0,2 + storedRotation: -65 - type: CP14FlammableAmbientSound - type: AmbientSound enabled: false diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 992090b552..52584db7b3 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -305,6 +305,7 @@ - CP14BaseSickle - CP14BasePickaxe - CP14Lighter + - CP14Torch - type: loadout id: CP14MagicHealingStaff @@ -395,6 +396,12 @@ back: - CP14Lighter +- type: loadout + id: CP14Torch + storage: + back: + - CP14Torch + # Spells - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml index c2f9e347f4..154e0b996d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml @@ -51,6 +51,9 @@ - material: CP14WoodenPlanks amount: 3 doAfter: 3 + - material: CP14Cloth + amount: 1 + doAfter: 1 - node: CP14WallmountTorch entity: CP14WallmountTorch diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 7799b114a4..0880398972 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -51,3 +51,21 @@ stacks: CP14WoodenPlanks: 3 result: CP14BaseBattleStaff + +- type: CP14Recipe + id: CP14Torch + tag: CP14RecipeWorkbench + craftTime: 4 + stacks: + CP14WoodenPlanks: 3 + CP14Cloth: 1 + result: CP14Torch + +- type: CP14Recipe + id: CP14Lighter + tag: CP14RecipeWorkbench + craftTime: 4 + stacks: + CP14Stone: 1 + CP14IronBar: 1 + result: CP14Lighter diff --git a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-left.png index a8b07a415a..c03edb2a3c 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-left.png and b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-right.png index b5689d2b4c..3802583eb8 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-right.png and b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/meta.json index 3a9cc6ca7b..6a06929dd5 100644 --- a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/meta.json @@ -85,12 +85,6 @@ }, { "name": "torch-unlit" - }, - { - "name": "unlit-inhand-left" - }, - { - "name": "unlit-inhand-right" } ] } diff --git a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-left.png deleted file mode 100644 index c03edb2a3c..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-right.png deleted file mode 100644 index 3802583eb8..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-right.png and /dev/null differ