cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 07:04:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Post-testing fixes

Browse Source
This commit is contained in:
Heroman
2021-12-04 19:48:59 +10:00
parent 2e29a40ef7
commit 76df8bf18b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/bsharpoon_vr.dm
+5 -3
View File
@@ -129,6 +129,7 @@
user.forceMove(pick(trange(24,user)))
else
user.forceMove(ToTurf)
var/vore_happened = FALSE
if(can_dropnom && living_user.can_be_drop_pred)
var/obj/belly/belly_dest
if(living_user.vore_selected)
@@ -139,9 +140,10 @@
for(var/mob/living/prey in ToTurf)
if(prey.can_be_drop_prey)
prey.forceMove(belly_dest)
vore_happened = TRUE
to_chat(prey, "<span class='danger'>[living_user] materializes around you, as you end up in their [belly_dest]!</span>")
to_chat(living_user, "<span class='notice'>You materialize around [prey] as they end up in your [belly_dest]!</span>")
else if(can_dropnom && living_user.can_be_drop_prey)
if(can_dropnom && !vore_happened && living_user.can_be_drop_prey)
var/mob/living/pred
for(var/mob/living/potential_pred in ToTurf)
if(potential_pred.can_be_drop_pred)
@@ -155,7 +157,7 @@
if(belly_dest)
living_user.forceMove(belly_dest)
to_chat(pred, "<span class='notice'>[living_user] materializes inside you as they end up in your [belly_dest]!</span>")
to_chat(living_user, "<span class='danger'>You materialize inside [pred] as you end up in your [belly_dest]!</span>")
to_chat(living_user, "<span class='danger'>You materialize inside [pred] as you end up in their [belly_dest]!</span>")
else
for(var/obj/O in FromTurf)
@@ -181,7 +183,7 @@
if(belly_dest)
M.forceMove(belly_dest)
to_chat(living_user, "<span class='notice'>[M] materializes inside you as they end up in your [belly_dest]!</span>")
to_chat(M, "<span class='danger'>You materialize inside [living_user] as you end up in your [belly_dest]!</span>")
to_chat(M, "<span class='danger'>You materialize inside [living_user] as you end up in their [belly_dest]!</span>")
else if(can_dropnom && living_user.can_be_drop_prey && M.can_be_drop_pred && !user_vored)
var/obj/belly/belly_dest
if(M.vore_selected)