Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 61ccef6

Browse files
cowbot92cowbot92
committed
biome request
1 parent 64b6504 commit 61ccef6

File tree

4 files changed

+85
-84
lines changed

4 files changed

+85
-84
lines changed

‎code/modules/psionics/faculties/coercion.dm‎

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
cooldown = 5 SECONDS
2525
min_rank = PSI_RANK_OPERANT
2626
icon_state = "coe_commune"
27-
use_description = "Activate the power with z, then click on a creature on to psionically send them a message."
27+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on a creature on to psionically send them a message."
2828

2929
/datum/psionic_power/coercion/commune/invoke(mob/living/user, mob/living/target, proximity, parameters)
3030
if(!istype(target) || user == target)
@@ -46,6 +46,7 @@
4646
return TRUE
4747

4848
log_say("[key_name(user)] communed to [key_name(target)]: [text]")
49+
to_chat(user) "You succeed in sending your commune to [target]! Now to see if they listen..."
4950

5051
for (var/mob/M in GLOB.dead_mob_list)
5152
to_chat(M,span_notice("<b>[user] psionically says to [target]:</b> [text]"))
@@ -70,14 +71,14 @@
7071
cooldown = 5 SECONDS
7172
min_rank = PSI_RANK_OPERANT
7273
icon_state = "coe_assay"
73-
use_description = "Activate the power with z, then click on a target in order to perform a deep coercive-redactive probe of their psionic potential."
74+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on a target in order to perform a deep coercive-redactive probe of their psionic potential."
7475

7576
/datum/psionic_power/coercion/assay/invoke(mob/living/user, mob/living/target, proximity, parameters)
7677
if(!istype(target) || user == target)
7778
return FALSE
7879
. = ..()
7980
if(.)
80-
user.visible_message(span_warning("\The [user] holds the head of \the [target] in both hands..."))
81+
user.visible_message(span_warning("\The [user] taps into the the head of \the [target]..."))
8182
to_chat(user, span_notice("You insinuate your mentality into that of \the [target]..."))
8283
to_chat(target, span_warning("Your persona is being probed by the psychic lens of \the [user]."))
8384
var/speed = (4 - (user.psi.get_rank(PSI_COERCION) - 1)) SECONDS
@@ -89,71 +90,71 @@
8990
target.show_psi_assay(user)
9091
return TRUE
9192

