diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml new file mode 100644 index 0000000000..65156f801c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml @@ -0,0 +1,28 @@ +- type: entity + abstract: true + parent: CP14ClothingBackpackBase + id: CP14ClothingSatchelBase + categories: [ ForkFiltered ] + components: + - type: Storage + grid: + - 0,0,1,3 + - 3,0,6,3 + - 8,0,9,3 + +- type: entity + parent: CP14ClothingSatchelBase + id: CP14ClothingSatchelLeather + name: leather satchel + description: You wear this on your back and put items into it. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/leather_satchel.rsi + state: icon + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml new file mode 100644 index 0000000000..10ef00effc --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml @@ -0,0 +1,76 @@ +- type: entity + abstract: true + id: CP14BaseEssence + categories: [ ForkFiltered ] + name: magic essence + description: Particles of magical energy polarised into a particular type of magic. Will be gone soon, so try to collect them as soon as possible! + components: + - type: Clickable + - type: Sprite + noRot: true + drawdepth: Mobs + sprite: _CP14/Objects/Specific/Thaumaturgy/essence.rsi + layers: + - state: small + shader: unshaded + - type: TimedDespawn + lifetime: 60 + - type: CanMoveInAir + - type: RandomWalk + minSpeed: 0.5 + maxSpeed: 1 + - type: Physics + bodyType: Dynamic + bodyStatus: InAir + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + #- ItemMask # CP14 swap ItemMask to Impassable only + - Impassable + restitution: 0.3 # fite me + friction: 0.2 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceFire + name: fire essence + components: + - type: Sprite + color: "#d9741c" + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceEarth + name: earth essence + components: + - type: Sprite + color: "#70533f" + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceWater + name: water essence + components: + - type: Sprite + color: "#1c94d9" + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceLight + name: light essence + components: + - type: Sprite + color: "#ba97b8" + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceDarkness + name: darkness essence + components: + - type: Sprite + color: "#391c57" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml index c80761a540..fb0c48608c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml @@ -7,7 +7,7 @@ description: The core that connects the real world to the demiplane. Use it to open a temporary passage to the other world. components: - type: Item - size: Tiny + size: Normal - type: Sprite sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi layers: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml index 8d73e48a59..d413349ae4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flint.yml @@ -2,7 +2,7 @@ parent: BaseItem id: CP14Lighter name: flint and steel - description: "Setting things on fire. Absolutely, 100% not from minecraft." # TODO: remove minecraft sprite and desc + description: Setting things on fire categories: [ ForkFiltered ] components: - type: Item diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index a225fad3a4..cfad94a37a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -390,12 +390,18 @@ name: cp14-loadout-general-back loadouts: - CP14ClothingBackpackLeather + - CP14ClothingSatchelLeather - type: loadout id: CP14ClothingBackpackLeather equipment: back: CP14ClothingBackpackLeather +- type: loadout + id: CP14ClothingSatchelLeather + equipment: + back: CP14ClothingSatchelLeather + # Trinkets - type: loadoutGroup @@ -415,7 +421,6 @@ - CP14ModularIronPickaxe - CP14Lighter - CP14Torch - - CP14DemiplaneKeyT1 - CP14FluteInstrument - CP14LyraInstrument - CP14ClothingBeltQuiver @@ -486,12 +491,6 @@ back: - CP14Torch -- type: loadout - id: CP14DemiplaneKeyT1 - storage: - back: - - CP14DemiplaneKeyT1 - - type: loadout id: CP14LyraInstrument storage: diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..670db2682e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..905533424e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..c476e396f2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK.png new file mode 100644 index 0000000000..6cb1e475ca Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/icon.png new file mode 100644 index 0000000000..dd3c472cd0 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-left.png new file mode 100644 index 0000000000..f905171fd0 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-right.png new file mode 100644 index 0000000000..57aae1140a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/meta.json new file mode 100644 index 0000000000..d3a3750d78 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creame (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/equipped-CLOAK.png index f4cbc488b0..18bce3baa4 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/icon.png index 321fd925b2..4babbf7313 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/meta.json index 47ee4578b9..660ed31f5e 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by hazzloebizhe, recolored by TheShuEd", + "copyright": "Created by TheShuEd", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/icon.png index aa7842adfd..c0081364cd 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/icon.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-left.png index 049d3fdfe0..1b2bd09777 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-left.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-right.png index 049d3fdfe0..1b2bd09777 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-right.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/meta.json index a034ae464a..194b4f885c 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github)", + "license": "All right reserved", + "copyright": "Created by TheShuEd (Github) & resprite omsoyk (discord)", "size": { "x": 48, "y": 48 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-left.png index 049d3fdfe0..1b2bd09777 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-left.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-right.png index 049d3fdfe0..1b2bd09777 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-right.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/cauldron.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/blank.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/blank.png deleted file mode 100644 index 7ee468b5b2..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/blank.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/dagger.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/dagger.png deleted file mode 100644 index f7dec4a846..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/dagger.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/meta.json deleted file mode 100644 index a080cf8b2c..0000000000 --- a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", - "states": [ - { - "name": "blank" - }, - { - "name": "dagger" - }, - { - "name": "nails" - }, - { - "name": "pickaxe" - }, - { - "name": "shovel" - }, - { - "name": "sickle" - }, - { - "name": "sword" - }, - { - "name": "throwable_spear" - }, - { - "name": "two_handed_sword" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/nails.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/nails.png deleted file mode 100644 index b0f4584264..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/nails.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/pickaxe.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/pickaxe.png deleted file mode 100644 index 311a7e82d7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/pickaxe.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/shovel.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/shovel.png deleted file mode 100644 index ec3f89b085..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/shovel.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/sickle.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/sickle.png deleted file mode 100644 index 807bf0a7b4..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/sickle.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/sword.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/sword.png deleted file mode 100644 index e5565706c0..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/sword.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/throwable_spear.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/throwable_spear.png deleted file mode 100644 index ee65b805dc..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/throwable_spear.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/two_handed_sword.png b/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/two_handed_sword.png deleted file mode 100644 index 38a818c8fa..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Specific/Blacksmith/melting_molds.rsi/two_handed_sword.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/essence.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/essence.rsi/meta.json new file mode 100644 index 0000000000..4ea98bd5e8 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/essence.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "small", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/essence.rsi/small.png b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/essence.rsi/small.png new file mode 100644 index 0000000000..90bdd47491 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/essence.rsi/small.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/flint.rsi/icon.png b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/icon.png index f3b04643fa..485c0acaa0 100644 Binary files a/Resources/Textures/_CP14/Objects/Tools/flint.rsi/icon.png and b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/flint.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/inhand-left.png new file mode 100644 index 0000000000..4dc802ab71 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/flint.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/inhand-right.png new file mode 100644 index 0000000000..428f172fb1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/flint.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/meta.json index 21dce574be..be41d69f24 100644 --- a/Resources/Textures/_CP14/Objects/Tools/flint.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tools/flint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Discord)", + "copyright": "Created by omsoyk (Discord)", "size": { "x": 32, "y": 32 @@ -9,6 +9,14 @@ "states": [ { "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core.png b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core.png index d37b98aa15..f478826b2e 100644 Binary files a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core.png and b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png index 51f324ab98..5ce89a8332 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq1.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq1.png index 4ac6b8c58f..71ae8da9d0 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq1.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq1.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq2.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq2.png index f66b3f6ce1..a32b481069 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq2.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq2.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq3.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq3.png index 1733991089..a01a6036ac 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq3.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq3.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq4.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq4.png index e435564e4f..c93b1c9fe1 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq4.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq4.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq5.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq5.png index a3acd94dca..2f9541767a 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq5.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq5.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq6.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq6.png index ad0b606b9d..08aa64f578 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq6.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/liq6.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/meta.json index 9f9ef5555b..792c942f04 100644 --- a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by Jaraten", + "copyright": "Created by Jaraten & resprite omsoyk (discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/crystal.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/crystal.png deleted file mode 100644 index 2a0d186de1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/crystal.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/spreader.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/spreader.png deleted file mode 100644 index 8690e6da04..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/spreader.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/analyzer.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/analyzer.png new file mode 100644 index 0000000000..0f94b007e4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/analyzer.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/crystal.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/crystal.png new file mode 100644 index 0000000000..b8d7354cdc Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/crystal.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/meta.json similarity index 67% rename from Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/meta.json index 573988accd..52b5c7d622 100644 --- a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/Spreader.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_analyzer.rsi/meta.json @@ -1,14 +1,14 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by Jaraten (discord/github) ", + "copyright": "Created by TheShuEd (github) ", "size": { "x": 32, "y": 48 }, "states": [ { - "name": "spreader" + "name": "analyzer" }, { "name": "crystal"