Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,160 Commits 73 Branches 88 Tags
7b44138282
Commit Graph

1872 Commits

Author SHA1 Message Date
Zakant
bdea0fcdba [Medical Rewrite] Adding respawn compatibility () 
* Added respawn transition

* Removed respawn transition from statemachine and added manual transition comment

* Changed transiton to manual. Added easy way to get current status as well

* Updated event reference

* Fixed manualTransition call

* Minor headers changes
 2017-06-17 18:28:16 -05:00
Zakant
b5f6169341 Remove legacy code () 2017-06-17 14:01:59 -05:00
PabstMirror
bec55114fa Add load,unload and radial actions () 
- Add radial actions
- Revert back to using 'ACE_isUnconscious'
 2017-06-15 14:35:33 -05:00
PabstMirror
356a8f640a Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_addHeartRateAdjustment.sqf
	addons/medical/functions/fnc_addToInjuredCollection.sqf
	addons/medical/functions/fnc_addUnconsciousCondition.sqf
	addons/medical/functions/fnc_addVitalLoop.sqf
	addons/medical/functions/fnc_canTreat.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_getBloodPressure.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getCardiacOutput.sqf
	addons/medical/functions/fnc_getHeartRateChange.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_hasMedicalEnabled.sqf
	addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
	addons/medical/functions/fnc_isInStableCondition.sqf
	addons/medical/functions/fnc_isMedicalVehicle.sqf
	addons/medical/functions/fnc_itemCheck.sqf
	addons/medical/functions/fnc_medicationEffectLoop.sqf
	addons/medical/functions/fnc_modifyMedicalAction.sqf
	addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
	addons/medical/functions/fnc_moduleReviveSettings.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_playInjuredSound.sqf
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_selectionNameToNumber.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setStructuralDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentBasic_morphine.sqf
	addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
	addons/medical/functions/fnc_treatmentTourniquet.sqf
	addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/functions/fnc_useItem.sqf
	addons/medical/functions/fnc_vitalLoop.sqf
	addons/medical_blood/functions/fnc_hit.sqf
	addons/medical_treatment/functions/fnc_hasItem.sqf
	addons/medical_treatment/functions/fnc_useItems.sqf
 2017-06-10 10:21:18 -05:00
SilentSpike
a53f68a347 Use getUnitTrait for medics, engineers and EOD () 2017-06-10 11:41:01 +01:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines () 
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
 2017-06-08 15:31:51 +02:00
Ľuboš Lendáč
b91e892710 Merge branch 'medical-rewrite' into medical-rewrite-kill-ai 2017-06-05 22:54:03 +02:00
PabstMirror
f715edabc9 Fix debug 2017-06-05 12:30:54 -05:00
PabstMirror
f98b268419 Split setUnconscious func, add spontaneousWakeUpChance setting () 2017-06-05 11:42:46 -05:00
Cuel
5b9c70a738 Fix zeus RC units using player damage treshold () 
* Fix zeus RC units using player damage treshold

Closes 

* add pabstmirrors suggestion

use gvar
 2017-06-02 11:21:57 -05:00
PabstMirror
7bccf2f6be Fix IVs not showing in patient display () 
Fix  for 3.10
 2017-06-01 10:28:47 -05:00
PabstMirror
a31037bd45 Merge branch 'medical-rewrite' into medical-rewrite-restructure 2017-05-23 13:46:15 -05:00
Arcanum
22e1cdfe35 Add myself as Author 2017-05-22 22:49:27 +02:00
Arcanum
2e856063cb Fix option in setting module 2017-05-22 22:43:03 +02:00
Arcanum
9895881ad9 Add options to disable AI going unconscious and for AI to die instantly 2017-05-22 22:16:18 +02:00
Arcanum
e3f9e65fb7 Revert "Add function to check if AI and condition from fatal" 
This reverts commit 31e1e2964ba41eb3ddb9d1927594053c34e3fa0d.
 2017-05-22 21:11:25 +02:00
Arcanum
31e1e2964b Add function to check if AI and condition from fatal 2017-05-22 20:53:00 +02:00
Arcanum
d055845201 Add vars for separate AI fatalInjuty condition 2017-05-22 19:57:02 +02:00
PabstMirror
9e1a9b9af9 Fix bad var names 2017-05-14 15:14:22 -05:00
PabstMirror
0cdb2ce238 Increase max weapon index for large modsets () 2017-05-12 13:12:39 -05:00
PabstMirror
31a81c4407 Merge branch 'master' into medical-rewrite 2017-05-06 12:01:58 -05:00
classic
777d0e6fb0 Improve Japanese translation () 
* Add the Japanese translation for cargo

