Revert "Merge branch 'dev-Tomcat' of https://github.com/Apricot-ale/KAM…

… into dev-Tomcat"

This reverts commit af08811, reversing
changes made to 50f75f5.

addons/circulation/CfgVehicles.hpp

@@ -73,13 +73,22 @@ class CfgVehicles {
         };
     };
 
-    class kat_X_AEDItem: kat_AEDItem {
+    class kat_X_AEDItem: Item_Base_F {
+        scope = 2;
+        scopeCurator = 2;
         displayName = CSTRING(X_Display);
+        author = "Katalam";
+        vehicleClass = "Items";
         model = QPATHTOF(models\aedx\aedx.p3d);
         class TransportItems {
             MACRO_ADDITEM(kat_X_AED,1);
         };
 
+        ACEGVAR(dragging,canDrag) = 1;
+        ACEGVAR(dragging,canCarry) = 1;
+        ACEGVAR(dragging,dragPosition)[] = {0,1.1,0};
+        ACEGVAR(dragging,carryPosition)[] = {0,1.1,1};
+
         class ACE_Actions {
             class ACE_MainActions {
                 selection = "interaction_point";

addons/circulation/XEH_preInit.sqf

@@ -73,17 +73,6 @@ PREP_RECOMPILE_END;
     true
 ] call CBA_Settings_fnc_init;
 
-// Allow application of AED pads while CPR is performed
-[
-    QGVAR(AED_duringCpr),
-    "CHECKBOX",
-    LLSTRING(SETTING_AED_duringCpr),
-    [CBA_SETTINGS_CAT, LSTRING(SubCategory_AED)],
-    [true],
-    true
-] call CBA_Settings_fnc_init;
-
-
 //Max Succes chance for AED-X
 [
     QGVAR(AED_X_MaxChance),

addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf

@@ -51,4 +51,4 @@ switch (_AEDOrigin) do {
 
 if (_exit) exitWith {false};
 
-_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && (["",_patient] call ACEFUNC(medical_treatment,canCPR) || GVAR(AED_duringCpr));
+_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && (objectParent _patient isEqualTo objectParent _medic) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)};

addons/circulation/functions/fnc_placeAED_PickUpAction.sqf

@@ -66,10 +66,11 @@ _pickUpText,
     };
 
     deleteVehicle _AED;
-
-    private _added = (([_medic, _AEDClassName] call ACEFUNC(common,addToInventory)) select 0);
-
-    if !(_added) then {
+    if (_medic canAddItemToUniform _AEDClassName || _medic canAddItemToVest _AEDClassName || _medic canAddItemToBackpack _AEDClassName) then {
+        _medic addItem _AEDClassName;
+    } else {
+        private _droppedAED = createVehicle ["Weapon_Empty", getPosATL _medic, [], 0, "CAN_COLLIDE"];
+        _droppedAED addItemCargo [_AEDClassName, 1];
         [ACELLSTRING(Common,Inventory_Full), 1.5, _medic] call ACEFUNC(common,displayTextStructured);
     };
 },

addons/gui/stringtable.xml

@@ -14,7 +14,6 @@
             <Spanish>Parámetros básicos</Spanish>
             <Portuguese>Configurações básicas</Portuguese>
             <Finnish>Perus asetukset</Finnish>
-            <Russian>Основные настройки</Russian>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_ColoredLogs">
             <English>Colored activitylogs (AED-X/Pulseoximeter)</English>
@@ -59,7 +58,6 @@
             <Portuguese>Sem fluídos injetados</Portuguese>
             <Spanish>No se administraron fluidos</Spanish>
             <Finnish>Ei lisätty nesteitä</Finnish>
-            <Russian>Никаких переливаний</Russian>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showInactiveStatuses">
             <English>Show Inactive Statuses</English>
@@ -70,7 +68,6 @@
             <Portuguese>Mostrar status inativos</Portuguese>
             <Spanish>Mostrar estados inactivos</Spanish>
             <Finnish>Näytä passiiviset tehosteet</Finnish>
-            <Russian>Показывать неактивные статусы</Russian>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showBleedRate">
             <English>Show Bleed Rate</English>
@@ -81,7 +78,6 @@
             <Portuguese>Mostrar taxa de sangramento</Portuguese>
             <Spanish>Mostrar ritmo de sangrado</Spanish>
             <Finnish>Näytä verenvuotonopeus</Finnish>
-            <Russian>Показывать скорость кровотечения</Russian>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showBleedRate_DESC">
             <English>Display bleed rate (slow/moderate/severe/massive)</English>
@@ -92,7 +88,6 @@
             <Portuguese>Exibir taxa de sangramento (lento/moderado/grave/massivo)</Portuguese>
             <Spanish>Mostrar la tasa de sangrado (lento, moderado, grave, masivo)</Spanish>
             <Finnish>Näytä verenvuotonopeus (hidas/kohtalainen/vakava/valtava)</Finnish>
-            <Russian>Отображение скорости кровотечения (медленное/умеренное/сильное/массивное)</Russian>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_overlayBodyPart">
             <English>Overlay Selected Body Part</English>
@@ -103,7 +98,6 @@
             <Portuguese>Sobrepor parte do corpo selecionada</Portuguese>
             <Spanish>Resaltar parte del cuerpo seleccionada</Spanish>
             <Finnish>Korosta valittu kehon osa</Finnish>
-            <Russian>Показать выбранную часть тела</Russian>
         </Key>
         <Key ID="STR_KAT_GUI_SETTING_showPatientSideLabels">
             <English>Label Patient Sides</English>
@@ -114,7 +108,6 @@
             <Portuguese>Mostrar etiquetas laterias do paciente</Portuguese>
             <Spanish>Señalar lados del paciente</Spanish>
             <Finnish>Merkitse potilaan sivut</Finnish>
-            <Russian>Маркировка сторон пациента</Russian>
         </Key>
     </Package>
 </Project>

addons/main/stringtable.xml

@@ -11,7 +11,6 @@
             <Korean>https://github.com/KAT-Advanced-Medical/KAM</Korean>
             <Portuguese>https://github.com/KAT-Advanced-Medical/KAM</Portuguese>
             <Finnish>https://github.com/KAT-Advanced-Medical/KAM</Finnish>
-            <Russian>https://github.com/KAT-Advanced-Medical/KAM</Russian>
         </Key>
     </Package>
 </Project>