-
Notifications
You must be signed in to change notification settings - Fork 616
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' of https://github.com/Fandromn/space-station-14…
- Loading branch information
Showing
9 changed files
with
36 additions
and
36 deletions.
There are no files selected for viewing
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
BIN
-319 Bytes
(76%)
Resources/Textures/Objects/Tools/lantern.rsi/lantern-on.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.
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 |
---|---|---|
@@ -1,39 +1,39 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by .kreks.(1042144875602268200)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9bebd81ae0b0a7f952b59886a765c681205de31f", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "lantern" | ||
}, | ||
"states": [ | ||
{ | ||
"name": "lantern" | ||
}, | ||
{ | ||
"name": "lantern-on" | ||
}, | ||
{ | ||
"name": "off-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "off-inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "on-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "burnt" | ||
}, | ||
{ | ||
"name": "flashing" | ||
}, | ||
{ | ||
"name": "on-inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
{ | ||
"name": "lantern-on" | ||
}, | ||
{ | ||
"name": "off-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "off-inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "on-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "burnt" | ||
}, | ||
{ | ||
"name": "flashing" | ||
}, | ||
{ | ||
"name": "on-inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file modified
BIN
-183 Bytes
(66%)
Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-left.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
BIN
-199 Bytes
(64%)
Resources/Textures/Objects/Tools/lantern.rsi/off-inhand-right.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
BIN
-177 Bytes
(67%)
Resources/Textures/Objects/Tools/lantern.rsi/on-inhand-left.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
BIN
-191 Bytes
(65%)
Resources/Textures/Objects/Tools/lantern.rsi/on-inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.