Refactor and fix Pioneer corps away site (#1137)

SierraBay · Oct 25, 2023 · 4400f33 · 4400f33
1 parent d395294
commit 4400f33
Show file tree

Hide file tree

Showing 21 changed files with 352 additions and 305 deletions.
diff --git a/maps/sierra/sierra_ranks.dm b/maps/sierra/sierra_ranks.dm
@@ -13,7 +13,6 @@
 		/datum/mil_branch/skrell_fleet,
 		/datum/mil_branch/iccgn,
 		/datum/mil_branch/css,
-		/datum/mil_branch/pioneer,
 		/datum/mil_branch/fleet,
 		/datum/mil_branch/scga
 	)
@@ -26,7 +25,6 @@
 		/datum/mil_branch/skrell_fleet,
 		/datum/mil_branch/iccgn,
 		/datum/mil_branch/css,
-		/datum/mil_branch/pioneer,
 		/datum/mil_branch/fleet,
 		/datum/mil_branch/scga
 	)

diff --git a/mods/_maps/farfleet/code/farfleet.dm b/mods/_maps/farfleet/code/farfleet.dm
@@ -42,8 +42,9 @@
 	description = "Garibaldi-class Gunboat, ICCG Pioneer Corps Reconnaissance Craft."
 	prefix = "mods/_maps/farfleet/maps/"
 	suffixes = list("farfleet-1.dmm", "farfleet-2.dmm")
-	spawn_cost = 50 // Temporary disabled
-	player_cost = 50
+	ban_ruins = list(/datum/map_template/ruin/away_site/patrol)
+	spawn_cost = 0.5
+	player_cost = 7
 	spawn_weight = 1
 	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/snz)
 

diff --git a/mods/_maps/farfleet/code/farfleet_areas.dm b/mods/_maps/farfleet/code/farfleet_areas.dm
@@ -7,6 +7,7 @@
 	name = "\improper Officer's Locker Room"
 	icon_state = "locker"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_CREW
 
 /area/ship/farfleet/crew/hydroponics
 	name = "\improper Auxiliary Hydroponics"
@@ -47,86 +48,101 @@
 	name = "\improper Hallway - Operative Deck"
 	icon_state = "hallF"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_HALLWAYS
 
 /area/ship/farfleet/crew/hallway/upper
 	name = "\improper Hallway - Hangar Deck"
 	icon_state = "hallA"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_HALLWAYS
 
 /area/ship/farfleet/crew/brig
 	name = "\improper Ship Brig"
 	icon_state = "red"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_SECURITY
 
 /area/ship/farfleet/crew/brig/emergency_armory
 	name = "\improper Emergency Armory"
 	icon_state = "red"
 	req_access = list(access_away_iccgn, access_away_iccgn_captain)
+	holomap_color = HOLOMAP_AREACOLOR_SECURITY
 
 /area/ship/farfleet/crew/brig/css
 	name = "\improper Counsultant Room"
 	icon_state = "red"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_COMMAND
 
 /area/ship/farfleet/engineering/hallway
 	name = "\improper Engineering Hallway"
 	icon_state = "yellow"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/engineering/equipment
 	name = "\improper Engineering Equipment"
 	icon_state = "yellow"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/engineering/atmos_equipment
 	name = "\improper Atmospherics Equipment"
 	icon_state = "yellow"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/engineering/storage
 	name = "\improper Engineering Storage"
 	icon_state = "engineering_locker"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/engineering/shield
 	name = "\improper Shield Generator"
 	icon_state = "yellow"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/engineering/fussion
 	name = "\improper Fussion Zone"
 	icon_state = "rust_reactor"
 	ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambieng1.ogg')
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/engineering/fussion/control
 	name = "\improper Fussion Control"
 	icon_state = "green"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/engineering/atmospherics
 	name = "\improper Atmospherics"
 	icon_state = "atmos"
 	ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambiatm1.ogg')
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/barracks
 	name = "\improper Droptroops Section"
 	icon_state = "locker"
 	req_access = list(access_away_iccgn, access_away_iccgn_droptroops)
+	holomap_color = HOLOMAP_AREACOLOR_EXPLORATION
 
 /area/ship/farfleet/barracks/armory
 	name = "\improper Droptroops Armory"
 	icon_state = "red"
 	req_access = list(access_away_iccgn, access_away_iccgn_droptroops, access_away_iccgn_sergeant)
-
+	holomap_color = HOLOMAP_AREACOLOR_EXPLORATION
 
 
 
 /area/ship/farfleet/medbay
 	name = "\improper Medical Bay"
 	icon_state = "exam_room"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_MEDICAL
 
 /area/ship/farfleet/medbay/storage
 	name = "\improper Medical Storage"
@@ -151,6 +167,7 @@
 	name = "\improper Anomaly Materials "
 	icon_state = "amaint"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_SCIENCE
 
 /area/ship/farfleet/maintenance/storage
 	name = "\improper Auxiliary Storage"
@@ -173,11 +190,13 @@
 	name = "\improper Bridge"
 	icon_state = "bridge"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_COMMAND
 
 /area/ship/farfleet/command/eva
 	name = "\improper Fleet EVA"
 	icon_state = "eva"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_COMMAND
 
 /area/ship/farfleet/command/equipment
 	name = "\improper Fleet Equipment"
@@ -188,21 +207,24 @@
 	name = "\improper SNZ Hangar"
 	icon_state = "hangar"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_CARGO
 
 /area/ship/farfleet/command/hangar_canisters
 	name = "\improper Fuel station"
 	icon_state = "purple"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
 /area/ship/farfleet/command/launcher
 	name = "\improper Fore Impulse Cannon"
 	icon_state = "blue"
 	req_access = list(access_away_iccgn)
