SD QOL update

Fixes a few map issues.

code/game/objects/random/mapping.dm

@@ -1456,3 +1456,193 @@
 	return pick(prob(5);/turf/simulated/floor/lava,
 				prob(3);/turf/simulated/floor/outdoors/rocks/caves,
 				prob(1);/turf/simulated/mineral)
+
+//VOREStation Add Start - Underdark stuff that would be cool if existed if the underdark doesn't.
+
+/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(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult),
+				prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser),
+				prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged),
+				prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
+				)
+//VOREStation Add End

code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm

@@ -0,0 +1,171 @@
+GLOBAL_VAR_CONST(max_jellyfish, 50)
+GLOBAL_VAR_INIT(jellyfish_count, 0)
+
+
+/datum/category_item/catalogue/fauna/space_jellyfish
+	name = "Alien Wildlife - Space Jellyfish"
+	desc = "A hostile space predator. \
+			This space jellyfish uses hypnotic patterns to lure in prey, which it then wraps in tentacles to leech energy from.\
+			It is somewhat weak, but uses unknown means to stun prey. It uses the energy of its prey to replicate itself. \
+			These creatures can quickly grow out of control if left to feed and reproduce unchecked. \
+			Notable weakness to rapid cooling from ice based weaponry.\
+			The flesh is typically non-toxic and quite delicious. Their cores are considered a delicacy in many regions."
+	value = CATALOGUER_REWARD_EASY
+
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish
+	name = "space jellyfish"
+	desc = "A semi-translucent space creature, possessing of tentacles and a hypnotizing, flashing bio-luminescent display."
+	tt_desc = "Semaeostomeae Stellarus"
+	catalogue_data = list(/datum/category_item/catalogue/fauna/space_jellyfish)
+
+	icon = 'icons/mob/alienanimals_x32.dmi'
+	icon_state = "space_jellyfish"
+	icon_living = "space_jellyfish"
+	icon_dead = "space_jellyfish_dead"
+	has_eye_glow = TRUE
+	hovering = TRUE
+
+
+	faction = "jellyfish"
+	maxHealth = 100
+	health = 100
+	nutrition = 150
+	pass_flags = PASSTABLE
+	movement_cooldown = 3.25
+
+	see_in_dark = 10
+
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "punches"
+
+	harm_intent_damage = 1
+	melee_damage_lower = 1
+	melee_damage_upper = 2
+	attack_sharp = FALSE
+	attack_sound = 'sound/weapons/tap.ogg'
+	attacktext = list("drained", "bludgeoned", "wraped", "tentacle whipped")
+
+	ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/jellyfish
+
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	maxbodytemp = 900
+
+	speak_emote = list("thrumms")
+
+	meat_amount = 0
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore
+
+	say_list_type = /datum/say_list/jellyfish
+
+	vore_active = 1
+	vore_capacity = 1
+	vore_bump_chance = 25
+	vore_ignores_undigestable = 0
+	vore_default_mode = DM_DRAIN
+	vore_icons = SA_ICON_LIVING
+	vore_stomach_name = "internal chamber"
+	vore_default_contamination_flavor = "Wet"
+	vore_default_contamination_color = "grey"
+	vore_default_item_mode = IM_DIGEST
+
+	var/reproduction_cooldown = 0
+
+/datum/say_list/jellyfish
+	emote_see = list("flickers", "flashes", "looms","pulses","sways","shimmers hypnotically")
+
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/init_vore()
+	..()
+	var/obj/belly/B = vore_selected
+	B.name = "internal chamber"
+	B.desc = "It's smooth and translucent. You can see the world around you distort and wobble with the movement of the space jellyfish. It floats casually, while the delicate flesh seems to form to you. It's surprisingly cool, and flickers with its own light. You're on display for all to see, trapped within the confines of this strange space alien!"
+	B.mode_flags = 40
+	B.digest_brute = 0.5
+	B.digest_burn = 0.5
+	B.digestchance = 0
+	B.absorbchance = 0
+	B.escapechance = 15
+
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/apply_melee_effects(var/atom/A)
+	if(isliving(A))
+		var/mob/living/L = A
+		var/leech = rand(1,100)
+		if(L.nutrition)
+			L.adjust_nutrition(-leech)
+			adjust_nutrition(leech)
+		if(prob(25))
+			L.adjustHalLoss(leech)
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/New(newloc, jellyfish)
+	GLOB.jellyfish_count ++
+	var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/parent = jellyfish
+	if(parent)
+		parent.faction = faction
+	..()
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/death()
+	. = ..()
+	new /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore(loc, nutrition)
+	GLOB.jellyfish_count --
+	qdel(src)
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Life()
+	. = ..()
+	if(client)
+		return
+	reproduce()
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/proc/reproduce()
+	if(reproduction_cooldown > 0)
+		reproduction_cooldown --
+		return
+	if(GLOB.jellyfish_count >= GLOB.max_jellyfish)
+		return
+	if(nutrition < 500)
+		return
+	if(prob(10))
+		new /mob/living/simple_mob/vore/alienanimals/space_jellyfish(loc, src)
+		adjust_nutrition(-400)
+		reproduction_cooldown = 60
+
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Process_Spacemove(var/check_drift = 0)
+	return TRUE
+
+/datum/ai_holder/simple_mob/melee/evasive/jellyfish
+	hostile = TRUE
+	cooperative = FALSE
+	retaliate = TRUE
+	speak_chance = 2
+	wander = TRUE
+	unconscious_vore = TRUE
+
+/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore
+	name = "jellyfish core"
+	icon = 'icons/obj/food_vr.dmi'
+	icon_state = "jellyfish_core"
+	desc = "The pulsing core of a space jellyfish! ... It smells delicious."
+	nutriment_amt = 50
+	bitesize = 1000
+	nutriment_desc = list("heavenly space meat" = 100)
+
+	var/inherited_nutriment = 0
+
+/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/New(newloc, inherit)
+	inherited_nutriment	= inherit
+	. = ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/Initialize()
+	nutriment_amt += inherited_nutriment
+	. = ..()
+	reagents.add_reagent("nutriment", nutriment_amt, nutriment_desc)

code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm

