From de2438a860dea337fdd312b95b78a55dac1f616f Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Mon, 12 Aug 2019 10:14:10 -0400 Subject: [PATCH 1/3] Find Your Seats Ports ChompStation facesitting, pretty much. :> --- code/modules/mob/mob_grab_vr.dm | 14 ++++++++++++++ vorestation.dme | 1 + 2 files changed, 15 insertions(+) create mode 100644 code/modules/mob/mob_grab_vr.dm diff --git a/code/modules/mob/mob_grab_vr.dm b/code/modules/mob/mob_grab_vr.dm new file mode 100644 index 00000000000..4e718f92b28 --- /dev/null +++ b/code/modules/mob/mob_grab_vr.dm @@ -0,0 +1,14 @@ +//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 aa34b9fc183..f69787733a4 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2073,6 +2073,7 @@ #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" From 58d1a95454a147d0b7faffbf7810bd2a696ea3c1 Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Mon, 12 Aug 2019 16:51:43 -0400 Subject: [PATCH 2/3] Sod it Spent like five hours trying to get it to work in a different file but it might well be better to just.... Do a 1:1 port with //VoreStation edit comments as per code practice here. --- code/modules/mob/mob_grab.dm | 10 ++++++++++ code/modules/mob/mob_grab_vr.dm | 14 -------------- vorestation.dme | 1 - 3 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 code/modules/mob/mob_grab_vr.dm diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index b335faf1d37..09e4bfcd53b 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 4e718f92b28..00000000000 --- 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 f69787733a4..aa34b9fc183 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" From 223c23c100339af987036bf0b9ec57630ca7e398 Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Mon, 12 Aug 2019 18:02:34 -0400 Subject: [PATCH 3/3] No Blindess Make it so you're not mechanically blind so you can hear regular emotes. But ICly, you'd still be blind, so.... Go nuts with that. :> --- code/modules/mob/mob_grab.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 09e4bfcd53b..7ad90dfc43f 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -179,10 +179,6 @@ 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()