diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs index d599c324e17..21686f6acf5 100644 --- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs +++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs @@ -17,8 +17,8 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface = new Dictionary { ["WallsAndFlooring"] = ("rcd-component-walls-and-flooring", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/walls_and_flooring.png"))), - ["WindowsAndGrilles"] = ("rcd-component-windows-and-grilles", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/windows_and_grilles.png"))), - ["Airlocks"] = ("rcd-component-airlocks", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/airlocks.png"))), + ["WindowsAndGrilles"] = ("rcd-component-windows-and-grilles", new SpriteSpecifier.Texture(new ResPath("/Textures/_DV/Interface/Radial/RCD/windows_and_grilles.png"))), // DeltaV - Path changed to new sprites reflecting Delta-V resprites + ["Airlocks"] = ("rcd-component-airlocks", new SpriteSpecifier.Texture(new ResPath("/Textures/_DV/Interface/Radial/RCD/airlocks.png"))), // DeltaV - Path changed to new sprites reflecting Delta-V resprites ["Electrical"] = ("rcd-component-electrical", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/multicoil.png"))), ["Lighting"] = ("rcd-component-lighting", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/lighting.png"))), }; diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml index 375c5ce37cb..b8cb694bf40 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml @@ -7,7 +7,7 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/basic.rsi + sprite: _DV/Structures/Doors/Airlocks/Standard/basic.rsi # Delta V - Resprite Doors state: "assembly" - type: Physics - type: Fixtures diff --git a/Resources/Prototypes/RCD/rcd.yml b/Resources/Prototypes/RCD/rcd.yml index f476f06dc48..487c149cd27 100644 --- a/Resources/Prototypes/RCD/rcd.yml +++ b/Resources/Prototypes/RCD/rcd.yml @@ -7,7 +7,7 @@ id: Deconstruct name: rcd-component-deconstruct category: WallsAndFlooring - sprite: /Textures/Interface/Radial/RCD/deconstruct.png + sprite: /Textures/_DV/Interface/Radial/RCD/deconstruct.png # DeltaV - Changed to reflect airlock resprites mode: Deconstruct prototype: EffectRCDDeconstructPreview rotation: Camera @@ -103,7 +103,7 @@ - type: rcd id: Window category: WindowsAndGrilles - sprite: /Textures/Interface/Radial/RCD/window.png + sprite: /Textures/_DV/Interface/Radial/RCD/window.png # DeltaV - Changed to reflect window resprites mode: ConstructObject prototype: Window cost: 3 @@ -117,7 +117,7 @@ - type: rcd id: WindowDirectional category: WindowsAndGrilles - sprite: /Textures/Interface/Radial/RCD/directional.png + sprite: /Textures/_DV/Interface/Radial/RCD/directional.png # DeltaV - Changed to reflect window resprites mode: ConstructObject prototype: WindowDirectional cost: 2 @@ -132,7 +132,7 @@ - type: rcd id: ReinforcedWindow category: WindowsAndGrilles - sprite: /Textures/Interface/Radial/RCD/window_reinforced.png + sprite: /Textures/_DV/Interface/Radial/RCD/window_reinforced.png # DeltaV - Changed to reflect window resprites mode: ConstructObject prototype: ReinforcedWindow cost: 4 @@ -146,7 +146,7 @@ - type: rcd id: WindowReinforcedDirectional category: WindowsAndGrilles - sprite: /Textures/Interface/Radial/RCD/directional_reinforced.png + sprite: /Textures/_DV/Interface/Radial/RCD/directional_reinforced.png # DeltaV - Changed to reflect window resprites mode: ConstructObject prototype: WindowReinforcedDirectional cost: 3 @@ -162,7 +162,7 @@ - type: rcd id: Airlock category: Airlocks - sprite: /Textures/Interface/Radial/RCD/airlock.png + sprite: /Textures/_DV/Interface/Radial/RCD/airlock.png # DeltaV - Changed to reflect airlock resprites mode: ConstructObject prototype: Airlock cost: 4 @@ -174,7 +174,7 @@ - type: rcd id: AirlockGlass category: Airlocks - sprite: /Textures/Interface/Radial/RCD/glass_airlock.png + sprite: /Textures/_DV/Interface/Radial/RCD/glass_airlock.png # DeltaV - Changed to reflect airlock resprites mode: ConstructObject prototype: AirlockGlass cost: 4 diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 2fbb3561f07..3d80938e707 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -387,7 +387,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/window.rsi + sprite: _DV/Structures/Windows/window.rsi # DeltaV - Resprite windows state: full objectType: Structure placementMode: SnapgridCenter @@ -406,7 +406,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/window_diagonal.rsi + sprite: _DV/Structures/Windows/window_diagonal.rsi # DeltaV - Resprite windows state: state1 objectType: Structure placementMode: SnapgridCenter @@ -424,7 +424,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_window.rsi + sprite: _DV/Structures/Windows/reinforced_window.rsi # DeltaV - Resprite windows state: full objectType: Structure placementMode: SnapgridCenter @@ -443,7 +443,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_window_diagonal.rsi + sprite: _DV/Structures/Windows/reinforced_window_diagonal.rsi # DeltaV - Resprite windows state: state1 objectType: Structure placementMode: SnapgridCenter @@ -461,7 +461,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/tinted_window.rsi + sprite: _DV/Structures/Windows/tinted_window.rsi # DeltaV - Resprite windows state: full objectType: Structure placementMode: SnapgridCenter @@ -517,7 +517,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/plasma_window.rsi + sprite: _DV/Structures/Windows/plasma_window.rsi # DeltaV - Resprite windows state: full objectType: Structure placementMode: SnapgridCenter @@ -536,7 +536,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_plasma_window.rsi + sprite: _DV/Structures/Windows/reinforced_plasma_window.rsi # DeltaV - Resprite windows state: full objectType: Structure placementMode: SnapgridCenter @@ -574,7 +574,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/plasma_diagonal.rsi + sprite: _DV/Structures/Windows/plasma_diagonal.rsi # DeltaV - Resprite windows state: state1 objectType: Structure placementMode: SnapgridCenter @@ -592,7 +592,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_plasma_diagonal.rsi + sprite: _DV/Structures/Windows/reinforced_plasma_diagonal.rsi # DeltaV - Resprite windows state: state1 objectType: Structure placementMode: SnapgridCenter @@ -610,7 +610,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: _DV/Structures/Windows/directional.rsi #Delta V - Resprite windows + sprite: _DV/Structures/Windows/directional.rsi # DeltaV - Resprite windows state: window objectType: Structure placementMode: SnapgridCenter @@ -628,7 +628,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: _DV/Structures/Windows/directional.rsi #Delta V - Resprite windows + sprite: _DV/Structures/Windows/directional.rsi # DeltaV - Resprite windows state: reinforced_window objectType: Structure placementMode: SnapgridCenter @@ -664,7 +664,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: _DV/Structures/Windows/directional.rsi #Delta V - Resprite windows + sprite: _DV/Structures/Windows/directional.rsi # DeltaV - Resprite windows state: plasma_window objectType: Structure placementMode: SnapgridCenter @@ -682,7 +682,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: _DV/Structures/Windows/directional.rsi #Delta V - Resprite windows + sprite: _DV/Structures/Windows/directional.rsi # DeltaV - Resprite windows state: plasma_reinforced_window objectType: Structure placementMode: SnapgridCenter @@ -700,7 +700,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/uranium_window.rsi + sprite: _DV/Structures/Windows/uranium_window.rsi # DeltaV - Resprite windows state: full objectType: Structure placementMode: SnapgridCenter @@ -719,7 +719,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_uranium_window.rsi + sprite: _DV/Structures/Windows/reinforced_uranium_window.rsi # DeltaV - Resprite windows state: full objectType: Structure placementMode: SnapgridCenter @@ -738,7 +738,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/uranium_window_diagonal.rsi + sprite: _DV/Structures/Windows/uranium_window_diagonal.rsi # DeltaV - Resprite windows state: state1 objectType: Structure placementMode: SnapgridCenter @@ -756,7 +756,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_uranium_diagonal.rsi + sprite: _DV/Structures/Windows/reinforced_uranium_diagonal.rsi # DeltaV - Resprite windows state: state1 objectType: Structure placementMode: SnapgridCenter @@ -1271,7 +1271,7 @@ category: construction-category-structures description: It opens, it closes, and maybe crushes you. icon: - sprite: Structures/Doors/Airlocks/Standard/basic.rsi + sprite: _DV/Structures/Doors/Airlocks/Standard/basic.rsi # DeltaV - Changed to match DeltaV specific door sprite state: assembly objectType: Structure placementMode: SnapgridCenter @@ -1288,7 +1288,7 @@ category: construction-category-structures description: It opens, it closes, and maybe crushes you. icon: - sprite: Structures/Doors/Airlocks/Glass/glass.rsi + sprite: _DV/Structures/Doors/Airlocks/Glass/glass.rsi # DeltaV - Changed to match DeltaV specific door sprite state: assembly objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/airlock.png b/Resources/Textures/_DV/Interface/Radial/RCD/airlock.png new file mode 100644 index 00000000000..47c697f2e07 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/airlock.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/airlocks.png b/Resources/Textures/_DV/Interface/Radial/RCD/airlocks.png new file mode 100644 index 00000000000..49701a5a723 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/airlocks.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/attributions.yml b/Resources/Textures/_DV/Interface/Radial/RCD/attributions.yml new file mode 100644 index 00000000000..936079099a4 --- /dev/null +++ b/Resources/Textures/_DV/Interface/Radial/RCD/attributions.yml @@ -0,0 +1,14 @@ +- files: ["airlock.png, glass_airlock.png"] + license: "CC-BY-SA-3.0" + copyright: "RCD wheel sprites made for DeltaV by https://github.com/SubspaceEmber. based on ported sprites Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/basic.rsi and Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/glass.rsi from https://github.com/DeltaV-Station/Delta-v/tree/d9839a319a16ad48552393aa998fa51dc4377871/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/basic.rsi and https://github.com/DeltaV-Station/Delta-v/tree/d9839a319a16ad48552393aa998fa51dc4377871/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/basic.rsi." + source: "https://github.com/subspaceember" + +- files: ["deconstruct.png, directional.png, directional_reinforced.png, window.png, window_reinforced.png"] + license: "CC-BY-SA-3.0" + copyright: "RCD wheel sprites made for DeltaV by https://github.com/SubspaceEmber. based on ported sprites Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/external.rsi, Resources/Textures/_DV/Structures/Windows/window.rsi, Resources/Textures/_DV/Structures/Windows/directional.rsi, from https://github.com/ParadiseSS13/Paradise/blob/42099d95b1d3f271383e91ef8f9507c7581b57a0/icons/obj/doors/airlocks/external/external.dmi https://github.com/ParadiseSS13/Paradise/blob/42099d95b1d3f271383e91ef8f9507c7581b57a0/icons/obj/smooth_structures/windows/window.dmi Resources/Textures/_DV/Structures/Windows/reinforced_window.rsi https://github.com/ParadiseSS13/Paradise/blob/42099d95b1d3f271383e91ef8f9507c7581b57a0/icons/obj/smooth_structures/windows/window.dmi https://github.com/ParadiseSS13/Paradise/blob/42099d95b1d3f271383e91ef8f9507c7581b57a0/icons/obj/structures.dmi https://github.com/ParadiseSS13/Paradise/blob/42099d95b1d3f271383e91ef8f9507c7581b57a0/icons/obj/smooth_structures/windows/reinforced_window.dmi." + source: "https://github.com/subspaceember" + +- files: ["airlocks.png, windows_and_grilles.png"] + license: "CC-BY-SA-3.0" + copyright: "RCD wheel sprites made for DeltaV by https://github.com/SubspaceEmber. Modified from sprites Resources/Textures/Interface/Radial/RCD/airlocks.png and Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png from https://github.com/space-wizards/space-station-14/blob/c96af2808f5565505e7d3823a68276552193b236/Resources/Textures/Interface/Radial/RCD/airlocks.png and https://github.com/space-wizards/space-station-14/blob/c96af2808f5565505e7d3823a68276552193b236/Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png." + source: "https://github.com/subspaceember" diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/deconstruct.png b/Resources/Textures/_DV/Interface/Radial/RCD/deconstruct.png new file mode 100644 index 00000000000..792d4361f2d Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/deconstruct.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/directional.png b/Resources/Textures/_DV/Interface/Radial/RCD/directional.png new file mode 100644 index 00000000000..c7c49b8ccc7 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/directional.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/directional_reinforced.png b/Resources/Textures/_DV/Interface/Radial/RCD/directional_reinforced.png new file mode 100644 index 00000000000..1a1a97a4043 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/directional_reinforced.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/glass_airlock.png b/Resources/Textures/_DV/Interface/Radial/RCD/glass_airlock.png new file mode 100644 index 00000000000..e8cfb694180 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/glass_airlock.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/window.png b/Resources/Textures/_DV/Interface/Radial/RCD/window.png new file mode 100644 index 00000000000..1b34dff63ad Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/window.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/window_reinforced.png b/Resources/Textures/_DV/Interface/Radial/RCD/window_reinforced.png new file mode 100644 index 00000000000..6deef48778d Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/window_reinforced.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/windows_and_grilles.png b/Resources/Textures/_DV/Interface/Radial/RCD/windows_and_grilles.png new file mode 100644 index 00000000000..7914906617c Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/windows_and_grilles.png differ