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

Commit f590cf2

Browse files
committed
actually nevermind this is better
1 parent 93888cb commit f590cf2

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

code/modules/psionics/faculties/coercion.dm

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -297,25 +297,25 @@
297297
M.adjust_confusion(10 SECONDS)
298298
return TRUE
299299

300-
// /datum/psionic_power/coercion/dis_arm
301-
// name = "Dis-Arm"
302-
// cost = 10
303-
// heat = 10
304-
// cooldown = 10 SECONDS
305-
// min_rank = PSI_RANK_PARAMOUNT
306-
// icon_state = "coe_disarm"
307-
// 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."
308-
309-
// /datum/psionic_power/coercion/dis_arm/invoke(mob/living/user, mob/living/target, proximity, parameters)
310-
// if(!user.combat_mode || user == target)
311-
// return FALSE
312-
// . = ..()
313-
// if(.)
314-
// user.visible_message(span_danger("\The [user] grows two psionic arms, ripping [target]'s arms off!"))
315-
// to_chat(user, span_danger("You channel your full mental might into ripping and tearing!"))
316-
// var/mob/living/carbon/CM = target
317-
// for(var/obj/item/bodypart/bodypart in CM.bodyparts)
318-
// if(!(bodypart.body_part & (HEAD|CHEST|LEGS)))
319-
// if(bodypart.dismemberable)
320-
// bodypart.dismember()
321-
// return TRUE
300+
/datum/psionic_power/coercion/dis_arm
301+
name = "Dis-Arm"
302+
cost = 40
303+
heat = 50
304+
cooldown = 100 SECONDS
305+
min_rank = PSI_RANK_PARAMOUNT
306+
icon_state = "coe_disarm"
307+
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."
308+
309+
/datum/psionic_power/coercion/dis_arm/invoke(mob/living/user, mob/living/target, proximity, parameters)
310+
if(!user.combat_mode || user == target)
311+
return FALSE
312+
. = ..()
313+
if(.)
314+
user.visible_message(span_danger("\The [user] grows two psionic arms, ripping [target]'s arms off!"))
315+
to_chat(user, span_danger("You channel your full mental might into ripping and tearing!"))
316+
var/mob/living/carbon/CM = target
317+
for(var/obj/item/bodypart/bodypart in CM.bodyparts)
318+
if(!(bodypart.body_part & (HEAD|CHEST|LEGS)))
319+
if(bodypart.dismemberable)
320+
bodypart.dismember()
321+
return TRUE

0 commit comments

Comments
 (0)