Skip to content

Commit 9324769

Browse files
ThatOneMoonfunkystationbot
ThatOneMoon
and
funkystationbot
authored
Mining Rework and salvage tweaks vol. 2 (funky-station#1455)
Co-authored-by: funkystationbot <funky@funkystation.org>
1 parent a534452 commit 9324769

31 files changed

Lines changed: 264 additions & 121 deletions

File tree

‎Content.Server/Materials/MaterialReclaimerSystem.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@
1616
// SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
1717
// SPDX-FileCopyrightText: 2024 nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
1818
// SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
19+
// SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneMoon@users.noreply.github.com>
20+
// SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
1921
// SPDX-FileCopyrightText: 2025 pa.pecherskij <pa.pecherskij@interfax.ru>
2022
// SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
23+
// SPDX-FileCopyrightText: 2025 willow <willowzeta632146@proton.me>
2124
// SPDX-FileCopyrightText: 2025 wilowzeta <willowzeta632146@proton.me>
2225
//
2326
// SPDX-License-Identifier: MIT
@@ -43,6 +46,7 @@
4346
using Content.Shared.Mind;
4447
using Content.Shared.Nutrition.EntitySystems;
4548
using Content.Shared.Power;
49+
using Content.Shared.Stacks;
4650
using Robust.Server.GameObjects;
4751
using Robust.Shared.Player;
4852
using Robust.Shared.Prototypes;
@@ -236,9 +240,12 @@ private void SpawnMaterialsFromComposition(EntityUid reclaimer,
236240
if (!Resolve(item, ref composition, false))
237241
return;
238242

243+
// If more of these checks are needed, use an event instead
244+
var modifier = CompOrNull<StackComponent>(item)?.Count ?? 1.0f;
245+
239246
foreach (var (material, amount) in composition.MaterialComposition)
240247
{
241-
var outputAmount = (int) (amount * efficiency);
248+
var outputAmount = (int) (amount * efficiency* modifier);
242249
_materialStorage.TryChangeMaterialAmount(reclaimer, material, outputAmount, storage);
243250
}
244251

‎Resources/Maps/Dungeon/experiment.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
# SPDX-FileCopyrightText: 2024 Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
55
# SPDX-FileCopyrightText: 2024 Hannah Giovanna Dawson <karakkaraz@gmail.com>
66
# SPDX-FileCopyrightText: 2024 Kara <lunarautomaton6@gmail.com>
7-
# SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
7+
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
8+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
9+
# SPDX-FileCopyrightText: 2025 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
810
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
911
#
1012
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -6168,7 +6170,7 @@ entities:
61686170
- type: Transform
61696171
pos: 45.521095,1.5328176
61706172
parent: 1653
6171-
- proto: CircuitImprinter
6173+
- proto: MachineAnomalyVesselExperimental
61726174
entities:
61736175
- uid: 1600
61746176
components:
@@ -8428,7 +8430,7 @@ entities:
84288430
parent: 1653
84298431
- type: ApcPowerReceiver
84308432
powerLoad: 0
8431-
- proto: Protolathe
8433+
- proto: Biofabricator
84328434
entities:
84338435
- uid: 618
84348436
components:

‎Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# SPDX-FileCopyrightText: 2023 mhamster <81412348+mhamsterr@users.noreply.github.com>
1313
# SPDX-FileCopyrightText: 2023 potato1234_x <79580518+potato1234x@users.noreply.github.com>
1414
# SPDX-FileCopyrightText: 2024 Aidenkrz <aiden@djkraz.com>
15+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
1516
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
1617
#
1718
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -191,7 +192,8 @@
191192
contents:
192193
- id: ClothingHeadHatCargosoft
193194
- id: ClothingUniformJumpsuitCargo
194-
- id: ClothingBackpack
195+
- id: MaterialBag # Funky Station
196+
- id: RadioHandheldCargo # Funky Station
195197
- id: ClothingShoesColorBlack
196198
- id: ClothingUniformJumpskirtCargo
197199
- id: ClothingHandsGlovesFingerless
@@ -204,7 +206,7 @@
204206
components:
205207
- type: StorageFill
206208
contents:
207-
- id: ClothingBackpack
209+
- id: MaterialBag # Funky Station
208210
- id: ClothingShoesBootsSalvage
209211
amount: 2
210212
- id: ClothingUniformJumpsuitSalvageSpecialist

‎Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# SPDX-FileCopyrightText: 2024 heree <79546981+hereelabs@users.noreply.github.com>
1414
# SPDX-FileCopyrightText: 2024 hereelabs <hahmorm@gmail.com>
1515
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
16+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
1617
# SPDX-FileCopyrightText: 2025 pa.pecherskij <pa.pecherskij@interfax.ru>
1718
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
1819
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
@@ -27,19 +28,23 @@
2728
ClothingBackpackDuffelCargo: 3
2829
ClothingUniformJumpsuitCargo: 3
2930
ClothingUniformJumpskirtCargo: 3
31+
ClothingUniformJumpsuitSalvageSpecialist: 3
3032
ClothingShoesColorBlack: 3
33+
ClothingShoesBootsSalvage: 3
3134
ClothingHandsGlovesFingerless: 3
3235
ClothingHeadHatCargosoft: 3
3336
ClothingHeadBandBrown: 3
3437
ClothingHeadsetCargo: 3
38+
RadioHandheldCargo : 3 # Funky Station
3539
ClothingOuterWinterCargo: 2
3640
ClothingOuterWinterMiner: 2
37-
ClothingNeckScarfStripedBrown: 3
41+
ClothingNeckScarfStripedOrange: 3
42+
ClothingNeckScarfStripedPurple: 3
3843
ClothingShoesBootsWinterCargo: 2
39-
MailBag: 2
44+
MaterialBag: 3 # Funky Station
4045
emaggedInventory:
4146
ClothingUniformJumpsuitWSMSyndicate: 1
4247
contrabandInventory:
4348
ToyFigurineCargoTech: 1
4449
ToyFigurineSalvage: 1
45-
ToyFigurineQuartermaster: 1
50+
ToyFigurineQuartermaster: 1

‎Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# SPDX-FileCopyrightText: 2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
22
# SPDX-FileCopyrightText: 2025 Tadeo <td12233a@gmail.com>
33
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
4+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
5+
# SPDX-FileCopyrightText: 2025 TheSecondLord <88201625+TheSecondLord@users.noreply.github.com>
6+
# SPDX-FileCopyrightText: 2025 V <97265903+formlessnameless@users.noreply.github.com>
47
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
58
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
69
#
@@ -81,7 +84,7 @@
8184
damage:
8285
types:
8386
Slash: 10
84-
Piercing: 10
87+
Blunt: 10
8588
- type: NpcFactionMember
8689
factions:
8790
- SimpleHostile
@@ -201,7 +204,7 @@
201204

202205
- type: entity
203206
id: MobHivelord
204-
parent: [ BaseMobAsteroid, FlyingMobBase ]
207+
parent: BaseMobAsteroid
205208
name: hivelord
206209
description: A truly alien creature, it is a mass of unknown organic material, constantly fluctuating. When attacking, pieces of it split off and attack in tandem with the original.
207210
components:
@@ -334,7 +337,7 @@
334337
entity: FoodHivelordRemainsInert
335338
stage: 1
336339
- type: StaticPrice
337-
price: 5000
340+
price: 1500
338341

339342
- type: entity
340343
id: FoodHivelordRemainsInert

‎Resources/Prototypes/Entities/Mobs/NPCs/carp.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
# SPDX-FileCopyrightText: 2024 no <165581243+pissdemon@users.noreply.github.com>
4444
# SPDX-FileCopyrightText: 2025 Binbag <124107163+Binbagg@users.noreply.github.com>
4545
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
46+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
47+
# SPDX-FileCopyrightText: 2025 TheSecondLord <88201625+TheSecondLord@users.noreply.github.com>
48+
# SPDX-FileCopyrightText: 2025 V <97265903+formlessnameless@users.noreply.github.com>
4649
# SPDX-FileCopyrightText: 2025 misghast <51974455+misterghast@users.noreply.github.com>
4750
# SPDX-FileCopyrightText: 2025 pa.pecherskij <pa.pecherskij@interfax.ru>
4851
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
@@ -112,6 +115,9 @@
112115
- id: MaterialToothSpaceCarp1
113116
amount: 1
114117
maxAmount: 4
118+
- id: MaterialCarpScale1 # Funky
119+
amount: 1
120+
prob: 0.1
115121
- type: MeleeWeapon
116122
altDisarm: false
117123
angle: 0
@@ -317,8 +323,8 @@
317323
- id: MaterialToothSharkminnow1
318324
amount: 1
319325
maxAmount: 3
320-
- id: MaterialChitinSharkminnow1 # Funky
321-
amount: 1
326+
- id: MaterialCarpScale1 # Funky
327+
amount: 2
322328
maxAmount: 4
323329
- type: MeleeWeapon
324330
damage:

‎Resources/Prototypes/Entities/Mobs/NPCs/space.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
# SPDX-FileCopyrightText: 2025 Middleson5 <middlesonarts@gmail.com>
3434
# SPDX-FileCopyrightText: 2025 Tadeo <td12233a@gmail.com>
3535
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
36+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
37+
# SPDX-FileCopyrightText: 2025 TheSecondLord <88201625+TheSecondLord@users.noreply.github.com>
38+
# SPDX-FileCopyrightText: 2025 V <97265903+formlessnameless@users.noreply.github.com>
3639
# SPDX-FileCopyrightText: 2025 misghast <51974455+misterghast@users.noreply.github.com>
3740
# SPDX-FileCopyrightText: 2025 pa.pecherskij <pa.pecherskij@interfax.ru>
3841
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
@@ -52,7 +55,7 @@
5255
task: SimpleHostileCompound
5356
- type: NpcFactionMember
5457
factions:
55-
- SimpleHostile
58+
- Dragon # Funky station, so space fauna dont just kill one another when spawned in
5659
- type: Sprite
5760
drawdepth: Mobs
5861
sprite: Mobs/Animals/bear.rsi

‎Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
# SPDX-FileCopyrightText: 2024 Emisse <99158783+Emisse@users.noreply.github.com>
2626
# SPDX-FileCopyrightText: 2024 Ubaser <134914314+UbaserB@users.noreply.github.com>
2727
# SPDX-FileCopyrightText: 2024 strO0pwafel <153459934+strO0pwafel@users.noreply.github.com>
28+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
29+
# SPDX-FileCopyrightText: 2025 TheSecondLord <88201625+TheSecondLord@users.noreply.github.com>
30+
# SPDX-FileCopyrightText: 2025 V <97265903+formlessnameless@users.noreply.github.com>
2831
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
2932
#
3033
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -42,7 +45,7 @@
4245
task: SimpleHostileCompound
4346
- type: NpcFactionMember
4447
factions:
45-
- SimpleHostile
48+
- Dragon # Funky station, so space fauna dont just kill one another when spawned in
4649
- type: Sprite
4750
drawdepth: Mobs
4851
layers:

‎Resources/Prototypes/Entities/Mobs/Player/dragon.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
# SPDX-FileCopyrightText: 2024 no <165581243+pissdemon@users.noreply.github.com>
3939
# SPDX-FileCopyrightText: 2025 Tadeo <td12233a@gmail.com>
4040
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
41+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
42+
# SPDX-FileCopyrightText: 2025 TheSecondLord <88201625+TheSecondLord@users.noreply.github.com>
43+
# SPDX-FileCopyrightText: 2025 V <97265903+formlessnameless@users.noreply.github.com>
4144
# SPDX-FileCopyrightText: 2025 misghast <51974455+misterghast@users.noreply.github.com>
4245
# SPDX-FileCopyrightText: 2025 pa.pecherskij <pa.pecherskij@interfax.ru>
4346
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
@@ -170,7 +173,10 @@
170173
- type: Butcherable
171174
spawned:
172175
- id: FoodMeatDragon
173-
amount: 2
176+
amount: 4
177+
- id: MaterialCarpScale1 # Funky
178+
amount: 5
179+
maxAmount: 10
174180
- type: InteractionPopup
175181
successChance: 0.25 # It's no goose, but you better smell like carp.
176182
interactSuccessString: petting-success-dragon
@@ -260,12 +266,15 @@
260266
- type: MobThresholds
261267
thresholds:
262268
0: Alive
263-
200: Dead
269+
400: Dead
264270
# less meat spawned since it's a lot easier to kill
265271
- type: Butcherable
266272
spawned:
267273
- id: FoodMeatDragon
268-
amount: 1
274+
amount: 2
275+
- id: MaterialCarpScale1 # Funky
276+
amount: 3
277+
maxAmount: 7
269278
- type: MeleeWeapon
270279
damage:
271280
groups:

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
# SPDX-FileCopyrightText: 2023 lzk <124214523+lzk228@users.noreply.github.com>
99
# SPDX-FileCopyrightText: 2024 Alekshhh <44923899+Alekshhh@users.noreply.github.com>
1010
# SPDX-FileCopyrightText: 2024 Ed <96445749+TheShuEd@users.noreply.github.com>
11-
# SPDX-FileCopyrightText: 2024 Ilya246 <57039557+Ilya246@users.noreply.github.com>
1211
# SPDX-FileCopyrightText: 2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
1312
# SPDX-FileCopyrightText: 2024 PJBot <pieterjan.briers+bot@gmail.com>
1413
# SPDX-FileCopyrightText: 2024 Tadeo <td12233a@gmail.com>
1514
# SPDX-FileCopyrightText: 2024 Ubaser <134914314+UbaserB@users.noreply.github.com>
1615
# SPDX-FileCopyrightText: 2024 Zadeon <loldude9000@gmail.com>
1716
# SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
17+
# SPDX-FileCopyrightText: 2025 Ilya246 <57039557+Ilya246@users.noreply.github.com>
18+
# SPDX-FileCopyrightText: 2025 McBosserson <148172569+McBosserson@users.noreply.github.com>
19+
# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
1820
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
1921
#
2022
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -171,7 +173,7 @@
171173
- type: Material
172174
- type: PhysicalComposition
173175
materialComposition:
174-
RawPlasma: 500 # Goobstation - was 100
176+
RawPlasma: 300 # Goobstation - was 100
175177
- type: PointLight
176178
radius: 1.2
177179
energy: 0.6
@@ -212,7 +214,7 @@
212214
- type: Material
213215
- type: PhysicalComposition
214216
materialComposition:
215-
RawSilver: 300 # Goobstation - was 100
217+
RawSilver: 300
216218
- type: Extractable
217219
grindableSolutionName: silverore
218220
- type: SolutionContainerManager
@@ -284,7 +286,7 @@
284286
- type: Material
285287
- type: PhysicalComposition
286288
materialComposition:
287-
RawUranium: 300 # Goobstation - was 100
289+
RawUranium: 200
288290
- type: PointLight
289291
radius: 1.2
290292
energy: 0.8
@@ -389,7 +391,7 @@
389391
Quantity: 0.1
390392
- type: PhysicalComposition
391393
materialComposition:
392-
Coal: 200 # Goobstation - was 100
394+
Coal: 100
393395

394396
- type: entity
395397
parent: Coal

0 commit comments

Comments
 (0)