From e6c3fbf071c5286d040588462ad4fb3ef24ebe92 Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Thu, 10 Apr 2014 01:19:49 -0700 Subject: [PATCH] Changes all appropriate instances of 'Plasma' to 'Phoron' --- baystation12.dme | 2 +- .../components/trinary_devices/filter.dm | 6 ++-- code/ATMOSPHERICS/pipes.dm | 6 ++-- .../Cael_Aislinn/Rust/core_field.dm | 2 +- code/WorkInProgress/periodic_news.dm | 2 +- code/ZAS/Diagnostic.dm | 2 +- code/ZAS/Phoron.dm | 12 ++++---- code/ZAS/Variable Settings.dm | 28 +++++++++---------- code/datums/supplypacks.dm | 4 +-- code/game/gamemodes/events/ninja_equipment.dm | 2 +- code/game/jobs/job/science.dm | 2 +- .../atmoalter/portable_atmospherics.dm | 2 +- code/game/machinery/doors/airlock.dm | 8 +++--- code/game/mecha/equipment/tools/tools.dm | 2 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 4 +-- code/game/objects/items/devices/scanners.dm | 2 +- .../game/objects/items/stacks/sheets/glass.dm | 8 +++--- .../objects/items/stacks/sheets/mineral.dm | 4 +-- .../objects/items/weapons/flamethrower.dm | 2 +- .../objects/items/weapons/storage/boxes.dm | 2 +- .../objects/items/weapons/tanks/tank_types.dm | 4 +-- .../game/objects/items/weapons/tanks/tanks.dm | 2 +- .../crates_lockers/closets/syndicate.dm | 2 +- .../structures/crates_lockers/crates.dm | 2 +- .../game/objects/structures/tank_dispenser.dm | 2 +- code/game/turfs/simulated/walls_mineral.dm | 10 +++---- code/modules/admin/admin.dm | 2 +- code/modules/admin/verbs/debug.dm | 10 +++---- code/modules/mining/machine_processing.dm | 2 +- code/modules/mining/machine_stacking.dm | 6 ++-- code/modules/mining/mine_turfs.dm | 4 +-- code/modules/mining/minerals.dm | 2 +- code/modules/mining/mint.dm | 2 +- code/modules/mining/money_bag.dm | 2 +- code/modules/mining/ores_coins.dm | 4 +-- code/modules/mining/satchel_ore_boxdm.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- .../mob/living/silicon/pai/software.dm | 2 +- code/modules/mob/mob.dm | 2 +- code/modules/paperwork/paper.dm | 4 +-- code/modules/reagents/Chemistry-Reagents.dm | 4 +-- code/modules/reagents/Chemistry-Recipes.dm | 2 +- code/modules/research/designs.dm | 4 +-- code/modules/research/rd-readme.dm | 6 ++-- code/modules/research/rdconsole.dm | 6 ++-- code/modules/research/research.dm | 2 +- .../research/xenoarchaeology/geosample.dm | 2 +- .../tools/suspension_generator.dm | 2 +- code/setup.dm | 2 +- 50 files changed, 101 insertions(+), 101 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index f0c649295c..802db258a4 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1340,7 +1340,7 @@ #include "code\ZAS\Debug.dm" #include "code\ZAS\Diagnostic.dm" #include "code\ZAS\Fire.dm" -#include "code\ZAS\Plasma.dm" +#include "code\ZAS\Phoron.dm" #include "code\ZAS\Turf.dm" #include "code\ZAS\Variable Settings.dm" #include "code\ZAS\Zone.dm" diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 967d9f9531..2dfa10d345 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -14,7 +14,7 @@ obj/machinery/atmospherics/trinary/filter /* Filter types: -1: Nothing - 0: Carbon Molecules: Plasma Toxin, Oxygen Agent B + 0: Phoron: Phoron, Oxygen Agent B 1: Oxygen: Oxygen ONLY 2: Nitrogen: Nitrogen ONLY 3: Carbon Dioxide: Carbon Dioxide ONLY @@ -170,7 +170,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE var/current_filter_type switch(filter_type) if(0) - current_filter_type = "Carbon Molecules" + current_filter_type = "Phoron" if(1) current_filter_type = "Oxygen" if(2) @@ -188,7 +188,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE Power: [on?"On":"Off"]
Filtering: [current_filter_type]

Set Filter Type:

