Skip to content

Commit

Permalink
Merge pull request sojourn-13#5928 from MikeTheWallDweller/grammar-n-…
Browse files Browse the repository at this point in the history 
…stuff

Grammar n' stuff
  • Loading branch information
@Trilbyspaceclone
Trilbyspaceclone authored Jan 8, 2025
2 parents 3d04730 + 0ef3bf2 commit 8246947
Show file tree
Hide file tree
Showing 15 changed files with 95 additions and 95 deletions.
32 changes: 16 additions & 16 deletions code/modules/psionics/ear.dm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/machinery/eternal_ascension_resonances
name = "EGO: E.A.R. T-01-92beta S-23"// EGO as in the ego, T as in Tech, S for Sanity
desc = "A grand work of SI's psionic advancements. Marble pillars that only can hold psionic catalysts, converting the power of many into one."
description_info = "Design and prototyped by a non psionic CRO, many personal touches are engraved in runes, fractal patterns and small engraving of a name starting with a stylized T."
desc = "A grand work of SI's psionic advancements. Marble Pillars that can only hold psionic catalysts, converting the power of many into one."
description_info = "Designed and prototyped by a non-psionic CRO, many personal touches are engraved in runes, fractal patterns and small engraving of a name starting with a stylized T."
icon = 'icons/obj/psionic/occmachinery.dmi'
icon_state = "ear"
density = TRUE
Expand Down Expand Up @@ -55,7 +55,7 @@
if("Sure")
if(!active)
active = TRUE
to_chat(user, "As you press down a marbel plate the Pillars plasma bulbs start to dance inside the glass casings.")
to_chat(user, "As you press down on the marble plate, the plasma bulbs start to dance inside the glass casings.")
icon_state = "ear_active"
addtimer(CALLBACK(src, .proc/repice_index), wave_time)
else
Expand Down Expand Up @@ -96,7 +96,7 @@

/obj/machinery/eternal_ascension_resonances/proc/add_cube(obj/item/device/psionic_catalyst/PC, mob/user)
if(anti_cheat)
to_chat(user, "Your already thinking of the Pillar to add a catalyst!")
to_chat(user, "You're already thinking of the Pillar to insert a catalyst to!")
return

if(!PC.resonances)
Expand All @@ -105,51 +105,51 @@

anti_cheat = TRUE

var/choice = input(user, "What slot do you add the [PC] in?") as null|anything in list("Pillar One","Pillar Two","Pillar Three","Pillar Four")
var/choice = input(user, "What slot do you insert the [PC] in?") as null|anything in list("Pillar One","Pillar Two","Pillar Three","Pillar Four")

switch(choice)

if("Pillar One")
if(!slot_one)
to_chat(user, "You add [PC] into the First Pillar.")
to_chat(user, "You insert [PC]'s resonance into the First Pillar.")
else
to_chat(user, "You carefully take out the override the resonance in [PC], First Pillar.")
to_chat(user, "You carefully override the First Pillar's resonance with the one from the [PC].")
slot_one = PC.resonances
PC.resonances = null
anti_cheat = FALSE
return
if("Pillar Two")
if(!slot_two)
to_chat(user, "You add [PC]'resonance into the Second Pillar.")
to_chat(user, "You insert [PC]'s resonance into the Second Pillar.")
else
to_chat(user, "You carefully take out the override the resonance in [PC], Second Pillar.")
to_chat(user, "You carefully override the Second Pillar's resonance with the one from the [PC].")

slot_two = PC.resonances
PC.resonances = null
anti_cheat = FALSE
return
if("Pillar Three")
if(!slot_three)
to_chat(user, "You add [PC]'resonance into the Third Pillar.")
to_chat(user, "You insert [PC]'s resonance into the Third Pillar.")
else
to_chat(user, "You carefully take out the override the resonance in [PC], Third Pillar.")
to_chat(user, "You carefully override the Third Pillar's resonance with the one from the [PC].")

slot_three = PC.resonances
PC.resonances = null
anti_cheat = FALSE
return
if("Pillar Four")
if(!slot_four)
to_chat(user, "You add [PC]'resonance into the Forth Pillar.")
to_chat(user, "You insert [PC]'s resonance into the Fourth Pillar.")
else
to_chat(user, "You carefully take out the override the resonance in [PC], Forth Pillar.")
to_chat(user, "You carefully override the Fourth Pillar's resonance with the one from the [PC].")

slot_four = PC.resonances
PC.resonances = null
anti_cheat = FALSE

