0.69 + 1.7.5.M1D15

dayz_code/medical/bandage.sqf

@@ -34,18 +34,14 @@ while {r_doLoop} do {
 r_doLoop = false;
 
 if (_finished) then {
-	
-	
-	usecBandage = [_unit,player];
-	publicVariable "usecBandage";
+	["usecBandage",[_unit,player]] call broadcastRpcCallAll;
 		
 	if (_unit == player) then {
 		//Self Healing
 		_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medBandaged.sqf";
 		dayz_sourceBleeding =	objNull;
 	} else {
-		dayzHumanity = [player,20];
-		_id = dayzHumanity spawn player_humanityChange;
+		["dayzHumanity",[player,20]] call dayzHumanity_code;
 	};
 
 	{_unit setVariable[_x,false,true];} forEach USEC_woundHit;

dayz_code/medical/drag.sqf

@@ -24,9 +24,7 @@ sleep 2;
 
 //unconscious unit assumes dragging posture
 //public EH 
-norrnRaDrag = _dragee;
-publicVariable "norrnRaDrag";
-_dragee switchmove "ainjppnemstpsnonwrfldb_still";
+["norrnRaDrag",_dragee] call broadcastRpcCallAll;
 _dragee attachto [_unit,[0.1, 1.01, 0]];
 sleep 0.02;
 

dayz_code/medical/epinephrine.sqf

@@ -12,9 +12,7 @@ if (!_isDead) then {
 	_unit setVariable ["NORRN_unconscious", false, true];
 	_unit setVariable ["USEC_isCardiac",false,true];
 	sleep 5;
-	usecEpi = [_unit,player,"ItemEpinephrine"];
-	publicVariable "usecEpi";
-	_unit switchMove "AmovPpneMstpSnonWnonDnon_healed";
+	["usecEpi",[_unit,player,"ItemEpinephrine"]] call broadcastRpcCallAll;
 };
 
 r_action = false;

dayz_code/medical/load/load_act.sqf

@@ -20,9 +20,7 @@ if ((_vcl emptyPositions "cargo") > 0) then
 	_dragger  switchMove "";
 	_wounded setVariable ["NORRN_LoadVcl", _vcl, true];
 	sleep 1;
-	[_wounded] execVM "\z\addons\dayz_code\medical\load\load_wounded.sqf";
-	norrnRLact = _wounded;
-	publicVariable "norrnRLact";
+	["norrnRLact",_wounded] call broadcastRpcCallAll;
 	player removeAction NORRN_dropAction;
 }else{
 	

dayz_code/medical/load/load_wounded.sqf

@@ -14,9 +14,7 @@ _wounded setVariable ["NORRN_unit_dragged", true, true];
 _wounded assignAsCargo _vcl; 
 _wounded moveInCargo _vcl;
 sleep 1;
-norrnRALW = _wounded;
-publicVariable "norrnRALW";
-_wounded switchMove "kia_hmmwv_driver";
+["norrnRALW",_wounded] call broadcastRpcCallAll;
 
 if (local _wounded) then 
 {	

dayz_code/medical/load_wounded.sqf

@@ -16,9 +16,7 @@ _wounded setVariable ["NORRN_unit_dragged", true, true];
 _wounded assignAsCargo _vcl; 
 _wounded moveInCargo _vcl;
 sleep 1;
-norrnRALW = _wounded;
-publicVariable "norrnRALW";
-_wounded switchMove "kia_hmmwv_driver";
+["norrnRALW",_wounded] call broadcastRpcCallAll;
 
 if (local _wounded) then 
 {	

dayz_code/medical/morphine.sqf

@@ -38,14 +38,12 @@ if (_finished) then {
 		//Self Healing
 		_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf";
 	} else {
-		dayzHumanity = [player,50];
-		_id = dayzHumanity spawn player_humanityChange;
+		["dayzHumanity",[player,50]] call dayzHumanity_code;
 	};
 
 	player removeMagazine "ItemMorphine";
 
-	usecMorphine = [_unit,player];
-	publicVariable "usecMorphine";
+	["usecMorphine",[_unit,player]] call broadcastRpcCallAll;
 } else {
 	r_interrupt = false;
 	[objNull, player, rSwitchMove,""] call RE;

dayz_code/medical/painkiller.sqf

@@ -15,12 +15,11 @@ if (_unit == player) then {
 	//Self Healing
 	_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf";
 } else {
-	dayzHumanity = [player,20];
-	_id = dayzHumanity spawn player_humanityChange;
+	["dayzHumanity",[player,20]] call dayzHumanity_code;
 };
 
 player removeMagazine "ItemPainkiller";
 
 sleep 1;
-usecPainK = [_unit,player];
-publicVariable "usecPainK";
+//clear the healed player's vision
+["usecPainK",[_unit,player]] call broadcastRpcCallAll;

dayz_code/medical/publicEH/medEpi.sqf

@@ -9,14 +9,16 @@ if (local _unit) then {_unit setCaptive false};
 
 if (!_isDead) then {
 	_unit switchMove "AmovPpneMstpSnonWnonDnon_healed";
-	_unit setVariable ["NORRN_unconscious", false, true];
-	_unit setVariable ["USEC_isCardiac",false,true];
+	//no need to public broadcast the variables since this runs on every peer
+	_unit setVariable ["NORRN_unconscious", false, false];
+	_unit setVariable ["USEC_isCardiac",false, false];
 	if (_unit == player) then {
 		r_player_unconscious = false;
 		disableUserInput false;
 		r_player_cardiac = false;
 		r_player_handler1 = false;
 	};
+
 	if (isServer) then {
 		_unit setVariable["medForceUpdate",true];
 	};

dayz_code/medical/publicEH/medMorphine.sqf

@@ -18,8 +18,8 @@ if (_unit == player) then {
 	
 	_id = false spawn dayz_disableRespawn;
 };
-_unit setVariable ["hit_legs",0];
-_unit setVariable ["hit_hands",0];
+_unit setVariable ["hit_legs",0,false];
+_unit setVariable ["hit_hands",0,false];
 
 if (isServer) then {
 	_unit setVariable["medForceUpdate",true];

dayz_code/medical/publicEH/medTransfuse.sqf

@@ -5,6 +5,9 @@ _array = _this; //_this select 0;
 _unit = _array select 0;
 _medic = _array select 1;
 
+_rndInfection = (random 15);
+_TransfusionInfection = (_rndInfection < 1);
+
 if (_unit == player) then {
 	r_player_blood = r_player_bloodTotal;
 	r_player_lowblood = 	false;	
@@ -12,6 +15,11 @@ if (_unit == player) then {
 	"dynamicBlur" ppEffectAdjust [0]; "dynamicBlur" ppEffectCommit 5;
 	"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 1],  [1, 1, 1, 1]];"colorCorrections" ppEffectCommit 5;
 	
+	if (_TransfusionInfection) then {
+		r_player_infected = true;
+		player setVariable["USEC_infected",true];
+	};
+	
 	//Ensure Control is visible
 	_display = uiNamespace getVariable 'DAYZ_GUI_display';
 	_control = 	_display displayCtrl 1300;

dayz_code/medical/setup_functions_med.sqf

@@ -155,7 +155,7 @@ fnc_usec_damageBleed = {
 	/***********************************************************
 	PROCESS DAMAGE TO A UNIT
 	- Function
-	- [_unit, _wound] call fnc_usec_damageBleed;
+	- [_unit, _wound, _injury] call fnc_usec_damageBleed;
 	************************************************************/
 		private["_unit","_wound","_injury","_modelPos","_point","_source"];
 		_unit = _this select 0;
@@ -229,6 +229,7 @@ fnc_usec_damageBleed = {
 };
 
 fnc_usec_recoverUncons = {
+	//same actions as in the EH, just timed differently
 	player setVariable ["NORRN_unconscious", false, true];
 	player setVariable ["unconsciousTime", 0, true];
 	player setVariable ["USEC_isCardiac",false,true];

dayz_code/medical/transfusion.sqf

@@ -3,6 +3,9 @@ _unit = (_this select 3) select 0;
 _lowBlood = 	_unit getVariable ["USEC_lowBlood", false];
 _injured = 		_unit getVariable ["USEC_injured", false];
 _inPain = 		_unit getVariable ["USEC_inPain", false];
+_lastused = 	_unit getVariable ["LastTransfusion", time];
+
+if (_lastused - time < 600) exitwith {cutText [format[(localize "str_actions_medical_18"),_text] , "PLAIN DOWN"]};
 
 call fnc_usec_medic_removeActions;
 r_action = false;
@@ -35,12 +38,12 @@ while {r_doLoop} do {
 r_doLoop = false;
 
 if (_finished) then {
+	_unit setVariable["LastTransfusion",time,true];
 	_unit setVariable["USEC_lowBlood",false,true];
 	player removeMagazine "ItemBloodbag";	
-	usecTransfuse = [_unit,player];
-	publicVariable "usecTransfuse";
-	dayzHumanity = [player,250];
-	_id = dayzHumanity spawn player_humanityChange;
+	["usecTransfuse",[_unit,player]] call broadcastRpcCallAll;
+
+	["dayzHumanity",[player,250]] call dayzHumanity_code;
 } else {
 	r_interrupt = false;
 	player switchMove "";