Removes Resident from the Southern Cross

code/datums/outfits/jobs/civilian.dm

@@ -7,6 +7,7 @@
 	id_pda_assignment = "Visitor"
 	uniform = /obj/item/clothing/under/assistantformal
 
+<<<<<<< HEAD
 /decl/hierarchy/outfit/job/assistant/resident
 	name = OUTFIT_JOB_NAME("Resident")
 	id_pda_assignment = "Resident"
@@ -16,6 +17,8 @@
 	name = OUTFIT_JOB_NAME("Intern")
 	id_type = /obj/item/weapon/card/id/civilian
 //VOREStation Add End - Interns
+=======
+>>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop
 /decl/hierarchy/outfit/job/service
 	l_ear = /obj/item/device/radio/headset/headset_service
 	hierarchy_type = /decl/hierarchy/outfit/job/service

code/game/jobs/job/assistant.dm

@@ -39,12 +39,22 @@
 	access = list()
 	minimal_access = list()
 	outfit_type = /decl/hierarchy/outfit/job/assistant
+<<<<<<< HEAD
 	timeoff_factor = 0
 /datum/job/assistant/New()
 	..()
 	if(config)
 		total_positions = config.limit_visitors
 		spawn_positions = config.limit_visitors
+=======
+	alt_titles = list(
+		"Technical Assistant",
+		"Medical Intern",
+		"Research Assistant",
+		"Visitor" = /decl/hierarchy/outfit/job/assistant/visitor
+	)
+
+>>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop
 /datum/job/assistant/get_access()
 	if(config.assistant_maint)
 		return list(access_maint_tunnels)

maps/northern_star/job/outfits.dm

@@ -0,0 +1,6 @@
+//Job Outfits
+
+/decl/hierarchy/outfit/job/assistant/resident
+	name = OUTFIT_JOB_NAME("Resident")
+	id_pda_assignment = "Resident"
+	uniform = /obj/item/clothing/under/color/white

maps/northern_star/northern_star.dm

@@ -9,6 +9,8 @@
 	#include "northern_star_defines.dm"
 	#include "northern_star_areas.dm"
 	#include "northern_star_shuttles.dm"
+	#include "northern_star_jobs.dm"
+	#include "job/outfits.dm"
 
 	#define USING_MAP_DATUM /datum/map/northern_star
 

maps/northern_star/northern_star_defines.dm

@@ -27,7 +27,7 @@
 
 	shuttle_docked_message = "The scheduled shuttle to the %dock_name% has docked with the station at docks one and two. It will depart in approximately %ETD%."
 	shuttle_leaving_dock = "The Crew Transfer Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%."
-	shuttle_called_message = "A crew transfer to %Dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%."
+	shuttle_called_message = "A crew transfer to %dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%."
 	shuttle_recall_message = "The scheduled crew transfer has been cancelled."
 	emergency_shuttle_docked_message = "The Emergency Shuttle has docked with the station at docks one and two. You have approximately %ETD% to board the Emergency Shuttle."
 	emergency_shuttle_leaving_dock = "The Emergency Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%."

maps/northern_star/northern_star_jobs.dm

@@ -0,0 +1,9 @@
+// Overrides the alt titles.
+/datum/job/assistant
+	alt_titles = list(
+		"Technical Assistant",
+		"Medical Intern",
+		"Research Assistant",
+		"Visitor" = /decl/hierarchy/outfit/job/assistant/visitor,
+		"Resident" = /decl/hierarchy/outfit/job/assistant/resident
+	)

maps/southern_cross/southern_cross_defines.dm

@@ -37,7 +37,7 @@
 
 	shuttle_docked_message = "The scheduled shuttle to the %dock_name% has docked with the station at docks one and two. It will depart in approximately %ETD%."
 	shuttle_leaving_dock = "The Crew Transfer Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%."
-	shuttle_called_message = "A crew transfer to %Dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%."
+	shuttle_called_message = "A crew transfer to %dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to docks one and two in approximately %ETA%."
 	shuttle_recall_message = "The scheduled crew transfer has been cancelled."
 	emergency_shuttle_docked_message = "The Emergency Shuttle has docked with the station at docks one and two. You have approximately %ETD% to board the Emergency Shuttle."
 	emergency_shuttle_leaving_dock = "The Emergency Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%."