cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes enthrall follow the same rules as bloodsucking (#10917)

Browse Source 
* Makes enthrall more consistent with bloodsucking

* Adds changelog

* removes copypaste, adds suck, species that don't breathe oxygen are Ok again

* Removes ability to enthrall while resting
This commit is contained in:
JustSumBody
2016-07-26 15:33:06 -04:00
committed by clusterfack
parent 807f27f601
commit f36f1f14a5
3 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/mob/living/carbon/human/human_attackhand.dm
View File

@@ -6,15 +6,8 @@
//Vampire code
if(M.zone_sel && M.zone_sel.selecting == LIMB_HEAD && src != M)
if(M.mind && isvampire(M) && !M.mind.vampire.draining)
if(src.check_body_part_coverage(MOUTH))
to_chat(M, "<span class='warning'>Remove their mask!</span>")
if(!M.can_suck(src))
return 0
if(M.check_body_part_coverage(MOUTH))
if(M.species.breath_type == "oxygen")
to_chat(M, "<span class='warning'>Remove your mask!</span>")
return 0
else
to_chat(M, "<span class='notice'>With practiced ease, you shift aside your mask for each gulp of blood.</span>")
if(mind && mind.vampire && (mind in ticker.mode.vampires))
to_chat(M, "<span class='warning'>Your fangs fail to pierce [src.name]'s cold flesh.</span>")
return 0