-
Notifications
You must be signed in to change notification settings - Fork 29
feat: port emergency pillows, plus departmental variations #818
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
3cc79bc
Emergency Comfort Deployment Unit (#558)
MajorMoth 5d9b37b
ports the Den's pillows and added four recolors (Medical/Bar/Engineer…
KoboldCatgirl 9d5a98c
fixed construction id
KoboldCatgirl e531b84
genericized bar pillow, fixed engy pillow name
KoboldCatgirl 96d7c9d
added pilllow suffix to the comfort units
KoboldCatgirl ef97ae2
replaces pillow sprites, moves the pillows to our codebase, new names
KoboldCatgirl ab61cd7
made some fixes, still not working
KoboldCatgirl 2cb4ad7
more failed "fixes" x)
KoboldCatgirl 1418caf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 3310c77
actual fixes (it was something stupid)
KoboldCatgirl 542f141
Merge remote-tracking branch 'origin/port-the-den-pillows' into port-…
KoboldCatgirl fd1ce9f
fixed localizations
KoboldCatgirl 30cecbc
fixed locker prototypes
KoboldCatgirl 171fe14
removed soundhit
KoboldCatgirl d8cb385
fixed Doafter
KoboldCatgirl 05d41ce
dialed back contrasts
KoboldCatgirl feed330
remove spacing in construction graph
foxcurl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
9 changes: 9 additions & 0 deletions
9
Resources/Locale/en-US/_starcup/construction/Recipes/furniture.ftl
This file contains hidden or 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,9 @@ | ||
| # Pillows | ||
| construction-recipe-pillow-base-wrapped = wrapped pillow | ||
| construction-recipe-pillow-base-unwrapped = pillow | ||
| construction-recipe-pillow-command-wrapped = wrapped command pillow | ||
| construction-recipe-pillow-command-unwrapped = command pillow | ||
| construction-recipe-pillow-engineering-wrapped = wrapped engineering pillow | ||
| construction-recipe-pillow-engineering-unwrapped = engineering pillow | ||
| construction-recipe-pillow-medical-wrapped = wrapped medical pillow | ||
| construction-recipe-pillow-medical-unwrapped = medical pillow |
This file contains hidden or 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 hidden or 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
133 changes: 133 additions & 0 deletions
133
Resources/Prototypes/_starcup/Entities/Structures/Furniture/pillows.yml
This file contains hidden or 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,133 @@ | ||
| # starcup - Emergency Comfort Deployment Units adapted from The Den. | ||
|
|
||
| - type: entity | ||
| parent: BaseItem | ||
| id: PillowBaseWrapped | ||
| name: wrapped pillow | ||
| description: The SyndComm Emergency Deployment Comfort Unit, to be deployed in case of comfort crisis. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: base-wrapped | ||
| - type: Item | ||
| size: Normal | ||
| - type: SpawnItemsOnUse | ||
| items: | ||
| - id: PillowBaseUnwrapped | ||
| sound: | ||
| path: /Audio/Misc/zip.ogg | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowbasewrapped | ||
|
|
||
| - type: entity | ||
| parent: SeatBase | ||
| id: PillowBaseUnwrapped | ||
| name: pillow | ||
| description: The SyndComm Emergency Deployment Comfort Unit, optimized for maximum fluffiness in conditions of zero-gravity. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: base-unwrapped | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowbaseunwrapped | ||
|
|
||
| - type: entity | ||
| parent: PillowBaseWrapped | ||
| id: PillowCommandWrapped | ||
| name: wrapped command pillow | ||
| description: Contains a soft velvet cushion, perfect for resting those heads weary with the weight of authority. Deploy as needed. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: command-wrapped | ||
| - type: Item | ||
| size: Normal | ||
| - type: SpawnItemsOnUse | ||
| items: | ||
| - id: PillowCommandUnwrapped | ||
| sound: | ||
| path: /Audio/Misc/zip.ogg | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowcommandwrapped | ||
|
|
||
| - type: entity | ||
| parent: PillowBaseUnwrapped | ||
| id: PillowCommandUnwrapped | ||
| name: command pillow | ||
| description: A soft velvet cushion, perfect for resting those heads weary with the weight of authority for the rare occasions Renault isn't already sleeping on it. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: command-unwrapped | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowcommandunwrapped | ||
|
|
||
| - type: entity | ||
| parent: PillowBaseWrapped | ||
| id: PillowEngineeringWrapped | ||
| name: wrapped engineering pillow | ||
| description: A pillow sewn into a sturdy flame-resistant case. Not Tesla-proof. Deploy as needed. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: engineering-wrapped | ||
| - type: Item | ||
| size: Normal | ||
| - type: SpawnItemsOnUse | ||
| items: | ||
| - id: PillowEngineeringUnwrapped | ||
| sound: | ||
| path: /Audio/Misc/zip.ogg | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowengineeringwrapped | ||
|
|
||
| - type: entity | ||
| parent: PillowBaseUnwrapped | ||
| id: PillowEngineeringUnwrapped | ||
| name: engineering pillow | ||
| description: A pillow sewn into a sturdy flame-resistant case. Not Tesla-proof. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: engineering-unwrapped | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowengineeringunwrapped | ||
|
|
||
| - type: entity | ||
| parent: PillowBaseWrapped | ||
| id: PillowMedicalWrapped | ||
| name: wrapped medical pillow | ||
| description: A pillow sewn into an soft antimicrobial case, for the comfort of patients and overworked professionals alike. Deploy as needed. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: medical-wrapped | ||
| - type: Item | ||
| size: Normal | ||
| - type: SpawnItemsOnUse | ||
| items: | ||
| - id: PillowMedicalUnwrapped | ||
| sound: | ||
| path: /Audio/Misc/zip.ogg | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowmedicalwrapped | ||
|
|
||
| - type: entity | ||
| parent: PillowBaseUnwrapped | ||
| id: PillowMedicalUnwrapped | ||
| name: medical pillow | ||
| description: A pillow sewn into an soft antimicrobial case, for the comfort of patients and overworked professionals alike. | ||
| components: | ||
| - type: Sprite | ||
| sprite: /Textures/_starcup/Structures/Furniture/pillows.rsi | ||
| state: medical-unwrapped | ||
| - type: Construction | ||
| graph: Pillow | ||
| node: pillowmedicalunwrapped |
77 changes: 77 additions & 0 deletions
77
Resources/Prototypes/_starcup/Recipes/Construction/Graphs/Furniture/pillows.yml
This file contains hidden or 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,77 @@ | ||
| - type: constructionGraph | ||
| id: Pillow | ||
| start: start | ||
| graph: | ||
| - node: start | ||
| edges: | ||
| - to: pillowbaseunwrapped | ||
| steps: | ||
| - material: Cloth | ||
| amount: 2 | ||
| doAfter: 3 | ||
|
|
||
| - node: pillowbaseunwrapped | ||
| entity: PillowBaseUnwrapped | ||
| edges: | ||
| - to: pillowbasewrapped | ||
| steps: | ||
| - material: Plastic | ||
| amount: 1 | ||
| doAfter: 1 | ||
| - to: pillowcommandunwrapped | ||
| steps: | ||
| - material: FloorCarpetPurple | ||
| amount: 1 | ||
| doAfter: 2 | ||
| - material: Gold | ||
| amount: 1 | ||
| doAfter: 3 | ||
| - to: pillowengineeringunwrapped | ||
| steps: | ||
| - material: FloorCarpetOrange | ||
| amount: 1 | ||
| doAfter: 2 | ||
| - to: pillowmedicalunwrapped | ||
| steps: | ||
| - material: FloorCarpetSkyBlue | ||
| amount: 1 | ||
| doAfter: 2 | ||
|
|
||
| - node: pillowcommandunwrapped | ||
| entity: PillowCommandUnwrapped | ||
| edges: | ||
| - to: pillowcommandwrapped | ||
| steps: | ||
| - material: Plastic | ||
| amount: 1 | ||
| doAfter: 1 | ||
|
|
||
| - node: pillowengineeringunwrapped | ||
| entity: PillowEngineeringUnwrapped | ||
| edges: | ||
| - to: pillowengineeringwrapped | ||
| steps: | ||
| - material: Plastic | ||
| amount: 1 | ||
| doAfter: 1 | ||
|
|
||
| - node: pillowmedicalunwrapped | ||
| entity: PillowMedicalUnwrapped | ||
| edges: | ||
| - to: pillowmedicalwrapped | ||
| steps: | ||
| - material: Plastic | ||
| amount: 1 | ||
| doAfter: 1 | ||
|
|
||
| - node: pillowbasewrapped | ||
| entity: PillowBaseWrapped | ||
|
|
||
| - node: pillowcommandwrapped | ||
| entity: PillowCommandWrapped | ||
|
|
||
| - node: pillowengineeringwrapped | ||
| entity: PillowEngineeringWrapped | ||
|
|
||
| - node: pillowmedicalwrapped | ||
| entity: PillowMedicalWrapped | ||
94 changes: 94 additions & 0 deletions
94
Resources/Prototypes/_starcup/Recipes/Construction/pillows.yml
This file contains hidden or 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,94 @@ | ||
| - type: construction | ||
| id: PillowBaseWrapped | ||
| name: construction-recipe-pillow-base-wrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowbasewrapped | ||
| category: construction-category-misc | ||
| objectType: Item | ||
|
|
||
| - type: construction | ||
| id: PillowBaseUnwrapped | ||
| name: construction-recipe-pillow-base-unwrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowbaseunwrapped | ||
| category: construction-category-misc | ||
| objectType: Structure | ||
| placementMode: SnapgridCenter | ||
| canRotate: true | ||
| canBuildInImpassable: false | ||
| conditions: | ||
| - !type:TileNotBlocked | ||
|
|
||
| # Command | ||
| - type: construction | ||
| id: PillowCommandWrapped | ||
| name: construction-recipe-pillow-command-wrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowcommandwrapped | ||
| category: construction-category-misc | ||
| objectType: Item | ||
|
|
||
| - type: construction | ||
| id: PillowCommandUnwrapped | ||
| name: construction-recipe-pillow-command-unwrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowcommandunwrapped | ||
| category: construction-category-misc | ||
| objectType: Structure | ||
| placementMode: SnapgridCenter | ||
| canRotate: true | ||
| canBuildInImpassable: false | ||
| conditions: | ||
| - !type:TileNotBlocked | ||
|
|
||
| # Engineering | ||
| - type: construction | ||
| id: PillowEngineeringWrapped | ||
| name: construction-recipe-pillow-engineering-wrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowengineeringwrapped | ||
| category: construction-category-misc | ||
| objectType: Item | ||
|
|
||
| - type: construction | ||
| id: PillowEngineeringUnwrapped | ||
| name: construction-recipe-pillow-engineering-unwrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowengineeringunwrapped | ||
| category: construction-category-misc | ||
| objectType: Structure | ||
| placementMode: SnapgridCenter | ||
| canRotate: true | ||
| canBuildInImpassable: false | ||
| conditions: | ||
| - !type:TileNotBlocked | ||
|
|
||
| # Medical | ||
| - type: construction | ||
| id: PillowMedicalWrapped | ||
| name: construction-recipe-pillow-medical-wrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowmedicalwrapped | ||
| category: construction-category-misc | ||
| objectType: Item | ||
|
|
||
| - type: construction | ||
| id: PillowMedicalUnwrapped | ||
| name: construction-recipe-pillow-medical-unwrapped | ||
| graph: Pillow | ||
| startNode: start | ||
| targetNode: pillowmedicalunwrapped | ||
| category: construction-category-misc | ||
| objectType: Structure | ||
| placementMode: SnapgridCenter | ||
| canRotate: true | ||
| canBuildInImpassable: false | ||
| conditions: | ||
| - !type:TileNotBlocked |
Binary file added
BIN
+747 Bytes
Resources/Textures/_starcup/Structures/Furniture/pillows.rsi/base-unwrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.26 KB
Resources/Textures/_starcup/Structures/Furniture/pillows.rsi/base-wrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.23 KB
Resources/Textures/_starcup/Structures/Furniture/pillows.rsi/command-unwrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.16 KB
Resources/Textures/_starcup/Structures/Furniture/pillows.rsi/command-wrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+773 Bytes
...es/Textures/_starcup/Structures/Furniture/pillows.rsi/engineering-unwrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.22 KB
...rces/Textures/_starcup/Structures/Furniture/pillows.rsi/engineering-wrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+700 Bytes
Resources/Textures/_starcup/Structures/Furniture/pillows.rsi/medical-unwrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.23 KB
Resources/Textures/_starcup/Structures/Furniture/pillows.rsi/medical-wrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions
35
Resources/Textures/_starcup/Structures/Furniture/pillows.rsi/meta.json
This file contains hidden or 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,35 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "base-wrapped for The Den by Goopabelle, base-unwrapped and Command/Engineering/Medical pillow sprites for starcup by KoboldCatgirl (git)", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "base-unwrapped" | ||
| }, | ||
| { | ||
| "name": "base-wrapped" | ||
| }, | ||
| { | ||
| "name": "command-unwrapped" | ||
| }, | ||
| { | ||
| "name": "command-wrapped" | ||
| }, | ||
| { | ||
| "name": "engineering-unwrapped" | ||
| }, | ||
| { | ||
| "name": "engineering-wrapped" | ||
| }, | ||
| { | ||
| "name": "medical-wrapped" | ||
| }, | ||
| { | ||
| "name": "medical-unwrapped" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.