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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-05 12:42:03 -05:00
committed by GitHub
parent 10b99691df
commit 5a4db1f1ac
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/digest_act_vr.dm
-4
View File
@@ -75,9 +75,6 @@
qdel(O)
else if(item_storage)
O.forceMove(item_storage)
<<<<<<< HEAD
qdel(src)
=======
if(istype(src,/obj/item/stack))
var/obj/item/stack/S = src
if(S.get_amount() <= 1)
@@ -89,7 +86,6 @@
qdel(src)
if(g_damage > w_class)
return w_class
>>>>>>> 04c4c68140... Merge pull request #11918 from Verkister/patch-102
return g_damage
/////////////