diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml new file mode 100644 index 0000000000..67409d2350 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml @@ -0,0 +1,42 @@ +- type: entity + abstract: true + parent: + - Clothing + - ContentsExplosionResistanceBase + id: CP14ClothingBackpackBase + components: + - type: Item + size: Huge + - type: Clothing + equipDelay: 0.4 + unequipDelay: 0.2 + slots: + - back + quickEquip: false + breakOnMove: false + - type: Storage + grid: + - 0,0,6,3 + maxItemSize: Huge + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UseDelay + delay: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + +- type: entity + parent: CP14ClothingBackpackBase + id: CP14ClothingBackpackLeather + name: leather backpack + description: You wear this on your back and put items into it. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/leather_backpack.rsi + state: icon diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml index 3f39870a00..bd20fd248f 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml @@ -8,6 +8,7 @@ unequipDelay: 0.3 slots: - HEAD + breakOnMove: false - type: Sprite state: icon - type: Item diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index 6310c5616b..c863ae4417 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -34,6 +34,7 @@ state: hands - type: Inventory templateId: CP14Human + speciesId: goblin displacements: belt: sizeMaps: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml b/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml index a715cfc24f..4fca0dd678 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml @@ -10,22 +10,22 @@ sprite: _CP14/Structures/Wallpaper/icons.rsi - type: entity - id: CP14WallpaperPink1 + id: CP14WallpaperPurple1 parent: CP14BaseWallpaper - name: pink wallpaper + name: purple wallpaper suffix: 1 components: - type: Sprite - state: pink + state: purple - type: CP14Wallpaper - rsiPath: _CP14/Structures/Wallpaper/wallpaper_pink.rsi + rsiPath: _CP14/Structures/Wallpaper/wallpaper_purple.rsi - type: Stack - stackType: CP14WallpaperPink + stackType: CP14WallpaperPurple count: 1 - type: entity - id: CP14WallpaperPink30 - parent: CP14WallpaperPink1 + id: CP14WallpaperPurple30 + parent: CP14WallpaperPurple1 suffix: 30 components: - type: Stack @@ -51,4 +51,4 @@ suffix: 30 components: - type: Stack - count: 30 \ No newline at end of file + count: 30 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index b4c554ac01..e649fdb02d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -49,7 +49,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - + - type: CP14WallpaperHolder + - type: entity ### Crushed Medium id: CP14WallStonebrickCrushedMedium name: stone brick wall @@ -137,12 +138,13 @@ randomStates: - bricksA - bricksB - + - type: CP14WallpaperHolder + - type: entity id: CP14WallWooden name: wooden wall - parent: + parent: - CP14BaseWall - CP14BaseFlammableSpreading components: @@ -175,7 +177,7 @@ id: CP14WallCardboard name: cardboard Wall description: A thin, flimsy wall made of paper and cardboard. Popular in warm countries. - parent: + parent: - CP14WallWooden - CP14BaseFlammableSpreadingStrong components: @@ -197,7 +199,8 @@ - type: Construction graph: CP14WallWood node: WallCardboard - + - type: CP14WallpaperHolder + - type: entity id: CP14WallCyan name: cyan wall @@ -228,7 +231,8 @@ - skullsA - skullsB - type: Appearance - + - type: CP14WallpaperHolder + - type: entity id: CP14WallSteel name: steel wall diff --git a/Resources/Prototypes/_CP14/Stacks/wallpapers.yml b/Resources/Prototypes/_CP14/Stacks/wallpapers.yml index bea25fd53c..5dfa567585 100644 --- a/Resources/Prototypes/_CP14/Stacks/wallpapers.yml +++ b/Resources/Prototypes/_CP14/Stacks/wallpapers.yml @@ -1,10 +1,10 @@ - type: stack - id: CP14WallpaperPink - name: cp14-stack-wallpaper-pink - spawn: CP14WallpaperPink1 - icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: pink } + id: CP14WallpaperPurple + name: cp14-stack-wallpaper-purple + spawn: CP14WallpaperPurple1 + icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: purple } maxCount: 30 - + - type: stack id: CP14WallpaperGreen name: cp14-stack-wallpaper-green diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..9b6302fc5a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..d22a5e46d5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/icon.png new file mode 100644 index 0000000000..01c9921565 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-left.png new file mode 100644 index 0000000000..d47ee3a7d5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-right.png new file mode 100644 index 0000000000..2e7c40d93f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json new file mode 100644 index 0000000000..37659aad00 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by jaraten (Discord/Github) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/green.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/green.png index e296a8c1b8..95afe50539 100644 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/green.png and b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/green.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/meta.json index 796538d3f3..eabe98c3fd 100644 --- a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "pink" + "name": "purple" }, { "name": "green" diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/pink.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/pink.png deleted file mode 100644 index 30ac7833ee..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/pink.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/purple.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/purple.png new file mode 100644 index 0000000000..e94e700c37 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/purple.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/bottom.png index de06b94797..96f3ec87ca 100644 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/bottom.png and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/bottom.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/left.png index d440c9afd5..27d491ec4e 100644 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/left.png and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/left.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/meta.json index 4a802ffec7..ed8a32001a 100644 --- a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CLA", - "copyright": "Created by TheShuEd (Github/discord) for CrystallPunk", + "copyright": "Created by jaraten (Github/discord) for CrystallPunk", "size": { "x": 32, "y": 64 diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/right.png index fdb53dd133..69f9717e0d 100644 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/right.png and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/right.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/top.png index 39e929bbdd..b20305e57e 100644 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/top.png and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_green.rsi/top.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/bottom.png deleted file mode 100644 index c05562d578..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/bottom.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/left.png deleted file mode 100644 index 20452afa3b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/right.png deleted file mode 100644 index 0304fc3b66..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/top.png deleted file mode 100644 index b046f6327b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/top.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/bottom.png new file mode 100644 index 0000000000..0a1b4948dd Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/bottom.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/left.png new file mode 100644 index 0000000000..f761dbb1e9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/left.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/meta.json similarity index 82% rename from Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/meta.json index 4a802ffec7..ed8a32001a 100644 --- a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_pink.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CLA", - "copyright": "Created by TheShuEd (Github/discord) for CrystallPunk", + "copyright": "Created by jaraten (Github/discord) for CrystallPunk", "size": { "x": 32, "y": 64 diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/right.png new file mode 100644 index 0000000000..598b0c7126 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/right.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/top.png new file mode 100644 index 0000000000..99b9331e4c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_purple.rsi/top.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png index c22c180ec2..b5b9916845 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png index ed6e26865b..f0793517d0 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png index 65fd336de3..68a9e27cfe 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png index ed6e26865b..e4712d3af8 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png index 65fd336de3..1c9cf93533 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png index fde15ed655..ab83179383 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png index deef3e4948..b5b9916845 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png index fde15ed655..f612941d22 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png index cd63b33ec0..c8b4aae378 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png and b/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png index 5b9ae66ffd..a019fe057a 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png and b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/full.png index 931b4379c9..42a0a20050 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/full.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood0.png index 3ff6d31d39..8e4b6927bf 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood0.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood1.png index 3b15d8f1f8..f385a84322 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood1.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood2.png index 3ff6d31d39..8e4b6927bf 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood2.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood3.png index 5c85ae56cb..79de4d75f6 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood3.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood4.png index c121f4d940..2b92a11622 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood4.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood5.png index b2a0d25fed..fda6698073 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood5.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood6.png index a9503d0de2..aab67ab50d 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood6.png and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/wood6.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 96b8d6e84f..07cd691d73 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -80,6 +80,8 @@ CP14WoodenDoorTavernDorms4: CP14WoodenDoorTavernDorms CP14WoodenDoorTavernDorms5: CP14WoodenDoorTavernDorms CP14WoodenDoorTavernAlchemyLocked: CP14WoodenDoorTavernAlchemy +#2024-09-24 +CP14WallpaperPink30: CP14WallpaperPurple30 # <---> CrystallPunk migration zone end