From 02880d8e327b23d6fa1fed3036608a79e6b4d81b Mon Sep 17 00:00:00 2001 From: musurca Date: Wed, 3 Jun 2020 16:29:44 -0700 Subject: [PATCH] v1.33 --- README.md | 4 ++++ addons/GR/functions/fn_initCBA.sqf | 2 +- addons/GR/functions/fn_initClient.sqf | 9 +++++++++ mod.cpp | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2309f1c..29ba65a 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,10 @@ For questions, comments, or bug reports, please contact me directly at nick.musu CHANGELOG: --------------------- +v1.33 (June 3, 2020): +* Russian localization (courtesy of [barman75](https://github.com/barman75)) +* BLM + v1.32 (January 26, 2020): * bugfix: doctors can now perform autopsies * added: CBA setting to determine who can perform autopsies diff --git a/addons/GR/functions/fn_initCBA.sqf b/addons/GR/functions/fn_initCBA.sqf index dfe21a2..4c974b6 100644 --- a/addons/GR/functions/fn_initCBA.sqf +++ b/addons/GR/functions/fn_initCBA.sqf @@ -44,7 +44,7 @@ GR_AUTOPSY_DOCTORS=2; "LIST", [localize "STR_FNINITCBA_candoautopsy",localize "STR_FNINITCBA_candoautopsy2"], "Guilt & Remembrance", - [[GR_AUTOPSY_ANYONE,GR_AUTOPSY_MEDICS,GR_AUTOPSY_DOCTORS],[localize "STR_FNINITCBA_anyone", lozalize "STR_FNINITCBA_medicsdoctors",localize"STR_FNINITCBA_doctorsonly"],1] + [[GR_AUTOPSY_ANYONE,GR_AUTOPSY_MEDICS,GR_AUTOPSY_DOCTORS],[localize "STR_FNINITCBA_anyone", localize "STR_FNINITCBA_medicsdoctors",localize"STR_FNINITCBA_doctorsonly"],1] ] call CBA_fnc_AddSetting; [ diff --git a/addons/GR/functions/fn_initClient.sqf b/addons/GR/functions/fn_initClient.sqf index 15a7baa..fbcfaec 100644 --- a/addons/GR/functions/fn_initClient.sqf +++ b/addons/GR/functions/fn_initClient.sqf @@ -115,3 +115,12 @@ GR_ace_readEpitaphAction = ["actionEpitaph",localize "STR_FNINITCLIENT_Readmarke }; }, {true}] call ace_interact_menu_fnc_createAction; ["Land_Grave_dirt_F",0,["ACE_MainActions"],GR_ace_readEpitaphAction] call ace_interact_menu_fnc_addActionToClass; + +[] spawn { + if(profileNamespace getVariable ["GR_BLM_MESSAGE_SHOWN",0] != 1) then { + profileNamespace setVariable ["GR_BLM_MESSAGE_SHOWN",1]; + sleep 1; + _blmText = parseText "Dear American friends:
In the wake of George Floyd's killing by the Minneapolis Police, people all across the country have taken to the streets to protest the use of lethal force by local and state police. Nearly everywhere the police have responded with extreme violence: using batons, rubber bullets, and tear gas against crowds of unarmed and largely peaceful protesters. Many have suffered severe and permanent injuries; some have even been killed.

It is time to stop the flow of military equipment to the police, and end policies that have shielded violent police officers from prosecution. If you can, please support collective action by clicking the links below to support the following organizations:


Campaign Zero
NAACP Legal Defense Fund
Black Lives Matter


Thanks for reading-- and please note that after clicking OK below, you will not see this message again.

In solidarity with the international struggle against state violence in Hong Kong, Russia, France, and beyond."; + [_blmText, "Guilt & Remembrance - June 3, 2020", "OK"] spawn BIS_fnc_guiMessage; + }; +}; diff --git a/mod.cpp b/mod.cpp index f2ceb8d..5568474 100644 --- a/mod.cpp +++ b/mod.cpp @@ -12,4 +12,4 @@ overview = "Civilian deaths, reparations, and war crimes. Deliver the bodies of author = "@musurca"; overviewText = "GR"; overviewPicture = "img\logomain.paa"; -overviewFootnote = "v132"; \ No newline at end of file +overviewFootnote = "v133"; \ No newline at end of file