@@ -0,0 +1,219 @@
+/datum/category_item/catalogue/fauna/space_ghost
+	name = "Alien Wildlife - Space Ghost"
+	desc = "A mysterious and unknown creature made of radical energy.\
+	This creature's energy interferes the nervous system in many kinds of creatures, which may result in hallucinations.\
+	This creature's lack of a physical form leaves it quite resistant to physical damage.\
+	Smaller variants of this creature seem to be vulnerable to bright light.\
+	While both variants are quite vulnerable to laser and energy weapons."
+	value = CATALOGUER_REWARD_EASY
+
+
+/mob/living/simple_mob/vore/alienanimals/space_ghost
+	name = "space ghost"
+	desc = "A pulsing mass of darkness that seems to have gained sentience."
+	tt_desc = "?????"
+	catalogue_data = list(/datum/category_item/catalogue/fauna/space_ghost)
+
+	icon = 'icons/mob/alienanimals_x32.dmi'
+	icon_state = "space_ghost"
+	icon_living = "space_ghost"
+	icon_dead = "space_ghost_dead"
+	has_eye_glow = TRUE
+	hovering = TRUE
+	pass_flags = PASSTABLE
+
+	faction = "space ghost"
+	maxHealth = 50
+	health = 50
+	movement_cooldown = 3.25
+
+	see_in_dark = 10
+
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "punches"
+
+	harm_intent_damage = 0
+	melee_damage_lower = 1
+	melee_damage_upper = 1
+	attack_sharp = FALSE
+	attacktext = list("spooked", "startled", "jumpscared", "screamed at")
+
+	ai_holder_type = /datum/ai_holder/simple_mob/melee/space_ghost
+
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	maxbodytemp = 999999
+
+	armor = list(
+			"melee" = 100,
+			"bullet" = 100,
+			"laser" = 0,
+			"energy" = 0,
+			"bomb" = 0,
+			"bio" = 0,
+			"rad" = 100)
+
+	armor_soak = list(
+		"melee" = 100,
+		"bullet" = 100,
+		"laser" = 0,
+		"energy" = 0,
+		"bomb" = 0,
+		"bio" = 0,
+		"rad" = 100
+		)
+
+	speak_emote = list("rumbles")
+
+	loot_list = list(/obj/item/weapon/ore/diamond)
+
+	vore_active = 0
+
+	projectiletype = /mob/living/simple_mob/vore/alienanimals/spooky_ghost
+	projectilesound = null
+	projectile_accuracy = 0
+	projectile_dispersion = 0
+
+	needs_reload = TRUE
+	reload_max = 1
+	reload_count = 0
+	reload_time = 7 SECONDS
+
+
+/datum/ai_holder/simple_mob/ranged/kiting/space_ghost
+	hostile = TRUE
+	retaliate = TRUE
+	destructive = TRUE
+	violent_breakthrough = TRUE
+	speak_chance = 0
+
+/mob/living/simple_mob/vore/alienanimals/space_ghost/apply_melee_effects(var/atom/A)
+	var/mob/living/L = A
+	L.hallucination += 50
+
+/mob/living/simple_mob/vore/alienanimals/space_ghost/shoot(atom/A) //We're shooting ghosts at people and need them to have the same faction as their parent, okay?
+	if(!projectiletype)
+		return	
+	if(A == get_turf(src))
+		return
+	face_atom(A)
+	if(reload_count >= reload_max)
+		return
+	var/mob/living/simple_mob/P = new projectiletype(loc, src)
+	
+	if(!P)
+		return
+	if(needs_reload)
+		reload_count++
+
+	P.faction = faction
+	playsound(src, projectilesound, 80, 1)
+
+/mob/living/simple_mob/vore/alienanimals/space_ghost/death(gibbed, deathmessage = "fades away!")
+	. = ..()
+	qdel(src)
+
+/mob/living/simple_mob/vore/alienanimals/spooky_ghost
+	name = "space ghost"
+	desc = "A pulsing mass of darkness that seems to have gained sentience."
+	tt_desc = "?????"
+	catalogue_data = list(/datum/category_item/catalogue/fauna/space_ghost)
+
+	icon = 'icons/mob/alienanimals_x32.dmi'
+	icon_state = "spookyghost-1"
+	icon_living = "spookyghost-1"
+	icon_dead = "space_ghost_dead"
+	hovering = TRUE
+	pass_flags = PASSTABLE
+
+	faction = "space ghost"
+	maxHealth = 5
+	health = 5
+	movement_cooldown = 1
+
+	see_in_dark = 10
+	alpha = 128
+
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "punches"
+
+	harm_intent_damage = 0
+	melee_damage_lower = 1
+	melee_damage_upper = 1
+	attack_sharp = FALSE
+	attacktext = list("spooked", "startled", "jumpscared", "screamed at")
+
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	maxbodytemp = 999999
+
+	armor = list(
+			"melee" = 100,
+			"bullet" = 100,
+			"laser" = 0,
+			"energy" = 0,
+			"bomb" = 0,
+			"bio" = 0,
+			"rad" = 100)
+
+	armor_soak = list(
+		"melee" = 100,
+		"bullet" = 100,
+		"laser" = 0,
+		"energy" = 0,
+		"bomb" = 0,
+		"bio" = 0,
+		"rad" = 100
+		)
+
+	speak_emote = list("rumbles")
+
+	vore_active = 0
+
+	ai_holder_type = /datum/ai_holder/simple_mob/melee/space_ghost
+
+/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Initialize()
+	. = ..()
+	icon_living = "spookyghost-[rand(1,2)]"
+	icon_state = icon_living
+	addtimer(CALLBACK(src, .proc/death), 2 MINUTES)
+	update_icon()
+
+/datum/ai_holder/simple_mob/melee/space_ghost
+	hostile = TRUE
+	retaliate = TRUE
+	destructive = TRUE
+	violent_breakthrough = TRUE
+	speak_chance = 0
+
+/mob/living/simple_mob/vore/alienanimals/spooky_ghost/death(gibbed, deathmessage = "fades away!")
+	. = ..()
+	qdel(src)
+
+/mob/living/simple_mob/vore/alienanimals/spooky_ghost/apply_melee_effects(var/atom/A)
+	var/mob/living/L = A
+	L.hallucination += rand(1,50)
+
+/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Life()
+	. = ..()
+	var/turf/T = get_turf(src)
+	if(!T)
+		return
+	if(T.get_lumcount() >= 0.5)
+		adjustBruteLoss(1)

code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm

@@ -0,0 +1,175 @@
+/datum/category_item/catalogue/fauna/startreader
+	name = "Alien Wildlife - Star Treader"
+	desc = "A hard shelled creature that lives on asteroids.\
+	It is quite durable and very opportunistic in its feeding habits.\
+	It is vulnerable to extreme vibrations, and from the bottom."
+	value = CATALOGUER_REWARD_EASY
+
+
+/mob/living/simple_mob/vore/alienanimals/startreader
+	name = "asteroid star treader"
+	desc = "A slow, hard shelled creature that stalks asteroids."
+	tt_desc = "Testudines Stellarus"
+	catalogue_data = list(/datum/category_item/catalogue/fauna/startreader)
+
+	icon = 'icons/mob/alienanimals_x32.dmi'
+	icon_state = "startreader"
+	icon_living = "startreader"
+	icon_dead = "startreader_dead"
+
+	faction = "space turtle"
+	maxHealth = 1000
+	health = 1000
+	movement_cooldown = 20
+
+	see_in_dark = 10
+
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "punches"
+
+	harm_intent_damage = 1
+	melee_damage_lower = 1
+	melee_damage_upper = 10
+	attack_sharp = FALSE
+	attacktext = list("chomped", "bashed", "monched", "bumped")
+
+	ai_holder_type = /datum/ai_holder/simple_mob/melee/startreader
+
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+	minbodytemp = 0
+	maxbodytemp = 900
+
+	loot_list = list(/obj/random/underdark/uncertain)
+
+	armor = list(
+			"melee" = 100,
+			"bullet" = 100,
+			"laser" = 100,
+			"energy" = 100,
+			"bomb" = 0,
+			"bio" = 100,
+			"rad" = 100)
+
+	armor_soak = list(
+		"melee" = 30,
+		"bullet" = 30,
+		"laser" = 10,
+		"energy" = 10,
+		"bomb" = 0,
+		"bio" = 100,
+		"rad" = 100
+		)
+
+	speak_emote = list("rumbles")
+
+	say_list_type = /datum/say_list/startreader
+
+	vore_active = 1
+	vore_capacity = 2
+	vore_bump_chance = 25
+	vore_ignores_undigestable = 0
+	vore_default_mode = DM_DRAIN
+	vore_icons = SA_ICON_LIVING
+	vore_stomach_name = "gastric sac"
+	vore_default_contamination_flavor = "Wet"
+	vore_default_contamination_color = "grey"
+	vore_default_item_mode = IM_DIGEST
+
+	var/flipped = FALSE
+	var/flip_cooldown = 0
+
+/datum/say_list/startreader
+	emote_see = list("bobs", "digs around","gnashes at something","yawns","snaps at something")
+	emote_hear = list("thrumms","clicks","rattles","groans","burbles")
+
+
+/mob/living/simple_mob/vore/alienanimals/startreader/init_vore()
+	..()
+	var/obj/belly/B = vore_selected
+	B.name = "gastric sac"
+	B.desc = "It's cramped and hot! You're forced into a small ball as your shape is squeezed into the slick, wet chamber. Despite being swallowed into the creature, you find that you actually stretch out of the top a ways, and can JUST BARELY wiggle around..."
+	B.mode_flags = 40
+	B.digest_brute = 0.5
+	B.digest_burn = 0.5
+	B.digestchance = 10
+	B.absorbchance = 0
+	B.escapechance = 15
+
+/datum/ai_holder/simple_mob/melee/startreader
+	hostile = TRUE
+	retaliate = TRUE
+	destructive = TRUE
+	violent_breakthrough = TRUE
+
+/mob/living/simple_mob/vore/alienanimals/startreader/apply_melee_effects(var/atom/A)
+	if(prob(25))
+		var/mob/living/L = A
+		if(isliving(A))
+			visible_message("<span class='danger'>\The [src] trips \the [L]!</span>!")
+			L.weakened += rand(1,10)
+
+/mob/living/simple_mob/vore/alienanimals/startreader/Life()
+	. = ..()
+	if(flip_cooldown == 1)
+		flip_cooldown = 0
+		flipped = FALSE
+		handle_flip()
+		visible_message("<span class='notice'>\The [src] rights itself!!!</span>")
+		return
+	if(flip_cooldown)
+		flip_cooldown --
+		SetStunned(2)
+
+/mob/living/simple_mob/vore/alienanimals/startreader/proc/handle_flip()
+	if(flipped)
+		armor = list(
+			"melee" = 0,
+			"bullet" = 0,
+			"laser" = 0,
+			"energy" = 0,
+			"bomb" = 0,
+			"bio" = 0,
+			"rad" = 0)
+
+		armor_soak = list(
+			"melee" = 0,
+			"bullet" = 0,
+			"laser" = 0,
+			"energy" = 0,
+			"bomb" = 0,
+			"bio" = 0,
+			"rad" = 0
+			)
+		icon_living = "startreader_flipped"
+		AdjustStunned(flip_cooldown)
+	else
+		armor = list(
+			"melee" = 100,
+			"bullet" = 100,
+			"laser" = 100,
+			"energy" = 100,
+			"bomb" = 0,
+			"bio" = 100,
+			"rad" = 100)
+
+		armor_soak = list(
+			"melee" = 30,
+			"bullet" = 30,
+			"laser" = 10,
+			"energy" = 10,
+			"bomb" = 0,
+			"bio" = 100,
+			"rad" = 100
+			)
+		icon_living = "startreader"
+		SetStunned(0)
+
+	update_icon()

code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm

