Merge pull request #1268 from Yawn-Wider/izac

Voreupdate [MDB IGNORE] [IDB IGNORE]

code/game/machinery/computer/message.dm

@@ -69,11 +69,15 @@
 	..()
 
 /obj/machinery/computer/message_monitor/Initialize()
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/message_monitor/LateInitialize()
+	. = ..()
 	//Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
 	if(!linkedServer)
 		if(message_servers && message_servers.len > 0)
 			linkedServer = message_servers[1]
-	return ..()
 
 /obj/machinery/computer/message_monitor/tgui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)

code/modules/holodeck/HolodeckControl.dm

@@ -67,13 +67,13 @@
 	"Gym"				= new/datum/holodeck_program(/area/holodeck/source_gym), //VOREStation add
 	"Game Room"			= new/datum/holodeck_program(/area/holodeck/source_game_room), //VOREStation add
 	"Patient Ward"		= new/datum/holodeck_program(/area/holodeck/source_patient_ward), //VOREStation add
+	"Inside"			= new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add
 	"Turn Off" 			= new/datum/holodeck_program(/area/holodeck/source_plating, list())
 	)
 
 	var/list/restricted_programs = list(
 	"Burnoff Test Simulation"	= new/datum/holodeck_program(/area/holodeck/source_burntest, list()),
-	"Wildlife Simulation" 		= new/datum/holodeck_program(/area/holodeck/source_wildlife, list()),
-	"Inside"					= new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add
+	"Wildlife Simulation" 		= new/datum/holodeck_program(/area/holodeck/source_wildlife, list())
 	)
 
 /obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob)

code/modules/mob/living/carbon/human/life.dm

@@ -584,7 +584,7 @@
 				to_chat(src, "<span class='danger'>You feel your face burning and a searing heat in your lungs!</span>")
 
 		if(breath.temperature >= species.heat_discomfort_level)
-		
+
 			if(breath.temperature >= species.breath_heat_level_3)
 				apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, BP_HEAD, used_weapon = "Excessive Heat")
 				throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_MAX)
@@ -1408,12 +1408,10 @@
 		if(istype(rig) && rig.visor && !looking_elsewhere)
 			if(!rig.helmet || (head && rig.helmet == head))
 				if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses)
-					glasses_processed = 1
-					process_glasses(rig.visor.vision.glasses)
+					glasses_processed = process_glasses(rig.visor.vision.glasses)
 
 		if(glasses && !glasses_processed && !looking_elsewhere)
-			glasses_processed = 1
-			process_glasses(glasses)
+			glasses_processed = process_glasses(glasses)
 		if(XRAY in mutations)
 			sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 			see_in_dark = 8
@@ -1423,6 +1421,15 @@
 			if(!isnull(M.vision_flags))
 				sight |= M.vision_flags
 
+		if(!glasses_processed && nif)
+			var/datum/nifsoft/vision_soft
+			for(var/datum/nifsoft/NS in nif.nifsofts)
+				if(NS.vision_exclusive && NS.active)
+					vision_soft = NS
+					break
+			if(vision_soft)
+				glasses_processed = process_nifsoft_vision(vision_soft)		//not really glasses but equitable
+
 		if(!glasses_processed && (species.get_vision_flags(src) > 0))
 			sight |= species.get_vision_flags(src)
 		if(!seer && !glasses_processed && seedarkness)
@@ -1451,20 +1458,35 @@
 	return 1
 
 /mob/living/carbon/human/proc/process_glasses(var/obj/item/clothing/glasses/G)
+	. = FALSE
 	if(G && G.active)
-		see_in_dark += G.darkness_view
+		if(G.darkness_view)
+			see_in_dark += G.darkness_view
+			. = TRUE
 		if(G.overlay && client)
 			client.screen |= G.overlay
 		if(G.vision_flags)
 			sight |= G.vision_flags
+			. = TRUE
 		if(istype(G,/obj/item/clothing/glasses/night) && !seer)
 			see_invisible = SEE_INVISIBLE_MINIMUM
 
 		if(G.see_invisible >= 0)
 			see_invisible = G.see_invisible
