diff --git a/SQF/dayz_code/actions/boil.sqf b/SQF/dayz_code/actions/boil.sqf
index 4b5f893b0..33d618f51 100644
--- a/SQF/dayz_code/actions/boil.sqf
+++ b/SQF/dayz_code/actions/boil.sqf
@@ -1,6 +1,6 @@
private ["_bottletext","_tin1text","_tin2text","_tintext","_hastinitem","_qty","_dis","_sfx","_WB2Add"];
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_22" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
_bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "displayName");
diff --git a/SQF/dayz_code/actions/cook.sqf b/SQF/dayz_code/actions/cook.sqf
index 1df11e7a5..709c1f751 100644
--- a/SQF/dayz_code/actions/cook.sqf
+++ b/SQF/dayz_code/actions/cook.sqf
@@ -1,5 +1,5 @@
private ["_rawmeat","_cookedmeat","_meat","_meatcooked","_text","_qty","_dis","_sfx"];
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_23" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
//diag_log ("Cook Enabled");
player removeAction s_player_cook;
diff --git a/SQF/dayz_code/actions/gather_meat.sqf b/SQF/dayz_code/actions/gather_meat.sqf
index dfdc5f485..0e81e9b1e 100644
--- a/SQF/dayz_code/actions/gather_meat.sqf
+++ b/SQF/dayz_code/actions/gather_meat.sqf
@@ -2,11 +2,7 @@ private ["_item","_type","_hasHarvested","_knifeArray","_PlayerNear","_isListed"
_isZombie = _this isKindOf "zZombie_base";
if (dayz_actionInProgress) exitWith {
- if (_isZombie) then {
- localize "str_epoch_player_31" call dayz_rollingMessages;
- } else {
- localize "str_epoch_player_29" call dayz_rollingMessages;
- };
+ localize "str_player_actionslimit" call dayz_rollingMessages;
};
dayz_actionInProgress = true;
diff --git a/SQF/dayz_code/actions/player_addToolbelt.sqf b/SQF/dayz_code/actions/player_addToolbelt.sqf
index 9d9d810c4..f2c494997 100644
--- a/SQF/dayz_code/actions/player_addToolbelt.sqf
+++ b/SQF/dayz_code/actions/player_addToolbelt.sqf
@@ -5,7 +5,7 @@
3. Removing tool from toolbelt and converting it to primary
*/
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_39" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_item","_config","_onLadder","_text","_create","_config2","_primaryFull","_removed","_toolsFull"];
diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf
index 6294c6a67..b3348f8fc 100644
--- a/SQF/dayz_code/actions/player_craftItem.sqf
+++ b/SQF/dayz_code/actions/player_craftItem.sqf
@@ -25,7 +25,7 @@ class ItemActions
*/
private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_boiled","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_selectedRecipeInputStrict","_num_removed","_removed_total","_temp_removed_array","_abort","_waterLevel","_waterLevel_lowest","_reason","_isNear","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag","_sfx"];
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
// This is used to find correct recipe based what itemaction was click allows multiple recipes per item.
diff --git a/SQF/dayz_code/actions/player_craftItemVanilla.sqf b/SQF/dayz_code/actions/player_craftItemVanilla.sqf
index cb441b3b4..a3e1515f3 100644
--- a/SQF/dayz_code/actions/player_craftItemVanilla.sqf
+++ b/SQF/dayz_code/actions/player_craftItemVanilla.sqf
@@ -12,7 +12,7 @@
//diag_log("crafting system");
private ["_config","_input","_output","_required","_failChance","_hasInput","_availabeSpace","_classname","_isClass","_onLadder","_hasTools","_avail","_selection","_item","_amount","_itemName","_freeSlots","_slotType","_i","_j","_dis","_sfx"];
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
//diag_log(str(isnil "r_player_crafting"));
diff --git a/SQF/dayz_code/actions/player_wearClothes.sqf b/SQF/dayz_code/actions/player_wearClothes.sqf
index 22f973dfb..00d5eb346 100644
--- a/SQF/dayz_code/actions/player_wearClothes.sqf
+++ b/SQF/dayz_code/actions/player_wearClothes.sqf
@@ -6,7 +6,7 @@ _playerNear = {isPlayer _x} count (([player] call FNC_GetPos) nearEntities ["CAM
if (_playerNear) exitWith {localize "STR_EPOCH_PLAYER_84" call dayz_rollingMessages;};
if (_this in DZE_RestrictSkins) exitWith { format[localize "str_epoch_player_315",_this] call dayz_rollingMessages; };
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_83" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
/*
_item call player_wearClothes;
diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf
index 1c8642c9b..be1ca0741 100644
--- a/SQF/dayz_code/actions/remove.sqf
+++ b/SQF/dayz_code/actions/remove.sqf
@@ -1,4 +1,4 @@
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_88" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
/*
delete object from db with extra waiting by [VB]AWOL
diff --git a/SQF/dayz_code/actions/repair.sqf b/SQF/dayz_code/actions/repair.sqf
index fc7c5b36a..37d76f4f9 100644
--- a/SQF/dayz_code/actions/repair.sqf
+++ b/SQF/dayz_code/actions/repair.sqf
@@ -1,4 +1,4 @@
-if (dayz_actionInProgress) exitWith {localize "str_epoch_player_92" call dayz_rollingMessages;};
+if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_array","_vehicle","_part","_hitpoint","_type","_hasToolbox","_section","_nameType","_namePart","_damage","_selection","_dis","_sfx","_hitpoints","_allFixed","__FILE__"];
diff --git a/SQF/dayz_code/compile/fn_getPos.sqf b/SQF/dayz_code/compile/fn_getPos.sqf
new file mode 100644
index 000000000..1e087bcad
--- /dev/null
+++ b/SQF/dayz_code/compile/fn_getPos.sqf
@@ -0,0 +1,9 @@
+private "_pos";
+
+_pos = getPosASL (_this select 0);
+
+if !(surfaceIsWater _pos) then {
+ _pos = ASLToATL _pos;
+};
+
+_pos
\ No newline at end of file
diff --git a/SQF/dayz_code/compile/fnc_getPos.sqf b/SQF/dayz_code/compile/fnc_getPos.sqf
deleted file mode 100644
index 4a49bde06..000000000
--- a/SQF/dayz_code/compile/fnc_getPos.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-private "_pos";
-
-//if (isNil {_this select 0}) exitWith {[0,0,0]};
-_thingy = _this select 0;
-_pos = getPosASL _thingy;
-
-if !(surfaceIsWater _pos) then {
- _pos = ASLToATL _pos;
-};
-
-_pos
\ No newline at end of file
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index e4740b1a5..d6f3892a3 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -622,7 +622,7 @@ BIS_fnc_findNestedElement = compile preprocessFileLineNumbers "\z\addons\dayz_co
BIS_fnc_param = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\BIS_fnc\fn_param.sqf";
BIS_fnc_relativeDirTo = compile("private '_dir';_dir=_this call{" + (preprocessFileLineNumbers "ca\modules\Functions\geometry\fn_relativeDirTo.sqf")+"};if(_dir>180)then{_dir=_dir-360;};if(_dir<-180)then{_dir=_dir+360;};_dir");
fnc_buildWeightedArray = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildWeightedArray.sqf"; //Checks which actions for nearby casualty
-fnc_getPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_getPos.sqf";
+fnc_getPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_getPos.sqf";
fnc_spawnObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_spawnObjects.sqf";
object_getHit = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_getHit.sqf"; //gets the hit value for a HitPoint (i.e. HitLegs) against the selection (i.e. "legs"), returns the value
object_setHit = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_setHit.sqf"; //process the hit as a NORMAL damage (useful for persistent vehicles)
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 7e4d8cd24..c0624ce48 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -11535,22 +11535,6 @@
Le déverrouillage est déjà en cours.
Odemykání již probíhá.
-
- Boil is already in progress.
- Aufkochen bereits im Gange.
- Уже кипятится.
- Je bent al aan ket koken.
- L'ébullition est déjà en cours.
- Převařování již probíhá.
-
-
- Cooking is already in progress.
- Kochen bereits im Gange.
- Уже готовится.
- Je bent al aan het koken.
- La cuisson est déjà en cours.
- Vaření již probíhá.
-
Preparing to fuel and start generator, move to cancel.
Betanken und Starten des Generators, bewege dich um den Vorgang abzubrechen.
@@ -11583,22 +11567,6 @@
Le générateur a été démarré.
Generátor byl nastartován.
-
- Gutting animal is already in progress.
- Ausweiden des Tieres bereits im Gange.
- Животное уже разделывается.
- Je bent dit dier al aan het opensnijden.
- Le dépeçage de l'animal est déjà en cours.
- Kuchání zvířete již probíhá.
-
-
- Gutting zombie is already in progress.
- Ausweiden des Zombies bereits im Gange.
- Зомби уже разделывается.
- Je bent deze zombie al aan het opensnijden.
- Le dépeçage du zombie est déjà en cours.
- Kuchání zombie již probíhá.
-
Hotwire vehicle is already in progress.
Aufbrechen des Fahrzeuges bereits im Gange.
@@ -11636,14 +11604,6 @@
Le verrouillage du véhicule est déjà en cours.
Zamykání vozidla již probíhá.
-
- Add to toolbelt is already in progress.
- Hinzufügen zum Werkzeuggürtel bereits im Gange.
- Уже добавляется на пояс.
- Reeds bezig met toevoegen aan gereedschapsriem
- L'ajout à la ceinture est déjà en cours.
- Přidávání do opasku na nářadí již probíhá.
-
Building already in progress.
Bau bereits im Gange.
@@ -11795,14 +11755,6 @@
Construction démarré
Tvorba začala
-
- Crafting already in progress.
- Herstellung bereits im Gange.
- Уже создаётся.
- Je bent al bezig met creëren
- La construction est déjà en cours.
- Vytváření již probíhá.
-
Canceled crafting.
Herstellung abgebrochen.
@@ -11891,14 +11843,6 @@
Aucune amélioration disponible
Nejsou dostupné žádné upgrady
-
- Changing clothes already in progress.
- Wechseln der Kleidung bereits im Gange.
- Вы уже переодеваетесь.
- Je bent je al aan het omkleden.
- Le changement de vêtements est déjà en cours.
- Změna oblečení již probíhá.
-
You cannot change clothes when another player is nearby.
Du kannst deine Kleidung nicht wechseln, wenn ein anderer Spieler in der Nähe ist.
@@ -11915,14 +11859,6 @@
Vous ne pouvez pas porter les vêtements du sexe opposé.
Nemůžete nosit oblečení opačného pohlaví.
-
- Remove is already in progress.
- Entfernen bereits im Gange.
- Уже убирается/снимается.
- Al bezig met verwijderen.
- Le démontage est déjà en cours.
- Odstranění již probíhá.
-
Cannot remove a running generator.
Ein laufender Generator kann nicht entfernt werden.
@@ -11947,14 +11883,6 @@
Échec, l'objet n'existe plus.
Chyba. Objekt již neexistuje.
-
- Repair is already in progress.
- Reperatur bereits im Gange.
- Уже чинится.
- Wordt al reeds gerepareerd.
- La réparation est déjà en cours.
- Opravování již probíhá.
-
already in progress.
bereits im Gange.