Commit Graph
100 Commits
Author SHA1 Message Date
ebaydayz f41dbf377c Remove duplicate UH1H_DZ2 class
Duplicate of UH1H_2_DZ

This was not in 1051, so no need to swap in SQL updates.
2016-10-05 13:31:39 -04:00
ebaydayz 8c237492b9 Update vanilla player_build
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/fd8e1e2baaf2dc99d8a1ee4e550d7fade22e1ed9
2016-10-05 13:01:40 -04:00
ebaydayz 2109fdba03 Prevent sell from vehicle dupe
Prevents dupe described here:

https://epochmod.com/forum/topic/41891-resource-a-collection-of-anti-dupes/#comment-281324
2016-10-05 12:17:17 -04:00
ebaydayz d109d9fb01 Fix SVD_DZ alternative iron sight
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/8027cf6917a29f84627eca3118c2b92352693f5b
2016-10-03 16:49:26 -04:00
ebaydayz 97796bf524 Update change log 2016-10-03 15:45:13 -04:00
ebaydayz df39ea0f30 Fix DomeTentStorage SQL Update
The Epoch dome tents had more cargo space than the default vanilla ones,
so we have to use the level 1 upgraded version to prevent gear falling
out.

Also corrected swap for DesertTent.
2016-10-03 13:17:10 -04:00
ebaydayz a8e9c71ed1 Update some loot spawn rates
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/8be21c0322ec1aeff4ad9c5e4929702c316ac1a2

https://github.com/DayZMod/DayZ/commit/256212388d8a3966178c80dea35021bb573256fa

https://github.com/DayZMod/DayZ/commit/8d928c4c8f43c25636243f46b735b5b209e650a6

https://github.com/DayZMod/DayZ/commit/b83d74e0765b47c8141492a2c75fabbfa473cea5
2016-10-03 12:53:15 -04:00
ebaydayz da524041ee Update vanilla fences
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/c5f2447f14f29121426b6b4006f86e95973f7b9b

https://github.com/DayZMod/DayZ/commit/45e757ece2fdb099dade57350eb62eaf7986375d
2016-10-03 12:27:43 -04:00
ebaydayz 591af81575 Add exit in fn_waitForObject.sqf
This is just in case something goes very wrong (like bad server lag) and
the object doesn't spawn.
2016-10-02 22:30:38 -04:00
ebaydayz 8196c2343a Fix inCombat checks from 0a17804
My mistake from 0a17804
2016-10-02 21:13:17 -04:00
ebaydayz 004a3bcde4 Fix wrong string used for Mountain Green soda
Mountain green was using the mountain dew strings too. These strings
were unused.
2016-10-02 20:31:52 -04:00
ebaydayz 87bebfad1f Improve publishVeh2 diag_log 2016-10-02 20:07:03 -04:00
ebaydayz 4faa1cbaab Set third parameter after findSafePos
All other scripts using findSafePos either set the third parameter or
use a getPosATL/etc. instead before the position is saved to database.

Also partially reverted d6e78b2 since it is not needed.
2016-10-02 18:51:46 -04:00
ebaydayz de219116a8 Optimize save after trade
See my comment on b806043

Veh_setFixServer only runs on the server, so the client does not need to
compile it.

The PVDZ_veh_Save PVEH is only added on the server, so it should never
be sent with regular publicVariable anymore.
2016-10-02 15:44:51 -04:00
ebaydayz 91f168011c Remove unused variable from #1770
_inventoryMoney was unused @oiad
2016-10-02 14:11:20 -04:00
ebaydayz c4f861630d Fix typo from 55910cc
Variable is not defined in this script.
2016-10-02 13:57:33 -04:00
ebaydayz 55910cc3d2 Remove humanity hit for killing player zombies
If you kill a player zombie you should not lose humanity. Player_death
is now synced with the humanity hit code in the damage handler.

