-
Notifications
You must be signed in to change notification settings - Fork 450
Weather Block Marker, Rad Markers and Invisible Walls #862
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
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ea912c4
weather block marker, rad markers and invisible walls
Peptide90 f0a60c3
Update Resources/Prototypes/Entities/Markers/environmental.yml
Peptide90 fc289dc
Update Resources/Prototypes/Entities/Markers/environmental.yml
Peptide90 c1b0f99
Update Resources/Prototypes/Entities/Markers/environmental.yml
Peptide90 a4b86a3
Apply suggestions from code review
VMSolidus cb795c5
Merge branch 'master' into markers
VMSolidus 7c0ac3e
Update environmental.yml
VMSolidus 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
100 changes: 100 additions & 0 deletions
100
Resources/Prototypes/Entities/Markers/environmental.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,100 @@ | ||
| # Radiation | ||
| - type: entity | ||
| name: Marker Radiation | ||
| id: MarkerRadiation1 | ||
| parent: MarkerBase | ||
| suffix: intensity 1 | ||
| components: | ||
| - type: Sprite | ||
| layers: | ||
| - sprite: Markers/environment.rsi | ||
| state: base-green | ||
| shader: unshaded | ||
| - sprite: Markers/environment.rsi | ||
| shader: unshaded | ||
| state: rad | ||
| - type: RadiationSource | ||
| intensity: 1 | ||
|
|
||
| - type: entity | ||
| parent: MarkerRadiation1 | ||
| id: MarkerRadiation2 | ||
| suffix: intensity 2 | ||
| components: | ||
| - type: RadiationSource | ||
| intensity: 2 | ||
|
|
||
| - type: entity | ||
| parent: MarkerRadiation1 | ||
| id: MarkerRadiation3 | ||
| suffix: intensity 3 | ||
| components: | ||
| - type: RadiationSource | ||
| intensity: 3 | ||
|
|
||
| - type: entity | ||
| parent: MarkerRadiation1 | ||
| id: MarkerRadiation4 | ||
| suffix: intensity 4 | ||
| components: | ||
| - type: RadiationSource | ||
| intensity: 4 | ||
|
|
||
| - type: entity | ||
| parent: MarkerRadiation1 | ||
| id: MarkerRadiation5 | ||
| suffix: intensity 5 | ||
| components: | ||
| - type: RadiationSource | ||
| intensity: 5 | ||
|
|
||
| - type: entity | ||
| parent: MarkerRadiation1 | ||
| id: MarkerRadiation10 | ||
| suffix: intensity 10 | ||
| components: | ||
| - type: RadiationSource | ||
| intensity: 10 | ||
|
|
||
| # Invisible Walls | ||
| - type: entity | ||
| name: Marker Blocker | ||
| id: MarkerBlocker | ||
| parent: MarkerBase | ||
| suffix: invisible wall | ||
| components: | ||
| - type: Sprite | ||
| layers: | ||
| - sprite: Markers/environment.rsi | ||
| state: base-blue | ||
| shader: unshaded | ||
| - sprite: Markers/environment.rsi | ||
| shader: unshaded | ||
| state: wall | ||
| - type: PlacementReplacement | ||
| key: blocker | ||
| - type: Fixtures | ||
| fixtures: | ||
| fix1: | ||
| shape: | ||
| !type:PhysShapeAabb | ||
| bounds: "-0.5,-0.5,0.5,0.5" | ||
| mask: | ||
| - FullTileMask | ||
| layer: | ||
| - WallLayer | ||
| density: 1000 | ||
| - type: Physics | ||
| bodyType: Static | ||
|
|
||
|
|
||
| # Weather Blocker | ||
| - type: entity | ||
| name: Marker Weather Blocker | ||
| id: MarkerWeatherblocker | ||
| parent: MarkerBase | ||
| components: | ||
| - type: Sprite | ||
| sprite: Markers/environment.rsi | ||
| state: weather | ||
| - type: BlockWeather | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,32 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-NC-SA-3.0", | ||
| "copyright": "Nuclear14", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "base-blue" | ||
| }, | ||
| { | ||
| "name": "base-red" | ||
| }, | ||
| { | ||
| "name": "base-green" | ||
| }, | ||
| { | ||
| "name": "fire" | ||
| }, | ||
| { | ||
| "name": "rad" | ||
| }, | ||
| { | ||
| "name": "wall" | ||
| }, | ||
| { | ||
| "name": "weather" | ||
| } | ||
| ] | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.