[MIRROR] VR pod rewrite (#10484)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-21 21:57:56 +01:00
committed by GitHub
co-authored by Cameron Lennox
parent 07e5012dd2
commit ddebf29f35
32 changed files with 861 additions and 808 deletions
@@ -80,7 +80,6 @@
src.vr_link = avatar // Can't reuse vr_holder so that death can automatically eject users from VR
// Move the mind
// avatar.Sleeping(1) So vox don't drop their can, also feels arbitrary
src.mind.transfer_to(avatar)
to_chat(avatar, span_infoplain(span_bold("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, 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?
@@ -92,10 +91,10 @@
if(!vr_holder)
return
if(tfed_into_mob_check()) //CHOMPedit start: make sure we're not TFed and revert if we are before checking for a mind.
if(tfed_into_mob_check()) //Make sure we're not TFed and revert if we are before checking for a mind.
var/mob/living/M = loc
if(istype(M)) // Sanity check, though shouldn't be needed since this is already checked by the proc.
M.revert_mob_tf() // CHOMPedit end
M.revert_mob_tf()
if(!mind)
return
@@ -123,9 +122,8 @@
if(istype(vr_holder.loc, /obj/machinery/vr_sleeper))
var/obj/machinery/vr_sleeper/V = vr_holder.loc
V.go_out()
V.go_out(TRUE)
//CHOMPAdd Start
if(died_in_vr)
addtimer(CALLBACK(src, PROC_REF(cleanup_vr)), 3000, TIMER_DELETE_ME) //Delete the body after 5 minutes
@@ -137,4 +135,3 @@
unEquip(I,force = TRUE)
release_vore_contents(include_absorbed = TRUE, silent = TRUE)
qdel(src)
//CHOMPAdd End
+1 -1
View File
@@ -86,7 +86,7 @@
handle_dripping()
handle_vr_derez() // CHOMPedit
handle_vr_derez()
/mob/living/proc/handle_breathing()
return
+2 -2
View File
@@ -1472,12 +1472,12 @@
drop.drips |= drips
// Update appearance.
drop.basecolor = rgb(H.r_skin,H.g_skin,H.b_skin)
drop.update_icon()
drop.name = "drips of something"
drop.desc = "It's thick and gooey. Perhaps it's the chef's cooking?"
drop.dryname = "dried something"
drop.drydesc = "It's dry and crusty. The janitor isn't doing their job."
drop.basecolor = rgb(H.r_skin,H.g_skin,H.b_skin)
drop.update_icon()
drop.fluorescent = 0
drop.invisibility = 0
//else
@@ -107,3 +107,8 @@
)
var/touch_reaction_flags
var/virtual_reality_mob = FALSE // gross boolean for keeping VR mobs in VR
var/mob/living/tf_form // Shapeshifter shenanigans
var/tf_form_ckey
@@ -149,7 +149,7 @@
/obj/effect/slug_glue
name = "liquid"
desc = "This looks wet."
icon = 'icons/effects/effects_ch.dmi'
icon = 'icons/effects/effects.dmi'
icon_state = "wet_turf"
opacity = 0
mouse_opacity = 0 //Unclickable