else
to_chat(user, "You add [PC]'resonance into the none of the Pillars.")
to_chat(user, "You add [PC]'s resonance into the none of the Pillars.")
anti_cheat = FALSE
return

Expand Down Expand Up @@ -292,7 +292,7 @@

/obj/structure/sign/ear
name = "EGO: E.A.R Music Sheet"
desc = "Contains helpful device on E.A.R recpies. Unless you're reading this placeholder text, at least."
desc = "Contains helpful advice on E.A.R recpies. Unless you're reading this placeholder text, at least."
icon = 'icons/obj/genetics/genetic_poster.dmi'
icon_state = "ear_poster"

Expand All @@ -312,4 +312,4 @@

desc = "Score Sheet of the Shift: [blurb]"
else
desc = "A helpful poster containing a resonance recipie already found in the SI Psionics Lab: Todays shift has no selected Score Sheet."
desc = "A helpful poster containing a resonance recipe already found in the SI Psionics Lab: Todays shift has no selected Score Sheet."
12 changes: 6 additions & 6 deletions code/modules/psionics/psion_powers/armour_powers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

/mob/living/carbon/human/proc/psionic_armor()
set category = "Psionic powers"
set name = "Psionic armor (4)"
set desc = "Creates a set of armor from somewhere that does not exist. Anything taken off disappears and whatever clothing you are wearing when this power is used is destroyed."
set name = "Psionic Armor (4)"
set desc = "Spend four psi points to don a set of armor from somewhere that does not exist. Anything taken off disappears and whatever clothing you are wearing when this power is used is destroyed."
var/psi_point_cost = 4
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -22,8 +22,8 @@

/mob/living/carbon/human/proc/Hpsi_armor()
set category = "Psionic powers"
set name = "Durable shell (8)"
set desc = "Creates a set of very strong armor, using your mind and the environment as the material. Each piece of armor replaces the clothes you are already wearing, and provides additional strength to your body, in exchange for your psionic abilities."
set name = "Durable Shell (8)"
set desc = "Spend eight psi points to don a set of very strong armor, using your mind and the environment as the materials. Each piece of armor replaces the clothes you are already wearing, and provides additional strength to your body, in exchange for your psionic abilities."
var/psi_point_cost = 8
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -40,8 +40,8 @@

