aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
VegaZ
2018-10-22 20:22:45 +02:00
parent 00975dda33 4766d25a17
commit 81e18eb765
11 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/Gui/deathscreen.js
View File

@@ -37,6 +37,7 @@ mp.events.add("onPlayerRevived", () => {
isDeath = false;
mp.gui.chat.activate(true);
mp.game.gameplay.setFadeOutAfterDeath(false);
mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("Mptattoos");
});
mp.events.add("respawnDeathPlayer", () => {
@@ -44,6 +45,7 @@ mp.events.add("respawnDeathPlayer", () => {
mp.gui.chat.activate(true);
mp.game.gameplay.setFadeOutAfterDeath(false);
mp.events.callRemote('RespawnPlayerAtHospital');
mp.game.graphics.setStreamedTextureDictAsNoLongerNeeded("Mptattoos");
});
mp.events.add("updateDutyMedics", (count) => {