Skip to content

Commit

Permalink
The Resprite: Diagonal Reinforced Wall, Greyscale Decal Cleanup, Secr…
Browse files Browse the repository at this point in the history
…et Doors (#1842)

* Canisters Sprites (Update) (#1409)

* Canisters

* Liquid

* Update meta.json

* Update gas_canisters.yml

* Update meta.json

* Fix

* Create gas_canisters.yml

* Update gas_canisters.yml

* Update gas_canisters.yml

* Fixing the Tile Decals being offset by pixels / missing pixels

* applying the tile decal change to the yml

* Aika's Wooden Tiles

* Merge pull request #757

* Diagonal walls and window

* added notice board and diagonal window

* diagonal plasma windows

* secret door

* notice boards are craftable

* kegs

* keggers

* added kegs to boozeomat inventory

* Adressing the issues

* Delete Resources/Prototypes/_NF/Recipes/Construction/Graphs/structure…

* Delete Resources/Prototypes/_NF/Recipes/Construction/wallmount_notice…

* Update boozeomat.yml

* window parenting fixes

* Cleanup

* Fixing

* added new entity to use as a parent instead of WallSolidDiagonal (whi…

* Update diagonal_walls.yml

* Merge branch 'new-frontiers-14:master' into Diagonal-Walls&Windows

* moving diagonal windows and grille to separate PR

* Merge remote-tracking branch 'origin/master' into pr/757

* Merge branch 'new-frontiers-14:master' into Diagonal-Walls&Windows

* Frontier is my best friend <3

* Nukes a reinforced wall from the Frontier file and places it in the normal walls yaml so there's no dupe

* forgor

* Yippee woohoo fixing sprite bugs because they exist but weren't LINKED

* Revert "forgor"

This reverts commit b3804d0.

* Revert "Canisters Sprites (Update) (#1409)"

This reverts commit f820d52.

* crediting Aika in the attributions yaml because i'm a dummy that forgot to do that

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: ErhardSteinhauer <[email protected]>
  • Loading branch information
3 people authored Sep 18, 2024
1 parent 268d2c4 commit fb61091
Show file tree
Hide file tree
Showing 64 changed files with 914 additions and 57 deletions.
36 changes: 18 additions & 18 deletions Resources/Prototypes/Decals/Overlays/grayscale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: fulltile_overlay

- type: decal
Expand Down Expand Up @@ -115,95 +115,95 @@
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency
state: halftile_overlay

- type: decal
id: HalfTileOverlayGreyscale90
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency
state: halftile_overlay_90

- type: decal
id: HalfTileOverlayGreyscale180
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: halftile_overlay_180

- type: decal
id: HalfTileOverlayGreyscale270
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: halftile_overlay_270

- type: decal
id: QuarterTileOverlayGreyscale
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: quartertile_overlay

- type: decal
id: QuarterTileOverlayGreyscale90
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: quartertile_overlay_90

- type: decal
id: QuarterTileOverlayGreyscale180
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: quartertile_overlay_180

- type: decal
id: QuarterTileOverlayGreyscale270
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: quartertile_overlay_270

- type: decal
id: ThreeQuarterTileOverlayGreyscale
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: threequartertile_overlay

- type: decal
id: ThreeQuarterTileOverlayGreyscale90
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: threequartertile_overlay_90

- type: decal
id: ThreeQuarterTileOverlayGreyscale180
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: threequartertile_overlay_180

- type: decal
id: ThreeQuarterTileOverlayGreyscale270
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: threequartertile_overlay_270

- type: decal
Expand All @@ -219,39 +219,39 @@
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: checkerNESW

- type: decal
id: CheckerNWSE
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: checkerNWSE

- type: decal
id: DiagonalOverlay
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: diagonal

- type: decal
id: DiagonalCheckerAOverlay
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: diagonal_checker_a

- type: decal
id: DiagonalCheckerBOverlay
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: Decals/Overlays/greyscale.rsi
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
state: diagonal_checker_b

- type: decal
Expand Down
Loading

0 comments on commit fb61091

Please sign in to comment.