/mob/living/carbon/human/proc/Light_psi_armor()
set category = "Psionic powers"
set name = "Void robe (6)"
set desc = "When applied, it creates an ultra-light protected cloak, spurring the wearer to new adventures in the kingdom of the king of dreams! Each part of the kit enhances the psion's thinking abilities and accelerates his step."
set name = "Void Robe (6)"
set desc = "Spend six psi points to don an ultra-light protective cloak, spurring the wearer to new adventures in the kingdom of the king of dreams! Each part of the kit enhances the psion's thinking abilities and accelerates his step."
var/psi_point_cost = 6
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/psionics/psion_powers/deepmaints_themed_powers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/mob/living/carbon/human/proc/bring_darkness()
set category = "Psionic powers"
set name = "Bring Darkness (3)"
set desc = "Expend three psi points to break all the lights connected to the power grid near you. Does not work on independent light sources, sunlight, or grant you sight in darkness."
set desc = "Spend three psi points to break all the lights connected to the power grid near you. Does not work on independent light sources, sunlight, and doesn't grant you sight in the dark."
var/psi_point_cost = 3
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -24,7 +24,7 @@
/mob/living/carbon/human/proc/kings_decorum()
set category = "Psionic powers"
set name = "Kings Decorum (2)"
set desc = "Expend two psi points to expel gore, blood, and smoke to decorate the world as the king desires."
set desc = "Spend two psi points to expel gore, blood, and smoke to decorate the world as the king desires."
var/psi_point_cost = 2
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand Down Expand Up @@ -102,7 +102,7 @@
/mob/living/carbon/human/proc/ascend_another()
set category = "Psionic powers"
set name = "Psionic Ascension (5)"
set desc = "Expend five psi points to ascend someone standing in front of you, making them a psion. The process is extremely damaging to the mind and you must stand still during it."
set desc = "Spend five psi points to ascend someone standing in front of you, making them a psion. The process is extremely damaging to the mind and you must stand still during it."
var/psi_point_cost = 5
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand Down Expand Up @@ -132,7 +132,7 @@
/mob/living/carbon/human/proc/cerebral_hemorrhage()
set category = "Psionic powers"
set name = "Cerebral Hemorrhage (5)"
set desc = "Expend five psi points to destroy the brain of anyone you are grappling. Lesser creatures will be instantly slain in a messy fashion, unless they are harmless."
set desc = "Spend five psi points to destroy the brain of anyone you are grappling. Lesser creatures will be instantly slain in a messy fashion, unless they are harmless."
var/psi_point_cost = 5
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/psionics/psion_powers/faction_powers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/mob/living/carbon/human/proc/nightmare_mind()
set category = "Psionic powers"
set name = "Nightmarish Mind (1)"
set desc = "Expend a single psi point to realign your mind to that of nightmare stalkers, causing them to not react to your presence, even when you attack them. May have unforseen consequences."
set desc = "Spend a single psi point to realign your mind to that of nightmare stalkers, causing them to not react to your presence, even when you attack them. May have unforseen consequences."
var/psi_point_cost = 1
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand Down
36 changes: 18 additions & 18 deletions code/modules/psionics/psion_powers/gear_summoning_powers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/mob/living/carbon/human/proc/psionic_omnitool()
set category = "Psionic powers"
set name = "Telekinetic Omnitool (2)"
set desc = "Expend two points of your psi essence to create an omnitool. It disappears when dropped or if it leaves your hand."
set desc = "Spend two psi points to create an omnitool. It disappears when dropped or if it leaves your hand."
var/psi_point_cost = 2
var/stat_mec = 25
var/stat_bio = 25
Expand Down Expand Up @@ -37,7 +37,7 @@
/mob/living/carbon/human/proc/pyrokinetic_spark()
set category = "Psionic powers"
set name = "Pyrokinetic Spark (1)"
set desc = "Expend a single point of your psi essence to create a tiny flickering fire in your hand that will shine light and ignite combustible materials, can be thrown but will extinguish quickly."
set desc = "Spend a single psi point to create a tiny flickering fire in your hand that will shine light and ignite combustible materials, can be thrown but will extinguish quickly."
var/psi_point_cost = 1
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -54,7 +54,7 @@
/mob/living/carbon/human/proc/psionic_knife()
set category = "Psionic powers"
set name = "Psychic Blade (1)"
set desc = "Expend a single point of your psi essence to create a low quality but still deadly knife. It's power and damage scale with your robustness."
set desc = "Spend a single psi point to create a shoddy, yet still deadly knife. It's power and damage scale with your robustness."
var/psi_point_cost = 1
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -71,9 +71,9 @@
/mob/living/carbon/human/proc/psionic_shield()
set category = "Psionic powers"
set name = "Psychic Shield (1)"
set desc = "Expend a single point of your psi essence to create an energy shield capable of blocking melee attacks. \
If you already have a shield inhand it will enhance it making it capable of blocking lasers and bullets at the cost of its durablity.\
If the shield inhand is already enhanced it will be be healed"
set desc = "Spend a single psi point to create an energy shield capable of blocking melee attacks. \
If you already have a shield in-hand, it will be enhanced instead, making it capable of blocking lasers and bullets at the cost of its durablity.\
If the shield in-hand is already enhanced, it will be be repaired instead."
var/psi_point_cost = 1
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand Down Expand Up @@ -122,7 +122,7 @@
if(successfully_enhanced || num_of_shields >= 2)
user.visible_message(
"[user] looks at the psy-shield and forcefully compresses it!",
"Its hard to tell but you can feel that the shield well more solidified. This should be able capable of blocking lasers and bullets."
"It's hard to tell, but you can feel that the shield became more solid. It should be able to block lasers and bullets now."
)
return