92-
/datum/psionic_power/coercion/psiping
93-
name = "Psi-ping"
94-
cost = 50
95-
heat = 20
96-
cooldown = 20 SECONDS
97-
min_rank = PSI_RANK_OPERANT
98-
icon_state = "coe_psiping"
99-
use_description = "Activate the power with z, then click on yourself with an empty hand to detect nearby psionic signatures."
100-
var/searching = FALSE
101-
102-
/datum/psionic_power/coercion/psiping/invoke(mob/living/user, mob/living/target, proximity, parameters)
103-
if(user != target || searching)
104-
return FALSE
105-
. = ..()
106-
if(.)
107-
to_chat(user, span_notice("You take a moment to tune into the local Nlom..."))
108-
searching = TRUE
109-
if(!do_after(user, 3 SECONDS, user))
110-
searching = FALSE
111-
return FALSE
112-
searching = FALSE
113-
var/list/dirs = list()
114-
for(var/mob/living/L in GLOB.mob_living_list)
115-
var/turf/T = get_turf(L)
116-
if(!T || L == user || L.stat == DEAD || issilicon(L) || !(L.psi || isdarkspawn(L)) || (L.z != user.z))
117-
continue
118-
/*
119-
var/image/ping_image = image(icon = 'icons/effects/effects.dmi', icon_state = "sonar_ping", loc = user)
120-
ping_image.plane = LIGHTING_LAYER+1
121-
ping_image.layer = LIGHTING_LAYER+1
122-
ping_image.pixel_x = (T.x - user.x) * 32
123-
ping_image.pixel_y = (T.y - user.y) * 32
124-
user << ping_image
125-
addtimer(CALLBACK(GLOBAL_PROC, /proc/qdel, ping_image), 8)
126-
*/
127-
var/direction = num2text(angle2dir(Get_Angle(user, L)))
128-
var/dist
129-
if(text2num(direction))
130-
switch(get_dist(user, L))
131-
if(0 to 10)
132-
dist = "very close"
133-
if(10 to 20)
134-
dist = "close"
135-
if(20 to 30)
136-
dist = "a little ways away"
137-
if(30 to 40)
138-
dist = "farther away"
139-
else
140-
dist = "far away"
141-
else
142-
dist = "on top of you"
143-
LAZYINITLIST(dirs[direction])
144-
dirs[direction][dist] += 1
145-
if(length(dirs))
146-
var/list/feedback = list()
147-
feedback += "You sense..."
148-
for(var/d in dirs)
149-
feedback += "[capitalize(dir2text(text2num(d)))]:"
150-
for(var/dst in dirs[d])
151-
feedback += "[dirs[d][dst]] psionic signature\s [dst]."
93+
// /datum/psionic_power/coercion/psiping
94+
// name = "Psi-ping"
95+
// cost = 50
96+
// heat = 20
97+
// cooldown = 20 SECONDS
98+
// min_rank = PSI_RANK_OPERANT
99+
// icon_state = "coe_psiping"
100+
// use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on yourself with an empty hand to detect nearby psionic signatures."
101+
// var/searching = FALSE
102+
103+
// /datum/psionic_power/coercion/psiping/invoke(mob/living/user, mob/living/target, proximity, parameters)
104+
// if(user != target || searching)
105+
// return FALSE
106+
// . = ..()
107+
// if(.)
108+
// to_chat(user, span_notice("You take a moment to tune into the local Nlom..."))
109+
// searching = TRUE
110+
// if(!do_after(user, 3 SECONDS, user))
111+
// searching = FALSE
112+
// return FALSE
113+
// searching = FALSE
114+
// var/list/dirs = list()
115+
// for(var/mob/living/L in GLOB.mob_living_list)
116+
// var/turf/T = get_turf(L)
117+
// if(!T || L == user || L.stat == DEAD || issilicon(L) || !(L.psi || isdarkspawn(L)) || (L.z != user.z))
118+
// continue
119+
// /*
120+
// var/image/ping_image = image(icon = 'icons/effects/effects.dmi', icon_state = "sonar_ping", loc = user)
121+
// ping_image.plane = LIGHTING_LAYER+1
122+
// ping_image.layer = LIGHTING_LAYER+1
123+
// ping_image.pixel_x = (T.x - user.x) * 32
124+
// ping_image.pixel_y = (T.y - user.y) * 32
125+
// user << ping_image
126+
// addtimer(CALLBACK(GLOBAL_PROC, /proc/qdel, ping_image), 8)
127+
// */
128+
// var/direction = num2text(angle2dir(Get_Angle(user, L)))
129+
// var/dist
130+
// if(text2num(direction))
131+
// switch(get_dist(user, L))
132+
// if(0 to 10)
133+
// dist = "very close"
134+
// if(10 to 20)
135+
// dist = "close"
136+
// if(20 to 30)
137+
// dist = "a little ways away"
138+
// if(30 to 40)
139+
// dist = "farther away"
140+
// else
141+
// dist = "far away"
142+
// else
143+
// dist = "on top of you"
144+
// LAZYINITLIST(dirs[direction])
145+
// dirs[direction][dist] += 1
146+
// if(length(dirs))
147+
// var/list/feedback = list()
148+
// feedback += "You sense..."
149+
// for(var/d in dirs)
150+
// feedback += "[capitalize(dir2text(text2num(d)))]:"
151+
// for(var/dst in dirs[d])
152+
// feedback += "[dirs[d][dst]] psionic signature\s [dst]."
152153

153-
to_chat(user, span_notice(feedback.Join("<br>")))
154-
else
155-
to_chat(user, span_notice("You detect no psionic signatures but your own."))
156-
return TRUE
154+
// to_chat(user, span_notice(feedback.Join("<br>")))
155+
// else
156+
// to_chat(user, span_notice("You detect no psionic signatures but your own."))
157+
// return TRUE
157158

158159
/datum/psionic_power/coercion/agony
159160
name = "Agony"
@@ -162,7 +163,7 @@
162163
cooldown = 2 SECONDS
163164
min_rank = PSI_RANK_OPERANT
164165
icon_state = "coe_agony"
165-
use_description = "Activate the power with z, attack someone while in combat mode to deal minor stamina damage. Higher psi levels augment the damage done."
166+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, attack someone while in combat mode to deal minor stamina damage. Higher psi levels augment the damage done."
166167

167168
/datum/psionic_power/coercion/agony/invoke(mob/living/user, mob/living/target, proximity, parameters)
168169
if(!istype(target) || !proximity || user == target || !user.combat_mode)
@@ -182,7 +183,7 @@
182183
cooldown = 10 SECONDS
183184
min_rank = PSI_RANK_MASTER
184185
icon_state = "coe_spasm"
185-
use_description = "Activate the power with z, then target a creature to use a ranged attack that may rip the weapons away from the target."
186+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target a creature to use a ranged attack that may rip the weapons away from the target."
186187