@@ -687,7 +687,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 			amount_grown -= rand(100,250)
 	if(not_hungy)
 		do_breeding()
-	if(prob(0.5))
+	if(!client && prob(0.5))
 		teppi_sound()
 
 /mob/living/simple_mob/vore/alienanimals/teppi/proc/do_breeding()

code/modules/projectiles/guns/energy/pummeler_vr.dm

@@ -45,4 +45,14 @@
 			L.Confuse(1)
 		L.throw_at(get_edge_target_turf(L, throwdir), rand(3,6), 10)
 
+		//VOREStation Add Start
+		if(istype(L, /mob/living/simple_mob/vore/alienanimals/startreader))
+			var/mob/living/simple_mob/vore/alienanimals/startreader/S = L
+			if(!S.flipped)
+				S.adjustBruteLoss(100)
+				S.visible_message("<span class='notice'>\The [S] is flipped over!!!</span>")
+				S.flipped = TRUE
+				S.flip_cooldown = 10
+				S.handle_flip()
+		//VOREStation Add End
 		return 1

code/modules/projectiles/projectile/special.dm

@@ -87,7 +87,12 @@
 
 		new_temperature = round(new_temperature * temp_factor)
 		L.bodytemperature = new_temperature
-
+	//VOREStation Add Start - The last metroid has escaped from captivity, the galaxy is no longer safe.
+		if(istype(L, /mob/living/simple_mob/vore/alienanimals/space_jellyfish) && target_temperature <= T0C)
+			var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/J = L
+			J.adjustFireLoss(75)
+			J.movement_cooldown *= 2
+	//VOREStation Add End
 	return 1
 
 /obj/item/projectile/temp/hot

maps/stellardelight/stellar_delight1.dmm

@@ -8,6 +8,7 @@
 "ac" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 1;
 	name = "night shift APC";
 	nightshift_setting = 2
@@ -3113,8 +3114,9 @@
 	dir = 4
 	},
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 8;
-	req_access = list(31)
+	req_access = list(31,5)
 	},
 /obj/structure/cable/yellow,
 /obj/machinery/light/floortube{
@@ -3933,7 +3935,11 @@
 	},
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 4;
-	pixel_y = 28
+	pixel_y = 29
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 38
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_cell_hallway)
@@ -4212,6 +4218,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/machinery/station_map{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/aft)
 "iT" = (
@@ -4251,6 +4260,15 @@
 /obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/starboard)
+"iX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/fore)
 "iY" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -4585,6 +4603,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 6
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/mining)
 "jG" = (
@@ -4828,6 +4847,17 @@
 	},
 /turf/simulated/floor/lino,
 /area/chapel/office)
+"kl" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/milspec/color/emerald/half{
+	dir = 4
+	},
+/obj/machinery/station_map{
+	dir = 8;
+	pixel_x = 32
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/aft)
 "km" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -5971,6 +6001,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
+/obj/machinery/station_map{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/starboard)
 "mF" = (
@@ -6120,6 +6153,15 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/starboard)
+"mT" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/fore)
 "mU" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/dark,
