Renames phoron to plasma everywhere in the codebase and replaces sprites. (#3110)

This commit is contained in:
Vera Aguilera Puerto
2021-02-09 19:05:19 +01:00
committed by GitHub
parent 2d06990ee3
commit 9b1142973e
75 changed files with 154 additions and 129 deletions

View File

@@ -182,8 +182,8 @@ namespace Content.Client.Construction
case StackType.Plasteel:
return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/plasteel.png");
case StackType.Phoron:
return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/phoron.png");
case StackType.Plasma:
return _resourceCache.GetTexture("/Textures/Objects/Materials/sheets.rsi/plasma.png");
case StackType.Cable:
return _resourceCache.GetTexture("/Textures/Objects/Tools/cables.rsi/coil-30.png");

View File

@@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Power
private Animation _insertingMetalAnimation;
private Animation _insertingGlassAnimation;
private Animation _insertingGoldAnimation;
private Animation _insertingPhoronAnimation;
private Animation _insertingPlasmaAnimation;
public override void LoadData(YamlMappingNode node)
{
@@ -29,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power
_insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f);
_insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f);
_insertingGoldAnimation = PopulateAnimation("autolathe_inserting_gold_plate", "autolathe_inserting_unlit", 0.9f);
_insertingPhoronAnimation = PopulateAnimation("autolathe_inserting_phoron_sheet", "autolathe_inserting_unlit", 0.9f);
_insertingPlasmaAnimation = PopulateAnimation("autolathe_inserting_plasma_sheet", "autolathe_inserting_unlit", 0.9f);
}
private Animation PopulateAnimation(string sprite, string spriteUnlit, float length)
@@ -103,10 +103,10 @@ namespace Content.Client.GameObjects.Components.Power
animPlayer.Play(_insertingGoldAnimation, AnimationKey);
}
break;
case LatheVisualState.InsertingPhoron:
case LatheVisualState.InsertingPlasma:
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
animPlayer.Play(_insertingPhoronAnimation, AnimationKey);
animPlayer.Play(_insertingPlasmaAnimation, AnimationKey);
}
break;
default:

View File

@@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.Components.Power
private Animation _insertingMetalAnimation;
private Animation _insertingGlassAnimation;
private Animation _insertingGoldAnimation;
private Animation _insertingPhoronAnimation;
private Animation _insertingPlasmaAnimation;
public override void LoadData(YamlMappingNode node)
{
@@ -29,7 +29,7 @@ namespace Content.Client.GameObjects.Components.Power
_insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f);
_insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f);
_insertingGoldAnimation = PopulateAnimation("protolathe_gold", 0.9f);
_insertingPhoronAnimation = PopulateAnimation("protolathe_phoron", 0.9f);
_insertingPlasmaAnimation = PopulateAnimation("protolathe_plasma", 0.9f);
}
private Animation PopulateAnimation(string sprite, float length)
@@ -99,10 +99,10 @@ namespace Content.Client.GameObjects.Components.Power
animPlayer.Play(_insertingGoldAnimation, AnimationKey);
}
break;
case LatheVisualState.InsertingPhoron:
case LatheVisualState.InsertingPlasma:
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
animPlayer.Play(_insertingPhoronAnimation, AnimationKey);
animPlayer.Play(_insertingPlasmaAnimation, AnimationKey);
}
break;
default:

View File

