Skip to content

Commit 4509821

Browse files
EmoGarbage404EmoGarbage404
authored
[HOTFIX] Revert "Updated air scrubber and air vent sprites." (space-wizards#36992)
Revert "Updated air scrubber and air vent sprites. (space-wizards#34223)" This reverts commit 3957bbb.
1 parent 14cca79 commit 4509821

File tree

12 files changed

+67
-232
lines changed

12 files changed

+67
-232
lines changed

‎Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json‎

Lines changed: 32 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,34 @@
11
{
2-
"version": 1,
3-
"size": {
4-
"x": 32,
5-
"y": 32
6-
},
7-
"license": "CC-BY-SA-3.0",
8-
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/32742/commits/44820f5b6e2c864a35bfad448e0a9437f01ad2e2",
9-
"states": [
10-
{
11-
"name": "scrub_off",
12-
"directions": 4
13-
},
14-
{
15-
"name": "scrub_welded",
16-
"directions": 4
17-
},
18-
{
19-
"name": "scrub_on",
20-
"directions": 4,
21-
"delays": [
22-
[
23-
0.10,
24-
0.10,
25-
0.10,
26-
0.10,
27-
0.10,
28-
0.10
29-
],
30-
[
31-
0.10,
32-
0.10,
33-
0.10,
34-
0.10,
35-
0.10,
36-
0.10
37-
],
38-
[
39-
0.10,
40-
0.10,
41-
0.10,
42-
0.10,
43-
0.10,
44-
0.10
45-
],
46-
[
47-
0.10,
48-
0.10,
49-
0.10,
50-
0.10,
51-
0.10,
52-
0.10
53-
]
54-
]
55-
},
56-
{
57-
"name": "scrub_purge",
58-
"directions": 4,
59-
"delays": [
60-
[
61-
0.06,
62-
0.06,
63-
0.06,
64-
0.06,
65-
0.06,
66-
0.06
67-
],
68-
[
69-
0.06,
70-
0.06,
71-
0.06,
72-
0.06,
73-
0.06,
74-
0.06
75-
],
76-
[
77-
0.06,
78-
0.06,
79-
0.06,
80-
0.06,
81-
0.06,
82-
0.06
83-
],
84-
[
85-
0.06,
86-
0.06,
87-
0.06,
88-
0.06,
89-
0.06,
90-
0.06
91-
]
92-
]
93-
},
94-
{
95-
"name": "scrub_wide",
96-
"directions": 4,
97-
"delays": [
98-
[
99-
0.10,
100-
0.10,
101-
0.10,
102-
0.10,
103-
0.10,
104-
0.10
105-
],
106-
[
107-
0.10,
108-
0.10,
109-
0.10,
110-
0.10,
111-
0.10,
112-
0.10
113-
],
114-
[
115-
0.10,
116-
0.10,
117-
0.10,
118-
0.10,
119-
0.10,
120-
0.10
121-
],
122-
[
123-
0.10,
124-
0.10,
125-
0.10,
126-
0.10,
127-
0.10,
128-
0.10
129-
]
130-
]
131-
}
132-
]
2+
"version":1,
3+
"size":{
4+
"x":32,
5+
"y":32
6+
},
7+
"license":"CC-BY-SA-3.0",
8+
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
9+
"states":[
10+
{
11+
"name":"scrub_off",
12+
"directions": 4
13+
},
14+
{
15+
"name":"scrub_welded",
16+
"directions": 4
17+
},
18+
{
19+
"name":"scrub_on",
20+
"directions": 4,
21+
"delays": [[0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08]]
22+
},
23+
{
24+
"name": "scrub_purge",
25+
"directions": 4,
26+
"delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
27+
},
28+
{
29+
"name": "scrub_wide",
30+
"directions": 4,
31+
"delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
32+
}
33+
]
13334
}

‎Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png‎

-211 Bytes
Loading

‎Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png‎

14.1 KB
Loading

‎Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png‎

1.21 KB
Loading

‎Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png‎

4.23 KB
Loading

‎Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json‎

Lines changed: 35 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,37 @@
11
{
2-
"version": 1,
3-
"size": {
4-
"x": 32,
5-
"y": 32
6-
},
7-
"license": "CC-BY-SA-3.0",
8-
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/32742/commits/44820f5b6e2c864a35bfad448e0a9437f01ad2e2",
9-
"states": [
10-
{
11-
"name": "vent_passive",
12-
"directions": 4
13-
},
14-
{
15-
"name": "vent_off",
16-
"directions": 4
17-
},
18-
{
19-
"name": "vent_welded",
20-
"directions": 4
21-
},
22-
{
23-
"name": "vent_out",
24-
"directions": 4,
25-
"delays": [
26-
[
27-
0.05,
28-
0.05,
29-
0.05,
30-
0.05,
31-
0.05,
32-
0.05
33-
],
34-
[
35-
0.05,
36-
0.05,
37-
0.05,
38-
0.05,
39-
0.05,
40-
0.05
41-
],
42-
[
43-
0.05,
44-
0.05,
45-
0.05,
46-
0.05,
47-
0.05,
48-
0.05
49-
],
50-
[
51-
0.05,
52-
0.05,
53-
0.05,
54-
0.05,
55-
0.05,
56-
0.05
57-
]
58-
]
59-
},
60-
{
61-
"name": "vent_in",
62-
"directions": 4,
63-
"delays": [
64-
[
65-
0.05,
66-
0.05,
67-
0.05,
68-
0.05,
69-
0.05,
70-
0.05
71-
],
72-
[
73-
0.05,
74-
0.05,
75-
0.05,
76-
0.05,
77-
0.05,
78-
0.05
79-
],
80-
[
81-
0.05,
82-
0.05,
83-
0.05,
84-
0.05,
85-
0.05,
86-
0.05
87-
],
88-
[
89-
0.05,
90-
0.05,
91-
0.05,
92-
0.05,
93-
0.05,
94-
0.05
95-
]
96-
]
97-
},
98-
{
99-
"name": "vent_lockout",
100-
"directions": 4
101-
}
102-
]
2+
"version":1,
3+
"size":{
4+
"x":32,
5+
"y":32
6+
},
7+
"license":"CC-BY-SA-3.0",
8+
"copyright":"Taken from https://github.com/BeeStation/BeeStation-Hornet at commit 4ccd79de285e79e504308bcd6fa5908d6b7685f7",
9+
"states":[
10+
{
11+
"name":"vent_passive",
12+
"directions" : 4
13+
},
14+
{
15+
"name":"vent_off",
16+
"directions" : 4
17+
},
18+
{
19+
"name":"vent_welded",
20+
"directions" : 4
21+
},
22+
{
23+
"name":"vent_out",
24+
"directions" : 4,
25+
"delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
26+
},
27+
{
28+
"name":"vent_in",
29+
"directions" : 4,
30+
"delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
31+
},
32+
{
33+
"name":"vent_lockout",
34+
"directions" : 4
35+
}
36+
]
10337
}

‎Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png‎

-2.57 KB
Loading

‎Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png‎

107 Bytes
Loading

‎Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png‎

-104 Bytes
Loading

‎Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png‎

-1.34 KB
Loading

0 commit comments

Comments
 (0)