Expand All @@ -140,7 +140,7 @@
if (user.stats.getStat(STAT_TGH) >= STAT_LEVEL_PROF || user.stats.getPerk(PERK_PSI_MANIA))
user.visible_message(
"[user] looks at the psy-shield and forcefully compresses it!",
"Its hard to tell but you can feel that the shield well more solidified. This should be able capable of blocking lasers and bullets."
"It's hard to tell, but you can feel that the shield became more solid. It should be able to block lasers and bullets now."
)
shield.can_block_proj = TRUE
shield.base_block_chance += 10
Expand All @@ -154,7 +154,7 @@
/mob/living/carbon/human/proc/psionic_shield_layered()
set category = "Psionic powers"
set name = "Layered Psychic Shield (1)"
set desc = "Expend a single point of your psi essence to create a layered shield capable of blocking bullets, energy beams, and melee attacks."
set desc = "Spend a single psi point to create a layered shield capable of blocking bullets, energy beams and melee attacks."
var/psi_point_cost = 1
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -175,8 +175,8 @@
/mob/living/carbon/human/proc/telekinetic_fist()
set category = "Psionic powers"
set name = "Telekinetic Fist (1)"
set desc = "Expend a single point of your psi essence to create a telekinetic fist, hitting some with it in melee will damage and knock them back. It's knockback and power \
scales with your physical robustness."
set desc = "Spend a single psi point to create a telekinetic fist, a single-use melee weapon that knocks your foes back. It's knockback and power \
scales with your robustness."
var/psi_point_cost = 1
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -193,7 +193,7 @@
/mob/living/carbon/human/proc/kinetic_barrier()
set category = "Psionic powers"
set name = "Kinetic Barrier (2)"
set desc = "Expend two psi points to create a psychic barrier a short distance from where the psion is facing. It blocks all movement and projectiles, but not vision."
set desc = "Spend two psi points to create a wide, psychic barrier in front of you. It blocks all movement and projectiles, but not vision."
var/psi_point_cost = 2
var/timer = 10 SECONDS
var/mob/living/carbon/human/user = src
Expand All @@ -215,7 +215,7 @@
/mob/living/carbon/human/proc/kinetic_blaster()
set category = "Psionic powers"
set name = "Kinetic Orb (0)"
set desc = "Expend none of your essence to create a kinetic orb in hand, a ranged weapon that grows in power with your cognition and expends a single psi point per shot."
set desc = "Create a kinetic orb in your hand at no cost to your psi points. It acts as a ranged weapon that grows in power with your cognition and uses a single psi point per shot."
var/psi_point_cost = 0
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -233,8 +233,8 @@
/mob/living/carbon/human/proc/cryo_kinetic_blaster()
set category = "Psionic powers"
set name = "Cryo-Kinetic Orb (0)"
set desc = "Expend none of your essence to create a cryo-kinetic orb in hand, a ranged weapon that grows in power with your cognition and expends four psi points per shot. \
Deals no damage on its own, but the sudden blast of cold stuns whoever it hits for a short time."
set desc = "Create a cryo-kinetic orb in your hand at no cost to your psi points. It acts as a ranged weapon that grows in power with your cognition and uses four psi points per shot. \
Deals no damage on its own, but the sudden blast of cold can stun your target for a short time."
var/psi_point_cost = 0
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand All @@ -251,7 +251,7 @@
/mob/living/carbon/human/proc/pyro_kinetic_blaster()
set category = "Psionic powers"
set name = "Pyro-Kinetic Orb (0)"
set desc = "Expend none of your essence to create a pyro-kinetic orb in hand, a ranged weapon that grows in power with your cognition and expends three psi points per explosive shot. \
set desc = "Create a pyro-kinetic orb in your hand at no cost to your psi points. It acts as a ranged weapon that grows in power with your cognition and uses three psi points per shot. \
The heat generated from pyro blasts fast enough to not cause fires, but the sudden expansion of hot air is highly explosive."
var/psi_point_cost = 0
var/mob/living/carbon/human/user = src
Expand All @@ -269,7 +269,7 @@
/mob/living/carbon/human/proc/electro_kinetic_blaster()
set category = "Psionic powers"
set name = "Electro-Kinetic Orb (0)"
set desc = "Expend none of your essence to create a electro-kinetic orb in hand, a ranged weapon that grows in power with your cognition and expends a two psi points per shot. \
set desc = "Create an electro-kinetic orb in your hand at no cost to your psi points. It acts as a ranged weapon that grows in power with your cognition and uses two psi points per shot. \
Much stronger than kinetic blasts and doesn't need to travel towards its target, being electric."
var/psi_point_cost = 0
var/mob/living/carbon/human/user = src
Expand All @@ -287,7 +287,7 @@
/mob/living/carbon/human/psionic_tumor/proc/needle_n_thread()
set category = "Psionic powers"
set name = "Psionic Suture (1)"
set desc = "Expend one of your essence to create a psionic suture in hand, able to stop bleeding. If you are more psionically gifted, it can even help heal wounds."
set desc = "Spend a single psi point to create a psionic suture in hand, which can be used to stop bleeding and to close wounds."
var/psi_point_cost = 1
var/mob/living/carbon/human/user = src
var/obj/item/organ/internal/psionic_tumor/PT = user.first_organ_by_process(BP_PSION)
Expand Down
Loading

0 comments on commit 8246947

Please sign in to comment.