From 906d9dd159eb352fefa4212a5e6853320000bbf5 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Wed, 15 Dec 2021 11:27:52 +0000 Subject: [PATCH] Organised construction graphs into folders (#5723) Co-authored-by: metalgearsloth --- .../Graphs/{ => furniture}/seats.yml | 0 .../Graphs/{ => furniture}/tables.yml | 0 .../Graphs/{ => furniture}/toilet.yml | 0 .../Graphs/{ => machines}/computer.yml | 0 .../Graphs/{ => machines}/machine.yml | 0 .../Graphs/{ => machines}/turing.yml | 0 .../Graphs/{ => materials}/glass.yml | 0 .../Graphs/{ => materials}/metal_rod.yml | 0 .../Graphs/{ => structures}/airlock.yml | 0 .../Graphs/{ => structures}/barricades.yml | 0 .../Graphs/{ => structures}/catwalk.yml | 0 .../Graphs/{ => structures}/conveyor.yml | 0 .../Graphs/{ => structures}/firelock.yml | 0 .../Graphs/{ => structures}/girder.yml | 0 .../Graphs/{ => structures}/grille.yml | 0 .../Graphs/{ => structures}/lighting.yml | 0 .../Graphs/{ => structures}/low_wall.yml | 0 .../Graphs/{ => structures}/windoor.yml | 0 .../Graphs/{ => structures}/window.yml | 0 .../{ => structures}/windowdirectional.yml | 0 .../Construction/Graphs/{ => tools}/torch.yml | 0 .../Graphs/{ => utilities}/APC.yml | 0 .../cable_terminal.yml} | 0 .../{ => utilities}/disposal_machines.yml | 0 .../{ => utilities}/particle_accelerator.yml | 0 .../Graphs/{ => utilities}/solarpanel.yml | 0 .../Graphs/{ => weapons}/spear.yml | 0 .../Recipes/Construction/conveyor.yml | 32 --- .../Recipes/Construction/disposal.yml | 12 - .../Recipes/Construction/furniture.yml | 154 ++++++++++- .../Recipes/Construction/lighting.yml | 58 ----- .../Recipes/Construction/structures.yml | 244 ++++++++++++------ .../Recipes/Construction/tables.yml | 118 --------- .../Construction/{power.yml => utilities.yml} | 25 +- .../Crafting/Graphs/{ => improvised}/bat.yml | 0 .../{ => improvised}/makeshifthandcuffs.yml | 0 .../{ => improvised}/pneumatic_cannon.yml | 0 .../{ => storage}/crategenericsteel.yml | 0 .../Graphs/{ => storage}/cratelivestock.yml | 0 .../Graphs/{ => storage}/crateplastic.yml | 0 .../Graphs/{ => storage}/cratesecure.yml | 0 41 files changed, 338 insertions(+), 305 deletions(-) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => furniture}/seats.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => furniture}/tables.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => furniture}/toilet.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => machines}/computer.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => machines}/machine.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => machines}/turing.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => materials}/glass.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => materials}/metal_rod.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/airlock.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/barricades.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/catwalk.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/conveyor.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/firelock.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/girder.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/grille.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/lighting.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/low_wall.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/windoor.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/window.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => structures}/windowdirectional.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => tools}/torch.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => utilities}/APC.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{wire_terminal.yml => utilities/cable_terminal.yml} (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => utilities}/disposal_machines.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => utilities}/particle_accelerator.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => utilities}/solarpanel.yml (100%) rename Resources/Prototypes/Recipes/Construction/Graphs/{ => weapons}/spear.yml (100%) delete mode 100644 Resources/Prototypes/Recipes/Construction/conveyor.yml delete mode 100644 Resources/Prototypes/Recipes/Construction/disposal.yml delete mode 100644 Resources/Prototypes/Recipes/Construction/lighting.yml delete mode 100644 Resources/Prototypes/Recipes/Construction/tables.yml rename Resources/Prototypes/Recipes/Construction/{power.yml => utilities.yml} (74%) rename Resources/Prototypes/Recipes/Crafting/Graphs/{ => improvised}/bat.yml (100%) rename Resources/Prototypes/Recipes/Crafting/Graphs/{ => improvised}/makeshifthandcuffs.yml (100%) rename Resources/Prototypes/Recipes/Crafting/Graphs/{ => improvised}/pneumatic_cannon.yml (100%) rename Resources/Prototypes/Recipes/Crafting/Graphs/{ => storage}/crategenericsteel.yml (100%) rename Resources/Prototypes/Recipes/Crafting/Graphs/{ => storage}/cratelivestock.yml (100%) rename Resources/Prototypes/Recipes/Crafting/Graphs/{ => storage}/crateplastic.yml (100%) rename Resources/Prototypes/Recipes/Crafting/Graphs/{ => storage}/cratesecure.yml (100%) diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/seats.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/tables.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/toilet.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/toilet.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/computer.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/machine.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/turing.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/turing.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/turing.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/machines/turing.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/glass.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/glass.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/barricades.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/barricades.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/catwalk.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/catwalk.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/catwalk.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/girder.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/grille.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/grille.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/grille.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/lighting.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/low_wall.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/low_wall.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/low_wall.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/low_wall.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/windoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/windoor.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/window.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/windowdirectional.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/windowdirectional.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/torch.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/torch.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/APC.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/APC.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/wire_terminal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/wire_terminal.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/disposal_machines.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/disposal_machines.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/solarpanel.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml similarity index 100% rename from Resources/Prototypes/Recipes/Construction/Graphs/spear.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml diff --git a/Resources/Prototypes/Recipes/Construction/conveyor.yml b/Resources/Prototypes/Recipes/Construction/conveyor.yml deleted file mode 100644 index 314745146e..0000000000 --- a/Resources/Prototypes/Recipes/Construction/conveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: construction - name: conveyor belt - id: conveyorbelt - graph: ConveyorGraph - startNode: start - targetNode: entity - category: Structures - description: A conveyor belt, commonly used to transport large numbers of items elsewhere quite quickly. - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: Structures/conveyor.rsi - state: conveyor_stopped_cw - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: two-way lever - id: twowaylever - graph: leverGraph - startNode: start - targetNode: lever - category: Structures - description: A lever to control machines. It has 3 modes. - objectType: Structure - canBuildInImpassable: false - icon: - sprite: Structures/conveyor.rsi - state: switch-off - conditions: - - !type:TileNotBlocked {} diff --git a/Resources/Prototypes/Recipes/Construction/disposal.yml b/Resources/Prototypes/Recipes/Construction/disposal.yml deleted file mode 100644 index 90d454d7b2..0000000000 --- a/Resources/Prototypes/Recipes/Construction/disposal.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: construction - name: disposal unit - id: DisposalUnit - graph: disposalMachine - startNode: start - targetNode: disposal_unit - category: Disposal - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: Structures/Piping/disposal.rsi - state: "disposal" diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 30e7b23596..5fd023d140 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -1,3 +1,4 @@ +#chairs - type: construction name: chair id: Chair @@ -13,7 +14,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: stool @@ -30,7 +31,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: bar stool @@ -47,7 +48,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: office chair @@ -64,7 +65,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: dark office chair @@ -81,7 +82,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: comfy chair @@ -98,7 +99,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: wooden chair @@ -115,4 +116,143 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked + + +#tables +- type: construction + name: table + id: Table + graph: table + startNode: start + targetNode: Table + category: Furniture + description: A square piece of metal standing on four metal legs. + icon: + sprite: Structures/Furniture/Tables/carpet.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: reinforced table + id: TableReinforced + graph: table + startNode: start + targetNode: TableReinforced + category: Furniture + description: A square piece of metal standing on four metal legs. Extra robust. + icon: + sprite: Structures/Furniture/Tables/reinforced.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: glass table + id: TableGlass + graph: table + startNode: start + targetNode: TableGlass + category: Furniture + description: A square piece of glass, standing on four metal legs. + icon: + sprite: Structures/Furniture/Tables/glass.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: reinforced glass table + id: TableReinforcedGlass + graph: table + startNode: start + targetNode: TableReinforcedGlass + category: Furniture + description: A square piece of glass, standing on four metal legs. Extra robust. + icon: + sprite: Structures/Furniture/Tables/r_glass.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: plasma glass table + id: TablePlasmaGlass + graph: table + startNode: start + targetNode: TablePlasmaGlass + category: Furniture + description: A square piece of plasma glass, standing on four metal legs. Pretty! + icon: + sprite: Structures/Furniture/Tables/plasma.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: wood table + id: TableWood + graph: table + startNode: start + targetNode: TableWood + category: Furniture + description: Do not apply fire to this. Rumour says it burns easily. + icon: + sprite: Structures/Furniture/Tables/wood.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: poker table + id: TableCarpet + graph: table + startNode: start + targetNode: TableCarpet + category: Furniture + description: A square piece of wood standing on four legs covered by a cloth. (What did you expect?) + icon: + sprite: Structures/Furniture/Tables/carpet.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +#bathroom +- type: construction + name: toilet + id: ToiletEmpty + graph: toilet + startNode: start + targetNode: toilet + category: Furniture + description: A square piece of wood standing on four legs covered by a cloth. (What did you expect?) + icon: + sprite: Structures/Furniture/toilet.rsi + state: closed_toilet_seat_up + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/Recipes/Construction/lighting.yml b/Resources/Prototypes/Recipes/Construction/lighting.yml deleted file mode 100644 index 389dd4d44d..0000000000 --- a/Resources/Prototypes/Recipes/Construction/lighting.yml +++ /dev/null @@ -1,58 +0,0 @@ -- type: construction - name: wall light - id: LightTubeFixture - graph: lightFixture - startNode: start - targetNode: tubeLight - category: Structures - description: A wall light fixture. Use light tubes. - icon: - sprite: Structures/Wallmounts/Lighting/light_tube.rsi - state: off - objectType: Structure - placementMode: SnapgridCenter - canRotate: true - canBuildInImpassable: false - conditions: - # Need an *additional* condition here that forces there to be a wall in the opposite direction to the one used for placement. - # Also see below. Didn't add it b/c construction ECS work going on. Cheers, - 20kdc - - !type:TileNotBlocked {} - -- type: construction - name: small wall light - id: LightSmallFixture - graph: lightFixture - startNode: start - targetNode: bulbLight - category: Structures - description: A wall light fixture. Use light bulbs. - icon: - sprite: Structures/Wallmounts/Lighting/light_small.rsi - state: off - objectType: Structure - placementMode: SnapgridCenter - canRotate: true - canBuildInImpassable: false - conditions: - # Same here. - 20kdc - - !type:TileNotBlocked {} - -- type: construction - name: light switch - id: LightSwitchRecipe - graph: lightSwitch - startNode: start - targetNode: lightSwitch - category: Structures - description: A switch for toggling lights that are connected to the same apc. - icon: - sprite: Structures/Wallmounts/switch.rsi - state: on - objectType: Structure - placementMode: SnapgridCenter - canRotate: true - canBuildInImpassable: true - conditions: - - !type:WallmountCondition {} - - diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index ec6be72df7..ddfb356606 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -14,7 +14,7 @@ canRotate: false canBuildInImpassable: false conditions: - - !type:TileNotBlocked { } + - !type:TileNotBlocked - type: construction name: wall @@ -32,7 +32,7 @@ canRotate: false canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: reinforced wall @@ -50,7 +50,7 @@ canRotate: false canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: grille @@ -79,8 +79,8 @@ description: Clear. canBuildInImpassable: true conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/window.rsi state: full @@ -98,8 +98,8 @@ description: Clear but tough. canBuildInImpassable: true conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/reinforced_window.rsi state: full @@ -117,8 +117,8 @@ canBuildInImpassable: true description: Clear and even tougher, with a purple tint. conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/plasma_window.rsi state: full @@ -136,8 +136,8 @@ canBuildInImpassable: true description: Fire resistant and even tougher, with a purple tint. conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/reinforced_plasma_window.rsi state: full @@ -155,8 +155,8 @@ description: Clear. canBuildInImpassable: true conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/directional.rsi state: window @@ -173,8 +173,8 @@ description: Clear but tough. canBuildInImpassable: true conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/directional.rsi state: reinforced_window @@ -191,8 +191,8 @@ canBuildInImpassable: true description: Clear and even tougher, with a purple tint. conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/directional.rsi state: plasma_window @@ -209,8 +209,8 @@ canBuildInImpassable: true description: Fire resistant and even tougher, with a purple tint. conditions: - - !type:EmptyOrWindowValidInTile {} - - !type:NoWindowsInTile {} + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile icon: sprite: Structures/Windows/directional.rsi state: plasma_reinforced_window @@ -232,7 +232,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: catwalk @@ -243,7 +243,7 @@ category: Structures description: Just like a lattice. Except it looks better. conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - !type:TileType targets: - lattice @@ -271,58 +271,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} - -- type: construction - name: airlock - id: airlock - graph: airlock - startNode: start - targetNode: airlock - category: Structures - description: It opens, it closes, and maybe crushes you. - icon: - sprite: Structures/Doors/Airlocks/Standard/basic.rsi - state: assembly - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: windoor - id: windoor - graph: windoor - startNode: start - targetNode: windoor - category: Structures - description: It opens, it closes, and you can see through it! - icon: - sprite: Structures/Doors/Windoors/windoor.rsi - state: closed - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: secure windoor - id: secureWindoor - graph: windoor - startNode: start - targetNode: windoorSecure - category: Structures - description: It opens, it closes, and you can see through it! This one looks tough. - icon: - sprite: Structures/Doors/Windoors/windoor.rsi - state: closed - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: railing @@ -339,7 +288,7 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked - type: construction name: railing corner @@ -356,4 +305,149 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} + - !type:TileNotBlocked + +- type: construction + name: airlock + id: airlock + graph: airlock + startNode: start + targetNode: airlock + category: Structures + description: It opens, it closes, and maybe crushes you. + icon: + sprite: Structures/Doors/Airlocks/Standard/basic.rsi + state: assembly + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: windoor + id: windoor + graph: windoor + startNode: start + targetNode: windoor + category: Structures + description: It opens, it closes, and you can see through it! + icon: + sprite: Structures/Doors/Windoors/windoor.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: secure windoor + id: secureWindoor + graph: windoor + startNode: start + targetNode: windoorSecure + category: Structures + description: It opens, it closes, and you can see through it! This one looks tough. + icon: + sprite: Structures/Doors/Windoors/windoor.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + + +#lighting +- type: construction + name: wall light + id: LightTubeFixture + graph: lightFixture + startNode: start + targetNode: tubeLight + category: Structures + description: A wall light fixture. Use light tubes. + icon: + sprite: Structures/Wallmounts/Lighting/light_tube.rsi + state: off + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + # Need an *additional* condition here that forces there to be a wall in the opposite direction to the one used for placement. + # Also see below. Didn't add it b/c construction ECS work going on. Cheers, - 20kdc + - !type:TileNotBlocked + +- type: construction + name: small wall light + id: LightSmallFixture + graph: lightFixture + startNode: start + targetNode: bulbLight + category: Structures + description: A wall light fixture. Use light bulbs. + icon: + sprite: Structures/Wallmounts/Lighting/light_small.rsi + state: off + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + # Same here. - 20kdc + - !type:TileNotBlocked + +- type: construction + name: light switch + id: LightSwitchRecipe + graph: lightSwitch + startNode: start + targetNode: lightSwitch + category: Structures + description: A switch for toggling lights that are connected to the same apc. + icon: + sprite: Structures/Wallmounts/switch.rsi + state: on + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + + +#conveyor +- type: construction + name: conveyor belt + id: conveyorbelt + graph: ConveyorGraph + startNode: start + targetNode: entity + category: Structures + description: A conveyor belt, commonly used to transport large numbers of items elsewhere quite quickly. + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + icon: + sprite: Structures/conveyor.rsi + state: conveyor_stopped_cw + conditions: + - !type:TileNotBlocked + +- type: construction + name: two-way lever + id: twowaylever + graph: leverGraph + startNode: start + targetNode: lever + category: Structures + description: A lever to control machines. It has 3 modes. + objectType: Structure + canBuildInImpassable: false + icon: + sprite: Structures/conveyor.rsi + state: switch-off + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/Recipes/Construction/tables.yml b/Resources/Prototypes/Recipes/Construction/tables.yml deleted file mode 100644 index 0140ce290c..0000000000 --- a/Resources/Prototypes/Recipes/Construction/tables.yml +++ /dev/null @@ -1,118 +0,0 @@ -- type: construction - name: table - id: Table - graph: table - startNode: start - targetNode: Table - category: Structures - description: A square piece of metal standing on four metal legs. - icon: - sprite: Structures/Furniture/Tables/carpet.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: reinforced table - id: TableReinforced - graph: table - startNode: start - targetNode: TableReinforced - category: Structures - description: A square piece of metal standing on four metal legs. Extra robust. - icon: - sprite: Structures/Furniture/Tables/reinforced.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: glass table - id: TableGlass - graph: table - startNode: start - targetNode: TableGlass - category: Structures - description: A square piece of glass, standing on four metal legs. - icon: - sprite: Structures/Furniture/Tables/glass.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: reinforced glass table - id: TableReinforcedGlass - graph: table - startNode: start - targetNode: TableReinforcedGlass - category: Structures - description: A square piece of glass, standing on four metal legs. Extra robust. - icon: - sprite: Structures/Furniture/Tables/r_glass.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: plasma glass table - id: TablePlasmaGlass - graph: table - startNode: start - targetNode: TablePlasmaGlass - category: Structures - description: A square piece of plasma glass, standing on four metal legs. Pretty! - icon: - sprite: Structures/Furniture/Tables/plasma.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: wood table - id: TableWood - graph: table - startNode: start - targetNode: TableWood - category: Structures - description: Do not apply fire to this. Rumour says it burns easily. - icon: - sprite: Structures/Furniture/Tables/wood.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - -- type: construction - name: poker table - id: TableCarpet - graph: table - startNode: start - targetNode: TableCarpet - category: Structures - description: A square piece of wood standing on four legs covered by a cloth. (What did you expect?) - icon: - sprite: Structures/Furniture/Tables/carpet.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} diff --git a/Resources/Prototypes/Recipes/Construction/power.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml similarity index 74% rename from Resources/Prototypes/Recipes/Construction/power.yml rename to Resources/Prototypes/Recipes/Construction/utilities.yml index 26d5488266..6b052a6023 100644 --- a/Resources/Prototypes/Recipes/Construction/power.yml +++ b/Resources/Prototypes/Recipes/Construction/utilities.yml @@ -1,10 +1,11 @@ +#POWER - type: construction name: APC id: apc graph: apc startNode: start targetNode: apc - category: Utility + category: Utilities description: "Area Power Controller (APC). Controls power. In an area." icon: sprite: Structures/Power/apc.rsi @@ -19,7 +20,7 @@ graph: solarpanel startNode: start targetNode: solarpanel - category: Utility + category: Utilities description: "Can be turned into a solar panel or solar tracker." icon: sprite: Structures/Power/Generation/solar_panel.rsi @@ -36,7 +37,7 @@ graph: cable_terminal startNode: start targetNode: cable_terminal - category: Utility + category: Utilities description: "Input of devices such as the SMES. The red cables needs to face the device." icon: sprite: Structures/Power/cable_terminal.rsi @@ -44,3 +45,21 @@ objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false + + +#DISPOSALS +- type: construction + name: disposal unit + id: DisposalUnit + graph: disposalMachine + startNode: start + targetNode: disposal_unit + category: Utilities + placementMode: SnapgridCenter + canBuildInImpassable: false + icon: + sprite: Structures/Piping/disposal.rsi + state: "disposal" + + +#ATMOS diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml similarity index 100% rename from Resources/Prototypes/Recipes/Crafting/Graphs/bat.yml rename to Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/makeshifthandcuffs.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshifthandcuffs.yml similarity index 100% rename from Resources/Prototypes/Recipes/Crafting/Graphs/makeshifthandcuffs.yml rename to Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshifthandcuffs.yml diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/pneumatic_cannon.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml similarity index 100% rename from Resources/Prototypes/Recipes/Crafting/Graphs/pneumatic_cannon.yml rename to Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/crategenericsteel.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/crategenericsteel.yml similarity index 100% rename from Resources/Prototypes/Recipes/Crafting/Graphs/crategenericsteel.yml rename to Resources/Prototypes/Recipes/Crafting/Graphs/storage/crategenericsteel.yml diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/cratelivestock.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratelivestock.yml similarity index 100% rename from Resources/Prototypes/Recipes/Crafting/Graphs/cratelivestock.yml rename to Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratelivestock.yml diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/crateplastic.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/crateplastic.yml similarity index 100% rename from Resources/Prototypes/Recipes/Crafting/Graphs/crateplastic.yml rename to Resources/Prototypes/Recipes/Crafting/Graphs/storage/crateplastic.yml diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/cratesecure.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratesecure.yml similarity index 100% rename from Resources/Prototypes/Recipes/Crafting/Graphs/cratesecure.yml rename to Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratesecure.yml