Revert "Psionics Rework: Kyoushiki Murasaki (#16805)" (#16948)

This reverts commit 27c40bdaf6.
This commit is contained in:
Matt Atlas
2023-07-31 01:51:40 +00:00
committed by GitHub
parent 06ca379a91
commit 87f637564f
145 changed files with 1617 additions and 3162 deletions
-18
View File
@@ -284,26 +284,8 @@
var/laser = (damage_flags & DAMAGE_FLAG_LASER)
var/sharp = (damage_flags & DAMAGE_FLAG_SHARP)
var/edge = (damage_flags & DAMAGE_FLAG_EDGE)
var/psionic = HAS_FLAG(damage_flags, DAMAGE_FLAG_PSIONIC)
var/blunt = !!(brute && !sharp && !edge)
/// Psionics and psionically deaf species take varying amounts of damage from psionic abilities.
if(psionic)
if(!owner.has_psionics())
brute *= 0.9
burn *= 0.9
else if(owner.psi)
var/psi_rank = owner.psi.get_rank()
if(psi_rank == PSI_RANK_SENSITIVE)
brute *= 1.05
burn *= 1.05
else if(psi_rank == PSI_RANK_HARMONIOUS)
brute *= 1.1
burn *= 1.1
else if(psi_rank == PSI_RANK_APEX)
brute *= 1.2
burn *= 1.2
if(status & ORGAN_BROKEN && prob(40) && brute)
if(owner && (owner.can_feel_pain()) && owner.stat == CONSCIOUS)
owner.emote(pick("scream", "groan")) //getting hit on broken hand hurts
+1
View File
@@ -529,6 +529,7 @@
organ_tag = BP_AUG_COCHLEAR
parent_organ = BP_HEAD
// Snakebitten!
/obj/item/organ/internal/augment/psi
name = "psionic receiver"
desc = "An augment installed into the head that functions as a surrogate for a missing zona bovinae, also functioning as a filter for the psionically-challenged."