+			. = TRUE
 		else if(!druggy && !seer)
 			see_invisible = see_invisible_default
 
+/mob/living/carbon/human/proc/process_nifsoft_vision(var/datum/nifsoft/NS)
+	. = FALSE
+	if(NS && NS.active)
+		if(NS.darkness_view)
+			see_in_dark += NS.darkness_view
+			. = TRUE
+		if(NS.vision_flags_mob)
+			sight |= NS.vision_flags_mob
+			. = TRUE
+
 /mob/living/carbon/human/handle_random_events()
 	if(inStasisNow())
 		return

code/modules/nifsoft/nifsoft.dm

@@ -35,8 +35,13 @@
 	var/combat_flags = 0	// Otherwise use set_flag/clear_flag in one of your own procs for tricks
 	var/other_flags = 0
 
+	var/vision_flags_mob = 0
+	var/darkness_view = 0
+
 	var/list/planes_enabled = null	// List of vision planes this nifsoft enables when active
 
+	var/vision_exclusive = FALSE	//Whether or not this NIFSoft provides exclusive vision modifier
+
 	var/list/incompatible_with = null // List of NIFSofts that are disabled when this one is enabled
 
 //Constructor accepts the NIF it's being loaded into
@@ -99,6 +104,11 @@
 		nif.set_flag(combat_flags,NIF_FLAGS_COMBAT)
 		nif.set_flag(other_flags,NIF_FLAGS_OTHER)
 
+		if(vision_exclusive)
+			var/mob/living/carbon/human/H = nif.human
+			if(H && istype(H))
+				H.recalculate_vis()
+
 	return nif_result
 
 //Called when attempting to deactivate an implant
@@ -122,6 +132,11 @@
 		nif.clear_flag(combat_flags,NIF_FLAGS_COMBAT)
 		nif.clear_flag(other_flags,NIF_FLAGS_OTHER)
 
+		if(vision_exclusive)
+			var/mob/living/carbon/human/H = nif.human
+			if(H && istype(H))
+				H.recalculate_vis()
+
 	return nif_result
 
 //Called when an implant expires
@@ -215,7 +230,7 @@
 			qdel(src)
 		else
 			new stored_organic(Ht.nif,extra)
-			qdel(src)		
+			qdel(src)
 	else
 		icon_state = "[initial(icon_state)]"	//If it fails to apply to a valid target and doesn't get deleted, reset its icon state
 		update_icon()
@@ -348,7 +363,7 @@
 
 /datum/nifsoft/package/mining
 	software = list(/datum/nifsoft/material,/datum/nifsoft/spare_breath)
-	
+
 /datum/nifsoft/package/mining_synth
 	software = list(/datum/nifsoft/material,/datum/nifsoft/pressure,/datum/nifsoft/heatsinks)
 

code/modules/nifsoft/software/01_vision.dm

@@ -104,14 +104,9 @@
 	tick_flags = NIF_ACTIVETICK
 	planes_enabled = list(VIS_FULLBRIGHT, VIS_MESONS)
 	vision_flags = (NIF_V_MESONS)
+	vision_flags_mob = SEE_TURFS
 	incompatible_with = list(NIF_MATERIAL,NIF_THERMALS,NIF_NIGHTVIS)
-
-/datum/nifsoft/mesons/life()
-	if((. = ..()))
-		var/mob/living/carbon/human/H = nif.human
-		H.sight |= SEE_TURFS
-		if(H.client)
-			H.client.screen |= global_hud.meson
+	vision_exclusive = TRUE
 
 /datum/nifsoft/material
 	name = "Material Scanner"
@@ -123,14 +118,9 @@
 	tick_flags = NIF_ACTIVETICK
 	planes_enabled = list(VIS_FULLBRIGHT)
 	vision_flags = (NIF_V_MATERIAL)
+	vision_flags_mob = SEE_OBJS
 	incompatible_with = list(NIF_MESONS,NIF_THERMALS,NIF_NIGHTVIS)
