Pulling in Scav's updated ministation to replace the existing minista…

…tion.

code/game/objects/items/books/skill_book.dm

@@ -17,8 +17,8 @@
 										"\"What The Fuck is [capitalize(ADD_ARTICLE(capitalize(skill_name)))]?\"", \
 										"\"Starting [capitalize(ADD_ARTICLE(capitalize(skill_name)))] Business By Yourself\"", \
 										"\"Even You Can Learn [skill_name]!\"", \
-										"\"How To Impress Your Matriarch with [skill_name]\"", \
-										"\"How To Become A Patriarch of [skill_name]\"", \
+										"\"How To Impress Your Parents with [skill_name]\"", \
+										"\"How To Become A Master of [skill_name]\"", \
 										"\"Everything The Government Doesn't Want You To Know About [skill_name]\"", \
 										"\"[skill_name] For Younglets\"", \
 										"\"[skill_name]: Volume [rand(1,100)]\"", \

code/game/objects/items/devices/radio/intercom.dm

@@ -88,3 +88,6 @@
 
 /obj/item/radio/intercom/locked/set_frequency()
 	..(locked_frequency)
+
+/obj/item/radio/intercom/locked/entertainment
+	locked_frequency = 1461

code/modules/paperwork/photography.dm

@@ -212,6 +212,10 @@
 	var/field_of_view    = 3 // squared, so 3 is a 3x3 of tiles
 	var/obj/item/camera_film/film = new //Currently loaded film
 
+/obj/item/camera/loaded/Initialize()
+	film = new(src)
+	return ..()
+
 /obj/item/camera/Initialize()
 	set_extension(src, /datum/extension/base_icon_state, icon_state)
 	. = ..()

maps/ministation/jobs/civilian.dm

@@ -6,7 +6,8 @@
 	economic_power = 1
 	access = list()
 	minimal_access = list()
-	alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Visitor")
+	hud_icon = "hudassistant"
+	alt_titles = list("Technical Recruit","Medical Recruit","Research Recruit","Visitor")
 	outfit_type = /decl/hierarchy/outfit/job/ministation_assistant
 	department_types = list(/decl/department/civilian)
 	event_categories = list(ASSIGNMENT_GARDENER)
@@ -24,7 +25,7 @@
 	title = "Bartender"
 	alt_titles = list("Cook","Barista")
 	supervisors = "the Lieutenant and the Captain"
-	total_positions = 1
+	total_positions = 2
 	spawn_positions = 1
 	outfit_type = /decl/hierarchy/outfit/job/ministation/bartender
 	department_types = list(/decl/department/service)
@@ -49,13 +50,13 @@
 		SKILL_COOKING	= SKILL_MAX,
 		SKILL_BOTANY	= SKILL_MAX
 	)
-	skill_points = 20
+	skill_points = 30
 
 /datum/job/ministation/cargo
 	title = "Cargo Technician"
 	alt_titles = list("Shaft Miner","Drill Technician","Prospector")
 	supervisors = "the Lieutenant and the Captain"
-	total_positions = 2
+	total_positions = 3
 	spawn_positions = 1
 	outfit_type = /decl/hierarchy/outfit/job/ministation/cargo
 	department_types = list(/decl/department/service)
@@ -68,7 +69,8 @@
 		access_mailsorting,
 		access_mining,
 		access_mining_station,
-		access_external_airlocks
+		access_external_airlocks,
+		access_eva
 	)
 	minimal_access = list(
 		access_cargo,
@@ -92,7 +94,7 @@
 		SKILL_EVA		= SKILL_MAX,
 		SKILL_FINANCE	= SKILL_MAX
 	)
