diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d7e7f2a169..3788735d76 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1531,54 +1531,3 @@
var/obj/item/clothing/accessory/permit/drone/permit = new(T)
permit.set_name(real_name)
equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
-
-// enter_vr is called on the original mob, and puts the mind into the supplied vr mob
-/mob/living/carbon/human/proc/enter_vr(var/mob/living/carbon/human/avatar) // Avatar is currently a human, because we have preexisting setup code for appearance manipulation, etc.
- if(!istype(avatar))
- return
-
- // Link the two mobs for client transfer
- avatar.vr_holder = src
- src.teleop = avatar
- src.vr_link = avatar // Can't reuse vr_holder so that death can automatically eject users from VR
-
- // Move the mind
- avatar.Sleeping(1)
- 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.\nYou can modify your appearance by using various \"Change \[X\]\" verbs in the Abilities tab.")
- 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?
-
-// exit_vr is called on the vr mob, and puts the mind back into the original mob
-/mob/living/carbon/human/verb/exit_vr()
- set name = "Exit Virtual Reality"
- set category = "Abilities"
-
- if(!vr_holder)
- return
- if(!mind)
- return
-
- var/total_damage
- // Tally human damage
- if(ishuman(src))
- var/mob/living/carbon/human/H = src
- total_damage = H.getBruteLoss() + H.getFireLoss() + H.getOxyLoss() + H.getToxLoss()
-
- // Move the mind back to the original mob
-// vr_holder.Sleeping(1)
- src.mind.transfer_to(vr_holder)
- to_chat(vr_holder, "You black out for a moment, and wake to find yourself back in your own body.")
- // Two-thirds damage is transferred as agony for /humans
- // Getting hurt in VR doesn't damage the physical body, but you still got hurt.
- if(ishuman(vr_holder) && total_damage)
- var/mob/living/carbon/human/V = vr_holder
- V.stun_effect_act(0, total_damage*2/3, null) // 200 damage leaves the user in paincrit for several seconds, agony reaches 0 after around 2m.
- to_chat(vr_holder, "Pain from your time in VR lingers.") // 250 damage leaves the user unconscious for several seconds in addition to paincrit
-
- // Maintain a link with the mob, but don't use teleop
- vr_holder.vr_link = src
- vr_holder.teleop = null
-
- if(istype(vr_holder.loc, /obj/machinery/vr_sleeper))
- var/obj/machinery/vr_sleeper/V = vr_holder.loc
- V.go_out()
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 8fbf47022d..2709cffd2b 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
@@ -24,9 +24,71 @@
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite)
has_organ = list(O_BRAIN = /obj/item/organ/internal/brain/slime, O_EYES = /obj/item/organ/internal/eyes) // Slime core.
heal_rate = 0 // Avatars don't naturally heal like prometheans, at least not for now
+ inherent_verbs = list(
+ /mob/living/carbon/human/proc/shapeshifter_select_shape,
+ /mob/living/carbon/human/proc/shapeshifter_select_colour,
+ /mob/living/carbon/human/proc/shapeshifter_select_hair,
+ /mob/living/carbon/human/proc/shapeshifter_select_hair_colors,
+ /mob/living/carbon/human/proc/shapeshifter_select_gender,
+ /mob/living/carbon/human/proc/regenerate,
+ /mob/living/carbon/human/proc/exit_vr
+ )
+
/datum/species/shapeshifter/promethean/avatar/handle_death(var/mob/living/carbon/human/H)
return
/datum/species/shapeshifter/promethean/avatar/handle_environment_special(var/mob/living/carbon/human/H)
- return
\ No newline at end of file
+ return
+
+
+// enter_vr is called on the original mob, and puts the mind into the supplied vr mob
+/mob/living/carbon/human/proc/enter_vr(var/mob/living/carbon/human/avatar) // Avatar is currently a human, because we have preexisting setup code for appearance manipulation, etc.
+ if(!istype(avatar))
+ return
+
+ // Link the two mobs for client transfer
+ avatar.vr_holder = src
+ src.teleop = avatar
+ src.vr_link = avatar // Can't reuse vr_holder so that death can automatically eject users from VR
+
+ // Move the mind
+ avatar.Sleeping(1)
+ 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.\nYou can modify your appearance by using various \"Change \[X\]\" verbs in the Abilities tab.")
+ 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?
+
+// exit_vr is called on the vr mob, and puts the mind back into the original mob
+/mob/living/carbon/human/proc/exit_vr()
+ set name = "Exit Virtual Reality"
+ set category = "Abilities"
+
+ if(!vr_holder)
+ return
+ if(!mind)
+ return
+
+ var/total_damage
+ // Tally human damage
+ if(ishuman(src))
+ var/mob/living/carbon/human/H = src
+ total_damage = H.getBruteLoss() + H.getFireLoss() + H.getOxyLoss() + H.getToxLoss()
+
+ // Move the mind back to the original mob
+// vr_holder.Sleeping(1)
+ src.mind.transfer_to(vr_holder)
+ to_chat(vr_holder, "You black out for a moment, and wake to find yourself back in your own body.")
+ // Two-thirds damage is transferred as agony for /humans
+ // Getting hurt in VR doesn't damage the physical body, but you still got hurt.
+ if(ishuman(vr_holder) && total_damage)
+ var/mob/living/carbon/human/V = vr_holder
+ V.stun_effect_act(0, total_damage*2/3, null) // 200 damage leaves the user in paincrit for several seconds, agony reaches 0 after around 2m.
+ to_chat(vr_holder, "Pain from your time in VR lingers.") // 250 damage leaves the user unconscious for several seconds in addition to paincrit
+
+ // Maintain a link with the mob, but don't use teleop
+ vr_holder.vr_link = src
+ vr_holder.teleop = null
+
+ if(istype(vr_holder.loc, /obj/machinery/vr_sleeper))
+ var/obj/machinery/vr_sleeper/V = vr_holder.loc
+ V.go_out()
\ No newline at end of file