-
-/datum/nifsoft/material/life()
-	if((. = ..()))
-		var/mob/living/carbon/human/H = nif.human
-		H.sight |= SEE_OBJS
-		if(H.client)
-			H.client.screen |= global_hud.material
+	vision_exclusive = TRUE
 
 /datum/nifsoft/thermals
 	name = "Thermal Scanner"
@@ -143,14 +133,9 @@
 	tick_flags = NIF_ACTIVETICK
 	planes_enabled = list(VIS_FULLBRIGHT, VIS_CLOAKED)
 	vision_flags = (NIF_V_THERMALS)
+	vision_flags_mob = SEE_MOBS
 	incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_NIGHTVIS)
-
-/datum/nifsoft/thermals/life()
-	if((. = ..()))
-		var/mob/living/carbon/human/H = nif.human
-		H.sight |= SEE_MOBS
-		if(H.client)
-			H.client.screen |= global_hud.thermal
+	vision_exclusive = TRUE
 
 /datum/nifsoft/nightvis
 	name = "Low-Light Amp"
@@ -162,11 +147,6 @@
 	tick_flags = NIF_ACTIVETICK
 	planes_enabled = list(VIS_FULLBRIGHT)
 	vision_flags = (NIF_V_NIGHTVIS)
+	darkness_view = 7
 	incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_THERMALS)
-
-/datum/nifsoft/nightvis/life()
-	if((. = ..()))
-		var/mob/living/carbon/human/H = nif.human
-		H.see_in_dark += 7
-		if(H.client)
-			H.client.screen |= global_hud.nvg
+	vision_exclusive = TRUE

code/modules/planet/virgo3c_vr.dm

@@ -53,7 +53,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 	var/min = 0
 
 	switch(sun_position)
-		if(0 to 0.475) // Night
+		if(0 to 0.3) // Night
 			low_brightness = 0.3
 			low_color = "#000066"
 
@@ -61,7 +61,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#66004D"
 			min = 0
 
-		if(0.475 to 0.50) // Twilight
+		if(0.3 to 0.35) // Twilight
 			low_brightness = 0.5
 			low_color = "#66004D"
 
@@ -69,7 +69,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#CC3300"
 			min = 0.40
 
-		if(0.50 to 0.525) // Sunrise/set
+		if(0.35 to 0.45) // Sunrise/set
 			low_brightness = 0.9
 			low_color = "#CC3300"
 
@@ -77,7 +77,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#FF9933"
 			min = 0.50
 
-		if(0.525 to 1.00) // Noon
+		if(0.45 to 1.00) // Noon
 			low_brightness = 3.0
 			low_color = "#DDDDDD"
 

code/modules/xenobio/items/slimepotions_vr.dm

@@ -164,6 +164,8 @@
 	to_chat(user, "<span class='notice'>You feed \the [M] the agent. It may now eventually develop proper sapience.</span>")
 	M.ghostjoin = 1
 	active_ghost_pods |= M
+	if(!M.vore_active)
+		M.verbs += /mob/living/simple_mob/proc/animal_nom
 	M.ghostjoin_icon()
 	log_and_message_admins("[key_name_admin(user)] used a sapience potion on a simple mob: [M]. [ADMIN_FLW(src)]")
 	playsound(src, 'sound/effects/bubbles.ogg', 50, 1)

maps/groundbase/gb-z3.dmm

@@ -4517,8 +4517,8 @@ Zo
 Zo
 Zo
 Zo
-Kr
-Kr
+QD
+QD
 Zo
 Zo
 Zo
@@ -8436,7 +8436,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -8578,7 +8578,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -8720,7 +8720,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -8862,7 +8862,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -9004,7 +9004,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -9146,7 +9146,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -9288,7 +9288,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -11163,7 +11163,7 @@ Zo
 Zo
 Zo
 Zo
-QD
+Zo
 QD
 QD
 QD
@@ -11297,11 +11297,12 @@ Zo
 Zo
 Zo
 Zo
+vs
 Kr