-	skill_points = 20
+	skill_points = 30
 	software_on_spawn = list(
 		/datum/computer_file/program/supply,
 		/datum/computer_file/program/deck_management,
@@ -103,7 +105,7 @@
 	title = "Janitor"
 	event_categories = list(ASSIGNMENT_JANITOR)
 	department_types = list(/decl/department/service)
-	total_positions = 1
+	total_positions = 2
 	spawn_positions = 1
 	supervisors = "the Lieutenant and the Captain"
 	economic_power = 3
@@ -132,7 +134,7 @@
 	min_skill = list(
 		SKILL_HAULING  = SKILL_BASIC
 	)
-	skill_points = 18
+	skill_points = 28
 
 /datum/job/ministation/librarian
 	title = "Librarian"

maps/ministation/jobs/command.dm

@@ -1,6 +1,6 @@
 /datum/job/ministation/captain
 	title = "Captain"
-	supervisors = "your profit margin, your conscience, and the Trademaster"
+	supervisors = "your profit margin, your conscience, and the watchful eye of the Company Rep"
 	outfit_type = /decl/hierarchy/outfit/job/ministation/captain
 	min_skill = list(
 		SKILL_LITERACY = SKILL_ADEPT,
@@ -12,12 +12,13 @@
 		SKILL_PILOT   = SKILL_MAX,
 		SKILL_WEAPONS = SKILL_MAX
 	)
-	skill_points = 30
+	skill_points = 40
 	head_position = 1
 	department_types = list(/decl/department/command)
 	total_positions = 1
 	spawn_positions = 1
 	selection_color = "#1d1d4f"
+	hud_icon = "hudcaptain"
 	req_admin_notify = 1
 	access = list()
 	minimal_access = list()
@@ -37,7 +38,7 @@
 	return get_all_station_access()
 
 /mob/proc/freetradeunion_rename_company()
-	set name = "Rename Free Trade Union"
+	set name = "Defect from Corporate Control"
 	set category = "Captain's Powers"
 	var/company = sanitize(input(src, "What should your enterprise be called?", "Company name", global.using_map.company_name), MAX_NAME_LEN)
 	if(!company)
@@ -63,6 +64,7 @@
 	total_positions = 1
 	spawn_positions = 1
 	selection_color = "#2f2f7f"
+	hud_icon = "hudlieutenant"
 	req_admin_notify = 1
 	minimal_player_age = 14
 	economic_power = 10
@@ -74,9 +76,11 @@
 		access_sec_doors,
 		access_brig,
 		access_forensics_lockers,
+		access_armory,
 		access_heads,
 		access_medical,
 		access_engine,
+		access_atmospherics,
 		access_change_ids,
 		access_ai_upload,
 		access_eva,
@@ -89,6 +93,10 @@
 		access_morgue,
 		access_crematorium,
 		access_kitchen,
+		access_mining,
+		access_xenobiology,
+		access_robotics,
+		access_engine_equip,
 		access_cargo,
 		access_cargo_bot,
 		access_mailsorting,
@@ -111,9 +119,11 @@
 		access_sec_doors,
 		access_brig,
 		access_forensics_lockers,
+		access_armory,
 		access_heads,
 		access_medical,
 		access_engine,
+		access_atmospherics,
 		access_change_ids,
 		access_ai_upload,
 		access_eva,
@@ -123,6 +133,10 @@
 		access_bar,
 		access_janitor,
 		access_construction,
+		access_mining,
+		access_xenobiology,
+		access_robotics,
+		access_engine_equip,
 		access_morgue,
 		access_crematorium,
 		access_kitchen,
@@ -154,5 +168,4 @@
 		SKILL_PILOT =   SKILL_MAX,
 		SKILL_FINANCE = SKILL_MAX
 	)
-	skill_points = 30
-	alt_titles = list()
+	skill_points = 40

maps/ministation/jobs/corporate.dm

@@ -0,0 +1,96 @@
+/datum/job/ministation/corporate/rep
+	title = "Company Representative"
+	alt_titles = list("Narc")
+	hud_icon = "hudnarc"
+	spawn_positions = 1
+	total_positions = 2
+	req_admin_notify = 1
+	guestbanned = 1
+	supervisors = "the Board of Directors"
+	outfit_type = /decl/hierarchy/outfit/job/ministation/corporate
+	min_skill = list(
+		SKILL_WEAPONS  = SKILL_BASIC,
+		SKILL_FINANCE  = SKILL_EXPERT,
+		SKILL_LITERACY = SKILL_ADEPT,
+		SKILL_PILOT    = SKILL_ADEPT,
+		SKILL_MEDICAL  = SKILL_ADEPT
+	)
+	max_skill = list(
+		SKILL_PILOT    = SKILL_MAX,
+		SKILL_FINANCE  = SKILL_MAX,
+		SKILL_MEDICAL  = SKILL_MAX,
+		SKILL_ANATOMY  = SKILL_EXPERT
+	)
+	skill_points = 35
+	department_types = list(/decl/department/corporate)
+	selection_color = "#a89004"
+	access = list(
+		access_lawyer,
+		access_security,
+		access_sec_doors,
+		access_brig,
+		access_heads,
+		access_medical,
+		access_engine,
+		access_atmospherics,
+		access_ai_upload,
+		access_eva,
+		access_bridge,
+		access_all_personal_lockers,
+		access_maint_tunnels,
+		access_bar,
+		access_janitor,
+		access_construction,
+		access_morgue,
+		access_crematorium,
+		access_kitchen,
+		access_cargo,
+		access_cargo_bot,
+		access_qm,
+		access_hydroponics,
+		access_lawyer,
+		access_chapel_office,
+		access_library,
+		access_research,
+		access_mining,
+		access_heads_vault,
+		access_mining_station,
+		access_hop,
+		access_RC_announce,
+		access_keycard_auth,
+		access_gateway
+		)
+
+	minimal_access = list(
+		access_lawyer,
+		access_security,
+		access_sec_doors,
+		access_brig,
+		access_medical,
+		access_heads,
+		access_engine,
+		access_atmospherics,
+		access_ai_upload,
+		access_eva,
+		access_bridge,
+		access_maint_tunnels,
+		access_bar,
+		access_janitor,
+		access_construction,
+		access_morgue,
+		access_crematorium,
+		access_kitchen,
+		access_cargo,
+		access_cargo_bot,
+		access_hydroponics,
+		access_chapel_office,
+		access_library,
+		access_research,
+		access_mining,
+		access_heads_vault,
+		access_mining_station,
+		access_hop,
+		access_RC_announce,
+		access_keycard_auth,
+		access_gateway
+		)

