From 5dbbb61668aac6b9d2b08cb04f0ac77243270ebc Mon Sep 17 00:00:00 2001 From: Bib Bob Date: Thu, 29 Sep 2022 20:12:15 -0500 Subject: [PATCH] Vox and Zaddat can use VR now --- code/game/machinery/virtual_reality/vr_console.dm | 6 +++--- .../living/carbon/human/species/virtual_reality/avatar.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 7637eaca5c..b66bc2dff8 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -247,14 +247,14 @@ avatar.shapeshifter_change_shape(occupant.species.name) avatar.forceMove(get_turf(S)) // Put the mob on the landmark, instead of inside it - +//CHOMPedit start VR fix occupant.enter_vr(avatar) //Yes, I am using a aheal just so your markings transfer over, I could not get .prefs.copy_to working. This is very stupid, and I can't be assed to rewrite this. Too bad! avatar.revive() - avatar.revive() + avatar.species.equip_survival_gear(avatar) avatar.verbs += /mob/living/carbon/human/proc/exit_vr //ahealing removes the prommie verbs and the VR verbs, giving it back - avatar.Sleeping(1) +//CHOMPedit end // Prompt for username after they've enterred the body. var/newname = sanitize(tgui_input_text(avatar, "You are entering virtual reality. Your username is currently [src.name]. Would you like to change it to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if (newname) diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm index 79a9d5688e..c9254c0c9a 100644 --- a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm +++ b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm @@ -79,7 +79,7 @@ src.vr_link = avatar // Can't reuse vr_holder so that death can automatically eject users from VR // Move the mind - avatar.Sleeping(1) + // avatar.Sleeping(1) So vox don't drop their can, also feels arbitrary src.mind.transfer_to(avatar) to_chat(avatar, "You have enterred Virtual Reality!\nAll normal gameplay rules still apply.\nWounds you suffer here won't persist when you leave VR, but some of the pain will.\nYou can leave VR at any time by using the \"Exit Virtual Reality\" verb in the Abilities tab, or by ghosting.") //No more prommie VR thing, so removed tidbit about changing appearance to_chat(avatar, " You black out for a moment, and wake to find yourself in a new body in virtual reality.") // So this is what VR feels like?