diff --git a/_maps/map_files/vr/blood_and_sand.dmm b/_maps/map_files/vr/blood_and_sand.dmm deleted file mode 100644 index 01ca76ab4e7..00000000000 --- a/_maps/map_files/vr/blood_and_sand.dmm +++ /dev/null @@ -1,1033 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/space, -/area/space) -"b" = ( -/turf/unsimulated/wall/other, -/area/vr/roman) -"c" = ( -/turf/unsimulated/beach/sand, -/area/vr/roman) -"d" = ( -/obj/effect/landmark{ - name = "avatarspawn" - }, -/turf/unsimulated/beach/sand, -/area/vr/roman) -"e" = ( -/turf/unsimulated/floor{ - tag = "icon-warnplate (NORTHWEST)"; - icon_state = "warnplate"; - dir = 9 - }, -/area/vr/roman) -"f" = ( -/turf/unsimulated/floor{ - tag = "icon-warnplate (NORTH)"; - icon_state = "warnplate"; - dir = 1 - }, -/area/vr/roman) -"g" = ( -/turf/unsimulated/floor{ - tag = "icon-warnplate (NORTHEAST)"; - icon_state = "warnplate"; - dir = 5 - }, -/area/vr/roman) -"h" = ( -/turf/unsimulated/floor{ - icon_state = "warnplate"; - dir = 8 - }, -/area/vr/roman) -"i" = ( -/turf/unsimulated/floor/lava/dense, -/area/vr/roman) -"j" = ( -/turf/unsimulated/floor{ - icon_state = "panelscorched" - }, -/area/vr/roman) -"k" = ( -/turf/unsimulated/floor{ - tag = "icon-warnplate (SOUTHWEST)"; - icon_state = "warnplate"; - dir = 10 - }, -/area/vr/roman) -"l" = ( -/turf/unsimulated/floor{ - tag = "icon-warnplate"; - icon_state = "warnplate"; - dir = 2 - }, -/area/vr/roman) -"m" = ( -/turf/unsimulated/floor{ - tag = "icon-warnplate (SOUTHEAST)"; - icon_state = "warnplate"; - dir = 6 - }, -/area/vr/roman) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -b -b -b -b -b -b -b -b -a -a -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -a -a -a -a -a -b -b -b -b -c -c -c -c -c -c -b -b -b -b -a -a -a -a -a -a -a -a -"} -(3,1,1) = {" -a -a -a -a -a -a -a -b -b -c -c -c -c -c -c -c -c -c -c -c -c -b -b -a -a -a -a -a -a -a -"} -(4,1,1) = {" -a -a -a -a -a -b -b -b -c -c -c -c -c -c -d -d -c -c -c -c -c -c -b -b -b -a -a -a -a -a -"} -(5,1,1) = {" -a -a -a -a -b -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -d -b -b -a -a -a -a -"} -(6,1,1) = {" -a -a -a -b -b -d -c -c -e -h -k -c -c -c -c -c -c -c -c -c -c -c -c -d -d -b -b -a -a -a -"} -(7,1,1) = {" -a -a -a -b -d -d -c -c -f -i -l -c -c -c -c -c -c -c -c -c -c -e -h -k -c -c -b -a -a -a -"} -(8,1,1) = {" -a -a -b -b -c -c -c -c -g -j -m -c -c -c -c -c -c -c -c -c -c -f -i -l -c -c -b -b -a -a -"} -(9,1,1) = {" -a -b -b -c -c -c -c -c -c -c -c -c -c -c -d -d -c -c -c -c -c -g -j -m -c -c -c -b -b -a -"} -(10,1,1) = {" -a -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -a -"} -(11,1,1) = {" -a -b -c -c -c -c -c -c -c -c -c -d -c -c -c -c -c -c -d -c -c -c -c -c -c -c -c -c -b -a -"} -(12,1,1) = {" -b -b -c -c -c -c -c -c -c -c -d -b -c -c -c -c -c -c -b -d -c -c -c -c -c -c -c -c -b -b -"} -(13,1,1) = {" -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -"} -(14,1,1) = {" -b -c -c -c -e -h -k -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -"} -(15,1,1) = {" -b -c -c -d -f -i -l -c -c -d -c -c -c -c -c -c -c -c -c -c -c -d -c -c -c -c -d -c -c -b -"} -(16,1,1) = {" -b -c -c -d -g -j -m -c -c -d -c -c -c -c -c -c -c -c -c -c -c -d -c -c -c -c -d -c -c -b -"} -(17,1,1) = {" -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -"} -(18,1,1) = {" -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -"} -(19,1,1) = {" -b -b -c -c -c -c -c -c -c -c -d -b -c -c -c -c -c -c -b -d -c -c -c -c -c -c -c -c -b -b -"} -(20,1,1) = {" -a -b -c -c -c -c -c -c -c -c -c -d -c -c -c -c -c -c -d -c -c -c -c -c -c -c -c -c -b -a -"} -(21,1,1) = {" -a -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -a -"} -(22,1,1) = {" -a -b -b -c -c -c -c -c -c -c -c -c -c -c -d -d -c -c -c -c -c -c -c -c -c -c -c -b -b -a -"} -(23,1,1) = {" -a -a -b -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -b -a -a -"} -(24,1,1) = {" -a -a -a -b -d -d -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -d -d -b -a -a -a -"} -(25,1,1) = {" -a -a -a -b -b -d -c -c -c -c -c -c -c -c -c -c -c -c -e -h -k -c -c -c -d -b -b -a -a -a -"} -(26,1,1) = {" -a -a -a -a -b -b -c -c -c -c -c -c -c -c -c -c -c -c -f -i -l -c -c -c -b -b -a -a -a -a -"} -(27,1,1) = {" -a -a -a -a -a -b -b -b -c -c -c -c -c -c -d -d -c -c -g -j -m -c -b -b -b -a -a -a -a -a -"} -(28,1,1) = {" -a -a -a -a -a -a -a -b -b -c -c -c -c -c -c -c -c -c -c -c -c -b -b -a -a -a -a -a -a -a -"} -(29,1,1) = {" -a -a -a -a -a -a -a -a -b -b -b -b -c -c -c -c -c -c -b -b -b -b -a -a -a -a -a -a -a -a -"} -(30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -b -b -b -b -b -b -b -b -a -a -a -a -a -a -a -a -a -a -a -"} diff --git a/_maps/map_files/vr/lobby.dmm b/_maps/map_files/vr/lobby.dmm deleted file mode 100644 index 6385ba01416..00000000000 --- a/_maps/map_files/vr/lobby.dmm +++ /dev/null @@ -1,1462 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/space, -/area/space) -"b" = ( -/turf/unsimulated/wall/metal, -/area/vr/lobby) -"c" = ( -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vr/lobby) -"d" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 8; - icon_state = "fakewindows3"; - tag = "icon-fakewindows (WEST)" - }, -/area/vr/lobby) -"e" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/area/vr/lobby) -"f" = ( -/obj/structure/decor/machinery/telecomms/processor, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vr/lobby) -"g" = ( -/turf/unsimulated/floor{ - icon_state = "light_on" - }, -/area/vr/lobby) -"h" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 1; - icon_state = "fakewindows"; - tag = "icon-fakewindows (WEST)" - }, -/area/vr/lobby) -"i" = ( -/turf/unsimulated/wall/fakeglass{ - dir = 0; - icon_state = "fakewindows"; - tag = "icon-fakewindows (EAST)" - }, -/area/vr/lobby) -"j" = ( -/obj/structure/decor/machinery/telecomms/server, -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/area/vr/lobby) -"k" = ( -/obj/structure/decor/machinery/telecomms/relay, -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/area/vr/lobby) -"l" = ( -/obj/structure/decor/machinery/telecomms/hub, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vr/lobby) -"m" = ( -/obj/machinery/computer/vr_control, -/turf/unsimulated/floor{ - tag = "icon-dark"; - icon_state = "dark" - }, -/area/vr/lobby) -"n" = ( -/turf/unsimulated/wall/fakeglass{ - icon_state = "fakewindows"; - dir = 8 - }, -/area/vr/lobby) -"o" = ( -/turf/unsimulated/wall/fakeglass{ - tag = "icon-fakewindows (EAST)"; - icon_state = "fakewindows"; - dir = 4 - }, -/area/vr/lobby) -"p" = ( -/obj/effect/landmark{ - name = "avatarspawn" - }, -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, -/area/vr/lobby) -"q" = ( -/obj/structure/decor/machinery/telecomms/processor, -/turf/simulated/floor/bluegrid{ - icon_state = "dark"; - name = "Mainframe Floor"; - nitrogen = 100; - oxygen = 0; - temperature = 80 - }, -/area/vr/lobby) -"r" = ( -/turf/unsimulated/wall/fakeglass, -/area/vr/lobby) - -(1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(3,1,1) = {" -a -a -a -a -a -b -b -b -b -b -b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(4,1,1) = {" -a -a -a -a -a -b -b -c -e -c -b -b -b -b -b -a -a -a -a -a -a -a -a -a -a -"} -(5,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(6,1,1) = {" -a -a -a -a -a -b -e -e -j -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(7,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(8,1,1) = {" -a -a -a -a -a -b -e -e -k -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(9,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(10,1,1) = {" -a -a -a -a -a -b -e -e -j -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(11,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(12,1,1) = {" -a -a -a -a -a -b -e -e -k -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(13,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(14,1,1) = {" -a -a -a -a -a -b -e -e -j -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(15,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(16,1,1) = {" -a -a -a -a -a -b -b -c -e -c -b -b -c -c -b -b -a -a -a -a -a -a -a -a -a -"} -(17,1,1) = {" -a -a -a -a -a -b -b -b -b -b -b -d -e -e -d -b -b -b -a -a -a -a -a -a -a -"} -(18,1,1) = {" -a -a -a -a -a -b -b -b -b -e -e -f -e -e -f -e -e -b -b -b -b -a -a -a -a -"} -(19,1,1) = {" -a -a -a -a -a -b -e -e -e -e -g -n -e -e -n -g -e -e -e -e -b -a -a -a -a -"} -(20,1,1) = {" -a -a -a -a -a -b -e -g -c -g -c -o -e -e -o -c -g -c -g -e -b -a -a -a -a -"} -(21,1,1) = {" -a -a -a -a -b -b -e -c -e -e -e -l -e -e -l -e -e -e -c -e -b -b -a -a -a -"} -(22,1,1) = {" -a -a -a -a -b -e -e -g -e -c -g -n -e -e -n -g -c -e -g -e -e -b -a -a -a -"} -(23,1,1) = {" -a -a -a -b -b -e -g -c -e -g -c -o -e -e -o -c -g -e -c -g -e -b -b -a -a -"} -(24,1,1) = {" -a -a -b -b -d -f -h -i -l -h -i -b -c -c -b -h -r -l -h -r -f -d -b -b -a -"} -(25,1,1) = {" -a -a -b -c -e -e -e -e -e -e -e -c -p -p -c -e -e -e -e -e -e -e -c -b -a -"} -(26,1,1) = {" -a -a -b -c -e -e -e -e -e -e -e -c -p -p -c -e -e -e -e -e -e -e -c -b -a -"} -(27,1,1) = {" -a -a -b -b -d -f -h -i -l -h -i -b -c -c -b -h -i -l -h -i -f -d -b -b -a -"} -(28,1,1) = {" -a -a -a -b -b -e -g -c -e -g -c -n -e -e -n -c -g -e -c -g -e -b -b -a -a -"} -(29,1,1) = {" -a -a -a -a -b -e -e -g -e -c -g -o -e -e -o -g -c -e -g -e -e -b -a -a -a -"} -(30,1,1) = {" -a -a -a -a -b -b -e -c -e -e -e -l -e -e -l -e -e -e -c -e -b -b -a -a -a -"} -(31,1,1) = {" -a -a -a -a -a -b -e -g -c -g -c -n -e -e -n -c -g -c -g -e -b -a -a -a -a -"} -(32,1,1) = {" -a -a -a -a -a -b -e -e -e -e -g -o -e -e -o -g -e -e -e -e -b -a -a -a -a -"} -(33,1,1) = {" -a -a -a -a -a -b -b -b -b -e -e -f -e -e -q -e -e -b -b -b -b -a -a -a -a -"} -(34,1,1) = {" -a -a -a -a -a -b -b -b -b -b -b -d -e -e -d -b -b -b -a -a -a -a -a -a -a -"} -(35,1,1) = {" -a -a -a -a -a -b -b -c -e -c -b -b -c -c -b -b -a -a -a -a -a -a -a -a -a -"} -(36,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(37,1,1) = {" -a -a -a -a -a -b -e -e -j -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(38,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(39,1,1) = {" -a -a -a -a -a -b -e -e -k -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(40,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(41,1,1) = {" -a -a -a -a -a -b -e -e -j -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(42,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(43,1,1) = {" -a -a -a -a -a -b -e -e -k -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(44,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(45,1,1) = {" -a -a -a -a -a -b -e -e -j -e -e -m -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(46,1,1) = {" -a -a -a -a -a -b -c -g -e -g -c -d -e -e -b -a -a -a -a -a -a -a -a -a -a -"} -(47,1,1) = {" -a -a -a -a -a -b -b -c -e -c -b -b -b -b -b -a -a -a -a -a -a -a -a -a -a -"} -(48,1,1) = {" -a -a -a -a -a -b -b -b -b -b -b -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(49,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(50,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} diff --git a/_maps/test_all_maps.dm b/_maps/test_all_maps.dm index 55cb0ff946b..94bd9bac437 100644 --- a/_maps/test_all_maps.dm +++ b/_maps/test_all_maps.dm @@ -126,11 +126,6 @@ #include "map_files\templates\small_asteroid_1.dmm" #include "map_files\templates\small_shuttle_1.dmm" - // VR maps - #include "map_files\vr\blood_and_sand.dmm" - #include "map_files\vr\lobby.dmm" - - // This is pointless, we don't run the server /*#define MAP_TRANSITION_CONFIG list(AWAY_MISSION = UNAFFECTED, AWAY_MISSION = UNAFFECTED, diff --git a/code/_globalvars/mapping.dm b/code/_globalvars/mapping.dm index 22205dacf91..c1efb29075d 100644 --- a/code/_globalvars/mapping.dm +++ b/code/_globalvars/mapping.dm @@ -40,7 +40,6 @@ var/list/prisonwarped = list() //list of players already warped var/list/blobstart = list() var/list/ninjastart = list() var/list/carplist = list() //list of all carp-spawn landmarks -var/list/avatarspawn = list() var/list/syndicateofficer = list() //away missions @@ -53,5 +52,4 @@ var/list/datum/map_template/ruins_templates = list() var/list/datum/map_template/space_ruins_templates = list() var/list/datum/map_template/lava_ruins_templates = list() var/list/datum/map_template/shelter_templates = list() -var/list/datum/map_template/shuttle_templates = list() -var/list/datum/map_template/vr_templates = list() \ No newline at end of file +var/list/datum/map_template/shuttle_templates = list() \ No newline at end of file diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm index 92f6e7f360a..2030897e3ce 100644 --- a/code/datums/helper_datums/map_template.dm +++ b/code/datums/helper_datums/map_template.dm @@ -114,7 +114,6 @@ preloadRuinTemplates() preloadShelterTemplates() preloadShuttleTemplates() - preloadVRTemplates() /proc/preloadRuinTemplates() // Still supporting bans by filename @@ -162,15 +161,4 @@ var/datum/map_template/shuttle/S = new shuttle_type() shuttle_templates[S.shuttle_id] = S - map_templates[S.shuttle_id] = S - -/proc/preloadVRTemplates() - for(var/item in subtypesof(/datum/map_template/vr)) - var/datum/map_template/vr/vr_type = item - if(!initial(vr_type.suffix)) - continue - - var/datum/map_template/vr/V = new vr_type() - - vr_templates[V.id] = V - map_templates[V.id] = V + map_templates[S.shuttle_id] = S \ No newline at end of file diff --git a/code/datums/vr.dm b/code/datums/vr.dm deleted file mode 100644 index 4d31b6a2072..00000000000 --- a/code/datums/vr.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/map_template/vr - name = null - var/id = null // For blacklisting purposes, all vr levels need an id - var/description = "This is a placeholder. Please contact your virtual adminsitrator if you see this." - var/outfit = null - - var/prefix = null - var/suffix = null - -/datum/map_template/vr/New() - if(!name && id) - name = id - - mappath = prefix + suffix - ..(path = mappath) \ No newline at end of file diff --git a/code/datums/vr/level.dm b/code/datums/vr/level.dm deleted file mode 100644 index d3feca26ad9..00000000000 --- a/code/datums/vr/level.dm +++ /dev/null @@ -1,16 +0,0 @@ -/datum/map_template/vr/level - prefix = "_maps/map_files/vr/" - -/datum/map_template/vr/level/lobby - id = "lobby" - suffix = "lobby.dmm" - name = "Virtual Hub Facility" - description = "This is the lobby. The hub for all things VR." - outfit = /datum/outfit/vr/vr_basic - -/datum/map_template/vr/level/roman - id = "roman" - suffix = "blood_and_sand.dmm" - name = "Blood and Sand Arena" - description = "To the Death!" - outfit = /datum/outfit/vr/roman \ No newline at end of file diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index d6a531950c5..97eca30cbfe 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -2278,21 +2278,6 @@ var/list/ghostteleportlocs = list() /area/awaycontent/a30 icon_state = "awaycontent30" -////////////////////////VR AREAS/////////////////////////////////// - -/area/vr - name = "VR" - requires_power = FALSE - dynamic_lighting = DYNAMIC_LIGHTING_DISABLED - no_teleportlocs = TRUE - -/area/vr/lobby - name = "VR Lobby" - -/area/vr/roman - name = "Roman Arena" - - ///////////////////////////////////////////////////////////////////// /* Lists of areas to be used with is_type_in_list. diff --git a/code/game/machinery/computer/vr_control.dm b/code/game/machinery/computer/vr_control.dm deleted file mode 100644 index baf2eda1914..00000000000 --- a/code/game/machinery/computer/vr_control.dm +++ /dev/null @@ -1,30 +0,0 @@ -/obj/machinery/computer/vr_control - name = "VR console" - desc = "A list and control panel for all virtual servers." - icon_screen = "comm_logs" - - light_color = LIGHT_COLOR_DARKGREEN - -/obj/machinery/computer/vr_control/attack_ai(mob/user) - attack_hand(user) - ui_interact(user) - - -/obj/machinery/computer/vr_control/attack_hand(mob/user) - add_fingerprint(user) - if(stat & (BROKEN|NOPOWER)) - return - ui_interact(user) - -/obj/machinery/computer/vr_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - switch(alert("What would you like to do?", "VR Control", "Join Room", "Make Room", "Cancel")) - if("Join Room") - spawn_vr_avatar(user, input(user, "Choose a room to join.","Select Level") as null|anything in vr_rooms) - qdel(user) - if("Make Room") - make_vr_room(input(user, "Name your new Room","Name here.") as null|text, input(user, "Choose a Level to load into your new Room.","Select Level") as null|anything in vr_templates) - if("Cancel") - return - -/obj/machinery/computer/vr_control/interact(mob/user) - diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 1dacf315e9c..eac27316f44 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -20,9 +20,6 @@ wizardstart += loc qdel(src) - if("avatarspawn") - avatarspawn += loc - if("JoinLate") latejoin += loc qdel(src) diff --git a/code/modules/space_management/space_chunk.dm b/code/modules/space_management/space_chunk.dm index 28432bd21bb..b311dad0028 100644 --- a/code/modules/space_management/space_chunk.dm +++ b/code/modules/space_management/space_chunk.dm @@ -94,14 +94,7 @@ /datum/space_chunk/proc/return_turfs() return -/datum/space_chunk/proc/search_chunk(object_list) - var/list/located = list() - for(var/atom/object in object_list) - if(((object.x >= x) && (object.x <= (x + width))) && ((object.y >= y) && (object.y <= (y + height))) && (object.z == zpos)) - located.Add(object) - return located - #undef BOTTOM_LEFT_CHUNK #undef BOTTOM_RIGHT_CHUNK #undef TOP_LEFT_CHUNK -#undef TOP_RIGHT_CHUNK +#undef TOP_RIGHT_CHUNK \ No newline at end of file diff --git a/code/modules/vr/vr_avatar.dm b/code/modules/vr/vr_avatar.dm deleted file mode 100644 index 4719ffc4961..00000000000 --- a/code/modules/vr/vr_avatar.dm +++ /dev/null @@ -1,88 +0,0 @@ - - -/mob/living/carbon/human/virtual_reality - var/mob/living/carbon/human/real_me //The human controlling us, can be any human (including virtual ones... inception...) - var/datum/action/quit_vr/quit_action - var/datum/action/back_to_lobby/back_to_lobby - var/datum/action/detach_from_avatar/detach_from_avatar - -/mob/living/carbon/human/virtual_reality/New() - quit_action = new() - quit_action.Grant(src) - back_to_lobby = new() - back_to_lobby.Grant(src) - detach_from_avatar = new() - detach_from_avatar.Grant(src) - ..() - -/mob/living/carbon/human/virtual_reality/death() - if(can_die()) - return_to_lobby() - return ..() - -/mob/living/carbon/human/virtual_reality/Destroy() - return_to_lobby() - return ..() - -/mob/living/carbon/human/virtual_reality/ghost() - set category = "OOC" - set name = "Ghost" - set desc = "Relinquish your life and enter the land of the dead." - var/mob/living/carbon/human/H = real_me - revert_to_reality(FALSE) - if(H) - H.ghost() - qdel(src) - -/mob/living/carbon/human/virtual_reality/proc/revert_to_reality(remove = 0) - if(real_me && mind) - mind.transfer_to(real_me) - real_me.EyeBlind(2) - real_me.Confused(2) - if(remove) - qdel(src) - else - return src - -/mob/living/carbon/human/virtual_reality/proc/return_to_lobby() - if(real_me && mind) - var/mob/living/carbon/human/virtual_reality/new_vr - new_vr = spawn_vr_avatar(src, "Lobby") - var/obj/item/clothing/glasses/vr_goggles/g = new_vr.real_me.glasses - g.vr_human = new_vr - qdel(src) - -/datum/action/quit_vr - name = "Quit Virtual Reality" - -/datum/action/quit_vr/Trigger() - if(..()) - if(istype(owner, /mob/living/carbon/human/virtual_reality)) - var/mob/living/carbon/human/virtual_reality/vr = owner - vr.revert_to_reality(1) - else - Remove(owner) - -/datum/action/back_to_lobby - name = "Return To Lobby" - -/datum/action/back_to_lobby/Trigger() - if(..()) - if(istype(owner, /mob/living/carbon/human/virtual_reality)) - var/mob/living/carbon/human/virtual_reality/vr = owner - vr.return_to_lobby() - else - Remove(owner) - -/datum/action/detach_from_avatar - name = "Detach From Avatar" - -/datum/action/detach_from_avatar/Trigger() - if(..()) - if(istype(owner, /mob/living/carbon/human/virtual_reality)) - var/mob/living/carbon/human/virtual_reality/vr = owner - var/obj/item/clothing/glasses/vr_goggles/g = vr.real_me.glasses - g.vr_human = vr - vr.revert_to_reality(0) - else - Remove(owner) diff --git a/code/modules/vr/vr_controller.dm b/code/modules/vr/vr_controller.dm deleted file mode 100644 index 30b33e0baa3..00000000000 --- a/code/modules/vr/vr_controller.dm +++ /dev/null @@ -1,63 +0,0 @@ -//Control file with the backbone for the vr rooms and avatars - -var/datum/vr_rooms = list() -var/roomcap = 20 - -/datum/vr_room - var/name = null - var/datum/map_template/vr/template = null - var/datum/space_chunk/chunk = null - var/list/spawn_points = list() - var/expires = 1 - -proc/make_vr_room(name, template, expires) - var/datum/vr_room/R = new - R.name = name - R.template = template - R.template = vr_templates[R.template] - R.chunk = space_manager.allocate_space(R.template.width, R.template.height) - R.expires = expires - vr_rooms[R.name] = R - R.template.load(locate(R.chunk.x,R.chunk.y,R.chunk.zpos), centered = FALSE) - - for(var/atom/landmark in R.chunk.search_chunk(GLOB.landmarks_list)) - if(landmark.name == "avatarspawn") - R.spawn_points.Add(landmark) - -//Control code for the avatars -proc/build_virtual_avatar(mob/living/carbon/human/H, location, datum/map_template/vr/level/template) - if(!location) - return - var/mob/living/carbon/human/virtual_reality/vr_avatar - location = get_turf(location) - vr_avatar = new /mob/living/carbon/human/virtual_reality(location) - if(istype(H, /mob/living/carbon/human/virtual_reality)) - var/mob/living/carbon/human/virtual_reality/V = H - vr_avatar.real_me = V.real_me - else - vr_avatar.real_me = H - vr_avatar.set_species(H.dna.species.type) - vr_avatar.dna = H.dna.Clone() - vr_avatar.name = H.name - vr_avatar.real_name = H.real_name - vr_avatar.undershirt = H.undershirt - vr_avatar.underwear = H.underwear - vr_avatar.UpdateAppearance() - vr_avatar.equipOutfit(template.outfit) - return vr_avatar - -proc/control_remote(mob/living/carbon/human/H, mob/living/carbon/human/virtual_reality/vr_avatar) - if(H.mind) - H.mind.transfer_to(vr_avatar) - -proc/spawn_vr_avatar(mob/living/carbon/human/H, datum/vr_room/room) - room = vr_rooms[room] - var/mob/living/carbon/human/virtual_reality/vr_human - vr_human = build_virtual_avatar(H, pick(room.spawn_points), room.template) - control_remote(H, vr_human) - return vr_human - -//Preloaded rooms -/hook/roundstart/proc/starting_levels() - make_vr_room("Lobby", "lobby", 0) - return 1 \ No newline at end of file diff --git a/code/modules/vr/vr_goggles.dm b/code/modules/vr/vr_goggles.dm deleted file mode 100644 index f2df5d2189e..00000000000 --- a/code/modules/vr/vr_goggles.dm +++ /dev/null @@ -1,41 +0,0 @@ -//Glorified teleporter that puts you in a new human body. -// it's """VR""" - -/obj/item/clothing/glasses/vr_goggles - desc = "A long time ago, people used these glasses to makes images from screens threedimensional." - name = "3D glasses" - icon_state = "3d" - item_state = "3d" - prescription_upgradable = 0 - - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' - ) - - var/you_die_in_the_game_you_die_for_real = FALSE - var/mob/living/carbon/human/virtual_reality/vr_human - - -/obj/item/clothing/glasses/vr_goggles/Destroy() - ..() - vr_human.revert_to_reality(1) - cleanup_vr_avatar() - -/obj/item/clothing/glasses/vr_goggles/dropped() - ..() - if(vr_human) - vr_human.revert_to_reality(0) - -/obj/item/clothing/glasses/vr_goggles/proc/cleanup_vr_avatar() - if(vr_human) - vr_human = null - -/obj/item/clothing/glasses/vr_goggles/equipped() - ..() - var/mob/living/carbon/human/H = loc - spawn(1) - if(H.glasses == src) - if(vr_human == null) - vr_human = spawn_vr_avatar(H, "Lobby") - else - control_remote(H, vr_human) \ No newline at end of file diff --git a/code/modules/vr/vr_outfits.dm b/code/modules/vr/vr_outfits.dm deleted file mode 100644 index e61ea829b27..00000000000 --- a/code/modules/vr/vr_outfits.dm +++ /dev/null @@ -1,15 +0,0 @@ -//place all the outfits for your levels in here. - -/datum/outfit/vr/vr_basic - name = "Basic Virtual Reality" - uniform = /obj/item/clothing/under/psysuit - shoes = /obj/item/clothing/shoes/black - -/datum/outfit/vr/roman - name = "Roman" - uniform = /obj/item/clothing/under/roman - shoes = /obj/item/clothing/shoes/roman - l_hand = /obj/item/shield/riot/roman - r_hand = /obj/item/twohanded/spear - head = /obj/item/clothing/head/helmet/roman - back = /obj/item/twohanded/spear \ No newline at end of file diff --git a/paradise.dme b/paradise.dme index 740c4715447..5eb94788628 100644 --- a/paradise.dme +++ b/paradise.dme @@ -272,7 +272,6 @@ #include "code\datums\supplypacks.dm" #include "code\datums\uplink_item.dm" #include "code\datums\vision_override.dm" -#include "code\datums\vr.dm" #include "code\datums\cache\air_alarm.dm" #include "code\datums\cache\apc.dm" #include "code\datums\cache\cache.dm" @@ -403,7 +402,6 @@ #include "code\datums\status_effects\gas.dm" #include "code\datums\status_effects\neutral.dm" #include "code\datums\status_effects\status_effect.dm" -#include "code\datums\vr\level.dm" #include "code\datums\weather\weather.dm" #include "code\datums\weather\weather_types\ash_storm.dm" #include "code\datums\weather\weather_types\floor_is_lava.dm" @@ -716,7 +714,6 @@ #include "code\game\machinery\computer\station_alert.dm" #include "code\game\machinery\computer\store.dm" #include "code\game\machinery\computer\syndicate_specops_shuttle.dm" -#include "code\game\machinery\computer\vr_control.dm" #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_control.dm" #include "code\game\machinery\doors\airlock_electronics.dm" @@ -2473,10 +2470,6 @@ #include "code\modules\vehicle\speedbike.dm" #include "code\modules\vehicle\sportscar.dm" #include "code\modules\vehicle\vehicle.dm" -#include "code\modules\vr\vr_avatar.dm" -#include "code\modules\vr\vr_controller.dm" -#include "code\modules\vr\vr_goggles.dm" -#include "code\modules\vr\vr_outfits.dm" #include "code\modules\zombie\items.dm" #include "code\modules\zombie\organs.dm" #include "goon\code\datums\browserOutput.dm"