From 8a13dad21cc976c6efe8ffce8c5e7966335a232e Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Sun, 8 Apr 2018 12:03:32 +0200 Subject: [PATCH 1/3] Minor VR sleeper related changes --- code/modules/VR/vr_sleeper.dm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index 1ef8a71cb4..dac632ee97 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -23,18 +23,9 @@ sparks = new /datum/effect_system/spark_spread() sparks.set_up(2,0) sparks.attach(src) - + build_spawnpoints() update_icon() - if(!available_vr_spawnpoints || !available_vr_spawnpoints.len) //(re)build spawnpoint lists - available_vr_spawnpoints = list() - for(var/obj/effect/landmark/vr_spawn/V in GLOB.landmarks_list) - available_vr_spawnpoints[V.vr_category] = list() - var/turf/T = get_turf(V) - if(T) - available_vr_spawnpoints[V.vr_category] |= T - - /obj/machinery/vr_sleeper/attack_hand(mob/user) if(occupant) ui_interact(user) @@ -59,6 +50,8 @@ QDEL_NULL(sparks) return ..() +/obj/machinery/vr_sleeper/hugbox/emag_act(mob/user) + return /obj/machinery/vr_sleeper/emag_act(mob/user) you_die_in_the_game_you_die_for_real = TRUE @@ -153,6 +146,19 @@ /obj/machinery/vr_sleeper/proc/get_vr_spawnpoint() //proc so it can be overriden for team games or something return safepick(available_vr_spawnpoints[vr_category]) +<<<<<<< HEAD +======= +/obj/machinery/vr_sleeper/proc/build_spawnpoints(rebuild = FALSE) + if (rebuild) + available_vr_spawnpoints = null + if(!available_vr_spawnpoints || !available_vr_spawnpoints.len) //(re)build spawnpoint lists + available_vr_spawnpoints = list() + for(var/obj/effect/landmark/vr_spawn/V in GLOB.landmarks_list) + available_vr_spawnpoints[V.vr_category] = list() + var/turf/T = get_turf(V) + if(T) + available_vr_spawnpoints[V.vr_category] |= T +>>>>>>> 469a216... Minor VR sleeper related changes (#36974) /obj/machinery/vr_sleeper/proc/build_virtual_human(mob/living/carbon/human/H, location, transfer = TRUE) if(H) @@ -182,6 +188,14 @@ /obj/effect/landmark/vr_spawn //places you can spawn in VR, auto selected by the vr_sleeper during get_vr_spawnpoint() var/vr_category = "default" //So we can have specific sleepers, eg: "Basketball VR Sleeper", etc. +<<<<<<< HEAD +======= +/obj/effect/landmark/vr_spawn/team_1 + vr_category = "team_1" + +/obj/effect/landmark/vr_spawn/team_2 + vr_category = "team_2" +>>>>>>> 469a216... Minor VR sleeper related changes (#36974) /datum/outfit/vr_basic name = "basic vr" From 6fb9142fd11306726028ec8e6c90f302a6e16e1f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 9 Apr 2018 05:17:48 -0500 Subject: [PATCH 2/3] Update vr_sleeper.dm --- code/modules/VR/vr_sleeper.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index dac632ee97..4bcf46a9f0 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -146,8 +146,6 @@ /obj/machinery/vr_sleeper/proc/get_vr_spawnpoint() //proc so it can be overriden for team games or something return safepick(available_vr_spawnpoints[vr_category]) -<<<<<<< HEAD -======= /obj/machinery/vr_sleeper/proc/build_spawnpoints(rebuild = FALSE) if (rebuild) available_vr_spawnpoints = null @@ -158,7 +156,6 @@ var/turf/T = get_turf(V) if(T) available_vr_spawnpoints[V.vr_category] |= T ->>>>>>> 469a216... Minor VR sleeper related changes (#36974) /obj/machinery/vr_sleeper/proc/build_virtual_human(mob/living/carbon/human/H, location, transfer = TRUE) if(H) From 4cea1feb1b991e33753042aef5343f2605205d9a Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 10 Apr 2018 03:16:28 -0400 Subject: [PATCH 3/3] Update vr_sleeper.dm --- code/modules/VR/vr_sleeper.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index 4bcf46a9f0..20054069da 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -185,14 +185,11 @@ /obj/effect/landmark/vr_spawn //places you can spawn in VR, auto selected by the vr_sleeper during get_vr_spawnpoint() var/vr_category = "default" //So we can have specific sleepers, eg: "Basketball VR Sleeper", etc. -<<<<<<< HEAD -======= /obj/effect/landmark/vr_spawn/team_1 vr_category = "team_1" /obj/effect/landmark/vr_spawn/team_2 vr_category = "team_2" ->>>>>>> 469a216... Minor VR sleeper related changes (#36974) /datum/outfit/vr_basic name = "basic vr"