More PoIs

code/modules/mining/mine_turfs.dm

@@ -606,7 +606,7 @@ var/list/mining_overlay_cache = list()
 				new /obj/item/stack/material/uranium(src, rand(5,25))
 
 /turf/simulated/mineral/proc/make_ore(var/rare_ore)
-	if(mineral || ignore_mapgen) //VOREStation Edit - Makes sense, doesn't it?
+	if(mineral || ignore_mapgen || ignore_oregen) //VOREStation Edit - Makes sense, doesn't it?
 		return
 
 	var/mineral_name

code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm

@@ -1,41 +1,77 @@
 /obj/structure/closet/crate/mimic
+	name = "old crate"
+	desc = "A rectangular steel crate. This one looks particularly unstable."
+	var/mimic_chance = 30
+	var/mimic_active = TRUE
 
+/obj/structure/closet/crate/mimic/open()
+	if(src.opened)
+		return 0
+	if(!src.can_open())
+		return 0
 
+	if(mimic_active)
+		mimic_active = FALSE
+		if(prob(mimic_chance))
+			var/mob/living/simple_mob/vore/aggressive/mimic/new_mimic = new(loc, src)
+			visible_message("<font color='red'><b>The [new_mimic] suddenly growls as it turns out to be a mimic!</b></font>")
+			forceMove(new_mimic)
+			new_mimic.real_crate = src
+			new_mimic.name = name
+			new_mimic.desc = desc
+			new_mimic.icon = icon
+			new_mimic.icon_state = icon_opened
+			new_mimic.icon_living = icon_opened
+		else
+			return ..()
+	else
+		return ..()
 
+/obj/structure/closet/crate/mimic/ex_act(severity)
+	for(var/obj/O in src.contents)
+		qdel(O)
+	qdel(src)
+	return
 
+/obj/structure/closet/crate/mimic/damage(var/damage)
+	if(contents.len)
+		visible_message("<font color='red'><b>The [src] makes out a crunchy noise as its contents are destroyed!</b></font>")
+		for(var/obj/O in src.contents)
+			qdel(O)
+	..()
 
+/obj/structure/closet/crate/mimic/safe
+	mimic_chance = 0
+	mimic_active = FALSE
 
+/obj/structure/closet/crate/mimic/guaranteed
+	mimic_chance = 100
 
+/obj/structure/closet/crate/mimic/dangerous
+	mimic_chance = 70
 
-
+/obj/structure/closet/crate/mimic/cointoss
-
+	mimic_chance = 50
-
-
-
-
-
 
 /mob/living/simple_mob/vore/aggressive/mimic
 	name = "crate"
 	desc = "A rectangular steel crate."
-
 	icon_state = "crate"
 	icon_living = "crate"
 	icon = 'icons/obj/storage.dmi'
 
 	faction = "mimic"
 
-	maxHealth = 250
+	maxHealth = 125
-	health = 250
+	health = 125
-	movement_cooldown = 5
+	movement_cooldown = 7
 
 	response_help = "touches"
 	response_disarm = "pushes"
 	response_harm = "hits"
 
-	harm_intent_damage = 5
+	melee_damage_lower = 7
-	melee_damage_lower = 4
+	melee_damage_upper = 15
-	melee_damage_upper = 6
 	attacktext = list("attacked")
 	attack_sound = 'sound/weapons/bite.ogg'
 
@@ -49,24 +85,17 @@
 	max_n2 = 0
 	minbodytemp = 0
 
-	say_list_type = /datum/say_list/mimic
 	ai_holder_type = /datum/ai_holder/mimic
 
 	var/obj/structure/closet/crate/real_crate
 
-	var/knockdown_chance = 15 //Stubbing your toe on furniture hurts.
+	var/knockdown_chance = 10 //Stubbing your toe on furniture hurts.
 
 	showvoreprefs = 0 //Hides mechanical vore prefs for mimics. You can't see their gaping maws when they're just sitting idle.
 
-/datum/say_list/mimic
-	say_got_target = list("Grrowl!")
-
 /datum/ai_holder/mimic
 	wander = FALSE
 	hostile = TRUE
