From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Wed, 7 May 2025 11:37:59 +0000 (+1200) Subject: Four-way pipe junction, swapping junction construction fix (#37092) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ae6f96fa8799737abf968a544366c434e3a43449;p=space-station-14.git Four-way pipe junction, swapping junction construction fix (#37092) * pipe x-junction assets, yml, construction * remove duplicate asset * attribution * x junction instead of junctioncross for utilities.yml --- diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index d6d5454384..bb7b08cc2c 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -356,6 +356,7 @@ mask: - SubfloorMask - type: Construction + graph: DisposalPipe node: junctionflipped containers: - DisposalJunction @@ -400,6 +401,48 @@ containers: - DisposalJunction +- type: entity + id: DisposalXJunction + parent: DisposalPipeBase + name: disposal x-junction + description: A four-way junction. The arrow indicates where items exit. + components: + - type: Sprite + layers: + - map: [ "pipe" ] + state: conpipe-x + visible: true + - type: DisposalTube + containerId: DisposalJunction + - type: DisposalJunction + degrees: + - 0 + - -90 + - 180 + - 90 + - type: ContainerContainer + containers: + DisposalJunction: !type:Container + - type: GenericVisualizer + visuals: + enum.DisposalTubeVisuals.VisualState: + pipe: + Free: { state: conpipe-x } + Anchored: { state: pipe-x } + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + mask: + - SubfloorMask + - type: Construction + graph: DisposalPipe + node: xJunction + containers: + - DisposalJunction + - type: entity id: DisposalBend parent: DisposalPipeBase diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_pipes.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_pipes.yml index 1b3aa3105b..41ec858a1a 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_pipes.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_pipes.yml @@ -46,6 +46,11 @@ - material: Steel amount: 2 doAfter: 1 + - to: xJunction + steps: + - material: Steel + amount: 2 + doAfter: 1 - to: bend steps: - material: Steel @@ -157,8 +162,8 @@ steps: - tool: Screwing doAfter: 1 - - node: junctionflipped - entity: DisposalJunctionFlipped + - node: yJunction + entity: DisposalYJunction edges: - to: start completed: @@ -169,12 +174,12 @@ steps: - tool: Welding doAfter: 1 - - to: yJunction + - to: junctionflipped steps: - tool: Screwing doAfter: 1 - - node: yJunction - entity: DisposalYJunction + - node: junctionflipped + entity: DisposalJunctionFlipped edges: - to: start completed: @@ -185,14 +190,27 @@ steps: - tool: Welding doAfter: 1 - - to: junction + - to: xJunction steps: - tool: Screwing doAfter: 1 - - to: junctionflipped + - node: xJunction + entity: DisposalXJunction + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + - !type:DeleteEntity + steps: + - tool: Welding + doAfter: 1 + - to: junction steps: - tool: Screwing doAfter: 1 + # DisposalBend - node: bend entity: DisposalBend edges: diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml index 680bc4e36b..0feffe998d 100644 --- a/Resources/Prototypes/Recipes/Construction/utilities.yml +++ b/Resources/Prototypes/Recipes/Construction/utilities.yml @@ -200,6 +200,15 @@ placementMode: SnapgridCenter canBuildInImpassable: false +- type: construction + id: DisposalXJunction + graph: DisposalPipe + startNode: start + targetNode: xJunction + category: construction-category-utilities + placementMode: SnapgridCenter + canBuildInImpassable: false + - type: construction id: DisposalBend graph: DisposalPipe diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-x.png b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-x.png new file mode 100644 index 0000000000..bd67ab45e1 Binary files /dev/null and b/Resources/Textures/Structures/Piping/disposal.rsi/conpipe-x.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json index fab3d5249f..7fce39e694 100644 --- a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json +++ b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf. Signal router sprites based on normal router modified by deltanedas (github). disposal bins by EmoGarbage404 (github)", + "copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf. Signal router sprites based on normal router modified by deltanedas (github). disposal bins by EmoGarbage404 (github). pipe-x pipe-xf, conpipe-x by K-Dynamic (github).", "states": [ { "name": "condisposal", @@ -35,6 +35,10 @@ "name": "conpipe-j2s", "directions": 4 }, + { + "name": "conpipe-x", + "directions": 4 + }, { "name": "conpipe-s", "directions": 4 @@ -291,6 +295,14 @@ "name": "pipe-j2sf", "directions": 4 }, + { + "name": "pipe-x", + "directions": 4 + }, + { + "name": "pipe-xf", + "directions": 4 + }, { "name": "pipe-s", "directions": 4 @@ -315,10 +327,6 @@ "name": "pipe-tf", "directions": 4 }, - { - "name": "pipe-u", - "directions": 4 - }, { "name": "pipe-y", "directions": 4 diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/pipe-u.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-u.png deleted file mode 100644 index 021d067b7b..0000000000 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/pipe-u.png and /dev/null differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/pipe-x.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-x.png new file mode 100644 index 0000000000..0f5085c11b Binary files /dev/null and b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-x.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/pipe-xf.png b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-xf.png new file mode 100644 index 0000000000..c590b89190 Binary files /dev/null and b/Resources/Textures/Structures/Piping/disposal.rsi/pipe-xf.png differ