diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 5e2969956c..d0471f5e43 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -342,10 +342,12 @@ - HVCable - CableTerminal - Deconstruct + - Windoor # DeltaV - Added base RCD windoors + - PostLight # DeltaV - added base RCD postlight - type: LimitedCharges maxCharges: 30 - type: Sprite - sprite: Objects/Tools/rcd.rsi + sprite: _DV/Objects/Tools/RCD.rsi # DeltaV - RCD inhand resprite state: icon - type: Item size: Normal @@ -387,6 +389,41 @@ maxCharges: 20 - type: AutoRecharge rechargeDuration: 10 +# Begin DeltaV additions. Added extra items that can be made with the experimental RCD and new sprites + - type: RCD + availablePrototypes: + - WallSolid + - FloorSteel + - Plating + - Catwalk + - Grille + - Window + - WindowDirectional + - WindowReinforcedDirectional + - ReinforcedWindow + - Airlock + - AirlockGlass + - Firelock + - TubeLight + - BulbLight + - LVCable + - MVCable + - HVCable + - CableTerminal + - Deconstruct + - Windoor + - PostLight + - WallReinforced + - PlasmaWindow + - PlasmaWindowDirectional + - PlasmaReinforcedWindowDirectional + - AirlockExternal + - AirlockExternalGlass + - ReinforcedPlasmaWindow + - type: Sprite + sprite: _DV/Objects/Tools/RCD_experimental.rsi +# End DeltaV additions + - type: entity id: RCDExperimental @@ -397,6 +434,10 @@ components: - type: AutoRecharge rechargeDuration: 1 +# Begin DeltaV additions. New experimental RCD sprite + - type: Sprite + sprite: _DV/Objects/Tools/RCD_experimental.rsi +# End DeltaV additions - type: entity name: compressed matter diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/tools.yml index 11490f4bc1..258f96bf83 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/tools.yml @@ -6,3 +6,7 @@ components: - type: LimitedCharges maxCharges: 500 + - type: Sprite + sprite: _DV/Objects/Tools/RCD_combat.rsi + - type: Clothing + sprite: _DV/Objects/Tools/RCD_combat.rsi diff --git a/Resources/Prototypes/_DV/RCD/RCD.yml b/Resources/Prototypes/_DV/RCD/RCD.yml new file mode 100644 index 0000000000..d8227c0f50 --- /dev/null +++ b/Resources/Prototypes/_DV/RCD/RCD.yml @@ -0,0 +1,115 @@ +- type: rcd + id: Windoor + category: Airlocks + sprite: /Textures/_DV/Interface/Radial/RCD/windoor.png + mode: ConstructObject + prototype: Windoor + cost: 4 + delay: 4 + collisionMask: FullTileMask + rotation: Camera + fx: EffectRCDConstruct4 + +- type: rcd + id: PostLight + category: Lighting + sprite: /Textures/_DV/Interface/Radial/RCD/postlight.png + mode: ConstructObject + prototype: PoweredLightPostSmall + cost: 2 + delay: 1 + rotation: User + fx: EffectRCDConstruct1 + + #Experimental RCD +- type: rcd + id: WallReinforced + category: WallsAndFlooring + sprite: /Textures/_DV/Interface/Radial/RCD/reinforced_wall.png + mode: ConstructObject + prototype: WallReinforced + cost: 8 + delay: 4 + collisionMask: FullTileMask + rotation: Fixed + fx: EffectRCDConstruct2 + +- type: rcd + id: PlasmaWindow + category: WindowsAndGrilles + sprite: /Textures/_DV/Interface/Radial/RCD/window_plasma.png + mode: ConstructObject + prototype: PlasmaWindow + cost: 4 + delay: 2 + collisionMask: Impassable + rules: + - IsWindow + rotation: Fixed + fx: EffectRCDConstruct2 + +- type: rcd + id: ReinforcedPlasmaWindow + category: WindowsAndGrilles + sprite: /Textures/_DV/Interface/Radial/RCD/window_reinforced_plasma.png + mode: ConstructObject + prototype: ReinforcedPlasmaWindow + cost: 6 + delay: 4 + collisionMask: Impassable + rules: + - IsWindow + rotation: Fixed + fx: EffectRCDConstruct2 + +- type: rcd + id: PlasmaWindowDirectional + category: WindowsAndGrilles + sprite: /Textures/_DV/Interface/Radial/RCD/directional_plasma.png + mode: ConstructObject + prototype: PlasmaWindowDirectional + cost: 4 + delay: 2 + collisionMask: Impassable + rules: + - IsWindow + rotation: Fixed + fx: EffectRCDConstruct2 + +- type: rcd + id: PlasmaReinforcedWindowDirectional + category: WindowsAndGrilles + sprite: /Textures/_DV/Interface/Radial/RCD/directional_reinforced_plasma.png + mode: ConstructObject + prototype: PlasmaReinforcedWindowDirectional + cost: 6 + delay: 4 + collisionMask: Impassable + rules: + - IsWindow + rotation: Fixed + fx: EffectRCDConstruct2 + +- type: rcd + id: AirlockExternal + category: Airlocks + sprite: /Textures/_DV/Interface/Radial/RCD/external.png + mode: ConstructObject + prototype: AirlockExternal + cost: 8 + delay: 4 + collisionMask: FullTileMask + rotation: Camera + fx: EffectRCDConstruct4 + +- type: rcd + id: AirlockExternalGlass + category: Airlocks + sprite: /Textures/_DV/Interface/Radial/RCD/glass_external.png + mode: ConstructObject + prototype: AirlockExternalGlass + cost: 8 + delay: 4 + collisionMask: FullTileMask + rotation: Camera + fx: EffectRCDConstruct4 diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/attributions.yml b/Resources/Textures/_DV/Interface/Radial/RCD/attributions.yml index 936079099a..071f98cbb7 100644 --- a/Resources/Textures/_DV/Interface/Radial/RCD/attributions.yml +++ b/Resources/Textures/_DV/Interface/Radial/RCD/attributions.yml @@ -1,14 +1,14 @@ -- files: ["airlock.png, glass_airlock.png"] +- files: ["airlock.png, glass_airlock.png, reinforced_wall.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." + 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 Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/glass.rsi Resources/Textures/Structures/Walls/solid.rsi from https://github.com/DeltaV-Station/Delta-v/tree/d9839a319a16ad48552393aa998fa51dc4377871/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/basic.rsi https://github.com/DeltaV-Station/Delta-v/tree/d9839a319a16ad48552393aa998fa51dc4377871/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/basic.rsi https://github.com/SubspaceEmber/Delta-v/tree/d8815a31b984d0b8ac1de7992759e8227cc6574d/Resources/Textures/Structures/Walls/solid.rsi." source: "https://github.com/subspaceember" -- files: ["deconstruct.png, directional.png, directional_reinforced.png, window.png, window_reinforced.png"] +- files: ["deconstruct.png, directional.png, directional_reinforced.png, window.png, window_reinforced.png, directional_plasma.png, directional_reinforced_plasma.png, window_plasma.png window_reinforced_plasma.png, external.png, glass_external.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." + 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 https://github.com/ParadiseSS13/Paradise/blob/42099d95b1d3f271383e91ef8f9507c7581b57a0/icons/obj/smooth_structures/windows/plasma_window.dmi https://github.com/ParadiseSS13/Paradise/blob/42099d95b1d3f271383e91ef8f9507c7581b57a0/icons/obj/smooth_structures/windows/rplasma_window.dmi." source: "https://github.com/subspaceember" -- files: ["airlocks.png, windows_and_grilles.png"] +- files: ["airlocks.png, windows_and_grilles.png, postlight.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." + copyright: "RCD wheel sprites made for DeltaV by https://github.com/SubspaceEmber. Modified from sprites Resources/Textures/Interface/Radial/RCD/airlocks.png, Resources/Textures/Interface/Radial/RCD/windows_and_grilles.png, Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi 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 https://github.com/space-wizards/space-station-14/tree/90fd66c3d4e723d582f2de226eaa641123330142/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi." source: "https://github.com/subspaceember" diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/directional_plasma.png b/Resources/Textures/_DV/Interface/Radial/RCD/directional_plasma.png new file mode 100644 index 0000000000..1cd7b2ce93 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/directional_plasma.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/directional_reinforced_plasma.png b/Resources/Textures/_DV/Interface/Radial/RCD/directional_reinforced_plasma.png new file mode 100644 index 0000000000..c8ba7b3c8d Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/directional_reinforced_plasma.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/external.png b/Resources/Textures/_DV/Interface/Radial/RCD/external.png new file mode 100644 index 0000000000..696c6df8c6 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/external.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/glass_external.png b/Resources/Textures/_DV/Interface/Radial/RCD/glass_external.png new file mode 100644 index 0000000000..3d882c1b1e Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/glass_external.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/postlight.png b/Resources/Textures/_DV/Interface/Radial/RCD/postlight.png new file mode 100644 index 0000000000..bebd9c9665 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/postlight.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/reinforced_wall.png b/Resources/Textures/_DV/Interface/Radial/RCD/reinforced_wall.png new file mode 100644 index 0000000000..023ea89356 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/reinforced_wall.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/windoor.png b/Resources/Textures/_DV/Interface/Radial/RCD/windoor.png new file mode 100644 index 0000000000..9eb9a0f51b Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/windoor.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/window_plasma.png b/Resources/Textures/_DV/Interface/Radial/RCD/window_plasma.png new file mode 100644 index 0000000000..a017c30967 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/window_plasma.png differ diff --git a/Resources/Textures/_DV/Interface/Radial/RCD/window_reinforced_plasma.png b/Resources/Textures/_DV/Interface/Radial/RCD/window_reinforced_plasma.png new file mode 100644 index 0000000000..ef359d5889 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Radial/RCD/window_reinforced_plasma.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/equipped-BELT.png new file mode 100644 index 0000000000..0b6ed65457 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD.rsi/icon.png b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/icon.png new file mode 100644 index 0000000000..cb62979010 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/inhand-left.png new file mode 100644 index 0000000000..8c624d80c0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/inhand-right.png new file mode 100644 index 0000000000..001def2b44 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD.rsi/meta.json b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/meta.json new file mode 100644 index 0000000000..20d077833b --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tools/RCD.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept. New inhand version made by https://github.com/SubspaceEmber for DeltaV.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/icon.png b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/icon.png new file mode 100644 index 0000000000..822ac59b40 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/inhand-left.png new file mode 100644 index 0000000000..7da876739b Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/inhand-right.png new file mode 100644 index 0000000000..b84be0ab8d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/meta.json b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/meta.json new file mode 100644 index 0000000000..98d68362bd --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tools/RCD_combat.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original design from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept. New combat version made by https://github.com/SubspaceEmber for DeltaV.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/icon.png b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/icon.png new file mode 100644 index 0000000000..895985fef2 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/inhand-left.png new file mode 100644 index 0000000000..09338ce281 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/inhand-right.png new file mode 100644 index 0000000000..5be1e7e14d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/meta.json b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/meta.json new file mode 100644 index 0000000000..50612d9b62 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tools/RCD_experimental.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original design from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept. New experimental version made by https://github.com/SubspaceEmber for DeltaV.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}