diff --git a/Resources/Prototypes/_NF/Atmos/deposits.yml b/Resources/Prototypes/_NF/Atmos/deposits.yml index 2dee1d8912c..76bf673739d 100644 --- a/Resources/Prototypes/_NF/Atmos/deposits.yml +++ b/Resources/Prototypes/_NF/Atmos/deposits.yml @@ -102,3 +102,29 @@ - 0, 2000 # ammonia - 0, 1000 # n2o - 0, 0 # frezon + +- type: gasDeposit + id: MuddleEven + gases: + - 2000, 4000 # oxygen + - 2000, 4000 # nitrogen + - 2000, 4000 # carbon dioxide + - 2000, 4000 # plasma + - 0, 400 # tritium + - 2000, 4000 # water vapor + - 2000, 4000 # ammonia + - 2000, 4000 # n2o + - 0, 0 # frezon + +- type: gasDeposit + id: MuddlePlasma + gases: + - 2000, 4000 # oxygen + - 2000, 4000 # nitrogen + - 2000, 4000 # carbon dioxide + - 4000, 8000 # plasma + - 0, 300 # tritium + - 1000, 2000 # water vapor + - 1000, 2000 # ammonia + - 2000, 4000 # n2o + - 0, 0 # frezon diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml index d314cfb55a8..fee45fb35a0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Atmospherics/deposits.yml @@ -23,7 +23,7 @@ - type: entity parent: BaseGasDeposit - id: OxygenGasDeposit + id: GasDepositOxygen suffix: Oxygen components: - type: RandomGasDeposit @@ -33,7 +33,7 @@ - type: entity parent: BaseGasDeposit - id: NitrogenGasDeposit + id: GasDepositNitrogen suffix: Nitrogen components: - type: RandomGasDeposit @@ -43,7 +43,7 @@ - type: entity parent: BaseGasDeposit - id: CarbonDioxideGasDeposit + id: GasDepositCarbonDioxide suffix: Carbon Dioxide components: - type: RandomGasDeposit @@ -53,7 +53,7 @@ - type: entity parent: BaseGasDeposit - id: PlasmaGasDeposit + id: GasDepositPlasma suffix: Plasma components: - type: RandomGasDeposit @@ -63,7 +63,7 @@ - type: entity parent: BaseGasDeposit - id: AmmoniaGasDeposit + id: GasDepositAmmonia suffix: Ammonia components: - type: RandomGasDeposit @@ -73,7 +73,7 @@ - type: entity parent: BaseGasDeposit - id: WaterVaporGasDeposit + id: GasDepositWaterVapor suffix: Water Vapor components: - type: RandomGasDeposit @@ -83,7 +83,7 @@ - type: entity parent: BaseGasDeposit - id: NitrousOxideGasDeposit + id: GasDepositNitrousOxide suffix: Nitrous Oxide components: - type: RandomGasDeposit @@ -93,12 +93,32 @@ - type: entity parent: BaseGasDeposit - id: AirGasDeposit + id: GasDepositAir suffix: Air-like components: - type: RandomGasDeposit depositPrototype: AirLike +- type: entity + parent: BaseGasDeposit + id: GasDepositMuddleEven + suffix: Muddled, Even + components: + - type: RandomGasDeposit + depositPrototype: MuddleEven + - type: Sprite + color: "#DDEEDD" + +- type: entity + parent: BaseGasDeposit + id: GasDepositMuddlePlasma + suffix: Muddled, Plasma-heavy + components: + - type: RandomGasDeposit + depositPrototype: MuddlePlasma + - type: Sprite + color: "#F0DDF0" + # Debug item for detecting gas deposits - type: entity parent: PinpointerSyndicateNuclear diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml index 324fc3bc438..6ff8a996df6 100644 --- a/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml +++ b/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml @@ -34,21 +34,25 @@ max: 2 canBeAirSealed: true entries: - - id: OxygenGasDeposit + - id: GasDepositOxygen orGroup: deposit - - id: NitrogenGasDeposit + - id: GasDepositNitrogen orGroup: deposit - - id: CarbonDioxideGasDeposit + - id: GasDepositCarbonDioxide orGroup: deposit - - id: PlasmaGasDeposit + - id: GasDepositPlasma orGroup: deposit - - id: AmmoniaGasDeposit + - id: GasDepositAmmonia orGroup: deposit - - id: WaterVaporGasDeposit + - id: GasDepositWaterVapor orGroup: deposit - - id: NitrousOxideGasDeposit + - id: GasDepositNitrousOxide orGroup: deposit - - id: AirGasDeposit + - id: GasDepositAir + orGroup: deposit + - id: GasDepositMuddleEven + orGroup: deposit + - id: GasDepositMuddlePlasma orGroup: deposit # endregion Rock Table