cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes the knockout from high level bloodsucker mesmerize since it makes the ability weaker (#17917)

Browse Source 
* Removes the knockout from high level bloodsucker mesmerize since it makes the ability weaker

* Update mesmerize.dm

* killing you
This commit is contained in:
Theos
2023-02-16 20:08:18 -05:00
committed by GitHub
parent 7d664d3af5
commit 6ebf0318d9
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/antagonists/bloodsuckers/powers/targeted/mesmerize.dm
View File

@@ -5,7 +5,6 @@
* Level 2: Additionally mutes * Level 2: Additionally mutes
* Level 3: Can be used through face protection * Level 3: Can be used through face protection
* Level 5: Doesn't need to be facing you anymore * Level 5: Doesn't need to be facing you anymore
* Level 6: Causes the target to fall asleep
*/ */
/datum/action/bloodsucker/targeted/mesmerize /datum/action/bloodsucker/targeted/mesmerize
@@ -20,7 +19,6 @@
At level 1, your target will additionally be muted.\n\ At level 1, your target will additionally be muted.\n\
At level 3, you will be able to use the power through items covering your face.\n\ At level 3, you will be able to use the power through items covering your face.\n\
At level 5, you will be able to mesmerize regardless of your target's direction.\n\ At level 5, you will be able to mesmerize regardless of your target's direction.\n\
At level 6, you will cause your target to fall asleep.\n\
Higher levels will increase the time of the mesmerize's freeze." Higher levels will increase the time of the mesmerize's freeze."
power_flags = BP_AM_TOGGLE power_flags = BP_AM_TOGGLE
check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_IN_FRENZY|BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_IN_FRENZY|BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS
@@ -106,9 +104,7 @@
if(iscarbon(target)) if(iscarbon(target))
var/mob/living/carbon/mesmerized = target var/mob/living/carbon/mesmerized = target
to_chat(owner, span_notice("Successfully mesmerized [mesmerized].")) to_chat(owner, span_notice("Successfully mesmerized [mesmerized]."))
if(level_current >= 6) if(level_current >= 1)
mesmerized.SetUnconscious(power_time)
else if(level_current >= 1)
ADD_TRAIT(mesmerized, TRAIT_MUTE, BLOODSUCKER_TRAIT) ADD_TRAIT(mesmerized, TRAIT_MUTE, BLOODSUCKER_TRAIT)
mesmerized.Immobilize(power_time) mesmerized.Immobilize(power_time)
//mesmerized.silent += power_time / 10 // Silent isn't based on ticks. //mesmerized.silent += power_time / 10 // Silent isn't based on ticks.