diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 640a5e435e..f55add8db2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -524,6 +524,14 @@ - MailingUnit - ToiletEmpty +- type: entity # WD + id: RapidPipeDispenserEmpty + parent: RapidPipeDispenser + suffix: Empty + components: + - type: LimitedCharges + charges: 0 + - type: entity id: RCDRecharging parent: RCD diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml index ce4c1c13a2..87389cdb09 100644 --- a/Resources/Prototypes/Recipes/Construction/utilities.yml +++ b/Resources/Prototypes/Recipes/Construction/utilities.yml @@ -394,7 +394,7 @@ targetNode: half category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeHalf @@ -408,7 +408,7 @@ targetNode: straight category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeStraight @@ -422,7 +422,7 @@ targetNode: bend category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeBend @@ -436,7 +436,7 @@ targetNode: tjunction category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeTJunction @@ -450,7 +450,7 @@ targetNode: fourway category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeFourway diff --git a/Resources/Prototypes/_White/RPD/rpd.yml b/Resources/Prototypes/_White/RPD/rpd.yml index d2ef3481dd..7ffe804cf0 100644 --- a/Resources/Prototypes/_White/RPD/rpd.yml +++ b/Resources/Prototypes/_White/RPD/rpd.yml @@ -10,7 +10,7 @@ prototype: GasPipeStraight cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -26,7 +26,7 @@ prototype: GasPipeBend cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -42,7 +42,7 @@ prototype: GasPipeTJunction cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -58,7 +58,7 @@ prototype: GasPipeFourway cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -270,7 +270,7 @@ prototype: DisposalPipe cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -286,7 +286,7 @@ prototype: DisposalBend cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -302,7 +302,7 @@ prototype: DisposalJunction cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -318,7 +318,7 @@ prototype: DisposalJunctionFlipped cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -334,7 +334,7 @@ prototype: DisposalYJunction cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -350,7 +350,7 @@ prototype: DisposalRouter cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -366,7 +366,7 @@ prototype: DisposalRouterFlipped cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -382,7 +382,7 @@ prototype: DisposalTagger cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -398,7 +398,7 @@ prototype: DisposalSignalRouter cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -414,7 +414,7 @@ prototype: DisposalSignalRouterFlipped cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -430,7 +430,7 @@ prototype: DisposalTrunk cost: 1 delay: 0 - collisionMask: InteractImpassable + collisionMask: None rules: - MustBuildOnSubfloor rotation: User @@ -447,10 +447,10 @@ mode: ConstructObject prototype: DisposalUnit cost: 2 - delay: 1 + delay: 2 collisionMask: InteractImpassable rotation: User - fx: EffectRCDConstruct1 + fx: EffectRCDConstruct2 - type: rcd id: MailingUnit @@ -461,10 +461,10 @@ mode: ConstructObject prototype: MailingUnit cost: 2 - delay: 1 + delay: 2 collisionMask: InteractImpassable rotation: User - fx: EffectRCDConstruct1 + fx: EffectRCDConstruct2 - type: rcd id: ToiletEmpty @@ -475,8 +475,8 @@ mode: ConstructObject prototype: ToiletEmpty cost: 2 - delay: 1 + delay: 2 collisionMask: InteractImpassable rotation: User - fx: EffectRCDConstruct1 + fx: EffectRCDConstruct2 diff --git a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml index 4cba462e3b..6032000928 100644 --- a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml +++ b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml @@ -170,16 +170,16 @@ - type: latheRecipe id: RapidPipeDispenserRecipe - result: RapidPipeDispenser + result: RapidPipeDispenserEmpty completetime: 1 materials: - Steel: 300 - Glass: 300 + Steel: 500 + Glass: 500 - type: latheRecipe id: RCDRecipe - result: RCD + result: RCDEmpty completetime: 1 materials: - Steel: 300 - Glass: 300 + Steel: 500 + Glass: 500