diff --git a/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index d3e149d2e..89e01dd9e 100644 --- a/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -22,12 +22,8 @@ R3F_TIRED_FNCT_Voile_Noir = { }; }; -R3F_TIRED_FNCT_WarnBeforeBlackout = { - [player,0.1] call fnc_usec_damageUnconscious; - cutText ["You are over burdened.", "PLAIN DOWN"]; -}; R3F_TIRED_FNCT_DoBlackVanish = { [player,0.1] call fnc_usec_damageUnconscious; - cutText ["You are over burdened.", "PLAIN DOWN"]; + cutText ["You are overburdened.", "PLAIN DOWN"]; }; diff --git a/dayz_epoch/textures/parts_bag_texture3c_CA.paa b/dayz_epoch/pictures/parts_bag_texture3c_CA.paa similarity index 100% rename from dayz_epoch/textures/parts_bag_texture3c_CA.paa rename to dayz_epoch/pictures/parts_bag_texture3c_CA.paa diff --git a/dayz_server/compile/server_publishVehicle2.sqf b/dayz_server/compile/server_publishVehicle2.sqf index 8b96fb3b9..0b5d7cc9d 100644 --- a/dayz_server/compile/server_publishVehicle2.sqf +++ b/dayz_server/compile/server_publishVehicle2.sqf @@ -85,14 +85,13 @@ _key call server_hiveWrite; _object setVariable ["CharacterID", _characterID, true]; - _object attachTo [_object_para, [0,0,-1.6]]; - - sleep 1.0; - - WaitUntil{(getpos _object select 2) < 0.1}; - - detach _object; - deleteVehicle _object_para; + if(DZE_TRADER_SPAWNMODE) then { + _object attachTo [_object_para, [0,0,-1.6]]; + sleep 1.0; + WaitUntil{(getpos _object select 2) < 0.1}; + detach _object; + deleteVehicle _object_para; + }; dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; diff --git a/dayz_server/modules/hello_world.sqf b/dayz_server/modules/hello_world.sqf index 03b39477f..2c6bc3293 100644 --- a/dayz_server/modules/hello_world.sqf +++ b/dayz_server/modules/hello_world.sqf @@ -1,3 +1,3 @@ // Sample Hello World -[nil,nil,"per",rTITLETEXT,"Welcome to DayzEpoch.com","PLAIN DOWN"] call RE; +[nil,nil,"per",rTITLETEXT,"Welcome to DayzEpoch","PLAIN DOWN"] call RE;