diff --git a/Resources/Locale/ru-RU/recipes/recipes.ftl b/Resources/Locale/ru-RU/recipes/recipes.ftl index 75e6b99ab48..b2362aca914 100644 --- a/Resources/Locale/ru-RU/recipes/recipes.ftl +++ b/Resources/Locale/ru-RU/recipes/recipes.ftl @@ -1,2 +1,93 @@ recipes-secret-door-name = потайная дверь recipes-secret-door-desc = Дверь, замаскированная под стену. Идеальное решение для сокрытия ваших тёмных делишек. + + +#MiningWalls +construction-recipe-wall-mining = { ent-WallMining } +construction-recipe-wall-mining-desc = { ent-WallMining.desc } +construction-recipe-wall-mining-diagonal = { ent-WallMiningDiagonal } +construction-recipe-wall-mining-diagonal-desc = { ent-WallMiningDiagonal.desc } + +#MiningWindows +construction-recipe-mining-window = { ent-MiningWindow } +construction-recipe-mining-window-desc = { ent-MiningWindow.desc } +construction-recipe-mining-window-diagonal = { ent-MiningWindow } +construction-recipe-mining-window-diagonal-desc = { ent-MiningWindow.desc } + +construction-recipe-mining-window-plasma = { ent-MiningWindowPlasma } +construction-recipe-mining-window-plasma-desc = { ent-MiningWindowPlasma.desc } +construction-recipe-mining-window-plasma-diagonal = { ent-MiningWindowPlasmaDiagonal } +construction-recipe-mining-window-plasma-diagonal-desc = { ent-MiningWindowPlasmaDiagonal.desc } + +construction-recipe-mining-window-uran = { ent-MiningWindowUran } +construction-recipe-mining-window-uran-desc = { ent-MiningWindowUran.desc } +construction-recipe-mining-window-uran-diagonal = { ent-MiningWindowUranDiagonal } +construction-recipe-mining-window-uran-diagonal-desc = { ent-MiningWindowUranDiagonal.desc } + + +#PlastitaniumWalls +construction-recipe-plastitanium-wall = { ent-WallPlastitanium } +construction-recipe-plastitanium-wall-desc = { ent-WallPlastitanium.desc } +construction-recipe-wall-plastitanium-diagonal = { ent-WallPlastitaniumDiagonal } +construction-recipe-wall-plastitanium-diagonal-desc = { ent-WallPlastitaniumDiagonal.desc } + +#PlastitaniumWindows +construction-recipe-plastitanium-window = { ent-PlastitaniumWindow } +construction-recipe-plastitanium-window-desc = { ent-PlastitaniumWindow.desc } +construction-recipe-plastitanium-window-diagonal = { ent-PlastitaniumWindow } +construction-recipe-plastitanium-window-diagonal-desc = { ent-PlastitaniumWindow.desc } + +construction-recipe-plastitanium-window-plasma = { ent-PlastitaniumWindowPlasma } +construction-recipe-plastitanium-window-plasma-desc = { ent-PlastitaniumWindowPlasma.desc } +construction-recipe-plastitanium-window-plasma-diagonal = { ent-PlastitaniumWindowPlasmaDiagonal } +construction-recipe-plastitanium-window-plasma-diagonal-desc = { ent-PlastitaniumWindowPlasmaDiagonal.desc } + +construction-recipe-plastitanium-window-uran = { ent-PlastitaniumWindowUran } +construction-recipe-plastitanium-window-uran-desc = { ent-PlastitaniumWindowUran.desc } +construction-recipe-plastitanium-window-uran-diagonal = { ent-PlastitaniumWindowUranDiagonal } +construction-recipe-plastitanium-window-uran-diagonal-desc = { ent-PlastitaniumWindowUranDiagonal.desc } + + +#ShuttlemWalls +construction-recipe-shuttle-wall = { ent-WallShuttle } +construction-recipe-shuttle-wall-desc = { ent-WallShuttle.desc } +construction-recipe-shuttle-secret-door-construction = стена шаттла (секретная дверь) +construction-recipe-shuttle-secret-door-construction-desc = Дверь засекреченная под стену шаттла +construction-recipe-interior-shuttle-wall = { ent-WallShuttleInterior } +construction-recipe-interior-shuttle-wall-desc = { ent-WallShuttleInterior.desc } + +#ShuttleWindows +construction-recipe-shuttle-window = { ent-ShuttleWindow } +construction-recipe-shuttle-window-desc = { ent-ShuttleWindow.desc } +construction-recipe-shuttle-window-diagonal = { ent-ShuttleWindow } +construction-recipe-shuttle-window-diagonal-desc = { ent-ShuttleWindow.desc } + +construction-recipe-shuttle-window-plasma = { ent-ShuttleWindowPlasma } +construction-recipe-shuttle-window-plasma-desc = { ent-ShuttleWindowPlasma.desc } +construction-recipe-shuttle-window-plasma-diagonal = { ent-ShuttleWindowPlasmaDiagonal } +construction-recipe-shuttle-window-plasma-diagonal-desc = { ent-ShuttleWindowPlasmaDiagonal.desc } + +construction-recipe-shuttle-window-uran = { ent-ShuttleWindowUran } +construction-recipe-shuttle-window-uran-desc = { ent-ShuttleWindowUran.desc } +construction-recipe-shuttle-window-uran-diagonal = { ent-ShuttleWindowUranDiagonal } +construction-recipe-shuttle-window-uran-diagonal-desc = { ent-ShuttleWindowUranDiagonal.desc } + + +#Materials +construction-recipe-sheet-plastitanium-glass-1 = { ent-SheetPlastitaniumGlass } +construction-recipe-sheet-plastitanium-glass-1-desc = { ent-SheetPlastitaniumGlass.desc } + + +#FillingCabinets +construction-recipe-extinguisher-cabinet = { ent-ExtinguisherCabinet } +construction-recipe-extinguisher-cabinet-desc = { ent-ExtinguisherCabinet.desc } +construction-recipe-defibrillator-cabinet = { ent-DefibrillatorCabinet } +construction-recipe-defibrillator-cabinet-desc = { ent-DefibrillatorCabinet.desc } + + +#SuitStorageBase +construction-recipe-suit-storage = { ent-SuitStorageBase } +construction-recipe-suit-storage-desc = { ent-SuitStorageBase.desc } + +construction-recipe-suit-storage-wallmount = { ent-SuitStorageWallmount } +construction-recipe-suit-storage-desc = { ent-SuitStorageWallmount.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/materials/materials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/materials/materials.ftl index baaa5d6c263..3ffbd769a8d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/materials/materials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/materials/materials.ftl @@ -35,6 +35,15 @@ ent-SheetPlastitanium1 = { ent-SheetPlastitanium } ent-SheetPlastitanium10 = { ent-SheetPlastitanium } .suffix = 10 .desc = { ent-SheetPlastitanium.desc } +ent-SheetPlastitaniumGlass = пластитановое стекло + .suffix = Полный + .desc = Широко производимый высокопрочный сплав объедененный со стеклом! Крайне крепкий и практически бесполезный... +ent-SheetPlastitaniumGlass1 = { ent-SheetPlastitaniumGlass } + .suffix = 1 + .desc = { ent-SheetPlastitaniumGlass.desc } +ent-SheetPlastitaniumGlass10 = { ent-SheetPlastitaniumGlass } + .suffix = 10 + .desc = { ent-SheetPlastitaniumGlass.desc } ent-MaterialDiamond5 = { ent-MaterialDiamond } .suffix = Утилизация .desc = { ent-MaterialDiamond.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl index 5d1259ffde2..2c10da38862 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl @@ -70,9 +70,9 @@ ent-WallWeb = паутинная стена .desc = Удерживает паучат внутри, а ассистентов снаружи. ent-WallNecropolis = каменная стена .desc = { ent-BaseWall.desc } -ent-WallMining = стена +ent-WallMining = шахтёрская стена .desc = { ent-BaseWall.desc } -ent-WallMiningDiagonal = стена +ent-WallMiningDiagonal = { ent-WallMining } .suffix = Диагональ .desc = { ent-WallShuttleDiagonal.desc } ent-WallVaultAlien = инопланетная стена хранилища diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index 9b049bd47af..a610eac873c 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -322,3 +322,10 @@ repairTo: SuitStorageBase repairTime: 2 repairCost: 3 + # Forge-Change-Start + - type: Construction + graph: SuitStorage + node: done + containers: + - entity_storage + # Forge-Change-End diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml index 3e5c2486ea1..89de083ced9 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml @@ -49,6 +49,11 @@ - !type:PlaySoundBehavior sound: collection: MetalGlassBreak + # Forge-Change-Start + - type: Construction + graph: FilingCabinet + node: defibrillatorcabinet + # Forge-Change-End - type: entity parent: DefibrillatorCabinet diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml index 30db2d8e4d5..bc3e02a7292 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml @@ -54,6 +54,11 @@ collection: MetalGlassBreak params: volume: -4 + # Forge-Change-Start + - type: Construction + graph: FilingCabinet + node: extinguishercabinet + # Forge-Change-End - type: entity parent: ExtinguisherCabinet diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 60d4cd4f214..423d030ca5e 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -10,7 +10,7 @@ - Wall components: - type: Anchorable - flags: + flags: - Anchorable - type: Rotatable - type: RangedDamageSound @@ -1058,6 +1058,11 @@ - mining - miningB - type: Appearance + # Forge-Change-Start + - type: Construction + graph: Girder + node: wallMining + # Forge-Change-End - type: entity parent: WallShuttleDiagonal @@ -1082,6 +1087,11 @@ state: state0 - type: RCDDeconstructable # Frontier deconstructable: false # Frontier + # Forge-Change-Start + - type: Construction + graph: Girder + node: wallMiningDiagonal + # Forge-Change-End # Vault Walls diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml index 68f6e4f0d87..db29285bdc6 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml @@ -50,6 +50,11 @@ sprite: Structures/Windows/cracks.rsi - type: StaticPrice price: 100 + # Forge-Change-Start + - type: Construction + graph: mining_window + node: miningWindow + # Forge-Change-End - type: entity parent: ShuttleWindow @@ -95,3 +100,8 @@ - type: DamageVisuals damageOverlay: sprite: Structures/Windows/cracks_diagonal.rsi + # Forge-Change-Start + - type: Construction + graph: mining_window + node: miningWindowDiagonal + # Forge-Change-End diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml index 40db1acfafa..5ecda6e93ae 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml @@ -225,3 +225,8 @@ - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass + # Forge-Change-Start + - type: Construction + graph: Plastitanium + node: plastitaniumWindowDiagonal + # Forge-Change-End diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index f81d94b875e..3763c4fc9d4 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -106,3 +106,6 @@ - type: DamageVisuals damageOverlay: sprite: Structures/Windows/cracks_diagonal.rsi + - type: Construction + graph: Window + node: shuttleWindowDiagonal diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/filing_cabinet.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/filing_cabinet.yml index 72b33bb6499..c43c11bf713 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/filing_cabinet.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/filing_cabinet.yml @@ -21,6 +21,18 @@ - material: Steel amount: 3 doAfter: 3 + # Forge-Change-Start + - to: extinguishercabinet + steps: + - material: Steel + amount: 3 + doAfter: 3 + - to: defibrillatorcabinet + steps: + - material: Steel + amount: 3 + doAfter: 3 + # Forge-Change-End - node: filingCabinet entity: filingCabinet @@ -55,3 +67,29 @@ steps: - tool: Screwing doAfter: 4 + # Forge-Change-Start + - node: extinguishercabinet + entity: ExtinguisherCabinet + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 3 + - !type:EmptyAllContainers + steps: + - tool: Screwing + doAfter: 4 + - node: defibrillatorcabinet + entity: DefibrillatorCabinet + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 3 + - !type:EmptyAllContainers + steps: + - tool: Screwing + doAfter: 4 + # Forge-Change-End diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml index 02c5d94f98c..a9b2b76e374 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml @@ -101,6 +101,17 @@ amount: 1 - material: Uranium amount: 1 + # Forge-Change-Start + - to: SheetPlastitaniumGlass1 + completed: + - !type:SetStackCount + amount: 1 + steps: + - material: Glass + amount: 1 + - material: Plastitanium + amount: 1 + # Forge-Change-End - node: SheetGlass entity: SheetGlass @@ -125,7 +136,7 @@ - node: SheetRUGlass entity: SheetRUGlass - + - node: SheetClockworkGlass entity: SheetClockworkGlass @@ -134,3 +145,8 @@ - node: SheetRUGlass1 entity: SheetRUGlass + + # Forge-Change-Start + - node: SheetPlastitaniumGlass1 + entity: SheetPlastitaniumGlass + # Forge-Change-End diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml index c42be67b46d..a7aacfe131f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml @@ -325,7 +325,35 @@ - material: Plasteel amount: 2 doAfter: 1 - + # Forge-Change-Start + - to: wallMining + completed: + - !type:SnapToGrid + southRotation: true + conditions: + - !type:EntityAnchored { } + steps: + - tool: Cutting + doAfter: 1 + - material: Plasteel + amount: 2 + doAfter: 1 + - to: wallMiningDiagonal + completed: + - !type:SnapToGrid + southRotation: false + conditions: + - !type:EntityAnchored { } + steps: + - tool: Prying + doAfter: 1 + - material: Steel + amount: 2 + doAfter: 1 + - material: Plasteel + amount: 2 + doAfter: 1 + # Forge-Change-End #Mono - create diagonal reinforced wall - to: wallReinforcedDiagonal completed: @@ -343,21 +371,23 @@ #Mono - create diagonal plastitanium wall - to: wallPlastitaniumDiagonal completed: - - !type:SnapToGrid - southRotation: false + - !type:SnapToGrid + southRotation: false conditions: - - !type:EntityAnchored { } + - !type:EntityAnchored { } # Forge-Change steps: - - tool: Prying - doAfter: 1 - - tool: Welding - doAfter: 2 - - material: Plasteel - amount: 2 - doAfter: 1 - - material: Plastitanium - amount: 2 - doAfter: 1 + # Forge-Change-Start + - tool: Prying + doAfter: 1 + - tool: Welding + doAfter: 2 + - material: Plasteel + amount: 2 + doAfter: 1 + - material: Plastitanium + amount: 2 + doAfter: 1 + # Forge-Change-End - to: plastitaniumWall completed: @@ -471,6 +501,87 @@ data: 0 - tool: Cutting doAfter: 1 + # Forge-Change-Start + - node: wallMining + entity: WallMining + edges: + - to: reinforcedGirder + completed: + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + steps: + - tool: Cutting + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.ReinforcedWallVisuals.DeconstructionStage" + data: 5 + - tool: Screwing + doAfter: 1 + - tool: Welding + doAfter: 5 + completed: + - !type:VisualizerDataInt + key: "enum.ReinforcedWallVisuals.DeconstructionStage" + data: 4 + - tool: Prying + doAfter: 1 + - tool: Anchoring + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.ReinforcedWallVisuals.DeconstructionStage" + data: 3 + - tool: Welding + doAfter: 10 + completed: + - !type:VisualizerDataInt + key: "enum.ReinforcedWallVisuals.DeconstructionStage" + data: 2 + - tool: Prying + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.ReinforcedWallVisuals.DeconstructionStage" + data: 1 + - tool: Screwing + doAfter: 1 + completed: + - !type:VisualizerDataInt + key: "enum.ReinforcedWallVisuals.DeconstructionStage" + data: 0 + - tool: Cutting + doAfter: 1 + + - node: wallMiningDiagonal + entity: WallMiningDiagonal + edges: + - to: reinforcedGirder + completed: + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + steps: + - tool: Cutting + doAfter: 1 + - tool: Screwing + doAfter: 1 + - tool: Welding + doAfter: 5 + - tool: Prying + doAfter: 1 + - tool: Anchoring + doAfter: 1 + - tool: Welding + doAfter: 10 + - tool: Prying + doAfter: 1 + - tool: Screwing + doAfter: 1 + - tool: Cutting + doAfter: 1 + # Forge-Change-End - node: reinforcedWallChitin entity: WallReinforcedChitin @@ -648,36 +759,38 @@ - node: wallPlastitaniumDiagonal entity: WallPlastitaniumDiagonal edges: - - to: reinforcedGirder - completed: - - !type:SpawnPrototype - prototype: ScrapSteel - amount: 1 - steps: - - tool: Cutting - doAfter: 1 - - tool: Screwing - doAfter: 1 - - tool: Welding - doAfter: 5 - - tool: Prying - doAfter: 1 - - tool: Anchoring - doAfter: 1 - - tool: Welding - doAfter: 10 - - tool: Prying - doAfter: 1 - - tool: Screwing - doAfter: 1 - - tool: Cutting - doAfter: 1 - - tool: Welding - doAfter: 15 - - tool: Prying - doAfter: 5 - - tool: Anchoring - doAfter: 1 + # Forge-Change-Start + - to: reinforcedGirder + completed: + - !type:SpawnPrototype + prototype: ScrapSteel + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + - tool: Screwing + doAfter: 1 + - tool: Welding + doAfter: 5 + - tool: Prying + doAfter: 1 + - tool: Anchoring + doAfter: 1 + - tool: Welding + doAfter: 10 + - tool: Prying + doAfter: 1 + - tool: Screwing + doAfter: 1 + - tool: Cutting + doAfter: 1 + - tool: Welding + doAfter: 15 + - tool: Prying + doAfter: 5 + - tool: Anchoring + doAfter: 1 + # Forge-Change-End - node: plastitaniumWall entity: WallPlastitanium diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml index 37682eb0913..9c7b3a23be2 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml @@ -53,7 +53,43 @@ - material: ReinforcedGlass amount: 2 doAfter: 4 - + # Forge-Change-Start + - to: shuttleWindowDiagonal + steps: + - material: Plasteel + amount: 2 + - material: ReinforcedGlass + amount: 2 + doAfter: 4 + - to: shuttleWindowUran + steps: + - material: Plasteel + amount: 2 + - material: ReinforcedUraniumGlass + amount: 2 + doAfter: 4 + - to: shuttleWindowUranDiagonal + steps: + - material: Plasteel + amount: 2 + - material: ReinforcedUraniumGlass + amount: 2 + doAfter: 4 + - to: shuttleWindowPlasma + steps: + - material: Plasteel + amount: 2 + - material: ReinforcedPlasmaGlass + amount: 2 + doAfter: 4 + - to: shuttleWindowPlasmaDiagonal + steps: + - material: Plasteel + amount: 2 + - material: ReinforcedPlasmaGlass + amount: 2 + doAfter: 4 + # Forge-Change-End - to: clockworkWindow steps: - material: ClockworkGlass @@ -223,7 +259,7 @@ doAfter: 2 - tool: Anchoring doAfter: 3 - + - node: shuttleWindow entity: ShuttleWindow edges: @@ -236,8 +272,7 @@ prototype: SheetPlasteel1 amount: 2 - !type:DeleteEntity {} - steps: - #To-Do: Add deconstruct visuals + steps: &deconstructionWindow # Forge-Change - tool: Welding doAfter: 6 - tool: Screwing @@ -253,4 +288,72 @@ - tool: Welding doAfter: 4 - tool: Anchoring - doAfter: 1 \ No newline at end of file + doAfter: 1 + + # Forge-Change-Start + - node: shuttleWindowDiagonal + entity: ShuttleWindowDiagonal + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRGlass1 + amount: 2 + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + - !type:DeleteEntity {} + steps: *deconstructionWindow + - node: shuttleWindowUran + entity: ShuttleWindowUran + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRUGlass1 + amount: 2 + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + - !type:DeleteEntity {} + steps: *deconstructionWindow + - node: shuttleWindowUranDiagonal + entity: ShuttleWindowUranDiagonal + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRUGlass1 + amount: 2 + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + - !type:DeleteEntity {} + steps: *deconstructionWindow + - node: shuttleWindowPlasma + entity: ShuttleWindowPlasma + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRPGlass1 + amount: 2 + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + - !type:DeleteEntity {} + steps: *deconstructionWindow + - node: shuttleWindowPlasmaDiagonal + entity: ShuttleWindowPlasmaDiagonal + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetRPGlass1 + amount: 2 + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + - !type:DeleteEntity {} + steps: *deconstructionWindow + # Forge-Change-End diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml index d644538a452..fd00024206b 100644 --- a/Resources/Prototypes/Recipes/Construction/materials.yml +++ b/Resources/Prototypes/Recipes/Construction/materials.yml @@ -128,4 +128,17 @@ targetNode: SheetRUGlass1 category: construction-category-materials icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass } - objectType: Item \ No newline at end of file + objectType: Item + +# Forge-Change-Start +- type: construction + name: plastitanium glass + description: Merged plastitanium and glass in one, used for specialized applications requiring both strength and visibility. + id: SheetPlastitaniumGlass1 + graph: Glass + startNode: start + targetNode: SheetPlastitaniumGlass1 + category: construction-category-materials + icon: { sprite: _Mono/Objects/Materials/plastitaniumglass.rsi, state: plastitaniumglass } + objectType: Item +# Forge-Change-End diff --git a/Resources/Prototypes/Recipes/Construction/storage.yml b/Resources/Prototypes/Recipes/Construction/storage.yml index 48f6dd4d034..f6bcf6c07f2 100644 --- a/Resources/Prototypes/Recipes/Construction/storage.yml +++ b/Resources/Prototypes/Recipes/Construction/storage.yml @@ -215,3 +215,36 @@ canBuildInImpassable: true conditions: - !type:WallmountCondition + +# Forge-Change-Start +- type: construction + id: ExtinguisherCabinet + name: extinguisher cabinet + graph: FilingCabinet + startNode: start + targetNode: extinguishercabinet + category: construction-category-storage + description: A small wall mounted cabinet designed to hold a fire extinguisher. + icon: + sprite: Structures/Wallmounts/extinguisher_cabinet.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + canRotate: false + +- type: construction + id: DefibrillatorCabinet + name: defibrillator cabinet + graph: FilingCabinet + startNode: start + targetNode: defibrillatorcabinet + category: construction-category-storage + description: A small wall mounted cabinet designed to hold a defibrillator. + icon: + sprite: Structures/Wallmounts/defib_cabinet.rsi + state: closed + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + # Forge-Change-End diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 0332a07ecb7..2b47a013419 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -1747,3 +1747,131 @@ state: closed conditions: - !type:TileNotBlocked +# Forge-Change-Start +- type: construction + name: mining wall + id: WallMining + graph: Girder + startNode: start + targetNode: wallMining + category: construction-category-structures + description: Keeps the air in and the greytide out. + icon: + sprite: Structures/Walls/mining.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: mining diagonal wall + id: WallMiningDiagonal + graph: Girder + startNode: start + targetNode: wallMiningDiagonal + category: construction-category-structures + description: Keeps the air in and the greytide out. + canBuildInImpassable: true + conditions: + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile + icon: + drawdepth: Walls + sprite: Structures/Walls/mining_diagonal.rsi + state: state0 + objectType: Structure + placementMode: SnapgridCenter + +- type: construction + name: shuttle uranium window + id: ShuttleWindowUran + graph: Window + startNode: start + targetNode: shuttleWindowUran + category: construction-category-structures + description: Extra sturdy to resist the pressure of FTL or sustain damage from munitions. + icon: + sprite: Forge/Structures/Windows/shuttle_uran_window.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: shuttle diagonal uranium window + id: ShuttleWindowUranDiagonal + graph: Window + startNode: start + targetNode: shuttleWindowUranDiagonal + category: construction-category-structures + description: Extra sturdy to resist the pressure of FTL or sustain damage from munitions. + canBuildInImpassable: true + conditions: + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile + icon: + sprite: Forge/Structures/Windows/shuttle_uran_window_diagonal.rsi + state: state0 + objectType: Structure + placementMode: SnapgridCenter + +- type: construction + name: shuttle plasma window + id: ShuttleWindowPlasma + graph: Window + startNode: start + targetNode: shuttleWindowPlasma + category: construction-category-structures + description: Extra sturdy to resist the pressure of FTL or sustain damage from munitions. + icon: + sprite: Forge/Structures/Windows/shuttle_plasma_window.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: shuttle diagonal plasma window + id: ShuttleWindowPlasmaDiagonal + graph: Window + startNode: start + targetNode: shuttleWindowPlasmaDiagonal + category: construction-category-structures + description: Keeps the air in and the greytide out. + canBuildInImpassable: true + conditions: + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile + icon: + sprite: Forge/Structures/Windows/shuttle_plasma_window_diagonal.rsi + state: state0 + objectType: Structure + placementMode: SnapgridCenter + +- type: construction + name: shuttle diagonal window + id: ShuttleWindowDiagonal + graph: Window + startNode: start + targetNode: shuttleWindowDiagonal + category: construction-category-structures + description: Keeps the air in and the greytide out. + canBuildInImpassable: true + conditions: + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile + icon: + sprite: Structures/Windows/shuttle_window_diagonal.rsi + state: state0 + objectType: Structure + placementMode: SnapgridCenter +# Forge-Change-End diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml index c465d74db7b..2723f209805 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml @@ -172,3 +172,68 @@ amount: 4 - !type:EmptyAllContainers - !type:DeleteEntity + +# Forge-Change-Start +- type: constructionGraph + id: SuitStorage + start: start + graph: + - node: start + edges: + - to: done + steps: + - material: Steel + amount: 4 + - material: Cable + amount: 2 + doAfter: 5 + - to: suitStorageWallmount + steps: + - material: Steel + amount: 4 + - material: Cable + amount: 2 + doAfter: 5 + - node: done + entity: SuitStorageBase + edges: + - to: start + steps: + - tool: Screwing + doAfter: 5 + conditions: + - !type:StorageWelded + welded: false + - !type:Locked + locked: false + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 4 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity + - node: suitStorageWallmount + entity: SuitStorageWallmount + edges: + - to: start + steps: + - tool: Screwing + doAfter: 5 + conditions: + - !type:StorageWelded + welded: false + - !type:Locked + locked: false + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 4 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity +# Forge-Change-End diff --git a/Resources/Prototypes/Recipes/Crafting/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/tallbox.yml index 7de80870afc..fa3050c67dc 100644 --- a/Resources/Prototypes/Recipes/Crafting/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/tallbox.yml @@ -57,3 +57,33 @@ canBuildInImpassable: true conditions: - !type:WallmountCondition + +# Forge-Change-Start +- type: construction + id: SuitStorage + name: suit storage unit + graph: SuitStorage + startNode: start + targetNode: done + category: construction-category-storage + description: A fancy hi-tech storage unit made for storing space suits. + icon: { sprite: Structures/Storage/suit_storage.rsi, state: base } + objectType: Structure + placementMode: SnapgridCenter + +- type: construction + id: SuitStorageWallmount + name: suit wallstorage unit + graph: SuitStorage + startNode: start + targetNode: suitStorageWallmount + category: construction-category-storage + description: A fancy hi-tech storage unit made for storing space suits. + icon: { sprite: _NF/Structures/Storage/suit_storage_wall.rsi, state: generic } + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + # Forge-Change-End diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/_Forge/Entities/Structures/Windows/mining.yml index 419c71ad314..66e1859164d 100644 --- a/Resources/Prototypes/_Forge/Entities/Structures/Windows/mining.yml +++ b/Resources/Prototypes/_Forge/Entities/Structures/Windows/mining.yml @@ -52,6 +52,9 @@ price: 100 - type: RadiationBlocker resistance: 4 + - type: Construction + graph: mining_window + node: miningWindowUran - type: entity parent: ShuttleWindowUran @@ -99,6 +102,9 @@ sprite: Structures/Windows/cracks_diagonal.rsi - type: RadiationBlocker resistance: 4 + - type: Construction + graph: mining_window + node: miningWindowUranDiagonal - type: entity id: MiningWindowPlasma @@ -154,6 +160,9 @@ price: 100 - type: RadiationBlocker resistance: 3 + - type: Construction + graph: mining_window + node: miningWindowPlasma - type: entity parent: ShuttleWindowPlasma @@ -201,3 +210,6 @@ sprite: Structures/Windows/cracks_diagonal.rsi - type: RadiationBlocker resistance: 3 + - type: Construction + graph: mining_window + node: miningWindowPlasmaDiagonal diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/_Forge/Entities/Structures/Windows/plastitanium.yml index e504bb62580..ba721d646eb 100644 --- a/Resources/Prototypes/_Forge/Entities/Structures/Windows/plastitanium.yml +++ b/Resources/Prototypes/_Forge/Entities/Structures/Windows/plastitanium.yml @@ -1,6 +1,6 @@ - type: entity id: PlastitaniumWindowUran - name: plastitanium window + name: plastitanium uranium window parent: PlastitaniumWindowSquareBase components: - type: Sprite @@ -50,10 +50,13 @@ price: 100 # Frontier - type: RadiationBlocker resistance: 5 + - type: Construction + graph: Plastitanium + node: plastitaniumWindowUran - type: entity id: PlastitaniumWindowUranDiagonal - name: plastitanium window + name: plastitanium uranium diagonal window parent: PlastitaniumWindowDiagonalBase suffix: diagonal components: @@ -103,10 +106,13 @@ damageModifierSet: RGlass - type: RadiationBlocker resistance: 5 + - type: Construction + graph: Plastitanium + node: plastitaniumWindowUranDiagonal - type: entity id: PlastitaniumWindowPlasma - name: plastitanium window + name: plastitanium plasma window parent: PlastitaniumWindowSquareBase components: - type: Sprite @@ -156,10 +162,13 @@ price: 100 # Frontier - type: RadiationBlocker resistance: 4 + - type: Construction + graph: Plastitanium + node: plastitaniumWindowPlasma - type: entity id: PlastitaniumWindowPlasmaDiagonal - name: plastitanium window + name: plastitanium plasma diagonal window parent: PlastitaniumWindowDiagonalBase suffix: diagonal components: @@ -209,3 +218,6 @@ damageModifierSet: RGlass - type: RadiationBlocker resistance: 4 + - type: Construction + graph: Plastitanium + node: plastitaniumWindowPlasmaDiagonal diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/_Forge/Entities/Structures/Windows/shuttle.yml index bca112bf667..2e5688b5dec 100644 --- a/Resources/Prototypes/_Forge/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/_Forge/Entities/Structures/Windows/shuttle.yml @@ -1,6 +1,6 @@ - type: entity id: ShuttleWindowUran - name: shuttle window + name: shuttle uranium window parent: Window # Frontier: WindowRCDResistant