Skip to content

Commit

Permalink
Merge pull request #175
Browse files Browse the repository at this point in the history
* guh1!!

* g
  • Loading branch information
potato1234x committed Sep 21, 2023
1 parent c589573 commit 16c5381
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 1 deletion.
28 changes: 28 additions & 0 deletions Resources/Prototypes/Decals/ss14sign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,32 @@
sprite: Decals/ss14sign.rsi
state: ss14sign7

- type: decal
id: SpaceStationSign8
tags: ["station"]
sprite:
sprite: Decals/ss14sign.rsi
state: ss14sign8

- type: decal
id: SpaceStationSign9
tags: ["station"]
sprite:
sprite: Decals/ss14sign.rsi
state: ss14sign9

- type: decal
id: SpaceStationSign10
tags: ["station"]
sprite:
sprite: Decals/ss14sign.rsi
state: ss14sign10

- type: decal
id: SpaceStationSign11
tags: ["station"]
sprite:
sprite: Decals/ss14sign.rsi
state: ss14sign11


14 changes: 13 additions & 1 deletion Resources/Textures/Decals/ss14sign.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "tgstation at 606005645d3a14c4439e5ce14785650121b22678, modified by EmoGarbage404",
"copyright": "tgstation at 606005645d3a14c4439e5ce14785650121b22678, modified by Potato1234x (Github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -27,6 +27,18 @@
},
{
"name": "ss14sign7"
},
{
"name": "ss14sign8"
},
{
"name": "ss14sign9"
},
{
"name": "ss14sign10"
},
{
"name": "ss14sign11"
}
]
}
Binary file modified Resources/Textures/Decals/ss14sign.rsi/ss14sign1.png
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.
Binary file modified Resources/Textures/Decals/ss14sign.rsi/ss14sign2.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 modified Resources/Textures/Decals/ss14sign.rsi/ss14sign3.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 modified Resources/Textures/Decals/ss14sign.rsi/ss14sign4.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 modified Resources/Textures/Decals/ss14sign.rsi/ss14sign5.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 modified Resources/Textures/Decals/ss14sign.rsi/ss14sign6.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 modified Resources/Textures/Decals/ss14sign.rsi/ss14sign7.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 Resources/Textures/Decals/ss14sign.rsi/ss14sign8.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 Resources/Textures/Decals/ss14sign.rsi/ss14sign9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 16c5381

Please sign in to comment.