mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 14:39:58 +01:00
[MIRROR] Fixes typo 'transfered', olive oil reaction repath [MDB IGNORE] (#23469)
* Fixes typo 'transfered', olive oil reaction repath * Modular * Update condiment.dm * Update recipes_guide.dm * Update _cup.dm --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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..."))
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user