From f52f76b483702c681ad268bf39f85905776996b7 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 19 Apr 2024 22:26:25 -0400 Subject: [PATCH] Phoron Will Make Us Rich --- .../Explosion/ExplosionOverlaySystem.cs | 2 +- .../Systems/AdminVerbSystem.Tools.cs | 34 ++++----- .../Components/AnomalyGeneratorComponent.cs | 4 +- .../AtmosphereSystem.Commands.cs | 8 +-- .../EntitySystems/AtmosphereSystem.Hotspot.cs | 10 +-- .../Unary/EntitySystems/GasCanisterSystem.cs | 2 +- .../Portable/PortableScrubberComponent.cs | 2 +- ...aFireReaction.cs => PhoronFireReaction.cs} | 40 +++++------ .../Components/GatewayGeneratorComponent.cs | 2 +- .../Materials/MaterialStorageSystem.cs | 8 +-- .../EntitySystems/SmokingSystem.Vape.cs | 2 +- .../Power/Components/RiggableComponent.cs | 2 +- .../SolidFuelGeneratorAdapterComponent.cs | 2 +- .../Components/GasLeakRuleComponent.cs | 2 +- .../Components/TemperatureComponent.cs | 2 +- .../Components/GasArtifactComponent.cs | 2 +- .../Components/ArtifactGasTriggerComponent.cs | 2 +- Content.Shared/Atmos/Atmospherics.cs | 14 ++-- .../Atmos/Components/GasAnalyzerComponent.cs | 2 +- .../Components/SharedVentScrubberComponent.cs | 2 +- Resources/Audio/Weapons/attributions.yml | 6 +- .../{plasma_cutter.ogg => phoron_cutter.ogg} | Bin Resources/Changelog/Changelog.yml | 14 ++-- .../Locale/en-US/administration/smites.ftl | 4 +- .../advertisements/vending/atmosdrobe.ftl | 4 +- .../en-US/advertisements/vending/scidrobe.ftl | 2 +- .../ghost/roles/ghost-role-component.ftl | 4 +- .../en-US/escape-menu/ui/options-menu.ftl | 2 +- Resources/Locale/en-US/gases/gases.ftl | 2 +- Resources/Locale/en-US/markings/moth.ftl | 12 ++-- .../Locale/en-US/materials/materials.ftl | 8 +-- .../en-US/nyanotrasen/markings/moth.ftl | 4 +- Resources/Locale/en-US/paper/paper-misc.ftl | 2 +- .../power/components/radiation-collector.ftl | 4 +- .../Locale/en-US/reagents/meta/gases.ftl | 4 +- .../Locale/en-US/reagents/phlogiston.ftl | 2 +- .../Locale/en-US/salvage/salvage-magnet.ftl | 8 +-- .../en-US/xenoarchaeology/artifact-hints.ftl | 2 +- Resources/Maps/Dungeon/experiment.yml | 6 +- Resources/Maps/Dungeon/snowy_labs.yml | 2 +- Resources/Maps/Misc/charliestation.yml | 8 +-- Resources/Maps/Nonstations/nukieplanet.yml | 6 +- Resources/Maps/Ruins/DeltaV/derelict.yml | 4 +- Resources/Maps/Ruins/derelict.yml | 2 +- .../Maps/Salvage/DeltaV/DV-animalfarm.yml | 2 +- .../Maps/Salvage/DeltaV/DV-asteroid-base.yml | 18 ++--- .../Salvage/DeltaV/DV-asteroid-large-03.yml | 2 +- .../DeltaV/DV-asteroid-mining-chemlab.yml | 6 +- .../Maps/Salvage/DeltaV/DV-atlas-atmos.yml | 6 +- .../Maps/Salvage/DeltaV/DV-atlas-epi.yml | 4 +- .../Maps/Salvage/DeltaV/DV-atlas-medical.yml | 6 +- .../Maps/Salvage/DeltaV/DV-atlas-perma.yml | 2 +- .../Salvage/DeltaV/DV-hauling-shuttle.yml | 2 +- .../DeltaV/DV-large-asteroid-mining-01.yml | 4 +- .../Maps/Salvage/DeltaV/DV-med-chunk-01.yml | 2 +- .../Salvage/DeltaV/DV-med-crashed-shuttle.yml | 2 +- .../Maps/Salvage/DeltaV/DV-med-vault-01.yml | 4 +- .../Maps/Salvage/DeltaV/DV-medium-01.yml | 6 +- .../Maps/Salvage/DeltaV/DV-outpost-arm.yml | 2 +- .../Salvage/DeltaV/DV-research-outpost-01.yml | 6 +- .../Salvage/DeltaV/DV-ruin-cargo-salvage.yml | 2 +- .../Maps/Salvage/DeltaV/DV-stationstation.yml | 2 +- Resources/Maps/Salvage/asteroid-base.yml | 10 +-- Resources/Maps/Salvage/engineering-chunk.yml | 4 +- Resources/Maps/Salvage/hauling-shuttle.yml | 2 +- Resources/Maps/Salvage/medium-1.yml | 2 +- .../Maps/Salvage/medium-crashed-shuttle.yml | 2 +- Resources/Maps/Salvage/medium-vault-1.yml | 4 +- Resources/Maps/Salvage/outpost-arm.yml | 2 +- Resources/Maps/Salvage/ruin-cargo-salvage.yml | 2 +- Resources/Maps/Salvage/small-syndicate.yml | 2 +- Resources/Maps/Salvage/stationstation.yml | 2 +- .../Maps/Shuttles/DeltaV/DV-pirateradio.yml | 2 +- Resources/Maps/Shuttles/DeltaV/NTES_BC20.yml | 2 +- .../Maps/Shuttles/DeltaV/NTES_Centipede.yml | 2 +- Resources/Maps/Shuttles/DeltaV/NTES_Delta.yml | 4 +- Resources/Maps/Shuttles/DeltaV/NTES_Lox.yml | 2 +- Resources/Maps/Shuttles/DeltaV/NTES_Right.yml | 2 +- Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml | 2 +- Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml | 6 +- Resources/Maps/Shuttles/dart.yml | 2 +- Resources/Maps/Shuttles/emergency.yml | 2 +- Resources/Maps/Shuttles/infiltrator.yml | 6 +- Resources/Maps/Shuttles/pirate.yml | 4 +- Resources/Maps/Shuttles/striker.yml | 4 +- Resources/Maps/Shuttles/trading_outpost.yml | 2 +- Resources/Maps/Shuttles/wizard.yml | 6 +- Resources/Maps/Test/dev_map.yml | 4 +- Resources/Maps/Test/test_teg.yml | 2 +- Resources/Maps/arena.yml | 22 +++--- Resources/Maps/asterisk.yml | 10 +-- Resources/Maps/centcomm.yml | 2 +- Resources/Maps/edge.yml | 26 +++---- Resources/Maps/hammurabi.yml | 18 ++--- Resources/Maps/hive.yml | 12 ++-- Resources/Maps/pebble.yml | 16 ++--- Resources/Maps/shoukou.yml | 22 +++--- Resources/Maps/submarine.yml | 18 ++--- Resources/Maps/tortuga.yml | 18 ++--- Resources/Migrations/migration.yml | 4 +- Resources/Prototypes/Atmospherics/gases.yml | 6 +- .../Prototypes/Atmospherics/reactions.yml | 18 ++--- .../Prototypes/Atmospherics/thresholds.yml | 2 +- .../Catalog/Cargo/cargo_atmospherics.yml | 4 +- .../Catalog/Cargo/cargo_materials.yml | 6 +- .../Prototypes/Catalog/Fills/Crates/cargo.yml | 2 +- .../Catalog/Fills/Crates/engines.yml | 4 +- .../Catalog/Fills/Crates/materials.yml | 10 +-- .../Catalog/Fills/Crates/salvage.yml | 4 +- .../Catalog/Fills/Crates/service.yml | 2 +- .../Catalog/Fills/Items/gas_tanks.yml | 14 ++-- .../Inventories/tankdispenser.yml | 2 +- .../Datasets/Names/Operation_prefix.yml | 2 +- .../Prototypes/Datasets/Names/autoborg.yml | 2 +- Resources/Prototypes/Datasets/ion_storm.yml | 2 +- Resources/Prototypes/Datasets/tips.yml | 8 +-- .../Markers/Spawners/Random/miningrock.yml | 4 +- .../Structures/Machines/vending_machines.yml | 2 +- .../DeltaV/Recipes/Lathes/security.yml | 2 +- Resources/Prototypes/DeltaV/ore.yml | 2 +- .../Entities/Clothing/Back/backpacks.yml | 2 +- .../Entities/Clothing/Back/duffel.yml | 2 +- .../Entities/Clothing/Back/satchel.yml | 2 +- .../Markers/Spawners/Random/crates.yml | 2 +- .../Markers/Spawners/Random/salvage.yml | 2 +- .../Entities/Markers/atmos_blocker.yml | 14 ++-- .../Mobs/Customization/Markings/moth.yml | 10 +-- .../Smokeables/Cigarettes/cigarette.yml | 2 +- .../Circuitboards/Machine/production.yml | 16 ++--- .../Objects/Devices/encryption_keys.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 2 +- .../Objects/Materials/Sheets/glass.yml | 30 ++++---- .../Objects/Materials/Sheets/metal.yml | 2 +- .../Objects/Materials/Sheets/other.yml | 34 ++++----- .../Entities/Objects/Materials/ore.yml | 20 +++--- .../Entities/Objects/Materials/shards.yml | 14 ++-- .../Objects/Specific/Janitorial/soap.yml | 2 +- .../Entities/Objects/Specific/Mech/mechs.yml | 4 +- .../Entities/Objects/Tools/gas_tanks.yml | 12 ++-- .../Entities/Objects/Tools/matches.yml | 2 +- .../Objects/Weapons/Melee/e_sword.yml | 4 +- .../Entities/Objects/Weapons/Melee/knife.yml | 12 ++-- .../Entities/Objects/Weapons/Melee/mining.yml | 2 +- .../Entities/Objects/Weapons/Melee/spear.yml | 10 +-- .../Doors/MaterialDoors/material_doors.yml | 8 +-- .../Structures/Doors/Windoors/assembly.yml | 14 ++-- .../Doors/Windoors/base_structurewindoors.yml | 14 ++-- .../Structures/Doors/Windoors/windoor.yml | 48 ++++++------- .../Structures/Furniture/Tables/tables.yml | 14 ++-- .../Structures/Machines/anomaly_equipment.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 4 +- .../Structures/Machines/vending_machines.yml | 2 +- .../Structures/Piping/Atmospherics/miners.yml | 6 +- .../Structures/Piping/Atmospherics/unary.yml | 4 +- .../Generation/Singularity/collector.yml | 8 +-- .../Power/Generation/portable_generator.yml | 10 +-- .../Specific/Atmospherics/sensor.yml | 2 +- .../Storage/Canisters/gas_canisters.yml | 24 +++---- .../Structures/Storage/Crates/crates.yml | 8 +-- .../Structures/Wallmounts/Signs/signs.yml | 8 +-- .../Entities/Structures/Walls/asteroid.yml | 56 +++++++-------- .../Entities/Structures/Walls/walls.yml | 12 ++-- .../Windows/{plasma.yml => phoron.yml} | 34 ++++----- .../Entities/Structures/Windows/rplasma.yml | 34 ++++----- .../{liquid_plasma.yml => liquid_phoron.yml} | 12 ++-- .../Entities/World/Debris/asteroids.yml | 2 +- .../Markers/Spawners/Random/randomitems.yml | 6 +- .../Mobs/Customization/Markings/moth.yml | 8 +-- .../Objects/Specific/Mail/mail_medical.yml | 6 +- .../Structures/Machines/vending_machines.yml | 2 +- .../Structures/Wallmounts/Signs/posters.yml | 2 +- .../Recipes/Lathes/electronics.yml | 2 +- .../Nyanotrasen/Recipes/Reactions/psionic.yml | 4 +- .../Prototypes/Nyanotrasen/mailDeliveries.yml | 4 +- .../Prototypes/Procedural/Magnet/asteroid.yml | 2 +- .../Procedural/biome_ore_templates.yml | 16 ++--- .../Prototypes/Procedural/biome_templates.yml | 4 +- .../Prototypes/Procedural/salvage_loot.yml | 4 +- .../Prototypes/Procedural/salvage_mods.yml | 6 +- .../Prototypes/Procedural/salvage_rewards.yml | 2 +- .../Prototypes/Reagents/Materials/glass.yml | 12 ++-- .../Reagents/Materials/materials.yml | 8 +-- .../Prototypes/Reagents/Materials/metals.yml | 2 +- .../Prototypes/Reagents/Materials/ores.yml | 8 +-- Resources/Prototypes/Reagents/gases.yml | 6 +- .../Construction/Graphs/furniture/tables.yml | 8 +-- .../Construction/Graphs/materials/glass.yml | 8 +-- .../Construction/Graphs/structures/doors.yml | 10 +-- .../Construction/Graphs/structures/girder.yml | 10 +-- .../Graphs/structures/windoor.yml | 28 ++++---- .../Construction/Graphs/structures/window.yml | 16 ++--- .../Graphs/structures/window_diagonal.yml | 16 ++--- .../Graphs/structures/windowdirectional.yml | 16 ++--- .../Construction/Graphs/weapons/shiv.yml | 14 ++-- .../Construction/Graphs/weapons/spear.yml | 8 +-- .../Recipes/Construction/furniture.yml | 10 +-- .../Recipes/Construction/materials.yml | 16 ++--- .../Recipes/Construction/structures.yml | 68 +++++++++--------- .../Recipes/Construction/weapons.yml | 20 +++--- .../Recipes/Cooking/meal_recipes.yml | 4 +- .../Prototypes/Recipes/Lathes/chemistry.yml | 4 +- .../Prototypes/Recipes/Lathes/devices.yml | 14 ++-- .../Recipes/Lathes/rehydrateable.yml | 6 +- .../Prototypes/Recipes/Lathes/robotics.yml | 2 +- .../Prototypes/Recipes/Lathes/security.yml | 2 +- Resources/Prototypes/Recipes/Lathes/sheet.yml | 12 ++-- Resources/Prototypes/Recipes/Lathes/tools.yml | 8 +-- .../Recipes/Reactions/chemicals.yml | 2 +- .../Prototypes/Recipes/Reactions/drinks.yml | 2 +- .../Prototypes/Recipes/Reactions/fun.yml | 2 +- .../Prototypes/Recipes/Reactions/medicine.yml | 8 +-- .../Recipes/Reactions/pyrotechnic.yml | 6 +- .../Stacks/Materials/Sheets/glass.yml | 8 +-- .../Stacks/Materials/Sheets/other.yml | 8 +-- Resources/Prototypes/Stacks/Materials/ore.yml | 8 +-- .../XenoArch/Effects/normal_effects.yml | 8 +-- .../Prototypes/XenoArch/artifact_triggers.yml | 6 +- Resources/Prototypes/hud.yml | 6 +- Resources/Prototypes/ore.yml | 6 +- Resources/Prototypes/tags.yml | 2 +- Resources/Prototypes/themes.yml | 4 +- Resources/ServerInfo/AssDayRules.txt | 2 +- .../Guidebook/Engineering/Atmospherics.xml | 8 +-- .../Guidebook/Engineering/Fires.xml | 2 +- .../Engineering/PortableGenerator.xml | 2 +- .../Guidebook/Engineering/Singularity.xml | 12 ++-- .../ServerInfo/Guidebook/Engineering/TEG.xml | 2 +- .../Guidebook/Science/AnomalousResearch.xml | 2 +- .../ServerInfo/Guidebook/Science/Science.xml | 2 +- .../Guidebook/Epistemics/Psionics.xml | 2 +- .../Clothing/Belt/belt_overlay.rsi/meta.json | 2 +- ...-BELT.png => phorontank-equipped-BELT.png} | Bin .../Effects/atmospherics.rsi/meta.json | 4 +- .../{plasma.png => phoron.png} | Bin .../{plasma_old.png => phoron_old.png} | Bin .../SlotBackground.png | Bin .../{Plasmafire => Phoronfire}/Slots/back.png | Bin .../{Plasmafire => Phoronfire}/Slots/belt.png | Bin .../{Plasmafire => Phoronfire}/Slots/ears.png | Bin .../Slots/glasses.png | Bin .../Slots/gloves.png | Bin .../Slots/hand_l.png | Bin .../Slots/hand_l_no_letter.png | Bin .../Slots/hand_r.png | Bin .../Slots/hand_r_no_letter.png | Bin .../{Plasmafire => Phoronfire}/Slots/head.png | Bin .../{Plasmafire => Phoronfire}/Slots/id.png | Bin .../{Plasmafire => Phoronfire}/Slots/mask.png | Bin .../{Plasmafire => Phoronfire}/Slots/neck.png | Bin .../Slots/pocket.png | Bin .../Slots/shoes.png | Bin .../{Plasmafire => Phoronfire}/Slots/suit.png | Bin .../Slots/suit_storage.png | Bin .../Slots/toggle.png | Bin .../Slots/uniform.png | Bin .../{Plasmafire => Phoronfire}/Slots/web.png | Bin .../Storage/piece_bottom.png | Bin .../Storage/piece_bottomLeft.png | Bin .../Storage/piece_bottomRight.png | Bin .../Storage/piece_center.png | Bin .../Storage/piece_left.png | Bin .../Storage/piece_right.png | Bin .../Storage/piece_top.png | Bin .../Storage/piece_topLeft.png | Bin .../Storage/piece_topRight.png | Bin .../Storage/sidebar_bottom.png | Bin .../Storage/sidebar_mid.png | Bin .../Storage/sidebar_top.png | Bin .../Storage/tile_empty.png | Bin .../Storage/tile_empty_opaque.png | Bin .../slot_highlight.png | Bin .../template_small.png | Bin .../Textures/Markers/atmos.rsi/meta.json | 2 +- .../atmos.rsi/{plasma.png => phoron.png} | Bin .../Moth/moth_antennas.rsi/meta.json | 2 +- .../{plasmafire.png => phoronfire.png} | Bin .../Moth/moth_wings.rsi/meta.json | 4 +- ...ire_primary.png => phoronfire_primary.png} | Bin ...secondary.png => phoronfire_secondary.png} | Bin .../Moth/moth_antennas.rsi/meta.json | 2 +- .../{plasmafire.png => phoronfire.png} | Bin .../Moth/moth_wings.rsi/meta.json | 2 +- .../{plasmafire.png => phoronfire.png} | Bin .../Consumable/Drinks/rootbeer.rsi/meta.json | 2 +- .../Materials/Sheets/other.rsi/meta.json | 21 ++---- .../Sheets/other.rsi/phoron-inhand-left.png | Bin 420 -> 443 bytes .../Sheets/other.rsi/phoron-inhand-right.png | Bin 520 -> 420 bytes .../Materials/Sheets/other.rsi/phoron.png | Bin 460 -> 420 bytes .../other.rsi/{plasma_2.png => phoron_2.png} | Bin .../other.rsi/{plasma_3.png => phoron_3.png} | Bin .../Sheets/other.rsi/plasma-inhand-left.png | Bin 443 -> 0 bytes .../Sheets/other.rsi/plasma-inhand-right.png | Bin 420 -> 0 bytes .../Materials/Sheets/other.rsi/plasma.png | Bin 420 -> 0 bytes .../Objects/Materials/ore.rsi/meta.json | 4 +- .../ore.rsi/{plasma.png => phoron.png} | Bin ...lasmacutter.png => mecha_phoroncutter.png} | Bin .../Mech/mecha_equipment.rsi/meta.json | 4 +- .../equipped-BELT.png | Bin .../Tanks/{plasma.rsi => phoron.rsi}/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../{plasma.rsi => phoron.rsi}/meta.json | 0 .../equipped-BACKPACK.png | Bin .../equipped-BELT.png | Bin .../{plasmaman.rsi => phoronman.rsi}/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../equipped-BELT.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../equipped-BACKPACK.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../spear.png | Bin .../spear1.png | Bin .../wielded-inhand-left.png | Bin .../wielded-inhand-right.png | Bin .../closed.png | Bin .../closing.png | Bin .../meta.json | 0 .../open.png | Bin .../opening.png | Bin .../{plasma.rsi => phoron.rsi}/assembly.png | Bin .../bolted_unlit.png | Bin .../{plasma.rsi => phoron.rsi}/closed.png | Bin .../closed_unlit.png | Bin .../{plasma.rsi => phoron.rsi}/closing.png | Bin .../closing_unlit.png | Bin .../{plasma.rsi => phoron.rsi}/deny_unlit.png | Bin .../emergency_unlit.png | Bin .../{plasma.rsi => phoron.rsi}/meta.json | 0 .../{plasma.rsi => phoron.rsi}/open.png | Bin .../{plasma.rsi => phoron.rsi}/open_unlit.png | Bin .../{plasma.rsi => phoron.rsi}/opening.png | Bin .../opening_unlit.png | Bin .../{plasma.rsi => phoron.rsi}/panel_open.png | Bin .../secure_underlay.png | Bin .../{plasma.rsi => phoron.rsi}/sparks.png | Bin .../{plasma.rsi => phoron.rsi}/welded.png | Bin .../{plasma.rsi => phoron.rsi}/full.png | Bin .../{plasma.rsi => phoron.rsi}/meta.json | 0 .../{plasma.rsi => phoron.rsi}/state_0.png | Bin .../{plasma.rsi => phoron.rsi}/state_1.png | Bin .../{plasma.rsi => phoron.rsi}/state_2.png | Bin .../{plasma.rsi => phoron.rsi}/state_3.png | Bin .../{plasma.rsi => phoron.rsi}/state_4.png | Bin .../{plasma.rsi => phoron.rsi}/state_5.png | Bin .../{plasma.rsi => phoron.rsi}/state_6.png | Bin .../{plasma.rsi => phoron.rsi}/state_7.png | Bin .../{plasma.rsi => phoron.rsi}/base.png | Bin .../{plasma.rsi => phoron.rsi}/closed.png | Bin .../{plasma.rsi => phoron.rsi}/icon.png | Bin .../{plasma.rsi => phoron.rsi}/locked.png | Bin .../{plasma.rsi => phoron.rsi}/meta.json | 0 .../{plasma.rsi => phoron.rsi}/open.png | Bin .../{plasma.rsi => phoron.rsi}/sparking.png | Bin .../{plasma.rsi => phoron.rsi}/unlocked.png | Bin .../{plasma.rsi => phoron.rsi}/welded.png | Bin .../{atmos_plasma.png => atmos_phoron.png} | Bin .../Structures/Wallmounts/signs.rsi/meta.json | 2 +- .../Walls/{plasma.rsi => phoron.rsi}/full.png | Bin .../Structures/Walls/phoron.rsi/meta.json | 1 + .../plasma0.png => phoron.rsi/phoron0.png} | Bin .../plasma1.png => phoron.rsi/phoron1.png} | Bin .../plasma2.png => phoron.rsi/phoron2.png} | Bin .../plasma3.png => phoron.rsi/phoron3.png} | Bin .../plasma4.png => phoron.rsi/phoron4.png} | Bin .../plasma5.png => phoron.rsi/phoron5.png} | Bin .../plasma6.png => phoron.rsi/phoron6.png} | Bin .../plasma7.png => phoron.rsi/phoron7.png} | Bin .../Structures/Walls/plasma.rsi/meta.json | 1 - .../Windows/directional.rsi/meta.json | 6 +- ...indow.png => phoron_reinforced_window.png} | Bin .../{plasma_window.png => phoron_window.png} | Bin .../meta.json | 0 .../state0.png | Bin .../state1.png | Bin .../full.png | Bin .../meta.json | 0 .../pwindow0.png | Bin .../pwindow1.png | Bin .../pwindow2.png | Bin .../pwindow3.png | Bin .../pwindow4.png | Bin .../pwindow5.png | Bin .../pwindow6.png | Bin .../pwindow7.png | Bin .../meta.json | 0 .../state0.png | Bin .../state1.png | Bin .../full.png | Bin .../meta.json | 0 .../rpwindow0.png | Bin .../rpwindow1.png | Bin .../rpwindow2.png | Bin .../rpwindow3.png | Bin .../rpwindow4.png | Bin .../rpwindow5.png | Bin .../rpwindow6.png | Bin .../rpwindow7.png | Bin .../full.png | Bin .../meta.json | 18 ++--- .../phoron.png} | Bin .../phoron0.png} | Bin .../phoron1.png} | Bin .../phoron2.png} | Bin .../phoron3.png} | Bin .../phoron4.png} | Bin .../phoron5.png} | Bin .../phoron6.png} | Bin .../phoron7.png} | Bin Resources/mapping_actions.yml | 6 +- 416 files changed, 901 insertions(+), 912 deletions(-) rename Content.Server/Atmos/Reactions/{PlasmaFireReaction.cs => PhoronFireReaction.cs} (62%) rename Resources/Audio/Weapons/{plasma_cutter.ogg => phoron_cutter.ogg} (100%) rename Resources/Prototypes/Entities/Structures/Windows/{plasma.yml => phoron.yml} (83%) rename Resources/Prototypes/Entities/Tiles/{liquid_plasma.yml => liquid_phoron.yml} (82%) rename Resources/Textures/Clothing/Belt/belt_overlay.rsi/{plasmatank-equipped-BELT.png => phorontank-equipped-BELT.png} (100%) rename Resources/Textures/Effects/atmospherics.rsi/{plasma.png => phoron.png} (100%) rename Resources/Textures/Effects/atmospherics.rsi/{plasma_old.png => phoron_old.png} (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/SlotBackground.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/back.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/belt.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/ears.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/glasses.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/gloves.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/hand_l.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/hand_l_no_letter.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/hand_r.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/hand_r_no_letter.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/head.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/id.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/mask.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/neck.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/pocket.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/shoes.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/suit.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/suit_storage.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/toggle.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/uniform.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Slots/web.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_bottom.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_bottomLeft.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_bottomRight.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_center.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_left.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_right.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_top.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_topLeft.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/piece_topRight.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/sidebar_bottom.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/sidebar_mid.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/sidebar_top.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/tile_empty.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/Storage/tile_empty_opaque.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/slot_highlight.png (100%) rename Resources/Textures/Interface/{Plasmafire => Phoronfire}/template_small.png (100%) rename Resources/Textures/Markers/atmos.rsi/{plasma.png => phoron.png} (100%) rename Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/{plasmafire.png => phoronfire.png} (100%) rename Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/{plasmafire_primary.png => phoronfire_primary.png} (100%) rename Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/{plasmafire_secondary.png => phoronfire_secondary.png} (100%) rename Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/{plasmafire.png => phoronfire.png} (100%) rename Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/{plasmafire.png => phoronfire.png} (100%) rename Resources/Textures/Objects/Materials/Sheets/other.rsi/{plasma_2.png => phoron_2.png} (100%) rename Resources/Textures/Objects/Materials/Sheets/other.rsi/{plasma_3.png => phoron_3.png} (100%) delete mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-left.png delete mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png delete mode 100644 Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png rename Resources/Textures/Objects/Materials/ore.rsi/{plasma.png => phoron.png} (100%) rename Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/{mecha_plasmacutter.png => mecha_phoroncutter.png} (100%) rename Resources/Textures/Objects/Tanks/{plasma.rsi => phoron.rsi}/equipped-BELT.png (100%) rename Resources/Textures/Objects/Tanks/{plasma.rsi => phoron.rsi}/icon.png (100%) rename Resources/Textures/Objects/Tanks/{plasma.rsi => phoron.rsi}/inhand-left.png (100%) rename Resources/Textures/Objects/Tanks/{plasma.rsi => phoron.rsi}/inhand-right.png (100%) rename Resources/Textures/Objects/Tanks/{plasma.rsi => phoron.rsi}/meta.json (100%) rename Resources/Textures/Objects/Tanks/{plasmaman.rsi => phoronman.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/Objects/Tanks/{plasmaman.rsi => phoronman.rsi}/equipped-BELT.png (100%) rename Resources/Textures/Objects/Tanks/{plasmaman.rsi => phoronman.rsi}/icon.png (100%) rename Resources/Textures/Objects/Tanks/{plasmaman.rsi => phoronman.rsi}/inhand-left.png (100%) rename Resources/Textures/Objects/Tanks/{plasmaman.rsi => phoronman.rsi}/inhand-right.png (100%) rename Resources/Textures/Objects/Tanks/{plasmaman.rsi => phoronman.rsi}/meta.json (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_shiv.rsi => phoron_shiv.rsi}/equipped-BELT.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_shiv.rsi => phoron_shiv.rsi}/icon.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_shiv.rsi => phoron_shiv.rsi}/inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_shiv.rsi => phoron_shiv.rsi}/inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_shiv.rsi => phoron_shiv.rsi}/meta.json (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/meta.json (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/spear.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/spear1.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/wielded-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Melee/{plasma_spear.rsi => phoron_spear.rsi}/wielded-inhand-right.png (100%) rename Resources/Textures/Structures/Doors/MineralDoors/{plasma_door.rsi => phoron_door.rsi}/closed.png (100%) rename Resources/Textures/Structures/Doors/MineralDoors/{plasma_door.rsi => phoron_door.rsi}/closing.png (100%) rename Resources/Textures/Structures/Doors/MineralDoors/{plasma_door.rsi => phoron_door.rsi}/meta.json (100%) rename Resources/Textures/Structures/Doors/MineralDoors/{plasma_door.rsi => phoron_door.rsi}/open.png (100%) rename Resources/Textures/Structures/Doors/MineralDoors/{plasma_door.rsi => phoron_door.rsi}/opening.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/assembly.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/bolted_unlit.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/closed.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/closed_unlit.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/closing.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/closing_unlit.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/deny_unlit.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/emergency_unlit.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/meta.json (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/open.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/open_unlit.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/opening.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/opening_unlit.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/panel_open.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/secure_underlay.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/sparks.png (100%) rename Resources/Textures/Structures/Doors/Windoors/{plasma.rsi => phoron.rsi}/welded.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/full.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/meta.json (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_0.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_1.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_2.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_3.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_4.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_5.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_6.png (100%) rename Resources/Textures/Structures/Furniture/Tables/{plasma.rsi => phoron.rsi}/state_7.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/base.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/closed.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/icon.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/locked.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/meta.json (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/open.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/sparking.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/unlocked.png (100%) rename Resources/Textures/Structures/Storage/Crates/{plasma.rsi => phoron.rsi}/welded.png (100%) rename Resources/Textures/Structures/Wallmounts/signs.rsi/{atmos_plasma.png => atmos_phoron.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi => phoron.rsi}/full.png (100%) create mode 100644 Resources/Textures/Structures/Walls/phoron.rsi/meta.json rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma0.png => phoron.rsi/phoron0.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma1.png => phoron.rsi/phoron1.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma2.png => phoron.rsi/phoron2.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma3.png => phoron.rsi/phoron3.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma4.png => phoron.rsi/phoron4.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma5.png => phoron.rsi/phoron5.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma6.png => phoron.rsi/phoron6.png} (100%) rename Resources/Textures/Structures/Walls/{plasma.rsi/plasma7.png => phoron.rsi/phoron7.png} (100%) delete mode 100644 Resources/Textures/Structures/Walls/plasma.rsi/meta.json rename Resources/Textures/Structures/Windows/directional.rsi/{plasma_reinforced_window.png => phoron_reinforced_window.png} (100%) rename Resources/Textures/Structures/Windows/directional.rsi/{plasma_window.png => phoron_window.png} (100%) rename Resources/Textures/Structures/Windows/{plasma_diagonal.rsi => phoron_diagonal.rsi}/meta.json (100%) rename Resources/Textures/Structures/Windows/{plasma_diagonal.rsi => phoron_diagonal.rsi}/state0.png (100%) rename Resources/Textures/Structures/Windows/{plasma_diagonal.rsi => phoron_diagonal.rsi}/state1.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/full.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/meta.json (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow0.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow1.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow2.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow3.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow4.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow5.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow6.png (100%) rename Resources/Textures/Structures/Windows/{plasma_window.rsi => phoron_window.rsi}/pwindow7.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_diagonal.rsi => reinforced_phoron_diagonal.rsi}/meta.json (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_diagonal.rsi => reinforced_phoron_diagonal.rsi}/state0.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_diagonal.rsi => reinforced_phoron_diagonal.rsi}/state1.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/full.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/meta.json (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow0.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow1.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow2.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow3.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow4.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow5.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow6.png (100%) rename Resources/Textures/Structures/Windows/{reinforced_plasma_window.rsi => reinforced_phoron_window.rsi}/rpwindow7.png (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi => liquid_phoron.rsi}/full.png (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi => liquid_phoron.rsi}/meta.json (93%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma.png => liquid_phoron.rsi/phoron.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma0.png => liquid_phoron.rsi/phoron0.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma1.png => liquid_phoron.rsi/phoron1.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma2.png => liquid_phoron.rsi/phoron2.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma3.png => liquid_phoron.rsi/phoron3.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma4.png => liquid_phoron.rsi/phoron4.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma5.png => liquid_phoron.rsi/phoron5.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma6.png => liquid_phoron.rsi/phoron6.png} (100%) rename Resources/Textures/Tiles/Planet/{liquid_plasma.rsi/plasma7.png => liquid_phoron.rsi/phoron7.png} (100%) diff --git a/Content.Client/Explosion/ExplosionOverlaySystem.cs b/Content.Client/Explosion/ExplosionOverlaySystem.cs index fe552af0e79..dec52594994 100644 --- a/Content.Client/Explosion/ExplosionOverlaySystem.cs +++ b/Content.Client/Explosion/ExplosionOverlaySystem.cs @@ -11,7 +11,7 @@ namespace Content.Client.Explosion; /// /// This system is responsible for showing the client-side explosion effects (light source & fire-overlay). The -/// fire overlay code is just a bastardized version of the atmos plasma fire overlay and uses the same texture. +/// fire overlay code is just a bastardized version of the atmos phoron fire overlay and uses the same texture. /// public sealed class ExplosionOverlaySystem : EntitySystem { diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs index c68336deab8..675d6d017af 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs @@ -262,20 +262,20 @@ private void AddTricksVerbs(GetVerbsEvent args) }; args.Verbs.Add(refillInternalsN2); - Verb refillInternalsPlasma = new() + Verb refillInternalsPhoron = new() { - Text = "Refill Internals Plasma", + Text = "Refill Internals Phoron", Category = VerbCategory.Tricks, - Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/phoron.rsi"), "icon"), Act = () => { - RefillGasTank(args.Target, Gas.Plasma, tank); + RefillGasTank(args.Target, Gas.Phoron, tank); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-trick-internals-refill-plasma-description"), - Priority = (int) TricksVerbPriorities.RefillPlasma, + Message = Loc.GetString("admin-trick-internals-refill-phoron-description"), + Priority = (int) TricksVerbPriorities.RefillPhoron, }; - args.Verbs.Add(refillInternalsPlasma); + args.Verbs.Add(refillInternalsPhoron); } if (HasComp(args.Target)) @@ -304,17 +304,17 @@ private void AddTricksVerbs(GetVerbsEvent args) }; args.Verbs.Add(refillInternalsN2); - Verb refillInternalsPlasma = new() + Verb refillInternalsPhoron = new() { - Text = "Refill Internals Plasma", + Text = "Refill Internals Phoron", Category = VerbCategory.Tricks, - Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"), - Act = () => RefillEquippedTanks(args.User, Gas.Plasma), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/phoron.rsi"), "icon"), + Act = () => RefillEquippedTanks(args.User, Gas.Phoron), Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-trick-internals-refill-plasma-description"), - Priority = (int) TricksVerbPriorities.RefillPlasma, + Message = Loc.GetString("admin-trick-internals-refill-phoron-description"), + Priority = (int) TricksVerbPriorities.RefillPhoron, }; - args.Verbs.Add(refillInternalsPlasma); + args.Verbs.Add(refillInternalsPhoron); } Verb sendToTestArena = new() @@ -731,11 +731,11 @@ private void AddTricksVerbs(GetVerbsEvent args) } } - private void RefillEquippedTanks(EntityUid target, Gas plasma) + private void RefillEquippedTanks(EntityUid target, Gas phoron) { foreach (var held in _inventorySystem.GetHandOrInventoryEntities(target)) { - RefillGasTank(held, Gas.Plasma); + RefillGasTank(held, Gas.Phoron); } } @@ -855,7 +855,7 @@ public enum TricksVerbPriorities DrainBattery = -8, RefillOxygen = -9, RefillNitrogen = -10, - RefillPlasma = -11, + RefillPhoron = -11, SendToTestArena = -12, GrantAllAccess = -13, RevokeAllAccess = -14, diff --git a/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs b/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs index d4acfc6150c..032f9ae8b85 100644 --- a/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs +++ b/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs @@ -38,13 +38,13 @@ public sealed partial class AnomalyGeneratorComponent : Component /// The material needed to generate an anomaly /// [DataField("requiredMaterial", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] - public string RequiredMaterial = "Plasma"; + public string RequiredMaterial = "Phoron"; /// /// The amount of material needed to generate a single anomaly /// [DataField("materialPerAnomaly"), ViewVariables(VVAccess.ReadWrite)] - public int MaterialPerAnomaly = 1500; // a bit less than a stack of plasma + public int MaterialPerAnomaly = 1500; // a bit less than a stack of phoron /// /// The random anomaly spawner entity diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs index 6fbd638844b..78f1c94dfa6 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs @@ -51,12 +51,12 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar // 3: Nitrogen (GM) mixtures[3].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner); - // 4: Plasma (GM) - mixtures[4].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner); + // 4: Phoron (GM) + mixtures[4].AdjustMoles(Gas.Phoron, Atmospherics.MolesCellGasMiner); - // 5: Instant Plasmafire (r) + // 5: Instant Phoronfire (r) mixtures[5].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner); - mixtures[5].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner); + mixtures[5].AdjustMoles(Gas.Phoron, Atmospherics.MolesCellGasMiner); mixtures[5].Temperature = 5000f; // 6: (Walk-In) Freezer diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs index 713d1c4682c..29a3ece7156 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs @@ -41,7 +41,7 @@ private void ProcessHotspot(GridAtmosphereComponent gridAtmosphere, TileAtmosphe ExcitedGroupResetCooldowns(tile.ExcitedGroup); if ((tile.Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (tile.Hotspot.Volume <= 1f) - || tile.Air == null || tile.Air.GetMoles(Gas.Oxygen) < 0.5f || (tile.Air.GetMoles(Gas.Plasma) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f)) + || tile.Air == null || tile.Air.GetMoles(Gas.Oxygen) < 0.5f || (tile.Air.GetMoles(Gas.Phoron) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f)) { tile.Hotspot = new Hotspot(); InvalidateVisuals(tile.GridIndex, tile.GridIndices); @@ -104,14 +104,14 @@ private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, TileAtmospher if (oxygen < 0.5f) return; - var plasma = tile.Air.GetMoles(Gas.Plasma); + var phoron = tile.Air.GetMoles(Gas.Phoron); var tritium = tile.Air.GetMoles(Gas.Tritium); if (tile.Hotspot.Valid) { if (soh) { - if (plasma > 0.5f || tritium > 0.5f) + if (phoron > 0.5f || tritium > 0.5f) { if (tile.Hotspot.Temperature < exposedTemperature) tile.Hotspot.Temperature = exposedTemperature; @@ -123,10 +123,10 @@ private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, TileAtmospher return; } - if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f)) + if ((exposedTemperature > Atmospherics.PhoronMinimumBurnTemperature) && (phoron > 0.5f || tritium > 0.5f)) { if (sparkSourceUid.HasValue) - _adminLog.Add(LogType.Flammable, LogImpact.High, $"Heat/spark of {ToPrettyString(sparkSourceUid.Value)} caused atmos ignition of gas: {tile.Air.Temperature.ToString():temperature}K - {oxygen}mol Oxygen, {plasma}mol Plasma, {tritium}mol Tritium"); + _adminLog.Add(LogType.Flammable, LogImpact.High, $"Heat/spark of {ToPrettyString(sparkSourceUid.Value)} caused atmos ignition of gas: {tile.Air.Temperature.ToString():temperature}K - {oxygen}mol Oxygen, {phoron}mol Phoron, {tritium}mol Tritium"); tile.Hotspot = new Hotspot { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs index 64d02d793bc..2704931fc5e 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs @@ -128,7 +128,7 @@ private void OnCanisterChangeReleasePressure(EntityUid uid, GasCanisterComponent private void OnCanisterChangeReleaseValve(EntityUid uid, GasCanisterComponent canister, GasCanisterChangeReleaseValveMessage args) { var impact = LogImpact.High; - // filling a jetpack with plasma is less important than filling a room with it + // filling a jetpack with phoron is less important than filling a room with it impact = canister.GasTankSlot.HasItem ? LogImpact.Medium : LogImpact.High; var containedGasDict = new Dictionary(); diff --git a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs index ae9a5da9639..a8dd2b69fb4 100644 --- a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs +++ b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs @@ -23,7 +23,7 @@ public sealed partial class PortableScrubberComponent : Component public HashSet FilterGases = new() { Gas.CarbonDioxide, - Gas.Plasma, + Gas.Phoron, Gas.Tritium, Gas.WaterVapor, Gas.Ammonia, diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PhoronFireReaction.cs similarity index 62% rename from Content.Server/Atmos/Reactions/PlasmaFireReaction.cs rename to Content.Server/Atmos/Reactions/PhoronFireReaction.cs index 9adda3089cc..21230b6ab3c 100644 --- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs +++ b/Content.Server/Atmos/Reactions/PhoronFireReaction.cs @@ -6,7 +6,7 @@ namespace Content.Server.Atmos.Reactions { [UsedImplicitly] [DataDefinition] - public sealed partial class PlasmaFireReaction : IGasReactionEffect + public sealed partial class PhoronFireReaction : IGasReactionEffect { public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) { @@ -16,50 +16,50 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos var location = holder as TileAtmosphere; mixture.ReactionResults[GasReaction.Fire] = 0; - // More plasma released at higher temperatures. + // More phoron released at higher temperatures. var temperatureScale = 0f; - if (temperature > Atmospherics.PlasmaUpperTemperature) + if (temperature > Atmospherics.PhoronUpperTemperature) temperatureScale = 1f; else { - temperatureScale = (temperature - Atmospherics.PlasmaMinimumBurnTemperature) / - (Atmospherics.PlasmaUpperTemperature - Atmospherics.PlasmaMinimumBurnTemperature); + temperatureScale = (temperature - Atmospherics.PhoronMinimumBurnTemperature) / + (Atmospherics.PhoronUpperTemperature - Atmospherics.PhoronMinimumBurnTemperature); } if (temperatureScale > 0) { var oxygenBurnRate = Atmospherics.OxygenBurnRateBase - temperatureScale; - var plasmaBurnRate = 0f; + var phoronBurnRate = 0f; var initialOxygenMoles = mixture.GetMoles(Gas.Oxygen); - var initialPlasmaMoles = mixture.GetMoles(Gas.Plasma); + var initialPhoronMoles = mixture.GetMoles(Gas.Phoron); // Supersaturation makes tritium. - var oxyRatio = initialOxygenMoles / initialPlasmaMoles; - // Efficiency of reaction decreases from 1% Plasma to 3% plasma: + var oxyRatio = initialOxygenMoles / initialPhoronMoles; + // Efficiency of reaction decreases from 1% Phoron to 3% phoron: var supersaturation = Math.Clamp((oxyRatio - Atmospherics.SuperSaturationEnds) / (Atmospherics.SuperSaturationThreshold - Atmospherics.SuperSaturationEnds), 0.0f, 1.0f); - if (initialOxygenMoles > initialPlasmaMoles * Atmospherics.PlasmaOxygenFullburn) - plasmaBurnRate = initialPlasmaMoles * temperatureScale / Atmospherics.PlasmaBurnRateDelta; + if (initialOxygenMoles > initialPhoronMoles * Atmospherics.PhoronOxygenFullburn) + phoronBurnRate = initialPhoronMoles * temperatureScale / Atmospherics.PhoronBurnRateDelta; else - plasmaBurnRate = temperatureScale * (initialOxygenMoles / Atmospherics.PlasmaOxygenFullburn) / Atmospherics.PlasmaBurnRateDelta; + phoronBurnRate = temperatureScale * (initialOxygenMoles / Atmospherics.PhoronOxygenFullburn) / Atmospherics.PhoronBurnRateDelta; - if (plasmaBurnRate > Atmospherics.MinimumHeatCapacity) + if (phoronBurnRate > Atmospherics.MinimumHeatCapacity) { - plasmaBurnRate = MathF.Min(plasmaBurnRate, MathF.Min(initialPlasmaMoles, initialOxygenMoles / oxygenBurnRate)); - mixture.SetMoles(Gas.Plasma, initialPlasmaMoles - plasmaBurnRate); - mixture.SetMoles(Gas.Oxygen, initialOxygenMoles - plasmaBurnRate * oxygenBurnRate); + phoronBurnRate = MathF.Min(phoronBurnRate, MathF.Min(initialPhoronMoles, initialOxygenMoles / oxygenBurnRate)); + mixture.SetMoles(Gas.Phoron, initialPhoronMoles - phoronBurnRate); + mixture.SetMoles(Gas.Oxygen, initialOxygenMoles - phoronBurnRate * oxygenBurnRate); // supersaturation adjusts the ratio of produced tritium to unwanted CO2 - mixture.AdjustMoles(Gas.Tritium, plasmaBurnRate * supersaturation); - mixture.AdjustMoles(Gas.CarbonDioxide, plasmaBurnRate * (1.0f - supersaturation)); + mixture.AdjustMoles(Gas.Tritium, phoronBurnRate * supersaturation); + mixture.AdjustMoles(Gas.CarbonDioxide, phoronBurnRate * (1.0f - supersaturation)); - energyReleased += Atmospherics.FirePlasmaEnergyReleased * plasmaBurnRate; + energyReleased += Atmospherics.FirePhoronEnergyReleased * phoronBurnRate; energyReleased /= heatScale; // adjust energy to make sure speedup doesn't cause mega temperature rise - mixture.ReactionResults[GasReaction.Fire] += plasmaBurnRate * (1 + oxygenBurnRate); + mixture.ReactionResults[GasReaction.Fire] += phoronBurnRate * (1 + oxygenBurnRate); } } diff --git a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs index d65760e270f..bdcd9ba3b2b 100644 --- a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs +++ b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs @@ -60,7 +60,7 @@ public sealed partial class GatewayGeneratorComponent : Component "OreQuartz", "OreGold", "OreSilver", - "OrePlasma", + "OrePhoron", "OreUranium", "OreBananium", "OreArtifactFragment", diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs index 25e409fd010..cc9e6e6b793 100644 --- a/Content.Server/Materials/MaterialStorageSystem.cs +++ b/Content.Server/Materials/MaterialStorageSystem.cs @@ -118,7 +118,7 @@ public override bool TryInsertMaterialEntity(EntityUid user, /// Spawn an amount of a material in stack entities. /// Note the 'amount' is material dependent. /// 1 biomass = 1 biomass in its stack, - /// but 100 plasma = 1 sheet of plasma, etc. + /// but 100 phoron = 1 sheet of phoron, etc. /// public List SpawnMultipleFromMaterial(int amount, string material, EntityCoordinates coordinates) { @@ -129,7 +129,7 @@ public List SpawnMultipleFromMaterial(int amount, string material, En /// Spawn an amount of a material in stack entities. /// Note the 'amount' is material dependent. /// 1 biomass = 1 biomass in its stack, - /// but 100 plasma = 1 sheet of plasma, etc. + /// but 100 phoron = 1 sheet of phoron, etc. /// public List SpawnMultipleFromMaterial(int amount, string material, EntityCoordinates coordinates, out int overflowMaterial) { @@ -147,7 +147,7 @@ public List SpawnMultipleFromMaterial(int amount, string material, En /// Spawn an amount of a material in stack entities. /// Note the 'amount' is material dependent. /// 1 biomass = 1 biomass in its stack, - /// but 100 plasma = 1 sheet of plasma, etc. + /// but 100 phoron = 1 sheet of phoron, etc. /// [PublicAPI] public List SpawnMultipleFromMaterial(int amount, MaterialPrototype materialProto, EntityCoordinates coordinates) @@ -159,7 +159,7 @@ public List SpawnMultipleFromMaterial(int amount, MaterialPrototype m /// Spawn an amount of a material in stack entities. /// Note the 'amount' is material dependent. /// 1 biomass = 1 biomass in its stack, - /// but 100 plasma = 1 sheet of plasma, etc. + /// but 100 phoron = 1 sheet of phoron, etc. /// public List SpawnMultipleFromMaterial(int amount, MaterialPrototype materialProto, EntityCoordinates coordinates, out int overflowMaterial) { diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs index fe0d1d0c168..a204801e0e6 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs @@ -74,7 +74,7 @@ private void OnVapeInteraction(Entity entity, ref AfterInteractEv // All vapes explode if they contain anything other than pure water??? // WTF is this? Why is this? Am I going insane? // Who the fuck vapes pure water? - // If this isn't how this is meant to work and this is meant to be for vapes with plasma or something, + // If this isn't how this is meant to work and this is meant to be for vapes with phoron or something, // just re-use the existing RiggableSystem. foreach (var name in solution.Contents) { diff --git a/Content.Server/Power/Components/RiggableComponent.cs b/Content.Server/Power/Components/RiggableComponent.cs index 797c8c81f4c..262780cc46a 100644 --- a/Content.Server/Power/Components/RiggableComponent.cs +++ b/Content.Server/Power/Components/RiggableComponent.cs @@ -16,5 +16,5 @@ public sealed partial class RiggableComponent : Component [ViewVariables(VVAccess.ReadWrite)] [DataField("reagent")] - public ReagentQuantity RequiredQuantity = new("Plasma", FixedPoint2.New(5), null); + public ReagentQuantity RequiredQuantity = new("Phoron", FixedPoint2.New(5), null); } diff --git a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs index 61c69f2a235..98ea14d464e 100644 --- a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs +++ b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs @@ -24,7 +24,7 @@ public sealed partial class SolidFuelGeneratorAdapterComponent : Component /// [DataField("fuelMaterial", customTypeSerializer: typeof(PrototypeIdSerializer))] [ViewVariables(VVAccess.ReadWrite)] - public string FuelMaterial = "Plasma"; + public string FuelMaterial = "Phoron"; /// /// How much material (can be fractional) is left in the generator. diff --git a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs index 171aca12c27..1ab8a84f647 100644 --- a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs +++ b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs @@ -10,7 +10,7 @@ public sealed partial class GasLeakRuleComponent : Component public readonly Gas[] LeakableGases = { Gas.Ammonia, - Gas.Plasma, + Gas.Phoron, Gas.Tritium, Gas.Frezon, Gas.WaterVapor, // the fog diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs index ec00a570f96..eaf35252496 100644 --- a/Content.Server/Temperature/Components/TemperatureComponent.cs +++ b/Content.Server/Temperature/Components/TemperatureComponent.cs @@ -68,7 +68,7 @@ public float HeatCapacity /// Temperature won't do more than this amount of damage per second. /// /// - /// Okay it genuinely reaches this basically immediately for a plasma fire. + /// Okay it genuinely reaches this basically immediately for a phoron fire. /// [DataField, ViewVariables(VVAccess.ReadWrite)] public FixedPoint2 DamageCap = FixedPoint2.New(8); diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs index ee12326df3f..6e8115400e4 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs @@ -23,7 +23,7 @@ public sealed partial class GasArtifactComponent : Component public List PossibleGases = new() { Gas.Oxygen, - Gas.Plasma, + Gas.Phoron, Gas.Nitrogen, Gas.CarbonDioxide, Gas.Tritium, diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs index 77cb86f47f3..5c4eff15414 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs @@ -15,7 +15,7 @@ public sealed partial class ArtifactGasTriggerComponent : Component public List PossibleGases = new() { Gas.Oxygen, - Gas.Plasma, + Gas.Phoron, Gas.Nitrogen, Gas.CarbonDioxide, Gas.Ammonia, diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index 7460e08e46f..ac0cdf24305 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -50,7 +50,7 @@ static Atmospherics() /// to have very small heat capacity (e.g. room that was just unspaced) and for large amounts of /// energy to be transferred to it, even for a brief moment. However, this messes up subsequent /// calculations and so cap it here. The physical interpretation is that at this temperature, any - /// gas that you would have transforms into plasma. + /// gas that you would have transforms into phoron. /// public const float Tmax = 262144; // 1/64 of max safe integer, any values above will result in a ~0.03K epsilon @@ -192,17 +192,17 @@ static Atmospherics() public const float FireMinimumTemperatureToExist = T0C + 100f; public const float FireMinimumTemperatureToSpread = T0C + 150f; public const float FireSpreadRadiosityScale = 0.85f; - public const float FirePlasmaEnergyReleased = 160e3f; // methane is 16 kJ/mol, plus plasma's spark of magic + public const float FirePhoronEnergyReleased = 160e3f; // methane is 16 kJ/mol, plus phoron's spark of magic public const float FireGrowthRate = 40000f; public const float SuperSaturationThreshold = 96f; public const float SuperSaturationEnds = SuperSaturationThreshold / 3; public const float OxygenBurnRateBase = 1.4f; - public const float PlasmaMinimumBurnTemperature = (100f+T0C); - public const float PlasmaUpperTemperature = (1370f+T0C); - public const float PlasmaOxygenFullburn = 10f; - public const float PlasmaBurnRateDelta = 9f; + public const float PhoronMinimumBurnTemperature = (100f+T0C); + public const float PhoronUpperTemperature = (1370f+T0C); + public const float PhoronOxygenFullburn = 10f; + public const float PhoronBurnRateDelta = 9f; /// /// This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs) @@ -335,7 +335,7 @@ public enum Gas : sbyte Oxygen = 0, Nitrogen = 1, CarbonDioxide = 2, - Plasma = 3, + Phoron = 3, Tritium = 4, WaterVapor = 5, Ammonia = 6, diff --git a/Content.Shared/Atmos/Components/GasAnalyzerComponent.cs b/Content.Shared/Atmos/Components/GasAnalyzerComponent.cs index 51ae8cc7406..0e9c0776fb5 100644 --- a/Content.Shared/Atmos/Components/GasAnalyzerComponent.cs +++ b/Content.Shared/Atmos/Components/GasAnalyzerComponent.cs @@ -88,7 +88,7 @@ public GasEntry(string name, float amount, string color) public override string ToString() { - // e.g. "Plasma: 2000 mol" + // e.g. "Phoron: 2000 mol" return Loc.GetString( "gas-entry-info", ("gasName", Name), diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs index 2a333062450..e50c1bf85b3 100644 --- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs +++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs @@ -17,7 +17,7 @@ public sealed class GasVentScrubberData : IAtmosDeviceData public static HashSet DefaultFilterGases = new() { Gas.CarbonDioxide, - Gas.Plasma, + Gas.Phoron, Gas.Tritium, Gas.WaterVapor, Gas.Ammonia, diff --git a/Resources/Audio/Weapons/attributions.yml b/Resources/Audio/Weapons/attributions.yml index 310b01b7280..b780af35115 100644 --- a/Resources/Audio/Weapons/attributions.yml +++ b/Resources/Audio/Weapons/attributions.yml @@ -1,7 +1,7 @@ -- files: ["plasma_cutter.ogg"] +- files: ["phoron_cutter.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from Citadel station." - source: "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/5b43cb2545a19957ec6ce3352dceac5e347e77df/sound/weapons/plasma_cutter.ogg" + source: "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/5b43cb2545a19957ec6ce3352dceac5e347e77df/sound/weapons/phoron_cutter.ogg" - files: ["reel.ogg"] license: "CC0-1.0" @@ -82,7 +82,7 @@ license: "CC0-1.0" copyright: "Taken from ScreamStudio on freesound.org" source: "https://freesound.org/people/ScreamStudio/sounds/392617/" - + - files: ["pop.ogg"] license: "CC0-1.0" copyright: "Taken from 0ne_one111yt on freesound.org" diff --git a/Resources/Audio/Weapons/plasma_cutter.ogg b/Resources/Audio/Weapons/phoron_cutter.ogg similarity index 100% rename from Resources/Audio/Weapons/plasma_cutter.ogg rename to Resources/Audio/Weapons/phoron_cutter.ogg diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1eab2a3516f..b2948714e3e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -912,7 +912,7 @@ Entries: url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24097 - author: Flareguy changes: - - message: Made lava & liquid plasma significantly less lethal. + - message: Made lava & liquid phoron significantly less lethal. type: Tweak id: 5715 time: '2024-01-15T06:33:05.0000000+00:00' @@ -959,7 +959,7 @@ Entries: url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24050 - author: Boaz1111 changes: - - message: Reinforced Glass and Reinforced Plasma Glass no longer bubble randomly + - message: Reinforced Glass and Reinforced Phoron Glass no longer bubble randomly type: Fix id: 5720 time: '2024-01-16T03:43:18.0000000+00:00' @@ -1082,7 +1082,7 @@ Entries: url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24193 - author: Volotomite changes: - - message: Flippo can burn plasma now! + - message: Flippo can burn phoron now! type: Fix id: 5735 time: '2024-01-18T00:28:32.0000000+00:00' @@ -3489,7 +3489,7 @@ Entries: - author: Sphiral changes: - message: >- - NT has finally perfected methods for infusing Plasma/Uranium into Glass! + NT has finally perfected methods for infusing Phoron/Uranium into Glass! Windoors now have such varients! And Uranium Slim Windows exist! type: Add id: 6039 @@ -3602,7 +3602,7 @@ Entries: url: https://github.com/space-wizards/space-station-14/pull/25678 - author: Cojoke-dot changes: - - message: E-sword now lights plasma fires + - message: E-sword now lights phoron fires type: Tweak id: 6051 time: '2024-02-28T21:59:35.0000000+00:00' @@ -3726,7 +3726,7 @@ Entries: url: https://github.com/space-wizards/space-station-14/pull/25719 - author: MACMAN2003 changes: - - message: There are now more ways to craft reinforced plasma/uranium glass. + - message: There are now more ways to craft reinforced phoron/uranium glass. type: Tweak id: 6066 time: '2024-02-29T22:57:18.0000000+00:00' @@ -3786,7 +3786,7 @@ Entries: url: https://github.com/space-wizards/space-station-14/pull/24899 - author: Errant changes: - - message: Breathing tritium or plasma now displays a HUD alert. + - message: Breathing tritium or phoron now displays a HUD alert. type: Add id: 6074 time: '2024-03-02T14:07:05.0000000+00:00' diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl index fe8077a550c..54eeb412850 100644 --- a/Resources/Locale/en-US/administration/smites.ftl +++ b/Resources/Locale/en-US/administration/smites.ftl @@ -43,7 +43,7 @@ admin-smite-remove-gravity-description = Grants them anti-gravity. admin-smite-reptilian-species-swap-description = It changes their species to Reptilian. Useful for people who were being space racist. admin-smite-locker-stuff-description = Stuffs them in a (welded) locker. admin-smite-headstand-description = Vertically flips their sprite. -admin-smite-plasma-internals-description = Replaces the contents of their internals with plasma. +admin-smite-phoron-internals-description = Replaces the contents of their internals with phoron. admin-smite-become-mouse-description = They become a rat. Ratatouille. admin-smite-maid-description = Forcibly converts them into a janitorial cat maid. This is actual torture for some players, use it wisely. admin-smite-zoom-in-description = Zooms in their view so that they can no longer see their surroundings. @@ -73,7 +73,7 @@ admin-trick-refill-battery-description = Refills the internal battery of the giv admin-trick-drain-battery-description = Empties the internal battery of the given object. admin-trick-internals-refill-oxygen-description = Refills oxygen in the target tank or target's internals. admin-trick-internals-refill-nitrogen-description = Refills nitrogen in the target tank or target's internals. -admin-trick-internals-refill-plasma-description = Refills plasma in the target tank or target's internals. +admin-trick-internals-refill-phoron-description = Refills phoron in the target tank or target's internals. admin-trick-send-to-test-arena-description = Sends an object to the admin testing arena. This arena is per-admin. admin-trick-grant-all-access-description = Grants the target all access. admin-trick-revoke-all-access-description = Revokes all accesses on the target. diff --git a/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl index 642d142fbfb..dffaaee94ee 100644 --- a/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl @@ -1,3 +1,3 @@ advertisement-atmosdrobe-1 = Get your inflammable clothing right here!!! -advertisement-atmosdrobe-2 = Protects you against plasma fires! -advertisement-atmosdrobe-3 = Enjoy your off-brand engineering clothing! \ No newline at end of file +advertisement-atmosdrobe-2 = Protects you against phoron fires! +advertisement-atmosdrobe-3 = Enjoy your off-brand engineering clothing! diff --git a/Resources/Locale/en-US/advertisements/vending/scidrobe.ftl b/Resources/Locale/en-US/advertisements/vending/scidrobe.ftl index b76c93fb7d7..201e1a39797 100644 --- a/Resources/Locale/en-US/advertisements/vending/scidrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/scidrobe.ftl @@ -1,3 +1,3 @@ -advertisement-scidrobe-1 = Longing for the smell of plasma burnt flesh? Buy your science clothing now! +advertisement-scidrobe-1 = Longing for the smell of phoron burnt flesh? Buy your science clothing now! advertisement-scidrobe-2 = Made with 10% Auxetics, so you don't have to worry about losing your arm! advertisement-scidrobe-3 = These DEFINITELY will protect you when the artifact inevitably explodes. diff --git a/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl index 977a5f47bcb..411d7484a08 100644 --- a/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl @@ -2,11 +2,11 @@ ghost-role-information-nukie-mouse-name = Nuclear Operative Mouse ghost-role-information-nukie-mouse-description = A Nuclear Operative reinforcement for the Syndicate. ghost-role-information-nukie-mouse-rules = Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them. The crew is allowed to kill you without warning. - You are allowed to attack the crew and destroy the station without provocation. + You are allowed to attack the crew and destroy the station without provocation. ghost-role-information-listeningop-name = Listening Post Operative ghost-role-information-listeningop-description = You are a Listening Post operative. Get into range, observe the station, intercept communications and assist any operatives in the area! ghost-role-information-listeningop-rules = You are a Syndicate Operative tasked with the continuous reporting and monitoring of the station and its activities, as well as assisting any fellow operatives who may be aboard the station. As an antagonist, do whatever is required for you to complete this task. Make sure your station doesn't fall into enemy hands and DO NOT abandon your station! Hide your existence at any cost! ghost-role-information-paradox-anomaly-name = Paradox Anomaly ghost-role-information-paradox-anomaly-description = Replace your double, or befriend them. -ghost-role-information-paradox-anomaly-rules = Try and replace your twin with this funny roleplay antag rather than plasma flooding the station or something. You can also just befriend them. +ghost-role-information-paradox-anomaly-rules = Try and replace your twin with this funny roleplay antag rather than phoron flooding the station or something. You can also just befriend them. diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index 7d2f098b8c3..0993927e9bf 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -66,7 +66,7 @@ ui-options-scale-175 = 175% ui-options-scale-200 = 200% ui-options-hud-theme = HUD theme: ui-options-hud-theme-default = Default -ui-options-hud-theme-plasmafire = Plasmafire +ui-options-hud-theme-phoronfire = Phoronfire ui-options-hud-theme-slimecore = Slimecore ui-options-hud-theme-clockwork = Clockwork ui-options-hud-theme-retro = Retro diff --git a/Resources/Locale/en-US/gases/gases.ftl b/Resources/Locale/en-US/gases/gases.ftl index e41aa4fc996..624c4c8006b 100644 --- a/Resources/Locale/en-US/gases/gases.ftl +++ b/Resources/Locale/en-US/gases/gases.ftl @@ -1,7 +1,7 @@ gases-oxygen = Oxygen gases-nitrogen = Nitrogen gases-co2 = Carbon Dioxide -gases-plasma = Plasma +gases-phoron = Phoron gases-tritium = Tritium gases-water-vapor = Water Vapor gases-ammonia = Ammonia diff --git a/Resources/Locale/en-US/markings/moth.ftl b/Resources/Locale/en-US/markings/moth.ftl index 8e38df14e07..c50f069ed32 100644 --- a/Resources/Locale/en-US/markings/moth.ftl +++ b/Resources/Locale/en-US/markings/moth.ftl @@ -37,8 +37,8 @@ marking-MothAntennasMoffra = Antennae (Moffra) marking-MothAntennasOakworm-oakworm = Antennae marking-MothAntennasOakworm = Antennae (Oak Worm) -marking-MothAntennasPlasmafire-plasmafire = Antennae -marking-MothAntennasPlasmafire = Antennae (Plasmafire) +marking-MothAntennasPhoronfire-phoronfire = Antennae +marking-MothAntennasPhoronfire = Antennae (Phoronfire) marking-MothAntennasRoyal-royal = Antennae marking-MothAntennasRoyal = Antennae (Royal) @@ -104,9 +104,9 @@ marking-MothWingsMoffra = Wings (Moffra) marking-MothWingsOakworm-oakworm = Wing marking-MothWingsOakworm = Wings (Oak Worm) -marking-MothWingsPlasmafire-plasmafire_primary = Primary -marking-MothWingsPlasmafire-plasmafire_secondary = Secondary -marking-MothWingsPlasmafire = Wings (Plasmafire) +marking-MothWingsPhoronfire-phoronfire_primary = Primary +marking-MothWingsPhoronfire-phoronfire_secondary = Secondary +marking-MothWingsPhoronfire = Wings (Phoronfire) marking-MothWingsPointy-pointy = Wing marking-MothWingsPointy = Wings (Pointy) @@ -220,7 +220,7 @@ marking-MothRArmFirewatch = Moth Right Arm (Firewatch) marking-MothChestGothic-gothic_chest = Chest marking-MothChestGothic = Moth Chest (Gothic) -marking-MothHeadGothic-gothic_head = Head +marking-MothHeadGothic-gothic_head = Head marking-MothHeadGothic = Moth Head (Gothic) marking-MothLLegGothic-gothic_l_leg = Left Leg diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index dca520b5b49..52d6f05dbc7 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -1,8 +1,8 @@ # Glass materials-glass = glass materials-reinforced-glass = reinforced glass -materials-plasma-glass = plasma glass -materials-reinforced-plasma-glass = reinforced plasma glass +materials-phoron-glass = phoron glass +materials-reinforced-phoron-glass = reinforced phoron glass # Metals materials-steel = steel @@ -15,7 +15,7 @@ materials-biomass = biomass materials-cardboard = cardboard materials-cloth = cloth materials-durathread = durathread -materials-plasma = plasma +materials-phoron = phoron materials-plastic = plastic materials-wood = wood materials-paper = paper @@ -31,7 +31,7 @@ materials-raw-iron = raw iron materials-raw-quartz = raw quartz materials-raw-gold = raw gold materials-raw-silver = raw silver -materials-raw-plasma = raw plasma +materials-raw-phoron = raw phoron materials-raw-uranium = raw uranium materials-raw-bananium = raw bananium materials-raw-salt = raw salt diff --git a/Resources/Locale/en-US/nyanotrasen/markings/moth.ftl b/Resources/Locale/en-US/nyanotrasen/markings/moth.ftl index 93a025f4372..6db0f85e50b 100644 --- a/Resources/Locale/en-US/nyanotrasen/markings/moth.ftl +++ b/Resources/Locale/en-US/nyanotrasen/markings/moth.ftl @@ -11,7 +11,7 @@ marking-MothAntennasClassicMoffra = Antennas (Moffra, Classic) marking-MothAntennasClassicMoonfly = Antennas (Moonfly, Classic) marking-MothAntennasClassicOakworm = Antennas (Oakworm, Classic) marking-MothAntennasClassicPlain = Antennas (Plain, Classic) -marking-MothAntennasClassicPlasmafire = Antennas (Plasmafire, Classic) +marking-MothAntennasClassicPhoronfire = Antennas (Phoronfire, Classic) marking-MothAntennasClassicPoison = Antennas (Poison, Classic) marking-MothAntennasClassicReddish = Antennas (Reddish, Classic) marking-MothAntennasClassicRegal = Antennas (Regal, Classic) @@ -38,7 +38,7 @@ marking-MothWingsClassicMoonfly = Wings (Moonfly, Classic) marking-MothWingsClassicMoffra = Wings (Moffra, Classic) marking-MothWingsClassicOakworm = Wings (Oakworm, Classic) marking-MothWingsClassicPlain = Wings (Plain, Classic) -marking-MothWingsClassicPlasmafire = Wings (Plasmafire, Classic) +marking-MothWingsClassicPhoronfire = Wings (Phoronfire, Classic) marking-MothWingsClassicPoison = Wings (Poison, Classic) marking-MothWingsClassicRagged = Wings (Ragged, Classic) marking-MothWingsClassicReddish = Wings (Reddish, Classic) diff --git a/Resources/Locale/en-US/paper/paper-misc.ftl b/Resources/Locale/en-US/paper/paper-misc.ftl index 587701a9274..d1e3e9dd0c0 100644 --- a/Resources/Locale/en-US/paper/paper-misc.ftl +++ b/Resources/Locale/en-US/paper/paper-misc.ftl @@ -1,4 +1,4 @@ -book-text-plasma-trap = Heheheheh, no way in hell they're going to get at our stash NOW, is there? +book-text-phoron-trap = Heheheheh, no way in hell they're going to get at our stash NOW, is there? I rigged the area where our stuff's at to be a toasty thousand K. You know how to drain it when we need it out. - J. diff --git a/Resources/Locale/en-US/power/components/radiation-collector.ftl b/Resources/Locale/en-US/power/components/radiation-collector.ftl index c38050f1e0a..a1e87282dcb 100644 --- a/Resources/Locale/en-US/power/components/radiation-collector.ftl +++ b/Resources/Locale/en-US/power/components/radiation-collector.ftl @@ -1,2 +1,2 @@ -power-radiation-collector-gas-tank-missing = [color=darkred]No plasma tank attached.[/color] -power-radiation-collector-gas-tank-present = A plasma tank is [color=darkgreen]connected[/color]. \ No newline at end of file +power-radiation-collector-gas-tank-missing = [color=darkred]No phoron tank attached.[/color] +power-radiation-collector-gas-tank-present = A phoron tank is [color=darkgreen]connected[/color]. diff --git a/Resources/Locale/en-US/reagents/meta/gases.ftl b/Resources/Locale/en-US/reagents/meta/gases.ftl index 5460757be73..fa370108fcd 100644 --- a/Resources/Locale/en-US/reagents/meta/gases.ftl +++ b/Resources/Locale/en-US/reagents/meta/gases.ftl @@ -1,8 +1,8 @@ reagent-name-oxygen = oxygen reagent-desc-oxygen = An oxidizing, colorless gas. -reagent-name-plasma = plasma -reagent-desc-plasma = Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways. +reagent-name-phoron = phoron +reagent-desc-phoron = Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways. reagent-name-tritium = tritium reagent-desc-tritium = Radioactive space-magic pixie dust. diff --git a/Resources/Locale/en-US/reagents/phlogiston.ftl b/Resources/Locale/en-US/reagents/phlogiston.ftl index df43a42cad4..6d557cdc270 100644 --- a/Resources/Locale/en-US/reagents/phlogiston.ftl +++ b/Resources/Locale/en-US/reagents/phlogiston.ftl @@ -1 +1 @@ -phlogiston-plasma-created = The mixture bubbles, and plasma rises from it! +phlogiston-phoron-created = The mixture bubbles, and phoron rises from it! diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl index 1a391ea48cd..3ccbd8bebc3 100644 --- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl +++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl @@ -14,7 +14,7 @@ salvage-magnet-resources = {$resource -> [OreSalt] Salt [OreGold] Gold [OreSilver] Silver - [OrePlasma] Plasma + [OrePhoron] Phoron [OreUranium] Uranium [OreArtifactFragment] Artifact fragments *[other] {$resource} @@ -49,8 +49,8 @@ salvage-map-proto-SmallParty = Birthday Party salvage-map-proto-SmallSyndicate = Ruined Syndicate Ship salvage-map-proto-SmallTesla = Tesla Containment -salvage-map-proto-SmallA1 = Asteroid Plasmafire -salvage-map-proto-Medium1 = Plasma-Trapped Cache +salvage-map-proto-SmallA1 = Asteroid Phoronfire +salvage-map-proto-Medium1 = Phoron-Trapped Cache salvage-map-proto-MediumVault1 = Vault salvage-map-proto-MediumOrchestra = Silent Orchestra salvage-map-proto-MediumLibraryWreck = Abandoned Library @@ -70,4 +70,4 @@ salvage-map-proto-AsteroidBase = Asteroid Base salvage-map-proto-RuinCargoBase = Ruined Cargo Storage salvage-map-proto-SecurityChunk = Security Department Chunk salvage-map-proto-EngineeringChunk = Engineering Department Chunk -salvage-map-proto-OutpostArm = Overrun Outpost Arm \ No newline at end of file +salvage-map-proto-OutpostArm = Overrun Outpost Arm diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl index 98dfa89fa9f..8e601a49631 100644 --- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl +++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl @@ -37,6 +37,6 @@ artifact-trigger-hint-death = Life essence artifact-trigger-hint-radiation = Radiation artifact-trigger-hint-pressure = Extreme pressure artifact-trigger-hint-regular-gases = Standard atmospheric gases -artifact-trigger-hint-plasma = Gaseous plasma +artifact-trigger-hint-phoron = Gaseous phoron artifact-trigger-hint-land = Active deceleration artifact-trigger-hint-examine = Examination diff --git a/Resources/Maps/Dungeon/experiment.yml b/Resources/Maps/Dungeon/experiment.yml index 8449abf9328..b17ca4c5f00 100644 --- a/Resources/Maps/Dungeon/experiment.yml +++ b/Resources/Maps/Dungeon/experiment.yml @@ -7651,14 +7651,14 @@ entities: - type: Transform pos: 24.34895,16.173763 parent: 1653 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 833 components: - type: Transform pos: 16.5,27.5 parent: 1653 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 645 components: @@ -7706,7 +7706,7 @@ entities: - type: Transform pos: 34.5,36.5 parent: 1653 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 1473 components: diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml index 1211d7a6642..307978cfe2d 100644 --- a/Resources/Maps/Dungeon/snowy_labs.yml +++ b/Resources/Maps/Dungeon/snowy_labs.yml @@ -10907,7 +10907,7 @@ entities: - type: Transform pos: 33.566967,20.5998 parent: 1653 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 1473 components: diff --git a/Resources/Maps/Misc/charliestation.yml b/Resources/Maps/Misc/charliestation.yml index f67a2b0a37a..b2f41454d2d 100644 --- a/Resources/Maps/Misc/charliestation.yml +++ b/Resources/Maps/Misc/charliestation.yml @@ -16662,7 +16662,7 @@ entities: - type: Transform pos: 0.37494278,22.603415 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 2187 components: @@ -16671,7 +16671,7 @@ entities: parent: 2 - type: AtmosDevice joinedGrid: 2 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 2188 components: @@ -18708,7 +18708,7 @@ entities: - type: Transform pos: 27.5,32.5 parent: 2 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 2557 components: @@ -19269,7 +19269,7 @@ entities: - type: Transform pos: -24.48496,20.505053 parent: 2 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 2661 components: diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml index 304def19c70..dcfeaf98484 100644 --- a/Resources/Maps/Nonstations/nukieplanet.yml +++ b/Resources/Maps/Nonstations/nukieplanet.yml @@ -11312,7 +11312,7 @@ entities: - type: Transform pos: -0.5,-2.5 parent: 104 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 1817 components: @@ -12504,7 +12504,7 @@ entities: - type: Transform pos: -10.5,-19.5 parent: 104 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 1842 components: @@ -13331,7 +13331,7 @@ entities: - type: Transform pos: 0.5,-12.5 parent: 104 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 2411 components: diff --git a/Resources/Maps/Ruins/DeltaV/derelict.yml b/Resources/Maps/Ruins/DeltaV/derelict.yml index b6903971e0b..53d99be9622 100644 --- a/Resources/Maps/Ruins/DeltaV/derelict.yml +++ b/Resources/Maps/Ruins/DeltaV/derelict.yml @@ -1363,7 +1363,7 @@ entities: - type: Transform pos: 28.936926,46.54969 parent: 2 -- proto: AtmosFixInstantPlasmaFireMarker +- proto: AtmosFixInstantPhoronFireMarker entities: - uid: 2377 components: @@ -4539,7 +4539,7 @@ entities: - type: Transform pos: 32.441956,33.61885 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 2063 components: diff --git a/Resources/Maps/Ruins/derelict.yml b/Resources/Maps/Ruins/derelict.yml index 5470b3e7e78..85e9af6147f 100644 --- a/Resources/Maps/Ruins/derelict.yml +++ b/Resources/Maps/Ruins/derelict.yml @@ -4393,7 +4393,7 @@ entities: - type: Transform pos: 32.441956,33.61885 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 2063 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-animalfarm.yml b/Resources/Maps/Salvage/DeltaV/DV-animalfarm.yml index 6457a28b0ae..152374de418 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-animalfarm.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-animalfarm.yml @@ -804,7 +804,7 @@ entities: - type: Transform pos: 1.5,1.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 44 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-base.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-base.yml index d7066ed834e..a7c8967d1b3 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-asteroid-base.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-asteroid-base.yml @@ -999,7 +999,7 @@ entities: - type: Transform pos: -9.5,1.5 parent: 407 -- proto: AtmosFixInstantPlasmaFireMarker +- proto: AtmosFixInstantPhoronFireMarker entities: - uid: 373 components: @@ -1026,7 +1026,7 @@ entities: - type: Transform pos: 11.5,-5.5 parent: 407 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 358 components: @@ -1935,21 +1935,21 @@ entities: - type: Transform pos: 8.530472,8.534576 parent: 407 -- proto: PlasmaOre1 +- proto: PhoronOre1 entities: - uid: 397 components: - type: Transform pos: -9.462246,2.5242848 parent: 407 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 396 components: - type: Transform pos: 13.16939,-9.55732 parent: 407 -- proto: PlasmaWindow +- proto: PhoronWindow entities: - uid: 76 components: @@ -2090,7 +2090,7 @@ entities: - type: Transform pos: 10.5,-11.5 parent: 407 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 185 components: @@ -2196,14 +2196,14 @@ entities: - type: Transform pos: 6.5,-6.5 parent: 407 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 166 components: - type: Transform pos: -5.5267916,8.533299 parent: 407 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 384 components: @@ -2481,7 +2481,7 @@ entities: - type: Transform pos: 11.5,-8.5 parent: 407 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 395 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-03.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-03.yml index 5c37d0a8d7c..85e15b4b919 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-03.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-03.yml @@ -3967,7 +3967,7 @@ entities: - type: Transform pos: 2.5,-0.5 parent: 778 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 313 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml index 8cae38a6fb8..995e486cfb3 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml @@ -378,7 +378,7 @@ entities: - type: Transform pos: 8.500692,1.5182867 parent: 1 -- proto: AtmosFixInstantPlasmaFireMarker +- proto: AtmosFixInstantPhoronFireMarker entities: - uid: 338 components: @@ -424,7 +424,7 @@ entities: - type: Transform pos: -0.5,15.5 parent: 1 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 342 components: @@ -4990,7 +4990,7 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,6.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 71 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-atmos.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-atmos.yml index cb8ebf8456d..777196db05a 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-atlas-atmos.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-atlas-atmos.yml @@ -539,7 +539,7 @@ entities: - type: Transform pos: -5.5,0.5 parent: 612 -- proto: AtmosFixInstantPlasmaFireMarker +- proto: AtmosFixInstantPhoronFireMarker entities: - uid: 517 components: @@ -3271,7 +3271,7 @@ entities: - type: Transform pos: -1.5,-9.5 parent: 612 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 196 components: @@ -3365,7 +3365,7 @@ entities: - type: Transform pos: -2.1406271,-8.390582 parent: 612 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 181 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-epi.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-epi.yml index 692798708bd..1be8cea56c8 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-atlas-epi.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-atlas-epi.yml @@ -510,7 +510,7 @@ entities: - type: Transform pos: 0.5,-2.5 parent: 550 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 249 components: @@ -2931,7 +2931,7 @@ entities: - type: Transform pos: 14.5,2.5 parent: 550 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 246 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml index 5152a44f4da..b02f33a8a0c 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml @@ -3028,7 +3028,7 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-7.5 parent: 549 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 301 components: @@ -3224,7 +3224,7 @@ entities: - type: Transform pos: -5.334782,0.38485345 parent: 549 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 223 components: @@ -3459,7 +3459,7 @@ entities: - type: Transform pos: -2.5,-6.5 parent: 549 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 304 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-perma.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-perma.yml index 940d486c78a..bab58e7767f 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-atlas-perma.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-atlas-perma.yml @@ -1214,7 +1214,7 @@ entities: - type: Transform pos: 2.5,2.5 parent: 273 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 100 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-hauling-shuttle.yml b/Resources/Maps/Salvage/DeltaV/DV-hauling-shuttle.yml index ae2efcbae3d..93eb0e63e18 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-hauling-shuttle.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-hauling-shuttle.yml @@ -692,7 +692,7 @@ entities: - 0 - 0 - 0 -- proto: CratePlasma +- proto: CratePhoron entities: - uid: 191 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml b/Resources/Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml index 319a3000e29..3ba3d8f30c7 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml @@ -153,7 +153,7 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: SpreaderGrid -- proto: AtmosFixInstantPlasmaFireMarker +- proto: AtmosFixInstantPhoronFireMarker entities: - uid: 292 components: @@ -872,7 +872,7 @@ entities: - type: Transform pos: 10.500248,-12.6178875 parent: 298 -- proto: PlasmaOre1 +- proto: PhoronOre1 entities: - uid: 240 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-med-chunk-01.yml b/Resources/Maps/Salvage/DeltaV/DV-med-chunk-01.yml index bbb5866ba69..35c0ca1e73b 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-med-chunk-01.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-med-chunk-01.yml @@ -2069,7 +2069,7 @@ entities: - type: Transform pos: -3.5,-0.5 parent: 373 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 82 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml b/Resources/Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml index 30329d87145..c4519c1b738 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml @@ -404,7 +404,7 @@ entities: - type: Transform pos: 2.5,-1.5 parent: 166 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 35 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-med-vault-01.yml b/Resources/Maps/Salvage/DeltaV/DV-med-vault-01.yml index 8a9e480663b..19cfefdff54 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-med-vault-01.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-med-vault-01.yml @@ -815,7 +815,7 @@ entities: - type: Transform pos: -4.534439,-4.3155937 parent: 222 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 206 components: @@ -916,7 +916,7 @@ entities: - type: Transform pos: 4.5,-6.5 parent: 222 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 3 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-medium-01.yml b/Resources/Maps/Salvage/DeltaV/DV-medium-01.yml index d3a004d758b..443e9655236 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-medium-01.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-medium-01.yml @@ -373,7 +373,7 @@ entities: - type: Transform pos: 4.5,-0.5 parent: 85 -- proto: AtmosFixInstantPlasmaFireMarker +- proto: AtmosFixInstantPhoronFireMarker entities: - uid: 38 components: @@ -480,7 +480,7 @@ entities: - type: Transform pos: -5.5,4.5 parent: 85 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 165 components: @@ -997,7 +997,7 @@ entities: - type: Transform pos: -2.5,1.5 parent: 85 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 29 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml b/Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml index b15f6e4e857..f0cc8bdfed0 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml @@ -1192,7 +1192,7 @@ entities: - type: Transform pos: 6.5,0.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 9 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-research-outpost-01.yml b/Resources/Maps/Salvage/DeltaV/DV-research-outpost-01.yml index ed36b29abfe..e629209b25f 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-research-outpost-01.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-research-outpost-01.yml @@ -3126,7 +3126,7 @@ entities: - type: Transform pos: -2.4394016,-5.5581717 parent: 1 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 653 components: @@ -3844,7 +3844,7 @@ entities: rot: 1.5707963267948966 rad pos: -12.044347,9.298429 parent: 1 -- proto: ShardGlassPlasma +- proto: ShardGlassPhoron entities: - uid: 655 components: @@ -4165,7 +4165,7 @@ entities: - type: Transform pos: 11.5,4.5 parent: 1 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 598 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml b/Resources/Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml index 7ac16789c91..0b0e1c1760e 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml @@ -1105,7 +1105,7 @@ entities: - type: Transform pos: -1.5,-3.5 parent: 16 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 55 components: diff --git a/Resources/Maps/Salvage/DeltaV/DV-stationstation.yml b/Resources/Maps/Salvage/DeltaV/DV-stationstation.yml index e98c4686e38..b5c3a66d071 100644 --- a/Resources/Maps/Salvage/DeltaV/DV-stationstation.yml +++ b/Resources/Maps/Salvage/DeltaV/DV-stationstation.yml @@ -1626,7 +1626,7 @@ entities: - type: Transform pos: -14.727282,-5.4793034 parent: 179 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 688 components: diff --git a/Resources/Maps/Salvage/asteroid-base.yml b/Resources/Maps/Salvage/asteroid-base.yml index 0240648fa4c..dbd7b059cd4 100644 --- a/Resources/Maps/Salvage/asteroid-base.yml +++ b/Resources/Maps/Salvage/asteroid-base.yml @@ -1849,14 +1849,14 @@ entities: - type: Transform pos: 8.530472,8.534576 parent: 407 -- proto: PlasmaOre1 +- proto: PhoronOre1 entities: - uid: 397 components: - type: Transform pos: -9.462246,2.5242848 parent: 407 -- proto: PlasmaWindow +- proto: PhoronWindow entities: - uid: 76 components: @@ -1997,7 +1997,7 @@ entities: - type: Transform pos: 11.5,-5.5 parent: 407 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 185 components: @@ -2038,7 +2038,7 @@ entities: - type: Transform pos: 8.5,-4.5 parent: 407 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 384 components: @@ -2288,7 +2288,7 @@ entities: - type: Transform pos: 11.5,-8.5 parent: 407 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 395 components: diff --git a/Resources/Maps/Salvage/engineering-chunk.yml b/Resources/Maps/Salvage/engineering-chunk.yml index 53b0a24597c..4c59c285340 100644 --- a/Resources/Maps/Salvage/engineering-chunk.yml +++ b/Resources/Maps/Salvage/engineering-chunk.yml @@ -1395,7 +1395,7 @@ entities: - type: Transform pos: -6.5,-1.5 parent: 1 -- proto: AsteroidRockPlasma +- proto: AsteroidRockPhoron entities: - uid: 10 components: @@ -2129,7 +2129,7 @@ entities: - type: Transform pos: -4.5,-6.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 423 components: diff --git a/Resources/Maps/Salvage/hauling-shuttle.yml b/Resources/Maps/Salvage/hauling-shuttle.yml index d90c3c6b42e..63da51a31a2 100644 --- a/Resources/Maps/Salvage/hauling-shuttle.yml +++ b/Resources/Maps/Salvage/hauling-shuttle.yml @@ -673,7 +673,7 @@ entities: - type: Transform pos: -2.5,2.5 parent: 1 -- proto: CratePlasma +- proto: CratePhoron entities: - uid: 191 components: diff --git a/Resources/Maps/Salvage/medium-1.yml b/Resources/Maps/Salvage/medium-1.yml index 457c4478500..5380da5cbc3 100644 --- a/Resources/Maps/Salvage/medium-1.yml +++ b/Resources/Maps/Salvage/medium-1.yml @@ -841,7 +841,7 @@ entities: - type: Transform pos: -2.5,1.5 parent: 85 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 29 components: diff --git a/Resources/Maps/Salvage/medium-crashed-shuttle.yml b/Resources/Maps/Salvage/medium-crashed-shuttle.yml index 55a6d3ebd31..f5b95b56880 100644 --- a/Resources/Maps/Salvage/medium-crashed-shuttle.yml +++ b/Resources/Maps/Salvage/medium-crashed-shuttle.yml @@ -557,7 +557,7 @@ entities: - type: Transform pos: 3.5,3.5 parent: 166 -- proto: AsteroidRockPlasma +- proto: AsteroidRockPhoron entities: - uid: 35 components: diff --git a/Resources/Maps/Salvage/medium-vault-1.yml b/Resources/Maps/Salvage/medium-vault-1.yml index 46785fab6bd..5e4bc3d717c 100644 --- a/Resources/Maps/Salvage/medium-vault-1.yml +++ b/Resources/Maps/Salvage/medium-vault-1.yml @@ -843,7 +843,7 @@ entities: - type: Transform pos: -4.534439,-4.3155937 parent: 222 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 206 components: @@ -944,7 +944,7 @@ entities: - type: Transform pos: 4.5,-6.5 parent: 222 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 3 components: diff --git a/Resources/Maps/Salvage/outpost-arm.yml b/Resources/Maps/Salvage/outpost-arm.yml index 4d82773b9eb..882011cb83d 100644 --- a/Resources/Maps/Salvage/outpost-arm.yml +++ b/Resources/Maps/Salvage/outpost-arm.yml @@ -1191,7 +1191,7 @@ entities: - type: Transform pos: 6.5,0.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 9 components: diff --git a/Resources/Maps/Salvage/ruin-cargo-salvage.yml b/Resources/Maps/Salvage/ruin-cargo-salvage.yml index dbe3ca671bc..1f8367932ee 100644 --- a/Resources/Maps/Salvage/ruin-cargo-salvage.yml +++ b/Resources/Maps/Salvage/ruin-cargo-salvage.yml @@ -2400,7 +2400,7 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 16 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 265 components: diff --git a/Resources/Maps/Salvage/small-syndicate.yml b/Resources/Maps/Salvage/small-syndicate.yml index 1df88e9adf0..1af21f31058 100644 --- a/Resources/Maps/Salvage/small-syndicate.yml +++ b/Resources/Maps/Salvage/small-syndicate.yml @@ -714,7 +714,7 @@ entities: rot: 3.141592653589793 rad pos: 1.5,4.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 20 components: diff --git a/Resources/Maps/Salvage/stationstation.yml b/Resources/Maps/Salvage/stationstation.yml index 82ed15f3537..10cb76b9ca5 100644 --- a/Resources/Maps/Salvage/stationstation.yml +++ b/Resources/Maps/Salvage/stationstation.yml @@ -1641,7 +1641,7 @@ entities: - type: Transform pos: -14.727282,-5.4793034 parent: 179 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 688 components: diff --git a/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml b/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml index 9cff388fc88..cecfe4c49d8 100644 --- a/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml +++ b/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml @@ -5156,7 +5156,7 @@ entities: pos: 4.5,-3.5 parent: 1 - type: Emagged -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 789 components: diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_BC20.yml b/Resources/Maps/Shuttles/DeltaV/NTES_BC20.yml index 8ac88a1f031..5f187f3f11e 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_BC20.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_BC20.yml @@ -10019,7 +10019,7 @@ entities: - type: Transform pos: 9.5,-22.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 650 components: diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Centipede.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Centipede.yml index f1d20588b46..a3eabfb3630 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Centipede.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Centipede.yml @@ -12381,7 +12381,7 @@ entities: - type: Transform pos: -9.5,-7.5 parent: 1 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 941 components: diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Delta.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Delta.yml index ea42d89ddd1..26b5498ac9d 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Delta.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Delta.yml @@ -5183,7 +5183,7 @@ entities: - type: Transform pos: -8.607952,8.414773 parent: 1 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 819 components: @@ -5570,7 +5570,7 @@ entities: - type: Transform pos: -2.5,8.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 553 components: diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Lox.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Lox.yml index 9522cd74d3b..edb52616762 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Lox.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Lox.yml @@ -3335,7 +3335,7 @@ entities: - type: Transform pos: -6.5766983,9.757399 parent: 670 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 542 components: diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Right.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Right.yml index d2a239a0153..cdc21dd7ca3 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Right.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Right.yml @@ -8280,7 +8280,7 @@ entities: - type: Transform pos: 0.5,7.5 parent: 1 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 773 components: diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml index 930f6c74c7e..2f6734147ee 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml @@ -6465,7 +6465,7 @@ entities: parent: 60 - type: AtmosDevice joinedGrid: 60 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 170 components: diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml b/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml index 3743da92340..b6f13426970 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml @@ -7018,7 +7018,7 @@ entities: - type: Transform pos: -3.3392568,2.2526383 parent: 1 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 179 components: @@ -7645,7 +7645,7 @@ entities: - type: Transform pos: 14.5,-13.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 175 components: @@ -8157,7 +8157,7 @@ entities: - type: Transform pos: -6.5,-3.5 parent: 1 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 1045 components: diff --git a/Resources/Maps/Shuttles/dart.yml b/Resources/Maps/Shuttles/dart.yml index b0da93250cb..29bd36cbc1c 100644 --- a/Resources/Maps/Shuttles/dart.yml +++ b/Resources/Maps/Shuttles/dart.yml @@ -5025,7 +5025,7 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-20.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 239 components: diff --git a/Resources/Maps/Shuttles/emergency.yml b/Resources/Maps/Shuttles/emergency.yml index eeb7048141d..e6f98afae70 100644 --- a/Resources/Maps/Shuttles/emergency.yml +++ b/Resources/Maps/Shuttles/emergency.yml @@ -2089,7 +2089,7 @@ entities: parent: 410 - type: Physics canCollide: False -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 88 components: diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml index 4e888ae05cf..c799150cbc3 100644 --- a/Resources/Maps/Shuttles/infiltrator.yml +++ b/Resources/Maps/Shuttles/infiltrator.yml @@ -3793,7 +3793,7 @@ entities: - type: Transform pos: -2.4942985,-13.37949 parent: 1 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 520 components: @@ -4173,7 +4173,7 @@ entities: - type: Transform pos: 5.5,-17.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 573 components: @@ -4630,7 +4630,7 @@ entities: - type: Transform pos: 1.5,-19.5 parent: 1 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 642 components: diff --git a/Resources/Maps/Shuttles/pirate.yml b/Resources/Maps/Shuttles/pirate.yml index e4a45969ca2..c034a938785 100644 --- a/Resources/Maps/Shuttles/pirate.yml +++ b/Resources/Maps/Shuttles/pirate.yml @@ -3470,7 +3470,7 @@ entities: - type: Transform pos: -1.5,8.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 513 components: @@ -3631,7 +3631,7 @@ entities: - type: Transform pos: 8.5,1.5 parent: 1 -- proto: ReinforcedPlasmaWindowDiagonal +- proto: ReinforcedPhoronWindowDiagonal entities: - uid: 540 components: diff --git a/Resources/Maps/Shuttles/striker.yml b/Resources/Maps/Shuttles/striker.yml index 35b6178bd45..1b2965bc4ae 100644 --- a/Resources/Maps/Shuttles/striker.yml +++ b/Resources/Maps/Shuttles/striker.yml @@ -1466,7 +1466,7 @@ entities: parent: 325 - type: Physics canCollide: False -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 104 components: @@ -1590,7 +1590,7 @@ entities: - type: Transform pos: 1.5,-2.5 parent: 325 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 14 components: diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml index a10f070bd25..49d2b7effa0 100644 --- a/Resources/Maps/Shuttles/trading_outpost.yml +++ b/Resources/Maps/Shuttles/trading_outpost.yml @@ -4330,7 +4330,7 @@ entities: - type: Transform pos: 9.341236,-16.909695 parent: 2 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 388 components: diff --git a/Resources/Maps/Shuttles/wizard.yml b/Resources/Maps/Shuttles/wizard.yml index 031b547a8f2..c1461e97121 100644 --- a/Resources/Maps/Shuttles/wizard.yml +++ b/Resources/Maps/Shuttles/wizard.yml @@ -3141,7 +3141,7 @@ entities: - type: Transform pos: 1.5621729,-0.9631119 parent: 768 -- proto: PlasmaDoor +- proto: PhoronDoor entities: - uid: 7 components: @@ -3198,7 +3198,7 @@ entities: - type: Transform pos: -5.5,-4.5 parent: 768 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 240 components: @@ -3689,7 +3689,7 @@ entities: - type: Transform pos: -4.5,-13.5 parent: 768 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 5 components: diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index f00d7049a52..67594a4f210 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -4437,7 +4437,7 @@ entities: - type: Transform pos: 10.862433,12.602201 parent: 179 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 461 components: @@ -5004,7 +5004,7 @@ entities: - type: Transform pos: -0.5,8.5 parent: 179 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 1077 components: diff --git a/Resources/Maps/Test/test_teg.yml b/Resources/Maps/Test/test_teg.yml index 4a101265bb1..3ec5babfed6 100644 --- a/Resources/Maps/Test/test_teg.yml +++ b/Resources/Maps/Test/test_teg.yml @@ -2000,7 +2000,7 @@ entities: - type: Transform pos: -6.820592,5.657404 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 77 components: diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index ce973ef2d3d..f73b78edcad 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -17710,7 +17710,7 @@ entities: - type: Transform pos: 36.5,40.5 parent: 6747 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 873 components: @@ -130297,7 +130297,7 @@ entities: - type: Transform pos: 49.5,29.5 parent: 6747 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 12865 components: @@ -130306,14 +130306,14 @@ entities: parent: 6747 - type: AtmosDevice joinedGrid: 6747 -- proto: PlasmaOre1 +- proto: PhoronOre1 entities: - uid: 25553 components: - type: Transform pos: -37.68728,-86.442535 parent: 6747 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 650 components: @@ -130598,7 +130598,7 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,-24.5 parent: 6747 -- proto: PlasmaWindoorSecureChemistryLocked +- proto: PhoronWindoorSecureChemistryLocked entities: - uid: 5400 components: @@ -130620,7 +130620,7 @@ entities: - type: Transform pos: 11.5,-21.5 parent: 6747 -- proto: PlasmaWindoorSecureScienceLocked +- proto: PhoronWindoorSecureScienceLocked entities: - uid: 11437 components: @@ -142935,7 +142935,7 @@ entities: - type: Transform pos: 98.5,-24.5 parent: 6747 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 887 components: @@ -146746,7 +146746,7 @@ entities: - type: Transform pos: -23.526825,-58.39905 parent: 6747 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 5236 components: @@ -146766,7 +146766,7 @@ entities: rot: -1.5707963267948966 rad pos: 26.519497,-69.459854 parent: 6747 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 16168 components: @@ -155393,7 +155393,7 @@ entities: - type: Transform pos: -15.5,-26.5 parent: 6747 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 4020 components: @@ -173960,7 +173960,7 @@ entities: - type: Transform pos: 37.5,39.5 parent: 6747 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 8222 components: diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml index ac06ebba4e9..39689171b5c 100644 --- a/Resources/Maps/asterisk.yml +++ b/Resources/Maps/asterisk.yml @@ -51489,7 +51489,7 @@ entities: - type: Transform pos: 1.4500225,-4.7739863 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 1578 components: @@ -51512,7 +51512,7 @@ entities: parent: 2 - type: AtmosDevice joinedGrid: 2 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 808 components: @@ -55149,7 +55149,7 @@ entities: - type: Transform pos: 29.5,24.5 parent: 2 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 718 components: @@ -56511,7 +56511,7 @@ entities: - type: Transform pos: 14.5,-10.5 parent: 2 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 576 components: @@ -60900,7 +60900,7 @@ entities: - type: Transform pos: 6.5,-1.5 parent: 2 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 2695 components: diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml index b64158f08b4..1d76b566415 100644 --- a/Resources/Maps/centcomm.yml +++ b/Resources/Maps/centcomm.yml @@ -30841,7 +30841,7 @@ entities: - type: DeviceLinkSink links: - 5907 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 2791 components: diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml index 601cb7dd17c..7d36480c966 100644 --- a/Resources/Maps/edge.yml +++ b/Resources/Maps/edge.yml @@ -10456,7 +10456,7 @@ entities: - type: Transform pos: 7.5,-45.5 parent: 2 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 580 components: @@ -49508,7 +49508,7 @@ entities: - uid: 7689 components: - type: MetaData - name: plasma filter + name: phoron filter - type: Transform rot: 3.141592653589793 rad pos: -0.5,-48.5 @@ -49610,7 +49610,7 @@ entities: - uid: 7699 components: - type: MetaData - name: plasma mixer + name: phoron mixer - type: Transform rot: 3.141592653589793 rad pos: -2.5,-49.5 @@ -68792,7 +68792,7 @@ entities: - uid: 10192 components: - type: MetaData - name: plasma pump + name: phoron pump - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-49.5 @@ -68816,7 +68816,7 @@ entities: - uid: 10194 components: - type: MetaData - name: plasma input pump + name: phoron input pump - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-48.5 @@ -80804,7 +80804,7 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-52.5 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 12074 components: @@ -80813,7 +80813,7 @@ entities: parent: 2 - type: AtmosDevice joinedGrid: 2 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 12075 components: @@ -80827,7 +80827,7 @@ entities: rot: 1.5707963267948966 rad pos: -42.5,1.5 parent: 2 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 12077 components: @@ -86756,7 +86756,7 @@ entities: - type: Transform pos: 20.5,-49.5 parent: 2 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 13121 components: @@ -88977,7 +88977,7 @@ entities: - type: Transform pos: -42.71093,39.51951 parent: 2 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 13517 components: @@ -88993,7 +88993,7 @@ entities: count: 10 - type: Item size: 10 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 13519 components: @@ -95487,7 +95487,7 @@ entities: - type: Transform pos: -12.5,20.5 parent: 2 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 14497 components: @@ -108242,7 +108242,7 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-44.5 parent: 2 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 16854 components: diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 43cb095d8cd..4a2f93512c8 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -28672,7 +28672,7 @@ entities: - type: Transform pos: -100.5,-51.5 parent: 1 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 40775 components: @@ -204094,7 +204094,7 @@ entities: rot: -1.5707963267948966 rad pos: -98.5,-33.5 parent: 1 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 4139 components: @@ -204330,7 +204330,7 @@ entities: rot: 1.5707963267948966 rad pos: -111.5,-4.5 parent: 1 -- proto: PlasmaTank +- proto: PhoronTank entities: - uid: 32158 components: @@ -204347,7 +204347,7 @@ entities: - type: Transform pos: -132.57973,-23.467022 parent: 1 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 15894 components: @@ -222237,7 +222237,7 @@ entities: - type: Transform pos: 38.5,48.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 4118 components: @@ -230019,7 +230019,7 @@ entities: rot: 3.141592653589793 rad pos: -109.45741,-88.44611 parent: 1 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 3218 components: @@ -230043,7 +230043,7 @@ entities: rot: 3.141592653589793 rad pos: 53.583534,-50.498856 parent: 1 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 9810 components: @@ -242868,7 +242868,7 @@ entities: rot: 1.5707963267948966 rad pos: -52.5,35.5 parent: 1 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 4307 components: @@ -270102,7 +270102,7 @@ entities: - type: Transform pos: -99.5,-52.5 parent: 1 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 33953 components: diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index a732c83a534..27283f8d1b4 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -18286,7 +18286,7 @@ entities: - type: Transform pos: -53.5,32.5 parent: 1 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 10851 components: @@ -126615,7 +126615,7 @@ entities: - type: Transform pos: -54.5,29.5 parent: 1 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 1088 components: @@ -135918,7 +135918,7 @@ entities: - type: Transform pos: 73.5,46.5 parent: 1 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 196 components: @@ -139705,7 +139705,7 @@ entities: - type: Transform pos: 68.4801,35.62359 parent: 1 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 4664 components: @@ -148998,7 +148998,7 @@ entities: - type: Transform pos: 40.5,50.5 parent: 1 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 5995 components: @@ -170597,7 +170597,7 @@ entities: - type: Transform pos: -52.5,29.5 parent: 1 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 235 components: diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml index c90628f7f43..1ad9c4ed708 100644 --- a/Resources/Maps/pebble.yml +++ b/Resources/Maps/pebble.yml @@ -13267,7 +13267,7 @@ entities: - type: Transform pos: 21.5,38.5 parent: 2 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 1401 components: @@ -36327,7 +36327,7 @@ entities: parent: 2 - type: AtmosDevice joinedGrid: 2 -- proto: GasMinerPlasma +- proto: GasMinerPhoron entities: - uid: 5555 components: @@ -52811,7 +52811,7 @@ entities: - type: Transform pos: -9.474873,28.669428 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 7809 components: @@ -56270,7 +56270,7 @@ entities: - type: Transform pos: 41.5,-10.5 parent: 2 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 4569 components: @@ -57909,14 +57909,14 @@ entities: - type: Transform pos: -1.4423792,22.476915 parent: 2 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 8635 components: - type: Transform pos: 5.468627,23.546305 parent: 2 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 8636 components: @@ -62088,7 +62088,7 @@ entities: - type: Transform pos: -31.5,19.5 parent: 2 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 9237 components: @@ -69651,7 +69651,7 @@ entities: - type: Transform pos: 20.5,36.5 parent: 2 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 10652 components: diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index ea91cb0b433..44e7bc7df83 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -6718,7 +6718,7 @@ entities: - type: Transform pos: -36.5,-41.5 parent: 34 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 1873 components: @@ -37944,7 +37944,7 @@ entities: - uid: 1434 components: - type: MetaData - name: plasma mixer + name: phoron mixer - type: Transform rot: 3.141592653589793 rad pos: -43.5,-44.5 @@ -54583,7 +54583,7 @@ entities: - uid: 1425 components: - type: MetaData - name: plasma pump + name: phoron pump - type: Transform rot: -1.5707963267948966 rad pos: -40.5,-44.5 @@ -64079,7 +64079,7 @@ entities: - type: Transform pos: 37.5,-34.5 parent: 34 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 12323 components: @@ -64088,7 +64088,7 @@ entities: parent: 34 - type: AtmosDevice joinedGrid: 34 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 13338 components: @@ -68531,7 +68531,7 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,-29.5 parent: 34 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 1464 components: @@ -70598,14 +70598,14 @@ entities: - type: Transform pos: -32.350746,-27.221853 parent: 34 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 11132 components: - type: Transform pos: -34.59602,1.5904913 parent: 34 -- proto: SheetPlasma1 +- proto: SheetPhoron1 entities: - uid: 6248 components: @@ -76188,7 +76188,7 @@ entities: - type: Transform pos: 22.5,-14.5 parent: 34 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 2953 components: @@ -85895,12 +85895,12 @@ entities: - type: Transform pos: -39.5,-42.5 parent: 34 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 1201 components: - type: MetaData - name: plasma warning sign + name: phoron warning sign - type: Transform pos: -39.5,-44.5 parent: 34 diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml index 3c2abcd1210..52e75b434bc 100644 --- a/Resources/Maps/submarine.yml +++ b/Resources/Maps/submarine.yml @@ -162241,7 +162241,7 @@ entities: rot: 3.141592653589793 rad pos: -49.5,36.5 parent: 2 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 9351 components: @@ -162250,7 +162250,7 @@ entities: parent: 2 - type: AtmosDevice joinedGrid: 2 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 49 components: @@ -162706,7 +162706,7 @@ entities: - type: Transform pos: 38.5,21.5 parent: 2 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 9592 components: @@ -162718,7 +162718,7 @@ entities: - type: Transform pos: -48.58438,33.62493 parent: 2 -- proto: PlasmaWindowDirectional +- proto: PhoronWindowDirectional entities: - uid: 30281 components: @@ -175263,7 +175263,7 @@ entities: - type: Transform pos: -94.5,64.5 parent: 2 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 2202 components: @@ -176302,7 +176302,7 @@ entities: - type: Transform pos: -58.5,10.5 parent: 2 -- proto: ReinforcedPlasmaWindowDiagonal +- proto: ReinforcedPhoronWindowDiagonal entities: - uid: 22539 components: @@ -180188,7 +180188,7 @@ entities: - type: Transform pos: -69.625114,0.8576727 parent: 2 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 2032 components: @@ -189718,7 +189718,7 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,14.5 parent: 2 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 53 components: @@ -216439,7 +216439,7 @@ entities: - type: Transform pos: -48.5,47.5 parent: 2 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 9493 components: diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index a32f74f80bf..5d569fefb56 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -20330,7 +20330,7 @@ entities: - type: Transform pos: 31.5,67.5 parent: 33 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixPhoronMarker entities: - uid: 10107 components: @@ -147263,7 +147263,7 @@ entities: - type: Transform pos: 28.5,66.5 parent: 33 -- proto: PlasmaCanister +- proto: PhoronCanister entities: - uid: 29710 components: @@ -147279,7 +147279,7 @@ entities: parent: 33 - type: AtmosDevice joinedGrid: 33 -- proto: PlasmaReinforcedWindowDirectional +- proto: PhoronReinforcedWindowDirectional entities: - uid: 211 components: @@ -147435,14 +147435,14 @@ entities: rot: 1.5707963267948966 rad pos: 61.5,70.5 parent: 33 -- proto: PlasmaTank +- proto: PhoronTank entities: - uid: 29214 components: - type: Transform pos: 34.66312,-25.96221 parent: 33 -- proto: PlasmaTankFilled +- proto: PhoronTankFilled entities: - uid: 30600 components: @@ -158702,7 +158702,7 @@ entities: - type: Transform pos: 80.5,87.5 parent: 33 -- proto: ReinforcedPlasmaWindow +- proto: ReinforcedPhoronWindow entities: - uid: 121 components: @@ -163515,7 +163515,7 @@ entities: - type: Transform pos: -53.51073,35.553665 parent: 33 -- proto: SheetPlasma +- proto: SheetPhoron entities: - uid: 5384 components: @@ -174764,7 +174764,7 @@ entities: - type: Transform pos: 26.5,62.5 parent: 33 -- proto: TablePlasmaGlass +- proto: TablePhoronGlass entities: - uid: 3370 components: @@ -196062,7 +196062,7 @@ entities: - type: Transform pos: 32.5,66.5 parent: 33 -- proto: WarningPlasma +- proto: WarningPhoron entities: - uid: 490 components: diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index c4759eef91f..2593521f52d 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -83,9 +83,9 @@ SyringeSpaceacillin: null AirlockPainter: SprayPainter # 2023-08-19 -GeneratorPlasma: PortableGeneratorPacman +GeneratorPhoron: PortableGeneratorPacman GeneratorUranium: PortableGeneratorSuperPacman -GeneratorPlasmaMachineCircuitboard: PortableGeneratorPacmanMachineCircuitboard +GeneratorPhoronMachineCircuitboard: PortableGeneratorPacmanMachineCircuitboard GeneratorUraniumMachineCircuitboard: PortableGeneratorSuperPacmanMachineCircuitboard # 2023-12-12 diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index 6572b85e550..a2002831ec6 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -27,14 +27,14 @@ - type: gas id: 3 - name: gases-plasma + name: gases-phoron specificHeat: 200 heatCapacityRatio: 1.7 molarMass: 120 gasOverlaySprite: /Textures/Effects/atmospherics.rsi - gasOverlayState: plasma + gasOverlayState: phoron color: FF3300 - reagent: Plasma + reagent: Phoron - type: gas id: 4 diff --git a/Resources/Prototypes/Atmospherics/reactions.yml b/Resources/Prototypes/Atmospherics/reactions.yml index d226c81f6cc..99af917f9bb 100644 --- a/Resources/Prototypes/Atmospherics/reactions.yml +++ b/Resources/Prototypes/Atmospherics/reactions.yml @@ -1,14 +1,14 @@ - type: gasReaction - id: PlasmaFire + id: PhoronFire 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 # plasma + - 0.01 # phoron effects: - - !type:PlasmaFireReaction {} + - !type:PhoronFireReaction {} - type: gasReaction id: TritiumFire @@ -18,7 +18,7 @@ - 0.01 # oxygen - 0 # nitrogen - 0 # carbon dioxide - - 0 # plasma + - 0 # phoron - 0.01 # tritium effects: - !type:TritiumFireReaction {} @@ -31,7 +31,7 @@ - 0 # oxygen - 0.01 # nitrogen - 0 # carbon dioxide - - 0 # plasma + - 0 # phoron - 0 # tritium - 0 # vapor - 0 # ammonia @@ -48,7 +48,7 @@ - 0.01 # oxygen - 0.01 # nitrogen - 0 # carbon dioxide - - 0 # plasma + - 0 # phoron - 0.01 # tritium - 0 # vapor - 0 # ammonia @@ -65,7 +65,7 @@ - 0.01 # oxygen - 0 # nitrogen - 0 # carbon dioxide - - 0 # plasma + - 0 # phoron - 0 # tritium - 0 # vapor - 0.01 # ammonia @@ -82,7 +82,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # carbon dioxide - - 0 # plasma + - 0 # phoron - 0 # tritium - 0 # vapor - 0 # ammonia @@ -99,7 +99,7 @@ # - 0 # oxygen # - 0 # nitrogen # - 0 # carbon dioxide -# - 0 # plasma +# - 0 # phoron # - 0 # tritium # - 1 # water vapor # effects: diff --git a/Resources/Prototypes/Atmospherics/thresholds.yml b/Resources/Prototypes/Atmospherics/thresholds.yml index 9b09d64a10c..b36d58f5716 100644 --- a/Resources/Prototypes/Atmospherics/thresholds.yml +++ b/Resources/Prototypes/Atmospherics/thresholds.yml @@ -40,7 +40,7 @@ threshold: 0.5 - type: alarmThreshold - id: stationPlasma + id: stationPhoron upperBound: !type:AlarmThresholdSetting threshold: 0.00125 upperWarnAround: !type:AlarmThresholdSetting diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml index 0aa49383992..df8cc2b4c17 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml @@ -91,11 +91,11 @@ # group: market - type: cargoProduct - id: AtmosphericsPlasma + id: AtmosphericsPhoron icon: sprite: Structures/Storage/canister.rsi state: orange - product: PlasmaCanister + product: PhoronCanister cost: 4000 category: Atmospherics group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index e3b07af13ba..5cc73569c8e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -59,11 +59,11 @@ group: market - type: cargoProduct - id: MaterialPlasma + id: MaterialPhoron icon: sprite: Objects/Materials/Sheets/other.rsi - state: plasma_3 - product: CrateMaterialPlasma + state: phoron_3 + product: CrateMaterialPhoron cost: 2000 category: Materials group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index b36eab6ba91..ba36a2013b3 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -96,7 +96,7 @@ - id: OxygenCanister prob: 0.001 orGroup: Canister - - id: PlasmaCanister + - id: PhoronCanister prob: 0.001 orGroup: Canister - id: TritiumCanister diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index 9b47036b017..07f75de5314 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -48,12 +48,12 @@ id: CrateEngineeringSingularityCollector parent: CrateEngineeringSecure name: radiation collector crate - description: A radiation collector, best used for singularity engines. Plasma is included. + description: A radiation collector, best used for singularity engines. Phoron is included. components: - type: StorageFill contents: - id: RadiationCollectorFlatpack - - id: PlasmaTankFilled + - id: PhoronTankFilled - type: entity id: CrateEngineeringSingularityContainment diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml index bd47f984775..f47831e9e84 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml @@ -76,14 +76,14 @@ amount: 3 - type: entity - id: CrateMaterialPlasma - parent: CratePlasma - name: solid plasma crate - description: 90 sheets of plasma. + id: CrateMaterialPhoron + parent: CratePhoron + name: solid phoron crate + description: 90 sheets of phoron. components: - type: StorageFill contents: - - id: SheetPlasma + - id: SheetPhoron amount: 3 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index c1168f68d42..de981d42963 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -36,13 +36,13 @@ # Normal (10%) - id: OxygenTankFilled prob: 0.1 - - id: SheetPlasma + - id: SheetPhoron prob: 0.1 - id: IngotGold prob: 0.1 - id: IngotSilver prob: 0.1 - - id: SheetPlasma + - id: SheetPhoron prob: 0.1 - id: WelderIndustrialAdvanced prob: 0.1 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 8f8c1a114fc..37c5a35c14c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -314,7 +314,7 @@ prob: 0.1 - id: Syringe prob: 0.1 - - id: ShardGlassPlasma + - id: ShardGlassPhoron prob: 0.1 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml index 2cf1354c143..239fe385ed8 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml @@ -137,12 +137,12 @@ - 0.270782035 # 95% oxygen - 0 # nitrogen - 0 # CO2 - - 0 # plasma + - 0 # phoron - 0 # tritium - 0 # water vapor - 0 # ammonia - 0.014251686 # 5% N2O - # 0.285033721 total + # 0.285033721 total temperature: 293.15 - type: entity @@ -196,7 +196,7 @@ - 1.435965335 # 70% oxygen - 0 # nitrogen - 0 # CO2 - - 0 # plasma + - 0 # phoron - 0 # tritium - 0 # water vapor - 0 # ammonia @@ -205,9 +205,9 @@ temperature: 293.15 - type: entity - id: PlasmaTankFilled - parent: PlasmaTank - name: plasma tank + id: PhoronTankFilled + parent: PhoronTank + name: phoron tank suffix: Filled components: - type: GasTank @@ -219,5 +219,5 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 2.051379050 # plasma + - 2.051379050 # phoron temperature: 293.15 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml index fce18024a7e..ab604053b6f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml @@ -7,5 +7,5 @@ - type: vendingMachineInventory id: TankDispenserEngineeringInventory startingInventory: - PlasmaTankFilled: 10 + PhoronTankFilled: 10 OxygenTankFilled: 10 diff --git a/Resources/Prototypes/Datasets/Names/Operation_prefix.yml b/Resources/Prototypes/Datasets/Names/Operation_prefix.yml index f9696d71cc1..06001110fb2 100644 --- a/Resources/Prototypes/Datasets/Names/Operation_prefix.yml +++ b/Resources/Prototypes/Datasets/Names/Operation_prefix.yml @@ -61,7 +61,7 @@ - Outlaw - Painful - Phantasmagoric - - Plasma + - Phoron - Plastic - Purple - Red diff --git a/Resources/Prototypes/Datasets/Names/autoborg.yml b/Resources/Prototypes/Datasets/Names/autoborg.yml index 35e0443deb1..adb03296893 100644 --- a/Resources/Prototypes/Datasets/Names/autoborg.yml +++ b/Resources/Prototypes/Datasets/Names/autoborg.yml @@ -29,7 +29,7 @@ - IM NOT MALF GUYS - I AM ERROR - Carbon Exterminator - - PLASMALOOSE + - PHORONLOOSE - Taffy - Boop - Boop II diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index 0751582e3d6..acdc7300856 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -184,7 +184,7 @@ - OXYGEN - PAIN - PLANTS - - PLASMA + - PHORON - ROBOTS - SHUTTLES - SPACE diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 3caa2dcfbf8..719bed05d49 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -38,9 +38,9 @@ - "As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed." - "As a Traitor, be careful when using vestine from the chemical synthesis kit. If someone checks your station, they could easily out you." - "As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach." - - "As a Traitor, plasma gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it." + - "As a Traitor, phoron gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it." - "As a Traitor, dehydrated carps are useful for killing a large hoard of people. As long as you pat it before rehydrating it, it can be used as a great distraction." - - "As a Traitor, have you tried injecting plasma into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!" + - "As a Traitor, have you tried injecting phoron into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!" - "As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire." - "As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan." - "As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off guard by what he thinks is just a regular passenger!" @@ -73,7 +73,7 @@ - "As an Engineer, you can repair cracked windows by using a lit welding tool on them while not in combat mode." - "As an Engineer, you can electrify grilles by placing powered cables beneath them." - "As an Engineer, always double check when you're setting up the singularity. It is easier than you think to loose it!" - - "As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation." + - "As an Engineer, you can use phoron glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation." - "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about." - "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe." - "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny." @@ -97,7 +97,7 @@ - "In an emergency, you can always rely on firesuits and emergency EVA suits; they will always spawn in their respective lockers. They might be awkward to move around in, but can easily save your life in a dangerous situation." - "In an emergency, remember that you can craft improvised weapons! A baseball bat or spear could easily mean the difference between deterring an attacker or perishing from the hands of one." - "Spears can be tipped with chemicals, and will inject a few units every time you hit someone with them directly." - - "You can make spears with reinforced glass, plasma glass, or uranium glass shards to enhance their damage." + - "You can make spears with reinforced glass, phoron glass, or uranium glass shards to enhance their damage." - "Thrown spears deal extra damage! Beware, however, as throwing them too much will end up breaking them." - "All forms of toxin damage are fairly difficult to treat, and usually involve the use of chemicals or other inconvenient methods. You can use this to your advantage in combat." - "You can throw crafted bolas at people to slow them down, letting you follow up on them for an easier kill or getaway." diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml index f4aef8284b8..b13431a9c32 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml @@ -54,7 +54,7 @@ - type: RandomSpawner prototypes: - WallRockGold - - WallRockPlasma + - WallRockPhoron - WallRockQuartz - WallRockSilver - WallRockTin @@ -75,7 +75,7 @@ - type: RandomSpawner prototypes: - WallRockBasaltGold - - WallRockBasaltPlasma + - WallRockBasaltPhoron - WallRockBasaltQuartz - WallRockBasaltSilver - WallRockBasaltTin diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml index fad87f577fc..e6a71ca33e1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml @@ -27,7 +27,7 @@ parent: VendingMachine id: VendingMachineCourierDrobe name: CourierDrobe - description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds. + description: Neither solar flares nor meteors nor phoron fire nor void of space stays these couriers from the swift completion of their appointed rounds. components: - type: VendingMachine pack: CourierDrobeInventory diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index cd79417a44e..45ab3b469c3 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -177,4 +177,4 @@ Plastic: 500 Gold: 250 Silver: 100 - Plasma: 500 + Phoron: 500 diff --git a/Resources/Prototypes/DeltaV/ore.yml b/Resources/Prototypes/DeltaV/ore.yml index b6f69484d29..1dafbb1e20e 100644 --- a/Resources/Prototypes/DeltaV/ore.yml +++ b/Resources/Prototypes/DeltaV/ore.yml @@ -6,7 +6,7 @@ OreSteel: 1 OreSpaceQuartz: 2 OreGold: 10 - OrePlasma: 8 + OrePhoron: 8 OreSilver: 4 OreUranium: 6 OreArtifactFragment: 0.5 diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index d5cdd354a9e..6c03b1547e7 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -86,7 +86,7 @@ parent: ClothingBackpack id: ClothingBackpackAtmospherics name: atmospherics backpack - description: It's a backpack made of fire resistant fibers. Smells like plasma. + description: It's a backpack made of fire resistant fibers. Smells like phoron. components: - type: Sprite sprite: Clothing/Back/Backpacks/atmospherics.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index ca16aa5d7ed..59bc5f88d41 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -28,7 +28,7 @@ parent: ClothingBackpackDuffel id: ClothingBackpackDuffelAtmospherics name: atmospherics duffel bag - description: A large duffel bag made of fire resistant fibers. Smells like plasma. + description: A large duffel bag made of fire resistant fibers. Smells like phoron. components: - type: Sprite sprite: Clothing/Back/Duffels/atmospherics.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index bf52477340d..cf7c33ecdc0 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -34,7 +34,7 @@ parent: ClothingBackpackSatchel id: ClothingBackpackSatchelAtmospherics name: atmospherics satchel - description: A tough satchel made of fire resistant fibers. Smells like plasma. + description: A tough satchel made of fire resistant fibers. Smells like phoron. components: - type: Sprite sprite: Clothing/Back/Satchels/atmospherics.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml index ae7e5bcf762..9ae6100771a 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml @@ -56,6 +56,6 @@ - CrateHydroponicsSeeds chance: 0.7 rarePrototypes: - - CrateMaterialPlasma + - CrateMaterialPhoron - CrateHydroponicsSeedsExotic rareChance: 0.1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml index 34bf32d8d7b..1cb0863ebdc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml @@ -51,7 +51,7 @@ state: blue - type: RandomSpawner rarePrototypes: - - PlasmaCanister + - PhoronCanister rareChance: 0.03 prototypes: - AirCanister diff --git a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml index a5e91e6e536..a6f37d373ac 100644 --- a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml +++ b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml @@ -50,9 +50,9 @@ mode: 3 - type: entity - name: Atmos Fix Plasma Marker - id: AtmosFixPlasmaMarker - description: "Plasma @ gas miner pressure, T20C" + name: Atmos Fix Phoron Marker + id: AtmosFixPhoronMarker + description: "Phoron @ gas miner pressure, T20C" parent: MarkerBase components: - type: Sprite @@ -62,14 +62,14 @@ shader: unshaded - sprite: Markers/atmos.rsi shader: unshaded # } - state: plasma + state: phoron - type: AtmosFixMarker mode: 4 - type: entity - name: Atmos Fix Instant Plasmafire Marker - id: AtmosFixInstantPlasmaFireMarker - description: "INSTANT PLASMAFIRE" + name: Atmos Fix Instant Phoronfire Marker + id: AtmosFixInstantPhoronFireMarker + description: "INSTANT PHORONFIRE" parent: MarkerBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml index c1d5df24633..824f728d143 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml @@ -108,13 +108,13 @@ state: oakworm - type: marking - id: MothAntennasPlasmafire + id: MothAntennasPhoronfire bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_antennas.rsi - state: plasmafire + state: phoronfire - type: marking id: MothAntennasMaple @@ -308,15 +308,15 @@ state: oakworm - type: marking - id: MothWingsPlasmafire + id: MothWingsPhoronfire bodyPart: Tail markingCategory: Tail speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: plasmafire_primary + state: phoronfire_primary - sprite: Mobs/Customization/Moth/moth_wings.rsi - state: plasmafire_secondary + state: phoronfire_secondary - type: marking id: MothWingsPointy diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml index 659cbaa28a2..5a509990701 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -383,7 +383,7 @@ - type: entity id: CigaretteWeldingFuel parent: SoakedCigarette - name: Plasma Sauce + name: Phoron Sauce components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index c2a1fe6e7dc..f83cef92ce1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -190,7 +190,7 @@ - type: MachineBoard prototype: ResearchAndDevelopmentServer materialRequirements: - Plasma: 5 + Phoron: 5 - type: entity id: UniformPrinterMachineCircuitboard @@ -328,7 +328,7 @@ Capacitor: 3 materialRequirements: Cable: 1 - PlasmaGlass: 10 + PhoronGlass: 10 - type: ReverseEngineering # Nyano difficulty: 2 recipes: @@ -348,7 +348,7 @@ Capacitor: 3 materialRequirements: Cable: 5 - PlasmaGlass: 15 + PhoronGlass: 15 MetalRod: 4 - type: entity @@ -365,7 +365,7 @@ Manipulator: 2 Capacitor: 5 materialRequirements: - PlasmaGlass: 5 + PhoronGlass: 5 Cable: 5 - type: entity @@ -446,7 +446,7 @@ MatterBin: 2 Capacitor: 2 materialRequirements: - Plasma: 1 + Phoron: 1 - type: Construction deconstructionTarget: null graph: ThermomachineBoard @@ -466,7 +466,7 @@ MatterBin: 2 Capacitor: 2 materialRequirements: - Plasma: 1 + Phoron: 1 - type: Construction graph: ThermomachineBoard deconstructionTarget: null @@ -920,7 +920,7 @@ - type: ReverseEngineering # Nyano difficulty: 2 recipes: - - GeneratorPlasmaMachineCircuitboard + - GeneratorPhoronMachineCircuitboard - type: PhysicalComposition materialComposition: Glass: 200 @@ -1304,7 +1304,7 @@ Manipulator: 1 materialRequirements: Steel: 10 - Plasma: 5 + Phoron: 5 - type: ReverseEngineering # Nyano difficulty: 2 recipes: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index d270c93e50a..f444bfc8d34 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -144,7 +144,7 @@ parent: EncryptionKey id: EncryptionKeyScience name: epistemics encryption key # DeltaV - Epistemics Department replacing Science - description: An encryption key used by scientists. Maybe it is plasmaproof? + description: An encryption key used by scientists. Maybe it is phoronproof? components: - type: EncryptionKey channels: diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 706cbd5dbbf..875757a6f26 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -767,7 +767,7 @@ parent: BasePDA id: AtmosPDA name: atmos PDA - description: Still smells like plasma. + description: Still smells like phoron. components: - type: Pda id: AtmosIDCard diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index 59d8ed19220..11a31eecff7 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -200,15 +200,15 @@ - type: entity parent: SheetGlassBase id: SheetPGlass - name: plasma glass - description: A sheet of translucent plasma. + name: phoron glass + description: A sheet of translucent phoron. suffix: Full components: - type: PhysicalComposition materialComposition: - PlasmaGlass: 100 + PhoronGlass: 100 - type: Stack - stackType: PlasmaGlass + stackType: PhoronGlass baseLayer: base layerStates: - pglass @@ -243,7 +243,7 @@ volume: -4 - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 1 - !type:DoActsBehavior @@ -252,13 +252,13 @@ - type: entity parent: SheetPGlass id: SheetPGlass1 - name: plasma glass + name: phoron glass suffix: Single components: - type: Sprite state: pglass - type: Stack - stackType: PlasmaGlass + stackType: PhoronGlass count: 1 - type: Extractable grindableSolutionName: pglass @@ -268,22 +268,22 @@ reagents: - ReagentId: Silicon Quantity: 10 - - ReagentId: Plasma + - ReagentId: Phoron Quantity: 10 canReact: false - type: entity parent: SheetPGlass id: SheetRPGlass - name: reinforced plasma glass - description: A reinforced sheet of translucent plasma. + name: reinforced phoron glass + description: A reinforced sheet of translucent phoron. suffix: Full components: - type: PhysicalComposition materialComposition: - ReinforcedPlasmaGlass: 100 + ReinforcedPhoronGlass: 100 - type: Stack - stackType: ReinforcedPlasmaGlass + stackType: ReinforcedPhoronGlass baseLayer: base layerStates: - rpglass @@ -307,7 +307,7 @@ reagents: - ReagentId: Silicon Quantity: 10 - - ReagentId: Plasma + - ReagentId: Phoron Quantity: 10 - ReagentId: Iron Quantity: 4.5 @@ -318,13 +318,13 @@ - type: entity parent: SheetRPGlass id: SheetRPGlass1 - name: reinforced plasma glass + name: reinforced phoron glass suffix: Single components: - type: Sprite state: rpglass - type: Stack - stackType: ReinforcedPlasmaGlass + stackType: ReinforcedPhoronGlass count: 1 - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index 82b9f62837a..8337fa27b92 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -198,7 +198,7 @@ solutions: plasteel: reagents: - - ReagentId: Plasma + - ReagentId: Phoron Quantity: 10 - ReagentId: Iron Quantity: 9 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index dfb51336289..b2a150bb72e 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -75,36 +75,36 @@ - type: entity parent: SheetOtherBase - id: SheetPlasma - name: plasma + id: SheetPhoron + name: phoron suffix: Full components: - type: Material - type: PhysicalComposition materialComposition: - Plasma: 100 + Phoron: 100 - type: Stack - stackType: Plasma + stackType: Phoron baseLayer: base layerStates: - - plasma - - plasma_2 - - plasma_3 + - phoron + - phoron_2 + - phoron_3 - type: Sprite - state: plasma_3 + state: phoron_3 layers: - - state: plasma_3 + - state: phoron_3 map: ["base"] - type: Item - heldPrefix: plasma + heldPrefix: phoron - type: Appearance - type: Extractable - grindableSolutionName: plasma + grindableSolutionName: phoron - type: SolutionContainerManager solutions: - plasma: + phoron: reagents: - - ReagentId: Plasma + - ReagentId: Phoron Quantity: 10 canReact: false - type: Tag @@ -112,13 +112,13 @@ - Sheet - type: entity - parent: SheetPlasma - id: SheetPlasma1 - name: plasma + parent: SheetPhoron + id: SheetPhoron1 + name: phoron suffix: Single components: - type: Sprite - state: plasma + state: phoron - type: Stack count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml index bf7dbfad5a3..fa19782a649 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml @@ -99,35 +99,35 @@ - type: entity parent: OreBase - id: PlasmaOre - name: plasma ore + id: PhoronOre + name: phoron ore suffix: Full components: - type: Stack - stackType: PlasmaOre + stackType: PhoronOre - type: Sprite - state: plasma + state: phoron - type: Material - type: PhysicalComposition materialComposition: - RawPlasma: 500 + RawPhoron: 500 - type: PointLight radius: 1.2 energy: 0.6 castShadows: false color: "#e592e7" - type: Extractable - grindableSolutionName: plasmaore + grindableSolutionName: phoronore - type: SolutionContainerManager solutions: - plasmaore: + phoronore: reagents: - - ReagentId: Plasma + - ReagentId: Phoron Quantity: 10 - type: entity - parent: PlasmaOre - id: PlasmaOre1 + parent: PhoronOre + id: PhoronOre1 suffix: Single components: - type: Stack diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index f94f0a7e0eb..366b52368dd 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -143,23 +143,23 @@ - type: entity parent: ShardBase - id: ShardGlassPlasma - name: plasma glass shard - description: A small piece of plasma glass. + id: ShardGlassPhoron + name: phoron glass shard + description: A small piece of phoron glass. components: - type: Sprite color: "#FF72E7" - type: WelderRefinable refineResult: - SheetGlass1 - - SheetPlasma1 + - SheetPhoron1 - type: DamageUserOnTrigger damage: types: Piercing: 5 - type: Tag tags: - - PlasmaGlassShard + - PhoronGlassShard - Trash - type: Extractable grindableSolutionName: shardpglass @@ -169,10 +169,10 @@ reagents: - ReagentId: Silicon Quantity: 5 - - ReagentId: Plasma + - ReagentId: Phoron Quantity: 5 - type: Construction - graph: PlasmaShivConstruct + graph: PhoronShivConstruct node: start - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index 5678de6bafc..9801190c2ac 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -77,7 +77,7 @@ name: soap id: SoapNT parent: Soap - description: A Nanotrasen brand bar of soap. Smells of plasma. + description: A Nanotrasen brand bar of soap. Smells of phoron. components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 0e132541e1e..9c3a066874a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -10,7 +10,7 @@ # everything except oxygen and nitrogen gases: - CarbonDioxide - - Plasma + - Phoron - Tritium - WaterVapor - Ammonia @@ -21,7 +21,7 @@ overflowGases: - Nitrogen - CarbonDioxide - - Plasma + - Phoron - Tritium - WaterVapor - Ammonia diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 2f281e141a1..c078ac10d8b 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -226,15 +226,15 @@ - type: entity # it's a square so no rolling dough parent: GasTankBase - id: PlasmaTank - name: plasma tank - description: Contains dangerous plasma. Do not inhale. Extremely flammable. + id: PhoronTank + name: phoron tank + description: Contains dangerous phoron. Do not inhale. Extremely flammable. components: - type: Sprite - sprite: Objects/Tanks/plasma.rsi + sprite: Objects/Tanks/phoron.rsi - type: Item - sprite: Objects/Tanks/plasma.rsi + sprite: Objects/Tanks/phoron.rsi - type: GasTank outputPressure: 101.3 - type: Clothing - sprite: Objects/Tanks/plasma.rsi + sprite: Objects/Tanks/phoron.rsi diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index e8601fcf355..18c151280cd 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -57,7 +57,7 @@ name: match box parent: [ SmallboxItem, BaseBagOpenClose ] id: Matchbox - description: A small box of Almost But Not Quite Plasma Premium Matches. + description: A small box of Almost But Not Quite Phoron Premium Matches. components: - type: EmitSoundOnLand sound: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index bc376df5eab..1576edea8de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -2,7 +2,7 @@ name: energy sword parent: BaseItem id: EnergySword - description: A very loud & dangerous sword with a beam made of pure, concentrated plasma. Cuts through unarmored targets like butter. + description: A very loud & dangerous sword with a beam made of pure, concentrated phoron. Cuts through unarmored targets like butter. components: - type: EnergySword - type: ItemToggle @@ -181,7 +181,7 @@ name: energy cutlass parent: EnergySword id: EnergyCutlass - description: An exotic energy weapon, brutal blade crackling with crudely harnessed plasma. #DeltaV - nicer description. + description: An exotic energy weapon, brutal blade crackling with crudely harnessed phoron. #DeltaV - nicer description. components: - type: EnergySword - type: ItemToggleMeleeWeapon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index b5d597715aa..39f70ee9e6a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -215,13 +215,13 @@ sprite: Objects/Weapons/Melee/reinforced_shiv.rsi - type: entity - name: plasma shiv + name: phoron shiv parent: Shiv - id: PlasmaShiv - description: A crude weapon fashioned from a piece of cloth and a plasma glass shard. + id: PhoronShiv + description: A crude weapon fashioned from a piece of cloth and a phoron glass shard. components: - type: Construction - graph: PlasmaShiv + graph: PhoronShiv node: icon - type: MeleeWeapon attackRate: 1.5 @@ -229,9 +229,9 @@ types: Slash: 9 - type: Item - sprite: Objects/Weapons/Melee/plasma_shiv.rsi + sprite: Objects/Weapons/Melee/phoron_shiv.rsi - type: Sprite - sprite: Objects/Weapons/Melee/plasma_shiv.rsi + sprite: Objects/Weapons/Melee/phoron_shiv.rsi - type: entity name: uranium shiv diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index eee65a1ca78..6cdd99c0210 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -31,7 +31,7 @@ groups: Brute: -10 - type: Gun - soundGunshot: /Audio/Weapons/plasma_cutter.ogg + soundGunshot: /Audio/Weapons/phoron_cutter.ogg fireRate: 1 useKey: false - type: RechargeBasicEntityAmmo diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 279fed80433..06d43c91daa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -133,13 +133,13 @@ graph: SpearReinforced - type: entity - name: plasma spear + name: phoron spear parent: Spear - id: SpearPlasma - description: A spear with a plasma shard as a tip. + id: SpearPhoron + description: A spear with a phoron shard as a tip. components: - type: Sprite - sprite: Objects/Weapons/Melee/plasma_spear.rsi + sprite: Objects/Weapons/Melee/phoron_spear.rsi - type: MeleeWeapon wideAnimationRotation: -135 damage: @@ -150,7 +150,7 @@ types: Piercing: 21 - type: Construction - graph: SpearPlasma + graph: SpearPhoron - type: entity name: uranium spear diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index d3b8521a9bc..5552a0933b9 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -134,13 +134,13 @@ node: paperDoor - type: entity - id: PlasmaDoor - name: plasma door + id: PhoronDoor + name: phoron door parent: BaseMaterialDoorNavMap description: A door, where will it lead? components: - type: Sprite - sprite: Structures/Doors/MineralDoors/plasma_door.rsi + sprite: Structures/Doors/MineralDoors/phoron_door.rsi layers: - state: closed map: ["enum.DoorVisualLayers.Base"] @@ -157,7 +157,7 @@ acts: ["Destruction"] - type: Construction graph: DoorGraph - node: plasmaDoor + node: phoronDoor - type: entity id: GoldDoor diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml index 8d9cedac03a..eaefc68127d 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml @@ -100,15 +100,15 @@ graph: Windoor node: assemblyClockwork -#plasma windoor assemblies +#phoron windoor assemblies - type: entity - id: WindoorAssemblyPlasma - name: Plasma windoor assembly + id: WindoorAssemblyPhoron + name: Phoron windoor assembly description: It opens, it closes, and you can see through it! This one looks purp-, no, pink. Wait... parent: WindoorAssembly components: - type: Sprite - sprite: Structures/Doors/Windoors/plasma.rsi + sprite: Structures/Doors/Windoors/phoron.rsi layers: - state: assembly - type: Destructible @@ -132,13 +132,13 @@ node: pglass - type: entity - id: WindoorAssemblySecurePlasma - name: Secure Plasma windoor assembly + id: WindoorAssemblySecurePhoron + name: Secure Phoron windoor assembly description: It opens, it closes, and you can see through it! This one looks strong and pin-, no, purple. Hold on... parent: WindoorAssembly components: - type: Sprite - sprite: Structures/Doors/Windoors/plasma.rsi + sprite: Structures/Doors/Windoors/phoron.rsi layers: - state: secure_underlay - state: assembly diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 56167c178e2..8f242195038 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -196,14 +196,14 @@ - type: StaticPrice price: 200 -#Plasma Windoors +#Phoron Windoors - type: entity - id: BasePlasmaWindoor + id: BasePhoronWindoor parent: BaseWindoor abstract: true components: - type: Sprite - sprite: Structures/Doors/Windoors/plasma.rsi + sprite: Structures/Doors/Windoors/phoron.rsi layers: - state: closed map: [ "enum.DoorVisualLayers.Base" ] @@ -235,7 +235,7 @@ behaviors: - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 2 SheetSteel1: @@ -252,12 +252,12 @@ resistance: 2 - type: entity - id: BaseSecurePlasmaWindoor + id: BaseSecurePhoronWindoor parent: BaseWindoor abstract: true components: - type: Sprite - sprite: Structures/Doors/Windoors/plasma.rsi + sprite: Structures/Doors/Windoors/phoron.rsi layers: - state: secure_underlay - state: closed @@ -290,7 +290,7 @@ behaviors: - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 2 SheetPlasteel1: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 2b4b2c5fe07..b81834c3ae4 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -17,15 +17,15 @@ description: It's a sturdy window and a sliding door. Wow! - type: entity - id: WindoorPlasma - parent: BasePlasmaWindoor - name: Plasma Windoor + id: WindoorPhoron + parent: BasePhoronWindoor + name: Phoron Windoor description: It's a pink window *and* a sliding door. Amazing! - type: entity - id: WindoorSecurePlasma - parent: BaseSecurePlasmaWindoor - name: Secure Plasma Windoor + id: WindoorSecurePhoron + parent: BaseSecurePhoronWindoor + name: Secure Phoron Windoor description: It's a sturdy purple window *and* a sliding door. Spectacular! - type: entity @@ -92,9 +92,9 @@ access: [["Janitor"]] - type: entity - parent: WindoorPlasma - id: PlasmaWindoorJanitorLocked - suffix: Janitor, Locked, Plasma + parent: WindoorPhoron + id: PhoronWindoorJanitorLocked + suffix: Janitor, Locked, Phoron components: - type: AccessReader access: [["Janitor"]] @@ -191,9 +191,9 @@ access: [["Chemistry"]] - type: entity - parent: WindoorSecurePlasma - id: PlasmaWindoorSecureChemistryLocked - suffix: Chemistry, Locked, Plasma + parent: WindoorSecurePhoron + id: PhoronWindoorSecureChemistryLocked + suffix: Chemistry, Locked, Phoron components: - type: AccessReader access: [["Chemistry"]] @@ -207,9 +207,9 @@ access: [["CentralCommand"]] - type: entity - parent: WindoorSecurePlasma - id: PlasmaWindoorSecureCentralCommandLocked - suffix: Central Command, Locked, Plasma + parent: WindoorSecurePhoron + id: PhoronWindoorSecureCentralCommandLocked + suffix: Central Command, Locked, Phoron components: - type: AccessReader access: [["CentralCommand"]] @@ -247,9 +247,9 @@ access: [["Engineering"]] - type: entity - parent: WindoorSecurePlasma - id: PlasmaWindoorSecureEngineeringLocked - suffix: Engineering, Locked, Plasma + parent: WindoorSecurePhoron + id: PhoronWindoorSecureEngineeringLocked + suffix: Engineering, Locked, Phoron components: - type: AccessReader access: [["Engineering"]] @@ -279,9 +279,9 @@ access: [["Janitor"]] - type: entity - parent: WindoorSecurePlasma - id: PlasmaWindoorSecureJanitorLocked - suffix: Janitor, Locked, Plasma + parent: WindoorSecurePhoron + id: PhoronWindoorSecureJanitorLocked + suffix: Janitor, Locked, Phoron components: - type: AccessReader access: [["Janitor"]] @@ -335,9 +335,9 @@ access: [["Research"]] - type: entity - parent: WindoorSecurePlasma - id: PlasmaWindoorSecureScienceLocked - suffix: Science, Locked, Plasma + parent: WindoorSecurePhoron + id: PhoronWindoorSecureScienceLocked + suffix: Science, Locked, Phoron components: - type: AccessReader access: [["Research"]] diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index e424b1b40b4..69b0909126d 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -349,15 +349,15 @@ collection: FootstepTile - type: entity - id: TablePlasmaGlass + id: TablePhoronGlass parent: TableBase - name: plasma glass table - description: A square piece of plasma glass, standing on four metal legs. Pretty! + name: phoron glass table + description: A square piece of phoron glass, standing on four metal legs. Pretty! components: - type: Sprite - sprite: Structures/Furniture/Tables/plasma.rsi + sprite: Structures/Furniture/Tables/phoron.rsi - type: Icon - sprite: Structures/Furniture/Tables/plasma.rsi + sprite: Structures/Furniture/Tables/phoron.rsi - type: GlassTable climberDamage: types: @@ -388,7 +388,7 @@ node: TableFrame - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 1 PartRodMetal1: @@ -398,7 +398,7 @@ acts: [ "Destruction" ] - type: Construction graph: Table - node: TablePlasmaGlass + node: TablePhoronGlass - type: FootstepModifier footstepSoundCollection: collection: FootstepTile diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml index cc9f8035fe7..c3aa1b42c47 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml @@ -268,7 +268,7 @@ tags: - Sheet materialWhiteList: - - Plasma + - Phoron - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 02eeca1dd19..bfb15f87b33 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1173,7 +1173,7 @@ - SheetSteel30 - SheetGlass30 - SheetRGlass30 - - SheetPlasma30 + - SheetPhoron30 - SheetPGlass30 - SheetRPGlass30 - SheetUranium30 @@ -1198,7 +1198,7 @@ - SheetSteel30 - SheetGlass30 - SheetRGlass30 - - SheetPlasma30 + - SheetPhoron30 - SheetPGlass30 - SheetRPGlass30 - SheetPlasteel30 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 4c2217e6ff4..7439c09d21f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1948,7 +1948,7 @@ - type: entity parent: VendingMachine id: VendingMachineTankDispenserEngineering - suffix: ENG [O2, Plasma] + suffix: ENG [O2, Phoron] name: gas tank dispenser description: A vendor for dispensing gas tanks. This one has an engineering livery. components: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 2231fc4ddc1..1ee4be06166 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml @@ -101,14 +101,14 @@ spawnGas: CarbonDioxide - type: entity - name: plasma gas miner + name: phoron gas miner parent: GasMinerBase - id: GasMinerPlasma + id: GasMinerPhoron placement: mode: SnapgridCenter components: - type: GasMiner - spawnGas: Plasma + spawnGas: Phoron - type: entity name: tritium gas miner diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index c2f8fa339da..f0aa237ea7e 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -47,7 +47,7 @@ Oxygen: stationOxygen Nitrogen: ignore CarbonDioxide: stationCO2 - Plasma: stationPlasma # everything below is usually bad + Phoron: stationPhoron # everything below is usually bad Tritium: danger WaterVapor: stationWaterVapor Ammonia: stationAmmonia @@ -138,7 +138,7 @@ Oxygen: stationOxygen Nitrogen: ignore CarbonDioxide: stationCO2 - Plasma: stationPlasma # everything below is usually bad + Phoron: stationPhoron # everything below is usually bad Tritium: danger WaterVapor: stationWaterVapor Ammonia: stationAmmonia diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml index 3742c037ff5..3bf902851e2 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml @@ -2,7 +2,7 @@ id: RadiationCollector name: radiation collector suffix: Empty tank - description: A machine that collects radiation and turns it into power. Requires plasma gas to function. + description: A machine that collects radiation and turns it into power. Requires phoron gas to function. placement: mode: SnapgridCenter components: @@ -59,7 +59,7 @@ - type: RadiationCollector chargeModifier: 7500 radiationReactiveGases: - - reactantPrototype: Plasma + - reactantPrototype: Phoron powerGenerationEfficiency: 1 reactantBreakdownRate: 0.0001 - type: RadiationReceiver @@ -75,7 +75,7 @@ - type: ItemSlots slots: gas_tank: - startingItem: PlasmaTank + startingItem: PhoronTank whitelist: components: - GasTank @@ -102,7 +102,7 @@ - type: ItemSlots slots: gas_tank: - startingItem: PlasmaTankFilled + startingItem: PhoronTankFilled whitelist: components: - GasTank diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml index b606c01f1dd..87e1102b8e6 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml @@ -132,10 +132,10 @@ name: P.A.C.M.A.N.-type portable generator description: |- A flexible backup generator for powering a variety of equipment. - Runs off solid plasma sheets and is rated for up to 30 kW. + Runs off solid phoron sheets and is rated for up to 30 kW. parent: PortableGeneratorSwitchableBase id: PortableGeneratorPacman - suffix: Plasma, 30 kW + suffix: Phoron, 30 kW components: - type: Sprite layers: @@ -167,16 +167,16 @@ # a decent curve that goes up to about an hour at 5 kW. fuelEfficiencyConstant: 0.75 - type: SolidFuelGeneratorAdapter - fuelMaterial: Plasma + fuelMaterial: Phoron multiplier: 0.01 - type: MaterialStorage storageLimit: 3000 - materialWhiteList: [Plasma] + materialWhiteList: [Phoron] - type: PortableGenerator startChance: 0.8 - type: GeneratorExhaustGas gasType: CarbonDioxide - # 2 moles of gas for every sheet of plasma. + # 2 moles of gas for every sheet of phoron. moleRatio: 2 - type: PowerMonitoringDevice group: Generator diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml index 2df48a584cd..3ee03dc2500 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml @@ -52,7 +52,7 @@ Oxygen: stationOxygen Nitrogen: ignore CarbonDioxide: stationCO2 - Plasma: stationPlasma # everything below is usually bad + Phoron: stationPhoron # everything below is usually bad Tritium: danger WaterVapor: stationWaterVapor Ammonia: stationAmmonia diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 897b7be6ffb..247e38e8b1d 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -120,7 +120,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Plasma + - 0 # Phoron - 0 # Tritium - 0 # Water vapor - 0 # Ammonia @@ -365,9 +365,9 @@ - type: entity parent: GasCanister - id: PlasmaCanister - name: plasma canister - description: A canister that can contain any type of gas. This one is supposed to contain plasma. It can be attached to connector ports using a wrench. + id: PhoronCanister + name: phoron canister + description: A canister that can contain any type of gas. This one is supposed to contain phoron. It can be attached to connector ports using a wrench. components: - type: Sprite layers: @@ -379,7 +379,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # carbon dioxide - - 1871.71051 # plasma + - 1871.71051 # phoron temperature: 293.15 - type: Destructible thresholds: @@ -398,7 +398,7 @@ collection: MetalBreak - !type:SpawnEntitiesBehavior spawn: - PlasmaCanisterBroken: + PhoronCanisterBroken: min: 1 max: 1 - !type:DoActsBehavior @@ -423,7 +423,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Plasma + - 0 # Phoron - 1871.71051 # Tritium temperature: 293.15 - type: Destructible @@ -468,7 +468,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Plasma + - 0 # Phoron - 0 # Tritium - 1871.71051 # Water vapor temperature: 293.15 @@ -512,7 +512,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Plasma + - 0 # Phoron - 0 # Tritium - 0 # Water vapor - 1871.71051 # Ammonia @@ -559,7 +559,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Plasma + - 0 # Phoron - 0 # Tritium - 0 # Water vapor - 0 # Ammonia @@ -605,7 +605,7 @@ - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 0 # Plasma + - 0 # Phoron - 0 # Tritium - 0 # Water vapor - 0 # Ammonia @@ -736,7 +736,7 @@ - type: entity parent: GasCanisterBrokenBase - id: PlasmaCanisterBroken + id: PhoronCanisterBroken noSpawn: true components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index b854fb2fc65..535aab6c715 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -239,13 +239,13 @@ - type: entity parent: CrateBaseSecure - id: CratePlasma - name: plasma crate + id: CratePhoron + name: phoron crate components: - type: Icon - sprite: Structures/Storage/Crates/plasma.rsi + sprite: Structures/Storage/Crates/phoron.rsi - type: Sprite - sprite: Structures/Storage/Crates/plasma.rsi + sprite: Structures/Storage/Crates/phoron.rsi - type: AccessReader access: [["Engineering"], ["Research"], ["Chemistry"]] diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index ceb9f94b580..1488bbeed14 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1173,12 +1173,12 @@ - type: entity parent: BaseSign - id: WarningPlasma - name: plasma waste sign - description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working. + id: WarningPhoron + name: phoron waste sign + description: WARNING! Phoron flow tube. Ensure the flow is disengaged before working. components: - type: Sprite - state: atmos_plasma + state: atmos_phoron - type: entity parent: BaseSign diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index d1a6587d199..0e0cc26a921 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -92,14 +92,14 @@ - state: rock_gold - type: entity - id: AsteroidRockPlasma + id: AsteroidRockPhoron parent: AsteroidRock - description: An ore vein rich with plasma. - suffix: Plasma + description: An ore vein rich with phoron. + suffix: Phoron components: - type: OreVein oreChance: 1.0 - currentOre: OrePlasma + currentOre: OrePhoron - type: Sprite layers: - state: rock_asteroid @@ -455,14 +455,14 @@ - state: rock_gold - type: entity - id: WallRockPlasma + id: WallRockPhoron parent: WallRock - description: An ore vein rich with plasma. - suffix: Plasma + description: An ore vein rich with phoron. + suffix: Phoron components: - type: OreVein oreChance: 1.0 - currentOre: OrePlasma + currentOre: OrePhoron - type: Sprite layers: - state: rock @@ -699,14 +699,14 @@ - state: rock_gold - type: entity - id: WallRockBasaltPlasma + id: WallRockBasaltPhoron parent: WallRockBasalt - description: An ore vein rich with plasma. - suffix: Plasma + description: An ore vein rich with phoron. + suffix: Phoron components: - type: OreVein oreChance: 1.0 - currentOre: OrePlasma + currentOre: OrePhoron - type: Sprite layers: - state: rock_wall @@ -942,14 +942,14 @@ - state: rock_gold - type: entity - id: WallRockSnowPlasma + id: WallRockSnowPhoron parent: WallRockSnow - description: An ore vein rich with plasma. - suffix: Plasma + description: An ore vein rich with phoron. + suffix: Phoron components: - type: OreVein oreChance: 1.0 - currentOre: OrePlasma + currentOre: OrePhoron - type: Sprite layers: - state: rock_snow @@ -1185,14 +1185,14 @@ - state: rock_gold - type: entity - id: WallRockSandPlasma + id: WallRockSandPhoron parent: WallRockSand - description: An ore vein rich with plasma. - suffix: Plasma + description: An ore vein rich with phoron. + suffix: Phoron components: - type: OreVein oreChance: 1.0 - currentOre: OrePlasma + currentOre: OrePhoron - type: Sprite layers: - state: rock_sand @@ -1428,14 +1428,14 @@ - state: rock_gold - type: entity - id: WallRockChromitePlasma + id: WallRockChromitePhoron parent: WallRockChromite - description: An ore vein rich with plasma. - suffix: Plasma + description: An ore vein rich with phoron. + suffix: Phoron components: - type: OreVein oreChance: 1.0 - currentOre: OrePlasma + currentOre: OrePhoron - type: Sprite layers: - state: rock_chromite @@ -1671,14 +1671,14 @@ - state: rock_gold - type: entity - id: WallRockAndesitePlasma + id: WallRockAndesitePhoron parent: WallRockAndesite - description: An ore vein rich with plasma. - suffix: Plasma + description: An ore vein rich with phoron. + suffix: Phoron components: - type: OreVein oreChance: 1.0 - currentOre: OrePlasma + currentOre: OrePhoron - type: Sprite layers: - state: rock_andesite diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index a6b6b02361e..926a42c49d1 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -348,20 +348,20 @@ - type: entity parent: BaseWall - id: WallPlasma - name: plasma wall + id: WallPhoron + name: phoron wall components: - type: Tag tags: - Wall - RCDDeconstructWhitelist - type: Sprite - sprite: Structures/Walls/plasma.rsi + sprite: Structures/Walls/phoron.rsi - type: Icon - sprite: Structures/Walls/plasma.rsi + sprite: Structures/Walls/phoron.rsi - type: Construction graph: Girder - node: plasmaWall + node: phoronWall - type: Destructible thresholds: - trigger: @@ -386,7 +386,7 @@ acts: ["Destruction"] - type: IconSmooth key: walls - base: plasma + base: phoron - type: RadiationBlocker resistance: 5 diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/phoron.yml similarity index 83% rename from Resources/Prototypes/Entities/Structures/Windows/plasma.yml rename to Resources/Prototypes/Entities/Structures/Windows/phoron.yml index 5503ea856c8..5045fa05514 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/phoron.yml @@ -1,13 +1,13 @@ - type: entity - id: PlasmaWindow - name: plasma window + id: PhoronWindow + name: phoron window parent: Window components: - type: Sprite drawdepth: WallTops - sprite: Structures/Windows/plasma_window.rsi + sprite: Structures/Windows/phoron_window.rsi - type: Icon - sprite: Structures/Windows/plasma_window.rsi + sprite: Structures/Windows/phoron_window.rsi - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass @@ -31,7 +31,7 @@ collection: WindowShatter - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 2 - !type:DoActsBehavior @@ -40,7 +40,7 @@ base: pwindow - type: Construction graph: Window - node: plasmaWindow + node: phoronWindow - type: Appearance - type: DamageVisuals thresholds: [4, 8, 12] @@ -54,9 +54,9 @@ resistance: 2 - type: entity - id: PlasmaWindowDirectional + id: PhoronWindowDirectional parent: WindowDirectional - name: directional plasma window + name: directional phoron window description: Don't smudge up the glass down there. placement: mode: SnapgridCenter @@ -65,13 +65,13 @@ components: - type: Sprite sprite: Structures/Windows/directional.rsi - state: plasma_window + state: phoron_window - type: Icon sprite: Structures/Windows/directional.rsi - state: plasma_window + state: phoron_window - type: Construction graph: WindowDirectional - node: plasmaWindowDirectional + node: phoronWindowDirectional - type: Appearance - type: DamageVisuals thresholds: [4, 8, 12] @@ -90,7 +90,7 @@ collection: WindowShatter - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 1 - !type:DoActsBehavior @@ -99,8 +99,8 @@ price: 30 - type: entity - parent: PlasmaWindow - id: PlasmaWindowDiagonal + parent: PhoronWindow + id: PhoronWindowDiagonal suffix: diagonal placement: mode: SnapgridCenter @@ -109,14 +109,14 @@ components: - type: Sprite drawdepth: WallTops - sprite: Structures/Windows/plasma_diagonal.rsi + sprite: Structures/Windows/phoron_diagonal.rsi state: state0 - type: IconSmooth mode: Diagonal key: windows base: state - type: Icon - sprite: Structures/Windows/plasma_diagonal.rsi + sprite: Structures/Windows/phoron_diagonal.rsi state: state0 - type: Fixtures fixtures: @@ -136,4 +136,4 @@ sprite: Structures/Windows/cracks_diagonal.rsi - type: Construction graph: WindowDiagonal - node: plasmaWindowDiagonal + node: phoronWindowDiagonal diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml index 9281e0c7ff9..66b5ce03297 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml @@ -1,13 +1,13 @@ - type: entity - id: ReinforcedPlasmaWindow - name: reinforced plasma window + id: ReinforcedPhoronWindow + name: reinforced phoron window parent: Window components: - type: Sprite drawdepth: WallTops - sprite: Structures/Windows/reinforced_plasma_window.rsi + sprite: Structures/Windows/reinforced_phoron_window.rsi - type: Icon - sprite: Structures/Windows/reinforced_plasma_window.rsi + sprite: Structures/Windows/reinforced_phoron_window.rsi - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass @@ -33,7 +33,7 @@ collection: WindowShatter - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 2 PartRodMetal: @@ -45,7 +45,7 @@ base: rpwindow - type: Construction graph: Window - node: reinforcedPlasmaWindow + node: reinforcedPhoronWindow - type: Appearance - type: DamageVisuals thresholds: [4, 8, 12] @@ -57,9 +57,9 @@ price: 132 - type: entity - id: PlasmaReinforcedWindowDirectional + id: PhoronReinforcedWindowDirectional parent: WindowDirectional - name: directional reinforced plasma window + name: directional reinforced phoron window description: Don't smudge up the glass down there. placement: mode: SnapgridCenter @@ -68,13 +68,13 @@ components: - type: Sprite sprite: Structures/Windows/directional.rsi - state: plasma_reinforced_window + state: phoron_reinforced_window - type: Icon sprite: Structures/Windows/directional.rsi - state: plasma_reinforced_window + state: phoron_reinforced_window - type: Construction graph: WindowDirectional - node: plasmaReinforcedWindowDirectional + node: phoronReinforcedWindowDirectional - type: Appearance - type: DamageVisuals thresholds: [4, 8, 12] @@ -99,7 +99,7 @@ collection: WindowShatter - !type:SpawnEntitiesBehavior spawn: - ShardGlassPlasma: + ShardGlassPhoron: min: 1 max: 1 PartRodMetal: @@ -111,8 +111,8 @@ price: 66 - type: entity - parent: ReinforcedPlasmaWindow - id: ReinforcedPlasmaWindowDiagonal + parent: ReinforcedPhoronWindow + id: ReinforcedPhoronWindowDiagonal suffix: diagonal placement: mode: SnapgridCenter @@ -121,14 +121,14 @@ components: - type: Sprite drawdepth: WallTops - sprite: Structures/Windows/reinforced_plasma_diagonal.rsi + sprite: Structures/Windows/reinforced_phoron_diagonal.rsi state: state0 - type: IconSmooth mode: Diagonal key: windows base: state - type: Icon - sprite: Structures/Windows/reinforced_plasma_diagonal.rsi + sprite: Structures/Windows/reinforced_phoron_diagonal.rsi state: state0 - type: Fixtures fixtures: @@ -148,4 +148,4 @@ sprite: Structures/Windows/cracks_diagonal.rsi - type: Construction graph: WindowDiagonal - node: reinforcedPlasmaWindowDiagonal + node: reinforcedPhoronWindowDiagonal diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_phoron.yml similarity index 82% rename from Resources/Prototypes/Entities/Tiles/liquid_plasma.yml rename to Resources/Prototypes/Entities/Tiles/liquid_phoron.yml index 08f46538631..d61ca11d852 100644 --- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml +++ b/Resources/Prototypes/Entities/Tiles/liquid_phoron.yml @@ -1,6 +1,6 @@ - type: entity - id: FloorLiquidPlasmaEntity - name: liquid plasma + id: FloorLiquidPhoronEntity + name: liquid phoron description: Sweet, expensive nectar. Don't consume. placement: mode: SnapgridCenter @@ -20,17 +20,17 @@ - type: SyncSprite - type: Clickable - type: Sprite - sprite: Tiles/Planet/liquid_plasma.rsi + sprite: Tiles/Planet/liquid_phoron.rsi drawdepth: BelowFloor layers: - - state: plasma + - state: phoron shader: unshaded - type: Icon - sprite: Tiles/Planet/liquid_plasma.rsi + sprite: Tiles/Planet/liquid_phoron.rsi state: full - type: IconSmooth key: floor - base: plasma + base: phoron - type: Physics bodyType: Static - type: Fixtures diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml index 061288d010b..f4fb1b7c6ac 100644 --- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml +++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml @@ -35,7 +35,7 @@ - id: WallRockSilver prob: 0.05 orGroup: rock - - id: WallRockPlasma + - id: WallRockPhoron prob: 0.05 orGroup: rock - id: WallRockUranium diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml index 91e40a8e607..8d0c29fae79 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml @@ -34,7 +34,7 @@ - PartRodMetal1 - ShardGlass - ShardGlassReinforced - - ShardGlassPlasma + - ShardGlassPhoron - ShardGlassUranium - MaterialCloth1 - MaterialDurathread1 @@ -158,12 +158,12 @@ - GoldOre1 - SilverOre1 - SteelOre1 - - PlasmaOre1 + - PhoronOre1 - SpaceQuartz1 - UraniumOre1 - BananiumOre1 - SheetUranium1 - - SheetPlasma1 + - SheetPhoron1 - SheetPlasteel1 - SheetPGlass1 - SheetUGlass1 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml index 0bed0b02b44..f313668e28f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml @@ -195,7 +195,7 @@ state: plain - type: marking - id: MothAntennasClassicPlasmafire + id: MothAntennasClassicPhoronfire bodyPart: HeadTop markingCategory: HeadTop forcedColoring: true @@ -207,7 +207,7 @@ color: "#FFFFFF" sprites: - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi - state: plasmafire + state: phoronfire - type: marking id: MothAntennasClassicPoison @@ -571,7 +571,7 @@ state: plain - type: marking - id: MothWingsClassicPlasmafire + id: MothWingsClassicPhoronfire bodyPart: Tail markingCategory: Tail forcedColoring: true @@ -583,7 +583,7 @@ color: "#FFFFFF" sprites: - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi - state: plasmafire + state: phoronfire - type: marking id: MothWingsClassicPoison diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml index 4e797272e5e..92195c4db67 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml @@ -58,12 +58,12 @@ - type: entity noSpawn: true parent: BaseMail - id: MailMedicalSheetPlasma - suffix: sheetplasma + id: MailMedicalSheetPhoron + suffix: sheetphoron components: - type: Mail contents: - - id: SheetPlasma1 + - id: SheetPhoron1 #- type: entity # noSpawn: true diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml index 7b80180526e..79637cad390 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml @@ -2,7 +2,7 @@ # parent: VendingMachine # id: VendingMachineMailDrobe # DeltaV - Replaced with the CourierDrobe # name: MailDrobe -# description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds. +# description: Neither solar flares nor meteors nor phoron fire nor void of space stays these couriers from the swift completion of their appointed rounds. # components: # - type: VendingMachine # pack: MailDrobeInventory diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml index f7086081c51..ebf2d9d04bc 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml @@ -249,7 +249,7 @@ parent: PosterBase id: PosterLegitSafetyMothFires name: Safety Moth - Fires - description: Safety Moth™ promotes safe handling of plasma and to keep firefighting equipment within hand reach. + description: Safety Moth™ promotes safe handling of phoron and to keep firefighting equipment within hand reach. components: - type: Sprite sprite: Nyanotrasen/Structures/Wallmounts/Posters/safetymoth.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml index 418864cd408..97424a905c0 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml @@ -41,7 +41,7 @@ materials: Steel: 100 Glass: 300 - Plasma: 200 + Phoron: 200 - type: latheRecipe id: DeepFryerMachineCircuitboard diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/psionic.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/psionic.yml index 304c9b686a4..719fa6d8cd1 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/psionic.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/psionic.yml @@ -5,7 +5,7 @@ # amount: 1 # Cognizine: # amount: 1 -# Plasma: +# Phoron: # amount: 5 # catalyst: true # products: @@ -25,7 +25,7 @@ amount: 5 # DeltaV - Change from 10 to 5 to fit the guidebook recipe Ectoplasm: amount: 5 # DeltaV - Make Normality Crystals need only 5 Ectoplasm, was 10. - Plasma: + Phoron: amount: 5 # DeltaV - Change from 10 to 5 to fit the guidebook recipe catalyst: true effects: diff --git a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml index 6828780dd0a..8b76693f8c9 100644 --- a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml +++ b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml @@ -56,7 +56,7 @@ MailMedicalChemistrySupplement: 2 MailMedicalEmergencyPens: 3 MailMedicalMedicinePills: 2 - MailMedicalSheetPlasma: 1 + MailMedicalSheetPhoron: 1 # MailMedicalSpaceacillin: 1 MailMedicalStabilizers: 2 Engineering: @@ -93,7 +93,7 @@ ChiefMedicalOfficer: MailMedicalEmergencyPens: 2 MailMedicalMedicinePills: 3 - MailMedicalSheetPlasma: 2 + MailMedicalSheetPhoron: 2 Clown: MailClownGildedBikeHorn: 0.5 MailClownHonkSupplement: 3 diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml index a21b709afad..aba0d437efa 100644 --- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml +++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml @@ -7,7 +7,7 @@ OreSalt: 1.0 OreGold: 0.25 OreSilver: 0.25 - OrePlasma: 0.15 + OrePhoron: 0.15 OreUranium: 0.15 OreArtifactFragment: 0.15 diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml index 4a60427e305..120277b45e2 100644 --- a/Resources/Prototypes/Procedural/biome_ore_templates.yml +++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml @@ -86,16 +86,16 @@ radius: 4 # High value -# Plasma +# Phoron - type: biomeMarkerLayer - id: OrePlasma + id: OrePhoron entityMask: - AsteroidRock: AsteroidRockPlasma - WallRock: WallRockPlasma - WallRockBasalt: WallRockBasaltPlasma - WallRockChromite: WallRockChromitePlasma - WallRockSand: WallRockSandPlasma - WallRockSnow: WallRockSnowPlasma + AsteroidRock: AsteroidRockPhoron + WallRock: WallRockPhoron + WallRockBasalt: WallRockBasaltPhoron + WallRockChromite: WallRockChromitePhoron + WallRockSand: WallRockSandPhoron + WallRockSnow: WallRockSnowPhoron maxCount: 12 minGroupSize: 5 maxGroupSize: 10 diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml index 88979316443..1063e6fdeac 100644 --- a/Resources/Prototypes/Procedural/biome_templates.yml +++ b/Resources/Prototypes/Procedural/biome_templates.yml @@ -419,7 +419,7 @@ octaves: 5 cellularDistanceFunction: Euclidean cellularReturnType: Distance2 - # Liquid plasma rivers. Ice moon baby + # Liquid phoron rivers. Ice moon baby - !type:BiomeEntityLayer allowedTiles: - FloorSnow @@ -433,7 +433,7 @@ fractalType: Ridged octaves: 1 entities: - - FloorLiquidPlasmaEntity + - FloorLiquidPhoronEntity - !type:BiomeDummyLayer id: Loot - !type:BiomeTileLayer diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index f12e8c7ffda..38cee5ea290 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -159,11 +159,11 @@ # - High value - type: salvageLoot - id: OrePlasma + id: OrePhoron guaranteed: true loots: - !type:BiomeMarkerLoot - proto: OrePlasma + proto: OrePhoron - type: salvageLoot id: OreUranium diff --git a/Resources/Prototypes/Procedural/salvage_mods.yml b/Resources/Prototypes/Procedural/salvage_mods.yml index 4da7a3bf0f5..a0557b37713 100644 --- a/Resources/Prototypes/Procedural/salvage_mods.yml +++ b/Resources/Prototypes/Procedural/salvage_mods.yml @@ -181,14 +181,14 @@ - Lava - type: salvageAirMod - id: Plasma + id: Phoron cost: 4 desc: Toxic atmosphere gases: - 0 - 0 - 0 - - 103.927899 # plasma + - 103.927899 # phoron biomes: - Caves - Lava @@ -201,7 +201,7 @@ - 21.824779 # oxygen - 0 - 0 - - 82.10312 # plasma + - 82.10312 # phoron biomes: - Caves - Lava diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 33bb3907e0d..7ef32f6b489 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -25,7 +25,7 @@ # rare materials IngotGold: 1.0 IngotSilver: 1.0 - SheetPlasma: 1.0 + SheetPhoron: 1.0 SheetUranium: 1.0 CratePartsT3: 1.0 CratePartsT3T4: 0.5 diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml index 30e7762a81e..2eb5c07f8c9 100644 --- a/Resources/Prototypes/Reagents/Materials/glass.yml +++ b/Resources/Prototypes/Reagents/Materials/glass.yml @@ -15,20 +15,20 @@ price: 0.16 # 1-0.5 mix of glass and metal. - type: material - id: PlasmaGlass + id: PhoronGlass stackEntity: SheetPGlass1 - name: materials-plasma-glass + name: materials-phoron-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: pglass } color: "#b35989" - price: 0.30 # 1-1 mix of plasma and glass. + price: 0.30 # 1-1 mix of phoron and glass. - type: material - id: ReinforcedPlasmaGlass + id: ReinforcedPhoronGlass stackEntity: SheetRPGlass1 - name: materials-reinforced-plasma-glass + name: materials-reinforced-phoron-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass } color: "#8c4069" - price: 0.40 # 1-1-0.5 mix of plasma, glass, and metal. + price: 0.40 # 1-1-0.5 mix of phoron, glass, and metal. - type: material id: BrassGlass diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index fa51608a224..71325a7fd8d 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -43,10 +43,10 @@ price: 0.05 #same as wood - type: material - id: Plasma - stackEntity: SheetPlasma1 - name: materials-plasma - icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plasma } + id: Phoron + stackEntity: SheetPhoron1 + name: materials-phoron + icon: { sprite: Objects/Materials/Sheets/other.rsi, state: phoron } color: "#7e009e" price: 0.2 diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml index a2d2397dcde..07b6f8fd896 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -37,4 +37,4 @@ name: materials-plasteel icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel } color: "#696969" #Okay, this is epic - price: 0.28 # 1-1 mix of plasma and steel. + price: 0.28 # 1-1 mix of phoron and steel. diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml index 18f1d9ebb3a..a15f41f7545 100644 --- a/Resources/Prototypes/Reagents/Materials/ores.yml +++ b/Resources/Prototypes/Reagents/Materials/ores.yml @@ -34,11 +34,11 @@ price: 0.15 - type: material - id: RawPlasma - stackEntity: PlasmaOre1 - name: materials-raw-plasma + id: RawPhoron + stackEntity: PhoronOre1 + name: materials-raw-phoron unit: materials-unit-chunk - icon: { sprite: Objects/Materials/ore.rsi, state: plasma } + icon: { sprite: Objects/Materials/ore.rsi, state: phoron } color: "#7e009e" price: 0.2 diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 9cb73fffb85..2910c2fff70 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -37,9 +37,9 @@ Oxygen: -1.0 - type: reagent - id: Plasma - name: reagent-name-plasma - desc: reagent-desc-plasma + id: Phoron + name: reagent-name-phoron + desc: reagent-desc-phoron physicalDesc: reagent-physical-desc-gaseous flavor: bitter color: "#7e009e" diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml index bdfcaae6e96..472bcd0135d 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml @@ -68,9 +68,9 @@ amount: 1 doAfter: 1 - - to: TablePlasmaGlass + - to: TablePhoronGlass steps: - - material: PlasmaGlass + - material: PhoronGlass amount: 1 doAfter: 1 @@ -170,8 +170,8 @@ - tool: Anchoring doAfter: 1 - - node: TablePlasmaGlass - entity: TablePlasmaGlass + - node: TablePhoronGlass + entity: TablePhoronGlass edges: - to: TableFrame completed: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml index 02c5d94f98c..c99b64e177f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml @@ -20,7 +20,7 @@ steps: - material: Glass amount: 1 - - material: Plasma + - material: Phoron amount: 1 - to: SheetRPGlass completed: @@ -29,7 +29,7 @@ steps: - material: Glass amount: 1 - - material: Plasma + - material: Phoron amount: 1 - material: MetalRod amount: 1 @@ -38,7 +38,7 @@ - !type:SetStackCount amount: 1 steps: - - material: PlasmaGlass + - material: PhoronGlass amount: 1 - material: MetalRod amount: 1 @@ -49,7 +49,7 @@ steps: - material: ReinforcedGlass amount: 1 - - material: Plasma + - material: Phoron amount: 1 - to: SheetUGlass completed: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml index e15f4a644ae..1c395e7fb45 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml @@ -20,11 +20,11 @@ - material: WoodPlank amount: 20 doAfter: 15 - - to: plasmaDoor + - to: phoronDoor completed: - !type:SnapToGrid { } steps: - - material: Plasma + - material: Phoron amount: 20 doAfter: 15 - to: goldDoor @@ -77,13 +77,13 @@ steps: - tool: Anchoring doAfter: 15 - - node: plasmaDoor - entity: PlasmaDoor + - node: phoronDoor + entity: PhoronDoor edges: - to: start completed: - !type:SpawnPrototype - prototype: SheetPlasma + prototype: SheetPhoron amount: 20 steps: - tool: Anchoring diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml index 9f18fe8f2f9..5624d9cb83b 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml @@ -97,14 +97,14 @@ amount: 2 doAfter: 2 - - to: plasmaWall + - to: phoronWall completed: - !type:SnapToGrid southRotation: true conditions: - !type:EntityAnchored {} steps: - - material: Plasma + - material: Phoron amount: 2 - tool: Welding doAfter: 20 @@ -236,13 +236,13 @@ - tool: Prying doAfter: 10 - - node: plasmaWall - entity: WallPlasma + - node: phoronWall + entity: WallPhoron edges: - to: girder completed: - !type:GivePrototype - prototype: SheetPlasma1 + prototype: SheetPhoron1 amount: 2 steps: - tool: Welding diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml index 64809ee1dbc..73c68b0b57b 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml @@ -45,12 +45,12 @@ amount: 5 doAfter: 1 - #to plasma + #to phoron - to: pglass conditions: - !type:EntityAnchored {} steps: - - material: PlasmaGlass + - material: PhoronGlass amount: 5 doAfter: 1 @@ -151,9 +151,9 @@ - tool: Anchoring doAfter: 1 - #plasma windoor node + #phoron windoor node - node: pglass - entity: WindoorAssemblyPlasma + entity: WindoorAssemblyPhoron edges: - to: pwired conditions: @@ -175,7 +175,7 @@ doAfter: 2 - node: pwired - entity: WindoorAssemblyPlasma + entity: WindoorAssemblyPhoron edges: - to: pelectronics conditions: @@ -198,7 +198,7 @@ doAfter: 1 - node: pelectronics - entity: WindoorAssemblyPlasma + entity: WindoorAssemblyPhoron edges: - to: pwindoor conditions: @@ -208,7 +208,7 @@ doAfter: 2 - node: pwindoor - entity: WindoorPlasma + entity: WindoorPhoron edges: - to: pwired conditions: @@ -315,12 +315,12 @@ amount: 5 doAfter: 1 - #to secure plasma + #to secure phoron - to: pglassSecure conditions: - !type:EntityAnchored { } steps: - - material: ReinforcedPlasmaGlass + - material: ReinforcedPhoronGlass amount: 5 doAfter: 1 @@ -521,9 +521,9 @@ - tool: Anchoring doAfter: 4 - #secure plasma node + #secure phoron node - node: pglassSecure - entity: WindoorAssemblySecurePlasma + entity: WindoorAssemblySecurePhoron edges: - to: pwiredSecure conditions: @@ -546,7 +546,7 @@ doAfter: 4 - node: pwiredSecure - entity: WindoorAssemblySecurePlasma + entity: WindoorAssemblySecurePhoron edges: - to: pelectronicsSecure conditions: @@ -569,7 +569,7 @@ doAfter: 3 - node: pelectronicsSecure - entity: WindoorAssemblySecurePlasma + entity: WindoorAssemblySecurePhoron edges: - to: pwindoorSecure conditions: @@ -579,7 +579,7 @@ doAfter: 4 - node: pwindoorSecure - entity: WindoorSecurePlasma + entity: WindoorSecurePhoron edges: - to: pwiredSecure conditions: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml index 6adf2ac3beb..2a3207a26bc 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml @@ -4,9 +4,9 @@ graph: - node: start edges: - - to: plasmaWindow + - to: phoronWindow steps: - - material: PlasmaGlass + - material: PhoronGlass amount: 2 doAfter: 2 @@ -22,9 +22,9 @@ amount: 2 doAfter: 2 - - to: reinforcedPlasmaWindow + - to: reinforcedPhoronWindow steps: - - material: ReinforcedPlasmaGlass + - material: ReinforcedPhoronGlass amount: 2 doAfter: 3 @@ -117,8 +117,8 @@ - tool: Anchoring doAfter: 2 - - node: plasmaWindow - entity: PlasmaWindow + - node: phoronWindow + entity: PhoronWindow edges: - to: start completed: @@ -136,8 +136,8 @@ - tool: Anchoring doAfter: 3 - - node: reinforcedPlasmaWindow - entity: ReinforcedPlasmaWindow + - node: reinforcedPhoronWindow + entity: ReinforcedPhoronWindow edges: - to: start completed: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml index 55036b75599..c23b88fff91 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml @@ -4,9 +4,9 @@ graph: - node: start edges: - - to: plasmaWindowDiagonal + - to: phoronWindowDiagonal steps: - - material: PlasmaGlass + - material: PhoronGlass amount: 2 doAfter: 2 @@ -16,9 +16,9 @@ amount: 2 doAfter: 2 - - to: reinforcedPlasmaWindowDiagonal + - to: reinforcedPhoronWindowDiagonal steps: - - material: ReinforcedPlasmaGlass + - material: ReinforcedPhoronGlass amount: 2 doAfter: 3 @@ -107,8 +107,8 @@ - tool: Anchoring doAfter: 2 - - node: plasmaWindowDiagonal - entity: PlasmaWindowDiagonal + - node: phoronWindowDiagonal + entity: PhoronWindowDiagonal edges: - to: start completed: @@ -126,8 +126,8 @@ - tool: Anchoring doAfter: 3 - - node: reinforcedPlasmaWindowDiagonal - entity: ReinforcedPlasmaWindowDiagonal + - node: reinforcedPhoronWindowDiagonal + entity: ReinforcedPhoronWindowDiagonal edges: - to: start completed: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml index 96f009fabb7..480840cc3f5 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml @@ -17,15 +17,15 @@ amount: 1 doAfter: 3 - - to: plasmaWindowDirectional + - to: phoronWindowDirectional steps: - - material: PlasmaGlass + - material: PhoronGlass amount: 1 doAfter: 2 - - to: plasmaReinforcedWindowDirectional + - to: phoronReinforcedWindowDirectional steps: - - material: ReinforcedPlasmaGlass + - material: ReinforcedPhoronGlass amount: 1 doAfter: 3 - to: uraniumWindowDirectional @@ -80,8 +80,8 @@ - tool: Anchoring doAfter: 2 - - node: plasmaWindowDirectional - entity: PlasmaWindowDirectional + - node: phoronWindowDirectional + entity: PhoronWindowDirectional edges: - to: start completed: @@ -118,8 +118,8 @@ - tool: Anchoring doAfter: 3 - - node: plasmaReinforcedWindowDirectional - entity: PlasmaReinforcedWindowDirectional + - node: phoronReinforcedWindowDirectional + entity: PhoronReinforcedWindowDirectional edges: - to: start completed: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml index 28de8e7f7d4..a78942ebe90 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml @@ -69,11 +69,11 @@ entity: ReinforcedShiv - type: constructionGraph - id: PlasmaShivConstruct + id: PhoronShivConstruct start: start graph: - node: start - entity: ShardGlassPlasma + entity: ShardGlassPhoron edges: - to: icon steps: @@ -81,18 +81,18 @@ amount: 1 doAfter: 1 - node: icon - entity: PlasmaShiv + entity: PhoronShiv - type: constructionGraph - id: PlasmaShiv + id: PhoronShiv start: start graph: - node: start edges: - to: icon steps: - - tag: PlasmaGlassShard - name: Plasma Glass Shard + - tag: PhoronGlassShard + name: Phoron Glass Shard icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 @@ -101,7 +101,7 @@ amount: 1 doAfter: 1 - node: icon - entity: PlasmaShiv + entity: PhoronShiv - type: constructionGraph id: UraniumShivConstruct diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml index 6e1c682f475..93a1d9c72ab 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml @@ -45,7 +45,7 @@ entity: SpearReinforced - type: constructionGraph - id: SpearPlasma + id: SpearPhoron start: start graph: - node: start @@ -58,14 +58,14 @@ - material: Cable amount: 2 doAfter: 1 - - tag: PlasmaGlassShard - name: Plasma Glass Shard + - tag: PhoronGlassShard + name: Phoron Glass Shard icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 doAfter: 1 - node: spear - entity: SpearPlasma + entity: SpearPhoron - type: constructionGraph id: SpearUranium diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 4e05a4dfb86..95830fbfdc1 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -324,15 +324,15 @@ - !type:TileNotBlocked - type: construction - name: plasma glass table - id: TablePlasmaGlass + name: phoron glass table + id: TablePhoronGlass graph: Table startNode: start - targetNode: TablePlasmaGlass + targetNode: TablePhoronGlass category: construction-category-furniture - description: A square piece of plasma glass, standing on four metal legs. Pretty! + description: A square piece of phoron glass, standing on four metal legs. Pretty! icon: - sprite: Structures/Furniture/Tables/plasma.rsi + sprite: Structures/Furniture/Tables/phoron.rsi state: full objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml index d644538a452..d6c082b3d23 100644 --- a/Resources/Prototypes/Recipes/Construction/materials.yml +++ b/Resources/Prototypes/Recipes/Construction/materials.yml @@ -32,8 +32,8 @@ objectType: Item - type: construction - name: plasma glass - description: A sheet of translucent plasma. + name: phoron glass + description: A sheet of translucent phoron. id: SheetPGlass graph: Glass startNode: start @@ -43,8 +43,8 @@ objectType: Item - type: construction - name: reinforced plasma glass - description: A reinforced sheet of translucent plasma. + name: reinforced phoron glass + description: A reinforced sheet of translucent phoron. id: SheetRPGlass graph: Glass startNode: start @@ -54,8 +54,8 @@ objectType: Item - type: construction - name: reinforced plasma glass - description: A reinforced sheet of translucent plasma. + name: reinforced phoron glass + description: A reinforced sheet of translucent phoron. id: SheetRPGlass0 graph: Glass startNode: start @@ -65,8 +65,8 @@ objectType: Item - type: construction - name: reinforced plasma glass - description: A reinforced sheet of translucent plasma. + name: reinforced phoron glass + description: A reinforced sheet of translucent phoron. id: SheetRPGlass1 graph: Glass startNode: start diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index efc4236389e..c0e0057df9f 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -179,15 +179,15 @@ - !type:TileNotBlocked - type: construction - name: plasma wall - id: PlasmaWall + name: phoron wall + id: PhoronWall graph: Girder startNode: start - targetNode: plasmaWall + targetNode: phoronWall category: construction-category-structures description: Keeps the air in and the greytide out. icon: - sprite: Structures/Walls/plasma.rsi + sprite: Structures/Walls/phoron.rsi state: full objectType: Structure placementMode: SnapgridCenter @@ -451,11 +451,11 @@ placementMode: SnapgridCenter - type: construction - name: plasma window - id: PlasmaWindow + name: phoron window + id: PhoronWindow graph: Window startNode: start - targetNode: plasmaWindow + targetNode: phoronWindow category: construction-category-structures canBuildInImpassable: true description: Clear and even tougher, with a purple tint. @@ -463,18 +463,18 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/plasma_window.rsi + sprite: Structures/Windows/phoron_window.rsi state: full objectType: Structure placementMode: SnapgridCenter canRotate: false - type: construction - name: reinforced plasma window - id: ReinforcedPlasmaWindow + name: reinforced phoron window + id: ReinforcedPhoronWindow graph: Window startNode: start - targetNode: reinforcedPlasmaWindow + targetNode: reinforcedPhoronWindow category: construction-category-structures canBuildInImpassable: true description: Fire resistant and even tougher, with a purple tint. @@ -482,18 +482,18 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_plasma_window.rsi + sprite: Structures/Windows/reinforced_phoron_window.rsi state: full objectType: Structure placementMode: SnapgridCenter canRotate: false - type: construction - name: diagonal plasma window - id: PlasmaWindowDiagonal + name: diagonal phoron window + id: PhoronWindowDiagonal graph: WindowDiagonal startNode: start - targetNode: plasmaWindowDiagonal + targetNode: phoronWindowDiagonal category: construction-category-structures canBuildInImpassable: true description: Clear and even tougher, with a purple tint. @@ -501,17 +501,17 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/plasma_diagonal.rsi + sprite: Structures/Windows/phoron_diagonal.rsi state: state1 objectType: Structure placementMode: SnapgridCenter - type: construction - name: diagonal reinforced plasma window - id: ReinforcedPlasmaWindowDiagonal + name: diagonal reinforced phoron window + id: ReinforcedPhoronWindowDiagonal graph: WindowDiagonal startNode: start - targetNode: reinforcedPlasmaWindowDiagonal + targetNode: reinforcedPhoronWindowDiagonal category: construction-category-structures canBuildInImpassable: true description: Fire resistant and even tougher, with a purple tint. @@ -519,7 +519,7 @@ - !type:EmptyOrWindowValidInTile - !type:NoWindowsInTile icon: - sprite: Structures/Windows/reinforced_plasma_diagonal.rsi + sprite: Structures/Windows/reinforced_phoron_diagonal.rsi state: state1 objectType: Structure placementMode: SnapgridCenter @@ -579,11 +579,11 @@ placementMode: SnapgridCenter - type: construction - name: directional plasma window - id: PlasmaWindowDirectional + name: directional phoron window + id: PhoronWindowDirectional graph: WindowDirectional startNode: start - targetNode: plasmaWindowDirectional + targetNode: phoronWindowDirectional category: construction-category-structures canBuildInImpassable: true description: Clear and even tougher, with a purple tint. @@ -592,16 +592,16 @@ - !type:NoWindowsInTile icon: sprite: Structures/Windows/directional.rsi - state: plasma_window + state: phoron_window objectType: Structure placementMode: SnapgridCenter - type: construction - name: directional reinforced plasma window - id: PlasmaReinforcedWindowDirectional + name: directional reinforced phoron window + id: PhoronReinforcedWindowDirectional graph: WindowDirectional startNode: start - targetNode: plasmaReinforcedWindowDirectional + targetNode: phoronReinforcedWindowDirectional category: construction-category-structures canBuildInImpassable: true description: Fire resistant and even tougher, with a purple tint. @@ -610,7 +610,7 @@ - !type:NoWindowsInTile icon: sprite: Structures/Windows/directional.rsi - state: plasma_reinforced_window + state: phoron_reinforced_window objectType: Structure placementMode: SnapgridCenter @@ -1107,7 +1107,7 @@ startNode: start targetNode: windoor category: construction-category-structures - description: It opens, it closes, and you can see through it! And it can be made of Plasma, Uranium, or normal Glass! + description: It opens, it closes, and you can see through it! And it can be made of Phoron, Uranium, or normal Glass! icon: sprite: Structures/Doors/Windoors/windoor.rsi state: closed @@ -1124,7 +1124,7 @@ startNode: start targetNode: windoorSecure category: construction-category-structures - description: It's tough, it's a door, and you can see through it! And it can be made of Plasma, Uranium, or normal Glass! + description: It's tough, it's a door, and you can see through it! And it can be made of Phoron, Uranium, or normal Glass! icon: sprite: Structures/Doors/Windoors/windoor.rsi state: closed @@ -1262,18 +1262,18 @@ - !type:TileNotBlocked - type: construction - name: plasma door - id: PlasmaDoor + name: phoron door + id: PhoronDoor graph: DoorGraph startNode: start - targetNode: plasmaDoor + targetNode: phoronDoor category: construction-category-structures description: A primitive door with manual operation like the cavemen used. objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false icon: - sprite: Structures/Doors/MineralDoors/plasma_door.rsi + sprite: Structures/Doors/MineralDoors/phoron_door.rsi state: closed conditions: - !type:TileNotBlocked diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index 040d4c8963d..1ec65c29c5a 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -43,14 +43,14 @@ objectType: Item - type: construction - name: plasma shiv - id: PlasmaShiv - graph: PlasmaShiv + name: phoron shiv + id: PhoronShiv + graph: PhoronShiv startNode: start targetNode: icon category: construction-category-weapons - description: A plasma shard with a piece of cloth wrapped around it. - icon: { sprite: Objects/Weapons/Melee/plasma_shiv.rsi, state: icon } + description: A phoron shard with a piece of cloth wrapped around it. + icon: { sprite: Objects/Weapons/Melee/phoron_shiv.rsi, state: icon } objectType: Item - type: construction @@ -87,14 +87,14 @@ objectType: Item - type: construction - name: crude plasma spear - id: SpearPlasma - graph: SpearPlasma + name: crude phoron spear + id: SpearPhoron + graph: SpearPhoron startNode: start targetNode: spear category: construction-category-weapons - description: A crude plasma spear for when you need to put holes in somebody. - icon: { sprite: Objects/Weapons/Melee/plasma_spear.rsi, state: spear } + description: A crude phoron spear for when you need to put holes in somebody. + icon: { sprite: Objects/Weapons/Melee/phoron_spear.rsi, state: spear } objectType: Item - type: construction diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a5620fd8efe..b5ed2ad7907 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -157,7 +157,7 @@ time: 10 solids: FoodBreadBun: 1 - SheetPlasma1: 2 + SheetPhoron1: 2 - type: microwaveMealRecipe id: RecipeCarpBurger @@ -1722,7 +1722,7 @@ reagents: Sugar: 30 Nitrogen: 10 - Plasma: 10 + Phoron: 10 # Kebabs - type: microwaveMealRecipe diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index 3a54bfe1b33..0d8daaca1a7 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -51,7 +51,7 @@ materials: Steel: 200 #Cheaper Due to Needing Bluespace Plastic: 200 - Plasma: 50 + Phoron: 50 Silver: 50 Bluespace: 100 #DeltaV: Bluespace @@ -63,7 +63,7 @@ Steel: 100 #Cheaper Due to Needing Bluespace Plastic: 100 Glass: 200 - Plasma: 50 + Phoron: 50 Bluespace: 100 #DeltaV: Bluespace #Silver: 50 diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index d41b5fdce87..d1d7fbf5ba9 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -64,7 +64,7 @@ Steel: 100 Plastic: 100 Glass: 50 - Plasma: 50 + Phoron: 50 Silver: 50 - type: latheRecipe @@ -85,7 +85,7 @@ materials: Steel: 100 Plastic: 200 - Plasma: 100 + Phoron: 100 - type: latheRecipe id: AnomalyLocator @@ -132,7 +132,7 @@ Steel: 1500 Plastic: 300 Glass: 500 - Plasma: 500 + Phoron: 500 Silver: 250 - type: latheRecipe @@ -142,7 +142,7 @@ materials: Steel: 2000 Silver: 750 - Plasma: 1250 #Higher Plasma due to it needing less bluespace + Phoron: 1250 #Higher Phoron due to it needing less bluespace Uranium: 150 Bluespace: 300 #DeltaV: Bluespace Exists @@ -153,7 +153,7 @@ materials: Steel: 2000 Silver: 750 - Plasma: 1250 #Higher Plasma due to it needing less bluespace + Phoron: 1250 #Higher Phoron due to it needing less bluespace Uranium: 150 Bluespace: 300 #DeltaV: Bluespace Exists @@ -164,7 +164,7 @@ materials: Steel: 2000 Silver: 750 - Plasma: 1250 #Higher Plasma due to it needing less bluespace + Phoron: 1250 #Higher Phoron due to it needing less bluespace Uranium: 150 Bluespace: 300 #DeltaV: Bluespace Exists @@ -175,7 +175,7 @@ materials: Steel: 2000 Silver: 750 - Plasma: 1000 #DeltaV: Bluespace Exists so less plasma used, no uranium + Phoron: 1000 #DeltaV: Bluespace Exists so less phoron used, no uranium Bluespace: 200 #DeltaV: Bluespace Exists #- type: latheRecipe #DeltaV - LRP diff --git a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml index c38259dd816..4d3bb9fa5e4 100644 --- a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml +++ b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml @@ -55,7 +55,7 @@ completetime: 30 materials: Biomass: 24 - Plasma: 600 + Phoron: 600 - type: latheRecipe id: SpaceTickCube @@ -63,7 +63,7 @@ completetime: 15 materials: Biomass: 8 - Plasma: 300 # less biomass but more plasma + Phoron: 300 # less biomass but more phoron - type: latheRecipe id: AbominationCube @@ -71,4 +71,4 @@ completetime: 30 materials: # abominations are slow and essentially worse than even carp Biomass: 28 - Plasma: 500 # more biomass but less plasma + Phoron: 500 # more biomass but less phoron diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index f42e2851c78..647468c91d0 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -355,7 +355,7 @@ Plastic: 500 Gold: 100 Silver: 100 - Plasma: 1000 + Phoron: 1000 - type: latheRecipe id: BorgModuleCable diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index ffa74d460f9..b030daea356 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -247,7 +247,7 @@ Plastic: 15 Steel: 10 Glass: 5 - Plasma: 10 + Phoron: 10 Silver: 5 - type: latheRecipe diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index 053715a1811..53f0e6133f3 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -53,7 +53,7 @@ completetime: 2 materials: RawQuartz: 3000 - RawPlasma: 3000 + RawPhoron: 3000 - type: latheRecipe id: SheetRPGlass30 @@ -61,23 +61,23 @@ completetime: 2 materials: RawQuartz: 3000 - RawPlasma: 3000 + RawPhoron: 3000 RawIron: 1500 Coal: 500 - type: latheRecipe - id: SheetPlasma30 - result: SheetPlasma + id: SheetPhoron30 + result: SheetPhoron completetime: 2 materials: - RawPlasma: 3000 + RawPhoron: 3000 - type: latheRecipe id: SheetPlasteel30 result: SheetPlasteel completetime: 5 materials: - RawPlasma: 3000 + RawPhoron: 3000 RawIron: 6000 #Twice as durable as steel, Twice the material cost Coal: 1000 diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index 2b335ae6dc4..d11a851c626 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -224,7 +224,7 @@ completetime: 6 materials: Steel: 800 - Plasma: 200 + Phoron: 200 - type: latheRecipe id: JawsOfLife @@ -234,7 +234,7 @@ materials: Steel: 1000 Glass: 500 - Plasma: 300 + Phoron: 300 Gold: 50 - type: latheRecipe @@ -244,7 +244,7 @@ completetime: 3 materials: Steel: 500 - Plasma: 300 + Phoron: 300 Glass: 100 - type: latheRecipe @@ -254,5 +254,5 @@ completetime: 6 materials: Steel: 750 - Plasma: 150 + Phoron: 150 Uranium: 150 diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 537a792e859..532128b9a28 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -67,7 +67,7 @@ reactants: SulfuricAcid: amount: 1 - Plasma: + Phoron: amount: 1 Potassium: amount: 1 diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index e5afdbd6def..6c293b723c8 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -804,7 +804,7 @@ amount: 2 Vermouth: amount: 1 - Plasma: + Phoron: amount: 2 products: ToxinsSpecial: 5 diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index a8ccd5f0455..cd62482fb54 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -129,7 +129,7 @@ reactants: Frezon: amount: 3 - Plasma: + Phoron: amount: 1 catalyst: true Nitrogen: diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index a1ca3ea38e2..3135862c1c0 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -107,7 +107,7 @@ reactants: Oxygen: amount: 2 - Plasma: + Phoron: amount: 1 catalyst: true products: @@ -188,7 +188,7 @@ amount: 1 Fersilicite: amount: 1 - Plasma: + Phoron: amount: 1 catalyst: true products: @@ -279,7 +279,7 @@ reactants: HeartbreakerToxin: amount: 1 - Plasma: + Phoron: amount: 1 Vestine: amount: 1 @@ -328,7 +328,7 @@ reactants: Histamine: amount: 2 - Plasma: + Phoron: amount: 1 catalyst: true products: diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml index 318490931f8..fbd8a550e0f 100644 --- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml +++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml @@ -17,14 +17,14 @@ amount: 1 SulfuricAcid: amount: 1 - Plasma: + Phoron: amount: 1 effects: - !type:CreateGas - gas: Plasma + gas: Phoron - !type:PopupMessage visualType: LargeCaution - messages: [ "phlogiston-plasma-created" ] + messages: [ "phlogiston-phoron-created" ] type: Pvs products: Phlogiston: 3 diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml index 0caffb301f5..b688dc3d737 100644 --- a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml @@ -15,16 +15,16 @@ itemSize: 1 - type: stack - id: PlasmaGlass - name: plasma glass + id: PhoronGlass + name: phoron glass icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass } spawn: SheetPGlass1 maxCount: 30 itemSize: 1 - type: stack - id: ReinforcedPlasmaGlass - name: reinforced plasma glass + id: ReinforcedPhoronGlass + name: reinforced phoron glass icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass } spawn: SheetRPGlass1 maxCount: 30 diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml index 96f22ae656c..c3d8b0a335e 100644 --- a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml @@ -7,10 +7,10 @@ itemSize: 1 - type: stack - id: Plasma - name: plasma - icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma } - spawn: SheetPlasma1 + id: Phoron + name: phoron + icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: phoron } + spawn: SheetPhoron1 maxCount: 30 itemSize: 1 diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml index 2a95393c27b..605c2885e4a 100644 --- a/Resources/Prototypes/Stacks/Materials/ore.yml +++ b/Resources/Prototypes/Stacks/Materials/ore.yml @@ -15,10 +15,10 @@ itemSize: 2 - type: stack - id: PlasmaOre - name: plasma ore - icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma } - spawn: PlasmaOre1 + id: PhoronOre + name: phoron ore + icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: phoron } + spawn: PhoronOre1 maxCount: 30 itemSize: 2 diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index b9564c0366b..892b41471cd 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -206,7 +206,7 @@ - type: FoamArtifact reagents: - Oxygen - - Plasma + - Phoron - Blood - SpaceCleaner - Nutriment @@ -322,7 +322,7 @@ - id: SilverOre1 prob: 0.3 maxAmount: 3 - - id: PlasmaOre1 + - id: PhoronOre1 prob: 0.3 maxAmount: 3 - id: GoldOre1 @@ -450,7 +450,7 @@ - type: GasArtifact possibleGas: - CarbonDioxide - - Plasma + - Phoron - Tritium - Ammonia - NitrousOxide @@ -594,7 +594,7 @@ maxFoamAmount: 30 reagents: - Tritium - - Plasma + - Phoron - SulfuricAcid - SpaceDrugs - Nocturine diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml index b16a9de8dea..6083f602c26 100644 --- a/Resources/Prototypes/XenoArch/artifact_triggers.yml +++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml @@ -179,13 +179,13 @@ maxPressureThreshold: 385 - type: artifactTrigger - id: TriggerPlasma + id: TriggerPhoron targetDepth: 3 - triggerHint: artifact-trigger-hint-plasma + triggerHint: artifact-trigger-hint-phoron components: - type: ArtifactGasTrigger possibleGas: - - Plasma + - Phoron #don't add in new targetdepth values until you have a few #or else it will skew heavily towards a few options. diff --git a/Resources/Prototypes/hud.yml b/Resources/Prototypes/hud.yml index 637fbe2e6f6..b504954c9e6 100644 --- a/Resources/Prototypes/hud.yml +++ b/Resources/Prototypes/hud.yml @@ -5,9 +5,9 @@ order: -1 - type: hudTheme - id: SS14PlasmafireTheme - name: ui-options-hud-theme-plasmafire - path: Plasmafire + id: SS14PhoronfireTheme + name: ui-options-hud-theme-phoronfire + path: Phoronfire order: 3 - type: hudTheme diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index dde1516c855..d10dccaef4a 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -45,8 +45,8 @@ # Low yields - type: ore - id: OrePlasma - oreEntity: PlasmaOre1 + id: OrePhoron + oreEntity: PhoronOre1 minOreYield: 1 maxOreYield: 2 @@ -91,7 +91,7 @@ OreCoal: 10 OreSpaceQuartz: 8 OreGold: 2 - OrePlasma: 4 + OrePhoron: 4 OreSilver: 1 OreUranium: 1 OreBananium: 0.5 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 9f06df7bcb3..8723fd3754f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -941,7 +941,7 @@ id: PlantSampleTaker - type: Tag - id: PlasmaGlassShard + id: PhoronGlassShard - type: Tag id: Plastic diff --git a/Resources/Prototypes/themes.yml b/Resources/Prototypes/themes.yml index edd2681a624..1d56367ea9e 100644 --- a/Resources/Prototypes/themes.yml +++ b/Resources/Prototypes/themes.yml @@ -13,8 +13,8 @@ dangerousRedFore: "#BB3232" disabledFore: "#5A5A5A" - type: uiTheme - id: SS14PlasmafireTheme - path: /Textures/Interface/Plasmafire/ + id: SS14PhoronfireTheme + path: /Textures/Interface/Phoronfire/ colors: whiteText: "#FFF5EE" slotSelectedGold: "#FFF5EE" diff --git a/Resources/ServerInfo/AssDayRules.txt b/Resources/ServerInfo/AssDayRules.txt index 8acd6adedd9..00c50bb3b4e 100644 --- a/Resources/ServerInfo/AssDayRules.txt +++ b/Resources/ServerInfo/AssDayRules.txt @@ -13,7 +13,7 @@ Rules are relaxed today and admin abuse is more on the cards. [color=#a4885c]5.[/color] No creepy shit. [color=#a4885c]6.[/color] No impersonating the admins. [color=#a4885c]7.[/color] No walling off or obliterating arrivals. -[color=#a4885c]8.[/color] No singuloosing, plasma flooding, maxcapping, or spacing large parts of the station. +[color=#a4885c]8.[/color] No singuloosing, phoron flooding, maxcapping, or spacing large parts of the station. [color=#a4885c]9.[/color] If an admin tells you to quit doing something, quit it. [color=#a4885c]10.[/color] No you do not get an antag token. diff --git a/Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml b/Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml index 693e3a02098..17befaba8e7 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml @@ -10,9 +10,9 @@ Breathing pure O2 or pure N2 is generally bad for the health of your crew, and i -Variations on this mix may be necessary for the long-term comfort of atypical crew, for example crew who require a plasma gas mix to survive. For atypical crew, it is recommended to try and give them their own personal space, isolated by either airlock or disposals section. Keep in mind both methods are leaky and you will need scrubbers on both sides of the lock to clean up any leaked gasses. +Variations on this mix may be necessary for the long-term comfort of atypical crew, for example crew who require a phoron gas mix to survive. For atypical crew, it is recommended to try and give them their own personal space, isolated by either airlock or disposals section. Keep in mind both methods are leaky and you will need scrubbers on both sides of the lock to clean up any leaked gasses. - + ## Vents and Scrubbers @@ -33,10 +33,10 @@ In the event you finish all the tasks at hand, you can make some extra power or ##Tritium Tritium is a clear, green gas that is highly flammable, radioactive, and combusts when in contact with oxygen making it very helpful when running the [color=#a4885c]TEG.[/color] -It can be made by burning 1% Plasma and 96% or more Oxygen in the Burn Chamber. You can extract this gas through scrubbers. +It can be made by burning 1% Phoron and 96% or more Oxygen in the Burn Chamber. You can extract this gas through scrubbers. - + diff --git a/Resources/ServerInfo/Guidebook/Engineering/Fires.xml b/Resources/ServerInfo/Guidebook/Engineering/Fires.xml index a1c54059b78..ed288038299 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/Fires.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/Fires.xml @@ -1,7 +1,7 @@  # Fires & Space -Fires and spacings are an inevitability due to the highly flammable plasma gas and endless vacuum of space present in and around the station, so it's important to know how to manage them. +Fires and spacings are an inevitability due to the highly flammable phoron gas and endless vacuum of space present in and around the station, so it's important to know how to manage them. ## Spacing Space is arguably the easier of the two to handle. diff --git a/Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml b/Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml index 2cf1fa44ea1..dfbb994f7c6 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml @@ -25,7 +25,7 @@ - + diff --git a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml index 3553d43e6fc..f6a876fabde 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml @@ -22,17 +22,17 @@ The generator should be anchored at the center of the containment area since thi The emitters connect to MV cables and fire lasers as long as they have power and are turned on. Fire emitters at containment field generators to activate them. If two containment field generators are active, in range and in the same cardinal axis, a containment field will appear. -The containment field will repell the singularity, keeping it from escaping, and yield a little bit of power every time anything bounces off of them. +The containment field will repell the singularity, keeping it from escaping, and yield a little bit of power every time anything bounces off of them. Emitter lasers and containment field can cause damage, avoid touching them when active. ## Radiation collectors - + -They connect to HV cables and generate power from nearby radiation sources when turned on. -Radiation collectors require a tank full of gaseous plasma in order to operate. -Continous radiation exposure will gradually consume the stored plasma, so replace depleted tanks with fresh ones to maintain a high power output. +They connect to HV cables and generate power from nearby radiation sources when turned on. +Radiation collectors require a tank full of gaseous phoron in order to operate. +Continous radiation exposure will gradually consume the stored phoron, so replace depleted tanks with fresh ones to maintain a high power output. ## Particle accelerator @@ -74,7 +74,7 @@ Scan parts using the PA control computer to check if it's operational. If it sho Turn power on using the PA control computer. Set strength to an appropiate level. Currently the only appropriate level is [color=#f0684d]1[/color], anything above that will ensure that singularity grows too strong to handle. The higher the output stength is set on PA control computer, the bigger the singularity will be. -The PA will now draw power from the power net and start firing particles at the Gravitational singularity generator. +The PA will now draw power from the power net and start firing particles at the Gravitational singularity generator. diff --git a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml index a2a04e03ef0..5fa8403a628 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml @@ -1,7 +1,7 @@  # Thermo-electric Engine (TEG) - The TEG generates power by exchanging heat between hot and cold gases. On station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to make a cold side. + The TEG generates power by exchanging heat between hot and cold gases. On station, hot gas is usually created by burning phoron, and an array of heat-exchanging pipes in space radiates away heat to make a cold side. The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core, the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same. diff --git a/Resources/ServerInfo/Guidebook/Science/AnomalousResearch.xml b/Resources/ServerInfo/Guidebook/Science/AnomalousResearch.xml index 1bc4bc8ea75..fc81de66dfc 100644 --- a/Resources/ServerInfo/Guidebook/Science/AnomalousResearch.xml +++ b/Resources/ServerInfo/Guidebook/Science/AnomalousResearch.xml @@ -16,7 +16,7 @@ Scanners, vessels, and A.P.E.s are all used in the containment and observation o -The anomaly generator can produce a random anomaly somewhere on the station at the cost of plasma. +The anomaly generator can produce a random anomaly somewhere on the station at the cost of phoron. ## Anomalies Anomalies are static objects that appear on the station. They cannot be moved, and must be worked around, no matter their location. diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml index 0e28557dd93..24698d53416 100644 --- a/Resources/ServerInfo/Guidebook/Science/Science.xml +++ b/Resources/ServerInfo/Guidebook/Science/Science.xml @@ -43,6 +43,6 @@ Now [color=green]Tier 3[/color] is where it gets interesting. If you research a -At a lathe, you can choose a server to allow it print whatever recipes you have unlocked. Recipes require various materials (steel, glass, plastic, gold, plasma) which can be acquired at Logistics or Salvage. +At a lathe, you can choose a server to allow it print whatever recipes you have unlocked. Recipes require various materials (steel, glass, plastic, gold, phoron) which can be acquired at Logistics or Salvage. diff --git a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml index 2911dae1557..ae7f2da8a80 100644 --- a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml +++ b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml @@ -68,6 +68,6 @@ Metabolizing 20u or more of [color=#a4885c]mindbreaker[/color] will remove psion [color=#a4885c]Soulbreaker[/color] shells will remove psionics from psychics they hit. -[color=#a4885c]Ectoplasm[/color], combined in a beaker with equal parts water, ash, blood, and plasma, will produce a normality crystal when heated enough. [color=#fcdf03]Use a hot plate for this.[/color] +[color=#a4885c]Ectoplasm[/color], combined in a beaker with equal parts water, ash, blood, and phoron, will produce a normality crystal when heated enough. [color=#fcdf03]Use a hot plate for this.[/color] diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json index 3f3418b36c1..8b8bb72bd2b 100644 --- a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json @@ -172,7 +172,7 @@ "directions": 4 }, { - "name": "plasmatank-equipped-BELT", + "name": "phorontank-equipped-BELT", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/plasmatank-equipped-BELT.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/phorontank-equipped-BELT.png similarity index 100% rename from Resources/Textures/Clothing/Belt/belt_overlay.rsi/plasmatank-equipped-BELT.png rename to Resources/Textures/Clothing/Belt/belt_overlay.rsi/phorontank-equipped-BELT.png diff --git a/Resources/Textures/Effects/atmospherics.rsi/meta.json b/Resources/Textures/Effects/atmospherics.rsi/meta.json index 9c5eb2e1fe3..44465bd6515 100644 --- a/Resources/Textures/Effects/atmospherics.rsi/meta.json +++ b/Resources/Textures/Effects/atmospherics.rsi/meta.json @@ -47,11 +47,11 @@ "delays": [[0.1, 0.1, 0.1, 0.1]] }, { - "name": "plasma", + "name": "phoron", "delays": [[0.1, 0.1, 0.1]] }, { - "name": "plasma_old", + "name": "phoron_old", "delays": [[0.2, 0.2, 0.2]] }, { diff --git a/Resources/Textures/Effects/atmospherics.rsi/plasma.png b/Resources/Textures/Effects/atmospherics.rsi/phoron.png similarity index 100% rename from Resources/Textures/Effects/atmospherics.rsi/plasma.png rename to Resources/Textures/Effects/atmospherics.rsi/phoron.png diff --git a/Resources/Textures/Effects/atmospherics.rsi/plasma_old.png b/Resources/Textures/Effects/atmospherics.rsi/phoron_old.png similarity index 100% rename from Resources/Textures/Effects/atmospherics.rsi/plasma_old.png rename to Resources/Textures/Effects/atmospherics.rsi/phoron_old.png diff --git a/Resources/Textures/Interface/Plasmafire/SlotBackground.png b/Resources/Textures/Interface/Phoronfire/SlotBackground.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/SlotBackground.png rename to Resources/Textures/Interface/Phoronfire/SlotBackground.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/back.png b/Resources/Textures/Interface/Phoronfire/Slots/back.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/back.png rename to Resources/Textures/Interface/Phoronfire/Slots/back.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/belt.png b/Resources/Textures/Interface/Phoronfire/Slots/belt.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/belt.png rename to Resources/Textures/Interface/Phoronfire/Slots/belt.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/ears.png b/Resources/Textures/Interface/Phoronfire/Slots/ears.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/ears.png rename to Resources/Textures/Interface/Phoronfire/Slots/ears.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/glasses.png b/Resources/Textures/Interface/Phoronfire/Slots/glasses.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/glasses.png rename to Resources/Textures/Interface/Phoronfire/Slots/glasses.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/gloves.png b/Resources/Textures/Interface/Phoronfire/Slots/gloves.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/gloves.png rename to Resources/Textures/Interface/Phoronfire/Slots/gloves.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/hand_l.png b/Resources/Textures/Interface/Phoronfire/Slots/hand_l.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/hand_l.png rename to Resources/Textures/Interface/Phoronfire/Slots/hand_l.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/hand_l_no_letter.png b/Resources/Textures/Interface/Phoronfire/Slots/hand_l_no_letter.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/hand_l_no_letter.png rename to Resources/Textures/Interface/Phoronfire/Slots/hand_l_no_letter.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/hand_r.png b/Resources/Textures/Interface/Phoronfire/Slots/hand_r.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/hand_r.png rename to Resources/Textures/Interface/Phoronfire/Slots/hand_r.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/hand_r_no_letter.png b/Resources/Textures/Interface/Phoronfire/Slots/hand_r_no_letter.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/hand_r_no_letter.png rename to Resources/Textures/Interface/Phoronfire/Slots/hand_r_no_letter.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/head.png b/Resources/Textures/Interface/Phoronfire/Slots/head.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/head.png rename to Resources/Textures/Interface/Phoronfire/Slots/head.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/id.png b/Resources/Textures/Interface/Phoronfire/Slots/id.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/id.png rename to Resources/Textures/Interface/Phoronfire/Slots/id.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/mask.png b/Resources/Textures/Interface/Phoronfire/Slots/mask.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/mask.png rename to Resources/Textures/Interface/Phoronfire/Slots/mask.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/neck.png b/Resources/Textures/Interface/Phoronfire/Slots/neck.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/neck.png rename to Resources/Textures/Interface/Phoronfire/Slots/neck.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/pocket.png b/Resources/Textures/Interface/Phoronfire/Slots/pocket.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/pocket.png rename to Resources/Textures/Interface/Phoronfire/Slots/pocket.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/shoes.png b/Resources/Textures/Interface/Phoronfire/Slots/shoes.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/shoes.png rename to Resources/Textures/Interface/Phoronfire/Slots/shoes.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/suit.png b/Resources/Textures/Interface/Phoronfire/Slots/suit.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/suit.png rename to Resources/Textures/Interface/Phoronfire/Slots/suit.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/suit_storage.png b/Resources/Textures/Interface/Phoronfire/Slots/suit_storage.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/suit_storage.png rename to Resources/Textures/Interface/Phoronfire/Slots/suit_storage.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/toggle.png b/Resources/Textures/Interface/Phoronfire/Slots/toggle.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/toggle.png rename to Resources/Textures/Interface/Phoronfire/Slots/toggle.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/uniform.png b/Resources/Textures/Interface/Phoronfire/Slots/uniform.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/uniform.png rename to Resources/Textures/Interface/Phoronfire/Slots/uniform.png diff --git a/Resources/Textures/Interface/Plasmafire/Slots/web.png b/Resources/Textures/Interface/Phoronfire/Slots/web.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Slots/web.png rename to Resources/Textures/Interface/Phoronfire/Slots/web.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_bottom.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_bottom.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_bottom.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_bottom.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_bottomLeft.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_bottomLeft.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_bottomLeft.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_bottomLeft.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_bottomRight.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_bottomRight.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_bottomRight.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_bottomRight.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_center.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_center.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_center.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_center.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_left.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_left.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_left.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_left.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_right.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_right.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_right.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_right.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_top.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_top.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_top.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_top.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_topLeft.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_topLeft.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_topLeft.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_topLeft.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/piece_topRight.png b/Resources/Textures/Interface/Phoronfire/Storage/piece_topRight.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/piece_topRight.png rename to Resources/Textures/Interface/Phoronfire/Storage/piece_topRight.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/sidebar_bottom.png b/Resources/Textures/Interface/Phoronfire/Storage/sidebar_bottom.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/sidebar_bottom.png rename to Resources/Textures/Interface/Phoronfire/Storage/sidebar_bottom.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/sidebar_mid.png b/Resources/Textures/Interface/Phoronfire/Storage/sidebar_mid.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/sidebar_mid.png rename to Resources/Textures/Interface/Phoronfire/Storage/sidebar_mid.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/sidebar_top.png b/Resources/Textures/Interface/Phoronfire/Storage/sidebar_top.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/sidebar_top.png rename to Resources/Textures/Interface/Phoronfire/Storage/sidebar_top.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/tile_empty.png b/Resources/Textures/Interface/Phoronfire/Storage/tile_empty.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/tile_empty.png rename to Resources/Textures/Interface/Phoronfire/Storage/tile_empty.png diff --git a/Resources/Textures/Interface/Plasmafire/Storage/tile_empty_opaque.png b/Resources/Textures/Interface/Phoronfire/Storage/tile_empty_opaque.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/Storage/tile_empty_opaque.png rename to Resources/Textures/Interface/Phoronfire/Storage/tile_empty_opaque.png diff --git a/Resources/Textures/Interface/Plasmafire/slot_highlight.png b/Resources/Textures/Interface/Phoronfire/slot_highlight.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/slot_highlight.png rename to Resources/Textures/Interface/Phoronfire/slot_highlight.png diff --git a/Resources/Textures/Interface/Plasmafire/template_small.png b/Resources/Textures/Interface/Phoronfire/template_small.png similarity index 100% rename from Resources/Textures/Interface/Plasmafire/template_small.png rename to Resources/Textures/Interface/Phoronfire/template_small.png diff --git a/Resources/Textures/Markers/atmos.rsi/meta.json b/Resources/Textures/Markers/atmos.rsi/meta.json index aaa8485a867..34efc75e074 100644 --- a/Resources/Textures/Markers/atmos.rsi/meta.json +++ b/Resources/Textures/Markers/atmos.rsi/meta.json @@ -23,7 +23,7 @@ "name": "nitrogen" }, { - "name": "plasma" + "name": "phoron" }, { "name": "watervapour" diff --git a/Resources/Textures/Markers/atmos.rsi/plasma.png b/Resources/Textures/Markers/atmos.rsi/phoron.png similarity index 100% rename from Resources/Textures/Markers/atmos.rsi/plasma.png rename to Resources/Textures/Markers/atmos.rsi/phoron.png diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json index afde361663f..95337928bb5 100644 --- a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json @@ -60,7 +60,7 @@ "directions": 4 }, { - "name": "plasmafire", + "name": "phoronfire", "directions": 4 }, { diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/plasmafire.png b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/phoronfire.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/plasmafire.png rename to Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/phoronfire.png diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json index b2a9e559ed1..71dc4815b3d 100644 --- a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json @@ -80,11 +80,11 @@ "directions": 4 }, { - "name": "plasmafire_primary", + "name": "phoronfire_primary", "directions": 4 }, { - "name": "plasmafire_secondary", + "name": "phoronfire_secondary", "directions": 4 }, { diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/plasmafire_primary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/phoronfire_primary.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/plasmafire_primary.png rename to Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/phoronfire_primary.png diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/plasmafire_secondary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/phoronfire_secondary.png similarity index 100% rename from Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/plasmafire_secondary.png rename to Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/phoronfire_secondary.png diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/meta.json index 4c2043f5fec..2774ea2d028 100644 --- a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/meta.json @@ -80,7 +80,7 @@ "directions": 4 }, { - "name": "plasmafire", + "name": "phoronfire", "directions": 4 }, { diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/plasmafire.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/phoronfire.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/plasmafire.png rename to Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi/phoronfire.png diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/meta.json index 06141d6caf8..f84f3538932 100644 --- a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/meta.json @@ -92,7 +92,7 @@ "directions": 4 }, { - "name": "plasmafire", + "name": "phoronfire", "directions": 4 }, { diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/plasmafire.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/phoronfire.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/plasmafire.png rename to Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi/phoronfire.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json index 68b9e804a56..130b9b53230 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam])", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Phoronguy#6148 [Discord, liable to change] / jrjr3000 [Steam])", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json index 6cd21aae79a..232ace5a8a4 100644 --- a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json @@ -7,17 +7,6 @@ "y": 32 }, "states": [ - { - "name": "phoron" - }, - { - "name": "phoron-inhand-left", - "directions": 4 - }, - { - "name": "phoron-inhand-right", - "directions": 4 - }, { "name": "paper" }, @@ -53,20 +42,20 @@ "directions": 4 }, { - "name": "plasma" + "name": "phoron" }, { - "name": "plasma_2" + "name": "phoron_2" }, { - "name": "plasma_3" + "name": "phoron_3" }, { - "name": "plasma-inhand-left", + "name": "phoron-inhand-left", "directions": 4 }, { - "name": "plasma-inhand-right", + "name": "phoron-inhand-right", "directions": 4 }, { diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-left.png index 654701b1a84b2d5949a40fd1ecf7bae7a5b6d853..1116634e7fca6028aac1b4f9c313f9c3f41a2340 100644 GIT binary patch delta 417 zcmV;S0bc&31G@u|B!7ZQL_t(|obB4NO2a@H2k?KbTOf;qdlnHYojdprj=q2{jy`~7 za_X2RzJO!i!r3MevbYP$A_!gN?@%vbTpDxNYwQ099SY6e_kDN04Br7FA|fIpA|fJ| zr9sRzi0L~HZ}KoBqpEii_NH)58s=ffJj~WkC=FsVs+flvxqn#hb`h8~Z8GcpJ`Liw zVCGpS&F&PTyJCzgGOBtdVE#5{_w;?<8?$2OyII9QjrCnPE|#m$w(kNH@QtHsGQN^MzF&j_+=T2bKkc*|iR+{f# zzKyQ*u*n^^vVYBI;XZ=Zc5}B)e)DnftetHVFX|GLhYMg{0{}*^r@iJpv=&g(5c3+3 zZ%+W=H2E}$S=1$fRiP*IGi&z|1_!pOlh@^agq^WBcNz&rM8uOXz`rYxxf^TG00000 LNkvXXu0mjf)%D9> delta 394 zcmV;50d@Yn1Ed3xB!6p3L_t(|obB2%N&`U@#_?xL$q{UWjab=u5F5415d;rlE#wGx z*~SB;@BsGHNy_9577|?f#>}#01M94hg@OMMB#hbleEZzp6nO>!00000002Y1pIgvR zd;8(~ua4ym%^HP@tM9Kuy{eibHy0MyxrN89RTZ>9{Z4D;dw(}!;@X_qrP*>}sra*- zxosbB2SsV0_NOK)H|9HYYrt1+X6q1(jKx1!wtanxClTMv%!WhRcj!l_00000NkvXXt^-0~f=i9aNB{r; diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/phoron-inhand-right.png index 0050c63ea6f2bd9ecf259fdc16fa14de99cdc25f..c24afc4eaae0c5bfe27133a064362aed54602498 100644 GIT binary patch delta 394 zcmV;50d@X}1f&CyB!6p3L_t(|obB2%PJ}=d2H>AqlF&$EPh&_(ti6dB(8h8rE5iXS zY48G;+`+jbdwhjApWU4IfxBcBt%qT7tYOsG{7 zn6zZlZZ%-tdy^2egiRuLTFxeW zUYT}zX2AT{+)1!r&zlacV!YiwBa71^&;j>`@jf(nX?~|bF3t>?NAUI86|jmC+@8AK oj9r`=SlqkF;yNTEB4XtSfWa&-Bsc-500000NkvXXt^-0~f*wh`n*aa+ delta 494 zcmVsDb?Hc(Zx2U($j(15RBJ!V1K-ApYh+6#@Sc@nQvgf z7*l^Vqy0^xXuDRlS`uB{%3dAp$DZ4@VsGQW7za;r2JoS&D*ow_`uAmZ5x)3NnK6kN zubncUX7bpZ{YSH)vonBCO+SjaVbEl5#w23ACiCy2k3$GKI|DcnwTidxgUtGkS99iV zJLK#PpvS$dWq+%9Zuh)*jkK^=bLP3tb%dP#L-m?(Ed#+cXWrfuLKLnseuTVS73R_L zUjKg1>!^mWTI{1B0ubPk6a*l^At?wzfJ0IcfB=W2AOHal zNkISt9Fl?n1UMuG0SItN3IY(|kQ4+Uz#%CJpv#x-|7Y&U?PgzYLu(E;SRXCQ{?0CLeEU)Bc!s)HiB4eaV^HlP9{!%+`zIhr@6TV=6rMR4FQadjEoMf z$=C-zp52moe*S*#JbyF**;rN=#K{=uZx>4ffY9=xRvnnoUVjOYol{n>tKMY}i&MDF0U`!nF9389g8*p0A$aG!Nxyg%eNZ%RFH4t1uN@#eC$e+O z;*=W)1u!d-#VLOdit5%bb859qtqF+b5(ldD1^_Itc>PVlO*{bgaZK+Y01Oy`*j%yA zI`gbt??58<=YKc`FQNR|gqDxRc7@RLYo--M#DH1ZfRSNuK7-bjPjxSZxzP0EWtT|e z@%hK7VASX*@7KK+ymbVso-Xeio9-rFE&9I3tpF;7eDg|5^h1q10dx?u_A%}SphCzn oUCT8ZfC|y)7i(l>bX58Qo3X8$wqVO900000NkvXXt^-0~f)YHp8vp@&aR}T&f=G@Dj$^27T?1z03IWm`00U5mzyP{~swYfksEjNH zv)liFWuzz@5)=2JxUNPPxO9>jqX~xq%<|R()VM|tYHSWd_B{hN3Zm+LkgV0}1j%yf z@efOkAcw##Cw~UubpWi;0Rw1|!W;qv=ng`T2AJ>h0lZNFa=_z<_fb_Af_oMbDxEv{4vxNnE{;BcWOC}5CBA@T-on`?5VE)n$s!0{TWy$s(0A|fIpA|fIpmZd?=G>GXt4sY@>BcrN!5%#8VOd954 z#yrf{PACmxGOCz|8M#>Qb`h8~Z8GcpJ`LiwVCGpS&F&PTyJCzgGOBtdVE#5{_w;?< z8?$2OyII9QjrCnPE|#m$w(kNH@Q1F-n(tn|jjr^t$sM+`f6Zs%K7!SDbGJ=?^KtL2 zoox~?>JpQO3t(OY07kE;z2-c$7Esa<^BRwDPXORF`80@G)Fpsbp(pb*YxfZb2ezq` l*X4bLov}A}2}MN2lP|!(E04JwYtH}x002ovPDHLkV1o5d&3pg= diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma-inhand-right.png deleted file mode 100644 index c24afc4eaae0c5bfe27133a064362aed54602498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fS(aSW-L^Y)gZUyFkX+k^QL zlP-89`6qjLtl8Tse&JY=w)SC0oy-qR)9xHR6t!XDM)Qf6T8{k@dy{kH2uu3((ivy} ztKK%uPrqlt{E$~c2?CfF@Dxu=^t=AIU=dHTQRYpTsoyy_%sXLp=BA72>=jDg=U%gH zc-LO2vNl%8M|r;Rfkn4_4*IMJ6`HXnZH~ddny}y3OhJ;s5YO7`()s(ZJS5R5R$WZaK?&#U;e^a8xBT9}O zR%cMCu%ExYKTY@Nhq?r_y*HVE8&o9JvUecBo8!~ZKVmnuGcL%ve^=exJ$1(ADMvP0 z%w2!y$z-)vZCS4;p4~T9b&g~~+|07dv;%*x-|^fKcYZeCnxs8?Dd{PD!$BQA6${4Yz|d## MboFyt=akR{0A%vM0ssI2 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png deleted file mode 100644 index fc2764fe538e7f04010d903261c5dc2ab1b82039..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)1m=8m?hOHqjEsy9tjX91KAzo@cz*tV?L2=p0NGep7sSaJ z=5H5E0)Wu+p;jH3&|V3Uol{n>tKMY}i&MDF0U`!nF9389 zg8*p0A$aG!Nxyg%eNZ%RFH4t1uN@#eC$e+O;*=W)1u!d-#VLOdit5%bb859qtqF+b z5(ldD1^_Itc>PVlO*{bgaZK+Y01Oy`*j%yAI`gbt??58<=Qsv0q5Ro|mXF1Dh0yYA zrWHiQfLYmqkzsE>gVvN!buWau(DdVFmq_CA`NybW)aWPg*S!|Jbp)!OF7Fzf?j~L> z`o6}k04juh^GZteLybEDbP%%kG42JRLdY;(%QYH+3eo2mYh+|}RQds%v8|f6V9O=| O0000