cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/cleanable.dm
+1 -1
View File
@@ -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
code/game/objects/effects/decals/cleanable/misc.dm
+1 -1
View File
@@ -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
code/game/objects/items.dm
+2 -2
View File
@@ -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()
code/game/objects/items/cigs_lighters.dm
+2 -2
View File
@@ -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)
code/game/objects/items/crayons.dm
+3 -3
View File
@@ -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)
code/game/objects/items/extinguisher.dm
+2 -2
View File
@@ -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)
code/game/objects/items/flamethrower.dm
+1 -1
View File
@@ -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)
code/game/objects/items/robot/items/hypo.dm
+3 -3
View File
@@ -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")
code/game/objects/items/storage/medkit.dm
+1 -1
View File
@@ -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
code/game/objects/items/tools/weldingtool.dm
+1 -1
View File
@@ -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()
code/game/objects/items/toys.dm
+2 -2
View File
@@ -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()
code/game/objects/structures/janitor.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/petrified_statue.dm
+1 -1
View File
@@ -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 ..()
code/game/objects/structures/watercloset.dm
+2 -2
View File
@@ -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)