cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-03-25 20:50:37 -07:00
committed by GitHub
parent 6889922b1c
commit b127f14201
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/turfs/simulated.dm
View File

@@ -154,13 +154,8 @@
if(M.slip("the [floor_type] floor", slip_stun)) if(M.slip("the [floor_type] floor", slip_stun))
for(var/i = 1 to slip_dist) for(var/i = 1 to slip_dist)
<<<<<<< HEAD
if(M.slip_vore_in_progress) //CHOMPEdit
break //CHOMPEdit
=======
if(isbelly(M.loc)) //VOREEdit, Stop the slip if we're in a belly. Inspired by a chompedit, cleaned it up with isbelly instead of a variable since the var was resetting too fast. if(isbelly(M.loc)) //VOREEdit, Stop the slip if we're in a belly. Inspired by a chompedit, cleaned it up with isbelly instead of a variable since the var was resetting too fast.
return return
>>>>>>> 1dad102bf4... Merge pull request #12539 from FartMaster69420/slip-nom
step(M, M.dir) step(M, M.dir)
sleep(1) sleep(1)
else else