maps/ministation/jobs/engineering.dm

@@ -1,6 +1,6 @@
 /datum/job/ministation/engineer
 	title = "Station Engineer"
-	supervisors = "the Lieutenant and the Captain"
+	supervisors = "the Head Engineer"
 	total_positions = 2
 	spawn_positions = 2
 	outfit_type = /decl/hierarchy/outfit/job/ministation/engineer
@@ -45,6 +45,91 @@
 		SKILL_ATMOS        = SKILL_MAX,
 		SKILL_ENGINES      = SKILL_MAX
 	)
-	skill_points = 20
-	alt_titles = list("Atmospheric Technician")
+	skill_points = 30
+	alt_titles = list("Atmospheric Technician", "Electrician", "Maintenance Technician")
+	event_categories = list(ASSIGNMENT_ENGINEER)
+
+/datum/job/ministation/engineer/head
+	title = "Head Engineer"
+	head_position = 1
+	department_types = list(
+		/decl/department/engineering,
+		/decl/department/command
+	)
+	total_positions = 1
+	spawn_positions = 1
+	selection_color = "#7f6e2c"
+	req_admin_notify = 1
+	economic_power = 10
+	ideal_character_age = 50
+	guestbanned = 1
+	must_fill = 1
+	not_random_selectable = 1
+	hud_icon = "hudchiefengineer"
+	access = list(
+		access_engine,
+		access_engine_equip,
+		access_tech_storage,
+		access_maint_tunnels,
+		access_heads,
+		access_teleporter,
+		access_external_airlocks,
+		access_atmospherics,
+		access_emergency_storage,
+		access_eva,
+		access_bridge,
+		access_construction, access_sec_doors,
+		access_ce,
+		access_RC_announce,
+		access_keycard_auth,
+		access_tcomsat,
+		access_mining,
+		access_kitchen,
+		access_robotics,
+		access_hydroponics,
+		access_ai_upload
+	)
+	minimal_access = list(
+		access_engine,
+		access_engine_equip,
+		access_tech_storage,
+		access_maint_tunnels,
+		access_heads,
+		access_teleporter,
+		access_external_airlocks,
+		access_atmospherics,
+		access_emergency_storage,
+		access_eva,
+		access_bridge,
+		access_construction,
+		access_sec_doors,
+		access_ce, access_RC_announce,
+		access_keycard_auth,
+		access_tcomsat,
+		access_mining,
+		access_kitchen,
+		access_robotics,
+		access_hydroponics,
+		access_ai_upload
+	)
+	minimal_player_age = 14
+	supervisors = "the Captain"
+	outfit_type = /decl/hierarchy/outfit/job/ministation/engineer/head
+	min_skill = list(
+		SKILL_LITERACY     = SKILL_ADEPT,
+		SKILL_COMPUTER     = SKILL_ADEPT,
+		SKILL_EVA          = SKILL_ADEPT,
+		SKILL_CONSTRUCTION = SKILL_ADEPT,
+		SKILL_ELECTRICAL   = SKILL_ADEPT,
+		SKILL_ATMOS        = SKILL_ADEPT,
+		SKILL_ENGINES      = SKILL_EXPERT
+	)
+	max_skill = list(
+		SKILL_CONSTRUCTION = SKILL_MAX,
+		SKILL_ELECTRICAL   = SKILL_MAX,
+		SKILL_ATMOS        = SKILL_MAX,
+		SKILL_ENGINES      = SKILL_MAX
+	)
+	skill_points = 40
+	alt_titles = list("Chief of Engineering")
 	event_categories = list(ASSIGNMENT_ENGINEER)