cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors throw vore code. Again. (#12868)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-07-02 23:12:42 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent 60a0796797
commit 0ab75ff4ef
7 changed files with 93 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/vore/spontaneous_vore.dm
+3 -5
View File
@@ -78,14 +78,12 @@
//Handle object throw vore
if(isitem(hitby))
var/obj/item/O = hitby
var/obj/belly/destination_belly = source.get_current_spont_belly(O)
var/obj/item/thrown_object = hitby
var/obj/belly/destination_belly = source.get_current_spont_belly(thrown_object)
if(!destination_belly)
return
if(source.stat != DEAD && source.trash_catching)
if(source.expanded_trasheat || is_type_in_list(O, GLOB.edible_trash) && O.trash_eatable && !is_type_in_list(O, GLOB.item_vore_blacklist))
source.visible_message(span_vwarning("[O] is thrown directly into [source]'s [lowertext(destination_belly.name)]!"))
destination_belly.nom_atom(O)
if(source.eat_trash_proc(thrown_object, thrown = TRUE))
return COMSIG_CANCEL_HITBY
//Throwing a prey into a pred takes priority. After that it checks to see if the person being thrown is a pred.