cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2021-12-10 01:27:04 -07:00
committed by GitHub
parent 3ff1fc8beb
commit 783c579b36
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/guns/energy/bsharpoon_vr.dm
View File

@@ -124,8 +124,6 @@
user.forceMove(pick(trange(24,user))) user.forceMove(pick(trange(24,user)))
else else
user.forceMove(ToTurf) user.forceMove(ToTurf)
<<<<<<< HEAD
=======
var/vore_happened = FALSE var/vore_happened = FALSE
if(can_dropnom && living_user.can_be_drop_pred) if(can_dropnom && living_user.can_be_drop_pred)
var/obj/belly/belly_dest var/obj/belly/belly_dest
@@ -158,7 +156,6 @@
to_chat(pred, "<span class='notice'>[living_user] materializes inside you as they end up in your [belly_dest]!</span>") 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 their [belly_dest]!</span>") to_chat(living_user, "<span class='danger'>You materialize inside [pred] as you end up in their [belly_dest]!</span>")
>>>>>>> 21f62265ec... Merge pull request #11991 from Very-Soft/noselfvoar
else else
for(var/obj/O in FromTurf) for(var/obj/O in FromTurf)
if(O.anchored) continue if(O.anchored) continue