187188
/datum/psionic_power/coercion/spasm/invoke(mob/living/user, mob/living/carbon/human/target, proximity, parameters)
188189
if(!istype(target) || user == target || !user.combat_mode)
@@ -206,7 +207,7 @@
206207
cooldown = 8 SECONDS
207208
min_rank = PSI_RANK_MASTER
208209
icon_state = "coe_focus"
209-
use_description = "Activate the power with z, then click on someone in order to cure ailments of the mind."
210+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on someone in order to cure ailments of the mind."
210211

211212
/datum/psionic_power/coercion/focus/invoke(mob/living/user, mob/living/target, proximity, parameters)
212213
if(!istype(target) || !proximity || user == target)
@@ -245,7 +246,7 @@
245246
cooldown = 25 SECONDS //It should take a WHILE to be able to use this again.
246247
min_rank = PSI_RANK_MASTER
247248
icon_state = "coe_mindread"
248-
use_description = "Activate the power with z, then click on someone in melee range to attempt to read a surface level thought."
249+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click on someone in melee range to attempt to read a surface level thought."
249250

250251
/datum/psionic_power/coercion/mindread/invoke(mob/living/user, mob/living/target, proximity, parameters)
251252
if(!istype(target) || target == user || !proximity)
@@ -282,7 +283,7 @@
282283
cooldown = 10 SECONDS
283284
min_rank = PSI_RANK_GRANDMASTER
284285
icon_state = "coe_blindstrike"
285-
use_description = "Activate the power with z, then click anywhere to use a radial attack that blinds, deafens and disorients everyone near you."
286+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click anywhere to use a radial attack that blinds, deafens and disorients everyone near you."
286287

287288
/datum/psionic_power/coercion/blindstrike/invoke(mob/living/user, mob/living/target, proximity, parameters)
288289
. = ..()
@@ -306,7 +307,7 @@
306307
cooldown = 10 SECONDS
307308
min_rank = PSI_RANK_PARAMOUNT
308309
icon_state = "coe_disarm"
309-
use_description = "Activate the power with z, then click your target with combat mode to Psionically rip their arms off."
310+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then click your target with combat mode to Psionically rip their arms off."
310311

311312
/datum/psionic_power/coercion/dis_arm/invoke(mob/living/user, mob/living/target, proximity, parameters)
312313
if(!user.combat_mode || user == target)

‎code/modules/psionics/faculties/energistics.dm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
cooldown = 7.5 SECONDS
1414
min_rank = PSI_RANK_OPERANT
1515
icon_state = "ene_ele"
16-
use_description = "Activate the power with z, then Enter combat mode to use a melee attack that electrocutes a victim, or charge an energy cell."
16+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, in an empty, then Enter combat mode to use a melee attack that electrocutes a victim, or charge an energy cell."
1717

1818
/datum/psionic_power/energistics/electrocute/invoke(mob/living/user, mob/living/target, proximity, parameters)
1919
if(!user.combat_mode || !istype(target) || !proximity)
@@ -39,7 +39,7 @@
3939
cooldown = 1 SECONDS
4040
min_rank = PSI_RANK_OPERANT
4141
icon_state = "ene_spark"
42-
use_description = "Activate the power with z, then target a non-living thing in melee range with combat mode on to cause some sparks to appear. This can light fires."
42+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target a non-living thing in melee range with combat mode on to cause some sparks to appear. This can light fires."
4343

4444
/datum/psionic_power/energistics/spark/invoke(mob/living/user, mob/living/target, proximity, parameters)
4545
if(!user.combat_mode || isnull(target) || istype(target) || !proximity)
@@ -64,7 +64,7 @@
6464
cooldown = 2 SECONDS
6565
min_rank = PSI_RANK_MASTER
6666
icon_state = "ene_zorch"
67-
use_description = "Activate the power with z, then use this ranged laser attack with combat mode on. Your mastery of Energistics will determine how powerful the laser is. Be wary of overuse, and try not to fry your own brain."
67+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then use this ranged laser attack with combat mode on. Your mastery of Energistics will determine how powerful the laser is. Be wary of overuse, and try not to fry your own brain."
6868

6969
/datum/psionic_power/energistics/zorch/invoke(mob/living/user, mob/living/target, proximity, parameters)
7070
. = ..()
@@ -111,7 +111,7 @@
111111
cooldown = 10 SECONDS
112112
min_rank = PSI_RANK_GRANDMASTER
113113
icon_state = "ene_disrupt"
114-
use_description = "Activate the power with z, then attack a target while in combat mode to cause a localized electromagnetic pulse."
114+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then attack a target while in combat mode to cause a localized electromagnetic pulse."
115115