Add the Japanese translation for cargo, fix to html tag and few improvement

* fix the Japanese transltion

Fix the Japanese translation for attach. it was used wrong html tag.

* changed The Japanese translation

Changed the Japanese translation of azimuth angle

* fix The Japanese translation

Fix the Japanese translation for chemlights. it was used wrong html tag.

* fix The Japanese translation

Fix the Japanese translation for laserpointer. it was used wrong html tag.

* Fix the Japanese translation

Fix the Japanese translation for medical_blood. it was used wrong translation.

* Fix the Japanese translation

Fix the Japanese translation for rearm. it was used wrong translation.

* add The Japanese translation

add The Japanese translation to new words

* Improve The Japanese translation

Improve, fix and change The Japanese translation

* minor fix to Japanese translation

minor fix to Japanese translation. see b1b07c5
 2017-05-06 12:01:31 -05:00
PabstMirror
dab9772d03 Don't let flumi see these 2017-04-29 14:18:31 -05:00
PabstMirror
fdb14cea20 Fix IvBags in displayPatientInformation 2017-04-29 13:05:39 -05:00
PabstMirror
e667931626 More debug monitor stuff 2017-04-29 12:58:35 -05:00
BaerMitUmlaut
67f557de6a Added status macro functions 2017-04-27 19:11:48 +02:00
BaerMitUmlaut
f12d69e231 Added proper addon basics to status, moved more functions into status 2017-04-26 22:05:40 +02:00
PabstMirror
c6fc4d0a13 Clenaup / Debug 2017-04-26 10:16:09 -05:00
PabstMirror
9139a52a38 Add more debug 2017-04-22 13:45:56 -05:00
PabstMirror
6464883852 misc cleanup, 1 sec min delay for vital loop 2017-04-22 10:57:32 -05:00
PabstMirror
d93269304d Merge branch 'master' into medical-rewrite 2017-04-15 10:09:50 -05:00
11RDP-LoupVert
a0e1205e54 (Medical) French text - minor changes () 
Minor changes due to users feedback
 2017-04-12 08:40:31 +02:00
BaerMitUmlaut
b89bc86e00 Added seperate vitals component 2017-04-02 00:27:50 +02:00
BaerMitUmlaut
54291b3b3b Renamed menu to gui, moved more gui stuff into it 2017-04-01 20:45:05 +02:00
BaerMitUmlaut
676c9a5451 Added seperate status component 2017-04-01 20:41:45 +02:00
BaerMitUmlaut
c4863c756c Moved statemachine into seperate component 2017-04-01 19:50:26 +02:00
PabstMirror
690e415ffe Minor cleanup 2017-03-25 11:36:37 -05:00
PabstMirror
80d7ef5b67 blood effects moved to UI 2017-03-25 11:27:18 -05:00
PabstMirror
169df1ed3b Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/stringtable.xml
 2017-03-25 11:03:50 -05:00
11RDP-LoupVert
fc860e7b43 French loc improvement () 
* French loc improvement

(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png

Hopefully suggested changes fixes that.

There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.

* Pull 5017 with spaces instead of tabs

https://github.com/acemod/ACE3/pull/5017

* Fixes a minor typo

Selectioner -> Sélectionner

* Duplicate entry (French)

Removes a duplicate entry, didn't saw first time
 2017-03-25 10:52:37 -05:00
Zakant
f1fbf6a8eb Removed legacy code 2017-03-23 15:29:52 +01:00
Zakant
5c89232306 Removed cardiac arrest check 2017-03-23 12:59:40 +01:00
PabstMirror
46be89eda6 Cleanup 2017-03-18 11:55:40 -05:00
PabstMirror
e3af1b55a5 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-18 09:56:42 -05:00
PabstMirror
c49e5bcfa0 Reload medical configs into extension on save load () 2017-03-08 19:33:28 +01:00
PabstMirror
d403f20d71 Adjust addDamageToUnit for rewrite 2017-03-06 15:06:01 -06:00
PabstMirror
2e47bad280 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-02 18:01:40 -06:00
PabstMirror
8ad3571d19 Merge branch 'master' into medical-rewrite 2017-03-02 18:00:34 -06:00
sbng-PAPA
e2c04a80c4 More accurate Korean translate for medical () 2017-03-02 17:48:48 -06:00
Dedmen Miller
512592b79d Prevent starting additional vital loops on full heal () 2017-03-02 17:22:16 -06:00