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

fix liquid transfer (#9581)

Browse Source
This commit is contained in:
Kashargul
2024-12-06 09:57:38 +01:00
committed by GitHub
parent 1e3d0f5d8b
commit c01568e213
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/reagents/holder/holder_ch.dm
View File

@@ -4,12 +4,15 @@
if(!target || !istype(target)) if(!target || !istype(target))
return return
if(iscarbon(target)) if(isliving(target))
var/mob/living/carbon/C = target
if(type == CHEM_VORE) if(type == CHEM_VORE)
var/datum/reagents/R = target_belly.reagents var/datum/reagents/R = target_belly.reagents
if(!R)
R = new /datum/reagents(amount)
target_belly.reagents = R
return trans_to_holder(R, amount, multiplier, copy) return trans_to_holder(R, amount, multiplier, copy)
if(type == CHEM_INGEST) if(type == CHEM_INGEST && iscarbon(target))
var/mob/living/carbon/C = target
var/datum/reagents/R = C.ingested var/datum/reagents/R = C.ingested
return C.ingest(src, R, amount, multiplier, copy) return C.ingest(src, R, amount, multiplier, copy)

4
code/modules/vore/eating/living_ch.dm
View File

@@ -163,7 +163,7 @@
return FALSE return FALSE
if(!Adjacent(TR) || !Adjacent(TG)) if(!Adjacent(TR) || !Adjacent(TG))
return //No long distance transfer return //No long distance transfer
if(!TR.reagents.get_free_space()) if(!TB.reagents?.get_free_space())
to_chat(user, span_vnotice("[TB] is full!")) to_chat(user, span_vnotice("[TB] is full!"))
return FALSE return FALSE
@@ -186,7 +186,7 @@
return FALSE return FALSE
if(!Adjacent(TR) || !Adjacent(TG)) if(!Adjacent(TR) || !Adjacent(TG))
return //No long distance transfer return //No long distance transfer
if(!TR.reagents.get_free_space()) if(!TB.reagents?.get_free_space())
to_chat(user, span_vnotice("[TR]'s [lowertext(TB.name)] is full!")) to_chat(user, span_vnotice("[TR]'s [lowertext(TB.name)] is full!"))
return FALSE return FALSE