diff --git a/code/game/machinery/virtual_reality/ar_console.dm b/code/game/machinery/virtual_reality/ar_console.dm index 6309aeb959..a0893aa9d0 100644 --- a/code/game/machinery/virtual_reality/ar_console.dm +++ b/code/game/machinery/virtual_reality/ar_console.dm @@ -121,7 +121,7 @@ occupant.enter_vr(avatar) if(spawn_with_clothing) job_master.EquipRank(avatar,"Visitor", 1, FALSE) - add_verb(avatar,/mob/living/carbon/human/proc/exit_vr) + add_verb(avatar,/mob/living/carbon/human/proc/perform_exit_vr) avatar.virtual_reality_mob = FALSE //THIS IS THE BIG DIFFERENCE WITH ALIEN VR PODS. THEY ARE NOT VR, THEY ARE REAL. //This handles all the 'We make it look like ourself' code. diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 47351333c8..a248c2ab32 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -298,7 +298,7 @@ occupant.enter_vr(avatar) if(spawn_with_clothing) job_master.EquipRank(avatar,"Visitor", 1, FALSE) - add_verb(avatar,/mob/living/carbon/human/proc/exit_vr) + add_verb(avatar,/mob/living/carbon/human/proc/perform_exit_vr) add_verb(avatar,/mob/living/carbon/human/proc/vr_transform_into_mob) add_verb(avatar,/mob/living/proc/set_size) avatar.virtual_reality_mob = TRUE @@ -320,7 +320,7 @@ add_verb(new_form,/mob/living/proc/vr_revert_mob_tf) new_form.virtual_reality_mob = TRUE - add_verb(avatar, /mob/living/carbon/human/proc/exit_vr) //ahealing removes the prommie verbs and the VR verbs, giving it back + add_verb(avatar, /mob/living/carbon/human/proc/perform_exit_vr) //ahealing removes the prommie verbs and the VR verbs, giving it back avatar.Sleeping(1) // Prompt for username after they've enterred the body. diff --git a/code/modules/client/preference_setup/vore/04_resleeving.dm b/code/modules/client/preference_setup/vore/04_resleeving.dm index 43835334fe..67cf72792f 100644 --- a/code/modules/client/preference_setup/vore/04_resleeving.dm +++ b/code/modules/client/preference_setup/vore/04_resleeving.dm @@ -29,7 +29,7 @@ spawn(50) if(QDELETED(character) || QDELETED(pref)) return // They might have been deleted during the wait - if(!character.virtual_reality_mob && !(/mob/living/carbon/human/proc/exit_vr in character.verbs)) //Janky fix to prevent resleeving VR avatars but beats refactoring transcore + if(!character.virtual_reality_mob && !(/mob/living/carbon/human/proc/perform_exit_vr in character.verbs)) //Janky fix to prevent resleeving VR avatars but beats refactoring transcore if(pref.resleeve_scan) var/datum/transhuman/body_record/BR = new() BR.init_from_mob(character, pref.resleeve_scan, pref.resleeve_lock) diff --git a/code/modules/mob/living/carbon/human/species/outsider/replicant.dm b/code/modules/mob/living/carbon/human/species/outsider/replicant.dm index 823c673fb6..f326cfa4b9 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/replicant.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/replicant.dm @@ -49,7 +49,7 @@ /mob/living/carbon/human/proc/shapeshifter_select_gender, /mob/living/carbon/human/proc/shapeshifter_select_colour, /mob/living/carbon/human/proc/shapeshifter_select_hair_colors, - /mob/living/carbon/human/proc/exit_vr + /mob/living/carbon/human/proc/perform_exit_vr ) has_organ = list( @@ -81,7 +81,7 @@ /mob/living/carbon/human/proc/shapeshifter_select_gender, /mob/living/carbon/human/proc/shapeshifter_select_colour, /mob/living/carbon/human/proc/shapeshifter_select_hair_colors, - /mob/living/carbon/human/proc/exit_vr, + /mob/living/carbon/human/proc/perform_exit_vr, /mob/living/carbon/human/proc/corrosive_acid, /mob/living/carbon/human/proc/neurotoxin, /mob/living/carbon/human/proc/acidspit 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 780784f4b4..e049ce6f78 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 @@ -41,7 +41,7 @@ /mob/living/proc/set_size, /mob/living/carbon/human/proc/regenerate, /mob/living/carbon/human/proc/promethean_select_opaqueness, - /mob/living/carbon/human/proc/exit_vr + /mob/living/carbon/human/proc/perform_exit_vr ) @@ -85,9 +85,12 @@ to_chat(avatar, span_notice(" 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(player_initated = TRUE) +/mob/living/carbon/human/proc/perform_exit_vr() set name = "Exit Virtual Reality" set category = "Abilities.VR" + exit_vr(TRUE) + +/mob/living/carbon/human/proc/exit_vr(player_initated) if(!vr_holder) return diff --git a/code/modules/organs/subtypes/replicant.dm b/code/modules/organs/subtypes/replicant.dm index 4f64cdf784..9df72f4a50 100644 --- a/code/modules/organs/subtypes/replicant.dm +++ b/code/modules/organs/subtypes/replicant.dm @@ -146,7 +146,7 @@ robotic = ORGAN_LIFELIKE organ_verbs = list( - /mob/living/carbon/human/proc/exit_vr + /mob/living/carbon/human/proc/perform_exit_vr ) supply_conversion_value = 50 // CHOMPedit - Selling engineered organs