Skip to content

Commit cae49ae

Browse files
various material & ore inhands (space-wizards#33342)
* begin * bones + pyrotten + goliath hide inhands * Update Resources/Prototypes/Entities/Objects/Materials/materials.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * pyrottOn --------- Co-authored-by: slarticodefast <[email protected]>
1 parent 91b9d4a commit cae49ae

Some content is hidden

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

50 files changed

+216
-10
lines changed

Resources/Prototypes/Entities/Objects/Materials/materials.yml

+20-2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
reagents:
5555
- ReagentId: Cellulose
5656
Quantity: 6
57+
- type: Item
58+
heldPrefix: cardboard
5759

5860
- type: entity
5961
parent: MaterialCardboard
@@ -135,6 +137,8 @@
135137
- type: Construction
136138
graph: WebObjects # not sure if I should either keep this here or just make another prototype. Will keep it here just in case.
137139
node: cloth
140+
- type: Item
141+
heldPrefix: cloth
138142

139143
- type: entity
140144
parent: MaterialCloth
@@ -195,6 +199,8 @@
195199
tags:
196200
- ClothMade
197201
- RawMaterial
202+
- type: Item
203+
heldPrefix: durathread
198204

199205
- type: entity
200206
parent: MaterialDurathread
@@ -334,8 +340,7 @@
334340
sprite: Objects/Materials/materials.rsi
335341
state: corgihide
336342
- type: Item
337-
sprite: Clothing/Head/Misc/hides.rsi
338-
heldPrefix: corgi
343+
heldPrefix: corgihide
339344
- type: Clothing
340345
sprite: Clothing/Head/Misc/hides.rsi
341346
equippedPrefix: corgi2
@@ -427,6 +432,8 @@
427432
tags:
428433
- ClothMade
429434
- RawMaterial
435+
- type: Item
436+
heldPrefix: cotton
430437

431438
- type: entity
432439
parent: MaterialCotton
@@ -479,6 +486,8 @@
479486
tags:
480487
- ClothMade
481488
- RawMaterial
489+
- type: Item
490+
heldPrefix: pyrotton
482491

483492
- type: entity
484493
parent: MaterialPyrotton
@@ -538,6 +547,8 @@
538547
- ReagentId: Honk
539548
Quantity: 5
540549
- type: Appearance
550+
- type: Item
551+
heldPrefix: bananium
541552

542553
- type: entity
543554
parent: MaterialBananium
@@ -588,6 +599,9 @@
588599
tags:
589600
- ClothMade
590601
- RawMaterial
602+
- type: Item
603+
sprite: Objects/Materials/silk.rsi
604+
heldPrefix: silk
591605

592606
- type: entity
593607
parent: MaterialWebSilk
@@ -710,6 +724,8 @@
710724
reagents:
711725
- ReagentId: Vitamin
712726
Quantity: 3
727+
- type: Item
728+
heldPrefix: bones
713729

714730
- type: entity
715731
parent: MaterialBones
@@ -764,6 +780,8 @@
764780
- goliath_hide_3
765781
- type: Item
766782
size: Large
783+
heldPrefix: goliathhide
784+
sprite: Objects/Materials/hide.rsi
767785
shape:
768786
- 0,0,2,2
769787

Resources/Prototypes/Entities/Objects/Materials/ore.yml

+20
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
reagents:
4747
- ReagentId: Gold
4848
Quantity: 10
49+
- type: Item
50+
heldPrefix: gold
4951

5052
- type: entity
5153
parent: GoldOre
@@ -77,6 +79,8 @@
7779
reagents:
7880
- ReagentId: Carbon
7981
Quantity: 20
82+
- type: Item
83+
heldPrefix: diamond
8084

8185
- type: entity
8286
parent: DiamondOre
@@ -108,6 +112,8 @@
108112
reagents:
109113
- ReagentId: Iron
110114
Quantity: 10
115+
- type: Item
116+
heldPrefix: iron
111117

112118
- type: entity
113119
id: SteelOre1
@@ -144,6 +150,8 @@
144150
reagents:
145151
- ReagentId: Plasma
146152
Quantity: 10
153+
- type: Item
154+
heldPrefix: plasma
147155

148156
- type: entity
149157
parent: PlasmaOre
@@ -175,6 +183,8 @@
175183
reagents:
176184
- ReagentId: Silver
177185
Quantity: 10
186+
- type: Item
187+
heldPrefix: silver
178188

179189
- type: entity
180190
parent: SilverOre
@@ -206,6 +216,8 @@
206216
reagents:
207217
- ReagentId: Silicon
208218
Quantity: 10
219+
- type: Item
220+
heldPrefix: spacequartz
209221

210222
- type: entity
211223
parent: SpaceQuartz
@@ -245,6 +257,8 @@
245257
- ReagentId: Radium
246258
Quantity: 2
247259
canReact: false
260+
- type: Item
261+
heldPrefix: uranium
248262

249263
- type: entity
250264
parent: UraniumOre
@@ -285,6 +299,8 @@
285299
Quantity: 2
286300
- ReagentId: Honk
287301
Quantity: 5
302+
- type: Item
303+
heldPrefix: bananium
288304

289305
- type: entity
290306
parent: BananiumOre
@@ -324,6 +340,8 @@
324340
- type: PhysicalComposition
325341
materialComposition:
326342
Coal: 100
343+
- type: Item
344+
heldPrefix: coal
327345

328346
- type: entity
329347
parent: Coal
@@ -381,6 +399,8 @@
381399
Quantity: 10
382400
- ReagentId: Iodine
383401
Quantity: 5
402+
- type: Item
403+
heldPrefix: salt
384404

385405
- type: entity
386406
parent: SaltOre

Resources/Prototypes/Entities/Objects/Materials/parts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
map: ["base"]
4646
- type: Item
4747
size: Normal
48-
# heldPrefix: rods
48+
heldPrefix: rods
4949
- type: Construction
5050
graph: MetalRod
5151
node: MetalRod
Loading
Loading
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 Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi",
4+
"copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/88d236d5c91e9a57e103957555c2e9a8c63b68fa/icons/obj/stacks/organic.dmi. Inhands by mubururu_ (github).",
55
"size": {
66
"x": 32,
77
"y": 32
@@ -10,11 +10,19 @@
1010
{
1111
"name": "goliath_hide"
1212
},
13+
{
14+
"name": "goliathhide-inhand-left",
15+
"directions": 4
16+
},
17+
{
18+
"name": "goliathhide-inhand-right",
19+
"directions": 4
20+
},
1321
{
1422
"name": "goliath_hide_2"
1523
},
1624
{
1725
"name": "goliath_hide_3"
1826
}
1927
]
20-
}
28+
}
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

