TGS Test Merge (#6298)

citadel.dme

@@ -955,6 +955,7 @@
 #include "code\game\area\Space Station 13 areas.dm"
 #include "code\game\area\ss13_deprecated_areas.dm"
 #include "code\game\area\Tether_areas.dm"
+#include "code\game\area\station\exporation.dm"
 #include "code\game\atoms\action_feedback.dm"
 #include "code\game\atoms\appearance.dm"
 #include "code\game\atoms\atom.dm"

code/game/area/Space Station 13 areas.dm

@@ -3553,52 +3553,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Telecommunications Power Control"
 	icon_state = "tcomsatwest"
 
-
-//Exploration areas
-/area/exploration
-	name = "\improper Exploration Foyer"
-	icon_state = "purple"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS
-
-/area/exploration/excursion_dock
-	name = "\improper Excursion Shuttle Dock"
-	icon_state = "hangar"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
-/area/exploration/courser_dock
-	name = "\improper Courser Shuttle Dock"
-	icon_state = "hangar"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
-/area/exploration/explorer_prep
-	name = "\improper Explorer Prep Room"
-	icon_state = "locker"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
-/area/exploration/pilot_prep
-	name = "\improper Pilot Prep Room"
-	icon_state = "locker"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
-/area/exploration/meeting
-	name = "\improper Explorer Meeting Room"
-	icon_state = "northeast"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE
-
-/area/exploration/showers
-	name = "\improper Explorer Showers"
-	icon_state = "restrooms"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE
-
-/area/exploration/medical
-	name = "\improper Exploration Med Station"
-	icon_state = "medbay"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
-/area/exploration/pathfinder_office
-	name = "\improper Pathfinder's Office"
-	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
 /area/station/protean_nanite_room
 	name = "\improper Nanite Chamber"
 	icon_state = "blue"

code/game/area/station/exporation.dm

@@ -0,0 +1,54 @@
+//Exploration areas
+/area/exploration
+	name = "\improper Exploration Foyer"
+	icon_state = "purple"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS
+
+/area/exploration/excursion_dock
+	name = "\improper Excursion Shuttle Dock"
+	icon_state = "hangar"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/exploration/courser_dock
+	name = "\improper Courser Shuttle Dock"
+	icon_state = "hangar"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/exploration/explorer_prep
+	name = "\improper Explorer Prep Room"
+	icon_state = "locker"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/exploration/medic_prep
+	name = "\improper Field Medic Prep Room"
+	icon_state = "locker"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/exploration/pilot_prep
+	name = "\improper Pilot Prep Room"
+	icon_state = "locker"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/exploration/pilot_Office
+	name = "\improper Pilot Office"
+	icon_state = "locker"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/exploration/meeting
+	name = "\improper Explorer Meeting Room"
+	icon_state = "northeast"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE
+
+/area/exploration/showers
+	name = "\improper Explorer Showers"
+	icon_state = "restrooms"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE
+
+/area/exploration/medical
+	name = "\improper Exploration Med Station"
+	icon_state = "medbay"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/exploration/pathfinder_office
+	name = "\improper Pathfinder's Office"
+	nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES

code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm

@@ -543,6 +543,17 @@
 		"research" = COLOR_PURPLE
 	)
 
