mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 13:09:11 +01:00
Transfer Liquids with Prey and Ethanol Bellies (#18107)
* Transfer Liquids with Prey and Ethanol Bellies Added the ability to use "Transfer Liquids (Vore)" with prey inside of your bellies. Added ethanol as an option for liquid belly reagents. * Constant
This commit is contained in:
@@ -206,6 +206,14 @@
|
||||
reagentid = REAGENT_ID_TRICORDRAZINE
|
||||
reagentcolor = "#8040FF"
|
||||
is_beneficial = TRUE
|
||||
if(REAGENT_ETHANOL)
|
||||
generated_reagents = list(REAGENT_ID_ETHANOL = 1)
|
||||
if(reagent_name in our_reagents)
|
||||
reagent_name = lowertext(REAGENT_ETHANOL)
|
||||
gen_amount = 1
|
||||
gen_cost = 5
|
||||
reagentid = REAGENT_ID_ETHANOL
|
||||
reagentcolor = "#bfbfbf"
|
||||
|
||||
|
||||
/////////////////////// FULLNESS MESSAGES //////////////////////
|
||||
|
||||
@@ -241,7 +241,8 @@
|
||||
REAGENT_LUBE,
|
||||
REAGENT_BIOMASS,
|
||||
REAGENT_CONCENTRATEDRADIUM,
|
||||
REAGENT_TRICORDRAZINE
|
||||
REAGENT_TRICORDRAZINE,
|
||||
REAGENT_ETHANOL
|
||||
)
|
||||
|
||||
// Special var section
|
||||
@@ -1078,6 +1079,7 @@
|
||||
M.reagents.del_reagent(REAGENT_ID_CLEANER)
|
||||
M.reagents.del_reagent(REAGENT_ID_CONCENTRATEDRADIUM)
|
||||
M.reagents.del_reagent(REAGENT_ID_TRICORDRAZINE)
|
||||
M.reagents.del_reagent(REAGENT_ID_ETHANOL)
|
||||
M.reagents.trans_to_holder(Pred.ingested, M.reagents.total_volume, 0.5, TRUE)
|
||||
|
||||
owner.handle_belly_update()
|
||||
|
||||
@@ -1453,7 +1453,11 @@
|
||||
|
||||
var/mob/living/user = src
|
||||
|
||||
var/mob/living/TG = tgui_input_list(user, "Choose who to transfer from", "Transfer From", mobs_in_view(1,user))
|
||||
var/list/transfer_from = mobs_in_view(1,user)
|
||||
for(var/obj/belly/B in vore_organs)
|
||||
for(var/mob/living/L in B.contents)
|
||||
transfer_from |= L
|
||||
var/mob/living/TG = tgui_input_list(user, "Choose who to transfer from", "Transfer From", transfer_from)
|
||||
if(!TG)
|
||||
return FALSE
|
||||
if(TG.give_reagents == FALSE && user != TG) //User isnt forced to allow giving in prefs if they are the one doing it
|
||||
@@ -1475,7 +1479,11 @@
|
||||
if("Cancel")
|
||||
return FALSE
|
||||
if("Vore belly")
|
||||
var/mob/living/TR = tgui_input_list(user,"Choose who to transfer to","Select Target", mobs_in_view(1,user))
|
||||
var/list/transfer_to = mobs_in_view(1,user)
|
||||
for(var/obj/belly/B in vore_organs)
|
||||
for(var/mob/living/L in B.contents)
|
||||
transfer_to |= L
|
||||
var/mob/living/TR = tgui_input_list(user,"Choose who to transfer to","Select Target", transfer_to)
|
||||
if(!TR) return FALSE
|
||||
|
||||
if(TR == user) //Proceed, we dont need to have prefs enabled for transfer within user
|
||||
@@ -1525,7 +1533,11 @@
|
||||
|
||||
|
||||
if("Stomach")
|
||||
var/mob/living/TR = tgui_input_list(user,"Choose who to transfer to","Select Target", mobs_in_view(1,user))
|
||||
var/list/transfer_to = mobs_in_view(1,user)
|
||||
for(var/obj/belly/B in vore_organs)
|
||||
for(var/mob/living/L in B.contents)
|
||||
transfer_to |= L
|
||||
var/mob/living/TR = tgui_input_list(user,"Choose who to transfer to","Select Target", transfer_to)
|
||||
if(!TR) return
|
||||
if(!Adjacent(TR) || !Adjacent(TG))
|
||||
return //No long distance transfer
|
||||
|
||||
Reference in New Issue
Block a user