Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Liquidated #668

Merged
merged 2 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
category: Atmospherics
group: market

- type: cargoProduct
id: AtmosphericsLiquidOxygen
icon:
sprite: Structures/Storage/canister.rsi
state: blue
product: LiquidOxygenCanister
cost: 3500
category: Atmospherics
group: market
# - type: cargoProduct
# id: AtmosphericsLiquidOxygen
# icon:
# sprite: Structures/Storage/canister.rsi
# state: blue
# product: LiquidOxygenCanister
# cost: 3500
# category: Atmospherics
# group: market

- type: cargoProduct
id: AtmosphericsNitrogen
Expand All @@ -38,15 +38,15 @@
category: Atmospherics
group: market

- type: cargoProduct
id: AtmosphericsLiquidNitrogen
icon:
sprite: Structures/Storage/canister.rsi
state: red
product: LiquidNitrogenCanister
cost: 3500
category: Atmospherics
group: market
# - type: cargoProduct
# id: AtmosphericsLiquidNitrogen
# icon:
# sprite: Structures/Storage/canister.rsi
# state: red
# product: LiquidNitrogenCanister
# cost: 3500
# category: Atmospherics
# group: market

- type: cargoProduct
id: AtmosphericsCarbonDioxide
Expand Down Expand Up @@ -78,38 +78,38 @@
category: Atmospherics
group: market

#- type: cargoProduct
# name: "water vapor canister"
# id: AtmosphericsWaterVapor
# description: "Water vapor canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: water_vapor
# product: WaterVaporCanister
# cost: 2600
# category: Atmospherics
# group: market
# - type: cargoProduct
# name: "water vapor canister"
# id: AtmosphericsWaterVapor
# description: "Water vapor canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: water_vapor
# product: WaterVaporCanister
# cost: 2600
# category: Atmospherics
# group: market

#- type: cargoProduct
# name: "plasma canister"
# id: AtmosphericsPlasma
# description: "Plasma canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: orange
# product: PlasmaCanister
# cost: 8500
# category: Atmospherics
# group: market
# - type: cargoProduct
# name: "plasma canister"
# id: AtmosphericsPlasma
# description: "Plasma canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: orange
# product: PlasmaCanister
# cost: 8500
# category: Atmospherics
# group: market

#- type: cargoProduct
# name: "tritium canister"
# id: AtmosphericsTritium
# description: "Tritium canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: green
# product: TritiumCanister
# cost: 15500
# category: Atmospherics
# group: market
# - type: cargoProduct
# name: "tritium canister"
# id: AtmosphericsTritium
# description: "Tritium canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# state: green
# product: TritiumCanister
# cost: 15500
# category: Atmospherics
# group: market
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/World/Debris/wrecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
prob: 0.3
- id: SalvageCanisterSpawner
prob: 0.3
- id: SalvageLiquidCanisterSpawner # Frontier
prob: 0.03
- id: SalvageMobSpawner
prob: 0.3
- id: SpawnMobBearSalvage
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# NOTE! All mobs that come out of this should have Salvage rulesets.
# These rulesets exist because Salvage mobs kept harassing the station and going out of control.

- type: entity
name: Salvage Liquid Canister Spawner
id: SalvageLiquidCanisterSpawner
parent: MarkerBase
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Storage/canister.rsi
state: blue
- type: RandomSpawner
rarePrototypes:
- LiquidCarbonDioxideCanister
rareChance: 0.03
prototypes:
- LiquidOxygenCanister
- LiquidNitrogenCanister
chance: 0.9
offset: 0.0
Loading