@@ -12,7 +12,7 @@ using Robust.Shared.Serialization;
namespace Content.Server.Atmos.Reactions
{
[UsedImplicitly]
public class PhoronFireReaction : IGasReactionEffect
public class PlasmaFireReaction : IGasReactionEffect
{
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup)
{
@@ -21,43 +21,43 @@ namespace Content.Server.Atmos.Reactions
var temperature = mixture.Temperature;
var location = holder as TileAtmosphere;
// More phoron released at higher temperatures
// More plasma released at higher temperatures
var temperatureScale = 0f;
var superSaturation = false;
if (temperature > Atmospherics.PhoronUpperTemperature)
if (temperature > Atmospherics.PlasmaUpperTemperature)
temperatureScale = 1f;
else
temperatureScale = (temperature - Atmospherics.PhoronMinimumBurnTemperature) /
(Atmospherics.PhoronUpperTemperature - Atmospherics.PhoronMinimumBurnTemperature);
temperatureScale = (temperature - Atmospherics.PlasmaMinimumBurnTemperature) /
(Atmospherics.PlasmaUpperTemperature - Atmospherics.PlasmaMinimumBurnTemperature);
if (temperatureScale > 0f)
{
var phoronBurnRate = 0f;
var plasmaBurnRate = 0f;
var oxygenBurnRate = Atmospherics.OxygenBurnRateBase - temperatureScale;
if (mixture.GetMoles(Gas.Oxygen) / mixture.GetMoles(Gas.Phoron) >
if (mixture.GetMoles(Gas.Oxygen) / mixture.GetMoles(Gas.Plasma) >
Atmospherics.SuperSaturationThreshold)
superSaturation = true;
if (mixture.GetMoles(Gas.Oxygen) >
mixture.GetMoles(Gas.Phoron) * Atmospherics.PhoronOxygenFullburn)
phoronBurnRate = (mixture.GetMoles(Gas.Phoron) * temperatureScale) /
Atmospherics.PhoronBurnRateDelta;
mixture.GetMoles(Gas.Plasma) * Atmospherics.PlasmaOxygenFullburn)
plasmaBurnRate = (mixture.GetMoles(Gas.Plasma) * temperatureScale) /
Atmospherics.PlasmaBurnRateDelta;
else
phoronBurnRate = (temperatureScale * (mixture.GetMoles(Gas.Oxygen) / Atmospherics.PhoronOxygenFullburn)) / Atmospherics.PhoronBurnRateDelta;
plasmaBurnRate = (temperatureScale * (mixture.GetMoles(Gas.Oxygen) / Atmospherics.PlasmaOxygenFullburn)) / Atmospherics.PlasmaBurnRateDelta;
if (phoronBurnRate > Atmospherics.MinimumHeatCapacity)
if (plasmaBurnRate > Atmospherics.MinimumHeatCapacity)
{
phoronBurnRate = MathF.Min(MathF.Min(phoronBurnRate, mixture.GetMoles(Gas.Phoron)), mixture.GetMoles(Gas.Oxygen)/oxygenBurnRate);
mixture.SetMoles(Gas.Phoron, mixture.GetMoles(Gas.Phoron) - phoronBurnRate);
mixture.SetMoles(Gas.Oxygen, mixture.GetMoles(Gas.Oxygen) - (phoronBurnRate * oxygenBurnRate));
plasmaBurnRate = MathF.Min(MathF.Min(plasmaBurnRate, mixture.GetMoles(Gas.Plasma)), mixture.GetMoles(Gas.Oxygen)/oxygenBurnRate);
mixture.SetMoles(Gas.Plasma, mixture.GetMoles(Gas.Plasma) - plasmaBurnRate);
mixture.SetMoles(Gas.Oxygen, mixture.GetMoles(Gas.Oxygen) - (plasmaBurnRate * oxygenBurnRate));
mixture.AdjustMoles(superSaturation ? Gas.Tritium : Gas.CarbonDioxide, phoronBurnRate);
mixture.AdjustMoles(superSaturation ? Gas.Tritium : Gas.CarbonDioxide, plasmaBurnRate);
energyReleased += Atmospherics.FirePhoronEnergyReleased * (phoronBurnRate);
energyReleased += Atmospherics.FirePlasmaEnergyReleased * (plasmaBurnRate);
mixture.ReactionResults[GasReaction.Fire] += (phoronBurnRate) * (1 + oxygenBurnRate);
mixture.ReactionResults[GasReaction.Fire] += (plasmaBurnRate) * (1 + oxygenBurnRate);
}
}

View File

@@ -150,14 +150,14 @@ namespace Content.Server.Atmos
if (oxygen < 0.5f)
return;
var phoron = Air.GetMoles(Gas.Phoron);
var plasma = Air.GetMoles(Gas.Plasma);
var tritium = Air.GetMoles(Gas.Tritium);
if (Hotspot.Valid)
{
if (soh)
{
if (phoron > 0.5f || tritium > 0.5f)
if (plasma > 0.5f || tritium > 0.5f)
{
if (Hotspot.Temperature < exposedTemperature)
Hotspot.Temperature = exposedTemperature;
@@ -169,7 +169,7 @@ namespace Content.Server.Atmos
return;
}
if ((exposedTemperature > Atmospherics.PhoronMinimumBurnTemperature) && (phoron > 0.5f || tritium > 0.5f))
if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f))
{
Hotspot = new Hotspot
{
@@ -753,7 +753,7 @@ namespace Content.Server.Atmos
ExcitedGroup?.ResetCooldowns();
if ((Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (Hotspot.Volume <= 1f)
|| Air == null || Air.Gases[(int)Gas.Oxygen] < 0.5f || (Air.Gases[(int)Gas.Phoron] < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f))
|| Air == null || Air.Gases[(int)Gas.Oxygen] < 0.5f || (Air.Gases[(int)Gas.Plasma] < 0.5f && Air.GetMoles(Gas.Tritium) < 0.5f))
{
Hotspot = new Hotspot();
UpdateVisuals();

View File

@@ -33,8 +33,8 @@ namespace Content.Server.Construction
prototype = "MetalRodStack1";
break;
case StackType.Phoron:
prototype = "PhoronStack1";
case StackType.Plasma:
prototype = "PlasmaStack1";
break;
case StackType.Plasteel:

View File

@@ -225,7 +225,7 @@ namespace Content.Server.GameObjects.Components.Atmos
case "chem.WeldingFuel":
case "chem.Thermite":
case "chem.Phoron":
case "chem.Plasma":
case "chem.Ethanol":
AdjustFireStacks(volume.Float() / 10f);
return volume;

View File

@@ -96,7 +96,7 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping.Filters
base.ExposeData(serializer);
serializer.DataField(ref _volumeFilterRate, "startingVolumePumpRate", 0);
serializer.DataField(ref _maxVolumeFilterRate, "maxVolumePumpRate", 100);
serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Phoron);
serializer.DataField(ref _gasToFilter, "gasToFilter", Gas.Plasma);
serializer.DataField(ref _initialInletDirection, "inletDirection", PipeDirection.None);
serializer.DataField(ref _initialFilterOutletDirection, "filterOutletDirection", PipeDirection.None);
serializer.DataField(ref _initialOutletDirection, "outletDirection", PipeDirection.None);

View File

@@ -104,8 +104,8 @@ namespace Content.Server.GameObjects.Components.Power
void ISolutionChange.SolutionChanged(SolutionChangeEventArgs eventArgs)
{
IsRigged = Owner.TryGetComponent(out SolutionContainerComponent? solution)
&& solution.Solution.ContainsReagent("chem.Phoron", out var phoron)
&& phoron >= 5;
&& solution.Solution.ContainsReagent("chem.Plasma", out var plasma)
&& plasma >= 5;
}
}

View File

@@ -168,16 +168,16 @@ namespace Content.Shared.Atmos
public const float FireMinimumTemperatureToExist = T0C + 100f;
public const float FireMinimumTemperatureToSpread = T0C + 150f;
public const float FireSpreadRadiosityScale = 0.85f;
public const float FirePhoronEnergyReleased = 3000000f;
public const float FirePlasmaEnergyReleased = 3000000f;
public const float FireGrowthRate = 40000f;
public const float SuperSaturationThreshold = 96f;
public const float OxygenBurnRateBase = 1.4f;
public const float PhoronMinimumBurnTemperature = (100f+T0C);
public const float PhoronUpperTemperature = (1370f+T0C);
public const float PhoronOxygenFullburn = 10f;
public const float PhoronBurnRateDelta = 9f;
public const float PlasmaMinimumBurnTemperature = (100f+T0C);
public const float PlasmaUpperTemperature = (1370f+T0C);
public const float PlasmaOxygenFullburn = 10f;
public const float PlasmaBurnRateDelta = 9f;
/// <summary>
/// This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs)
@@ -254,7 +254,7 @@ namespace Content.Shared.Atmos
Oxygen = 0,
Nitrogen = 1,
CarbonDioxide = 2,
Phoron = 3,
Plasma = 3,
Tritium = 4,
WaterVapor = 5,
}

View File

@@ -11,6 +11,6 @@ namespace Content.Shared.GameObjects.Components.Power
InsertingMetal,
InsertingGlass,
InsertingGold,
InsertingPhoron
InsertingPlasma
}
}