-Kr
-Kr
-Kr
+vs
+vs
 Zo
+vs
 Kr
 Kr
 Kr
@@ -11325,7 +11326,6 @@ QD
 QD
 QD
 QD
-QD
 Kr
 Kr
 Kr
@@ -11447,7 +11447,7 @@ Kr
 Kr
 Kr
 Kr
-QD
+Kr
 QD
 QD
 QD

maps/groundbase/groundbase_areas.dm

@@ -112,7 +112,7 @@
 /area/groundbase/science/rnd
 	name = "Research and Development"
 /area/groundbase/science/robotics
-	name = "Rocotics"
+	name = "Robotics"
 /area/groundbase/science/server
 	name = "Science Server Room"
 /area/groundbase/science/rd
@@ -370,6 +370,14 @@
 /area/groundbase/civilian/gameroom
 	name = "Gamatorium"
 	sound_env = SMALL_SOFTFLOOR
+/area/groundbase/civilian/mensrestroom
+	name = "Men's Restroom"
+	sound_env = SOUND_ENVIRONMENT_BATHROOM
+	lightswitch = 1
+/area/groundbase/civilian/womensrestroom
+	name = "Women's Restroom"
+	sound_env = SOUND_ENVIRONMENT_BATHROOM
+	lightswitch = 1
 
 /area/groundbase/exploration
 	name = "Exploration"

maps/groundbase/pois/outdoors4.dmm

