cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolves conflicts.

Browse Source
This commit is contained in:
Desolate
2018-10-11 05:36:22 -05:00
parent 4c062212ab 44ba995aa6
commit f7627d2fcb
486 changed files with 16260 additions and 10647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vr/vr_avatar.dm
+2 -1
View File
@@ -16,7 +16,8 @@
..()
/mob/living/carbon/human/virtual_reality/death()
return_to_lobby()
if(can_die())
return_to_lobby()
return ..()
/mob/living/carbon/human/virtual_reality/Destroy()