stuff

ffuts

maps/perseverance/XIV_areas.dm

@@ -295,7 +295,7 @@ area/ship/perseverance/bridge/bluespacedrive
 	name = "\improper Perseverance Bluespace Drive"
 	icon_state = "engineering"
 	color = COLOR_BLUE_LIGHT
-	req_access = list(access_XIV, access_engine, access_bridge)
+	req_access = list(access_XIV, access_engine, access_tcomsat)
 
 /area/ship/perseverance/hall/bsport
 	name = "\improper Perseverance Port Bluespace Drive Access"
@@ -322,7 +322,7 @@ area/ship/perseverance/sec/bot/saft
 	icon_state = "asmaint"
 
 area/ship/perseverance/sec/bot/pstore
-	name = "Perseverance Port Engineering Storage Room"
+	name = "Perseverance Waste Disposal"
 	icon_state = "pmaint"
 
 area/ship/perseverance/sec/bot/sstore

maps/perseverance/XIV_define.dm

@@ -10,7 +10,7 @@
 	station_short = "Perseverance"
 
 	dock_name     = "STNDRD"
-	boss_name     = "Xion Headquarters"
+	boss_name     = "Headquarters"
 	boss_short    = "HQ"
 	company_name  = "Xion Industries"
 	company_short = "Xion"
@@ -35,7 +35,7 @@
 	shuttle_recall_message = "Attention all hands: Jump sequence aborted, return to normal operating conditions."
 
 	use_overmap = 1
-	num_exoplanets = 1
+	num_exoplanets = 0
 	away_site_budget = 3
 	welcome_sound = 'sound/AI/welcome.ogg'
 

maps/perseverance/XIV_map_templates.dm

@@ -1,3 +1,2 @@
 #include "../random_ruins/exoplanet_ruins/ec_old_crash/ec_old_crash.dm"
-#include "../random_ruins/exoplanet_ruins/playablecolony/playablecolony.dm"
-#include "../random_ruins/exoplanet_ruins/playablecolony2/playablecolony2.dm"
+#include "../random_ruins/exoplanet_ruins/playablecolony/playablecolony.dm"

maps/perseverance/XIV_overmap.dm

@@ -8,21 +8,21 @@
 
 	initial_restricted_waypoints = list(
 		"Chimera" = list("nav_dock_mining"),	//can't have random shuttles popping inside the docking area
-		"Marshal" = list ("nav_dock_cargo")
+		"Marshal" = list("nav_dock_cargo"),
+		"Dagger"  = list("nav_dock_scout")
 	)
 
 	initial_generic_waypoints = list(
 		//everyone can come here
-		"nav_bottom_fore",
-		"nav_bottom_aft"
+		"nav_bottom_fore"
 	)
 
 /obj/effect/overmap/visitable/ship/landable/mining
 	name = "XIV Chimera"
 	desc = "An outdated configuration of the VTA-5 short range mining shuttle. Exterior writing reads 'XIV Chimera'. No transponder signal detected."
 	shuttle = "Chimera"
 	max_speed = 1/(1 SECONDS)
-	burn_delay = 3 SECONDS
+	burn_delay = 6 SECONDS
 	vessel_mass = 5000
 	fore_dir = WEST
 	skill_needed = SKILL_BASIC
@@ -33,8 +33,19 @@
 	desc = "A V-65 Ox long distance cargo shuttle. Exterior writing reads 'XIV Marshal'. No transponder signal detected."
 	shuttle = "Marshal"
 	max_speed = 1/(1 SECONDS)
-	burn_delay = 2 SECONDS
+	burn_delay = 4 SECONDS
 	vessel_mass = 6000
 	fore_dir = WEST
 	skill_needed = SKILL_BASIC
+	vessel_size = SHIP_SIZE_SMALL
+
+/obj/effect/overmap/visitable/ship/landable/scout
+	name = "SFV Dagger"
+	desc = "An unclassified shuttle belonging to the Sol Central Government Fleet. Exterior writing reads 'SFV Dagger'. No transponder signal detected."
+	shuttle = "Dagger"
+	max_speed = 2/(1 SECONDS)
+	burn_delay = 2 SECONDS
+	vessel_mass = 10000
+	fore_dir = EAST
+	skill_needed = SKILL_ADEPT
 	vessel_size = SHIP_SIZE_SMALL

maps/perseverance/XIV_shuttles.dm

@@ -62,12 +62,39 @@
 	name = "In Transit"
 	landmark_tag = "nav_transit_cargo"
 
+//Dagger
+
+/datum/shuttle/autodock/overmap/scout
+	name = "Dagger"
+	move_time = 30
+	shuttle_area = list(/area/shuttle/perseverance/scouting)
+	dock_target = "dagger_docking_controller"
+	current_location = "nav_dock_scout"
+	landmark_transition = "nav_transit_scout"
+	range = 0
+	warmup_time = 10
+	logging_home_tag = "nav_dock_scout"
+	logging_access = access_XIV
+	ceiling_type = /turf/simulated/floor/shuttle_ceiling/dark
+
+/obj/machinery/computer/shuttle_control/explore/scout
+	name = "shuttle control console"
+	shuttle_tag = "Dagger"
+	req_access = list(access_bridge)
+
+/obj/effect/shuttle_landmark/perseverance/dock/scout
+	name = "Dagger Dock"
+	landmark_tag = "nav_dock_scout"
+	docking_controller = "dagger_shuttle_dock"
+	base_area = /area/space
+	base_turf = /turf/space
+
+/obj/effect/shuttle_landmark/perseverance/transit/scout
+	name = "In Transit"
+	landmark_tag = "nav_transit_scout"
+
 //generic landmarks
 
 /obj/effect/shuttle_landmark/perseverance/bottom/fore
 	name = "Space north of the bottom deck"