-	threaten = TRUE
-	threaten_timeout = 5 SECONDS
-	threaten_delay = 1 SECONDS //not a threat, more of a delay.
 
 /mob/living/simple_mob/vore/aggressive/mimic/apply_melee_effects(var/atom/A)
 	if(isliving(A))
@@ -80,6 +109,9 @@
 
 /mob/living/simple_mob/vore/aggressive/mimic/death()
 	..()
-	real_crate.forceMove(loc)
+	if(real_crate)
+		real_crate.forceMove(loc)
+	else
+		new/obj/structure/closet/crate(loc)
 	real_crate = null
 	qdel(src)

code/modules/random_map/automata/caves.dm

@@ -47,7 +47,7 @@
 	if(!current_cell)
 		return 0
 	var/turf/simulated/mineral/T = locate((origin_x-1)+x,(origin_y-1)+y,origin_z)
-	if(istype(T) && !T.ignore_mapgen)
+	if(istype(T) && !T.ignore_mapgen && !T.ignore_cavegen)	//VOREStation Edit: ignore cavegen
 		if(map[current_cell] == FLOOR_CHAR)
 			T.make_floor() //VOREStation Edit - Don't make cracked sand on surface map, jerk.
 			//if(prob(90))

maps/tether/submaps/underdark_pois/_templates.dm

@@ -13,9 +13,52 @@
 	mappath = 'hard_mob.dmm'
 	cost = 15
 
+/datum/map_template/underdark/vault1
+	name = "Underdark Vault 1"
+	mappath = 'vault1.dmm'
+	cost = 10
+
+/datum/map_template/underdark/vault2
+	name = "Underdark Vault 2"
+	mappath = 'vault2.dmm'
+	cost = 15
+
+/datum/map_template/underdark/vault3
+	name = "Underdark Vault 3"
+	mappath = 'vault3.dmm'
+	cost = 10
+
+/datum/map_template/underdark/guardedloot_normal
+	name = "Underdark Guarded Loot Normal"
+	mappath = 'guardedloot_normal.dmm'
+	cost = 10
+
+/datum/map_template/underdark/guardedloot_hard
+	name = "Underdark Guarded Loot Hard"
+	mappath = 'guardedloot_hard.dmm'
+	cost = 20
+
+/datum/map_template/underdark/mechwreck
+	name = "Underdark Mech Wreck"
+	mappath = 'mechwreck.dmm'
+	cost = 15
+	allow_duplicates = FALSE
+
 /datum/map_template/underdark/underhall
 	name = "Underdark Golden Hall"
 	mappath = 'goldhall.dmm'
+	cost = 20
+	allow_duplicates = FALSE
+
+/datum/map_template/underdark/abandonedshelter
+	name = "Underdark Abandoned Shelter"
+	mappath = 'abandonedshelter.dmm'
+	cost = 15
+	allow_duplicates = FALSE
+
+/datum/map_template/underdark/deadminer
+	name = "Underdark Dead Miner"
+	mappath = 'deadminer.dmm'
 	cost = 15
 	allow_duplicates = FALSE
 

maps/tether/submaps/underdark_pois/abandonedshelter.dmm