View File

@@ -128,7 +128,7 @@ namespace Content.Shared.GameObjects.Components
MVCable,
HVCable,
Gold,
Phoron,
Plasma,
Ointment,
Gauze,
Brutepack,

View File

@@ -24,12 +24,12 @@
- type: gas
id: 3
name: Phoron
name: Plasma
specificHeat: 200
heatCapacityRatio: 1.7
molarMass: 120 #creadth: making it very heavy (x4 of oxygen), idk what the proper value should be
molarMass: 120
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlayState: phoron
gasOverlayState: plasma
color: FF3300
- type: gas

View File

@@ -1,14 +1,14 @@
- type: gasReaction
id: PhoronFire
id: PlasmaFire
priority: -2
minimumTemperature: 373.149 # Same as Atmospherics.FireMinimumTemperatureToExist
minimumRequirements: # In this case, same as minimum mole count.
- 0.01 # oxygen
- 0 # nitrogen
- 0 # carbon dioxide
- 0.01 # phoron
- 0.01 # plasma
effects:
- !type:PhoronFireReaction {}
- !type:PlasmaFireReaction {}
- type: gasReaction
id: TritiumFire
@@ -18,7 +18,7 @@
- 0.01 # oxygen
- 0 # nitrogen
- 0 # carbon dioxide
- 0 # phoron
- 0 # plasma
- 0.01 # tritium
effects:
- !type:TritiumFireReaction {}