- Carbon Molecules
+ Phoron
Oxygen
Nitrogen
Carbon Dioxide
diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index f872a8d0fb..b968c0fb12 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -886,7 +886,7 @@ obj/machinery/atmospherics/pipe/tank/carbon_dioxide obj/machinery/atmospherics/pipe/tank/toxins icon = 'icons/obj/atmospherics/orange_pipe_tank.dmi' - name = "Pressure Tank (Plasma)" + name = "Pressure Tank (Phoron)" New() air_temporary = new @@ -899,7 +899,7 @@ obj/machinery/atmospherics/pipe/tank/toxins obj/machinery/atmospherics/pipe/tank/oxygen_agent_b icon = 'icons/obj/atmospherics/red_orange_pipe_tank.dmi' - name = "Pressure Tank (Oxygen + Plasma)" + name = "Pressure Tank (Oxygen + Phoron)" New() air_temporary = new @@ -1013,7 +1013,7 @@ obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/weapon/W as obj, var/ user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(parent.air.temperature-T0C)]°C" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm index 09ac351d90..50125f4ef4 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm @@ -178,7 +178,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K //if there is too much plasma in the field, lose some /*if( held_plasma.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) ) - LosePlasma()*/ + LosePhoron()*/ if(held_plasma.toxins > 1) //lose a random amount of plasma back into the air, increased by the field strength (want to switch this over to frequency eventually) var/loss_ratio = rand() * (0.05 + (0.05 * 50 / field_strength)) diff --git a/code/WorkInProgress/periodic_news.dm b/code/WorkInProgress/periodic_news.dm index 8b8be52e2d..8cab325d88 100644 --- a/code/WorkInProgress/periodic_news.dm +++ b/code/WorkInProgress/periodic_news.dm @@ -107,7 +107,7 @@ message = {"More on the Refuge food riots: The Refuge Council has condemned NanoTrasen's withdrawal from the colony, claiming \"there has been no increase in anti-NanoTrasen activity\", and \"\[the only] reason - NanoTrasen withdrew was because the \[Tenebrae Lupus] system's Plasma deposits have been completely mined out. + NanoTrasen withdrew was because the \[Tenebrae Lupus] system's Phoron deposits have been completely mined out. We have little to trade with them now\". NanoTrasen officials have denied these allegations, calling them \"further proof\" of the colony's anti-NanoTrasen stance. Meanwhile, Refuge Security has been unable to quell the riots. More on this at 6."} diff --git a/code/ZAS/Diagnostic.dm b/code/ZAS/Diagnostic.dm index eb5d72788e..71c8d99fa3 100644 --- a/code/ZAS/Diagnostic.dm +++ b/code/ZAS/Diagnostic.dm @@ -105,7 +105,7 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) client << "Zone Air Contents" client << "Oxygen: [air.oxygen]" client << "Nitrogen: [air.nitrogen]" - client << "Plasma: [air.toxins]" + client << "Phoron: [air.toxins]" client << "Carbon Dioxide: [air.carbon_dioxide]" client << "Temperature: [air.temperature] K" client << "Heat Energy: [air.temperature * air.heat_capacity()] J" diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 64751e1e8c..6e5871c1ca 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -2,7 +2,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') /pl_control var/PHORON_DMG = 3 - var/PHORON_DMG_NAME = "Plasma Damage Amount" + var/PHORON_DMG_NAME = "Phoron Damage Amount" var/PHORON_DMG_DESC = "Self Descriptive" var/CLOTH_CONTAMINATION = 1 @@ -10,7 +10,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') var/CLOTH_CONTAMINATION_DESC = "If this is on, plasma does damage by getting into cloth." var/PHORONGUARD_ONLY = 0 - var/PHORONGUARD_ONLY_NAME = "\"PlasmaGuard Only\"" + var/PHORONGUARD_ONLY_NAME = "\"PhoronGuard Only\"" var/PHORONGUARD_ONLY_DESC = "If this is on, only biosuits and spacesuits protect against contamination and ill effects." var/GENETIC_CORRUPTION = 0 @@ -18,19 +18,19 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') var/GENETIC_CORRUPTION_DESC = "Chance of genetic corruption as well as toxic damage, X in 10,000." var/SKIN_BURNS = 0 - var/SKIN_BURNS_DESC = "Plasma has an effect similar to mustard gas on the un-suited." + var/SKIN_BURNS_DESC = "Phoron has an effect similar to mustard gas on the un-suited." var/SKIN_BURNS_NAME = "Skin Burns" var/EYE_BURNS = 1 var/EYE_BURNS_NAME = "Eye Burns" - var/EYE_BURNS_DESC = "Plasma burns the eyes of anyone not wearing eye protection." + var/EYE_BURNS_DESC = "Phoron burns the eyes of anyone not wearing eye protection." var/CONTAMINATION_LOSS = 0.02 var/CONTAMINATION_LOSS_NAME = "Contamination Loss" var/CONTAMINATION_LOSS_DESC = "How much toxin damage is dealt from contaminated clothing" //Per tick? ASK ARYN var/PHORON_HALLUCINATION = 0 - var/PHORON_HALLUCINATION_NAME = "Plasma Hallucination" + var/PHORON_HALLUCINATION_NAME = "Phoron Hallucination" var/PHORON_HALLUCINATION_DESC = "Does being in plasma cause you to hallucinate?" var/N2O_HALLUCINATION = 1 @@ -66,7 +66,7 @@ obj/var/contaminated = 0 suit_contamination() if(!pl_head_protected()) - if(prob(1)) suit_contamination() //Plasma can sometimes get through such an open suit. + if(prob(1)) suit_contamination() //Phoron can sometimes get through such an open suit. //Cannot wash backpacks currently. // if(istype(back,/obj/item/weapon/storage/backpack)) diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index d19eb8230c..1f9ebf1610 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -186,50 +186,50 @@ var/global/vs_control/vsc = new newvalue = vars[V] V = newvalue -/vs_control/proc/ChangePlasma() +/vs_control/proc/ChangePhoron() for(var/V in plc.settings) plc.Randomize(V) /vs_control/proc/SetDefault(var/mob/user) - var/list/setting_choices = list("Plasma - Standard", "Plasma - Low Hazard", "Plasma - High Hazard", "Plasma - Oh Shit!",\ + var/list/setting_choices = list("Phoron - Standard", "Phoron - Low Hazard", "Phoron - High Hazard", "Phoron - Oh Shit!",\ "ZAS - Normal", "ZAS - Forgiving", "ZAS - Dangerous", "ZAS - Hellish") var/def = input(user, "Which of these presets should be used?") as null|anything in setting_choices if(!def) return switch(def) - if("Plasma - Standard") + if("Phoron - Standard") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. - plc.SKIN_BURNS = 0 //Plasma has an effect similar to mustard gas on the un-suited. - plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. + plc.SKIN_BURNS = 0 //Phoron has an effect similar to mustard gas on the un-suited. + plc.EYE_BURNS = 1 //Phoron burns the eyes of anyone not wearing eye protection. plc.PHORON_HALLUCINATION = 0 plc.CONTAMINATION_LOSS = 0.02 - if("Plasma - Low Hazard") + if("Phoron - Low Hazard") plc.CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000 - plc.SKIN_BURNS = 0 //Plasma has an effect similar to mustard gas on the un-suited. - plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. + plc.SKIN_BURNS = 0 //Phoron has an effect similar to mustard gas on the un-suited. + plc.EYE_BURNS = 1 //Phoron burns the eyes of anyone not wearing eye protection. plc.PHORON_HALLUCINATION = 0 plc.CONTAMINATION_LOSS = 0.01 - if("Plasma - High Hazard") + if("Phoron - High Hazard") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. - plc.SKIN_BURNS = 1 //Plasma has an effect similar to mustard gas on the un-suited. - plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. + plc.SKIN_BURNS = 1 //Phoron has an effect similar to mustard gas on the un-suited. + plc.EYE_BURNS = 1 //Phoron burns the eyes of anyone not wearing eye protection. plc.PHORON_HALLUCINATION = 1 plc.CONTAMINATION_LOSS = 0.05 - if("Plasma - Oh Shit!") + if("Phoron - Oh Shit!") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. plc.PHORONGUARD_ONLY = 1 plc.GENETIC_CORRUPTION = 5 //Chance of genetic corruption as well as toxic damage, X in 1000. - plc.SKIN_BURNS = 1 //Plasma has an effect similar to mustard gas on the un-suited. - plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. + plc.SKIN_BURNS = 1 //Phoron has an effect similar to mustard gas on the un-suited. + plc.EYE_BURNS = 1 //Phoron burns the eyes of anyone not wearing eye protection. plc.PHORON_HALLUCINATION = 1 plc.CONTAMINATION_LOSS = 0.075 diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index ee2f220d9f..17ff8a79d4 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -600,7 +600,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee group = "Engineering" /datum/supply_packs/plasma - name = "Plasma assembly crate" + name = "Phoron assembly crate" contains = list(/obj/item/weapon/tank/plasma, /obj/item/weapon/tank/plasma, /obj/item/weapon/tank/plasma, @@ -615,7 +615,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/device/assembly/timer) cost = 10 containertype = /obj/structure/closet/crate/secure/plasma - containername = "Plasma assembly crate" + containername = "Phoron assembly crate" access = access_tox_storage group = "Medical / Science" diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index d2bd2dbc7b..afa8b72c1b 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -329,7 +329,7 @@ ________________________________________________________________________________ dat += "
  • Nitrogen: [round(n2_level*100)]%
    • " dat += "
  • Oxygen: [round(o2_level*100)]%
    • " dat += "
  • Carbon Dioxide: [round(co2_level*100)]%
    • " - dat += "
  • Plasma: [round(plasma_level*100)]%
    • " + dat += "
  • Phoron: [round(plasma_level*100)]%
    • " dat += "" if(unknown_level > 0.01) dat += "OTHER: [round(unknown_level)]%
    " diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index c4c117b260..e5cd453db1 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -46,7 +46,7 @@ selection_color = "#ffeeff" access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch) minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch) - alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher") + alt_titles = list("Xenoarcheologist", "Anomalist", "Phoron Researcher") equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index d8e45dab06..ce3a166b3a 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -133,7 +133,7 @@ user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C" diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3168fe4e7d..81675367ad 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -259,20 +259,20 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. return /obj/machinery/door/airlock/plasma - name = "Plasma Airlock" + name = "Phoron Airlock" desc = "No way this can end badly." icon = 'icons/obj/doors/Doorplasma.dmi' mineral = "plasma" /obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) - PlasmaBurn(exposed_temperature) + PhoronBurn(exposed_temperature) /obj/machinery/door/airlock/plasma/proc/ignite(exposed_temperature) if(exposed_temperature > 300) - PlasmaBurn(exposed_temperature) + PhoronBurn(exposed_temperature) -/obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature) +/obj/machinery/door/airlock/plasma/proc/PhoronBurn(temperature) for(var/turf/simulated/floor/target_tile in range(2,loc)) // if(target_tile.parent && target_tile.parent.group_processing) // THESE PROBABLY DO SOMETHING IMPORTANT BUT I DON'T KNOW HOW TO FIX IT - Erthilo // target_tile.parent.suspend_group_processing() diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 416e2ff6cb..015b6f8239 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -830,7 +830,7 @@ /obj/item/mecha_parts/mecha_equipment/generator - name = "Plasma Converter" + name = "Phoron Generator" desc = "Generates power using solid plasma as fuel. Pollutes the environment." icon_state = "tesla" origin_tech = "plasmatech=2;powerstorage=2;engineering=1" diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index b9a2e57daf..68716f3eb9 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -97,7 +97,7 @@ triggerproc = "triggerrad" /obj/effect/mine/plasma - name = "Plasma Mine" + name = "Phoron Mine" icon_state = "uglymine" triggerproc = "triggerplasma" diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 3a10e94f3c..55eac2f4e7 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1173,7 +1173,7 @@ var/global/list/obj/item/device/pda/PDAs = list() user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]°C" @@ -1202,7 +1202,7 @@ var/global/list/obj/item/device/pda/PDAs = list() user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(T.parent.air.temperature-T0C)]°C" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index d3f7523988..569b513823 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -257,7 +257,7 @@ REAGENT SCANNER user.show_message("\blue CO2: [round(co2_concentration*100)]%", 1) if(plasma_concentration > 0.01) - user.show_message("\red Plasma: [round(plasma_concentration*100)]%", 1) + user.show_message("\red Phoron: [round(plasma_concentration*100)]%", 1) if(unknown_concentration > 0.01) user.show_message("\red Unknown: [round(unknown_concentration*100)]%", 1) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 0e79b89189..0e5e34f346 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -2,8 +2,8 @@ * Contains: * Glass sheets * Reinforced glass sheets - * Plasma Glass Sheets - * Reinforced Plasma Glass Sheets (AKA Holy fuck strong windows) + * Phoron Glass Sheets + * Reinforced Phoron Glass Sheets (AKA Holy fuck strong windows) * Glass shards - TODO: Move this into code/game/object/item/weapons */ @@ -300,7 +300,7 @@ /* - * Plasma Glass sheets + * Phoron Glass sheets */ /obj/item/stack/sheet/glass/plasmaglass name = "plasma glass" @@ -336,7 +336,7 @@ */ /obj/item/stack/sheet/glass/plasmarglass name = "reinforced plasma glass" - desc = "Plasma glass which seems to have rods or something stuck in them." + desc = "Phoron glass which seems to have rods or something stuck in them." singular_name = "reinforced plasma glass sheet" icon_state = "sheet-plasmarglass" g_amt = 7500 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 624e912e15..90f97fd483 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -4,7 +4,7 @@ Mineral Sheets - Sandstone - Diamond - Uranium - - Plasma + - Phoron - Gold - Silver - Clown @@ -90,7 +90,7 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \ ..() /* - * Plasma + * Phoron */ /obj/item/stack/sheet/mineral/plasma name = "solid plasma" diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index b9321ec9b4..2e8e087ad5 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -131,7 +131,7 @@ user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(ptank.air_contents.temperature-T0C)]°C" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 83189aafd6..a428f8d829 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -410,7 +410,7 @@ /obj/item/weapon/storage/box/matches name = "matchbox" - desc = "A small box of Almost But Not Quite Plasma Premium Matches." + desc = "A small box of 'Space-Proof' premium matches." icon = 'icons/obj/cigarettes.dmi' icon_state = "matchbox" item_state = "zippo" diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 5e82cddbdf..0591d077ec 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -3,7 +3,7 @@ * Oxygen * Anesthetic * Air - * Plasma + * Phoron * Emergency Oxygen */ @@ -92,7 +92,7 @@ /* - * Plasma + * Phoron */ /obj/item/weapon/tank/plasma name = "plasma tank" diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 6cc4467882..9badcc71fe 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -105,7 +105,7 @@ user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C" diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 5ee7383b65..8cbf52835b 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -86,7 +86,7 @@ if(pickednum >= 10) new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max)) - //Plasma (rare ore) + //Phoron (rare ore) if(pickednum >= 15) new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max)) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 4c4df81ae0..331c825a9f 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -377,7 +377,7 @@ /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." - name = "Plasma crate" + name = "Phoron crate" icon_state = "plasmacrate" icon_opened = "plasmacrateopen" icon_closed = "plasmacrate" diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 37e019963f..66925627f5 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -36,7 +36,7 @@ user.set_machine(src) var/dat = "[src]

    " dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "Dispense" : "empty"]
    " - dat += "Plasma tanks: [plasmatanks] - [plasmatanks ? "Dispense" : "empty"]" + dat += "Phoron tanks: [plasmatanks] - [plasmatanks ? "Dispense" : "empty"]" user << browse(dat, "window=dispenser") onclose(user, "dispenser") return diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index e1ec717d30..7d0db5184e 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -89,7 +89,7 @@ return ..() -/turf/simulated/wall/mineral/plasma/proc/PlasmaBurn(temperature) +/turf/simulated/wall/mineral/plasma/proc/PhoronBurn(temperature) spawn(2) new /obj/structure/girder(src) src.ChangeTurf(/turf/simulated/floor) @@ -113,17 +113,17 @@ /turf/simulated/wall/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :( if(exposed_temperature > 300) - PlasmaBurn(exposed_temperature) + PhoronBurn(exposed_temperature) /turf/simulated/wall/mineral/plasma/proc/ignite(exposed_temperature) if(exposed_temperature > 300) - PlasmaBurn(exposed_temperature) + PhoronBurn(exposed_temperature) /turf/simulated/wall/mineral/plasma/bullet_act(var/obj/item/projectile/Proj) if(istype(Proj,/obj/item/projectile/beam)) - PlasmaBurn(2500) + PhoronBurn(2500) else if(istype(Proj,/obj/item/projectile/ion)) - PlasmaBurn(500) + PhoronBurn(500) ..() /* diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 16b94ba54e..837ab0ad0f 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -563,7 +563,7 @@ var/global/floorIsLava = 0 Create Turf
    Create Mob

    Edit Airflow Settings
    - Edit Plasma Settings
    + Edit Phoron Settings
    Choose a default ZAS setting
    "} diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 4131e46411..5a22503bab 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -144,7 +144,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/t = "" t+= "Nitrogen : [env.nitrogen]\n" t+= "Oxygen : [env.oxygen]\n" - t+= "Plasma : [env.toxins]\n" + t+= "Phoron : [env.toxins]\n" t+= "CO2: [env.carbon_dioxide]\n" usr.show_message(t, 1) @@ -955,11 +955,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that for(var/obj/machinery/power/rad_collector/Rad in world) if(Rad.anchored) if(!Rad.P) - var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad) - Plasma.air_contents.toxins = 70 + var/obj/item/weapon/tank/plasma/Phoron = new/obj/item/weapon/tank/plasma(Rad) + Phoron.air_contents.toxins = 70 Rad.drainratio = 0 - Rad.P = Plasma - Plasma.loc = Rad + Rad.P = Phoron + Phoron.loc = Rad if(!Rad.active) Rad.toggle_power() diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 298e4134dd..29b288995b 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -65,7 +65,7 @@ dat += text("Smelting ") else dat += text("Not smelting ") - dat += text("Plasma: [machine.ore_plasma]
    ") + dat += text("Phoron: [machine.ore_plasma]
    ") else machine.selected &= ~ORE_PROC_PHORON diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 138a42aaaa..da92cc78bb 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -41,11 +41,11 @@ if(machine.ore_rglass) dat += text("Reinforced Glass: [machine.ore_rglass] Release
    ") if(machine.ore_plasma) - dat += text("Plasma: [machine.ore_plasma] Release
    ") + dat += text("Phoron: [machine.ore_plasma] Release
    ") if(machine.ore_plasmaglass) - dat += text("Plasma Glass: [machine.ore_plasmaglass] Release
    ") + dat += text("Phoron Glass: [machine.ore_plasmaglass] Release
    ") if(machine.ore_plasmarglass) - dat += text("Reinforced Plasma Glass: [machine.ore_plasmarglass] Release
    ") + dat += text("Reinforced Phoron Glass: [machine.ore_plasmarglass] Release
    ") if(machine.ore_gold) dat += text("Gold: [machine.ore_gold] Release
    ") if(machine.ore_silver) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 749de26f33..922b114c25 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -358,7 +358,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont /turf/simulated/mineral/random name = "Mineral deposit" - var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Plasma" = 25)//Currently, Adamantine won't spawn as it has no uses. -Durandan + var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Phoron" = 25)//Currently, Adamantine won't spawn as it has no uses. -Durandan var/mineralChance = 10 //means 10% chance of this plot changing to a mineral deposit New() @@ -377,7 +377,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont /turf/simulated/mineral/random/high_chance mineralChance = 25 - mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Plasma" = 25) + mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Phoron" = 25) /**********************Asteroid**************************/ diff --git a/code/modules/mining/minerals.dm b/code/modules/mining/minerals.dm index 8d14f2352d..a9f5784d39 100644 --- a/code/modules/mining/minerals.dm +++ b/code/modules/mining/minerals.dm @@ -59,7 +59,7 @@ mineral/silver ore = /obj/item/weapon/ore/silver mineral/plasma - name = "Plasma" + name = "Phoron" result_amount = 5 spread_chance = 25 ore = /obj/item/weapon/ore/plasma diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 0b1c493d74..bb05f0c79d 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -100,7 +100,7 @@ dat += text("chosen") else dat += text("Choose") - dat += text("
    Plasma inserted: [amt_plasma] ") + dat += text("
    Phoron inserted: [amt_plasma] ") if (chosen == "plasma") dat += text("chosen") else diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index bb1db7a86d..dbc4e6165f 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -47,7 +47,7 @@ if (amt_diamond) dat += text("Diamond coins: [amt_diamond] Remove one
    ") if (amt_plasma) - dat += text("Plasma coins: [amt_plasma] Remove one
    ") + dat += text("Phoron coins: [amt_plasma] Remove one
    ") if (amt_uranium) dat += text("Uranium coins: [amt_uranium] Remove one
    ") if (amt_clown) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index b59ec2114b..6a7dddd3c7 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -30,8 +30,8 @@ del(src) /obj/item/weapon/ore/plasma - name = "Plasma ore" - icon_state = "Plasma ore" + name = "Phoron ore" + icon_state = "Phoron ore" origin_tech = "materials=2" /obj/item/weapon/ore/silver diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 4a0c9a6103..4ab39ad8d6 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -63,7 +63,7 @@ if (amt_diamond) dat += text("Diamond ore: [amt_diamond]
    ") if (amt_plasma) - dat += text("Plasma ore: [amt_plasma]
    ") + dat += text("Phoron ore: [amt_plasma]
    ") if (amt_uranium) dat += text("Uranium ore: [amt_uranium]
    ") if (amt_clown) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index ec85aaeaa4..79142744bc 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -417,7 +417,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp src << "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)" if(plasma_concentration > 0.01) - src << "\red Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)" + src << "\red Phoron: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)" if(unknown_concentration > 0.01) src << "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)" diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 6e688c2bdc..461d5dd713 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -547,7 +547,7 @@ dat += "Nitrogen: [round(n2_level*100)]%
    " dat += "Oxygen: [round(o2_level*100)]%
    " dat += "Carbon Dioxide: [round(co2_level*100)]%
    " - dat += "Plasma: [round(plasma_level*100)]%
    " + dat += "Phoron: [round(plasma_level*100)]%
    " if(unknown_level > 0.01) dat += "OTHER: [round(unknown_level)]%
    " dat += "Temperature: [round(environment.temperature-T0C)]°C
    " diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6e4c7e2e18..1f2394fb9a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -25,7 +25,7 @@ t+= "\red Temperature: [environment.temperature] \n" t+= "\blue Nitrogen: [environment.nitrogen] \n" t+= "\blue Oxygen: [environment.oxygen] \n" - t+= "\blue Plasma : [environment.toxins] \n" + t+= "\blue Phoron : [environment.toxins] \n" t+= "\blue Carbon Dioxide: [environment.carbon_dioxide] \n" for(var/datum/gas/trace_gas in environment.trace_gases) usr << "\blue [trace_gas.type]: [trace_gas.moles] \n" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 81670fb259..9c40db2da0 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -352,7 +352,7 @@ /obj/item/weapon/paper/Toxin name = "Chemical Information" - info = "Known Onboard Toxins:
    \n\tGrade A Semi-Liquid Plasma:
    \n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
    \n\t\tA gas mask fails to filter plasma after 50 units.
    \n\t\tWill attempt to diffuse like a gas.
    \n\t\tFiltered by scrubbers.
    \n\t\tThere is a bottled version which is very different
    \n\t\t\tfrom the version found in canisters!
    \n
    \n\t\tWARNING: Highly Flammable. Keep away from heat sources
    \n\t\texcept in a enclosed fire area!
    \n\t\tWARNING: It is a crime to use this without authorization.
    \nKnown Onboard Anti-Toxin:
    \n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
    \n\t\tBest if injected directly into bloodstream.
    \n\t\tA full injection is in every regular Med-Kit.
    \n\t\tSpecial toxin Kits hold around 7.
    \n
    \nKnown Onboard Chemicals (other):
    \n\tRejuvenation T#001:
    \n\t\tEven 1 unit injected directly into the bloodstream
    \n\t\t\twill cure paralysis and sleep toxins.
    \n\t\tIf administered to a dying patient it will prevent
    \n\t\t\tfurther damage for about units*3 seconds.
    \n\t\t\tit will not cure them or allow them to be cured.
    \n\t\tIt can be administeredd to a non-dying patient
    \n\t\t\tbut the chemicals disappear just as fast.
    \n\tSleep Toxin T#054:
    \n\t\t5 units wilkl induce precisely 1 minute of sleep.
    \n\t\t\tThe effect are cumulative.
    \n\t\tWARNING: It is a crime to use this without authorization" + info = "Known Onboard Toxins:
    \n\tGrade A Semi-Liquid Phoron:
    \n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
    \n\t\tA gas mask fails to filter plasma after 50 units.
    \n\t\tWill attempt to diffuse like a gas.
    \n\t\tFiltered by scrubbers.
    \n\t\tThere is a bottled version which is very different
    \n\t\t\tfrom the version found in canisters!
    \n
    \n\t\tWARNING: Highly Flammable. Keep away from heat sources
    \n\t\texcept in a enclosed fire area!
    \n\t\tWARNING: It is a crime to use this without authorization.
    \nKnown Onboard Anti-Toxin:
    \n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
    \n\t\tBest if injected directly into bloodstream.
    \n\t\tA full injection is in every regular Med-Kit.
    \n\t\tSpecial toxin Kits hold around 7.
    \n
    \nKnown Onboard Chemicals (other):
    \n\tRejuvenation T#001:
    \n\t\tEven 1 unit injected directly into the bloodstream
    \n\t\t\twill cure paralysis and sleep toxins.
    \n\t\tIf administered to a dying patient it will prevent
    \n\t\t\tfurther damage for about units*3 seconds.
    \n\t\t\tit will not cure them or allow them to be cured.
    \n\t\tIt can be administeredd to a non-dying patient
    \n\t\t\tbut the chemicals disappear just as fast.
    \n\tSleep Toxin T#054:
    \n\t\t5 units wilkl induce precisely 1 minute of sleep.
    \n\t\t\tThe effect are cumulative.
    \n\t\tWARNING: It is a crime to use this without authorization" /obj/item/weapon/paper/courtroom name = "A Crash Course in Legal SOP on SS13" @@ -373,7 +373,7 @@ /obj/item/weapon/paper/jobs name = "Job Information" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
    \nThe data will be in the following form.
    \nGenerally lower ranking positions come first in this list.
    \n
    \nJob Name general access>lab access-engine access-systems access (atmosphere control)
    \n\tJob Description
    \nJob Duties (in no particular order)
    \nTips (where applicable)
    \n
    \nResearch Assistant 1>1-0-0
    \n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
    \n1. Assist the researchers.
    \n2. Clean up the labs.
    \n3. Prepare materials.
    \n
    \nStaff Assistant 2>0-0-0
    \n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
    \n1. Patrol ship/Guard key areas
    \n2. Assist security officer
    \n3. Perform other security duties.
    \n
    \nTechnical Assistant 1>0-0-1
    \n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
    \n1. Assist Station technician and Engineers.
    \n2. Perform general maintenance of station.
    \n3. Prepare materials.
    \n
    \nMedical Assistant 1>1-0-0
    \n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
    \n1. Assist the medical personnel.
    \n2. Update medical files.
    \n3. Prepare materials for medical operations.
    \n
    \nResearch Technician 2>3-0-0
    \n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
    \n1. Inform superiors of research.
    \n2. Perform research alongside of official researchers.
    \n
    \nDetective 3>2-0-0
    \n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
    \n1. Perform crime-scene investigations/draw conclusions.
    \n2. Store and catalogue evidence properly.
    \n3. Testify to superiors/inquieries on findings.
    \n
    \nStation Technician 2>0-2-3
    \n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
    \n1. Maintain SS13 systems.
    \n2. Repair equipment.
    \n
    \nAtmospheric Technician 3>0-0-4
    \n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
    \n1. Maintain atmosphere on SS13
    \n2. Research atmospheres on the space station. (safely please!)
    \n
    \nEngineer 2>1-3-0
    \n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
    \n1. Upkeep the engine.
    \n2. Prevent fires in the engine.
    \n3. Maintain a safe orbit.
    \n
    \nMedical Researcher 2>5-0-0
    \n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
    \n1. Make sure the station is kept safe.
    \n2. Research medical properties of materials studied of Space Station 13.
    \n
    \nScientist 2>5-0-0
    \n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.
    \n1. Research plasma
    \n2. Make sure all plasma is properly handled.
    \n
    \nMedical Doctor (Officer) 2>0-0-0
    \n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
    \n1. Heal wounded people.
    \n2. Perform examinations of all personnel.
    \n3. Moniter usage of medical equipment.
    \n
    \nSecurity Officer 3>0-0-0
    \n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
    \n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
    \n1. Maintain order.
    \n2. Assist others.
    \n3. Repair structural problems.
    \n
    \nHead of Security 4>5-2-2
    \n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
    \n1. Oversee security.
    \n2. Assign patrol duties.
    \n3. Protect the station and staff.
    \n
    \nHead of Personnel 4>4-2-2
    \n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
    \n1. Assign duties.
    \n2. Moderate personnel.
    \n3. Moderate research.
    \n
    \nCaptain 5>5-5-5 (unrestricted station wide access)
    \n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
    \n1. Assign all positions on SS13
    \n2. Inspect the station for any problems.
    \n3. Perform administrative duties.
    \n" + info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
    \nThe data will be in the following form.
    \nGenerally lower ranking positions come first in this list.
    \n
    \nJob Name general access>lab access-engine access-systems access (atmosphere control)
    \n\tJob Description
    \nJob Duties (in no particular order)
    \nTips (where applicable)
    \n
    \nResearch Assistant 1>1-0-0
    \n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
    \n1. Assist the researchers.
    \n2. Clean up the labs.
    \n3. Prepare materials.
    \n
    \nStaff Assistant 2>0-0-0
    \n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
    \n1. Patrol ship/Guard key areas
    \n2. Assist security officer
    \n3. Perform other security duties.
    \n
    \nTechnical Assistant 1>0-0-1
    \n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
    \n1. Assist Station technician and Engineers.
    \n2. Perform general maintenance of station.
    \n3. Prepare materials.
    \n
    \nMedical Assistant 1>1-0-0
    \n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
    \n1. Assist the medical personnel.
    \n2. Update medical files.
    \n3. Prepare materials for medical operations.
    \n
    \nResearch Technician 2>3-0-0
    \n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
    \n1. Inform superiors of research.
    \n2. Perform research alongside of official researchers.
    \n
    \nDetective 3>2-0-0
    \n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
    \n1. Perform crime-scene investigations/draw conclusions.
    \n2. Store and catalogue evidence properly.
    \n3. Testify to superiors/inquieries on findings.
    \n
    \nStation Technician 2>0-2-3
    \n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
    \n1. Maintain SS13 systems.
    \n2. Repair equipment.
    \n
    \nAtmospheric Technician 3>0-0-4
    \n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
    \n1. Maintain atmosphere on SS13
    \n2. Research atmospheres on the space station. (safely please!)
    \n
    \nEngineer 2>1-3-0
    \n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
    \n1. Upkeep the engine.
    \n2. Prevent fires in the engine.
    \n3. Maintain a safe orbit.
    \n
    \nMedical Researcher 2>5-0-0
    \n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
    \n1. Make sure the station is kept safe.
    \n2. Research medical properties of materials studied of Space Station 13.
    \n
    \nScientist 2>5-0-0
    \n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as plasma is the material they routinly handle.
    \n1. Research plasma
    \n2. Make sure all plasma is properly handled.
    \n
    \nMedical Doctor (Officer) 2>0-0-0
    \n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
    \n1. Heal wounded people.
    \n2. Perform examinations of all personnel.
    \n3. Moniter usage of medical equipment.
    \n
    \nSecurity Officer 3>0-0-0
    \n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
    \n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
    \n1. Maintain order.
    \n2. Assist others.
    \n3. Repair structural problems.
    \n
    \nHead of Security 4>5-2-2
    \n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
    \n1. Oversee security.
    \n2. Assign patrol duties.
    \n3. Protect the station and staff.
    \n
    \nHead of Personnel 4>4-2-2
    \n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
    \n1. Assign duties.
    \n2. Moderate personnel.
    \n3. Moderate research.
    \n
    \nCaptain 5>5-5-5 (unrestricted station wide access)
    \n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
    \n1. Assign all positions on SS13
    \n2. Inspect the station for any problems.
    \n3. Perform administrative duties.
    \n" /obj/item/weapon/paper/photograph name = "photo" diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 3f735c9f03..a00c20b980 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1544,9 +1544,9 @@ datum return toxin/plasma - name = "Plasma" + name = "Phoron" id = "plasma" - description = "Plasma in its liquid form." + description = "Phoron in its liquid form." reagent_state = LIQUID color = "#E71B00" // rgb: 231, 27, 0 toxpwr = 3 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 9ecfa7fe18..70ca9b2900 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -522,7 +522,7 @@ datum result_amount = 3 plasmasolidification - name = "Solid Plasma" + name = "Solid Phoron" id = "solidplasma" result = null required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index de35439332..eb1b76957d 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -804,8 +804,8 @@ datum/design/mech_repair_droid category = "Exosuit Equipment" datum/design/mech_plasma_generator - name = "Exosuit Module Design (Plasma Converter Module)" - desc = "Exosuit-mounted plasma converter." + name = "Exosuit Module Design (Phoron Generator Module)" + desc = "Exosuit-mounted phoron generator." id = "mech_plasma_generator" build_type = MECHFAB req_tech = list("plasmatech" = 2, "powerstorage"= 2, "engineering" = 2) diff --git a/code/modules/research/rd-readme.dm b/code/modules/research/rd-readme.dm index 8680460c22..4d279cabba 100644 --- a/code/modules/research/rd-readme.dm +++ b/code/modules/research/rd-readme.dm @@ -34,7 +34,7 @@ When thinking about new stuff, check here to see if there are any slots unfilled //MATERIALS 1 | Metal -2 | Solid Plasma +2 | Solid Phoron 3 | Silver 4 | Gold, Super Capacitor 5 | Uranium, Nuclear Gun, SUPERPACMAN @@ -54,9 +54,9 @@ When thinking about new stuff, check here to see if there are any slots unfilled 19 | 20 | -//PLASMA TECH +//PHORON TECH 1 | -2 | Solid Plasma +2 | Solid Phoron 3 | Pacman Generator 4 | 5 | diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 103969bdd1..5c459092df 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -78,7 +78,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if("silver") return_name = "Silver" if("plasma") - return_name = "Solid Plasma" + return_name = "Solid Phoron" if("uranium") return_name = "Uranium" if("diamond") @@ -786,8 +786,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_lathe.silver_amount >= 10000) dat += "(5 Sheets) " if(linked_lathe.silver_amount >= 2000) dat += "(Max Sheets)" dat += "
    " - //Plasma - dat += "* [linked_lathe.plasma_amount] cm3 of Solid Plasma || " + //Phoron + dat += "* [linked_lathe.plasma_amount] cm3 of Solid Phoron || " dat += "Eject: " if(linked_lathe.plasma_amount >= 2000) dat += "(1 Sheet) " if(linked_lathe.plasma_amount >= 10000) dat += "(5 Sheets) " diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 1ec9093cfc..dd5c9ebbbc 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -189,7 +189,7 @@ datum/tech/engineering id = "engineering" datum/tech/plasmatech - name = "Plasma Research" + name = "Phoron Research" desc = "Research into the mysterious substance colloqually known as 'plasma'." id = "plasmatech" diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm index 67d56c6ee2..9628d5c003 100644 --- a/code/modules/research/xenoarchaeology/geosample.dm +++ b/code/modules/research/xenoarchaeology/geosample.dm @@ -85,7 +85,7 @@ age_million = rand(1,999) find_presence["iron"] = rand(1,1000) / 100 source_mineral = "iron" - if("Plasma") + if("Phoron") age_thousand = rand(1,999) age_million = rand(1,999) age_billion = rand(10, 13) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 2831e5ccc1..62cd53dfa4 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -89,7 +89,7 @@ dat += "[field_type=="iron"?"":"" ]Iron wafer conduction field
    " dat += "[field_type=="calcium"?"":"" ]Calcium binary deoxidiser
    " dat += "[field_type=="plasma"?"":"" ]Chlorine diffusion emissions
    " - dat += "[field_type=="plasma"?"":"" ]Plasma saturated field
    " + dat += "[field_type=="plasma"?"":"" ]Phoron saturated field
    " else dat += "
    " dat += "
    " diff --git a/code/setup.dm b/code/setup.dm index 9c3ef88a69..d69215bfa2 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -121,7 +121,7 @@ #define CARBON_LIFEFORM_FIRE_RESISTANCE 200+T0C #define CARBON_LIFEFORM_FIRE_DAMAGE 4 -//Plasma fire properties +//Phoron fire properties #define PHORON_MINIMUM_BURN_TEMPERATURE 100+T0C #define PHORON_FLASHPOINT 246+T0C #define PHORON_UPPER_TEMPERATURE 1370+T0C