116116
/datum/psionic_power/energistics/disrupt/invoke(mob/living/user, mob/living/target, proximity, parameters)
117117
if(!user.combat_mode || !istype(target) || !proximity)

‎code/modules/psionics/faculties/psychokenisis.dm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
cooldown = 3 SECONDS
1414
min_rank = PSI_RANK_OPERANT
1515
icon_state = "psy_blade"
16-
use_description = "Activate the power with z, summon a psiblade, or psibaton if the user is a pacifist. The power the blade/baton will vary based on your mastery of the faculty."
16+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, summon a psiblade, or psibaton if the user is a pacifist. The power the blade/baton will vary based on your mastery of the faculty."
1717
use_sound = 'sound/effects/psi/power_fabrication.ogg'
1818
admin_log = FALSE
1919

@@ -64,7 +64,7 @@
6464
cooldown = 10
6565
min_rank = PSI_RANK_OPERANT
6666
icon_state = "psy_tinker"
67-
use_description = "Activate the power with z, Use it in-hand to switch between tool types, different tools are available at different psi levels."
67+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, Use it in-hand to switch between tool types, different tools are available at different psi levels."
6868
use_sound = 'sound/effects/psi/power_fabrication.ogg'
6969
admin_log = FALSE
7070

@@ -98,7 +98,7 @@
9898
cooldown = 1 SECONDS
9999
min_rank = PSI_RANK_GRANDMASTER
100100
icon_state = "psy_tele"
101-
use_description = "Activate the power with z, to manifest a psychokinetic grip. Use it manipulate objects at a distance."
101+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, to manifest a psychokinetic grip. Use it manipulate objects at a distance."
102102
admin_log = FALSE
103103
use_sound = 'sound/effects/psi/power_used.ogg'
104104
var/list/valid_types = list( //a list of all

‎code/modules/psionics/faculties/redaction.dm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
cooldown = 3 SECONDS
3030
min_rank = PSI_RANK_OPERANT
3131
icon_state = "redac_skinsight"
32-
use_description = "Activate the power with z, then target the mob you wish to scan with combat mode off. Higher psi levels provide more information."
32+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target the mob you wish to scan with combat mode off. Higher psi levels provide more information."
3333

3434
/datum/psionic_power/redaction/skinsight/invoke(mob/living/user, mob/living/target, proximity, parameters)
3535
if(user.combat_mode || !istype(target) || !proximity)
@@ -47,7 +47,7 @@
4747
cooldown = 5 SECONDS
4848
min_rank = PSI_RANK_OPERANT
4949
icon_state = "redac_mend"
50-
use_description = "Activate the power with z, then target the mob you wish to heal with combat mode off. Higher psi levels provide further healing."
50+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target the mob you wish to heal with combat mode off. Higher psi levels provide further healing."
5151

5252
/datum/psionic_power/redaction/mend/invoke(mob/living/user, mob/living/carbon/human/target, proximity, parameters)
5353
if(user.combat_mode || !istype(target) || !proximity || !..())
@@ -124,7 +124,7 @@
124124
min_rank = PSI_RANK_OPERANT
125125
faculty = PSI_REDACTION
126126
icon_state = "redac_revive"
127-
use_description = "Activate the power with z, then target the mob you wish to revive with combat mode off. Has several limiting factors. Higher psi levels upgrade the revive."
127+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target the mob you wish to revive with combat mode off. Has several limiting factors. Higher psi levels upgrade the revive."
128128
admin_log = FALSE
129129

130130
/datum/psionic_power/revive/invoke(mob/living/user, mob/living/target, proximity, parameters)
@@ -162,7 +162,7 @@
162162
cooldown = 6 SECONDS
163163
min_rank = PSI_RANK_MASTER
164164
icon_state = "redac_cleanse"
165-
use_description = "Activate the power with z, then target the mob you wish cleanse with combat mode off. Cleanses radiation, clone damage, and toxins. Higher psi levels provide further cleansing."
165+
use_description = "Activate the power with the 'use' key (initially bound to Z) in an empty hand, then target the mob you wish cleanse with combat mode off. Cleanses radiation, clone damage, and toxins. Higher psi levels provide further cleansing."
166166

167167
/datum/psionic_power/redaction/cleanse/invoke(mob/living/user, mob/living/carbon/human/target, proximity, parameters)
168168
if(user.combat_mode || !istype(target) || !proximity)

0 commit comments

Comments
 (0)