@@ -7958,6 +8000,9 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/resleeving)
+"qX" = (
+/turf/space/internal_edge/right,
+/area/stellardelight/deck1/starboard)
 "qY" = (
 /obj/effect/floor_decal/milspec/color/orange/half,
 /turf/simulated/floor/tiled/dark,
@@ -8145,6 +8190,11 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/substation/security)
+"rt" = (
+/obj/structure/table/woodentable,
+/obj/item/weapon/folder/blue,
+/turf/simulated/floor/tiled/milspec,
+/area/stellardelight/deck1/explobriefing)
 "ru" = (
 /obj/machinery/light_switch{
 	dir = 4;
@@ -9572,6 +9622,9 @@
 	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/stellardelight/deck1/dorms/dorm2)
+"uw" = (
+/turf/space/internal_edge/left,
+/area/stellardelight/deck1/starboard)
 "ux" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/green{
@@ -9678,6 +9731,10 @@
 /obj/effect/floor_decal/steeldecal/steel_decals6{
 	dir = 9
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/port)
 "uH" = (
@@ -10756,6 +10813,9 @@
 /obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/tiled/dark,
 /area/security/security_processing)
+"xe" = (
+/turf/simulated/wall/bay/r_wall/brown,
+/area/stellardelight/deck1/starboard)
 "xf" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/window/bay/reinforced,
@@ -10975,15 +11035,12 @@
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/oreprocessing)
 "xE" = (
-/obj/machinery/power/apc/angled{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/station_map{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/fore)
 "xF" = (
@@ -11200,8 +11257,9 @@
 	dir = 8
 	},
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 4;
-	req_access = list(19,43,67)
+	req_access = list(19,43,67,66,5)
 	},
 /obj/structure/cable/green{
 	color = "#42038a"
@@ -14042,6 +14100,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_cell_hallway)
+"Ef" = (
+/turf/space/internal_edge/top,
+/area/stellardelight/deck1/starboard)
 "Eg" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -14215,6 +14276,18 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/xenobiology)
+"EA" = (
+/obj/effect/floor_decal/milspec/color/red/half{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 10
+	},
+/obj/machinery/firealarm/angled{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/fore)
 "EB" = (
 /obj/machinery/door/window/eastright{
 	dir = 8;
@@ -14263,6 +14336,18 @@
 	pixel_x = 4;
 	pixel_y = 5
 	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 20
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 28
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 36
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck1/explobriefing)
 "EG" = (
@@ -14424,6 +14509,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
+"EZ" = (
+/turf/space/internal_edge/bottomright,
+/area/stellardelight/deck1/starboard)
 "Fa" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 10
@@ -16004,18 +16092,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
 "Iu" = (
-/obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/angled_bay/external/glass{
 	dir = 4;
 	door_color = "#525252";
 	name = "Exploration Shuttle";
-	req_one_access = list(19,43,67,66);
+	req_one_access = list(19,43,67,66,5);
 	stripe_color = "#408f3b"
 	},
 /obj/structure/cable/green{
 	color = "#42038a";
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/door/firedoor/glass/talon,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/exploshuttle)
 "Iw" = (
@@ -16243,6 +16332,9 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck1/portcent)
+"IT" = (
+/turf/space/internal_edge/bottom,
+/area/stellardelight/deck1/starboard)
 "IU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
@@ -17664,17 +17756,18 @@
 /turf/simulated/wall/bay/r_wall/steel,
 /area/stellardelight/deck1/exploration)
 "Ma" = (
-/obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/angled_bay/external/glass{
 	dir = 4;
 	door_color = "#a88860";
 	name = "Mining Shuttle";
-	req_access = list(31);
+	req_access = list(31,5);
 	stripe_color = "#69461a"
 	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/door/firedoor/glass/talon,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/miningshuttle)
 "Mb" = (
@@ -17744,6 +17837,9 @@
 /obj/structure/low_wall/bay/reinforced/purple,
 /turf/simulated/floor,
 /area/rnd/workshop)
+"Mh" = (
+/turf/space/internal_edge/topleft,
+/area/stellardelight/deck1/starboard)
 "Mi" = (
 /obj/structure/table/standard,
 /obj/item/weapon/stock_parts/matter_bin,
@@ -18465,6 +18561,9 @@
 /area/assembly/robotics)
 "NN" = (
 /obj/structure/table/steel_reinforced,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "NP" = (
@@ -18496,6 +18595,9 @@
 	},
 /turf/simulated/floor,
 /area/stellardelight/deck1/mining)
+"NT" = (
+/turf/space/internal_edge/topright,
+/area/stellardelight/deck1/starboard)
 "NV" = (
 /obj/structure/cable/green{
 	color = "#42038a";
@@ -19556,7 +19658,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/firealarm/angled,
+/obj/machinery/station_map{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/fore)
 "Qp" = (
@@ -20233,6 +20337,9 @@
 	},
 /turf/simulated/floor/tiled/eris/white/bluecorner,
 /area/medical/exam_room)
+"RI" = (
+/turf/space/internal_edge/bottomleft,
+/area/stellardelight/deck1/starboard)
 "RJ" = (
 /obj/machinery/light{
 	dir = 4
@@ -20332,7 +20439,7 @@
 	},
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 4;
-	pixel_y = 28
+	pixel_y = 29
 	},
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 4;
@@ -20341,14 +20448,24 @@
 /obj/effect/floor_decal/milspec/color/red/half{
 	dir = 4
 	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 38
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
 "RX" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/milspec/color/red/half{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 9
+	},
+/obj/machinery/power/apc/angled{
+	dir = 8
 	},
 /obj/structure/cable/green{
-	icon_state = "1-8"
+	icon_state = "0-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/fore)
@@ -21318,6 +21435,8 @@
 /obj/machinery/alarm/angled{
 	dir = 4
 	},
+/obj/item/paint_palette,
+/obj/item/paint_brush,
 /turf/simulated/floor/wood,
 /area/library)
 "TW" = (
@@ -21613,6 +21732,7 @@
 /area/rnd/research)
 "UB" = (
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 1;
 	name = "night shift APC";
 	nightshift_setting = 2
@@ -22217,7 +22337,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/structure/ore_box,
+/obj/structure/table/standard,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/mining)
 "VF" = (
@@ -23424,6 +23547,7 @@
 /obj/machinery/camera/network/mining{
 	dir = 8
 	},
+/obj/structure/ore_box,
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/mining)
 "Yi" = (
@@ -23573,7 +23697,9 @@
 /area/security/tactical)
 "Yy" = (
 /obj/structure/table/steel_reinforced,
-/obj/machinery/recharger,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /obj/structure/sign/vacuum{
 	pixel_y = 32
 	},
@@ -23911,7 +24037,9 @@
 /area/stellardelight/deck1/miningequipment)
 "Zh" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/folder/blue,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/milspec,
 /area/stellardelight/deck1/explobriefing)
 "Zi" = (
@@ -24093,7 +24221,14 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/aft)
 "ZC" = (
-/obj/machinery/firealarm/angled,
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 20
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 29
+	},
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/mining)
 "ZD" = (
@@ -24156,6 +24291,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/firealarm/angled{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/mining)
 "ZK" = (
@@ -24189,9 +24327,9 @@
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
-/obj/structure/closet/emergsuit_wall{
-	dir = 8;
-	pixel_x = -27
+/obj/machinery/station_map{
+	dir = 4;
+	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/aft)
@@ -31231,7 +31369,7 @@ Rz
 TC
 oZ
 Zh
-zZ
+rt
 OB
 Rz
 ny
@@ -33157,7 +33295,7 @@ Zy
 SQ
 Yv
 xE
-RX
+zW
 xZ
 MA
 Zt
@@ -33439,9 +33577,9 @@ Xk
 OD
 ZR
 QG
-XC
-IF
-zW
+RX
+iX
+mT
 Ku
 Ku
 Ku
@@ -33742,13 +33880,13 @@ rW
 lC
 HT
 ER
-uq
-uq
-uq
-uq
-uq
-uq
-uq
+EZ
+qX
+qX
+qX
+qX
+qX
+NT
 vu
 Br
 AP
@@ -33884,13 +34022,13 @@ SH
 jD
 PI
 IZ
-uq
-uq
-uq
-uq
-uq
-uq
-uq
+IT
+xe
+xe
+xe
+xe
+xe
+Ef
 AT
 Aq
 WE
@@ -34026,13 +34164,13 @@ zg
 aj
 Wl
 IZ
-uq
-uq
-uq
-uq
-uq
-uq
-uq
+IT
+xe
+xe
+xe
+xe
+xe
+Ef
 AT
 Qd
 VH
@@ -34168,13 +34306,13 @@ bi
 bi
 bi
 bi
-uq
-uq
-uq
-uq
-uq
-uq
-uq
+IT
+xe
+xe
+xe
+xe
+xe
+Ef
 IC
 IC
 IC
@@ -34310,13 +34448,13 @@ Si
 gK
 LX
 wE
-uq
-uq
-uq
-uq
-uq
-uq
-uq
+IT
+xe
+xe
+xe
+xe
+xe
+Ef
 PA
 da
 dc
@@ -34452,13 +34590,13 @@ KG
 sn
 kL
 wE
-uq
-uq
-uq
-uq
-uq
-uq
-uq
+IT
+xe
+xe
+xe
+xe
+xe
+Ef
 PA
 Wk
 iT
@@ -34594,13 +34732,13 @@ HX
 Gu
 JB
 bi
-uq
-uq
-uq
-uq
-uq
-uq
-uq
+RI
+uw
+uw
+uw
+uw
+uw
+Mh
 IC
 RM
 De
@@ -34859,7 +34997,7 @@ HN
 Tg
 Vr
 Hs
-zb
+EA
 zc
 zW
 Ku
@@ -35751,7 +35889,7 @@ Wj
 MH
 xx
 xF
-XJ
+kl
 CV
 kv
 jg

maps/stellardelight/stellar_delight2.dmm

@@ -628,6 +628,9 @@
 	pixel_x = 32;
 	pixel_y = 18
 	},
+/obj/structure/railing/grey{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/stellardelight/deck2/aftport)
 "bn" = (
@@ -695,6 +698,9 @@
 	pixel_x = -32;
 	pixel_y = 18
 	},
+/obj/structure/railing/grey{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/stellardelight/deck2/aftstarboard)
 "bs" = (
@@ -2113,9 +2119,6 @@
 /area/stellardelight/deck2/aftport)
 "eE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portsolars)
 "eF" = (
@@ -2948,6 +2951,12 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/monitoring)
+"gA" = (
+/obj/structure/railing/grey{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/stellardelight/deck2/fore)
 "gB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -2992,10 +3001,10 @@
 /area/engineering/storage)
 "gF" = (
 /obj/structure/cable/orange{
-	icon_state = "2-8"
+	icon_state = "1-2"
 	},
 /obj/structure/cable/orange{
-	icon_state = "1-2"
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/airless,
 /area/stellardelight/deck2/exterior)
@@ -3168,9 +3177,6 @@
 /obj/machinery/alarm/angled{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/starboardsolars)
 "hb" = (
@@ -4149,13 +4155,15 @@
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/fore)
 "jz" = (
-/obj/machinery/firealarm/angled,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 1
 	},
+/obj/machinery/station_map{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftstarboard)
 "jA" = (
@@ -5085,6 +5093,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/monitoring)
 "lu" = (
@@ -5460,6 +5472,16 @@
 	},
 /turf/simulated/floor/airless,
 /area/stellardelight/deck2/exterior)
+"mb" = (
+/obj/effect/floor_decal/milspec/color/blue/half{
+	dir = 4
+	},
+/obj/machinery/station_map{
+	dir = 8;
+	pixel_x = 32
+	},
+/turf/simulated/floor/tiled,
+/area/stellardelight/deck2/port)
 "md" = (
 /obj/effect/floor_decal/industrial/outline,
 /obj/effect/floor_decal/steeldecal/steel_decals9,
@@ -5512,14 +5534,15 @@
 /area/stellardelight/deck2/port)
 "mj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 4;
 	name = "night shift APC";
 	nightshift_setting = 2
 	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/starboardsolars)
 "mk" = (
@@ -5771,6 +5794,10 @@
 /obj/effect/floor_decal/milspec/color/silver/corner{
 	dir = 4
 	},
+/obj/machinery/station_map{
+	dir = 8;
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/fore)
 "mO" = (
@@ -6022,6 +6049,10 @@
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftport)
 "nx" = (
@@ -6694,6 +6725,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 1
 	},
+/obj/machinery/station_map{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/fore)
 "pb" = (
@@ -6802,9 +6836,6 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portsolars)
 "pl" = (
@@ -7154,12 +7185,13 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck2/o2production)
 "pZ" = (
-/obj/machinery/firealarm/angled{
-	dir = 4
-	},
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
 	},
+/obj/machinery/station_map{
+	dir = 8;
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/fore)
 "qa" = (
@@ -7220,6 +7252,9 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/starboardsolars)
 "qi" = (
@@ -7608,6 +7643,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portsolars)
 "qZ" = (
@@ -8691,9 +8729,6 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/starboardsolars)
 "ty" = (
@@ -8704,6 +8739,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/monitoring)
 "tz" = (
@@ -10375,6 +10411,10 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftport)
 "xy" = (
@@ -11258,12 +11298,13 @@
 	dir = 4
 	},
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 8;
 	name = "night shift APC";
 	nightshift_setting = 2
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/structure/cable/green{
+	icon_state = "0-4"
 	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portsolars)
@@ -12126,6 +12167,12 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/plating,
 /area/engineering/storage)
+"BA" = (
+/obj/structure/railing/grey{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/stellardelight/deck2/fore)
 "BB" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -12537,6 +12584,9 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/monitoring)
 "CA" = (
@@ -12965,6 +13015,15 @@
 "DB" = (
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/atmos)
+"DC" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+	dir = 4
+	},
+/obj/machinery/firealarm/angled{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/stellardelight/deck2/fore)
 "DD" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/alarm/freezer{
@@ -13089,9 +13148,13 @@
 /turf/simulated/floor/tiled/freezer/cold,
 /area/crew_quarters/kitchen)
 "DQ" = (
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 1;
+	name = "Atmospherics";
+	sortType = "Atmospherics"
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftport)
 "DR" = (
@@ -14548,6 +14611,7 @@
 /obj/machinery/power/terminal{
 	dir = 8
 	},
+/obj/structure/cable,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portsolars)
 "GP" = (
@@ -14930,6 +14994,10 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 8
 	},
+/obj/machinery/station_map{
+	dir = 4;
+	pixel_x = -32
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftport)
 "HH" = (
@@ -15218,6 +15286,7 @@
 	},
 /obj/random/vendordrink,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/firealarm/angled,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftstarboard)
 "Il" = (
@@ -15336,6 +15405,16 @@
 /obj/machinery/recharger,
 /turf/simulated/floor/tiled/eris/white/bluecorner,
 /area/stellardelight/deck2/triage)
+"Iv" = (
+/obj/effect/floor_decal/milspec/color/blue/half{
+	dir = 8
+	},
+/obj/machinery/station_map{
+	dir = 4;
+	pixel_x = -32
+	},
+/turf/simulated/floor/tiled,
+/area/stellardelight/deck2/starboard)
 "Iw" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -17241,7 +17320,9 @@
 /area/crew_quarters/bar)
 "MM" = (
 /obj/structure/table/standard,
-/obj/machinery/recharger,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /obj/machinery/light/floortube{
 	pixel_y = -4
 	},
@@ -17943,6 +18024,7 @@
 /area/medical/surgery2)
 "Oq" = (
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 8
 	},
 /obj/structure/cable/cyan{
@@ -18181,6 +18263,10 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos/monitoring)
 "OU" = (
@@ -21553,6 +21639,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/engineering/atmos/monitoring)
 "WB" = (
@@ -21862,9 +21951,6 @@
 /obj/machinery/alarm/angled{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portsolars)
 "Xo" = (
@@ -21896,9 +21982,6 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/starboardsolars)
 "Xs" = (
@@ -30170,8 +30253,8 @@ UG
 cv
 cv
 cv
-ZG
-Jh
+CP
+SO
 Jh
 Jh
 Jh
@@ -30312,6 +30395,7 @@ Zt
 qM
 Vm
 mq
+Wb
 ZG
 Jh
 Jh
@@ -30332,7 +30416,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (52,1,1) = {"
 Jh
@@ -30454,6 +30537,7 @@ LG
 AV
 Vm
 Vm
+Wb
 ZG
 Jh
 Jh
@@ -30474,7 +30558,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (53,1,1) = {"
 Jh
@@ -30596,8 +30679,8 @@ yg
 AV
 cv
 cv
-ZG
-Jh
+Ds
+kL
 Jh
 Jh
 Jh
@@ -30880,8 +30963,8 @@ MP
 PB
 cv
 cv
-ZG
-Jh
+CP
+SO
 Jh
 Jh
 Jh
@@ -31022,6 +31105,7 @@ ay
 wm
 Vm
 mq
+Wb
 ZG
 Jh
 Jh
@@ -31042,7 +31126,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (57,1,1) = {"
 Jh
@@ -31164,6 +31247,7 @@ DR
 AV
 Vm
 Vm
+Wb
 ZG
 Jh
 Jh
@@ -31184,7 +31268,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (58,1,1) = {"
 Jh
@@ -31306,8 +31389,8 @@ eg
 tk
 cv
 cv
-ZG
-Jh
+Ds
+kL
 Jh
 Jh
 Jh
@@ -31682,7 +31765,7 @@ VP
 bA
 bA
 bA
-bA
+mb
 bA
 BP
 wF
@@ -32094,7 +32177,7 @@ nt
 Rq
 Rq
 lQ
-aA
+gA
 Jq
 Xi
 kF
@@ -33798,7 +33881,7 @@ nt
 Rq
 Rq
 lY
-aA
+BA
 Jq
 IK
 kF
@@ -34238,7 +34321,7 @@ Ru
 nL
 WL
 WL
-iu
+Iv
 iu
 ec
 YX
@@ -34500,7 +34583,7 @@ Zr
 Zr
 vj
 pZ
-Zr
+DC
 Zr
 OV
 Zr
@@ -34714,8 +34797,8 @@ uo
 BN
 nq
 nq
-ZG
-Jh
+CP
+SO
 Jh
 Jh
 Jh
@@ -34856,6 +34939,7 @@ cF
 Jk
 VJ
 Dw
+Wb
 ZG
 Jh
 Jh
@@ -34876,7 +34960,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (84,1,1) = {"
 Jh
@@ -34998,6 +35081,7 @@ Nt
 Lw
 VJ
 VJ
+Wb
 ZG
 Jh
 Jh
@@ -35018,7 +35102,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (85,1,1) = {"
 Jh
@@ -35140,8 +35223,8 @@ lk
 Lw
 nq
 nq
-ZG
-Jh
+Ds
+kL
 Jh
 Jh
 Jh
@@ -35424,8 +35507,8 @@ jA
 Lw
 nq
 nq
-ZG
-Jh
+CP
+SO
 Jh
 Jh
 Jh
@@ -35566,6 +35649,7 @@ lX
 yA
 VJ
 Dw
+Wb
 ZG
 Jh
 Jh
@@ -35586,7 +35670,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (89,1,1) = {"
 Jh
@@ -35708,6 +35791,7 @@ nO
 nq
 VJ
 VJ
+Wb
 ZG
 Jh
 Jh
@@ -35728,7 +35812,6 @@ Jh
 Jh
 Jh
 Jh
-Jh
 "}
 (90,1,1) = {"
 Jh
@@ -35850,8 +35933,8 @@ SG
 rT
 rT
 rT
-ZG
-Jh
+Ds
+kL
 Jh
 Jh
 Jh

maps/stellardelight/stellar_delight_areas.dm

@@ -129,6 +129,7 @@
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
+	forbid_events = TRUE
 
 /area/stellardelight/deck1/dorms/dorm1
 	name = "Dormitory One"
@@ -277,6 +278,10 @@
 /area/stellardelight/deck3/readingroom
 	name = "Reading Rooms"
 	sound_env = SMALL_SOFTFLOOR
+	flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT
+	soundproofed = TRUE
+	block_suit_sensors = TRUE
+	forbid_events = TRUE	
 
 /area/stellardelight/deck3/portdock
 	name = "Port Dock"

maps/stellardelight/stellar_delight_defines.dm

@@ -4,15 +4,16 @@
 #define Z_LEVEL_SHIP_HIGH					3
 #define Z_LEVEL_CENTCOM						4
 #define Z_LEVEL_MISC						5
-#define Z_LEVEL_BEACH						6
-#define Z_LEVEL_BEACH_CAVE					7
-#define Z_LEVEL_AEROSTAT					8
-#define Z_LEVEL_AEROSTAT_SURFACE			9
-#define Z_LEVEL_DEBRISFIELD					10
-#define Z_LEVEL_FUELDEPOT					11
-#define Z_LEVEL_OVERMAP						12
-#define Z_LEVEL_OFFMAP1						13
-#define Z_LEVEL_GATEWAY						14
+#define Z_LEVEL_SPACE_ROCKS					6
+#define Z_LEVEL_BEACH						7
+#define Z_LEVEL_BEACH_CAVE					8
+#define Z_LEVEL_AEROSTAT					9
+#define Z_LEVEL_AEROSTAT_SURFACE			10
+#define Z_LEVEL_DEBRISFIELD					11
+#define Z_LEVEL_FUELDEPOT					12
+#define Z_LEVEL_OVERMAP						13
+#define Z_LEVEL_OFFMAP1						14
+#define Z_LEVEL_GATEWAY						15
 
 //Camera networks
 #define NETWORK_HALLS "Halls"
@@ -46,12 +47,12 @@
 	lobby_screens = list("youcanttaketheskyfromme")
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
-/*
+
 	holomap_smoosh = list(list(
-		Z_LEVEL_SURFACE_LOW,
-		Z_LEVEL_SURFACE_MID,
-		Z_LEVEL_SURFACE_HIGH))
-*/
+		Z_LEVEL_SHIP_LOW,
+		Z_LEVEL_SHIP_MID,
+		Z_LEVEL_SHIP_HIGH))
+
 	station_name  = "NRV Stellar Delight"
 	station_short = "Stellar Delight"
 	dock_name     = "Virgo-3B Colony"
@@ -126,6 +127,7 @@
 	lateload_z_levels = list(
 		list("Ship - Central Command"),
 		list("Ship - Misc"), //Shuttle transit zones, holodeck templates, etc
+		list("V3b Asteroid Field"),
 		list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"),
 		list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"),
 		list("Debris Field - Z1 Space"),
@@ -177,17 +179,13 @@
 	. +=  "As an employee or contractor of NanoTrasen, operators of the Adephagia and one of the galaxy's largest corporations, you're probably just here to do a job."
 	return jointext(., "<br>")
 
-/*
+
 /datum/map/stellar_delight/perform_map_generation()
 
-	new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level.
-	new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SURFACE_MINE, 64, 64)         // Create the mining ore distribution map.
-
-	new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SOLARS, world.maxx, world.maxy) // Create the mining Z-level.
-	new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SOLARS, 64, 64)         // Create the mining ore distribution map.
-
+	new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, world.maxx, world.maxy) // Create the mining Z-level.
+	new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64)         // Create the mining ore distribution map.
 	return 1
-*/
+
 
 /datum/skybox_settings/stellar_delight
 	icon_state = "space5"
@@ -200,12 +198,6 @@
 		Z_LEVEL_BEACH
 	)
 
-// For making the 6-in-1 holomap, we calculate some offsets
-#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels.
-#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns
-#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE) - TETHER_HOLOMAP_CENTER_GUTTER) / 2) // 80
-#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE)) / 2) // 30
-
 /obj/effect/landmark/map_data/stellar_delight
 	height = 3
 
@@ -241,6 +233,11 @@
 		return
 	cached_skybox_image.add_overlay("glow")
 
+// For making the 6-in-1 holomap, we calculate some offsets
+#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels.
+#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns
+#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE) - SHIP_HOLOMAP_CENTER_GUTTER) / 2) // 80
+#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE)) / 2) // 30
 
 // We have a bunch of stuff common to the station z levels
 /datum/map_z_level/stellar_delight
@@ -253,18 +250,24 @@
 	name = "Deck 1"
 	base_turf = /turf/space
 	transit_chance = 33
+	holomap_offset_x = SHIP_HOLOMAP_MARGIN_X
+	holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y
 
 /datum/map_z_level/stellar_delight/deck_two
 	z = Z_LEVEL_SHIP_MID
 	name = "Deck 2"
 	base_turf = /turf/simulated/open
 	transit_chance = 33
+	holomap_offset_x = SHIP_HOLOMAP_MARGIN_X
+	holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE
 
 /datum/map_z_level/stellar_delight/deck_three
 	z = Z_LEVEL_SHIP_HIGH
 	name = "Deck 3"
 	base_turf = /turf/simulated/open
 	transit_chance = 33
+	holomap_offset_x = HOLOMAP_ICON_SIZE - SHIP_HOLOMAP_MARGIN_X - SHIP_MAP_SIZE
+	holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE
 
 /datum/map_template/ship_lateload
 	allow_duplicates = FALSE
@@ -307,6 +310,26 @@
 	name = "Misc"
 	flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT
 
+#include "../submaps/space_rocks/space_rocks.dm"
+/datum/map_template/ship_lateload/space_rocks
+	name = "V3b Asteroid Field"
+	desc = "Space debris is common in V3b's orbit due to the proximity of Virgo 3"
+	mappath = 'maps/submaps/space_rocks/space_rocks.dmm'
+
+	associated_map_datum = /datum/map_z_level/ship_lateload/space_rocks
+
+/datum/map_template/ship_lateload/space_rocks/on_map_loaded(z)
+	. = ..()
+	seed_submaps(list(Z_LEVEL_SPACE_ROCKS), 60, /area/sdmine/unexplored, /datum/map_template/space_rocks)
+	new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_SPACE_ROCKS, world.maxx - 4, world.maxy - 4)
+	new /datum/random_map/noise/ore/spacerocks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64)
+
+/datum/map_z_level/ship_lateload/space_rocks
+	z = Z_LEVEL_SPACE_ROCKS
+	name = "V3b Asteroid Field"
+	base_turf = /turf/space
+
+
 /datum/map_template/ship_lateload/overmap
 	name = "Overmap"
 	desc = "Overmap lives here :3"

maps/stellardelight/stellar_delight_shuttle_defs.dm

@@ -250,8 +250,11 @@
 	skybox_pixel_x = 0
 	skybox_pixel_y = 0
 
+	initial_generic_waypoints = list("sr-c","sr-n","sr-s")
 	initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad"))
 
+	extra_z_levels = list(Z_LEVEL_SPACE_ROCKS)
+
 /////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards)
 /obj/effect/overmap/visitable/sector/virgo3b/Initialize()
 	. = ..()

maps/submaps/space_rocks/pois/bittynest1.dmm

@@ -0,0 +1,145 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"L" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest1)
+"P" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/submap/space_rocks/bittynest1)
+"W" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest1)
+"Y" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest1)
+
+(1,1,1) = {"
+a
+a
+a
+a
+P
+P
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+P
+P
+P
+P
+W
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+P
+P
+W
+W
+W
+W
+P
+a
+"}
+(4,1,1) = {"
+a
+P
+P
+W
+W
+P
+P
+P
+P
+a
+"}
+(5,1,1) = {"
+P
+P
+W
+W
+W
+W
+W
+Y
+P
+P
+"}
+(6,1,1) = {"
+P
+P
+W
+W
+W
+L
+W
+W
+W
+P
+"}
+(7,1,1) = {"
+P
+P
+W
+W
+W
+W
+W
+W
+W
+P
+"}
+(8,1,1) = {"
+a
+P
+P
+Y
+W
+W
+W
+W
+P
+P
+"}
+(9,1,1) = {"
+a
+a
+P
+P
+P
+P
+P
+P
+P
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+P
+P
+a
+a
+a
+"}

maps/submaps/space_rocks/pois/bittynest2.dmm

@@ -0,0 +1,145 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"v" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/submap/space_rocks/bittynest2)
+"B" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest2)
+"R" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest2)
+"W" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest2)
+
+(1,1,1) = {"
+a
+a
+a
+a
+v
+v
+a
+v
+v
+a
+"}
+(2,1,1) = {"
+a
+a
+v
+v
+v
+v
+v
+v
+v
+a
+"}
+(3,1,1) = {"
+a
+v
+v
+v
+v
+W
+R
+v
+v
+v
+"}
+(4,1,1) = {"
+a
+v
+v
+v
+W
+W
+B
+W
+v
+v
+"}
+(5,1,1) = {"
+v
+v
+v
+W
+W
+W
+W
+W
+v
+a
+"}
+(6,1,1) = {"
+v
+v
+W
+W
+W
+W
+W
+v
+v
+v
+"}
+(7,1,1) = {"
+v
+v
+R
+B
+W
+W
+W
+W
+v
+a
+"}
+(8,1,1) = {"
+v
+v
+v
+W
+W
+v
+v
+W
+a
+a
+"}
+(9,1,1) = {"
+a
+v
+v
+v
+v
+v
+v
+W
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+v
+v
+a
+a
+a
+a
+a
+"}

maps/submaps/space_rocks/pois/bittynest3.dmm

@@ -0,0 +1,145 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"p" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest3)
+"N" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest3)
+"Q" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest3)
+"Z" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/submap/space_rocks/bittynest3)
+
+(1,1,1) = {"
+a
+a
+Q
+a
+Z
+Z
+Z
+Z
+a
+a
+"}
+(2,1,1) = {"
+a
+Z
+Q
+Q
+Q
+Z
+Z
+Z
+Z
+a
+"}
+(3,1,1) = {"
+a
+Z
+Z
+Q
+Q
+p
+Q
+Z
+Z
+Z
+"}
+(4,1,1) = {"
+Z
+Z
+Z
+Z
+Z
+Q
+Q
+Q
+Z
+Z
+"}
+(5,1,1) = {"
+Z
+Z
+Z
+p
+Q
+Z
+Q
+Q
+Z
+a
+"}
+(6,1,1) = {"
+Z
+Z
+Q
+Q
+Q
+Q
+Q
+Z
+Z
+a
+"}
+(7,1,1) = {"
+Z
+Z
+Q
+N
+Q
+Q
+Q
+Z
+Z
+a
+"}
+(8,1,1) = {"
+a
+Z
+Z
+Q
+Q
+Z
+Z
+Z
+Z
+a
+"}
+(9,1,1) = {"
+a
+a
+Z
+Z
+Z
+Z
+Z
+Z
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+Z
+Z
+Z
+a
+a
+a
+a
+"}

maps/submaps/space_rocks/pois/bittynest4.dmm

@@ -0,0 +1,145 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"m" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest4)
+"x" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest4)
+"P" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/bittynest4)
+"V" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/submap/space_rocks/bittynest4)
+
+(1,1,1) = {"
+a
+a
+V
+V
+V
+P
+V
+V
+a
+a
+"}
+(2,1,1) = {"
+a
+V
+V
+V
+P
+P
+P
+V
+V
+a
+"}
+(3,1,1) = {"
+V
+V
+P
+P
+P
+x
+V
+V
+V
+V
+"}
+(4,1,1) = {"
+V
+V
+P
+P
+V
+V
+V
+V
+V
+V
+"}
+(5,1,1) = {"
+a
+V
+P
+V
+V
+m
+P
+x
+V
+V
+"}
+(6,1,1) = {"
+V
+V
+P
+V
+P
+P
+P
+P
+P
+V
+"}
+(7,1,1) = {"
+V
+V
+P
+P
+P
+P
+V
+V
+P
+V
+"}
+(8,1,1) = {"
+V
+V
+V
+P
+V
+V
+V
+P
+P
+V
+"}
+(9,1,1) = {"
+a
+V
+V
+V
+V
+V
+P
+m
+V
+V
+"}
+(10,1,1) = {"
+a
+a
+V
+V
+V
+P
+P
+V
+V
+a
+"}

maps/submaps/space_rocks/pois/clearing.dmm

@@ -0,0 +1,148 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"v" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/clearing)
+"y" = (
+/obj/random/contraband/nofail,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/clearing)
+"P" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/clearing)
+"W" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/clearing)
+
+(1,1,1) = {"
+a
+a
+a
+a
+v
+v
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+v
+v
+v
+v
+v
+v
+a
+a
+"}
+(3,1,1) = {"
+a
+v
+v
+v
+v
+v
+v
+v
+v
+a
+"}
+(4,1,1) = {"
+a
+v
+v
+v
+v
+v
+v
+v
+v
+a
+"}
+(5,1,1) = {"
+v
+v
+v
+v
+P
+v
+v
+v
+v
+v
+"}
+(6,1,1) = {"
+v
+v
+v
+W
+v
+y
+v
+v
+v
+v
+"}
+(7,1,1) = {"
+a
+v
+v
+v
+v
+v
+v
+v
+v
+a
+"}
+(8,1,1) = {"
+a
+v
+v
+v
+v
+v
+v
+v
+v
+a
+"}
+(9,1,1) = {"
+a
+a
+v
+v
+v
+v
+v
+v
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+v
+v
+a
+a
+a
+a
+"}

maps/submaps/space_rocks/pois/seventemple.dmm

@@ -0,0 +1,498 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/structure/loot_pile/surface/alien/medical,
+/turf/simulated/shuttle/floor/alienplating/vacuum,
+/area/submap/space_rocks/seventemple)
+"f" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/seventemple)
+"h" = (
+/obj/structure/loot_pile/surface/alien/end,
+/turf/simulated/shuttle/floor/alienplating/vacuum,
+/area/submap/space_rocks/seventemple)
+"m" = (
+/turf/simulated/shuttle/floor/alien,
+/area/submap/space_rocks/seventemple)
+"p" = (
+/obj/structure/loot_pile/surface/bones,
+/turf/simulated/shuttle/floor/alien/blue,
+/area/submap/space_rocks/seventemple)
+"q" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/seventemple)
+"t" = (
+/turf/simulated/shuttle/floor/alienplating/vacuum,
+/area/submap/space_rocks/seventemple)
+"w" = (
+/obj/structure/loot_pile/surface/alien/security,
+/turf/simulated/shuttle/floor/alienplating/vacuum,
+/area/submap/space_rocks/seventemple)
+"y" = (
+/obj/structure/loot_pile/surface/drone,
+/turf/simulated/shuttle/floor/alienplating/vacuum,
+/area/submap/space_rocks/seventemple)
+"F" = (
+/turf/simulated/shuttle/floor/alien/blue,
+/area/submap/space_rocks/seventemple)
+"J" = (
+/turf/simulated/wall/eris/r_wall,
+/area/submap/space_rocks/seventemple)
+"R" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/seventemple)
+"Y" = (
+/obj/structure/loot_pile/surface/alien/engineering,
+/turf/simulated/shuttle/floor/alienplating/vacuum,
+/area/submap/space_rocks/seventemple)
+
+(1,1,1) = {"
+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
+J
+a
+a
+a
+a
+f
+J
+J
+J
+f
+a
+a
+a
+a
+J
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+J
+J
+J
+a
+a
+f
+J
+J
+t
+J
+J
+f
+a
+a
+J
+J
+J
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+J
+f
+f
+f
+f
+J
+Y
+t
+t
+J
+f
+f
+f
+f
+J
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+f
+R
+f
+f
+J
+t
+t
+t
+J
+f
+f
+f
+f
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+f
+f
+f
+f
+f
+J
+t
+y
+t
+J
+f
+f
+R
+f
+f
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+f
+f
+f
+f
+f
+J
+J
+t
+m
+t
+J
+J
+f
+f
+f
+f
+f
+a
+a
+"}
+(8,1,1) = {"
+a
+f
+f
+f
+f
+J
+J
+m
+t
+t
+t
+m
+J
+J
+f
+f
+f
+f
+a
+a
+"}
+(9,1,1) = {"
+a
+f
+q
+f
+J
+J
+t
+t
+t
+F
+t
+t
+t
+J
+J
+f
+f
+f
+a
+a
+"}
+(10,1,1) = {"
+J
+f
+f
+f
+J
+w
+t
+t
+F
+p
+F
+t
+t
+h
+J
+f
+f
+f
+J
+a
+"}
+(11,1,1) = {"
+a
+f
+f
+f
+J
+J
+t
+t
+t
+F
+t
+t
+t
+J
+J
+f
+f
+f
+a
+a
+"}
+(12,1,1) = {"
+a
+f
+f
+f
+f
+J
+J
+m
+t
+t
+t
+m
+J
+J
+f
+f
+f
+f
+a
+a
+"}
+(13,1,1) = {"
+a
+f
+f
+f
+f
+f
+J
+J
+t
+m
+t
+J
+J
+f
+f
+f
+q
+f
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+f
+f
+f
+f
+f
+J
+t
+y
+t
+J
+f
+f
+f
+f
+f
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+f
+R
+f
+f
+J
+t
+t
+t
+J
+f
+f
+R
+f
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+J
+f
+f
+f
+f
+J
+b
+t
+t
+J
+f
+f
+f
+f
+J
+a
+a
+a
+"}
+(17,1,1) = {"
+a
+J
+J
+J
+a
+a
+f
+J
+J
+t
+J
+J
+f
+a
+a
+J
+J
+J
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+J
+a
+a
+a
+a
+f
+J
+J
+J
+f
+a
+a
+a
+a
+J
+a
+a
+a
+"}
+(19,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}

maps/submaps/space_rocks/pois/spacecrystals.dmm

@@ -0,0 +1,471 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"c" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/spacecrystals)
+"j" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/spacecrystals)
+"W" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/submap/space_rocks/spacecrystals)
+"X" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/spacecrystals)
+"Z" = (
+/obj/machinery/crystal,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/spacecrystals)
+
+(1,1,1) = {"
+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
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+a
+W
+W
+W
+W
+W
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+W
+W
+c
+c
+c
+c
+W
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+W
+c
+c
+c
+c
+c
+c
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+W
+W
+X
+j
+c
+c
+c
+c
+W
+W
+W
+W
+W
+W
+a
+a
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+W
+c
+c
+c
+c
+c
+c
+Z
+c
+c
+c
+c
+W
+W
+a
+a
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+W
+c
+c
+c
+c
+Z
+c
+c
+c
+Z
+c
+c
+c
+W
+W
+a
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+W
+W
+c
+c
+c
+c
+c
+c
+c
+c
+c
+j
+c
+c
+W
+a
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+a
+W
+W
+W
+c
+c
+c
+Z
+c
+c
+c
+c
+c
+c
+W
+a
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+a
+a
+a
+W
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+W
+a
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+a
+a
+W
+W
+c
+Z
+c
+c
+c
+Z
+c
+c
+X
+W
+W
+a
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+W
+W
+c
+c
+c
+c
+Z
+c
+c
+W
+W
+W
+W
+a
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+W
+c
+c
+j
+X
+c
+c
+c
+W
+W
+a
+a
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+a
+W
+c
+c
+c
+c
+c
+c
+W
+W
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+a
+W
+c
+c
+c
+c
+c
+W
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+a
+W
+W
+c
+W
+c
+W
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(19,1,1) = {"
+a
+a
+a
+a
+W
+W
+W
+W
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}

maps/submaps/space_rocks/pois/tunnel1.dmm

@@ -0,0 +1,251 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/template_noop)
+"b" = (
+/turf/simulated/floor/airless,
+/area/submap/space_rocks/tunnel1)
+"k" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/tunnel1)
+"l" = (
+/turf/simulated/wall,
+/area/submap/space_rocks/tunnel1)
+"x" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/tunnel1)
+"L" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/submap/space_rocks/tunnel1)
+"Z" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/tunnel1)
+
+(1,1,1) = {"
+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
+"}
+(3,1,1) = {"
+L
+l
+L
+L
+L
+L
+l
+x
+L
+L
+L
+L
+l
+x
+x
+L
+L
+L
+l
+L
+"}
+(4,1,1) = {"
+L
+b
+L
+L
+Z
+L
+b
+x
+x
+L
+L
+x
+b
+L
+x
+x
+x
+x
+b
+L
+"}
+(5,1,1) = {"
+x
+b
+b
+x
+k
+x
+b
+b
+x
+x
+x
+x
+b
+b
+x
+x
+L
+x
+b
+b
+"}
+(6,1,1) = {"
+x
+b
+b
+x
+x
+x
+b
+b
+x
+x
+x
+x
+b
+b
+x
+Z
+k
+x
+b
+b
+"}
+(7,1,1) = {"
+L
+b
+L
+k
+x
+L
+b
+x
+x
+x
+x
+x
+b
+x
+x
+L
+x
+x
+b
+L
+"}
+(8,1,1) = {"
+L
+l
+x
+x
+L
+L
+l
+L
+x
+x
+L
+L
+l
+L
+L
+L
+L
+L
+l
+L
+"}
+(9,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}

maps/submaps/space_rocks/pois/tunnel2.dmm

@@ -0,0 +1,275 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/template_noop)
+"f" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/floor/airless,
+/area/submap/space_rocks/tunnel2)
+"i" = (
+/turf/simulated/floor/airless,
+/area/submap/space_rocks/tunnel2)
+"l" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/tunnel2)
+"q" = (
+/turf/simulated/wall,
+/area/submap/space_rocks/tunnel2)
+"z" = (
+/obj/tether_away_spawner/asteroidbaddies,
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/tunnel2)
+"C" = (
+/turf/simulated/mineral/floor/vacuum{
+	ignore_cavegen = 1
+	},
+/area/submap/space_rocks/tunnel2)
+"L" = (
+/turf/simulated/mineral/vacuum/sdmine,
+/area/submap/space_rocks/tunnel2)
+
+(1,1,1) = {"
+a
+a
+L
+L
+C
+C
+L
+L
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+q
+i
+i
+i
+i
+q
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+L
+C
+f
+i
+L
+L
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+L
+C
+C
+C
+L
+L
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+L
+C
+C
+C
+L
+L
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+L
+L
+L
+C
+l
+L
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+q
+i
+i
+i
+i
+q
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+L
+C
+i
+i
+L
+L
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+L
+C
+C
+C
+C
+L
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+C
+C
+C
+C
+L
+L
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+C
+C
+C
+C
+C
+L
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+L
+C
+C
+L
+C
+L
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+q
+i
+i
+i
+i
+q
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+L
+L
+i
+i
+L
+L
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+L
+L
+C
+C
+C
+L
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+L
+l
+C
+C
+C
+L
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+L
+z
+C
+C
+C
+L
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+L
+L
+L
+C
+C
+L
+a
+a
+"}
+(19,1,1) = {"
+a
+a
+q
+i
+i
+i
+i
+q
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+L
+L
+i
+i
+L
+L
+a
+a
+"}

maps/submaps/space_rocks/space_rocks.dm

@@ -0,0 +1,88 @@
+/turf/simulated/mineral/vacuum/sdmine/make_ore(var/rare_ore)
+	if(mineral)
+		return
+	var/mineral_name
+	if(rare_ore)
+		mineral_name = pickweight(list(
+			"marble" = 3,
+			"uranium" = 10,
+			"platinum" = 10,
+			"hematite" = 20,
+			"carbon" = 5,
+			"diamond" = 1,
+			"gold" = 8,
+			"silver" = 8,
+			"phoron" = 18,
+			"lead" = 2,
+			"verdantium" = 1))
+	else
+		mineral_name = pickweight(list(
+			"marble" = 2,
+			"uranium" = 5,
+			"platinum" = 5,
+			"hematite" = 35,
+			"carbon" = 5,
+			"gold" = 3,
+			"silver" = 3,
+			"phoron" = 25,
+			"lead" = 1))
+
+	if(mineral_name && (mineral_name in GLOB.ore_data))
+		mineral = GLOB.ore_data[mineral_name]
+		UpdateMineral()
+	update_icon()
+
+/datum/random_map/noise/ore/spacerocks
+	descriptor = "asteroid field ore distribution map"
+	deep_val = 0.2
+	rare_val = 0.1
+
+/datum/random_map/noise/ore/spacerocks/check_map_sanity()
+	return 1 //Totally random, but probably beneficial.
+
+/area/sdmine/
+	ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
+	base_turf = /turf/simulated/mineral/floor/vacuum
+/area/sdmine/unexplored
+	name = "asteroid field"
+	icon_state = "unexplored"
+/area/sdmine/explored
+	name = "asteroid field"
+	icon_state = "explored"
+
+
+/obj/effect/overmap/visitable/sector/virgo3b/generate_skybox(zlevel)
+	var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small")
+
+	if(zlevel == Z_LEVEL_SPACE_ROCKS)
+		return smallone
+
+/////LANDING LANDMARKS
+/obj/effect/shuttle_landmark/premade/spacerocks/center
+	name = "asteroid field center"
+	landmark_tag = "sr-c"
+
+/obj/effect/shuttle_landmark/premade/spacerocks/north
+	name = "asteroid field north"
+	landmark_tag = "sr-n"
+
+/obj/effect/shuttle_landmark/premade/spacerocks/south
+	name = "asteroid field south"
+	landmark_tag = "sr-s"
+
+/obj/tether_away_spawner/asteroidbaddies
+	name = "Asteroid Mob Spawner"
+	faction = "space_rock"
+	atmos_comp = TRUE
+	prob_spawn = 100
+	prob_fall = 40
+	//guard = 20
+	mobs_to_pick_from = list(
+		/mob/living/simple_mob/animal/space/bats = 5, 
+		/mob/living/simple_mob/vore/alienanimals/space_jellyfish = 10, 
+		/mob/living/simple_mob/vore/alienanimals/startreader = 10,
+		/mob/living/simple_mob/vore/alienanimals/space_ghost = 3,
+		/mob/living/simple_mob/vore/oregrub = 1,
+		/obj/tether_away_spawner/debrisfield/carp = 2,
+		/obj/tether_away_spawner/debrisfield/carp/hard = 1
+	)

maps/submaps/space_rocks/space_rocks_pois.dm

@@ -0,0 +1,96 @@
+#if MAP_TEST
+#include "bittynest1.dmm"
+#include "bittynest2.dmm"
+#include "bittynest3.dmm"
+#include "bittynest4.dmm"
+#include "clearing.dmm"
+#include "seventemple.dmm"
+#include "spacecrystals.dmm"
+#include "tunnel1.dmm"
+#include "tunnel2.dmm"
+#endif
+
+/area/submap/space_rocks
+	name = "POI - Space Rocks"
+	ambience = AMBIENCE_FOREBODING
+
+/area/submap/space_rocks/bittynest1
+	name = "POI - Bittynest1"
+
+/datum/map_template/space_rocks/bittynest1
+	name = "Bittynest1"
+	desc = "A smol nest for smol badguys"
+	mappath = 'pois/bittynest1.dmm'
+	cost = 5
+
+/area/submap/space_rocks/bittynest2
+	name = "POI - Bittynest2"
+
+/datum/map_template/space_rocks/bittynest2
+	name = "Bittynest2"
+	desc = "A smol nest for smol badguys"
+	mappath = 'pois/bittynest2.dmm'
+	cost = 5
+
+/area/submap/space_rocks/bittynest3
+	name = "POI - Bittynest3"
+
+/datum/map_template/space_rocks/bittynest3
+	name = "Bittynest3"
+	desc = "A smol nest for smol badguys"
+	mappath = 'pois/bittynest3.dmm'
+	cost = 5
+
+/area/submap/space_rocks/bittynest4
+	name = "POI - Bittynest4"
+
+/datum/map_template/space_rocks/bittynest4
+	name = "Bittynest4"
+	desc = "A smol nest for smol badguys"
+	mappath = 'pois/bittynest4.dmm'
+	cost = 5
+
+/area/submap/space_rocks/tunnel1
+	name = "POI - Tunnel1"
+
+/datum/map_template/space_rocks/tunnel1
+	name = "Tunnel1"
+	desc = "A tunnel left behind!"
+	mappath = 'pois/tunnel1.dmm'
+	cost = 10
+
+/area/submap/space_rocks/tunnel2
+	name = "POI - Tunnel2"
+
+/datum/map_template/space_rocks/tunnel2
+	name = "Tunnel2"
+	desc = "A tunnel left behind!"
+	mappath = 'pois/tunnel2.dmm'
+	cost = 10
+
+/area/submap/space_rocks/spacecrystals
+	name = "POI - Space Crystals"
+
+/datum/map_template/space_rocks/tunnel2
+	name = "Space Crystals"
+	desc = "Some crystals living in space!"
+	mappath = 'pois/spacecrystals.dmm'
+	cost = 10
+
+/area/submap/space_rocks/clearing
+	name = "POI - Clearing"
+
+/datum/map_template/space_rocks/clearing
+	name = "Clearing"
+	desc = "A clear spot for mischief to happen."
+	mappath = 'pois/clearing.dmm'
+	cost = 10
+
+/area/submap/space_rocks/seventemple
+	name = "POI - Temple of the Seven"
+
+/datum/map_template/space_rocks/seventemple
+	name = "Temple of the Seven"
+	desc = "A mysterious space!"
+	mappath = 'pois/seventemple.dmm'
+	cost = 25

maps/tether/submaps/underdark_pois/underdark_things.dm

@@ -81,193 +81,6 @@
 		/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(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult),
-				prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser),
-				prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged),
-				prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
-				)
-
 //POI STUFF
 VIRGO3B_TURF_CREATE(/turf/simulated/mineral/ignore_oregen)
 VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor/ignore_oregen)

vorestation.dme

@@ -2954,6 +2954,9 @@
 #include "code\modules\mob\living\simple_mob\taming.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\catslug.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\jellyfish.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\spookyghost.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\startreader.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\teppi.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\borer\borer.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\borer\borer_captive.dm"
@@ -4084,6 +4087,7 @@
 #include "maps\submaps\engine_submaps\engine.dm"
 #include "maps\submaps\engine_submaps\engine_areas.dm"
 #include "maps\submaps\engine_submaps_vr\tether\_engine_submaps.dm"
+#include "maps\submaps\space_rocks\space_rocks_pois.dm"
 #include "maps\submaps\space_submaps\space.dm"
 #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"