Merge remote-tracking branch 'origin/main' into randomizer

# Conflicts:
#	src/f_op/f_op_actor_mng.cpp

src/d/actor/d_a_obj_item.cpp

@@ -324,6 +324,11 @@ int daItem_c::_daItem_create() {
 
 
     m_itemNo = daItem_prm::getItemNo(this);
+#if TARGET_PC
+    if (dusk::getSettings().game.noHeartDrops && isHeart(m_itemNo)) {
+        return cPhs_ERROR_e;
+    }
+#endif
     BOOL flag = dItem_data::chkFlag(m_itemNo, 2);
 
 #if DEBUG