General fixes to skrell psionics. (#7826)

tweak: "Psiping is now activated by activating an empty hand on help intent."
    tweak: "Commune is now activated by clicking on someone on help intent while aiming for the mouth."
    tweak: "Psiping and Commune no longer make sounds."
This commit is contained in:
Matt Atlas
2019-12-28 20:14:31 +02:00
committed by Erki
parent 0b588dfa54
commit 9fbbfc2546
8 changed files with 73 additions and 19 deletions
@@ -827,8 +827,6 @@
sleeping += 1
Paralyse(5)
confused = max(0, confused - 1)
// If you're dirty, your gloves will become dirty, too.
if(gloves && germ_level > gloves.germ_level && prob(10))
gloves.germ_level += 1
+3
View File
@@ -106,6 +106,9 @@
if(!weakened)
update_icons()
if(confused)
confused = max(0, confused - 1)
/mob/living/proc/handle_disabilities()
//Eyes
if(sdisabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
+1 -1
View File
@@ -19,4 +19,4 @@
apply_psi_effect(thing)
/datum/event/psi/proc/apply_psi_effect(var/datum/psi_complexus/psi)
return
return psi && ishuman(psi.owner)
+5 -1
View File
@@ -34,9 +34,13 @@
/datum/event/minispasm/proc/do_spasm(var/mob/living/victim, var/obj/item/device/radio/source)
set waitfor = 0
playsound(source, 'sound/effects/narsie.ogg', 75) //LOUD AS FUCK BOY
if(!ishuman(victim))
to_chat(victim, "<span class='notice'>An annoying buzz passes through your head.</span>")
return
if(victim.psi)
playsound(source, 'sound/effects/narsie.ogg', 75) //LOUD AS FUCK BOY
to_chat(victim, span("danger", "A hauntingly familiar sound hisses from \icon[source] \the [source], and your vision flickers!"))
victim.psi.backblast(rand(5,15))
victim.Paralyse(5)
+1
View File
@@ -6,6 +6,7 @@
)
/datum/event/psi/balm/apply_psi_effect(var/datum/psi_complexus/psi)
..()
var/soothed
if(psi.stun > 1)
psi.stun--
+1
View File
@@ -6,6 +6,7 @@
)
/datum/event/psi/wail/apply_psi_effect(var/datum/psi_complexus/psi)
..()
var/annoyed
if(prob(1))
psi.stunned(1)
+18 -15
View File
@@ -213,16 +213,17 @@
return TRUE
/datum/psionic_power/coercion/commune
name = "Commune"
cost = 10
cooldown = 80
use_melee = TRUE
use_ranged = TRUE
min_rank = PSI_RANK_OPERANT
use_description = "Target the mouth and click on a creature on disarm intent to psionically send them a message."
name = "Commune"
cost = 10
cooldown = 15
use_melee = TRUE
use_ranged = TRUE
min_rank = PSI_RANK_OPERANT
use_sound = null
use_description = "Target the mouth and click on a creature on disarm intent to psionically send them a message."
/datum/psionic_power/coercion/commune/invoke(var/mob/living/user, var/mob/living/target)
if(user.zone_sel.selecting != "mouth")
if((target == user) || user.zone_sel.selecting != BP_MOUTH)
return FALSE
. = ..()
if(.)
@@ -276,15 +277,17 @@
to_chat(H,"<span class='warning'>Your mind buzzes...</span>")
/datum/psionic_power/coercion/psiping
name = "Psi-ping"
cost = 30
cooldown = 250
use_melee = TRUE
min_rank = PSI_RANK_OPERANT
use_description = "Click on yourself with an empty hand on disarm intent to detect nearby psionic signatures."
name = "Psi Ping"
cost = 5
cooldown = 30
use_melee = TRUE
use_manifest = TRUE
min_rank = PSI_RANK_OPERANT
use_sound = null
use_description = "Activate an empty hand on disarm intent to detect nearby psionic signatures."
/datum/psionic_power/coercion/psiping/invoke(var/mob/living/user, var/mob/living/target)
if((target && user != target))
if((target && user != target) && user.a_intent != I_HELP)
return FALSE
. = ..()
if(.)