Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Peptide90 committed Dec 5, 2023
2 parents ab57cb7 + 8229067 commit 55fb093
Show file tree
Hide file tree
Showing 76 changed files with 448 additions and 0 deletions.
207 changes: 207 additions & 0 deletions Resources/Prototypes/Nuclear14/Decals/roadmarkings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
- type: decal
id: RoadEdgeDouble1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: double1

- type: decal
id: RoadEdgeDouble2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: double2

- type: decal
id: RoadEdgeDoubleBroken1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: doublebroken1

- type: decal
id: RoadEdgeDoubleBroken2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: doublebroken2

- type: decal
id: RoadMiddleBrokenSplit1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlebrokensplit1

- type: decal
id: RoadMiddleBrokenSplit2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlebrokensplit2

- type: decal
id: RoadMiddleSolid1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolid1

- type: decal
id: RoadMiddleSolid2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolid2

- type: decal
id: RoadMiddleSolidBrokenSplit1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidbrokensplit1

- type: decal
id: RoadMiddleSolidBrokenSplit2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidbrokensplit2

- type: decal
id: RoadMiddleSolidBrokenSplit3
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidbrokensplit3

- type: decal
id: RoadMiddleSolidBrokenSplit4
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidbrokensplit4

- type: decal
id: RoadMiddleSolidSplit1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidsplit1

- type: decal
id: RoadMiddleSolidSplit2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidsplit2

- type: decal
id: RoadEdgeSingle1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: single1

- type: decal
id: RoadEdgeSingle2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: single2

- type: decal
id: RoadEdgeSingleBroken1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: singlebroken1

- type: decal
id: RoadEdgeSingleBroken2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: singlebroken2

- type: decal
id: RoadEdgeSingleCorner
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: singlecorner

- type: decal
id: RoadEdgeSingleCorner2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: singlecorner2

- type: decal
id: RoadEdgeSingleCorner3
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: singlecorner3

- type: decal
id: RoadEdgeDoubleCorner
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: doublecorner

- type: decal
id: RoadEdgeDoubleCorner2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: doublecorner2

- type: decal
id: RoadEdgeDoubleCorner3
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: doublecorner3

- type: decal
id: RoadMiddleSolidCorner1
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidcorner1

- type: decal
id: RoadMiddleSolidCorner2
tags: ["road"]
snapCardinals: true
sprite:
sprite: Nuclear14/Decals/roadlines.rsi
state: middlesolidcorner2
152 changes: 152 additions & 0 deletions Resources/Textures/Nuclear14/Decals/curb.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/be7a9f24f2bca68f07e4b0b086dc03a3eb9f971f",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "sidewalk-0"
},
{
"name": "sidewalk-1"
},
{
"name": "sidewalk-2"
},
{
"name": "sidewalk-3"
},
{
"name": "sidewalk-4"
},
{
"name": "sidewalk-5"
},
{
"name": "sidewalk-6"
},
{
"name": "sidewalk-7"
},
{
"name": "sidewalk-8"
},
{
"name": "sidewalk-9"
},
{
"name": "sidewalk-10"
},
{
"name": "sidewalk-11"
},
{
"name": "sidewalk-12"
},
{
"name": "sidewalk-13"
},
{
"name": "sidewalk-14"
},
{
"name": "sidewalk-15"
},
{
"name": "sidewalk-21"
},
{
"name": "sidewalk-23"
},
{
"name": "sidewalk-29"
},
{
"name": "sidewalk-31"
},
{
"name": "sidewalk-38"
},
{
"name": "sidewalk-39"
},
{
"name": "sidewalk-46"
},
{
"name": "sidewalk-47"
},
{
"name": "sidewalk-55"
},
{
"name": "sidewalk-63"
},
{
"name": "sidewalk-74"
},
{
"name": "sidewalk-75"
},
{
"name": "sidewalk-78"
},
{
"name": "sidewalk-79"
},
{
"name": "sidewalk-95"
},
{
"name": "sidewalk-110"
},
{
"name": "sidewalk-111"
},
{
"name": "sidewalk-127"
},
{
"name": "sidewalk-137"
},
{
"name": "sidewalk-139"
},
{
"name": "sidewalk-141"
},
{
"name": "sidewalk-143"
},
{
"name": "sidewalk-157"
},
{
"name": "sidewalk-159"
},
{
"name": "sidewalk-175"
},
{
"name": "sidewalk-191"
},
{
"name": "sidewalk-203"
},
{
"name": "sidewalk-207"
},
{
"name": "sidewalk-223"
},
{
"name": "sidewalk-239"
},
{
"name": "sidewalk-255"
}
]
}
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.
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.
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 55fb093

Please sign in to comment.