@@ -31,7 +31,7 @@
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "l" = (
-/obj/structure/bed/chair/sofa/right{
+/obj/structure/bed/chair/sofa/right/black{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -54,7 +54,7 @@
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "K" = (
-/obj/structure/bed/chair/sofa/left,
+/obj/structure/bed/chair/sofa/left/black,
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "O" = (
@@ -75,7 +75,7 @@
 /turf/simulated/wall/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "Z" = (
-/obj/structure/bed/chair/sofa/corner{
+/obj/structure/bed/chair/sofa/corner/black{
 	dir = 1
 	},
 /turf/simulated/floor/wood,

maps/groundbase/pois/outdoors5.dmm

@@ -50,11 +50,11 @@
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin2)
 "L" = (
-/obj/structure/bed/chair/sofa/right,
+/obj/structure/bed/chair/sofa/right/black,
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin2)
 "O" = (
-/obj/structure/bed/chair/sofa/left,
+/obj/structure/bed/chair/sofa/left/black,
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin2)
 "T" = (

maps/stellardelight/ship_centcom.dmm

@@ -5148,13 +5148,13 @@
 /turf/unsimulated/floor/techfloor_grid,
 /area/centcom/evac)
 "uC" = (
-/obj/machinery/computer/shuttle_control/emergency{
-	dir = 8
-	},
 /obj/machinery/light/floortube{
 	dir = 4;
 	pixel_x = 6
 	},
+/obj/machinery/computer{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/centcom/terminal)
 "uD" = (
@@ -5209,8 +5209,8 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "uT" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
+/obj/machinery/ion_engine{
+	dir = 4
 	},
 /turf/simulated/shuttle/plating,
 /area/centcom/terminal)
@@ -6662,6 +6662,16 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/centcom/terminal)
+"CP" = (
+/obj/machinery/door/airlock/angled_bay/external/glass{
+	dir = 4;
+	door_color = "#822a1e";
+	frequency = null;
+	id_tag = null;
+	locked = 1
+	},
+/turf/simulated/shuttle/floor/yellow,
+/area/centcom/terminal)
 "CR" = (
 /obj/machinery/porta_turret/crescent{
 	density = 1
@@ -20347,7 +20357,7 @@ dm
 dm
 wb
 wb
-dm
+CP
 wb
 wb
 dm

maps/stellardelight/ship_misc.dmm

@@ -2971,9 +2971,9 @@
 	},
 /area/holodeck/source_gym)
 "PL" = (
-/turf/simulated/floor/holofloor/reinforced,
-/turf/simulated/floor/flesh,
-/area/holodeck/the_uwu_zone)
+/turf/space,
+/turf/space,
+/area/space)
 "PM" = (
 /turf/simulated/floor/smole/megablocks,
 /area/holodeck/source_smoleworld)
@@ -10567,16 +10567,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -10709,16 +10709,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -10851,16 +10851,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -10993,16 +10993,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11135,16 +11135,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11277,16 +11277,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11419,16 +11419,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11561,16 +11561,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11703,16 +11703,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11845,16 +11845,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -16815,16 +16815,16 @@ fz
 fz
 fS
 dB
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
 PL
-Ly
-Ly
-Ly
+ap
+ap
+ap
 PL
-Ly
+ap
 xp
 ap
 ap
@@ -16957,16 +16957,16 @@ ei
 ei
 fJ
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17099,16 +17099,16 @@ fJ
 fz
 fS
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17241,16 +17241,16 @@ fJ
 ei
 fT
 dB
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
 PL
-Ly
-Ly
-Ly
+ap
+ap
+ap
 PL
-Ly
+ap
 xp
 ap
 ap
@@ -17383,16 +17383,16 @@ fJ
 fA
 fU
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17525,16 +17525,16 @@ ei
 ei
 fJ
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17667,16 +17667,16 @@ fA
 fA
 fU
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17809,16 +17809,16 @@ bh
 aG
 aG
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17951,16 +17951,16 @@ dJ
 dK
 dK
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -18093,16 +18093,16 @@ dJ
 dJ
 dJ
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap

maps/tether/submaps/tether_centcom.dmm

@@ -4652,8 +4652,8 @@
 /turf/simulated/floor/tiled,
 /area/centcom/main_hall)
 "qV" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
+/obj/machinery/ion_engine{
+	dir = 4
 	},
 /turf/simulated/shuttle/plating,
 /area/centcom/terminal)
@@ -5769,7 +5769,7 @@
 /turf/simulated/floor/tiled/white,
 /area/centcom/bathroom)
 "xj" = (
-/obj/machinery/computer/shuttle_control/emergency{
+/obj/machinery/computer{
 	dir = 8
 	},
 /obj/machinery/light/floortube{
@@ -5955,6 +5955,16 @@
 /area/centcom/security{
 	name = "\improper CentCom Security Arrivals"
 	})
+"ya" = (
+/obj/machinery/door/airlock/angled_bay/external/glass{
+	dir = 4;
+	door_color = "#822a1e";
+	frequency = null;
+	id_tag = null;
+	locked = 1
+	},
+/turf/simulated/shuttle/floor/yellow,
+/area/centcom/terminal)
 "yb" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -20369,7 +20379,7 @@ XL
 XL
 Cg
 Cg
-XL
+ya
 Cg
 Cg
 XL

maps/tether/submaps/tether_misc.dmm

@@ -2619,9 +2619,6 @@
 "Az" = (
 /turf/unsimulated/beach/coastline,
 /area/beach)
-"Ba" = (
-/turf/simulated/floor/holofloor/reinforced,
-/area/holodeck/the_uwu_zone)
 "Bi" = (
 /obj/structure/table/woodentable/holotable,
 /obj/effect/landmark/costume/madscientist,
@@ -14254,11 +14251,11 @@ bN
 bN
 bN
 bN
-Ba
 bN
 bN
 bN
-Ba
+bN
+bN
 bN
 fZ
 ap
@@ -14680,11 +14677,11 @@ bN
 bN
 bN
 bN
-Ba
 bN
 bN
 bN
-Ba
+bN
+bN
 bN
 fZ
 ap

vorestation.dme

@@ -1267,6 +1267,7 @@
 #include "code\game\objects\items\stacks\nanopaste_vr.dm"
 #include "code\game\objects\items\stacks\sandbags.dm"
 #include "code\game\objects\items\stacks\stack.dm"
+#include "code\game\objects\items\stacks\stack_vr.dm"
 #include "code\game\objects\items\stacks\telecrystal.dm"
 #include "code\game\objects\items\stacks\tickets.dm"
 #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"