-
+	holomap_color = HOLOMAP_AREACOLOR_COMMAND
 
 
 
 /area/ship/farfleet/dock
 	name = "\improper Docking Bay"
 	icon_state = "entry_1"
 	req_access = list(access_away_iccgn)
+	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
diff --git a/mods/_maps/farfleet/code/farfleet_crew.dm b/mods/_maps/farfleet/code/farfleet_crew.dm
@@ -99,13 +99,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
  */
 
 /datum/job/submap/away_iccgn_farfleet
-	title = "ICCG Droptrooper"
+	title = "Pioneer Corps Trooper"
 	total_positions = 2
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_droptroops
-	branch = /datum/mil_branch/pioneer
-	rank = /datum/mil_rank/pioneer/or3
-	allowed_branches = list(/datum/mil_branch/pioneer)
-	allowed_ranks = list(/datum/mil_rank/pioneer/or3)
+	branch = /datum/mil_rank/iccgn
+	rank = /datum/mil_rank/iccgn/or3
+	allowed_branches = list(/datum/mil_branch/iccgn)
+	allowed_ranks = list(/datum/mil_rank/iccgn/or3)
 	supervisors = "sergeant"
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
@@ -126,14 +126,14 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	access = list(access_away_iccgn, access_away_iccgn_droptroops, access_engine_equip)
 
 /datum/job/submap/away_iccgn_farfleet/iccgn_sergeant
-	title = "ICCG Droptrooper Sergeant"
+	title = "Pioneer Corps Sergeant"
 	total_positions = 1
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_sergeant
 	supervisors = "Recon captain, Command of the Pioneer Corps , ICCGN"
-	branch = /datum/mil_branch/pioneer
-	rank = /datum/mil_rank/pioneer/or5
-	allowed_branches = list(/datum/mil_branch/pioneer)
-	allowed_ranks = list(/datum/mil_rank/pioneer/or5)
+	branch = /datum/mil_rank/iccgn
+	rank = /datum/mil_rank/iccgn/or5
+	allowed_branches = list(/datum/mil_rank/iccgn)
+	allowed_ranks = list(/datum/mil_rank/iccgn/or5)
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
@@ -158,10 +158,10 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	title = "Pioneer Corps Captain"
 	total_positions = 1
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_captain
-	branch = /datum/mil_branch/pioneer
-	rank = /datum/mil_rank/pioneer/of5
-	allowed_branches = list(/datum/mil_branch/pioneer)
-	allowed_ranks = list(/datum/mil_rank/pioneer/of5)
+	branch = /datum/mil_rank/iccgn
+	rank = /datum/mil_rank/iccgn/of5
+	allowed_branches = list(/datum/mil_rank/iccgn)
+	allowed_ranks = list(/datum/mil_rank/iccgn/of5)
 	supervisors = "command of the Pioneer Corps , ICCGN"
 	loadout_allowed = TRUE
 	is_semi_antagonist = TRUE
@@ -187,12 +187,12 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	title = "Pioneer Corpsman"
 	total_positions = 1
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_medic
-	branch = /datum/mil_branch/pioneer
-	rank = /datum/mil_rank/pioneer/of5
-	allowed_branches = list(/datum/mil_branch/pioneer)
+	branch = /datum/mil_rank/iccgn
+	rank = /datum/mil_rank/iccgn/of5
+	allowed_branches = list(/datum/mil_rank/iccgn)
 	allowed_ranks = list(
-		/datum/mil_rank/pioneer/of1,
-		/datum/mil_rank/pioneer/of3
+		/datum/mil_rank/iccgn/of1,
+		/datum/mil_rank/iccgn/of3
 	)
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
@@ -216,13 +216,13 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	access = list(access_away_iccgn, access_engine_equip)
 
 /datum/job/submap/away_iccgn_farfleet/iccgn_gunner
-	title = "Senior Technician"
+	title = "Pioneer Corps Technician"
 	total_positions = 1
 	outfit_type = /singleton/hierarchy/outfit/job/iccgn/iccgn_gunner
-	branch = /datum/mil_branch/pioneer
-	rank = /datum/mil_rank/pioneer/of3
-	allowed_branches = list(/datum/mil_branch/pioneer)
-	allowed_ranks = list(/datum/mil_rank/pioneer/of3)
+	branch = /datum/mil_rank/iccgn
+	rank = /datum/mil_rank/iccgn/of3
+	allowed_branches = list(/datum/mil_rank/iccgn)
+	allowed_ranks = list(/datum/mil_rank/iccgn/of3)
 	supervisors = "captain"
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
@@ -256,6 +256,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 	allowed_branches = list(/datum/mil_branch/css)
 	allowed_ranks = list(/datum/mil_rank/css/fa7)
 	supervisors = "chief of 'P' Department, Confederate Security Service"
+	psi_faculties = list(PSI_COERCION = PSI_RANK_MASTER)
 	loadout_allowed = TRUE
 	info = "Вы просыпаетесь и выходите из криосна, ощущая прохладный воздух на своём лице, а также лёгкую тошноту. \
 	Вы - сотрдник отдела 'П' Конфедеративной Службы Безопасности, приписанный к кораблю Пионерского Корпуса. \
@@ -277,6 +278,7 @@ var/global/const/access_away_iccgn_captain = "ACCESS_ICCGN_CAPTAIN"
 
 	access = list(access_away_iccgn, access_away_iccgn_droptroops, access_away_iccgn_sergeant, access_away_iccgn_captain, access_engine_equip)
 
+
 /* OUTFITS
  * =======
  */