diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs index a060a178ec..52fdfd390c 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs @@ -30,7 +30,6 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; - private EntityQuery _metaQuery; private EntityQuery _stackQuery; @@ -86,6 +85,7 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem } var resultEntity = Spawn(_proto.Index(args.Recipe).Result); + _stack.TryMergeToContacts(resultEntity); _solutionContainer.TryGetSolution(resultEntity, recipe.Solution, out var resultSoln, out var resultSolution); if (recipe.TryMergeSolutions && resultSoln is not null) diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index 375ebb6fd9..50a4da1fd2 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -6,4 +6,6 @@ cp14-stack-cloth = rolls of fabric cp14-stack-copper-bars = copper bars cp14-stack-iron-bars = iron bars -cp14-stack-gold-bars = gold bars \ No newline at end of file +cp14-stack-gold-bars = gold bars + +cp14-stack-wallpaper = rolls of wallpaper \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/stack/wallpaper.ftl b/Resources/Locale/en-US/_CP14/stack/wallpaper.ftl deleted file mode 100644 index e1d48796ba..0000000000 --- a/Resources/Locale/en-US/_CP14/stack/wallpaper.ftl +++ /dev/null @@ -1,2 +0,0 @@ -cp14-stack-wallpaper-pink = rolls of pink wallpaper -cp14-stack-wallpaper-green = rolls of green wallpaper \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index c033f44724..4bcc95f070 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -6,4 +6,6 @@ cp14-stack-cloth = рулоны ткани cp14-stack-copper-bars = медные слитки cp14-stack-iron-bars = железные слитки -cp14-stack-gold-bars = золотые слитки \ No newline at end of file +cp14-stack-gold-bars = золотые слитки + +cp14-stack-wallpaper = рулон розоев \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stack/wallpaper.ftl b/Resources/Locale/ru-RU/_CP14/stack/wallpaper.ftl deleted file mode 100644 index c139e563c0..0000000000 --- a/Resources/Locale/ru-RU/_CP14/stack/wallpaper.ftl +++ /dev/null @@ -1,2 +0,0 @@ -cp14-stack-wallpaper-pink = рулоны розовых обоев -cp14-stack-wallpaper-green = рулоны зеленых обоев \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml new file mode 100644 index 0000000000..6d429d8dcd --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml @@ -0,0 +1,53 @@ +- type: entity + id: CP14PaperFolderBase + abstract: true + parent: BaseStorageItem + categories: [ ForkFiltered ] + name: folder + description: A folder filled with some paperwork. + components: + - type: Item + size: Small + - type: Storage + maxItemSize: Small + grid: + - 0,0,4,3 + whitelist: + tags: + - Document + - type: Tag + tags: + - Folder + - type: StorageFill + contents: + - id: CP14Paper + prob: 1 + - id: CP14Paper + prob: 1 + - id: CP14Paper + prob: 0.8 + - id: CP14Paper + prob: 0.6 + - id: CP14Paper + prob: 0.4 + - id: CP14Paper + prob: 0.2 + - type: ContainerContainer + containers: + storagebase: !type:Container + +- type: entity + id: CP14PaperFolderBlue + parent: CP14PaperFolderBase + components: + - type: Sprite + sprite: _CP14/Objects/Bureaucracy/paper.rsi + state: folder_blue + +- type: entity + id: CP14PaperFolderRed + parent: CP14PaperFolderBase + components: + - type: Sprite + sprite: _CP14/Objects/Bureaucracy/paper.rsi + state: folder_red \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml index e34425f5ff..311b57f292 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml @@ -56,6 +56,9 @@ reagents: - ReagentId: Fiber Quantity: 1 + - type: Tag + tags: + - Document - type: entity parent: CP14BasePaper diff --git a/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml b/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml index 5bc8ce937e..409bb9ef81 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/wallpaper.yml @@ -9,34 +9,25 @@ size: Normal - type: Sprite sprite: _CP14/Structures/Wallpaper/icons.rsi - -- type: entity - id: CP14WallpaperPurple1 - parent: CP14BaseWallpaper - name: purple wallpaper - suffix: 1 - components: - - type: Sprite - state: purple - - type: CP14Wallpaper - rsiPath: _CP14/Structures/Wallpaper/wallpaper_purple.rsi - - type: Stack - stackType: CP14WallpaperPurple - count: 1 - -- type: entity - id: CP14WallpaperPurple30 - parent: CP14WallpaperPurple1 - suffix: 30 - components: - type: Stack count: 30 - type: entity - id: CP14WallpaperGreen1 + id: CP14WallpaperBlack parent: CP14BaseWallpaper - name: green wallpaper - suffix: 1 + name: wallpaper "inkwell black" + components: + - type: Sprite + state: black + - type: CP14Wallpaper + rsiPath: _CP14/Structures/Wallpaper/wallpaper_black.rsi + - type: Stack + stackType: CP14WallpaperBlack + +- type: entity + id: CP14WallpaperGreen + parent: CP14BaseWallpaper + name: wallpaper "green orthogonality" components: - type: Sprite state: green @@ -44,12 +35,63 @@ rsiPath: _CP14/Structures/Wallpaper/wallpaper_green.rsi - type: Stack stackType: CP14WallpaperGreen - count: 1 - type: entity - id: CP14WallpaperGreen30 - parent: CP14WallpaperGreen1 - suffix: 30 + id: CP14WallpaperPurple + parent: CP14BaseWallpaper + name: wallpaper "purple glory" components: + - type: Sprite + state: purple + - type: CP14Wallpaper + rsiPath: _CP14/Structures/Wallpaper/wallpaper_purple.rsi - type: Stack - count: 30 + stackType: CP14WallpaperPurple + +- type: entity + id: CP14WallpaperRed + parent: CP14BaseWallpaper + name: wallpaper "burgundy" + components: + - type: Sprite + state: red + - type: CP14Wallpaper + rsiPath: _CP14/Structures/Wallpaper/wallpaper_red.rsi + - type: Stack + stackType: CP14WallpaperRed + +- type: entity + id: CP14WallpaperWhite + parent: CP14BaseWallpaper + name: wallpaper "flowers on white" + components: + - type: Sprite + state: white + - type: CP14Wallpaper + rsiPath: _CP14/Structures/Wallpaper/wallpaper_white.rsi + - type: Stack + stackType: CP14WallpaperWhite + +- type: entity + id: CP14WallpaperWhite2 + parent: CP14BaseWallpaper + name: wallpaper "pure white" + components: + - type: Sprite + state: white2 + - type: CP14Wallpaper + rsiPath: _CP14/Structures/Wallpaper/wallpaper_white2.rsi + - type: Stack + stackType: CP14WallpaperWhite2 + +- type: entity + id: CP14WallpaperYellow + parent: CP14BaseWallpaper + name: wallpaper "solar rhythm" + components: + - type: Sprite + state: yellow + - type: CP14Wallpaper + rsiPath: _CP14/Structures/Wallpaper/wallpaper_yellow.rsi + - type: Stack + stackType: CP14WallpaperYellow \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index f3d0ae1ece..ab6eeacc82 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -63,6 +63,7 @@ sprite: _CP14/Structures/Walls/whitebricks_stone_wall.rsi - type: IconSmooth base: stonebricks + - type: CP14WallpaperHolder - type: entity id: CP14WallBrownbrick diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index b18dcc0737..023f35abd6 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -260,3 +260,71 @@ CP14BloodFlower: 2 CP14FlowersYellow: 2 result: CP14ClothingHeadWreath + +# Wallpaper (TODO: Move to separate workbench?) + +- type: CP14Recipe + id: CP14WallpaperBlack + tag: CP14RecipeSewing + craftTime: 2 + stacks: + CP14Cloth: 10 + entities: + CP14DyeBlack: 1 + result: CP14WallpaperBlack + +- type: CP14Recipe + id: CP14WallpaperGreen + tag: CP14RecipeSewing + craftTime: 2 + stacks: + CP14Cloth: 10 + entities: + CP14DyeGreen: 1 + result: CP14WallpaperGreen + +- type: CP14Recipe + id: CP14WallpaperPurple + tag: CP14RecipeSewing + craftTime: 2 + stacks: + CP14Cloth: 10 + entities: + CP14DyePurple: 1 + result: CP14WallpaperPurple + +- type: CP14Recipe + id: CP14WallpaperRed + tag: CP14RecipeSewing + craftTime: 2 + stacks: + CP14Cloth: 10 + entities: + CP14DyeRed: 1 + result: CP14WallpaperRed + +- type: CP14Recipe + id: CP14WallpaperWhite + tag: CP14RecipeSewing + craftTime: 2 + stacks: + CP14Cloth: 10 + result: CP14WallpaperWhite + +- type: CP14Recipe + id: CP14WallpaperWhite2 + tag: CP14RecipeSewing + craftTime: 2 + stacks: + CP14Cloth: 10 + result: CP14WallpaperWhite2 + +- type: CP14Recipe + id: CP14WallpaperYellow + tag: CP14RecipeSewing + craftTime: 2 + stacks: + CP14Cloth: 10 + entities: + CP14DyeYellow: 1 + result: CP14WallpaperYellow diff --git a/Resources/Prototypes/_CP14/Stacks/wallpapers.yml b/Resources/Prototypes/_CP14/Stacks/wallpapers.yml index 5dfa567585..a718e8a0a3 100644 --- a/Resources/Prototypes/_CP14/Stacks/wallpapers.yml +++ b/Resources/Prototypes/_CP14/Stacks/wallpapers.yml @@ -1,13 +1,48 @@ - type: stack - id: CP14WallpaperPurple - name: cp14-stack-wallpaper-purple - spawn: CP14WallpaperPurple1 - icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: purple } + id: CP14WallpaperBlack + name: cp14-stack-wallpaper + spawn: CP14WallpaperBlack + icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: black } maxCount: 30 - type: stack id: CP14WallpaperGreen - name: cp14-stack-wallpaper-green - spawn: CP14WallpaperGreen1 + name: cp14-stack-wallpaper + spawn: CP14WallpaperGreen icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: green } maxCount: 30 + +- type: stack + id: CP14WallpaperPurple + name: cp14-stack-wallpaper + spawn: CP14WallpaperPurple + icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: purple } + maxCount: 30 + +- type: stack + id: CP14WallpaperRed + name: cp14-stack-wallpaper + spawn: CP14WallpaperRed + icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: red } + maxCount: 30 + +- type: stack + id: CP14WallpaperWhite + name: cp14-stack-wallpaper + spawn: CP14WallpaperWhite + icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: white } + maxCount: 30 + +- type: stack + id: CP14WallpaperWhite2 + name: cp14-stack-wallpaper + spawn: CP14WallpaperWhite2 + icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: white2 } + maxCount: 30 + +- type: stack + id: CP14WallpaperYellow + name: cp14-stack-wallpaper + spawn: CP14WallpaperYellow + icon: { sprite: _CP14/Structures/Wallpaper/icons.rsi, state: yellow } + maxCount: 30 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/folder_blue.png b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/folder_blue.png new file mode 100644 index 0000000000..8ddaacd9e4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/folder_blue.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/folder_red.png b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/folder_red.png new file mode 100644 index 0000000000..724b816b9f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/folder_red.png differ diff --git a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json index 86b75fe46a..b184585efd 100644 --- a/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json @@ -1,12 +1,18 @@ { "version": 1, "license": "CLA", - "copyright": "Created by Max Gab for CrystallPunk", + "copyright": "Created by Max Gab for CrystallPunk, folders by TheShuEd", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "folder_blue" + }, + { + "name": "folder_red" + }, { "name": "paper" }, diff --git a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil10.png b/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil10.png deleted file mode 100644 index 4be9527052..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil10.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil20.png b/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil20.png deleted file mode 100644 index 4be9527052..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil20.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil30.png b/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil30.png deleted file mode 100644 index 4be9527052..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/lv_coil30.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/meta.json deleted file mode 100644 index 9a80a61159..0000000000 --- a/Resources/Textures/_CP14/Objects/Tools/cable-coils.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CLA", - "copyright": "by TheShuEd for CrystallPunk", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "lv_coil10" - }, - { - "name": "lv_coil20" - }, - { - "name": "lv_coil30" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_0.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_0.png deleted file mode 100644 index 121d22e16e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_1.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_1.png deleted file mode 100644 index c0d2417b18..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_10.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_10.png deleted file mode 100644 index f67aa88db0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_10.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_11.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_11.png deleted file mode 100644 index 120fe2e8f9..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_11.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_12.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_12.png deleted file mode 100644 index cf7e019852..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_12.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_13.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_13.png deleted file mode 100644 index 310bf2b857..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_13.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_14.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_14.png deleted file mode 100644 index 6776faf8de..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_14.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_15.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_15.png deleted file mode 100644 index 5362ef0031..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_15.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_2.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_2.png deleted file mode 100644 index eccccf716a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_3.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_3.png deleted file mode 100644 index c87bdb1be8..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_4.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_4.png deleted file mode 100644 index 790c31269d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_5.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_5.png deleted file mode 100644 index 671da2e1e5..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_6.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_6.png deleted file mode 100644 index 9e7d74ab65..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_7.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_7.png deleted file mode 100644 index a974b41b72..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_8.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_8.png deleted file mode 100644 index 38bb0fe32d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_8.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_9.png b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_9.png deleted file mode 100644 index e0abc37c8e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/cable_9.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/meta.json b/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/meta.json deleted file mode 100644 index ae8e8c0388..0000000000 --- a/Resources/Textures/_CP14/Structures/Power/Cables/cable.rsi/meta.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CLA", - "copyright": "Created by TheShuEd for CrystallPunk", - "states": [ - { - "name": "cable_0", - "directions": 4 - }, - { - "name": "cable_1", - "directions": 4 - }, - { - "name": "cable_2", - "directions": 4 - }, - { - "name": "cable_3", - "directions": 4 - }, - { - "name": "cable_4", - "directions": 4 - }, - { - "name": "cable_5", - "directions": 4 - }, - { - "name": "cable_6", - "directions": 4 - }, - { - "name": "cable_7", - "directions": 4 - }, - { - "name": "cable_8", - "directions": 4 - }, - { - "name": "cable_9", - "directions": 4 - }, - { - "name": "cable_10", - "directions": 4 - }, - { - "name": "cable_11", - "directions": 4 - }, - { - "name": "cable_12", - "directions": 4 - }, - { - "name": "cable_13", - "directions": 4 - }, - { - "name": "cable_14", - "directions": 4 - }, - { - "name": "cable_15", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/black.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/black.png new file mode 100644 index 0000000000..f96e403c4c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/black.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 eabe98c3fd..ba5153d0ed 100644 --- a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/meta.json @@ -8,10 +8,25 @@ }, "states": [ { - "name": "purple" + "name": "black" }, { "name": "green" + }, + { + "name": "purple" + }, + { + "name": "red" + }, + { + "name": "white" + }, + { + "name": "white2" + }, + { + "name": "yellow" } ] } diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/red.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/red.png new file mode 100644 index 0000000000..52f2a35032 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/red.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/white.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/white.png new file mode 100644 index 0000000000..c9b4feddec Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/white.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/white2.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/white2.png new file mode 100644 index 0000000000..6edcda7c28 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/white2.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/yellow.png b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/yellow.png new file mode 100644 index 0000000000..0bcd57e65a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/icons.rsi/yellow.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/bottom.png new file mode 100644 index 0000000000..99e7fc46d5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/bottom.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/left.png new file mode 100644 index 0000000000..51601a0d60 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/left.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/meta.json new file mode 100644 index 0000000000..5596177727 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (discord) for CrystallPunk", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "bottom", + "directions": 4 + }, + { + "name": "top", + "directions": 4 + }, + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/right.png new file mode 100644 index 0000000000..02e35dcaf5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/right.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/top.png new file mode 100644 index 0000000000..9838fbb930 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_black.rsi/top.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/bottom.png new file mode 100644 index 0000000000..e5622390e4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/bottom.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/left.png new file mode 100644 index 0000000000..b60b5ccc52 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/left.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/meta.json new file mode 100644 index 0000000000..5596177727 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (discord) for CrystallPunk", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "bottom", + "directions": 4 + }, + { + "name": "top", + "directions": 4 + }, + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/right.png new file mode 100644 index 0000000000..88e170c4be Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/right.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/top.png new file mode 100644 index 0000000000..a4fc78d30a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_red.rsi/top.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/bottom.png new file mode 100644 index 0000000000..4d5a0c2975 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/bottom.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/left.png new file mode 100644 index 0000000000..0d8cfa2b4f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/left.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/meta.json new file mode 100644 index 0000000000..5596177727 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (discord) for CrystallPunk", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "bottom", + "directions": 4 + }, + { + "name": "top", + "directions": 4 + }, + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/right.png new file mode 100644 index 0000000000..21c95736ab Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/right.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/top.png new file mode 100644 index 0000000000..7556c02f7d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white.rsi/top.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/bottom.png new file mode 100644 index 0000000000..b74b88280d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/bottom.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/left.png new file mode 100644 index 0000000000..5b2b6e5435 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/left.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/meta.json new file mode 100644 index 0000000000..5596177727 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (discord) for CrystallPunk", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "bottom", + "directions": 4 + }, + { + "name": "top", + "directions": 4 + }, + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/right.png new file mode 100644 index 0000000000..a0e47c20e6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/right.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/top.png new file mode 100644 index 0000000000..3c4faa4f4d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_white2.rsi/top.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/bottom.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/bottom.png new file mode 100644 index 0000000000..ab4e37ef46 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/bottom.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/left.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/left.png new file mode 100644 index 0000000000..8dd6ca121b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/left.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/meta.json b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/meta.json new file mode 100644 index 0000000000..5596177727 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (discord) for CrystallPunk", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "bottom", + "directions": 4 + }, + { + "name": "top", + "directions": 4 + }, + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/right.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/right.png new file mode 100644 index 0000000000..e52f1a9100 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/right.png differ diff --git a/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/top.png b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/top.png new file mode 100644 index 0000000000..dafd6fd4d4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Wallpaper/wallpaper_yellow.rsi/top.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 5166f998d1..45f40d2249 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -75,7 +75,7 @@ CP14WoodenDoorTavernDorms5: CP14WoodenDoorTavernDorms CP14WoodenDoorTavernAlchemyLocked: CP14WoodenDoorTavernAlchemy #2024-09-24 -CP14WallpaperPink30: CP14WallpaperPurple30 +CP14WallpaperPink30: CP14WallpaperPurple #2024-09-25 CP14IronGrilleStraight: CP14FenceIronGrilleStraight @@ -104,6 +104,14 @@ CP14BarrelBloodGrassSap: CP14BarrelBloodFlowerSap #2024-10-11 CP14WoodenDresser: CP14WoodenCabinet + +#2024-10-17 +CP14WallpaperPurple1: CP14WallpaperPurple +CP14WallpaperPurple30: CP14WallpaperPurple +CP14WallpaperGreen1: CP14WallpaperGreen +CP14WallpaperGreen30: CP14WallpaperGreen + + # <---> CrystallPunk migration zone end