cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes broken exit-vr button (#10631)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-04-12 04:54:15 -07:00
committed by GitHub
parent 741ce089fc
commit 86ba87e574
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/virtual_reality/ar_console.dm
View File

@@ -121,7 +121,7 @@
occupant.enter_vr(avatar) occupant.enter_vr(avatar)
if(spawn_with_clothing) if(spawn_with_clothing)
job_master.EquipRank(avatar,"Visitor", 1, FALSE) 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. 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. //This handles all the 'We make it look like ourself' code.

4
code/game/machinery/virtual_reality/vr_console.dm
View File

@@ -298,7 +298,7 @@
occupant.enter_vr(avatar) occupant.enter_vr(avatar)
if(spawn_with_clothing) if(spawn_with_clothing)
job_master.EquipRank(avatar,"Visitor", 1, FALSE) 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/carbon/human/proc/vr_transform_into_mob)
add_verb(avatar,/mob/living/proc/set_size) add_verb(avatar,/mob/living/proc/set_size)
avatar.virtual_reality_mob = TRUE avatar.virtual_reality_mob = TRUE
@@ -320,7 +320,7 @@
add_verb(new_form,/mob/living/proc/vr_revert_mob_tf) add_verb(new_form,/mob/living/proc/vr_revert_mob_tf)
new_form.virtual_reality_mob = TRUE 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) avatar.Sleeping(1)
// Prompt for username after they've enterred the body. // Prompt for username after they've enterred the body.

2
code/modules/client/preference_setup/vore/04_resleeving.dm
View File

@@ -29,7 +29,7 @@
spawn(50) spawn(50)
if(QDELETED(character) || QDELETED(pref)) if(QDELETED(character) || QDELETED(pref))
return // They might have been deleted during the wait 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) if(pref.resleeve_scan)
var/datum/transhuman/body_record/BR = new() var/datum/transhuman/body_record/BR = new()
BR.init_from_mob(character, pref.resleeve_scan, pref.resleeve_lock) BR.init_from_mob(character, pref.resleeve_scan, pref.resleeve_lock)

4
code/modules/mob/living/carbon/human/species/outsider/replicant.dm
View File

@@ -49,7 +49,7 @@
/mob/living/carbon/human/proc/shapeshifter_select_gender, /mob/living/carbon/human/proc/shapeshifter_select_gender,
/mob/living/carbon/human/proc/shapeshifter_select_colour, /mob/living/carbon/human/proc/shapeshifter_select_colour,
/mob/living/carbon/human/proc/shapeshifter_select_hair_colors, /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( has_organ = list(
@@ -81,7 +81,7 @@
/mob/living/carbon/human/proc/shapeshifter_select_gender, /mob/living/carbon/human/proc/shapeshifter_select_gender,
/mob/living/carbon/human/proc/shapeshifter_select_colour, /mob/living/carbon/human/proc/shapeshifter_select_colour,
/mob/living/carbon/human/proc/shapeshifter_select_hair_colors, /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/corrosive_acid,
/mob/living/carbon/human/proc/neurotoxin, /mob/living/carbon/human/proc/neurotoxin,
/mob/living/carbon/human/proc/acidspit /mob/living/carbon/human/proc/acidspit

7
code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
View File

@@ -41,7 +41,7 @@
/mob/living/proc/set_size, /mob/living/proc/set_size,
/mob/living/carbon/human/proc/regenerate, /mob/living/carbon/human/proc/regenerate,
/mob/living/carbon/human/proc/promethean_select_opaqueness, /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? 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 // 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 name = "Exit Virtual Reality"
set category = "Abilities.VR" set category = "Abilities.VR"
exit_vr(TRUE)
/mob/living/carbon/human/proc/exit_vr(player_initated)
if(!vr_holder) if(!vr_holder)
return return

2
code/modules/organs/subtypes/replicant.dm
View File

@@ -146,7 +146,7 @@
robotic = ORGAN_LIFELIKE robotic = ORGAN_LIFELIKE
organ_verbs = list( 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 supply_conversion_value = 50 // CHOMPedit - Selling engineered organs