From a44d4bb8d30e59a15c250e4ef436c3c7a45b2396 Mon Sep 17 00:00:00 2001 From: Warior4356 Date: Sat, 25 Mar 2017 17:09:17 -0700 Subject: [PATCH] making backup --- _maps/map_files/templates/{vr => }/lobby.dmm | 0 _maps/map_files/vr/lobby.dmm | 3 +++ code/datums/vr/level.dm | 6 ++---- code/game/machinery/computer/vr_control.dm | 13 +++++++++---- 4 files changed, 14 insertions(+), 8 deletions(-) rename _maps/map_files/templates/{vr => }/lobby.dmm (100%) create mode 100644 _maps/map_files/vr/lobby.dmm diff --git a/_maps/map_files/templates/vr/lobby.dmm b/_maps/map_files/templates/lobby.dmm similarity index 100% rename from _maps/map_files/templates/vr/lobby.dmm rename to _maps/map_files/templates/lobby.dmm diff --git a/_maps/map_files/vr/lobby.dmm b/_maps/map_files/vr/lobby.dmm new file mode 100644 index 00000000000..82c5a7d4de7 --- /dev/null +++ b/_maps/map_files/vr/lobby.dmm @@ -0,0 +1,3 @@ +"a" = () + +(1,1,1, 10,10,1) = {""} diff --git a/code/datums/vr/level.dm b/code/datums/vr/level.dm index c65ea29c5c8..0966f8ff33d 100644 --- a/code/datums/vr/level.dm +++ b/code/datums/vr/level.dm @@ -1,12 +1,10 @@ //The bigger ones lag like hell if there is more than one on a z-level, so cost 2 for them /datum/map_template/vr/level - prefix = "_maps/map_files/templates/vr/" - cost = 1 + prefix = "_maps/map_files/vr/" /datum/map_template/vr/level/lobby id = "lobby" suffix = "lobby.dmm" - name = "Biological Storage Facility" + name = "Virtual Hub Facility" description = "This is the lobby. The hub for all things VR." - cost = 2 diff --git a/code/game/machinery/computer/vr_control.dm b/code/game/machinery/computer/vr_control.dm index 0f61d65f578..9cb47563ae5 100644 --- a/code/game/machinery/computer/vr_control.dm +++ b/code/game/machinery/computer/vr_control.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/vr_control - name = "crew monitoring computer" - desc = "Used to monitor active health sensors built into most of the crew's uniforms." + name = "VR console" + desc = "A list and control panel for all virtual servers." icon_screen = "comm_logs" light_color = LIGHT_COLOR_DARKGREEN @@ -31,5 +31,10 @@ /obj/machinery/computer/vr_control/interact(mob/user) //crew_monitor.ui_interact(user) -/obj/machinery/computer/vr_control/proc/loadlevel(template) - var/datum/space_chunk/C = zlev_manager.allocate_space(template.width, template.height) +/obj/machinery/computer/vr_control/proc/loadlevel(var/datum/map_template/template) + //var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in map_templates + //if(!map) + // return + template = "_maps/map_files/templates/vr/lobby.dmm" + var/datum/space_chunk/C = space_manager.allocate_space(template.width, template.height) + template.load(C, centered = FALSE) \ No newline at end of file