Resources/Textures/Objects/Materials/materials.rsi/meta.json

+65-1
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 commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base.",
4+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).",
55
"size": {
66
"x": 32,
77
"y": 32
@@ -16,6 +16,14 @@
1616
{
1717
"name": "bananium"
1818
},
19+
{
20+
"name": "bananium-inhand-left",
21+
"directions": 4
22+
},
23+
{
24+
"name": "bananium-inhand-right",
25+
"directions": 4
26+
},
1927
{
2028
"name": "bananium_1"
2129
},
@@ -36,6 +44,14 @@
3644
{
3745
"name": "cardboard"
3846
},
47+
{
48+
"name": "cardboard-inhand-left",
49+
"directions": 4
50+
},
51+
{
52+
"name": "cardboard-inhand-right",
53+
"directions": 4
54+
},
3955
{
4056
"name": "cardboard_2"
4157
},
@@ -48,6 +64,14 @@
4864
{
4965
"name": "cloth"
5066
},
67+
{
68+
"name": "cloth-inhand-left",
69+
"directions": 4
70+
},
71+
{
72+
"name": "cloth-inhand-right",
73+
"directions": 4
74+
},
5175
{
5276
"name": "cloth_2"
5377
},
@@ -57,9 +81,25 @@
5781
{
5882
"name": "corgihide"
5983
},
84+
{
85+
"name": "corgihide-inhand-left",
86+
"directions": 4
87+
},
88+
{
89+
"name": "corgihide-inhand-right",
90+
"directions": 4
91+
},
6092
{
6193
"name": "cotton"
6294
},
95+
{
96+
"name": "cotton-inhand-left",
97+
"directions": 4
98+
},
99+
{
100+
"name": "cotton-inhand-right",
101+
"directions": 4
102+
},
63103
{
64104
"name": "cotton_2"
65105
},
@@ -69,6 +109,14 @@
69109
{
70110
"name": "pyrotton"
71111
},
112+
{
113+
"name": "pyrotton-inhand-left",
114+
"directions": 4
115+
},
116+
{
117+
"name": "pyrotton-inhand-right",
118+
"directions": 4
119+
},
72120
{
73121
"name": "pyrotton_2"
74122
},
@@ -95,6 +143,14 @@
95143
{
96144
"name": "durathread"
97145
},
146+
{
147+
"name": "durathread-inhand-left",
148+
"directions": 4
149+
},
150+
{
151+
"name": "durathread-inhand-right",
152+
"directions": 4
153+
},
98154
{
99155
"name": "durathread_2"
100156
},
@@ -160,6 +216,14 @@
160216
{
161217
"name": "bones"
162218
},
219+
{
220+
"name": "bones-inhand-left",
221+
"directions": 4
222+
},
223+
{
224+
"name": "bones-inhand-right",
225+
"directions": 4
226+
},
163227
{
164228
"name": "bones_2"
165229
},
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)