+/singleton/closet_appearance/secure_closet/pilot
+	color = COLOR_CYAN_DARK
+	decals = list(
+		"lower_side_vent"
+	)
+	extra_decals = list(
+		"stripe_vertical_left_full" = COLOR_BLUE_LIGHT,
+		"stripe_vertical_right_full" = COLOR_BLUE_LIGHT,
+		"pilot" = COLOR_SUN
+	)
+
 /singleton/closet_appearance/secure_closet/rd
 	extra_decals = list(
 		"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,

code/game/objects/structures/crates_lockers/closets/secure/explorer.dm

@@ -77,10 +77,8 @@
 //Pilot Locker
 /obj/structure/closet/secure_closet/pilot
 	name = "pilot locker"
-	closet_appearance = /singleton/closet_appearance/secure_closet/expedition
+	closet_appearance = /singleton/closet_appearance/secure_closet/pilot
 	req_access = list(ACCESS_GENERAL_PILOT)
-
-/obj/structure/closet/secure_closet/pilot
 	starts_with = list(
 		/obj/item/storage/backpack/parachute,
 		/obj/item/storage/box/survival_knife,

code/modules/jobs/job_types/station/civillian/pilot.dm

@@ -7,11 +7,11 @@
 	department_flag = CIVILIAN
 	total_positions = 5
 	spawn_positions = 5
-	supervisors = "the Pathfinder and the Head of Personnel"
+	supervisors = "the Head of Personnel"
 	idtype = /obj/item/card/id/explorer/pilot
 	selection_color = "#515151"
 	minimal_player_age = 3
-	pto_type = PTO_EXPLORATION
+	pto_type = PTO_CIVILIAN
 	minimal_access = list(
 		ACCESS_GENERAL_PILOT,
 		ACCESS_ENGINEERING_AIRLOCK,

code/modules/overmap/legacy/sectors.dm

@@ -31,6 +31,8 @@
 
 	var/hide_from_reports = FALSE
 
+	var/sensors
+
 	var/has_distress_beacon
 	var/list/unowned_areas // areas we don't own despite them being present on our z
 

code/modules/overmap/legacy/ships/computers/sensors.dm

@@ -14,6 +14,23 @@
 	icon_screen = "adv_sensors_screen"
 	light_color = "#05A6A8"
 
+/obj/machinery/computer/ship/sensors/planet
+	name = "Sensor satelite uplink console"
+	var/planet_type = /obj/overmap/entity/visitable/sector/lythios43c
+
+/obj/machinery/computer/ship/sensors/planet/Initialize(mapload)
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/ship/sensors/planet/LateInitialize()
+	. = ..()
+	var/area/overmap/map = locate() in world
+	for(var/obj/overmap/entity/visitable/sector/S in map)
+		if(istype(S,planet_type))
+			linked = S
+			src.sensors = linked.sensors//Late init to be sure that the sensors have been set on the planet
+			break
+
 /obj/machinery/computer/ship/sensors/attempt_hook_up(obj/overmap/entity/visitable/ship/sector)
 	if(!(. = ..()))
 		return
@@ -150,6 +167,7 @@
 	var/range = 1
 
 	idle_power_usage = 5000
+	var/heat_factor = 1
 
 /obj/machinery/shipsensors/attackby(obj/item/W, mob/user)
 	var/damage = max_health - health
@@ -223,7 +241,7 @@
 
 			take_damage_legacy(rand(10,50))
 			toggle()
-		heat += idle_power_usage/15000
+		heat += (idle_power_usage/15000) * heat_factor
 
 	if (heat > 0)
 		heat = max(0, heat - heat_reduction)
@@ -254,3 +272,20 @@
 /obj/machinery/shipsensors/weak
 	heat_reduction = 0.2
 	desc = "Miniturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements."
+
+/obj/machinery/shipsensors/uplink
+	name = "sensors uplink"
+	desc = "A high power uplink, connecting to a satelite with a high power sensor array and a sophisticated cooling system."
+	var/planet_type = /obj/overmap/entity/visitable/sector/lythios43c
+	heat_factor = 0.1//Much much lower, since we are a cool sensor sat.
+
+/obj/machinery/shipsensors/uplink/in_vacuum()
+	return TRUE
+
+/obj/machinery/shipsensors/uplink/Initialize(mapload)
+	. = ..()
+	var/area/overmap/map = locate() in world
+	for(var/obj/overmap/entity/visitable/sector/S in map)
+		if(istype(S,planet_type))
+			S.sensors = src
+