@@ -0,0 +1,22 @@
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
+"b" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"c" = (/turf/simulated/shuttle/wall/voidcraft,/area/mine/explored/underdark)
+"d" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft,/area/mine/explored/underdark)
+"e" = (/turf/simulated/shuttle/floor/voidcraft,/area/mine/explored/underdark)
+"f" = (/obj/structure/bed/pod,/obj/item/weapon/bedsheet/mime,/turf/simulated/shuttle/floor/voidcraft,/area/mine/explored/underdark)
+"g" = (/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft,/area/mine/explored/underdark)
+"h" = (/obj/structure/table/survival_pod,/obj/random/multiple/underdark/miningdrills,/turf/simulated/shuttle/floor/voidcraft,/area/mine/explored/underdark)
+"i" = (/obj/structure/tubes,/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/mine/explored/underdark)
+"j" = (/obj/structure/sign/mining/survival,/turf/simulated/shuttle/wall/voidcraft,/area/mine/explored/underdark)
+"k" = (/obj/machinery/door/airlock/voidcraft/survival_pod,/turf/simulated/shuttle/floor/voidcraft,/area/mine/explored/underdark)
+"l" = (/obj/structure/sign/mining,/turf/simulated/shuttle/wall/voidcraft,/area/mine/explored/underdark)
+
+(1,1,1) = {"
+aabbb
+abbbb
+bbbcc
+bbbbc
+dbefg
+cheic
+cjklc
+"}

maps/tether/submaps/underdark_pois/boss_mob.dmm

@@ -1,132 +1,16 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
-"a" = (
+"b" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
-/turf/simulated/mineral/floor/virgo3b,
+"c" = (/obj/tether_away_spawner/underdark_boss,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
-/area/mine/explored/underdark)
-"b" = (
-/turf/simulated/mineral/virgo3b/rich,
-/area/mine/explored/underdark)
-"c" = (
-/obj/tether_away_spawner/underdark_boss,
-/turf/simulated/mineral/floor/virgo3b,
-/area/mine/explored/underdark)
 
 (1,1,1) = {"
-b
+aaabbbbaaa
-b
+aabbbbbbaa
-b
+abbbbbbbba
-a
+bbbbbbbbbb
-a
+bbbbbbbbbb
-a
+bbbbcbbbbb
-a
+bbbbbbbbbb
-b
+abbbbbbbba
-b
+aabbbbbbaa
-b
+aaabbbbaaa
-"}
-(2,1,1) = {"
-b
-b
-a
-a
-a
-a
-a
-a
-b
-b
-"}
-(3,1,1) = {"
-b
-a
-a
-a
-a
-a
-a
-a
-a
-b
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(5,1,1) = {"
-a
-a
-a
-a
-a
-c
-a
-a
-a
-a
-"}
-(6,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(7,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(8,1,1) = {"
-b
-a
-a
-a
-a
-a
-a
-a
-a
-b
-"}
-(9,1,1) = {"
-b
-b
-a
-a
-a
-a
-a
-a
-b
-b
-"}
-(10,1,1) = {"
-b
-b
-b
-a
-a
-a
-a
-b
-b
-b
 "}

maps/tether/submaps/underdark_pois/deadminer.dmm

@@ -0,0 +1,15 @@
+"a" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"b" = (/turf/simulated/mineral/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"c" = (/turf/template_noop,/area/mine/explored/underdark)
+"d" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"e" = (/obj/structure/closet/crate/mimic/guaranteed,/obj/random/multiple/underdark/ores,/obj/random/multiple/underdark/miningdrills,/obj/item/clothing/head/helmet/space/void/mining,/obj/item/clothing/suit/space/void/mining,/obj/item/clothing/accessory/poncho/roles/cloak/mining,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+
+(1,1,1) = {"
+aabbccc
+aaabbbc
+baaabbb
+bbdaabb
+bbbaebb
+cbbbbbb
+cccbbbc
+"}

maps/tether/submaps/underdark_pois/guardedloot_hard.dmm

@@ -0,0 +1,10 @@
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
+"b" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"c" = (/obj/tether_away_spawner/underdark_hard,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"d" = (/obj/structure/closet/crate/mimic/safe,/obj/random/underdark,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+
+(1,1,1) = {"
+abbca
+abbbb
+bdbaa
+"}

maps/tether/submaps/underdark_pois/guardedloot_normal.dmm

@@ -0,0 +1,12 @@
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
+"b" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"c" = (/obj/random/underdark,/obj/structure/closet/crate/mimic/safe,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"d" = (/obj/tether_away_spawner/underdark_normal,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+
+(1,1,1) = {"
+abaa
+bbba
+bcbb
+bbdb
+abba
+"}

maps/tether/submaps/underdark_pois/hard_mob.dmm

@@ -1,136 +1,16 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
-"a" = (
+"b" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
-/turf/simulated/mineral/floor/virgo3b{
+"c" = (/obj/tether_away_spawner/underdark_hard,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
-	ignore_mapgen = 1
-	},
-/area/mine/explored/underdark)
-"b" = (
-/turf/simulated/mineral/virgo3b/rich,
-/area/mine/explored/underdark)
-"c" = (
-/obj/tether_away_spawner/underdark_hard,
-/turf/simulated/mineral/floor/virgo3b{
-	ignore_mapgen = 1
-	},
-/area/mine/explored/underdark)
 
 (1,1,1) = {"
-b
+aaabbbbaaa
-b
+aabbbbbbaa
-b
+abbbbbbbba
-a
+bbbbbbbbbb
-a
+bbbbbbbbbb
-a
+bbbbbbbbbb
-a
+bbbbcbbbbb
-b
+abbbbbbbba
-b
+aabbbbbbaa
-b
+aaabbbbaaa
-"}
-(2,1,1) = {"
-b
-b
-a
-a
-a
-a
-a
-a
-b
-b
-"}
-(3,1,1) = {"
-b
-a
-a
-a
-a
-a
-a
-a
-a
-b
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(5,1,1) = {"
-a
-a
-a
-a
-a
-a
-c
-a
-a
-a
-"}
-(6,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(7,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(8,1,1) = {"
-b
-a
-a
-a
-a
-a
-a
-a
-a
-b
-"}
-(9,1,1) = {"
-b
-b
-a
-a
-a
-a
-a
-a
-b
-b
-"}
-(10,1,1) = {"
-b
-b
-b
-a
-a
-a
-a
-b
-b
-b
 "}

maps/tether/submaps/underdark_pois/mechwreck.dmm

@@ -0,0 +1,12 @@
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
+"b" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"c" = (/obj/random/multiple/underdark/mechtool,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"d" = (/obj/effect/decal/mecha_wreckage/ripley,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+
+(1,1,1) = {"
+aabbba
+abbbcb
+bbdbbb
+bbbbbb
+abcbba
+"}

maps/tether/submaps/underdark_pois/normal_mob.dmm

@@ -1,136 +1,16 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
-"a" = (
+"b" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
-/turf/simulated/mineral/floor/virgo3b{
+"c" = (/obj/tether_away_spawner/underdark_normal,/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
-	ignore_mapgen = 1
-	},
-/area/mine/explored/underdark)
-"b" = (
-/turf/simulated/mineral/virgo3b/rich,
-/area/mine/explored/underdark)
-"c" = (
-/obj/tether_away_spawner/underdark_normal,
-/turf/simulated/mineral/floor/virgo3b{
-	ignore_mapgen = 1
-	},
-/area/mine/explored/underdark)
 
 (1,1,1) = {"
-b
+aaabbbbaaa
-b
+aabbbbbbaa
-b
+abbbbbbbba
-a
+bbbbbbbbbb
-a
+bbbbbbbbbb
-a
+bbbbcbbbbb
-a
+bbbbbbbbbb
-b
+abbbbbbbba
-b
+aabbbbbbaa
-b
+aaabbbbaaa
-"}
-(2,1,1) = {"
-b
-b
-a
-a
-a
-a
-a
-a
-b
-b
-"}
-(3,1,1) = {"
-b
-a
-a
-a
-a
-a
-a
-a
-a
-b
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(5,1,1) = {"
-a
-a
-a
-a
-a
-c
-a
-a
-a
-a
-"}
-(6,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(7,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(8,1,1) = {"
-b
-a
-a
-a
-a
-a
-a
-a
-a
-b
-"}
-(9,1,1) = {"
-b
-b
-a
-a
-a
-a
-a
-a
-b
-b
-"}
-(10,1,1) = {"
-b
-b
-b
-a
-a
-a
-a
-b
-b
-b
 "}

maps/tether/submaps/underdark_pois/underdark_things.dm

@@ -46,9 +46,199 @@
 		/mob/living/simple_mob/vore/aggressive/dragon = 1
 	)
 
+/obj/random/underdark
+	name = "random underdark loot"
+	desc = "Random loot for Underdark."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "spickaxe"
 
+/obj/random/underdark/item_to_spawn()
+	return pick(prob(3);/obj/random/multiple/underdark/miningdrills,
+				prob(3);/obj/random/multiple/underdark/ores,
+				prob(2);/obj/random/multiple/underdark/treasure,
+				prob(1);/obj/random/multiple/underdark/mechtool)
+
+/obj/random/underdark/uncertain
+	icon_state = "upickaxe"
+	spawn_nothing_percentage = 65	//only 33% to spawn loot
+
+/obj/random/multiple/underdark/miningdrills
+	name = "random underdark mining tool loot"
+	desc = "Random mining tool loot for Underdark."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "spickaxe"
+
+/obj/random/multiple/underdark/miningdrills/item_to_spawn()
+	return pick(
+				prob(10);list(/obj/item/weapon/pickaxe/silver),
+				prob(8);list(/obj/item/weapon/pickaxe/drill),
+				prob(6);list(/obj/item/weapon/pickaxe/jackhammer),
+				prob(5);list(/obj/item/weapon/pickaxe/gold),
+				prob(4);list(/obj/item/weapon/pickaxe/plasmacutter),
+				prob(2);list(/obj/item/weapon/pickaxe/diamond),
+				prob(1);list(/obj/item/weapon/pickaxe/diamonddrill)
+				)
+
+/obj/random/multiple/underdark/ores
+	name = "random underdark mining ore loot"
+	desc = "Random mining utility loot for Underdark."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "satchel"
+
+/obj/random/multiple/underdark/ores/item_to_spawn()
+	return pick(
+				prob(9);list(
+							/obj/item/weapon/storage/bag/ore,
+							/obj/item/weapon/shovel,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/glass,
+							/obj/item/weapon/ore/hydrogen,
+							/obj/item/weapon/ore/hydrogen,
+							/obj/item/weapon/ore/hydrogen,
+							/obj/item/weapon/ore/hydrogen,
+							/obj/item/weapon/ore/hydrogen,
+							/obj/item/weapon/ore/hydrogen
+							),
+				prob(7);list(
+							/obj/item/weapon/storage/bag/ore,
+							/obj/item/weapon/pickaxe,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium,
+							/obj/item/weapon/ore/osmium
+							),
+				prob(4);list(
+							/obj/item/clothing/suit/radiation,
+							/obj/item/clothing/head/radiation,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium,
+							/obj/item/weapon/ore/uranium),
+				prob(2);list(
+							/obj/item/device/flashlight/lantern,
+							/obj/item/clothing/glasses/material,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond,
+							/obj/item/weapon/ore/diamond
+							),
+				prob(1);list(
+							/obj/item/weapon/mining_scanner,
+							/obj/item/weapon/shovel/spade,
+							/obj/item/weapon/ore/verdantium,
+							/obj/item/weapon/ore/verdantium,
+							/obj/item/weapon/ore/verdantium,
+							/obj/item/weapon/ore/verdantium,
+							/obj/item/weapon/ore/verdantium
+							)
+				)
+
+/obj/random/multiple/underdark/treasure
+	name = "random underdark treasure"
+	desc = "Random treasure loot for Underdark."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "cashbag"
+
+/obj/random/multiple/underdark/treasure/item_to_spawn()
+	return pick(
+				prob(5);list(
+							/obj/random/coin,
+							/obj/random/coin,
+							/obj/random/coin,
+							/obj/random/coin,
+							/obj/random/coin,
+							/obj/item/clothing/head/pirate
+							),
+				prob(4);list(
+							/obj/item/weapon/storage/bag/cash,
+							/obj/item/weapon/spacecash/c500,
+							/obj/item/weapon/spacecash/c100,
+							/obj/item/weapon/spacecash/c50
+							),
+				prob(3);list(
+							/obj/item/clothing/head/hardhat/orange,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold,
+							/obj/item/stack/material/gold),
+				prob(1);list(
+							/obj/item/stack/material/phoron,
+							/obj/item/stack/material/phoron,
+							/obj/item/stack/material/phoron,
+							/obj/item/stack/material/phoron,
+							/obj/item/stack/material/diamond,
+							/obj/item/stack/material/diamond,
+							/obj/item/stack/material/diamond
+							)
+				)
+
+/obj/random/multiple/underdark/mechtool
+	name = "random underdark mech equipment"
+	desc = "Random mech equipment loot for Underdark."
+	icon = 'icons/mecha/mecha_equipment.dmi'
+	icon_state = "mecha_clamp"
+
+/obj/random/multiple/underdark/mechtool/item_to_spawn()
+	return pick(
+				prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill),
+				prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp),
+				prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator),
+				prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged),
+				prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid),
+				prob(4);list(/obj/item/mecha_parts/mecha_equipment/combat_shield),
+				prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser),
+				prob(1);list(/obj/item/mecha_parts/mecha_equipment/wormhole_generator),
+				prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
+				)
 
 //POI STUFF
+VIRGO3B_TURF_CREATE(/turf/simulated/mineral/ignore_mapgen)
+VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor/ignore_mapgen)
+
+//Vault2
+VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/freezer)
 
 //Goldhall
 VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/kafel_full/yellow)

maps/tether/submaps/underdark_pois/vault1.dmm

@@ -1,13 +1,15 @@
 "a" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/virgo3b,/area/mine/explored/underdark)
 "b" = (/turf/simulated/wall/iron,/area/mine/explored/underdark)
 "c" = (/turf/template_noop,/area/mine/explored/underdark)
-"d" = (/turf/simulated/mineral/floor/virgo3b,/area/mine/explored/underdark)
+"d" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"e" = (/obj/effect/floor_decal/rust,/obj/structure/closet/crate/mimic/cointoss,/obj/random/underdark,/turf/simulated/floor/virgo3b,/area/mine/explored/underdark)
+"f" = (/obj/effect/floor_decal/rust,/obj/structure/closet/crate/mimic/safe,/obj/random/underdark/uncertain,/turf/simulated/floor/virgo3b,/area/mine/explored/underdark)
 
 (1,1,1) = {"
 bbbbcc
 baddcc
-badddc
+bedddc
 baaddb
-baaadb
+bafadb
 bbbbbb
 "}

maps/tether/submaps/underdark_pois/vault2.dmm

@@ -0,0 +1,14 @@
+"a" = (/turf/simulated/wall/titanium,/area/mine/explored/underdark)
+"b" = (/turf/simulated/mineral/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"c" = (/obj/structure/closet/crate/mimic/dangerous,/obj/random/multiple/underdark/treasure,/turf/simulated/floor/tiled/freezer/virgo3b,/area/mine/explored/underdark)
+"d" = (/turf/simulated/floor/tiled/freezer/virgo3b,/area/mine/explored/underdark)
+"e" = (/obj/structure/closet/crate/mimic,/obj/random/underdark,/turf/simulated/floor/tiled/freezer/virgo3b,/area/mine/explored/underdark)
+"f" = (/obj/structure/simple_door/silver,/turf/simulated/floor/tiled/freezer/virgo3b,/area/mine/explored/underdark)
+
+(1,1,1) = {"
+aaabb
+acdbb
+addeb
+addda
+aafaa
+"}

maps/tether/submaps/underdark_pois/vault3.dmm

@@ -0,0 +1,14 @@
+"a" = (/turf/template_noop,/area/mine/explored/underdark)
+"b" = (/turf/simulated/mineral/ignore_mapgen/virgo3b,/area/mine/explored/underdark)
+"c" = (/turf/simulated/wall/r_wall,/area/mine/explored/underdark)
+"d" = (/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/mine/explored/underdark)
+"e" = (/obj/structure/closet/crate/mimic/cointoss,/obj/random/underdark,/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/mine/explored/underdark)
+
+(1,1,1) = {"
+aabbbba
+abbbbbb
+bbbbbbb
+bbbbbbc
+abbbdec
+aabcccc
+"}

vorestation.dme

@@ -2009,6 +2009,7 @@
 #include "code\modules\mining\mine_items.dm"
 #include "code\modules\mining\mine_items_vr.dm"
 #include "code\modules\mining\mine_turfs.dm"
+#include "code\modules\mining\mine_turfs_vr.dm"
 #include "code\modules\mining\mineral_effect.dm"
 #include "code\modules\mining\mint.dm"
 #include "code\modules\mining\money_bag.dm"