-
Notifications
You must be signed in to change notification settings - Fork 282
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into boxingdrobe
- Loading branch information
Showing
54 changed files
with
1,756 additions
and
28 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file added
BIN
+93.8 KB
Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
19 changes: 19 additions & 0 deletions
19
Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.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,19 @@ | ||
| - type: entity | ||
| parent: PosterBase | ||
| id: PosterLegitFuckAround | ||
| name: Fuck Around... | ||
| description: ...and find out. Sponsored by the Intergalactic Bartenders' Federation, Delta branch. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Structures/Wallmounts/Posters/TJohnson.rsi | ||
| state: fuckaround | ||
|
|
||
| - type: entity | ||
| parent: PosterBase | ||
| id: PosterContrabandGotWood | ||
| name: "Got Wood?" | ||
| description: "A grimy old advert for a seedy lumber company. \"You got a friend in me.\" is scrawled in the corner." | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Structures/Wallmounts/Posters/misc.rsi | ||
| state: woodygotwood |
9 changes: 0 additions & 9 deletions
9
Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/posters.yml
This file was deleted.
Oops, something went wrong.
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
46 changes: 46 additions & 0 deletions
46
Resources/Prototypes/Nyanotrasen/Entities/Furniture/Tables/tables.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,46 @@ | ||
| - type: entity | ||
| id: TableWoodReinforced | ||
| parent: TableBase | ||
| name: reinforced wood table | ||
| description: A classic wooden table. Extra robust. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Nyanotrasen/Structures/Furniture/Tables/rwood.rsi | ||
| - type: Icon | ||
| sprite: Nyanotrasen/Structures/Furniture/Tables/rwood.rsi | ||
| - type: Damageable | ||
| damageModifierSet: Wood | ||
| - type: Destructible | ||
| thresholds: | ||
| - trigger: | ||
| !type:DamageTrigger | ||
| damage: 200 | ||
| behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. | ||
| - !type:DoActsBehavior | ||
| acts: [ "Destruction" ] | ||
| - trigger: | ||
| !type:DamageTrigger | ||
| damage: 75 | ||
| behaviors: | ||
| - !type:PlaySoundBehavior | ||
| sound: | ||
| path: /Audio/Effects/woodhit.ogg | ||
| - !type:SpawnEntitiesBehavior | ||
| spawn: | ||
| MaterialWoodPlank: | ||
| min: 2 | ||
| max: 2 | ||
| - !type:DoActsBehavior | ||
| acts: [ "Destruction" ] | ||
| - type: Construction | ||
| graph: Table | ||
| node: TableWoodReinforced | ||
| - type: Tag | ||
| tags: | ||
| - Wooden | ||
| - type: Bonkable | ||
| # Reinforced tables are extra tough | ||
| bonkDamage: | ||
| types: | ||
| Blunt: 8 | ||
| bonkTime: 3 |
37 changes: 37 additions & 0 deletions
37
Resources/Prototypes/Nyanotrasen/Entities/Furniture/tatami.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,37 @@ | ||
| - type: entity | ||
| id: tatamibase | ||
| parent: BaseStructure | ||
| abstract: true | ||
| components: | ||
| - type: Sprite | ||
| drawdepth: FloorTiles | ||
| sprite: Nyanotrasen/Structures/Furniture/tatami.rsi | ||
| - type: Tag | ||
| tags: [ Carpet ] | ||
| - type: Physics | ||
| canCollide: false | ||
| - type: Fixtures | ||
|
|
||
| - type: entity | ||
| id: tatamisingle | ||
| parent: tatamibase | ||
| name: tatami square | ||
| description: It's tatami, but a square. | ||
| components: | ||
| - type: Sprite | ||
| state: tatami_1x1 | ||
| - type: Construction | ||
| graph: tatami | ||
| node: tatamiSquare | ||
|
|
||
| - type: entity | ||
| id: tatamimat | ||
| parent: tatamibase | ||
| name: tatami mat | ||
| description: It's a portion of a tatami mat. | ||
| components: | ||
| - type: Sprite | ||
| state: tatami_1x1P | ||
| - type: Construction | ||
| graph: tatami | ||
| node: tatamiPart |
Oops, something went wrong.