Skip to content

Commit ef59cbb

Browse files
authored
Windows And Tables Resprites! (Simple-Station#958)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Changes Windows, Tables Sprites, and fixes the state for the airalarm. Directional windows needed to be updated as we updated the previous ones, tables looked ugly and needed an update, its was provided. Airalarm has its danger state set to warning, and the other inverted, this fixes it too. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] AirAlarm State Fix - [x] Window/Windoor Sprite - [x] Tables --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/aa05ca6e-5d1c-4ade-9158-78cfb7ced31d) </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - tweak: Directional Windows and Tables has gotten new sprites! - fix: AirAlarm Inverted Alert States has been fixed!
1 parent 0086588 commit ef59cbb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+230
-991
lines changed

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
- type: Construction
444444
graph: Table
445445
node: TableBrass
446-
446+
447447
- type: entity
448448
id: TableWood
449449
parent: TableBase
@@ -604,7 +604,7 @@
604604
thresholds:
605605
- trigger:
606606
!type:DamageTrigger
607-
damage: 25
607+
damage: 25
608608
behaviors:
609609
- !type:PlaySoundBehavior
610610
sound:
@@ -677,7 +677,7 @@
677677
- type: Construction
678678
graph: Table
679679
node: TableFancyRed
680-
680+
681681
- type: entity
682682
id: TableFancyPurple
683683
parent: TableFancyBase
@@ -690,7 +690,7 @@
690690
- type: Construction
691691
graph: Table
692692
node: TableFancyPurple
693-
693+
694694
- type: entity
695695
id: TableFancyPink
696696
parent: TableFancyBase
@@ -703,7 +703,7 @@
703703
- type: Construction
704704
graph: Table
705705
node: TableFancyPink
706-
706+
707707
- type: entity
708708
id: TableFancyGreen
709709
parent: TableFancyBase
@@ -712,11 +712,11 @@
712712
- type: Sprite
713713
sprite: Structures/Furniture/Tables/Fancy/green.rsi
714714
- type: Icon
715-
sprite: Structures/Furniture/Tables/Fancy/green.rsi
715+
sprite: Structures/Furniture/Tables/Fancy/green.rsi
716716
- type: Construction
717717
graph: Table
718718
node: TableFancyGreen
719-
719+
720720
- type: entity
721721
id: TableFancyOrange
722722
parent: TableFancyBase
@@ -729,7 +729,7 @@
729729
- type: Construction
730730
graph: Table
731731
node: TableFancyOrange
732-
732+
733733
- type: entity
734734
id: TableFancyWhite
735735
parent: TableFancyBase
-192 Bytes
Loading
-268 Bytes
Loading
-607 Bytes
Loading

Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version":1,
33
"license":"CC-BY-SA-3.0",
4-
"copyright":"Taken from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi",
4+
"copyright":"Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3/icons/obj/doors/windoor.dmi",
55
"size": {
66
"x":32,
77
"y":32
-690 Bytes
Loading
40 Bytes
Loading

Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json

Lines changed: 10 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -5,159 +5,42 @@
55
"y": 32
66
},
77
"license": "CC-BY-SA-3.0",
8-
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
8+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
99
"states": [
1010
{
11-
"name": "full",
12-
"delays": [
13-
[
14-
1
15-
]
16-
]
11+
"name": "full"
1712
},
1813
{
1914
"name": "state_0",
20-
"directions": 4,
21-
"delays": [
22-
[
23-
1.0
24-
],
25-
[
26-
1.0
27-
],
28-
[
29-
1.0
30-
],
31-
[
32-
1.0
33-
]
34-
]
15+
"directions": 4
3516
},
3617
{
3718
"name": "state_1",
38-
"directions": 4,
39-
"delays": [
40-
[
41-
1.0
42-
],
43-
[
44-
1.0
45-
],
46-
[
47-
1.0
48-
],
49-
[
50-
1.0
51-
]
52-
]
19+
"directions": 4
5320
},
5421
{
5522
"name": "state_2",
56-
"directions": 4,
57-
"delays": [
58-
[
59-
1.0
60-
],
61-
[
62-
1.0
63-
],
64-
[
65-
1.0
66-
],
67-
[
68-
1.0
69-
]
70-
]
23+
"directions": 4
7124
},
7225
{
7326
"name": "state_3",
74-
"directions": 4,
75-
"delays": [
76-
[
77-
1.0
78-
],
79-
[
80-
1.0
81-
],
82-
[
83-
1.0
84-
],
85-
[
86-
1.0
87-
]
88-
]
27+
"directions": 4
8928
},
9029
{
9130
"name": "state_4",
92-
"directions": 4,
93-
"delays": [
94-
[
95-
1.0
96-
],
97-
[
98-
1.0
99-
],
100-
[
101-
1.0
102-
],
103-
[
104-
1.0
105-
]
106-
]
31+
"directions": 4
10732
},
10833
{
10934
"name": "state_5",
110-
"directions": 4,
111-
"delays": [
112-
[
113-
1.0
114-
],
115-
[
116-
1.0
117-
],
118-
[
119-
1.0
120-
],
121-
[
122-
1.0
123-
]
124-
]
35+
"directions": 4
12536
},
12637
{
12738
"name": "state_6",
128-
"directions": 4,
129-
"delays": [
130-
[
131-
1.0
132-
],
133-
[
134-
1.0
135-
],
136-
[
137-
1.0
138-
],
139-
[
140-
1.0
141-
]
142-
]
39+
"directions": 4
14340
},
14441
{
14542
"name": "state_7",
146-
"directions": 4,
147-
"delays": [
148-
[
149-
1.0
150-
],
151-
[
152-
1.0
153-
],
154-
[
155-
1.0
156-
],
157-
[
158-
1.0
159-
]
160-
]
43+
"directions": 4
16144
}
16245
]
16346
}
24 Bytes
Loading
-20 Bytes
Loading

0 commit comments

Comments
 (0)