Also the killing blow set variable was moved up because the same
conditions were already checked above.
2016-10-02 13:50:30 -04:00
ebaydayz 4509902822 Remove source object from Humanity hit network send
Source object is always player and not needed anymore after 8ea21a2
2016-10-02 13:26:11 -04:00
ebaydayz f353967abb Remove duplicate transfusion in progress messages
In addition to 11fa6a6

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/f4aac518c1017b689dad36c1d15b32fd94315a2e
2016-10-01 20:06:59 -04:00
ebaydayz 17b30a7a2e Fix AI damage scaling
Fixes shots from AI using default scaling. For example AK_74 was doing
200 blood per shot or 60 shots to kill.
2016-10-01 17:45:46 -04:00
ebaydayz e630f428bc Enable self bloodbag by default
Most server will want this on, even vanilla has it enabled by default.
2016-10-01 16:00:46 -04:00
ebaydayz d6e78b27f0 Add setVelocity in publishVehicle2
This prevents trader spawned vehicles from floating.
2016-10-01 15:56:52 -04:00
ebaydayz 8ea21a2c81 Fix humanity hit for units in vehicles
The only change is a removal of this check and the corresponding
tabs/spacing:

if (_object == player) then {

That returns false if the player is in a vehicle. It is not needed since
PVCDZ_plr_Humanity EH only fires on the intended player now (sent with
PVC instead of PV).
2016-10-01 13:43:30 -04:00
ebaydayz 0a17804e36 Change inCombat to bool instead of number
When a variable is only going to be 0 or 1 it makes more sense to use a
bool.

Also avoided unnecessary network broadcasts of inCombat from e446603
2016-10-01 13:07:59 -04:00
ebaydayz 76273d06cd Fix undefined error _hasBloodBag in fn_damageActions
When this function was passed an empty array (like a player with no
magazines) it returned undefined because the inside of the forEach loop
did not execute.
2016-10-01 11:31:24 -04:00
ebaydayz 341e734373 Change satchel and mines to single gear slot
For consistency with all other items in Epoch.
2016-09-30 21:47:48 -04:00
ebaydayz ff8fb18cbf Correct stringtable explosion death grammar
Proper grammar when used in:
His name was %1, it appears he died from %2
and
%1 died from %2
2016-09-30 21:05:20 -04:00
ebaydayz d9b785750d Fix death messages vehicle detection again 2016-09-30 20:51:34 -04:00
ebaydayz 88c1b83c31 Fix mine detection in death messages again 2016-09-30 20:06:18 -04:00
ebaydayz 1fb0b1004d Fix typo from d335ee2 2016-09-30 19:16:38 -04:00
ebaydayz d335ee2b1c Fix death message mine and satchel detection 2016-09-30 19:14:11 -04:00
ebaydayz b45d6d9a24 Color new killfeed death messages
The player who died is colored red and the killer is colored green. The
weapon now points in the direction of the player who died.

Also reverted 66fd5be since it did not help. It is already done globally
in player_death.sqf anyway. I tested again and this actually fixes the
problem.
2016-09-29 20:26:26 -04:00
ebaydayz b4be955a0d Update new runover death message 2016-09-28 18:57:09 -04:00
ebaydayz 66fd5bee57 Clear combat status on death
This prevents "player combat logged" message after a player dies. The
alive check should prevent this in onPlayerDisconect, but it is
apparently unreliable or slow to update.
2016-09-28 14:46:59 -04:00
ebaydayz dbd84e419b Use spawn for dynamicText kill feed
My mistake from 9b13bd0
2016-09-27 20:54:38 -04:00
ebaydayz 15b05dc84b Fix return change free space check when buying into vehicle
This fixes incorrect return of "not enough space to accept change" when
purchasing large quantities of magazines into a vehicle.

Thanks @oiad for noticing this.
2016-09-27 19:09:54 -04:00
ebaydayz a2fcb69579 Remove scheduler_corpse setPosATL
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/b4b54b51ccc30da95dc0c09d1dbb8491226b51b8
2016-09-27 17:20:24 -04:00
ebaydayz f15db73072 Update vanilla player_build
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/f1e12509e13904a6253c3cd3a5b6b0d1ee01d0d1

https://github.com/DayZMod/DayZ/commit/ce98e0b1d5f78d871a3c7f4feecdfbcd85381f9d
2016-09-27 17:15:43 -04:00
ebaydayz 79c6d605a5 Add back playMoveNow in fn_unconscious.sqf
Partially reverting 341d45f

See comment on 341d45f
2016-09-27 16:50:59 -04:00
ebaydayz cc28d43d25 Remove unit's local event handler anticheat check
The createUnit remote execution locality exploit was fixed in current
A2OA stable patch 131129:
https://forums.bistudio.com/topic/186695-a2a2oa-patch-18122015/

This is now unnecessary and would needlessly restrict modders.
2016-09-27 16:04:14 -04:00
ebaydayz ceebaac579 Allow MAAWS HEAT round in createVehicle.txt
These are in the Epoch loot tables.
2016-09-27 15:26:09 -04:00
ebaydayz 9b13bd0e5e Update new death messages 2016-09-27 15:08:41 -04:00
ebaydayz c1763171db Fix damage on local trader city objects
This fixes local trader city objects taking damage from being run over.
2016-09-23 12:08:51 -04:00
ebaydayz c4388356e5 Add setVariable.txt BE exception 2016-09-23 11:18:00 -04:00
ebaydayz cc03256475 Update purchased vehicle spawn location
If there was no helipad available findSafePos was called. If that failed
it spawned the vehicle in the debug zone.

Calling findSafePos is no longer necessary since we are now using
createVehicle "NONE".
2016-09-22 18:12:52 -04:00
ebaydayz b315c15cb0 Update vanilla chop wood
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/1bca53125459c2769af7bd6b583c8b8d9bbc16d9
2016-09-21 18:43:23 -04:00
ebaydayz 5e71793c17 Update vanilla building
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/44f2552ff2b4baf9dd9391f7705bd05647c02267

https://github.com/DayZMod/DayZ/commit/213a333ce505b7e5e60bd1f5f0c2721f06a52267

https://github.com/DayZMod/DayZ/commit/423d53299dbddf37174133f3795b7050ab715df4

https://github.com/DayZMod/DayZ/commit/43bce6554f747e1831a13338523f6e2964236acb

https://github.com/DayZMod/DayZ/commit/f551cdac6e449d25ad30e373af30abb16fa98df0
2016-09-21 17:14:13 -04:00
ebaydayz 33cf7611ed Don't allow jerry fill from destroyed fuel source
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/90251abab3fd272527fc10d5ed673ce5c230e19f

https://github.com/DayZMod/DayZ/commit/9204c15d3f3874014842deafc4d825cc11b64252
2016-09-21 16:53:29 -04:00
ebaydayz ef065aeb35 Fix plot management buildables in range display count
See #1735
2016-09-21 15:52:14 -04:00
ebaydayz f3ccb74eab Also update objects if player is dead in onPlayerDisconnect
I just noticed before 5f0c2fc this was also running if the player was
dead. Now it will run if the player is alive in playerSync otherwise it
will run here if they are dead.
2016-09-21 11:41:41 -04:00
ebaydayz 01b45121d8 Fix dayz_townGeneratorBlacklist not working
I forgot to update it when these were moved to global spawn recently.
2016-09-20 20:19:47 -04:00
ebaydayz e2c2a2a76a Fix 309 error for newly placed safe inventory
See my comments on ae78fde and a3c3ccc

The object_maintenance function is only for vanilla buildables and is
currently not used. It immediately overwrites with a 306 call.
2016-09-20 13:47:18 -04:00
ebaydayz ac95c6b0df Make plot and door friends lists backwards compatible
This prevents errors when upgrading 1051 databases that had plot or door
management installed.

See comments at:

https://github.com/EpochModTeam/DayZ-Epoch/commit/fe9b8fdcb4b5cf069e0cc287b97785a3448817c8
2016-09-19 20:21:27 -04:00
ebaydayz 1b7d7a2ecb Clarify benchmark diag_log 2016-09-19 16:23:33 -04:00
ebaydayz 13600e9d4c Update 1.8.8 addons link again 2016-09-19 15:39:56 -04:00
ebaydayz df70d1f4a3 Clarify comment about grass 2016-09-19 15:34:40 -04:00
ebaydayz cb6a985645 Update change log
Fixed several typos. Updated outdated info.
Removed the [FIXED] line for DarkUI because that UI was not present in
1051.
2016-09-18 17:49:46 -04:00
ebaydayz 61f38fc259 Use number instead of string for weapon slot type in configs
This is consistent with the rest of the weapon configs.

It also avoids issues with using isNumber or getNumber to check slot
type in scripts.
2016-09-18 14:58:35 -04:00
ebaydayz 708328e486 Avoid gear update for empty random vehicles
There is no need to update the inventory if no loot was added.

My mistake from d98025c
2016-09-17 19:07:08 -04:00
ebaydayz d0e7b26121 Fix wrong distance in relocate diag_log
My mistake from 9c2f151
2016-09-17 18:15:16 -04:00
ebaydayz 3d0c5b13cf Fix playerSync error from 5f0c2fc
@icomrade There are cases where playerSync will receive > 3 params if
achievements are passed. Example:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_code/system/player_spawn_2.sqf#L305
2016-09-17 17:43:41 -04:00
ebaydayz 29d9ed9211 Set unit posATL in switchModel if respawn is in water
Reverts:

https://github.com/EpochModTeam/DayZ-Epoch/commit/bcc16a013520dcc243c306b178d3864dc4fec456

See:

https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452
2016-09-17 15:41:49 -04:00
ebaydayz 5f0c2fcc49 Speed up onPlayerDisconnect some more
Moved combat log setVariables to playerSync. Now the player object is no
longer needed for any of the code at the bottom of playerSync or
onPlayerDisconnected.

Update objects is already performed at the bottom of playerSync. There
is no reason to do it again in playerDisconnect since it calls
playerSync.
2016-09-17 15:02:00 -04:00
ebaydayz da70306291 Speed up playerSync a little
Removed unused variables and redundant checks.

_Force was always true so any condition with an OR _force in it was the
same as (true) i.e. redundant.
2016-09-17 14:03:05 -04:00
ebaydayz 9c2f15159a Correct Air relocate in server_playerSync
@icomrade you forgot to change the _playerObj variable to _character
when you moved this.

Also if BIS_fnc_findSafePos was successful on the first attempt the way
you had it would use the original _charPos instead of the successful
return because you never set _charPos = _newPos;

https://github.com/EpochModTeam/DayZ-Epoch/commit/ed3227fa7a3dd879083f43558a402a651afd56ce
2016-09-17 13:07:27 -04:00
ebaydayz bc4cb49463 Remove redundant characterID check in server_playerSync
I made no changes apart from removing the (_characterID != "0") check
and the corresponding spacing/tabs.

If _characterID == "0" the script would have already exited on line 30.
2016-09-17 12:18:54 -04:00
ebaydayz a63da4606d Speed up onPlayerDisconnect a little
Removed redundant diag_log since it is already done in dayz_recordLogin.

Removed noatlf4 variable because we use inCombat instead. Noatlf4 is
only set if the player is hit in the damage handler, while inCombat is
set any time the player is in combat.
2016-09-17 12:05:32 -04:00
ebaydayz b9507b2eb4 Don't hideObject on debug floor
https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452#commitcomment-19060242
2016-09-16 17:17:02 -04:00
ebaydayz bcc16a0135 Roll back to old swimming in ground fix
See
https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452#commitcomment-19053648
comments
2016-09-16 13:26:27 -04:00
ebaydayz b4ad50bf8f Add comment about grass height 2016-09-16 12:27:32 -04:00
ebaydayz 0ab46abd52 Don't spawn epoch dynamic debris if town generator is on
Vanilla town generator debris can end up spawning inside of epoch
dynamic debris if both are enabled.
2016-09-15 17:07:11 -04:00
ebaydayz 6e57bc6f6f Revert fix invisible primary stance glitch
Partial revert from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/e8e5d24e80f77268c8befa38680ccd9de6c03452

Can't seem to reproduce this one now with this commit reverted. If
anyone has working repro steps let me know.
2016-09-15 16:49:19 -04:00
ebaydayz 7415c21c2b Small update to object_build
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/a10173443b4d47d4f9739a50759d68c27b6340df
2016-09-15 12:48:31 -04:00
ebaydayz b2dfa058b0 Simplify double negative in fn_unconscious
Simpler than:

https://github.com/EpochModTeam/DayZ-Epoch/commit/b609dcf5190293d6cd6bfe741b968889749042fe
2016-09-15 12:44:47 -04:00
ebaydayz 815b54ec44 Fix gut dog
Body was disappearing because it had no meat on it (yield = 0). Thanks
@AirwavesMan
2016-09-14 16:42:25 -04:00
ebaydayz b349150548 Don't auto disable sound mute when exiting vehicle
Let the player choose when to disable so there aren't any unexpected
drastic volume changes.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/60f4968f2317bdb79f8d7d158f2e787d81d6b639
2016-09-14 15:36:35 -04:00
ebaydayz ce6dffde3d Add A2OA translations for open and close door 2016-09-14 14:46:58 -04:00
ebaydayz e8e5d24e80 Fix swimming in ground glitch
Also fixed invisible primary stance glitch when relogging with pistol
but no primary in inventory.

Fixed my mistake from:
https://github.com/EpochModTeam/DayZ-Epoch/commit/e85f6ad1b598afb07327b81a50d853e76cbb7f2c
2016-09-13 18:36:06 -04:00
ebaydayz e85f6ad1b5 Consolidate transfusion scripts
Consolidated transfusion and transfusion_noBloodTypes to one script.

Selfbloodbag.sqf will never run if DZE_selftransfuse = false; because
the right click action is hidden.

Total blood quantity is now added in 1/4 increments during self bloodbag
as intended instead of all at once.
2016-09-13 15:02:16 -04:00
ebaydayz a8e5aba517 Remove some redundant createVehicle filters part 2
These are covered by the first line now.

Vanilla commit:

https://github.com/DayZMod/Battleye-Filters/commit/cd52730484ae095c26618b2a40052514b69fe463
2016-09-13 11:45:36 -04:00
ebaydayz 4a2bf1c006 Remove redundant createVehicle filters
These are covered by the first line now
2016-09-13 11:20:47 -04:00
ebaydayz c7a6c71330 Disable vanilla base building actions for now
Since we are not going to use vanilla base building.
2016-09-12 16:11:29 -04:00
ebaydayz 29c16dc59f Consolidate duplicate sell distance variables 2016-09-12 14:14:38 -04:00
ebaydayz 2bb5c5942c Retire cone and pole plot previews in favor of dome
Thanks @oiad for pointing this out.

Poles are not used for previewing anymore. Cones do not give as much
information as the dome.

The dome is visible at night and under night vision too.
2016-09-12 13:39:00 -04:00
ebaydayz d98025c8d9 Fix random spawned vehicle loot saving
Dynamic vehicle loot will save to database now even if no players
interact with the vehicle before restart.
2016-09-12 12:23:23 -04:00
ebaydayz 66ac72ea9d Add setPos.txt BE exception for WoodenArrowF
https://github.com/DayZMod/Battleye-Filters/commit/4214d99bb1014112af944c459e948f9bfa335571
2016-09-11 18:12:34 -04:00
ebaydayz 8bcd3a44e6 Keep Epoch strings in the dayz_epoch package of stringtable
@oiad Please keep Epoch specific strings in the dayz_epoch package.
Vanilla does not have any of these items.
2016-09-11 15:40:16 -04:00
ebaydayz 16e4dc7b30 Move HeliCrash and CarePackage area variables to markers
This allows finer grained control of crashsite, carepackage and infected
camp spawn positions and radii (further north, south, east, west, etc.).

Also removed some hardcoded checks for Chernarus, since
dayz_townGenerator should always be off on other maps for now. Someone
may add town generator coordinates for other maps later.

Related vanilla commits:

https://github.com/DayZMod/DayZ/commit/b20b402bf030769350cf662b985efba9e83ebe55

https://github.com/DayZMod/DayZ/commit/7c8b69eb82a8c741d01251b2552d009abe2687c4

https://github.com/DayZMod/DayZ/commit/7dfd3ef9cf3cf1751759fd76f8eae10c0b1740dc
2016-09-11 14:45:49 -04:00
ebaydayz bbe6be6c31 Rename Multiplayer Setup to Lobby
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/fd90a380a7bad41fd71a8d9654d08e0ee69a88c0
2016-09-10 13:19:31 -04:00
ebaydayz 3b8f89f18d Add version number in mission briefingDescription
Provide some useful info here instead of just repeating the
briefingName.
2016-09-10 12:26:13 -04:00
ebaydayz f57e303355 Update vanilla fence building
Vanilla commits applied:

https://github.com/DayZMod/DayZ/commit/e88a5c42bc86f91d254104b13064f83a2dd23a76

https://github.com/DayZMod/DayZ/commit/fe9564351108ae72496592b3bd741a5064b84ccd

https://github.com/DayZMod/DayZ/commit/9a82b8307c523046773b9cd3440c387c7155d70e

https://github.com/DayZMod/DayZ/commit/5a305198c70b1c3bdf7fbf055f550cf3a2d14001

https://github.com/DayZMod/DayZ/commit/be872601c96e526cb443b6ad47eb71fdf6618775

https://github.com/DayZMod/DayZ/commit/44a25b1b4a86d17ecf0780ba322513d756d1cbb1

https://github.com/DayZMod/DayZ/commit/7bfeab3c13b3835c5f134b39a15c8eae948a21b7

https://github.com/DayZMod/DayZ/commit/cc5f02a41ae7cba9d0312463caf48f46eed9cdad
2016-09-10 11:25:10 -04:00
ebaydayz 11a3df0177 Add note about database in Test Build Readme 2016-09-09 14:55:20 -04:00
ebaydayz cb09377d26 Add GPS, Rangefinder and NVG back as sell only
Partially reverts
https://github.com/EpochModTeam/DayZ-Epoch/commit/743554858262bc4f71686d3cf53eb09411a20eba
@AirwavesMan now that buy or sell only is available via:

https://github.com/EpochModTeam/DayZ-Epoch/commit/ffef03186313e10b2802554b8a02ca538eca0a51
2016-09-09 14:05:06 -04:00
ebaydayz 8f25cc70db Localize sell and buy only messages
PrimaryWeapon always returns "", never nil unless the player object
isNull (in which case this script would not be running).

Fixed cases where a nil variable would throw an error when checking the
next condition.
2016-09-09 13:53:20 -04:00
ebaydayz e5e212bbc2 Add comment about salvage vehicle work around 2016-09-09 12:58:41 -04:00
ebaydayz eadbbb18bf Fix double tap bunny hop with no weapon glitch
Also makes it easier to bunny hop in quick succession. Previously double
tap triggered a bunny hop immediately followed by a regular vault.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/5833c76491879677f3dc0b95b9378276e5bde205
2016-09-09 11:41:09 -04:00
ebaydayz 32db983f34 Fix undefined amount when bloodbagging remote player 2016-09-08 20:00:38 -04:00
ebaydayz 4731780f5a Fix diag_log when vehicle spawn limit is reached
Prevents benchmark diag_log showing negative number of vehicles spawned.
2016-09-07 11:18:37 -04:00
ebaydayz 771284a297 Auto select main weapon after throwing
Also added to gear unload so player will auto select pistol if picking
one up with flares in their hands.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/08449fdfda6a3c7d5c3522e64de9b50eedb13454
2016-09-06 16:36:45 -04:00
ebaydayz c8b3053496 Remove unused keyboard_keys function
I moved the compile up in compiles.sqf since vanilla is now updated with
the change:

https://github.com/DayZMod/DayZ/commit/f5780256eee23d7b6ada7acac0105737a18516c4
2016-09-05 14:16:38 -04:00