diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index b335faf1d3..09e4bfcd53 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -174,6 +174,16 @@ assailant.visible_message("[assailant] covers [affecting]'s eyes!") if(affecting.eye_blind < 3) affecting.Blind(3) + //TFF 12/8/19 VoreStation Addition Start + if(BP_HEAD) + if(force_down) + if(announce) + assailant.visible_message("[assailant] sits on [target]'s head!") + if(target.silent < 3) + target.silent = 3 + if(target.eye_blind < 3) + target.Blind(3) + //VoreStation Addition End /obj/item/weapon/grab/attack_self() return s_click(hud) diff --git a/code/modules/mob/mob_grab_vr.dm b/code/modules/mob/mob_grab_vr.dm deleted file mode 100644 index 4e718f92b2..0000000000 --- a/code/modules/mob/mob_grab_vr.dm +++ /dev/null @@ -1,14 +0,0 @@ -//TFF 12/8/19 - Port ChompStation facesitting -/obj/item/weapon/grab/handle_eye_mouth_covering(mob/living/carbon/target, mob/user, var/target_zone) - var/announce = (target_zone != last_hit_zone) //only display messages when switching between different target zones - last_hit_zone = target_zone - - switch(target_zone) - if(BP_HEAD) - if(force_down) - if(announce) - assailant.visible_message("[assailant] moves their ass to [target]'s head, sitting down on them, making them unable to see anything else than [assailant]'s butt!") - if(target.silent < 3) - target.silent = 3 - if(target.eye_blind < 3) - target.Blind(3) \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index f69787733a..aa34b9fc18 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2073,7 +2073,6 @@ #include "code\modules\mob\mob_defines_vr.dm" #include "code\modules\mob\mob_grab.dm" #include "code\modules\mob\mob_grab_specials.dm" -#include "code\modules\mob\mob_grab_vr.dm" #include "code\modules\mob\mob_helpers.dm" #include "code\modules\mob\mob_movement.dm" #include "code\modules\mob\mob_planes.dm"