From deee1d92520e85e201378e6c5798ba405fd61240 Mon Sep 17 00:00:00 2001
From: Repede <blackangelace@gmail.com>
Date: Sat, 30 Dec 2023 13:02:36 -0500
Subject: [PATCH] MOre jungle vr fix

---
 maps/yw/yw_vrstuff/_vrmaps.dm       |  2 +-
 maps/yw/yw_vrstuff/vrmaps.dmm       | 46 ++++++++++++++++-------------
 maps/yw/yw_vrstuff/vrmaps_things.dm |  9 ++++--
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/maps/yw/yw_vrstuff/_vrmaps.dm b/maps/yw/yw_vrstuff/_vrmaps.dm
index 34a44e5d604..febd95faf13 100644
--- a/maps/yw/yw_vrstuff/_vrmaps.dm
+++ b/maps/yw/yw_vrstuff/_vrmaps.dm
@@ -14,4 +14,4 @@
 /datum/map_z_level/common_lateload/vrworld_destination
 	name = "VR World"
 	z = Z_LEVEL_VRWORLD
-	flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED
+	flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT
diff --git a/maps/yw/yw_vrstuff/vrmaps.dmm b/maps/yw/yw_vrstuff/vrmaps.dmm
index 53e26b81db4..2d87bb535aa 100644
--- a/maps/yw/yw_vrstuff/vrmaps.dmm
+++ b/maps/yw/yw_vrstuff/vrmaps.dmm
@@ -128,13 +128,6 @@
 	icon_state = "ironsand2"
 	},
 /area/vrworld/alwayslit)
-"cz" = (
-/obj/effect/floor_decal/grass_edge,
-/mob/living/simple_mob/animal/giant_spider/tunneler{
-	faction = "bird"
-	},
-/turf/unsimulated/floor/ironsand,
-/area/vrworld/alwayslit)
 "cD" = (
 /turf/unsimulated/floor{
 	icon_state = "dark"
@@ -562,9 +555,6 @@
 /area/vrworld/alwayslit)
 "kM" = (
 /obj/structure/flora/ausbushes,
-/mob/living/simple_mob/animal/giant_spider/tunneler{
-	faction = "bird"
-	},
 /turf/unsimulated/floor/ironsand{
 	icon_state = "ironsand2"
 	},
@@ -802,6 +792,12 @@
 /obj/structure/flora/bush,
 /turf/unsimulated/floor/ironsand,
 /area/vrworld/alwayslit)
+"rt" = (
+/obj/structure/table/glass,
+/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
+/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
+/turf/unsimulated/floor/irongrass,
+/area/vrworld/alwayslit)
 "rz" = (
 /obj/item/weapon/storage/box/scattershot/large,
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel,
@@ -1208,6 +1204,10 @@
 /obj/structure/flora/bush,
 /turf/simulated/floor/water,
 /area/vrworld/alwayslit)
+"Cc" = (
+/obj/machinery/telecomms/relay/preset/station,
+/turf/unsimulated/floor/steel,
+/area/vrworld)
 "Cf" = (
 /obj/item/weapon/gun/projectile/automatic/tommygun,
 /turf/unsimulated/floor{
@@ -1915,6 +1915,10 @@
 	},
 /turf/unsimulated/floor/ironsand,
 /area/vrworld/alwayslit)
+"VI" = (
+/obj/machinery/appliance/cooker/grill,
+/turf/unsimulated/floor/irongrass,
+/area/vrworld/alwayslit)
 "VN" = (
 /obj/effect/floor_decal/grass_edge{
 	dir = 1
@@ -2158,8 +2162,8 @@ Ma
 Ma
 Ma
 Ma
-VT
-VT
+Ma
+Ma
 VT
 VT
 VT
@@ -2320,8 +2324,8 @@ QX
 DJ
 nO
 Ma
-VT
-VT
+Cc
+Ma
 VT
 VT
 VT
@@ -2482,8 +2486,8 @@ Mx
 DJ
 Ig
 wT
-VT
-VT
+Ma
+Ma
 VT
 VT
 VT
@@ -9930,8 +9934,8 @@ Wd
 Wd
 Wd
 Wd
-Wd
-Wd
+rt
+VI
 Wv
 Wv
 GG
@@ -10078,7 +10082,7 @@ VT
 (50,1,1) = {"
 KL
 RB
-cz
+cp
 Wd
 hC
 lh
@@ -16892,8 +16896,8 @@ pX
 ye
 pX
 pX
-Wd
-Wd
+VI
+rt
 Wd
 Wd
 Wd
diff --git a/maps/yw/yw_vrstuff/vrmaps_things.dm b/maps/yw/yw_vrstuff/vrmaps_things.dm
index 0e7d104488a..1f26b221d80 100644
--- a/maps/yw/yw_vrstuff/vrmaps_things.dm
+++ b/maps/yw/yw_vrstuff/vrmaps_things.dm
@@ -3,8 +3,11 @@
 	faction = "bird"
 	prob_fall = 0
 	mobs_to_pick_from = list(
-		/mob/living/simple_mob/animal/giant_spider/tunneler = 2,
 		/mob/living/simple_mob/vore/bee = 3,
+		/mob/living/simple_mob/animal/giant_spider = 2,
+		/mob/living/simple_mob/animal/giant_spider/hunter = 2,
+		/mob/living/simple_mob/animal/giant_spider/nurse = 2,
+		/mob/living/simple_mob/animal/giant_spider/tunneler = 1,
 		/mob/living/simple_mob/vore/aggressive/giant_snake = 1
 	)
 
@@ -36,6 +39,6 @@
 	faction = "bird"
 	prob_fall = 0
 	mobs_to_pick_from = list(
-		/mob/living/simple_mob/animal/passive/fish/salmon = 1,
-		/mob/living/simple_mob/animal/passive/fish/koi = 1
+		/mob/living/simple_mob/animal/passive/fish/salmon = 3,
+		/mob/living/simple_mob/animal/passive/fish/koi = 3
 	)