Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/Prototypes/Atmospherics/gases.yml
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

8
Resources/Prototypes/Atmospherics/reactions.yml
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 {}

10
Resources/Prototypes/Catalog/Fills/gas_tanks.yml
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

12
Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml
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

18
Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml
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

6
Resources/Prototypes/Entities/Constructible/Walls/signs.yml
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

12
Resources/Prototypes/Entities/Constructible/Walls/windows.yml
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

24
Resources/Prototypes/Entities/Objects/Misc/material_stacks.yml
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

2
Resources/Prototypes/Entities/Objects/Specific/janitor.yml
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

10
Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
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

8
Resources/Prototypes/Entities/Objects/shards.yml
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

4
Resources/Prototypes/Reagents/chemicals.yml
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"

6
Resources/Prototypes/Reagents/materials.yml
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

10
Resources/Prototypes/Recipes/Construction/Graphs/window.yml
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:

8
Resources/Prototypes/Recipes/Construction/structures.yml
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

10
Resources/Prototypes/Recipes/Reactions/medicine.yml
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