View File

@@ -103,11 +103,11 @@
sprite: Objects/Tanks/generic.rsi
- type: entity
id: PhoronTankFilled
parent: PhoronTank
name: phoron tank
id: PlasmaTankFilled
parent: PlasmaTank
name: plasma tank
suffix: Filled
description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
components:
- type: GasTank
outputPressure: 101.325
@@ -117,5 +117,5 @@
- 0
- 0
- 0
- 11.3146928 # phoron
- 11.3146928 # plasma
temperature: 293.15

View File

@@ -79,7 +79,7 @@
- 0 # oxygen
- 0 # nitrogen
- 0 # CO2
- 0 # Phoron
- 0 # Plasma
- 0 # Tritium
- 0 # Water vapor
temperature: 293.15
@@ -152,8 +152,8 @@
- type: entity
parent: GasCanister
id: PhoronCanister
name: Phoron Canister
id: PlasmaCanister
name: Plasma Canister
components:
- type: Sprite
sprite: Constructible/Atmos/canister.rsi
@@ -165,7 +165,7 @@
- 0 # oxygen
- 0 # nitrogen
- 0 # carbon dioxide
- 1871.71051 # phoron
- 1871.71051 # plasma
temperature: 293.15
- type: entity
@@ -183,7 +183,7 @@
- 0 # oxygen
- 0 # nitrogen
- 0 # CO2
- 0 # Phoron
- 0 # Plasma
- 1871.71051 # Tritium
temperature: 293.15
@@ -202,7 +202,7 @@
- 0 # oxygen
- 0 # nitrogen
- 0 # CO2
- 0 # Phoron
- 0 # Plasma
- 0 # Tritium
- 1871.71051 # Water vapor
temperature: 293.15

View File

@@ -395,17 +395,17 @@
state_closed: scicratesecure_door
- type: entity
id: CratePhoron
name: phoron crate
id: CratePlasma
name: plasma crate
parent: CrateGeneric
components:
- type: AccessReader
- type: SecureEntityStorage
- type: Sprite
sprite: Constructible/Storage/Crates/phoron.rsi
sprite: Constructible/Storage/Crates/plasma.rsi
layers:
- state: phoroncrate
- state: phoroncrate_door
- state: plasmacrate
- state: plasmacrate_door
map: ["enum.StorageVisualLayers.Door"]
- state: welded
visible: false
@@ -414,13 +414,13 @@
map: ["enum.StorageVisualLayers.Lock"]
shader: unshaded
- type: Icon
sprite: Constructible/Storage/Crates/phoron.rsi
state: phoroncrate_icon
sprite: Constructible/Storage/Crates/plasma.rsi
state: plasmacrate_icon
- type: Appearance
visuals:
- type: StorageVisualizer
state_open: phoroncrate_open
state_closed: phoroncrate_door
state_open: plasmacrate_open
state_closed: plasmacrate_door
- type: entity
id: CrateSecure

View File

@@ -891,8 +891,8 @@
- type: entity
parent: BaseSign
id: WarningPhoron
name: phoron waste sign
id: WarningPlasma
name: plasma waste sign
description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working.
components:
- type: Physics
@@ -907,7 +907,7 @@
- SmallImpassable
- Clickable
- type: Sprite
state: atmos_phoron
state: atmos_plasma
- type: entity

