Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lamps sprite update #2876

Merged
merged 5 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@
enum.HolidayVisuals.Holiday:
base:
festive:
sprite: Objects/Misc/Lights/lamp.rsi
state: christmaslamp
light:
festive:
sprite: Objects/Misc/Lights/lamp.rsi
state: christmaslamp-on
- type: Rotatable # Corvax-Resprite
- type: Rotatable # Corvax-Resprite-start
- type: PointLight
color: "#F0FFA0FF" # Corvax-Resprite-end

- type: entity
name: interrogator lamp
Expand Down Expand Up @@ -184,6 +184,7 @@
enum.FlashVisuals.LightLayer:
True: {visible: true}
False: {visible: false}
- type: Rotatable # Corvax-Resprite

- type: entity
name: floodlight
Expand Down
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/Objects/Misc/Lights/lamp.rsi/christmaslamp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions Resources/Textures/Objects/Misc/Lights/lamp.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": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046, christmaslamp by Alekshhh (Github)",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional and christmas sprites by SonicHDC",
"size": {
"x": 32,
"y": 32
Expand All @@ -12,10 +12,12 @@
"directions": 4
},
{
"name": "christmaslamp"
"name": "christmaslamp",
"directions": 4
},
{
"name": "christmaslamp-on"
"name": "christmaslamp-on",
"directions": 4
},
{
"name": "lamp-on",
Expand Down
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional sprites by SonicDC#9046",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270, directional and christmas sprites by SonicHDC",
"size": {
"x": 32,
"y": 32
Expand All @@ -10,6 +10,14 @@
{
"name": "lampgreen",
"directions": 4
},
{
"name": "christmaslamp",
"directions": 4
},
{
"name": "christmaslamp-on",
"directions": 4
},
{
"name": "lampgreen-on",
Expand Down
Binary file modified Resources/Textures/Objects/Misc/Lights/lampint.rsi/burnt.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/Objects/Misc/Lights/lampint.rsi/lamp-int.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 24 additions & 5 deletions Resources/Textures/Objects/Misc/Lights/lampint.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,49 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"copyright": "Created by SonicHDC from lamp tgstation at https://github.com/tgstation/tgstation/commit/fb020482a6737372d5b8f2b603d58737b22b0270",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "lamp-int"
"name": "lamp-int",
"directions": 4
},
{
"name": "lamp-int-on"
"name": "lamp-int-on",
"directions": 4
},
{
"name": "flashing",
"directions": 4,
"delays": [
[
0.1,
0.2,
0.2
],
[
0.1,
0.2,
0.2
],
[
0.1,
0.2,
0.2
],
[
0.1,
0.3
0.2,
0.2
]
]
},
{
"name": "burnt"
"name": "burnt",
"directions": 4
},
{
"name": "off-inhand-left",
Expand Down
Loading