Skip to content

Commit c6050ce

Browse files
authored
salv vendor pr (BALANCE/LAVALAND) (Goob-Station#6274)
* salv vendor * linter
1 parent 76c99d6 commit c6050ce

3 files changed

Lines changed: 20 additions & 37 deletions

File tree

Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/salvage_points.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,26 @@
3939
- id: Soap
4040
cost: 200
4141
- id: SeismicCharge
42-
cost: 250
42+
cost: 200
4343
# TODO: laser pointer 300, toy facehugger 300
4444
# TODO: stabilizing serum for 400
4545
- id: BoxMarkerBeacons
4646
cost: 300
47+
- id: LavalandJaunter
48+
cost: 300
4749
- id: Fulton
50+
cost: 300
51+
- id: ClothingEyesGlassesGarMeson
52+
cost: 400
53+
- id: ClothingBeltSalvageWebbing
4854
cost: 400
4955
- id: FultonBeacon
5056
cost: 500
5157
- id: PowerCellHigh
5258
cost: 500
53-
- id: ClothingEyesGlassesGarMeson
54-
cost: 500
55-
- id: ClothingBeltSalvageWebbing
59+
- id: DeathRattleLavalandImplanter
5660
cost: 500
61+
overrideName: shop-listing-deathrattle-implant-lavaland # stupid implanter structure raagh
5762
- id: ClothingShoesBootsJack
5863
cost: 550
5964
- id: MineralScanner
@@ -66,15 +71,14 @@
6671
cost: 650
6772
- id: DoubleEmergencyNitrogenTankFilled
6873
cost: 650
69-
- id: DeathRattleLavalandImplanter
70-
cost: 700
71-
overrideName: shop-listing-deathrattle-implant-lavaland # stupid implanter structure raagh
7274
- id: ClothingMaskWeldingGas
7375
cost: 750
74-
- id: LavalandJaunter
75-
cost: 750
7676
- id: SpaceCash5000
7777
cost: 750
78+
- id: MiningDrill
79+
cost: 800
80+
- id: OreBagMagnetic
81+
cost: 800
7882
- id: SurvivalMedipen
7983
cost: 800
8084
- id: PKAUpgradeRange
@@ -91,20 +95,16 @@
9195
cost: 1050
9296
- id: WeaponCrusherDagger
9397
cost: 1050
94-
- id: MiningDrill
95-
cost: 1100
9698
- id: AdvancedMineralScanner
9799
cost: 1150
98-
- id: OreBagMagnetic
99-
cost: 1200
100100
- id: PKAUpgradeDamage
101101
cost: 1200
102102
- id: ClothingBackpackDuffelSalvageConscription
103103
cost: 1250
104104
- id: LuxuryMedipen
105105
cost: 1500
106106
- id: WeaponPlasmaCutter
107-
cost: 1700
107+
cost: 1500
108108
- id: BorgModuleAdvancedMining
109109
cost: 2000
110110
- id: ClothingHandsGlovesCombat
@@ -115,19 +115,23 @@
115115
cost: 2000
116116
- id: ClothingShoesBootsMoon
117117
cost: 2000
118+
- id: ClothingShoesBootsJump
119+
cost: 2000
118120
- id: ClothingOuterHardsuitSalvage
119121
cost: 2000
120122
#TODO: super resonator for 2500
121-
- id: ClothingShoesBootsJump
122-
cost: 2500
123123
- id: ClothingOuterHardsuitLuxury
124124
cost: 3000 #still costs more than just buying it with spesos you got from vendor but whatever
125+
- id: MedkitCombatFilled
126+
cost: 3000
125127
- id: ShelterCapsuleLuxury
126128
cost: 3000
127129
- id: ClothingEyesNightVisionGoggles
128130
cost: 3500
129131
- id: MiningDrillDiamond
130132
cost: 4000 #Mostly for flexing
133+
- id: ClothingNeckEnsembleSalvager #Earn. It.
134+
cost: 10000
131135
- id: CrateCargoClarkeAssembly
132136
cost: 12500 #TODO: Make modules real
133137
# TODO: luxury elite bar capsule for 10k

Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
role: JobSalvageSpecialist
1818
time: 72000 #20 hours
1919

20-
- type: loadoutEffectGroup
21-
id: GrandMasterSalvageSpecialist
22-
effects:
23-
- !type:JobRequirementLoadoutEffect
24-
requirement:
25-
!type:RoleTimeRequirement
26-
role: JobSalvageSpecialist
27-
time: 360000 # 100 hrs
2820
- type: loadout
2921
id: MinerCloak
3022
effects:
@@ -69,18 +61,6 @@
6961
species:
7062
- Plasmaman
7163

72-
- type: loadout # Goobstation - Ensembles
73-
id: SalvageEspecialistEnsemble
74-
equipment:
75-
neck: ClothingNeckEnsembleSalvager
76-
effects:
77-
- !type:GroupLoadoutEffect
78-
proto: GrandMasterSalvageSpecialist
79-
80-
- type: startingGear # Goobstation - Ensembles
81-
id: SalvageEspecialistEnsemble
82-
equipment:
83-
neck: ClothingNeckEnsembleSalvager
8464

8565
# Salvage
8666
- type: loadout

Resources/Prototypes/_Goobstation/Loadouts/loadout_groups.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,6 @@
13001300
minLimit: 0
13011301
loadouts:
13021302
- MinerCloak
1303-
- SalvageEspecialistEnsemble
13041303

13051304
# Chemist
13061305

0 commit comments

Comments
 (0)