Merge upstream 22.11.24

[larentoun]

About The Pull Request

Мере

[github-actions]

This PR causes following conflicts on translate branch:

code/modules/food_and_drinks/machinery/microwave.dm

++<<<<<<< HEAD
 +			visible_message(span_danger("You smell a burnt smell coming from [src]!"), ignored_mobs = cant_smell)
 +			add_shared_particles(/particles/smoke)
 +			addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, remove_shared_particles), /particles/smoke), 10 SECONDS)
++||||||| e99a1c33201
++			visible_message(span_danger("You smell a burnt smell coming from [src]!"), ignored_mobs = cant_smell)
++			particles = new /particles/smoke()
++			addtimer(CALLBACK(src, PROC_REF(remove_smoke)), 10 SECONDS)
++=======
+ 			visible_message(span_danger("Вы чуете запах гари из [declent_ru(GENITIVE)]!"), ignored_mobs = cant_smell)
+ 			particles = new /particles/smoke()
+ 			addtimer(CALLBACK(src, PROC_REF(remove_smoke)), 10 SECONDS)
++>>>>>>> origin/translate

code/modules/surgery/organ_manipulation.dm

++<<<<<<< HEAD
++||||||| e99a1c33201
++/datum/surgery/organ_manipulation/mechanic/next_step(mob/living/user, modifiers)
++	if(location != user.zone_selected)
++		return FALSE
++	if(user.combat_mode)
++		return FALSE
++	if(step_in_progress)
++		return TRUE
++
++	var/try_to_fail = FALSE
++	if(LAZYACCESS(modifiers, RIGHT_CLICK))
++		try_to_fail = TRUE
++
++	var/datum/surgery_step/step = get_surgery_step()
++	if(isnull(step))
++		return FALSE
++	var/obj/item/tool = user.get_active_held_item()
++	if(tool)
++		tool = tool.get_proxy_attacker_for(target, user)
++	if(step.try_op(user, target, user.zone_selected, tool, src, try_to_fail))
++		return TRUE
++	if(tool && tool.tool_behaviour) //Mechanic organ manipulation isn't done with just surgery tools
++		to_chat(user, span_warning("This step requires a different tool!"))
++		return TRUE
++
++	return FALSE
++
++=======
+ /datum/surgery/organ_manipulation/mechanic/next_step(mob/living/user, modifiers)
+ 	if(location != user.zone_selected)
+ 		return FALSE
+ 	if(user.combat_mode)
+ 		return FALSE
+ 	if(step_in_progress)
+ 		return TRUE
+ 
+ 	var/try_to_fail = FALSE
+ 	if(LAZYACCESS(modifiers, RIGHT_CLICK))
+ 		try_to_fail = TRUE
+ 
+ 	var/datum/surgery_step/step = get_surgery_step()
+ 	if(isnull(step))
+ 		return FALSE
+ 	var/obj/item/tool = user.get_active_held_item()
+ 	if(tool)
+ 		tool = tool.get_proxy_attacker_for(target, user)
+ 	if(step.try_op(user, target, user.zone_selected, tool, src, try_to_fail))
+ 		return TRUE
+ 	if(tool && tool.tool_behaviour) //Mechanic organ manipulation isn't done with just surgery tools
+ 		to_chat(user, span_warning("Для этого шага требуется другой инструмент!"))
+ 		return TRUE
+ 
+ 	return FALSE
+ 
++>>>>>>> origin/translate

code/modules/surgery/surgery.dm

++<<<<<<< HEAD
 +	if(!tool)
 +		return FALSE
 +	//Just because you used the wrong tool it doesn't mean you meant to whack the patient with it
 +	if((surgery_flags & SURGERY_CHECK_TOOL_BEHAVIOUR) ? tool.tool_behaviour : (tool.item_flags & SURGICAL_TOOL))
 +		to_chat(user, span_warning("This step requires a different tool!"))
++||||||| e99a1c33201
++	if(tool && tool.item_flags & SURGICAL_TOOL) //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it
++		to_chat(user, span_warning("This step requires a different tool!"))
++=======
+ 	if(tool && tool.item_flags & SURGICAL_TOOL) //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it
+ 		to_chat(user, span_warning("Для этого шага требуется другой инструмент!"))
++>>>>>>> origin/translate