-	landmark_tag = "nav_bottom_fore"
-
-/obj/effect/shuttle_landmark/perseverance/bottom/aft
-	name = "Space south of the bottom deck"
-	landmark_tag = "nav_bottom_aft"
+	landmark_tag = "nav_bottom_fore"

maps/perseverance/code/XIV_minor.dm

@@ -153,14 +153,22 @@
 /obj/structure/wall_frame/orange
 	paint_color = COLOR_DARK_ORANGE
 
+/obj/structure/wall_frame/titanium/prepainted
+	paint_color = COLOR_GUNMETAL
+
+/obj/effect/wallframe_spawn/titanium/prepainted
+	name = "white reinforced wall frame window spawner"
+	icon_state = "r-wingrille"
+	frame_path = /obj/structure/wall_frame/titanium/prepainted
+
 // For the fuel bay
 
 /obj/effect/wallframe_spawn/reinforced/orange
 	name = "white reinforced wall frame window spawner"
 	icon_state = "r-wingrille"
 	frame_path = /obj/structure/wall_frame/orange
 
-// Setting these two up as hull should make them do the special space-facing decay effet. Addendum: it does! It actually does! Seems to work on area check
+// Setting these two up as hull should make them do the special space-facing decay effet. Addendum: no effect on wallframes
 /obj/effect/wallframe_spawn/reinforced/hull/white
 	name = "white reinforced wall frame window spawner"
 	icon_state = "r-wingrille"
@@ -180,6 +188,9 @@
 /turf/simulated/wall/titanium/hull
 	paint_color = COLOR_HULL
 
+/turf/simulated/wall/r_titanium/black
+	paint_color = COLOR_GUNMETAL
+
 /turf/simulated/wall/titanium/orange
 	paint_color = COLOR_DARK_ORANGE
 
@@ -201,6 +212,9 @@
 /obj/structure/closet/secure_closet/freezer/kitchen/XIV
 	req_access = list()
 
+/turf/simulated/floor/shuttle_ceiling/dark
+	color = COLOR_GUNMETAL
+
 /obj/structure/closet/secure_closet/freezer/empty
 	name = "refrigerator"
 	icon = 'icons/obj/closets/fridge.dmi'
@@ -293,7 +307,7 @@
 	icon = 'maps/perseverance/icons/obj/tanks.dmi'
 	icon_state = "emergency_double_blue"
 
-//The editor is annoying, I'm not using it anymore, dont really think doing this will cause many issues
+//Should be removed at some point, but it works and should not cause any trouble
 
 obj/machinery/conveyor/XIV/shuttletosci
 	id = "shuttletosci"
@@ -312,7 +326,7 @@ obj/machinery/atmospherics/unary/outlet_injector/waste
 	icon_state = "on"
 	use_power = 1
 
-/mob/Check_Dense_Object() //this is from mob_movement.dm, there's a bug where open spaces are not checked so magboots treat them as solid objects they can grip. That's a nope from me.
+/mob/Check_Dense_Object() //this is from mob_movement.dm, there's a bug where open spaces are not checked so magboots treat them as solid objects they can grip. That's a nope from me, time to override
 
 	var/shoegrip = Check_Shoegrip()
 
@@ -363,6 +377,7 @@ obj/machinery/atmospherics/unary/outlet_injector/waste
 	if(prob(40))
 		new /obj/item/clothing/head/hardhat(src)
 
+//uses New() instead of Initialize(), and it does not work (except in the Torch map, somehow). Well, this fixes it.
 /turf/space/transit/east/Initialize()
 	..()
 	if(!phase_shift_by_y)
@@ -372,3 +387,22 @@ obj/machinery/atmospherics/unary/outlet_injector/waste
 	var/transit_state = (world.maxx - src.x + y_shift)%15 + 1
 
 	icon_state = "speedspace_ew_[transit_state]"
+
+//let's make railings a bit better, shall we? This is badly done, by the way, problably more efficient ways to do this.
+/obj/structure/railing/on_update_icon(var/update_neighbors = TRUE)
+	. = ..()
+
+	if (dir == 2)
+		layer = ABOVE_HUMAN_LAYER
+	else
+		layer = OBJ_LAYER
+
+/obj/structure/railing/do_climb(var/mob/living/user)
+	. = ..()
+	layer_shift()
+
+/obj/structure/railing/proc/layer_shift()
+	if (layer == ABOVE_HUMAN_LAYER)
+		layer = OBJ_LAYER
+		sleep (1.5)
+		layer = ABOVE_HUMAN_LAYER