-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature] Changes From Discord Votes (#194)
* feat: remove requred wielding from many guns Signed-off-by: Remuchi <[email protected]> * feat: craftable tiny fans and drains Signed-off-by: Remuchi <[email protected]> * fix: smgs are now proper smgs Signed-off-by: Remuchi <[email protected]> * Apply suggestions from code review Co-authored-by: Spatison <[email protected]> --------- Signed-off-by: Remuchi <[email protected]> Co-authored-by: Spatison <[email protected]>
- Loading branch information
Showing
8 changed files
with
111 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
Resources/Prototypes/_White/Recipes/Construction/Graphs/utilities/atmos_advanced.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| - type: constructionGraph | ||
| id: TinyFan | ||
| start: start | ||
| graph: | ||
| - node: start | ||
| edges: | ||
| - to: tinyFan | ||
| steps: | ||
| - material: Steel | ||
| amount: 5 | ||
| - material: Silver | ||
| amount: 10 | ||
| doAfter: 4 | ||
| - node: tinyFan | ||
| entity: AtmosDeviceFanTiny | ||
| edges: | ||
| - to: start | ||
| completed: | ||
| - !type:SpawnPrototype | ||
| prototype: SheetSteel1 | ||
| amount: 2 | ||
| - !type:SpawnPrototype | ||
| prototype: IngotSilver1 | ||
| amount: 5 | ||
| - !type:DeleteEntity | ||
| steps: | ||
| - tool: Screwing | ||
| doAfter: 2 | ||
| - tool: Welding | ||
| doAfter: 5 | ||
|
|
||
|
|
||
| - type: constructionGraph | ||
| id: FloorDrain | ||
| start: start | ||
| graph: | ||
| - node: start | ||
| edges: | ||
| - to: floorDrain | ||
| steps: | ||
| - material: Steel | ||
| amount: 5 | ||
| - material: Silver | ||
| amount: 10 | ||
| doAfter: 4 | ||
| - node: floorDrain | ||
| entity: FloorDrain | ||
| edges: | ||
| - to: start | ||
| completed: | ||
| - !type:SpawnPrototype | ||
| prototype: SheetSteel1 | ||
| amount: 2 | ||
| - !type:SpawnPrototype | ||
| prototype: IngotSilver1 | ||
| amount: 5 | ||
| - !type:DeleteEntity | ||
| steps: | ||
| - tool: Screwing | ||
| doAfter: 2 | ||
| - tool: Welding | ||
| doAfter: 5 |
29 changes: 29 additions & 0 deletions
29
Resources/Prototypes/_White/Recipes/Crafting/utilities/atmos_advanced.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| - type: construction | ||
| id: TinyFan | ||
| name: tiny fan | ||
| description: A tiny fan, releasing a thin gust of air. | ||
| category: construction-category-utilities | ||
| graph: TinyFan | ||
| startNode: start | ||
| targetNode: tinyFan | ||
| objectType: Structure | ||
| placementMode: SnapgridCenter | ||
| canBuildInImpassable: false | ||
| icon: | ||
| sprite: Structures/Piping/Atmospherics/tinyfan.rsi | ||
| state: icon | ||
|
|
||
| - type: construction | ||
| id: FloorDrain | ||
| name: drain | ||
| description: Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean. | ||
| category: construction-category-utilities | ||
| graph: FloorDrain | ||
| startNode: start | ||
| targetNode: floorDrain | ||
| objectType: Structure | ||
| placementMode: SnapgridCenter | ||
| canBuildInImpassable: false | ||
| icon: | ||
| sprite: Objects/Specific/Janitorial/drain.rsi | ||
| state: icon |