From 87bfa7a61a32a8d864221d1c2fb17bf75b76c8dc Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:49:33 +0200 Subject: [PATCH] [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> --- .../components/customizable_reagent_holder.dm | 2 +- code/datums/components/food/edible.dm | 4 ++-- code/datums/components/udder.dm | 4 ++-- code/datums/elements/chemical_transfer.dm | 2 +- code/datums/elements/food/dunkable.dm | 4 ++-- code/datums/mind/_mind.dm | 2 +- code/datums/mutations/tongue_spike.dm | 12 +++++------ code/datums/wires/conveyor.dm | 2 +- code/game/machinery/hologram.dm | 6 +++--- code/game/machinery/medipen_refiller.dm | 4 ++-- code/game/machinery/newscaster/newspaper.dm | 2 +- code/game/objects/effects/decals/cleanable.dm | 2 +- .../objects/effects/decals/cleanable/misc.dm | 2 +- code/game/objects/items.dm | 4 ++-- code/game/objects/items/cigs_lighters.dm | 4 ++-- code/game/objects/items/crayons.dm | 6 +++--- code/game/objects/items/extinguisher.dm | 4 ++-- code/game/objects/items/flamethrower.dm | 2 +- code/game/objects/items/robot/items/hypo.dm | 6 +++--- code/game/objects/items/storage/medkit.dm | 2 +- code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/items/toys.dm | 4 ++-- code/game/objects/structures/janitor.dm | 2 +- .../objects/structures/petrified_statue.dm | 2 +- code/game/objects/structures/watercloset.dm | 4 ++-- code/game/turfs/turf.dm | 2 +- .../antagonists/_common/antag_datum.dm | 2 +- .../components/binary_devices/pump.dm | 2 +- .../components/binary_devices/volume_pump.dm | 2 +- .../components/trinary_devices/mixer.dm | 4 ++-- .../components/unary_devices/vent_scrubber.dm | 6 +++--- .../food_and_drinks/machinery/deep_fryer.dm | 2 +- .../food_and_drinks/recipes/food_mixtures.dm | 4 ++-- .../food_and_drinks/recipes/soup_mixtures.dm | 2 +- .../recipes/tablecraft/recipes_guide.dm | 8 ++++---- code/modules/hydroponics/grown.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 2 +- code/modules/mob/living/brain/posibrain.dm | 18 ++++++++--------- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/carbon/death.dm | 4 ++-- code/modules/mob_spawn/mob_spawn.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/plumbing/plumbers/bottler.dm | 6 +++--- code/modules/power/apc/apc_attack.dm | 2 +- code/modules/power/turbine/turbine.dm | 8 ++++---- .../modules/projectiles/ammunition/_firing.dm | 2 +- .../projectiles/ammunition/special/syringe.dm | 6 +++--- code/modules/reagents/chemistry/holder.dm | 20 +++++++++---------- code/modules/reagents/chemistry/items.dm | 2 +- .../chemistry/machinery/chem_master.dm | 2 +- .../chemistry/machinery/smoke_machine.dm | 2 +- code/modules/reagents/chemistry/reagents.dm | 4 ++-- .../reagents/reaction_agents_reagents.dm | 4 ++-- code/modules/reagents/reagent_containers.dm | 4 ++-- .../reagents/reagent_containers/condiment.dm | 8 ++++---- .../reagents/reagent_containers/cups/_cup.dm | 16 +++++++-------- .../reagent_containers/cups/bottle.dm | 2 +- .../reagents/reagent_containers/cups/soda.dm | 2 +- .../reagents/reagent_containers/dropper.dm | 6 +++--- .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/medigel.dm | 2 +- .../reagents/reagent_containers/misc.dm | 2 +- .../reagents/reagent_containers/pill.dm | 6 +++--- .../reagents/reagent_containers/spray.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 6 +++--- code/modules/reagents/reagent_dispenser.dm | 2 +- .../xenobiology/crossbreeding/__corecross.dm | 2 +- code/modules/surgery/dental_implant.dm | 2 +- .../mecha/equipment/tools/medical_tools.dm | 2 +- .../code/modules/clothing/towels.dm | 4 ++-- .../ashwalkers/code/buildings/fuelwell.dm | 2 +- modular_skyrat/modules/bongs/code/bong.dm | 6 +++--- .../modules/medical/code/smartdarts.dm | 2 +- .../code/soulcatcher/soulcatcher_component.dm | 2 +- .../morenarcotics/code/cocaine_item.dm | 2 +- .../modules/morenarcotics/code/crackpipe.dm | 2 +- .../modules/morenarcotics/code/opium.dm | 2 +- .../modules/morenarcotics/code/vapecarts.dm | 2 +- 78 files changed, 152 insertions(+), 152 deletions(-) diff --git a/code/datums/components/customizable_reagent_holder.dm b/code/datums/components/customizable_reagent_holder.dm index 79ebf651d3f..36c84fc94af 100644 --- a/code/datums/components/customizable_reagent_holder.dm +++ b/code/datums/components/customizable_reagent_holder.dm @@ -2,7 +2,7 @@ * # Custom Atom Component * * When added to an atom, item ingredients can be put into that. - * The sprite is updated and reagents are transfered. + * The sprite is updated and reagents are transferred. * * If the component is added to something that is processed, creating new objects (being cut, for example), * the replacement type needs to also have the component. The ingredients will be copied over. Reagents are not diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index f436d168476..d187779a77e 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -461,7 +461,7 @@ Behavior that's still missing from this component that original food items had t apply_buff(eater) var/fraction = min(bite_consumption / owner.reagents.total_volume, 1) - owner.reagents.trans_to(eater, bite_consumption, transfered_by = feeder, methods = INGEST) + owner.reagents.trans_to(eater, bite_consumption, transferred_by = feeder, methods = INGEST) bitecount++ checkLiked(fraction, eater) @@ -654,7 +654,7 @@ Behavior that's still missing from this component that original food items had t if(foodtypes & edible_flags) var/atom/eaten_food = parent - eaten_food.reagents.trans_to(eater, eaten_food.reagents.total_volume, transfered_by = eater) + eaten_food.reagents.trans_to(eater, eaten_food.reagents.total_volume, transferred_by = eater) eater.visible_message(span_warning("[src] eats [eaten_food]!"), span_notice("You eat [eaten_food].")) playsound(get_turf(eater),'sound/items/eatfood.ogg', rand(30,50), TRUE) qdel(eaten_food) diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index 66732aac333..c1f0ff03245 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -117,8 +117,8 @@ if(milk_holder.reagents.total_volume >= milk_holder.volume) to_chat(user, span_warning("[milk_holder] is full.")) return - var/transfered = reagents.trans_to(milk_holder, rand(5,10)) - if(transfered) + var/transferred = reagents.trans_to(milk_holder, rand(5,10)) + if(transferred) user.visible_message(span_notice("[user] milks [src] using \the [milk_holder]."), span_notice("You milk [src] using \the [milk_holder].")) else to_chat(user, span_warning("The udder is dry. Wait a bit longer...")) diff --git a/code/datums/elements/chemical_transfer.dm b/code/datums/elements/chemical_transfer.dm index 09391cbf390..9802f0cc059 100644 --- a/code/datums/elements/chemical_transfer.dm +++ b/code/datums/elements/chemical_transfer.dm @@ -58,7 +58,7 @@ return var/built_attacker_message = replacetext(attacker_message, "%VICTIM", transfer_victim) var/built_victim_message = replacetext(attacker_message, "%ATTACKER", transfer_attacker) - transfer_attacker.reagents?.trans_to(transfer_victim, transfer_attacker.reagents.total_volume, multiplier = 1, preserve_data = 1, no_react = 0, transfered_by = transfer_attacker) + transfer_attacker.reagents?.trans_to(transfer_victim, transfer_attacker.reagents.total_volume, multiplier = 1, preserve_data = 1, no_react = 0, transferred_by = transfer_attacker) to_chat(transfer_attacker, built_attacker_message) to_chat(transfer_victim, built_victim_message) diff --git a/code/datums/elements/food/dunkable.dm b/code/datums/elements/food/dunkable.dm index a948772ce00..d413119e285 100644 --- a/code/datums/elements/food/dunkable.dm +++ b/code/datums/elements/food/dunkable.dm @@ -3,7 +3,7 @@ /datum/element/dunkable element_flags = ELEMENT_BESPOKE argument_hash_start_idx = 2 - var/dunk_amount // the amount of reagents that will be transfered from the container to the item on each click + var/dunk_amount // the amount of reagents that will be transferred from the container to the item on each click /datum/element/dunkable/Attach(datum/target, amount_per_dunk) . = ..() @@ -28,7 +28,7 @@ to_chat(user, span_warning("[container] is unable to be dunked in!")) return COMPONENT_AFTERATTACK_PROCESSED_ITEM var/obj/item/I = source // the item that has the dunkable element - if(container.reagents.trans_to(I, dunk_amount, transfered_by = user)) //if reagents were transfered, show the message + if(container.reagents.trans_to(I, dunk_amount, transferred_by = user)) //if reagents were transferred, show the message to_chat(user, span_notice("You dunk \the [I] into \the [container].")) return COMPONENT_AFTERATTACK_PROCESSED_ITEM if(!container.reagents.total_volume) diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm index 1087855265f..a3917b1585f 100644 --- a/code/datums/mind/_mind.dm +++ b/code/datums/mind/_mind.dm @@ -8,7 +8,7 @@ ghost.mind is however used as a reference to the ghost's corpse - When creating a new mob for an existing IC character (e.g. cloning a dead guy or borging a brain of a human) - the existing mind of the old mob should be transfered to the new mob like so: + the existing mind of the old mob should be transferred to the new mob like so: mind.transfer_to(new_mob) diff --git a/code/datums/mutations/tongue_spike.dm b/code/datums/mutations/tongue_spike.dm index cde1bcaf6fe..5d210c344b5 100644 --- a/code/datums/mutations/tongue_spike.dm +++ b/code/datums/mutations/tongue_spike.dm @@ -130,7 +130,7 @@ return var/datum/action/send_chems/chem_action = new(src) - chem_action.transfered_ref = WEAKREF(embedded_mob) + chem_action.transferred_ref = WEAKREF(embedded_mob) chem_action.Grant(fired_by) to_chat(fired_by, span_notice("Link established! Use the \"Transfer Chemicals\" ability \ @@ -154,7 +154,7 @@ check_flags = AB_CHECK_CONSCIOUS /// Weakref to the mob target that we transfer chemicals to on activation - var/datum/weakref/transfered_ref + var/datum/weakref/transferred_ref /datum/action/send_chems/New(Target) . = ..() @@ -168,12 +168,12 @@ if(!ishuman(owner) || !owner.reagents) return FALSE var/mob/living/carbon/human/transferer = owner - var/mob/living/carbon/human/transfered = transfered_ref?.resolve() - if(!ishuman(transfered)) + var/mob/living/carbon/human/transferred = transferred_ref?.resolve() + if(!ishuman(transferred)) return FALSE - to_chat(transfered, span_warning("You feel a tiny prick!")) - transferer.reagents.trans_to(transfered, transferer.reagents.total_volume, 1, 1, 0, transfered_by = transferer) + to_chat(transferred, span_warning("You feel a tiny prick!")) + transferer.reagents.trans_to(transferred, transferer.reagents.total_volume, 1, 1, 0, transferred_by = transferer) var/obj/item/hardened_spike/chem/chem_spike = target var/obj/item/bodypart/spike_location = chem_spike.check_embedded() diff --git a/code/datums/wires/conveyor.dm b/code/datums/wires/conveyor.dm index 53175eb00fb..dd0ac811bc2 100644 --- a/code/datums/wires/conveyor.dm +++ b/code/datums/wires/conveyor.dm @@ -1,7 +1,7 @@ /datum/wires/conveyor holder_type = /obj/machinery/conveyor_switch proper_name = "Conveyor" - /// var holder that logs who put the assembly inside and gets transfered to the switch on pulse + /// var holder that logs who put the assembly inside and gets transferred to the switch on pulse var/datum/weakref/fingerman_ref /datum/wires/conveyor/New(atom/holder) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index dd11c09d9c9..3144ff93c83 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -691,16 +691,16 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ if(!LAZYLEN(masters) || !masters[owner]) return TRUE var/obj/effect/overlay/holo_pad_hologram/holo = masters[owner] - var/transfered = FALSE + var/transferred = FALSE if(!validate_location(new_turf)) if(!transfer_to_nearby_pad(new_turf, owner)) return FALSE else - transfered = TRUE + transferred = TRUE //All is good. holo.abstract_move(new_turf) SET_PLANE(holo, ABOVE_GAME_PLANE, new_turf) - if(!transfered) + if(!transferred) update_holoray(owner, new_turf) return TRUE diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm index b5c97554865..8f17ad3faba 100644 --- a/code/game/machinery/medipen_refiller.dm +++ b/code/game/machinery/medipen_refiller.dm @@ -57,9 +57,9 @@ if(!length(reagent_container.reagents.reagent_list)) balloon_alert(user, "nothing to transfer!") return - var/units = reagent_container.reagents.trans_to(src, reagent_container.amount_per_transfer_from_this, transfered_by = user) + var/units = reagent_container.reagents.trans_to(src, reagent_container.amount_per_transfer_from_this, transferred_by = user) if(units) - balloon_alert(user, "[units] units transfered") + balloon_alert(user, "[units] units transferred") else balloon_alert(user, "reagent storage full!") return diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm index 2010f7480fd..d605d6257c3 100644 --- a/code/game/machinery/newscaster/newspaper.dm +++ b/code/game/machinery/newscaster/newspaper.dm @@ -28,7 +28,7 @@ var/mob/living/carbon/human/H = user var/obj/W = new /obj/item/reagent_containers/cup/glass/bottle/whiskey(H.loc) playsound(H.loc, 'sound/items/drink.ogg', rand(10,50), TRUE) - W.reagents.trans_to(H, W.reagents.total_volume, transfered_by = user) + W.reagents.trans_to(H, W.reagents.total_volume, transferred_by = user) user.visible_message(span_suicide("[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!")) return TOXLOSS diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 71ede0c55a3..b0af5c3ca02 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -79,7 +79,7 @@ to_chat(user, span_notice("[W] is full!")) return to_chat(user, span_notice("You scoop up [src] into [W]!")) - reagents.trans_to(W, reagents.total_volume, transfered_by = user) + reagents.trans_to(W, reagents.total_volume, transferred_by = user) if(!reagents.total_volume) //scooped up all of it qdel(src) return diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index d97b1ad9515..61306e4eceb 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -171,7 +171,7 @@ if(isflyperson(H)) playsound(get_turf(src), 'sound/items/drink.ogg', 50, TRUE) //slurp H.visible_message(span_alert("[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.")) - reagents.trans_to(H, reagents.total_volume, transfered_by = user, methods = INGEST) + reagents.trans_to(H, reagents.total_volume, transferred_by = user, methods = INGEST) qdel(src) /obj/effect/decal/cleanable/vomit/nebula diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 0724d990f26..efca8502ced 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -983,7 +983,7 @@ reagents = new() reagents.add_reagent_list(grind_results) if(reagents && target_holder) - reagents.trans_to(target_holder, reagents.total_volume, transfered_by = user) + reagents.trans_to(target_holder, reagents.total_volume, transferred_by = user) return TRUE ///Called BEFORE the object is ground up - use this to change grind results based on conditions. Return "-1" to prevent the grinding from occurring @@ -998,7 +998,7 @@ return FALSE reagents.convert_reagent(/datum/reagent/consumable, juice_typepath, include_source_subtypes = TRUE) if(reagents && target_holder) - reagents.trans_to(target_holder, reagents.total_volume, transfered_by = user) + reagents.trans_to(target_holder, reagents.total_volume, transferred_by = user) return TRUE /obj/item/proc/set_force_string() diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 96d04719663..f9f7377439b 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -237,7 +237,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!istype(glass)) //you can dip cigarettes into beakers return - if(glass.reagents.trans_to(src, chem_volume, transfered_by = user)) //if reagents were transfered, show the message + if(glass.reagents.trans_to(src, chem_volume, transferred_by = user)) //if reagents were transferred, show the message to_chat(user, span_notice("You dip \the [src] into \the [glass].")) //if not, either the beaker was empty, or the cigarette was full else if(!glass.reagents.total_volume) @@ -687,7 +687,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM packeditem = to_smoke.name update_name() if(to_smoke.reagents) - to_smoke.reagents.trans_to(src, to_smoke.reagents.total_volume, transfered_by = user) + to_smoke.reagents.trans_to(src, to_smoke.reagents.total_volume, transferred_by = user) qdel(to_smoke) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 580632a84ba..57bc04e7007 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -767,7 +767,7 @@ update_appearance() if(actually_paints) H.update_lips("spray_face", paint_color) - reagents.trans_to(user, used, volume_multiplier, transfered_by = user, methods = VAPOR) + reagents.trans_to(user, used, volume_multiplier, transferred_by = user, methods = VAPOR) return OXYLOSS /obj/item/toy/crayon/spraycan/Initialize(mapload) @@ -824,7 +824,7 @@ target.add_atom_colour(paint_color, WASHABLE_COLOUR_PRIORITY) SEND_SIGNAL(target, COMSIG_LIVING_MOB_PAINTED) use_charges(user, 2, requires_full = FALSE) - reagents.trans_to(target, ., volume_multiplier, transfered_by = user, methods = VAPOR) + reagents.trans_to(target, ., volume_multiplier, transferred_by = user, methods = VAPOR) if(pre_noise || post_noise) playsound(user.loc, 'sound/effects/spray.ogg', 5, TRUE, 5) @@ -851,7 +851,7 @@ holder.update_clothing(target_item.slot_flags) if(!(SEND_SIGNAL(target, COMSIG_OBJ_PAINTED, user, src, color_is_dark) & DONT_USE_SPRAYCAN_CHARGES)) use_charges(user, 2, requires_full = FALSE) - reagents.trans_to(target, ., volume_multiplier, transfered_by = user, methods = VAPOR) + reagents.trans_to(target, ., volume_multiplier, transferred_by = user, methods = VAPOR) if(pre_noise || post_noise) playsound(user.loc, 'sound/effects/spray.ogg', 5, TRUE, 5) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index ac07a3a9c6b..69193b7df92 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -163,7 +163,7 @@ balloon_alert(user, "already full!") return TRUE var/obj/structure/reagent_dispensers/W = target //will it work? - var/transferred = W.reagents.trans_to(src, max_water, transfered_by = user) + var/transferred = W.reagents.trans_to(src, max_water, transferred_by = user) if(transferred > 0) to_chat(user, span_notice("\The [src] has been refilled by [transferred] units.")) playsound(src.loc, 'sound/effects/refill.ogg', 50, TRUE, -6) @@ -231,7 +231,7 @@ var/datum/reagents/water_reagents = new /datum/reagents(5) water.reagents = water_reagents water_reagents.my_atom = water - reagents.trans_to(water, 1, transfered_by = user) + reagents.trans_to(water, 1, transferred_by = user) //Make em move dat ass, hun move_particles(water_particles) diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index d17708886f2..035af619513 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -224,7 +224,7 @@ if(air_transfer.gases[/datum/gas/plasma]) air_transfer.gases[/datum/gas/plasma][MOLES] *= 5 //Suffering target.assume_air(air_transfer) - //Burn it based on transfered gas + //Burn it based on transferred gas target.hotspot_expose((tank_mix.temperature*2) + 380,500) //location.hotspot_expose(1000,500,1) diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm index c482155e144..f91e6275f82 100644 --- a/code/game/objects/items/robot/items/hypo.dm +++ b/code/game/objects/items/robot/items/hypo.dm @@ -191,7 +191,7 @@ to_chat(user, span_notice("You inject [injectee] with the injector ([selected_reagent.name]).")) if(injectee.reagents) - hypospray_injector.trans_to(injectee, amount_per_transfer_from_this, transfered_by = user, methods = INJECT) + hypospray_injector.trans_to(injectee, amount_per_transfer_from_this, transferred_by = user, methods = INJECT) balloon_alert(user, "[amount_per_transfer_from_this] unit\s injected") log_combat(user, injectee, "injected", src, "(CHEMICALS: [selected_reagent])") else @@ -385,7 +385,7 @@ stored_reagents.remove_reagent(selected_reagent.type, amount_per_transfer_from_this) shaker.add_reagent(selected_reagent.type, amount_per_transfer_from_this, reagtemp = dispensed_temperature, no_react = TRUE) - shaker.trans_to(target, amount_per_transfer_from_this, transfered_by = user) + shaker.trans_to(target, amount_per_transfer_from_this, transferred_by = user) balloon_alert(user, "[amount_per_transfer_from_this] unit\s poured") return . @@ -449,7 +449,7 @@ var/datum/reagents/shaker = new() stored_reagents.remove_reagent(selected_reagent.type, amount_per_transfer_from_this) shaker.add_reagent(selected_reagent.type, amount_per_transfer_from_this, reagtemp = dispensed_temperature, no_react = TRUE) - shaker.trans_to(target, amount_per_transfer_from_this, transfered_by = user) + shaker.trans_to(target, amount_per_transfer_from_this, transferred_by = user) balloon_alert(user, "[amount_per_transfer_from_this] unit\s poured") diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index 9fc3ab8ee4a..6ca84e415e0 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -711,7 +711,7 @@ /obj/item/storage/organbox/attackby(obj/item/I, mob/user, params) 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) balloon_alert(user, "[units]u transferred") return diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 3dec18c8cda..3812cf911bf 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -173,7 +173,7 @@ if(!status && attacked_atom.is_refillable()) . |= AFTERATTACK_PROCESSED_ITEM - reagents.trans_to(attacked_atom, reagents.total_volume, transfered_by = user) + reagents.trans_to(attacked_atom, reagents.total_volume, transferred_by = user) to_chat(user, span_notice("You empty [src]'s fuel tank into [attacked_atom].")) update_appearance() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 2765c28682c..2eef8cc116e 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -62,7 +62,7 @@ else if(reagents.total_volume >= 10) to_chat(user, span_warning("[src] is full.")) else - A.reagents.trans_to(src, 10, transfered_by = user) + A.reagents.trans_to(src, 10, transferred_by = user) to_chat(user, span_notice("You fill the balloon with the contents of [A].")) desc = "A translucent balloon with some form of liquid sloshing around in it." update_appearance() @@ -77,7 +77,7 @@ else desc = "A translucent balloon with some form of liquid sloshing around in it." to_chat(user, span_notice("You fill the balloon with the contents of [I].")) - I.reagents.trans_to(src, 10, transfered_by = user) + I.reagents.trans_to(src, 10, transferred_by = user) update_appearance() else if(I.get_sharpness()) balloon_burst() diff --git a/code/game/objects/structures/janitor.dm b/code/game/objects/structures/janitor.dm index f5ee1cc7c2d..7721a6d39ac 100644 --- a/code/game/objects/structures/janitor.dm +++ b/code/game/objects/structures/janitor.dm @@ -43,7 +43,7 @@ if(!CART_HAS_MINIMUM_REAGENT_VOLUME) balloon_alert(user, "empty!") return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - reagents.trans_to(weapon, weapon.reagents.maximum_volume, transfered_by = user) + reagents.trans_to(weapon, weapon.reagents.maximum_volume, transferred_by = user) balloon_alert(user, "doused mop") playsound(src, 'sound/effects/slosh.ogg', 25, vary = TRUE) diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index e87e125ba6e..78bd478d523 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -68,7 +68,7 @@ petrified_mob.status_flags &= ~GODMODE REMOVE_TRAIT(petrified_mob, TRAIT_MUTE, STATUE_MUTE) REMOVE_TRAIT(petrified_mob, TRAIT_NOBLOOD, MAGIC_TRAIT) - petrified_mob.take_overall_damage((petrified_mob.health - atom_integrity + 100)) //any new damage the statue incurred is transfered to the mob + petrified_mob.take_overall_damage((petrified_mob.health - atom_integrity + 100)) //any new damage the statue incurred is transferred to the mob petrified_mob.faction -= FACTION_MIMIC petrified_mob.forceMove(loc) return ..() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 3548de15b9d..cbf8dd83d91 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -389,7 +389,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14)) return FALSE if(RG.is_refillable()) if(!RG.reagents.holder_full()) - reagents.trans_to(RG, RG.amount_per_transfer_from_this, transfered_by = user) + reagents.trans_to(RG, RG.amount_per_transfer_from_this, transferred_by = user) begin_reclamation() to_chat(user, span_notice("You fill [RG] from [src].")) return TRUE @@ -412,7 +412,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14)) if(reagents.total_volume <= 0) to_chat(user, span_notice("\The [src] is dry.")) return FALSE - reagents.trans_to(O, 5, transfered_by = user) + reagents.trans_to(O, 5, transferred_by = user) begin_reclamation() to_chat(user, span_notice("You wet [O] in [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index a240668cf54..6010df76cd3 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -671,7 +671,7 @@ GLOBAL_LIST_EMPTY(station_turfs) if(!belly?.reagents.total_volume) return var/chemicals_lost = belly.reagents.total_volume * purge_ratio - belly.reagents.trans_to(V, chemicals_lost, transfered_by = M) + belly.reagents.trans_to(V, chemicals_lost, transferred_by = M) //clear the stomach of anything even not food for(var/bile in belly.reagents.reagent_list) var/datum/reagent/reagent = bile diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 957be944e7e..7c0d77af86a 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_EMPTY(antagonists) /datum/antagonist/proc/specialization(datum/mind/new_owner) return src -///Called by the transfer_to() mind proc after the mind (mind.current and new_character.mind) has moved but before the player (key and client) is transfered. +///Called by the transfer_to() mind proc after the mind (mind.current and new_character.mind) has moved but before the player (key and client) is transferred. /datum/antagonist/proc/on_body_transfer(mob/living/old_body, mob/living/new_body) SHOULD_CALL_PARENT(TRUE) remove_innate_effects(old_body) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 006d9c95648..3c1ba634cae 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -5,7 +5,7 @@ // // Thus, the two variables affect pump operation are set in New(): // air1.volume -// This is the volume of gas available to the pump that may be transfered to the output +// This is the volume of gas available to the pump that may be transferred to the output // air2.volume // Higher quantities of this cause more air to be perfected later // but overall network volume is also increased as this increases... diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 502e35c74e4..94013ccadc7 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -5,7 +5,7 @@ // // Thus, the two variables affect pump operation are set in New(): // air1.volume -// This is the volume of gas available to the pump that may be transfered to the output +// This is the volume of gas available to the pump that may be transferred to the output // air2.volume // Higher quantities of this cause more air to be perfected later // but overall network volume is also increased as this increases... diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index b9fb506faf1..e37b0c5f4fe 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -11,9 +11,9 @@ ///Output pressure target var/target_pressure = ONE_ATMOSPHERE - ///Ratio between the node 1 and 2, determines the amount of gas transfered, sums up to 1 + ///Ratio between the node 1 and 2, determines the amount of gas transferred, sums up to 1 var/node1_concentration = 0.5 - ///Ratio between the node 1 and 2, determines the amount of gas transfered, sums up to 1 + ///Ratio between the node 1 and 2, determines the amount of gas transferred, sums up to 1 var/node2_concentration = 0.5 //node 3 is the outlet, nodes 1 & 2 are intakes diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 7e9951214c9..051299950bc 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -261,10 +261,10 @@ for(var/gas in filter_types & env_gases) filtered_out.add_gas(gas) //take this gases portion of removal_ratio of the turfs air, or all of that gas if less than or equal to MINIMUM_MOLES_TO_SCRUB - var/transfered_moles = max(QUANTIZE(env_gases[gas][MOLES] * removal_ratio * (env_gases[gas][MOLES] / total_moles_to_remove)), min(MINIMUM_MOLES_TO_SCRUB, env_gases[gas][MOLES])) + var/transferred_moles = max(QUANTIZE(env_gases[gas][MOLES] * removal_ratio * (env_gases[gas][MOLES] / total_moles_to_remove)), min(MINIMUM_MOLES_TO_SCRUB, env_gases[gas][MOLES])) - filtered_gases[gas][MOLES] = transfered_moles - env_gases[gas][MOLES] -= transfered_moles + filtered_gases[gas][MOLES] = transferred_moles + env_gases[gas][MOLES] -= transferred_moles environment.garbage_collect() diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm index 79fbb6ddd5e..fc20112f08a 100644 --- a/code/modules/food_and_drinks/machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm @@ -93,7 +93,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( to_chat(user, span_warning("There's nothing to dissolve [weapon] in!")) return user.visible_message(span_notice("[user] drops [weapon] into [src]."), span_notice("You dissolve [weapon] in [src].")) - weapon.reagents.trans_to(src, weapon.reagents.total_volume, transfered_by = user) + weapon.reagents.trans_to(src, weapon.reagents.total_volume, transferred_by = user) qdel(weapon) return // Make sure we have cooking oil diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 90e7963f6f8..0f70b0e0387 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -246,13 +246,13 @@ mix_message = "The mixture thickens into yoghurt." reaction_flags = REACTION_INSTANT -/datum/chemical_reaction/food/quality_oil_upconvert +/datum/chemical_reaction/food/olive_oil_upconvert required_reagents = list(/datum/reagent/consumable/nutriment/fat/oil/olive = 1, /datum/reagent/consumable/nutriment/fat/oil = 2) results = list(/datum/reagent/consumable/nutriment/fat/oil/olive = 2) mix_message = "The cooking oil dilutes the quality oil- how delightfully devilish..." reaction_flags = REACTION_INSTANT -/datum/chemical_reaction/food/quality_oil +/datum/chemical_reaction/food/olive_oil results = list(/datum/reagent/consumable/nutriment/fat/oil/olive = 2) required_reagents = list(/datum/reagent/consumable/olivepaste = 4, /datum/reagent/water = 1) reaction_flags = REACTION_INSTANT diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index 71986e46812..aa6a69ea064 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -47,7 +47,7 @@ /// Tracks the total number of ingredient items needed, for calculating multipliers. Only done once in first on_reaction VAR_FINAL/total_ingredient_max - /// Multiplier applied to all reagents transfered from reagents to pot when the soup is cooked + /// Multiplier applied to all reagents transferred from reagents to pot when the soup is cooked var/ingredient_reagent_multiplier = 0.8 /// What percent of nutriment is converted to "soup" (what percent does not stay final product)? /// Raise this if your ingredients have a lot of nutriment and is overpowering your other reagents diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index 4e99329d0ae..ea6d10cb668 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -180,12 +180,12 @@ result = /datum/reagent/consumable/yoghurt reaction = /datum/chemical_reaction/food/yoghurt -/datum/crafting_recipe/food/reaction/quality_oil +/datum/crafting_recipe/food/reaction/olive_oil result = /datum/reagent/consumable/nutriment/fat/oil/olive - reaction = /datum/chemical_reaction/food/quality_oil + reaction = /datum/chemical_reaction/food/olive_oil -/datum/crafting_recipe/food/reaction/quality_oil/upconvert - reaction = /datum/chemical_reaction/food/quality_oil_upconvert +/datum/crafting_recipe/food/reaction/olive_oil/upconvert + reaction = /datum/chemical_reaction/food/olive_oil_upconvert /datum/crafting_recipe/food/reaction/moonshine reaction = /datum/chemical_reaction/drink/moonshine diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 5a10c883e49..86a8dbc4095 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -149,7 +149,7 @@ reagents.add_reagent(reagent, single_reagent_amount, added_purity = average_purity) if(reagents && target_holder) - reagents.trans_to(target_holder, reagents.total_volume, transfered_by = user) + reagents.trans_to(target_holder, reagents.total_volume, transferred_by = user) return TRUE #undef BITE_SIZE_POTENCY_MULTIPLIER diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 04842519ea7..8c42dce397f 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -892,7 +892,7 @@ var/transfer_me_to_tray = reagent_source.reagents.get_reagent_amount(not_water_reagent.type) * transfer_amount / reagent_source.reagents.total_volume reagent_source.reagents.trans_id_to(H.reagents, not_water_reagent.type, transfer_me_to_tray) else - reagent_source.reagents.trans_to(H.reagents, transfer_amount, transfered_by = user) + reagent_source.reagents.trans_to(H.reagents, transfer_amount, transferred_by = user) lastuser = WEAKREF(user) if(IS_EDIBLE(reagent_source) || istype(reagent_source, /obj/item/reagent_containers/pill)) qdel(reagent_source) diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm index bb2077dbd83..b9080a8673a 100644 --- a/code/modules/mob/living/brain/posibrain.dm +++ b/code/modules/mob/living/brain/posibrain.dm @@ -124,20 +124,20 @@ GLOBAL_VAR(posibrain_notify_cooldown) brainmob.set_suicide(FALSE) transfer_personality(user) -/obj/item/mmi/posibrain/transfer_identity(mob/living/carbon/transfered_user) - name = "[initial(name)] ([transfered_user])" - brainmob.name = transfered_user.real_name - brainmob.real_name = transfered_user.real_name - if(transfered_user.has_dna()) +/obj/item/mmi/posibrain/transfer_identity(mob/living/carbon/transferred_user) + name = "[initial(name)] ([transferred_user])" + brainmob.name = transferred_user.real_name + brainmob.real_name = transferred_user.real_name + if(transferred_user.has_dna()) if(!brainmob.stored_dna) brainmob.stored_dna = new /datum/dna/stored(brainmob) - transfered_user.dna.copy_dna(brainmob.stored_dna) - brainmob.timeofdeath = transfered_user.timeofdeath + transferred_user.dna.copy_dna(brainmob.stored_dna) + brainmob.timeofdeath = transferred_user.timeofdeath brainmob.set_stat(CONSCIOUS) if(brainmob.mind) brainmob.mind.set_assigned_role(SSjob.GetJobType(posibrain_job_path)) - if(transfered_user.mind) - transfered_user.mind.transfer_to(brainmob) + if(transferred_user.mind) + transferred_user.mind.transfer_to(brainmob) brainmob.mind.remove_all_antag_datums() brainmob.mind.wipe_memory() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index f3bde576695..2ddb20b8b4e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -481,7 +481,7 @@ var/turf/floor = get_turf(src) var/obj/effect/decal/cleanable/vomit/spew = new(floor, get_static_viruses()) - bite.reagents.trans_to(spew, amount, transfered_by = src) + bite.reagents.trans_to(spew, amount, transferred_by = src) /mob/living/carbon/proc/spew_organ(power = 5, amt = 1) for(var/i in 1 to amt) diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index c3282967e64..4d14fb7df66 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -40,14 +40,14 @@ /mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts) var/atom/Tsec = drop_location() if(!no_bodyparts) - if(no_organs)//so the organs don't get transfered inside the bodyparts we'll drop. + if(no_organs)//so the organs don't get transferred inside the bodyparts we'll drop. for(var/organ in organs) if(no_brain || !istype(organ, /obj/item/organ/internal/brain)) qdel(organ) else //we're going to drop all bodyparts except chest, so the only organs that needs spilling are those inside it. for(var/obj/item/organ/organ as anything in organs) if(no_brain && istype(organ, /obj/item/organ/internal/brain)) - qdel(organ) //so the brain isn't transfered to the head when the head drops. + qdel(organ) //so the brain isn't transferred to the head when the head drops. continue var/org_zone = check_zone(organ.zone) //both groin and chest organs. if(org_zone == BODY_ZONE_CHEST) diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm index a05707534ca..a254c5511aa 100644 --- a/code/modules/mob_spawn/mob_spawn.dm +++ b/code/modules/mob_spawn/mob_spawn.dm @@ -234,7 +234,7 @@ */ /obj/effect/mob_spawn/ghost_role/proc/create_from_ghost(mob/dead/user) ASSERT(istype(user)) - var/user_ckey = user.ckey // We need to do it before everything else, because after the create() the ckey will already have been transfered. + var/user_ckey = user.ckey // We need to do it before everything else, because after the create() the ckey will already have been transferred. user.log_message("became a [prompt_name].", LOG_GAME) uses -= 1 // Remove a use before trying to spawn to prevent strangeness like the spawner trying to spawn more mobs than it should be able to diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 3caa5d5b77a..4f84725b923 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -237,7 +237,7 @@ return if(!M.reagents) return - reagents.trans_to(M, reagents.total_volume, transfered_by = user, methods = INJECT) + reagents.trans_to(M, reagents.total_volume, transferred_by = user, methods = INJECT) /obj/item/pen/sleepy/Initialize(mapload) diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index e28126d6220..7ce4c2f5576 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -85,15 +85,15 @@ var/obj/item/reagent_containers/B = AM ///see if it would overflow else inject if((B.reagents.total_volume + wanted_amount) <= B.reagents.maximum_volume) - reagents.trans_to(B, wanted_amount, transfered_by = src) + reagents.trans_to(B, wanted_amount, transferred_by = src) B.forceMove(goodspot) return ///glass was full so we move it away AM.forceMove(badspot) if(istype(AM, /obj/item/slime_extract)) ///slime extracts need inject AM.forceMove(goodspot) - reagents.trans_to(AM, wanted_amount, transfered_by = src, methods = INJECT) + reagents.trans_to(AM, wanted_amount, transferred_by = src, methods = INJECT) return if(istype(AM, /obj/item/slimecross/industrial)) ///no need to move slimecross industrial things - reagents.trans_to(AM, wanted_amount, transfered_by = src, methods = INJECT) + reagents.trans_to(AM, wanted_amount, transferred_by = src, methods = INJECT) return diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm index 85dc47f90dc..3ff3d640c62 100644 --- a/code/modules/power/apc/apc_attack.dm +++ b/code/modules/power/apc/apc_attack.dm @@ -243,7 +243,7 @@ balloon_alert(ethereal, "can't transfer power!") return if(istype(stomach)) - balloon_alert(ethereal, "transfered power") + balloon_alert(ethereal, "transferred power") stomach.adjust_charge(-APC_POWER_GAIN) cell.give(APC_POWER_GAIN) else diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm index fedfd42014e..bb4afcede94 100644 --- a/code/modules/power/turbine/turbine.dm +++ b/code/modules/power/turbine/turbine.dm @@ -69,14 +69,14 @@ * Handles all the calculations needed for the gases, work done, temperature increase/decrease */ /obj/machinery/power/turbine/proc/transfer_gases(datum/gas_mixture/input_mix, datum/gas_mixture/output_mix, work_amount_to_remove, intake_size = 1) - //pump gases. if no gases were transfered then no work was done + //pump gases. if no gases were transferred then no work was done var/output_pressure = PRESSURE_MAX(output_mix.return_pressure()) - var/datum/gas_mixture/transfered_gases = input_mix.pump_gas_to(output_mix, input_mix.return_pressure() * intake_size) - if(!transfered_gases) + var/datum/gas_mixture/transferred_gases = input_mix.pump_gas_to(output_mix, input_mix.return_pressure() * intake_size) + if(!transferred_gases) return 0 //compute work done - var/work_done = QUANTIZE(transfered_gases.total_moles()) * R_IDEAL_GAS_EQUATION * transfered_gases.temperature * log((transfered_gases.volume * PRESSURE_MAX(transfered_gases.return_pressure())) / (output_mix.volume * output_pressure)) * TURBINE_WORK_CONVERSION_MULTIPLIER + var/work_done = QUANTIZE(transferred_gases.total_moles()) * R_IDEAL_GAS_EQUATION * transferred_gases.temperature * log((transferred_gases.volume * PRESSURE_MAX(transferred_gases.return_pressure())) / (output_mix.volume * output_pressure)) * TURBINE_WORK_CONVERSION_MULTIPLIER if(work_amount_to_remove) work_done = work_done - work_amount_to_remove diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm index b890222a86c..dee2c087c68 100644 --- a/code/modules/projectiles/ammunition/_firing.dm +++ b/code/modules/projectiles/ammunition/_firing.dm @@ -64,7 +64,7 @@ loaded_projectile.ignore_source_check = TRUE if(reagents && loaded_projectile.reagents) - reagents.trans_to(loaded_projectile, reagents.total_volume, transfered_by = user) //For chemical darts/bullets + reagents.trans_to(loaded_projectile, reagents.total_volume, transferred_by = user) //For chemical darts/bullets qdel(reagents) /obj/item/ammo_casing/proc/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread, atom/fired_from) diff --git a/code/modules/projectiles/ammunition/special/syringe.dm b/code/modules/projectiles/ammunition/special/syringe.dm index 59f5f3b3177..c06069c4d10 100644 --- a/code/modules/projectiles/ammunition/special/syringe.dm +++ b/code/modules/projectiles/ammunition/special/syringe.dm @@ -15,7 +15,7 @@ var/obj/item/reagent_containers/syringe/S = SG.syringes[1] - S.reagents.trans_to(loaded_projectile, S.reagents.total_volume, transfered_by = user) + S.reagents.trans_to(loaded_projectile, S.reagents.total_volume, transferred_by = user) loaded_projectile.name = S.name var/obj/projectile/bullet/dart/D = loaded_projectile D.inject_flags = S.inject_flags @@ -25,7 +25,7 @@ var/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/syringe_gun = loc var/obj/item/reagent_containers/syringe/loaded_syringe = syringe_gun.syringes[1] var/obj/projectile/bullet/dart/shot_dart = loaded_projectile - syringe_gun.reagents.trans_to(shot_dart, min(loaded_syringe.volume, syringe_gun.reagents.total_volume), transfered_by = user) + syringe_gun.reagents.trans_to(shot_dart, min(loaded_syringe.volume, syringe_gun.reagents.total_volume), transferred_by = user) shot_dart.name = loaded_syringe.name shot_dart.inject_flags = loaded_syringe.inject_flags LAZYREMOVE(syringe_gun.syringes, loaded_syringe) @@ -45,7 +45,7 @@ var/obj/item/gun/chem/CG = loc if(CG.syringes_left <= 0) return - CG.reagents.trans_to(loaded_projectile, 15, transfered_by = user) + CG.reagents.trans_to(loaded_projectile, 15, transferred_by = user) loaded_projectile.name = "piercing chemical dart" CG.syringes_left-- return ..() diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 1160604fb23..cb8a30f61b8 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -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)) diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm index b2e29e3c5d6..37d089aab42 100644 --- a/code/modules/reagents/chemistry/items.dm +++ b/code/modules/reagents/chemistry/items.dm @@ -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 diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 5749ac9a62e..0a49fd1beb1 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -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) diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index 0271c17d18b..3a8754bfe4f 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -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 diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 44cf8b995da..016253baa3e 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -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 diff --git a/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm b/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm index a86bcfc97b0..c1da8b7424f 100644 --- a/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index acefe102256..49ef6980142 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -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 ..() diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index a5ea964172f..3a956d7968e 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -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 . | ..() diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index f6b2a0fb323..ad83d2c439c 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm index a2dae93c22e..1e4466da8c3 100644 --- a/code/modules/reagents/reagent_containers/cups/bottle.dm +++ b/code/modules/reagents/reagent_containers/cups/bottle.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm index 0be90bc7a70..4908942b2c0 100644 --- a/code/modules/reagents/reagent_containers/cups/soda.dm +++ b/code/modules/reagents/reagent_containers/cups/soda.dm @@ -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.", diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index fbfa62f896b..cf01c2cd4c2 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -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.")) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 624e97e69fd..63648375045 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm index df6c311878d..e6836c7a4c2 100644 --- a/code/modules/reagents/reagent_containers/medigel.dm +++ b/code/modules/reagents/reagent_containers/medigel.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/misc.dm b/code/modules/reagents/reagent_containers/misc.dm index cae8582392b..b7a5fbb71f5 100644 --- a/code/modules/reagents/reagent_containers/misc.dm +++ b/code/modules/reagents/reagent_containers/misc.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index c8a079f254e..7c7f97f0cc7 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 02a26e00bae..a19e7fbe7f3 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index b8b77d15561..beed3d17ba6 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -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 diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 40a41c6f033..5f8ebecd990 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -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() diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm index 7d24c7103dc..b83a0a5b7f4 100644 --- a/code/modules/research/xenobiology/crossbreeding/__corecross.dm +++ b/code/modules/research/xenobiology/crossbreeding/__corecross.dm @@ -152,7 +152,7 @@ To add a crossbreed: to_chat(user, span_warning("This can only be used on yourself.")) return if(reagents.total_volume && (ignore_flags || M.try_inject(user, injection_flags = INJECT_TRY_SHOW_ERROR_MESSAGE))) - reagents.trans_to(M, reagents.total_volume, transfered_by = user) + reagents.trans_to(M, reagents.total_volume, transferred_by = user) if(user != M) to_chat(M, span_warning("[user] presses [src] against you!")) to_chat(user, span_notice("You press [src] against [M], injecting [M.p_them()].")) diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 230b2b038b8..dc28e5da576 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -52,6 +52,6 @@ to_chat(owner, span_notice("You grit your teeth and burst the implanted [item_target.name]!")) owner.log_message("swallowed an implanted pill, [target]", LOG_ATTACK) if(item_target.reagents.total_volume) - item_target.reagents.trans_to(owner, item_target.reagents.total_volume, transfered_by = owner, methods = INGEST) + item_target.reagents.trans_to(owner, item_target.reagents.total_volume, transferred_by = owner, methods = INGEST) qdel(target) return TRUE diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index 3546d7853b3..ca3b4f2f479 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -428,7 +428,7 @@ if(!chassis.Adjacent(S)) to_chat(user, "[icon2html(src, user)][span_warning("Unable to load syringe!")]") return FALSE - S.reagents.trans_to(src, S.reagents.total_volume, transfered_by = user) + S.reagents.trans_to(src, S.reagents.total_volume, transferred_by = user) S.forceMove(src) LAZYADD(syringes,S) to_chat(user, "[icon2html(src, user)][span_notice("Syringe loaded.")]") diff --git a/modular_skyrat/master_files/code/modules/clothing/towels.dm b/modular_skyrat/master_files/code/modules/clothing/towels.dm index 5dafa97188c..051c367ff64 100644 --- a/modular_skyrat/master_files/code/modules/clothing/towels.dm +++ b/modular_skyrat/master_files/code/modules/clothing/towels.dm @@ -449,7 +449,7 @@ if(!amount) return - reagents.trans_to(target, amount * (1 - loss_factor), no_react = TRUE, transfered_by = user) + reagents.trans_to(target, amount * (1 - loss_factor), no_react = TRUE, transferred_by = user) if(loss_factor && reagents.total_volume) reagents.remove_any(amount * loss_factor) @@ -483,7 +483,7 @@ if(!amount) return - source.trans_to(reagents, amount, no_react = TRUE, transfered_by = user) + source.trans_to(reagents, amount, no_react = TRUE, transferred_by = user) if(!wet) set_wet(TRUE, !make_used || shape == TOWEL_USED) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm b/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm index acfbee550ad..0203a636230 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm @@ -44,7 +44,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() diff --git a/modular_skyrat/modules/bongs/code/bong.dm b/modular_skyrat/modules/bongs/code/bong.dm index ca709cf184b..614ccfca343 100644 --- a/modular_skyrat/modules/bongs/code/bong.dm +++ b/modular_skyrat/modules/bongs/code/bong.dm @@ -47,7 +47,7 @@ bong_hits = max_hits packed_item = TRUE if(grown_item.reagents) - grown_item.reagents.trans_to(src, grown_item.reagents.total_volume, transfered_by = user) + grown_item.reagents.trans_to(src, grown_item.reagents.total_volume, transferred_by = user) reagent_transfer_per_use = reagents.total_volume / max_hits qdel(grown_item) @@ -59,7 +59,7 @@ bong_hits = max_hits packed_item = TRUE if(used_item.reagents) - used_item.reagents.trans_to(src, used_item.reagents.total_volume, transfered_by = user) + used_item.reagents.trans_to(src, used_item.reagents.total_volume, transferred_by = user) reagent_transfer_per_use = reagents.total_volume / max_hits qdel(used_item) else @@ -96,7 +96,7 @@ return to_chat(hit_mob, span_notice("You finish taking a hit from the [src].")) if(reagents.total_volume) - reagents.trans_to(hit_mob, reagent_transfer_per_use, transfered_by = user, methods = VAPOR) + reagents.trans_to(hit_mob, reagent_transfer_per_use, transferred_by = user, methods = VAPOR) bong_hits-- var/turf/open/pos = get_turf(src) if(istype(pos)) diff --git a/modular_skyrat/modules/medical/code/smartdarts.dm b/modular_skyrat/modules/medical/code/smartdarts.dm index c36caa3f1eb..ed649300e93 100644 --- a/modular_skyrat/modules/medical/code/smartdarts.dm +++ b/modular_skyrat/modules/medical/code/smartdarts.dm @@ -34,7 +34,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.")) return SECONDARY_ATTACK_CONTINUE_CHAIN diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm index 6fb548eb4ff..97158ba5d91 100644 --- a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm +++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm @@ -249,7 +249,7 @@ GLOBAL_LIST_EMPTY(soulcatchers) current_souls -= target_soul target_room.current_souls += target_soul - to_chat(target_soul, span_cyan("you've been transfered to [target_room]!")) + to_chat(target_soul, span_cyan("you've been transferred to [target_room]!")) to_chat(target_soul, span_notice(target_room.room_description)) return TRUE diff --git a/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm b/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm index 10fde9ab06e..4673264c92d 100644 --- a/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm +++ b/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm @@ -56,7 +56,7 @@ if(do_after(user, 30)) to_chat(user, span_notice("You finish snorting the [src].")) if(reagents.total_volume) - reagents.trans_to(user, reagents.total_volume, transfered_by = user, methods = INGEST) + reagents.trans_to(user, reagents.total_volume, transferred_by = user, methods = INGEST) qdel(src) /obj/item/reagent_containers/cocaine/attack(mob/target, mob/user) diff --git a/modular_skyrat/modules/morenarcotics/code/crackpipe.dm b/modular_skyrat/modules/morenarcotics/code/crackpipe.dm index 42d09c707ba..e17bf805a37 100644 --- a/modular_skyrat/modules/morenarcotics/code/crackpipe.dm +++ b/modular_skyrat/modules/morenarcotics/code/crackpipe.dm @@ -33,7 +33,7 @@ smoketime = 2 * 60 name = "[used_item.name]-packed [initial(name)]" if(used_item.reagents) - used_item.reagents.trans_to(src, used_item.reagents.total_volume, transfered_by = user) + used_item.reagents.trans_to(src, used_item.reagents.total_volume, transferred_by = user) qdel(used_item) else var/lighting_text = used_item.ignition_effect(src,user) diff --git a/modular_skyrat/modules/morenarcotics/code/opium.dm b/modular_skyrat/modules/morenarcotics/code/opium.dm index 20436d38c8c..7c49c67ca5d 100644 --- a/modular_skyrat/modules/morenarcotics/code/opium.dm +++ b/modular_skyrat/modules/morenarcotics/code/opium.dm @@ -46,7 +46,7 @@ if(do_after(user, 30)) to_chat(user, span_notice("You finish snorting the [src].")) if(reagents.total_volume) - reagents.trans_to(user, reagents.total_volume, transfered_by = user, methods = INGEST) + reagents.trans_to(user, reagents.total_volume, transferred_by = user, methods = INGEST) qdel(src) /obj/item/reagent_containers/heroin/attack(mob/target, mob/user) diff --git a/modular_skyrat/modules/morenarcotics/code/vapecarts.dm b/modular_skyrat/modules/morenarcotics/code/vapecarts.dm index 19d65924945..8e9d242484e 100644 --- a/modular_skyrat/modules/morenarcotics/code/vapecarts.dm +++ b/modular_skyrat/modules/morenarcotics/code/vapecarts.dm @@ -17,7 +17,7 @@ if(istype(target, /obj/item/clothing/mask/vape)) var/obj/item/clothing/mask/vape/target_vape = target if(target_vape.screw == TRUE && !target_vape.reagents.total_volume) - src.reagents.trans_to(target_vape, src.volume, transfered_by = user) + src.reagents.trans_to(target_vape, src.volume, transferred_by = user) qdel(src) to_chat(user, span_notice("You plug the [src.name] into the vape.")) else if(!target_vape.screw)