[MIRROR] Fixes typo 'transfered', olive oil reaction repath [MDB IGNORE] (#23469)

* Fixes typo 'transfered', olive oil reaction repath

* Modular

* Update condiment.dm

* Update recipes_guide.dm

* Update _cup.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-09-04 14:49:33 +02:00
committed by GitHub
parent 11133f4e51
commit 87bfa7a61a
78 changed files with 152 additions and 152 deletions
+10 -10
View File
@@ -519,14 +519,14 @@
* * multiplier - multiplies amount of each reagent by this number
* * preserve_data - if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
* * no_react - passed through to [/datum/reagents/proc/add_reagent]
* * mob/transfered_by - used for logging
* * mob/transferred_by - used for logging
* * remove_blacklisted - skips transferring of reagents without REAGENT_CAN_BE_SYNTHESIZED in chemical_flags
* * methods - passed through to [/datum/reagents/proc/expose_single] and [/datum/reagent/proc/on_transfer]
* * show_message - passed through to [/datum/reagents/proc/expose_single]
* * round_robin - if round_robin=TRUE, so transfer 5 from 15 water, 15 sugar and 15 plasma becomes 10, 15, 15 instead of 13.3333, 13.3333 13.3333. Good if you hate floating point errors
* * ignore_stomach - when using methods INGEST will not use the stomach as the target
*/
/datum/reagents/proc/trans_to(obj/target, amount = 1, multiplier = 1, preserve_data = TRUE, no_react = FALSE, mob/transfered_by, remove_blacklisted = FALSE, methods = NONE, show_message = TRUE, round_robin = FALSE, ignore_stomach = FALSE)
/datum/reagents/proc/trans_to(obj/target, amount = 1, multiplier = 1, preserve_data = TRUE, no_react = FALSE, mob/transferred_by, remove_blacklisted = FALSE, methods = NONE, show_message = TRUE, round_robin = FALSE, ignore_stomach = FALSE)
var/list/cached_reagents = reagent_list
if(!target || !total_volume)
return
@@ -573,7 +573,7 @@
trans_data = copy_data(reagent)
if(reagent.intercept_reagents_transfer(R, cached_amount))//Use input amount instead.
continue
if(!R.add_reagent(reagent.type, transfer_amount * multiplier, trans_data, chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT)) //we only handle reaction after every reagent has been transfered.
if(!R.add_reagent(reagent.type, transfer_amount * multiplier, trans_data, chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT)) //we only handle reaction after every reagent has been transferred.
continue
if(methods)
r_to_send += reagent
@@ -607,7 +607,7 @@
transfer_amount = reagent.volume
if(reagent.intercept_reagents_transfer(R, cached_amount))//Use input amount instead.
continue
if(!R.add_reagent(reagent.type, transfer_amount * multiplier, trans_data, chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT)) //we only handle reaction after every reagent has been transfered.
if(!R.add_reagent(reagent.type, transfer_amount * multiplier, trans_data, chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT)) //we only handle reaction after every reagent has been transferred.
continue
to_transfer = max(to_transfer - transfer_amount , 0)
if(methods)
@@ -620,9 +620,9 @@
var/list/reagent_qualities = list(REAGENT_TRANSFER_AMOUNT = transfer_amount, REAGENT_PURITY = reagent.purity)
transfer_log[reagent.type] = reagent_qualities
if(transfered_by && target_atom)
target_atom.add_hiddenprint(transfered_by) //log prints so admins can figure out who touched it last.
log_combat(transfered_by, target_atom, "transferred reagents ([get_external_reagent_log_string(transfer_log)]) from [my_atom] to")
if(transferred_by && target_atom)
target_atom.add_hiddenprint(transferred_by) //log prints so admins can figure out who touched it last.
log_combat(transferred_by, target_atom, "transferred reagents ([get_external_reagent_log_string(transfer_log)]) from [my_atom] to")
update_total()
R.update_total()
@@ -959,7 +959,7 @@
return FALSE //Yup, no reactions here. No siree.
if(is_reacting)//Prevent wasteful calculations
if(!(datum_flags & DF_ISPROCESSING))//If we're reacting - but not processing (i.e. we've transfered)
if(!(datum_flags & DF_ISPROCESSING))//If we're reacting - but not processing (i.e. we've transferred)
START_PROCESSING(SSreagents, src)
if(!(has_changed_state()))
return FALSE
@@ -1163,7 +1163,7 @@
* Force stops the current holder/reagents datum from reacting
*
* Calls end_reaction() for each equlilbrium datum in reaction_list and finish_reacting()
* Usually only called when a datum is transfered into a NO_REACT container
* Usually only called when a datum is transferred into a NO_REACT container
*/
/datum/reagents/proc/force_stop_reacting()
var/list/mix_message = list()
@@ -1198,7 +1198,7 @@
* Transfers the reaction_list to a new reagents datum
*
* Arguments:
* * target - the datum/reagents that this src is being transfered into
* * target - the datum/reagents that this src is being transferred into
*/
/datum/reagents/proc/transfer_reactions(datum/reagents/target)
if(QDELETED(target))
+1 -1
View File
@@ -180,7 +180,7 @@
to_chat(user, span_warning("[src] is full."))
return
var/trans = container.reagents.trans_to(src, container.amount_per_transfer_from_this, transfered_by = user)
var/trans = container.reagents.trans_to(src, container.amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You fill [src] with [trans] unit\s of the contents of [container]."))
if(I.heat < 1000)
return
@@ -422,7 +422,7 @@ GLOBAL_LIST_INIT(chem_master_containers, list(
adjust_item_drop_location(item)
item.name = item_name
item.reagents.clear_reagents()
reagents.trans_to(item, volume_in_each, transfered_by = src)
reagents.trans_to(item, volume_in_each, transferred_by = src)
printing_progress++
item_count--
update_appearance(UPDATE_ICON)
@@ -103,7 +103,7 @@
add_fingerprint(user)
if(is_reagent_container(I) && I.is_open_container())
var/obj/item/reagent_containers/RC = I
var/units = RC.reagents.trans_to(src, RC.amount_per_transfer_from_this, transfered_by = user)
var/units = RC.reagents.trans_to(src, RC.amount_per_transfer_from_this, transferred_by = user)
if(units)
to_chat(user, span_notice("You transfer [units] units of the solution to [src]."))
return
+2 -2
View File
@@ -163,13 +163,13 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency * seconds_per_tick) //By default it slowly disappears.
/*
Used to run functions before a reagent is transfered. Returning TRUE will block the transfer attempt.
Used to run functions before a reagent is transferred. Returning TRUE will block the transfer attempt.
Primarily used in reagents/reaction_agents
*/
/datum/reagent/proc/intercept_reagents_transfer(datum/reagents/target)
return FALSE
///Called after a reagent is transfered
///Called after a reagent is transferred
/datum/reagent/proc/on_transfer(atom/A, methods=TOUCH, trans_volume)
return
@@ -35,7 +35,7 @@
if(target.ph <= ph)
target.my_atom.audible_message(span_warning("The beaker froths as the buffer is added, to no effect."))
playsound(target.my_atom, 'sound/chemistry/bufferadd.ogg', 50, TRUE)
holder.remove_reagent(type, amount)//Remove from holder because it's not transfered
holder.remove_reagent(type, amount)//Remove from holder because it's not transferred
return
var/ph_change = -((amount/target.total_volume)*strength)
target.adjust_all_reagents_ph(ph_change, ph, 14)
@@ -61,7 +61,7 @@
if(target.ph >= ph)
target.my_atom.audible_message(span_warning("The beaker froths as the buffer is added, to no effect."))
playsound(target.my_atom, 'sound/chemistry/bufferadd.ogg', 50, TRUE)
holder.remove_reagent(type, amount)//Remove from holder because it's not transfered
holder.remove_reagent(type, amount)//Remove from holder because it's not transferred
return
var/ph_change = (amount/target.total_volume)*strength
target.adjust_all_reagents_ph(ph_change, 0, ph)
+2 -2
View File
@@ -195,9 +195,9 @@
*/
/obj/item/reagent_containers/on_accidental_consumption(mob/living/carbon/M, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE)
M.losebreath += 2
reagents?.trans_to(M, min(15, reagents.total_volume / rand(5,10)), transfered_by = user, methods = INGEST)
reagents?.trans_to(M, min(15, reagents.total_volume / rand(5,10)), transferred_by = user, methods = INGEST)
if(source_item?.reagents)
reagents.trans_to(source_item, min(source_item.reagents.total_volume / 2, reagents.total_volume / 5), transfered_by = user, methods = TOUCH)
reagents.trans_to(source_item, min(source_item.reagents.total_volume / 2, reagents.total_volume / 5), transferred_by = user, methods = TOUCH)
return ..()
@@ -64,7 +64,7 @@
log_combat(user, M, "fed", reagents.get_reagent_log_string())
SEND_SIGNAL(M, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood
reagents.trans_to(M, 10, transfered_by = user, methods = INGEST)
reagents.trans_to(M, 10, transferred_by = user, methods = INGEST)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
return TRUE
@@ -83,7 +83,7 @@
to_chat(user, span_warning("[src] is full!"))
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user)
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You fill [src] with [trans] units of the contents of [target]."))
//Something like a glass or a food item. Player probably wants to transfer TO it.
@@ -94,7 +94,7 @@
if(target.reagents.total_volume >= target.reagents.maximum_volume)
to_chat(user, span_warning("you can't add anymore to [target]!"))
return
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You transfer [trans] units of the condiment to [target]."))
/obj/item/reagent_containers/condiment/enzyme
@@ -458,7 +458,7 @@
return
else
to_chat(user, span_notice("You tear open [src] above [target] and the condiments drip onto it."))
src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
src.reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user)
qdel(src)
return
return . | ..()
@@ -86,7 +86,7 @@
SEND_SIGNAL(src, COMSIG_GLASS_DRANK, target_mob, user)
SEND_SIGNAL(target_mob, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood
var/fraction = min(gulp_size/reagents.total_volume, 1)
reagents.trans_to(target_mob, gulp_size, transfered_by = user, methods = INGEST)
reagents.trans_to(target_mob, gulp_size, transferred_by = user, methods = INGEST)
checkLiked(fraction, target_mob)
playsound(target_mob.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
if(!iscarbon(target_mob))
@@ -124,7 +124,7 @@
to_chat(user, span_warning("[target] is full."))
return
var/trans = reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
var/trans = reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You transfer [trans] unit\s of the solution to [target]."))
else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
@@ -136,7 +136,7 @@
to_chat(user, span_warning("[src] is full."))
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user)
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You fill [src] with [trans] unit\s of the contents of [target]."))
target.update_appearance()
@@ -157,7 +157,7 @@
to_chat(user, span_warning("[src] is full."))
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user)
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You fill [src] with [trans] unit\s of the contents of [target]."))
target.update_appearance()
@@ -193,7 +193,7 @@
to_chat(user, span_notice("[src] is full."))
else
to_chat(user, span_notice("You break [attacking_egg] in [src]."))
attacking_egg.reagents.trans_to(src, attacking_egg.reagents.total_volume, transfered_by = user)
attacking_egg.reagents.trans_to(src, attacking_egg.reagents.total_volume, transferred_by = user)
qdel(attacking_egg)
return
@@ -414,7 +414,7 @@
if(reagents.total_volume < 1)
user.balloon_alert(user, "empty!")
else
reagents.trans_to(O, 5, transfered_by = user)
reagents.trans_to(O, 5, transferred_by = user)
user.balloon_alert(user, "doused [O]")
playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
return
@@ -430,13 +430,13 @@
user.balloon_alert(user, "mop is full!")
return
mop.reagents.remove_any(mop.reagents.total_volume * SQUEEZING_DISPERSAL_RATIO)
mop.reagents.trans_to(src, mop.reagents.total_volume, transfered_by = user)
mop.reagents.trans_to(src, mop.reagents.total_volume, transferred_by = user)
user.balloon_alert(user, "mop squeezed")
else
if(reagents.total_volume < 1)
user.balloon_alert(user, "container empty!")
else
reagents.trans_to(mop, 5, transfered_by = user)
reagents.trans_to(mop, 5, transferred_by = user)
user.balloon_alert(user, "mop wet")
playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
@@ -501,7 +501,7 @@
balloon_alert(user, "container full!")
return TRUE
var/transfer_amount = reagents.trans_to(attacking_item, amount_per_transfer_from_this, transfered_by = user)
var/transfer_amount = reagents.trans_to(attacking_item, amount_per_transfer_from_this, transferred_by = user)
balloon_alert(user, "transferred [transfer_amount] unit\s")
flick("syrup_anim",src)
@@ -36,7 +36,7 @@
sleep(1 SECONDS)
H.visible_message(span_suicide("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!"))
playsound(H,'sound/items/drink.ogg', 80, TRUE)
reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip
reagents.trans_to(H, src.reagents.total_volume, transferred_by = H) //a big sip
sleep(0.5 SECONDS)
H.say(pick(
"Now, Outbomb Cuban Pete, THAT was a game.",
@@ -41,7 +41,7 @@
if(!safe_thing.reagents)
safe_thing.create_reagents(100)
trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this, transfered_by = user, methods = TOUCH)
trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this, transferred_by = user, methods = TOUCH)
target.visible_message(span_danger("[user] tries to squirt something into [target]'s eyes, but fails!"), \
span_userdanger("[user] tries to squirt something into your eyes, but fails!"))
@@ -65,7 +65,7 @@
log_combat(user, M, "squirted", R)
trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You transfer [trans] unit\s of the solution."))
update_appearance()
target.update_appearance()
@@ -80,7 +80,7 @@
to_chat(user, span_warning("[target] is empty!"))
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user)
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user)
to_chat(user, span_notice("You fill [src] with [trans] unit\s of the solution."))
@@ -50,7 +50,7 @@
if(affected_mob.reagents)
var/trans = 0
if(!infinite)
trans = reagents.trans_to(affected_mob, amount_per_transfer_from_this, transfered_by = user, methods = INJECT)
trans = reagents.trans_to(affected_mob, amount_per_transfer_from_this, transferred_by = user, methods = INJECT)
else
reagents.expose(affected_mob, INJECT, fraction)
trans = reagents.copy_to(affected_mob, amount_per_transfer_from_this)
@@ -67,7 +67,7 @@
else
log_combat(user, M, "applied", src, reagents.get_reagent_log_string())
playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6)
reagents.trans_to(M, amount_per_transfer_from_this, transfered_by = user, methods = apply_type)
reagents.trans_to(M, amount_per_transfer_from_this, transferred_by = user, methods = apply_type)
return
/obj/item/reagent_containers/medigel/libital
@@ -146,7 +146,7 @@
var/reagentlist = pretty_string_from_reagent_list(reagents.reagent_list)
var/log_object = "containing [reagentlist]"
if(user.combat_mode && !carbon_target.is_mouth_covered())
reagents.trans_to(carbon_target, reagents.total_volume, transfered_by = user, methods = INGEST)
reagents.trans_to(carbon_target, reagents.total_volume, transferred_by = user, methods = INGEST)
carbon_target.visible_message(span_danger("[user] smothers \the [carbon_target] with \the [src]!"), span_userdanger("[user] smothers you with \the [src]!"), span_hear("You hear some struggling and muffled cries of surprise."))
log_combat(user, carbon_target, "smothered", src, log_object)
else
@@ -53,7 +53,7 @@
if(apply_type == INGEST)
SEND_SIGNAL(src, COMSIG_PILL_CONSUMED, eater = M, feeder = user)
if(reagents.total_volume)
reagents.trans_to(M, reagents.total_volume, transfered_by = user, methods = apply_type)
reagents.trans_to(M, reagents.total_volume, transferred_by = user, methods = apply_type)
qdel(src)
return TRUE
@@ -74,7 +74,7 @@
return
user.visible_message(span_warning("[user] slips something into [target]!"), span_notice("You dissolve [src] in [target]."), null, 2)
reagents.trans_to(target, reagents.total_volume, transfered_by = user)
reagents.trans_to(target, reagents.total_volume, transferred_by = user)
qdel(src)
/*
@@ -82,7 +82,7 @@
*/
/obj/item/reagent_containers/pill/on_accidental_consumption(mob/living/carbon/victim, mob/living/carbon/user, obj/item/source_item, discover_after = FALSE)
to_chat(victim, span_warning("You swallow something small. [source_item ? "Was that in [source_item]?" : ""]"))
reagents?.trans_to(victim, reagents.total_volume, transfered_by = user, methods = INGEST)
reagents?.trans_to(victim, reagents.total_volume, transferred_by = user, methods = INGEST)
qdel(src)
return discover_after
@@ -42,7 +42,7 @@
to_chat(user, span_warning("[src] is full."))
return
var/trans = target.reagents.trans_to(src, 50, transfered_by = user) //transfer 50u , using the spray's transfer amount would take too long to refill
var/trans = target.reagents.trans_to(src, 50, transferred_by = user) //transfer 50u , using the spray's transfer amount would take too long to refill
to_chat(user, span_notice("You fill \the [src] with [trans] units of the contents of \the [target]."))
return
@@ -82,7 +82,7 @@
living_target.log_message("injected themselves ([contained]) with [name]", LOG_ATTACK, color="orange")
else
log_combat(user, living_target, "injected", src, addition="which had [contained]")
reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user, methods = INJECT)
reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user, methods = INJECT)
to_chat(user, span_notice("You inject [amount_per_transfer_from_this] units of the solution. The syringe now contains [reagents.total_volume] units."))
target.update_appearance()
@@ -117,7 +117,7 @@
to_chat(user, span_warning("You cannot directly remove reagents from [target]!"))
return SECONDARY_ATTACK_CONTINUE_CHAIN
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user) // transfer from, transfer to - who cares?
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user) // transfer from, transfer to - who cares?
to_chat(user, span_notice("You fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units."))
target.update_appearance()
@@ -134,7 +134,7 @@
to_chat(victim, span_boldwarning("[src] injects you!"))
victim.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
reagents?.trans_to(victim, round(reagents.total_volume*(2/3)), transfered_by = user, methods = INJECT)
reagents?.trans_to(victim, round(reagents.total_volume*(2/3)), transferred_by = user, methods = INJECT)
return discover_after
+1 -1
View File
@@ -297,7 +297,7 @@
if(W.reagents.has_reagent(/datum/reagent/fuel, W.max_fuel))
to_chat(user, span_warning("Your [W.name] is already full!"))
return
reagents.trans_to(W, W.max_fuel, transfered_by = user)
reagents.trans_to(W, W.max_fuel, transferred_by = user)
user.visible_message(span_notice("[user] refills [user.p_their()] [W.name]."), span_notice("You refill [W]."))
playsound(src, 'sound/effects/refill.ogg', 50, TRUE)
W.update_appearance()