From a8ba92c36d32681c9d96a4b1c43dcfda477020d1 Mon Sep 17 00:00:00 2001 From: tacoguy7765093 Date: Mon, 11 Sep 2023 14:05:50 -0500 Subject: [PATCH] Enables the right file for VR pods (#6964) --- .../machinery/virtual_reality/vr_console.dm | 3 +- .../modules/mob/dead/observer/observer.dm | 34 ------------------- vorestation.dme | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm b/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm index 592903efd7..1eacad3612 100644 --- a/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm +++ b/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm @@ -266,7 +266,8 @@ occupant.enter_vr(avatar) avatar.regenerate_icons() avatar.update_transform() - avatar.species.equip_survival_gear(avatar) + var/decl/hierarchy/outfit/outfit = outfit_by_type(/decl/hierarchy/outfit/job/assistant) //you spawn with assistant gear, I tried to make loadout spawn but the code sucks + outfit.equip(avatar, "VR Avatar", "VR Avatar") avatar.verbs += /mob/living/carbon/human/proc/exit_vr avatar.verbs += /mob/living/carbon/human/proc/vr_transform_into_mob avatar.verbs |= /mob/living/proc/set_size // Introducing NeosVR diff --git a/modular_chomp/code/modules/mob/dead/observer/observer.dm b/modular_chomp/code/modules/mob/dead/observer/observer.dm index aaa9b56632..57f06022f2 100644 --- a/modular_chomp/code/modules/mob/dead/observer/observer.dm +++ b/modular_chomp/code/modules/mob/dead/observer/observer.dm @@ -69,37 +69,3 @@ 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) avatar.real_name = newname - -/mob/living/carbon/human/proc/vr_transform_into_mob() - set name = "Transform Into Creature" - set category = "Abilities" - set desc = "Become a different creature" - - var/tf = null - var/k = tgui_input_list(usr, "Please select a creature:", "Mob list", vr_mob_tf_options) - if(!k) - return 0 - tf = vr_mob_tf_options[k] - - var/mob/living/new_form = transform_into_mob(tf, TRUE, TRUE) - if(isliving(new_form)) // Sanity check - new_form.verbs += /mob/living/proc/vr_revert_mob_tf - new_form.virtual_reality_mob = TRUE - -/mob/living/proc/vr_revert_mob_tf() - set name = "Revert Transformation" - set category = "Abilities" - - revert_mob_tf() - -// Exiting VR but for ghosts -/mob/living/carbon/human/proc/fake_exit_vr() - set name = "Log Out Of Virtual Reality" - set category = "Abilities" - - if(tgui_alert(usr, "Would you like to log out of virtual reality?", "Log out?", list("Yes", "No")) == "Yes") - release_vore_contents(TRUE) - for(var/obj/item/I in src) - drop_from_inventory(I) - qdel(src) -//CHOMPedit end \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 5734d678e6..ea3011961e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1041,7 +1041,6 @@ #include "code\game\machinery\telecomms\telemonitor.dm" #include "code\game\machinery\telecomms\traffic_control.dm" #include "code\game\machinery\virtual_reality\ar_console.dm" -#include "code\game\machinery\virtual_reality\vr_console.dm" #include "code\game\magic\Uristrunes.dm" #include "code\game\mecha\mech_bay.dm" #include "code\game\mecha\mech_fabricator.dm" @@ -4595,6 +4594,7 @@ #include "modular_chomp\code\game\machinery\colormate.dm" #include "modular_chomp\code\game\machinery\petrification.dm" #include "modular_chomp\code\game\machinery\portable_turret.dm" +#include "modular_chomp\code\game\machinery\virtual_reality\vr_console.dm" #include "modular_chomp\code\game\objects\items.dm" #include "modular_chomp\code\game\objects\items\holosign_creator.dm" #include "modular_chomp\code\game\objects\items\petrifier.dm"