View File

@@ -89,15 +89,15 @@
node: reinforcedWindow
- type: entity
id: PhoronWindow
name: phoronwindow
id: PlasmaWindow
name: plasma window
parent: Window
components:
- type: Sprite
drawdepth: WallTops
sprite: Constructible/Structures/Windows/phoron_window.rsi
sprite: Constructible/Structures/Windows/plasma_window.rsi
- type: Icon
sprite: Constructible/Structures/Windows/phoron_window.rsi
sprite: Constructible/Structures/Windows/plasma_window.rsi
- type: Damageable
resistances: metallicResistances
- type: Destructible
@@ -110,7 +110,7 @@
soundCollection: GlassBreak
- !type:SpawnEntitiesBehavior
spawn:
ShardGlassPhoron:
ShardGlassPlasma:
min: 1
max: 2
- !type:DoActsBehavior
@@ -120,4 +120,4 @@
base: pwindow
- type: Construction
graph: window
node: phoronWindow
node: plasmaWindow

View File

@@ -157,37 +157,37 @@
count: 1
- type: entity
name: phoron ore
id: OrePhoron
name: plasma ore
id: OrePlasma
parent: BaseItem
components:
- type: Sprite
sprite: Objects/Materials/materials.rsi
state: phoron_ore
state: plasma_ore
- type: entity
name: phoron sheet
id: PhoronStack
name: plasma sheet
id: PlasmaStack
parent: MaterialStack
suffix: Full
components:
- type: Material
materials:
- key: enum.MaterialKeys.Stack
mat: phoron
mat: plasma
- type: Stack
stacktype: enum.StackType.Phoron
stacktype: enum.StackType.Plasma
- type: Sprite
sprite: Objects/Materials/sheets.rsi
state: phoron
state: plasma
- type: Item
sprite: Objects/Materials/sheets.rsi
HeldPrefix: phoron
HeldPrefix: plasma
- type: entity
id: PhoronStack1
name: phoron sheet
parent: PhoronStack
id: PlasmaStack1
name: plasma sheet
parent: PlasmaStack
suffix: 1
components:
- type: Stack

View File

@@ -109,7 +109,7 @@
name: soap
id: SoapNT
parent: Soap
description: A Nanotrasen brand bar of soap. Smells of phoron.
description: A Nanotrasen brand bar of soap. Smells of plasma.
components:
- type: Sprite
state: soapnt

View File

@@ -147,20 +147,20 @@
- Back
- type: entity
id: PhoronTank
id: PlasmaTank
parent: GasTankBase
name: phoron tank
name: plasma tank
suffix: Empty
description: "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
components:
- type: Sprite
sprite: Objects/Tanks/phoron.rsi
sprite: Objects/Tanks/plasma.rsi
- type: GasTank
outputPressure: 101.325
air:
volume: 70
temperature: 293.15
- type: Clothing
sprite: Objects/Tanks/phoron.rsi
sprite: Objects/Tanks/plasma.rsi
Slots:
- Belt

View File

@@ -54,9 +54,9 @@
amount: 10
- type: entity
id: ShardGlassPhoron
name: phoron glass shard
description: A small piece of phoron glass. It looks sharp, you wouldn't want to step on it barefoot.
id: ShardGlassPlasma
name: plasma glass shard
description: A small piece of plasma glass. It looks sharp, you wouldn't want to step on it barefoot.
parent: ShardBase
components:
- type: Sprite
@@ -66,6 +66,6 @@
- type: WelderRefinable
refineResult:
- GlassStack
- PhoronStack
- PlasmaStack
- type: DamageOtherOnHit
amount: 15

View File

@@ -99,8 +99,8 @@
amount: 0.5
- type: reagent
id: chem.Phoron
name: phoron
id: chem.Plasma
name: plasma
desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways.
physicalDesc: gaseous
color: "#7e009e"

View File

@@ -38,9 +38,9 @@
specificHeat: 1000
- type: material
id: phoron
name: phoron
icon: Objects/Materials/phoron_sheet.png
id: plasma
name: plasma
icon: Objects/Materials/sheets.rsi/plasma.png
density: 200
electricResistivity: 2.1e-1
thermalConductivity: 80

View File

@@ -4,14 +4,14 @@
graph:
- node: start
edges:
- to: phoronWindow
- to: plasmaWindow
steps:
- material: Metal
amount: 2
doAfter: 2
- material: Glass
amount: 2
- material: Phoron
- material: Plasma
amount: 2
doAfter: 3
@@ -61,8 +61,8 @@
- tool: Anchoring
doAfter: 2
- node: phoronWindow
entity: PhoronWindow
- node: plasmaWindow
entity: PlasmaWindow
edges:
- to: start
completed:
@@ -73,7 +73,7 @@
prototype: MetalSheet1
amount: 2
- !type:SpawnPrototype
prototype: PhoronSheet1
prototype: PlasmaSheet1
amount: 2
- !type:DeleteEntity {}
steps:

View File

@@ -107,18 +107,18 @@
canRotate: false
- type: construction
name: phoron window
id: PhoronWindow
name: plasma window
id: PlasmaWindow
graph: window
startNode: start
targetNode: phoronWindow
targetNode: plasmaWindow
category: Structures
description: Clear and even tougher, with an orange tint. Must be built on top of a low wall.
conditions:
- !type:LowWallInTile {}
- !type:NoWindowsInTile {}
icon:
sprite: Constructible/Structures/Windows/phoron_window.rsi
sprite: Constructible/Structures/Windows/plasma_window.rsi
state: full
objectType: Structure
placementMode: SnapgridCenter

View File

@@ -73,7 +73,7 @@
amount: 1
chem.Sodium:
amount: 1
chem.Phoron:
chem.Plasma:
amount: 5
catalyst: true
products:
@@ -106,7 +106,7 @@
reactants:
chem.Oxygen:
amount: 2
chem.Phoron:
chem.Plasma:
amount: 5
catalyst: true
products:
@@ -211,7 +211,7 @@
amount: 1
chem.Copper:
amount: 1
chem.Phoron:
chem.Plasma:
amount: 5
catalyst: true
products:
@@ -239,7 +239,7 @@
amount: 1
chem.Tramadol:
amount: 1
chem.Phoron:
chem.Plasma:
amount: 1
products:
chem.Oxycodone: 3
@@ -407,7 +407,7 @@
reactants:
chem.Ammonia:
amount: 1
chem.Phoron:
chem.Plasma:
amount: 1
products:
chem.Lexorin: 2

View File

Before

Width:  |  Height:  |  Size: 650 B

After

Width:  |  Height:  |  Size: 650 B

View File

@@ -88,7 +88,7 @@
]
},
{
"name": "atmos_phoron",
"name": "atmos_plasma",
"delays": [
[
1

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -93,6 +93,22 @@
]
]
},
{
"name": "autolathe_inserting_plasma_sheet",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "autolathe_inserting_gold_plate",
"delays": [

View File

@@ -8,17 +8,17 @@
},
"states": [
{
"name": "phoroncrate",
"name": "plasmacrate",
"select": [],
"flags": {}
},
{
"name": "phoroncrate_door",
"name": "plasmacrate_door",
"select": [],
"flags": {}
},
{
"name": "phoroncrate_icon",
"name": "plasmacrate_icon",
"select": [],
"flags": {}
},
@@ -46,7 +46,7 @@
"name": "sparking", "delays": [[0.1,0.1,0.1,0.1,0.1,0.1]]
},
{
"name": "phoroncrate_open",
"name": "plasmacrate_open",
"select": [],
"flags": {}
}

View File

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 775 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 775 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 892 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 B

View File

@@ -1 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "freon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "freon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "phoron", "delays": [[0.1, 0.1, 0.1]]}, {"name": "phoron_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]}
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "freon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "freon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "plasma", "delays": [[0.1, 0.1, 0.1]]}, {"name": "plasma_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 592 B

After

Width:  |  Height:  |  Size: 592 B

View File

@@ -58,6 +58,9 @@
{
"name": "tinbar_single"
},
{
"name": "plasma_ore"
},
{
"name": "phoron_ore"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 501 B

View File

@@ -35,6 +35,12 @@
{
"name": "phoron"
},
{
"name": "plasmaglass"
},
{
"name": "plasma"
},
{
"name": "metal"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

View File

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

View File

Before

Width:  |  Height:  |  Size: 482 B

After

Width:  |  Height:  |  Size: 482 B

View File

Before

Width:  |  Height:  |  Size: 537 B

After

Width:  |  Height:  |  Size: 537 B

View File

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 522 B