From 7b8d7b4d65f4e43da1632aef79d1f1601412f9f0 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Tue, 20 Dec 2022 16:07:55 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2022.12.20.16.07.55"

---
 html/changelog.html                           |   4 +
 html/changelogs/.all_changelog.yml            |   2 +
 html/changelogs/nope-iacship.yml              |  41 ---
 maps/away/ships/iac/iac_rescue_ship.dm        | 342 +++++++++---------
 .../ships/iac/iac_rescue_ship_ghostroles.dm   | 230 ++++++------
 5 files changed, 292 insertions(+), 327 deletions(-)
 delete mode 100644 html/changelogs/nope-iacship.yml

diff --git a/html/changelog.html b/html/changelog.html
index f11e158e0c8..45aee17c518 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -54,6 +54,10 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed psiblade and psiping not working.</li>
 			</ul>
+			<h3 class="author">Nope63 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added an Interstellar Aid Corps third party ship and an IAC info pamphlet.</li>
+			</ul>
 			<h3 class="author">RustingWithYou updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Gives xenobotanists and xenobiologists access to the main R&amp;D lab.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5133458904a..b09a4e02b86 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -27243,5 +27243,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Makes ashtrays actually empty into the bin instead of onto the floor.
   MattAtlas:
   - bugfix: Fixed psiblade and psiping not working.
+  Nope63:
+  - rscadd: Added an Interstellar Aid Corps third party ship and an IAC info pamphlet.
   RustingWithYou:
   - tweak: Gives xenobotanists and xenobiologists access to the main R&amp;D lab.
diff --git a/html/changelogs/nope-iacship.yml b/html/changelogs/nope-iacship.yml
deleted file mode 100644
index ebf540c9bdf..00000000000
--- a/html/changelogs/nope-iacship.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.
-author: Nope63
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
-  - rscadd: "Added an Interstellar Aid Corps third party ship and an IAC info pamphlet."
diff --git a/maps/away/ships/iac/iac_rescue_ship.dm b/maps/away/ships/iac/iac_rescue_ship.dm
index af4b8ec9f0e..7fb4a2ee72e 100644
--- a/maps/away/ships/iac/iac_rescue_ship.dm
+++ b/maps/away/ships/iac/iac_rescue_ship.dm
@@ -1,171 +1,171 @@
-/datum/map_template/ruin/away_site/iac_rescue_ship
-	name = "IAC Rescue Ship"
-	description = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a much older and more widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies."
-	suffix = "ships/iac/iac_rescue_ship.dmm"
-	sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL)
-	spawn_weight = 1
-	spawn_cost = 1
-	id = "iac_rescue_ship"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/iac_shuttle)
-
-
-/decl/submap_archetype/iac_rescue_ship
-	map = "IAC Rescue Ship"
-	descriptor = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a much older and more widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies."
-
-//areas
-/area/ship/iac_rescue_ship
-	name = "IAC Rescue Ship"
-	requires_power = TRUE
-	
-/area/ship/iac_rescue_ship/bridge
-	name = "IAC Rescue Ship Bridge"
-	
-/area/ship/iac_rescue_ship/hangar
-	name = "IAC Rescue Ship Hangar"
-	
-/area/ship/iac_rescue_ship/starboardengine
-	name = "IAC Rescue Ship Starboard Engine"
-	
-/area/ship/iac_rescue_ship/portengine
-	name = "IAC Rescue Ship Port Engine"
-	
-/area/ship/iac_rescue_ship/bathroom
-	name = "IAC Rescue Ship Bathroom"
-	
-/area/ship/iac_rescue_ship/mainstorage
-	name = "IAC Rescue Ship Main Storage"
-	
-/area/ship/iac_rescue_ship/medical
-	name = "IAC Rescue Ship Medical"
-	
-/area/ship/iac_rescue_ship/surgery
-	name = "IAC Rescue Ship Surgery Room"
-
-/area/ship/iac_rescue_ship/pharmacy
-	name = "IAC Rescue Ship Pharmacy"
-	
-/area/ship/iac_rescue_ship/dorms
-	name = "IAC Rescue Ship Dorms"
-	
-/area/ship/iac_rescue_ship/coord
-	name = "IAC Rescue Ship Coordinator's Office"
-	
-/area/ship/iac_rescue_ship/hallway
-	name = "IAC Rescue Ship Hallway"
-	
-/area/shuttle/iac_shuttle
-	name = "IAC Ambulance Shuttle"
-	icon_state = "shuttle2"
-
-//ship stuff
-
-/obj/effect/overmap/visitable/ship/iac_rescue_ship
-	name = "IAC Rescue Ship"
-	class = "IAV"
-	desc = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies."
-	icon_state = "ship"
-	moving_state = "ship_moving"
-	max_speed = 1/(2 SECONDS)
-	burn_delay = 1 SECONDS
-	vessel_mass = 5000
-	fore_dir = SOUTH
-	vessel_size = SHIP_SIZE_SMALL
-	initial_restricted_waypoints = list(
-		"IAC Ambulance Shuttle" = list("nav_hangar_iac")
-	)
-
-	initial_generic_waypoints = list(
-		"nav_iac_rescue_ship_1",
-		"nav_iac_rescue_ship_2",
-		"nav_iac_rescue_ship_3",
-		"nav_iac_rescue_ship_4",
-		"nav_iac_rescue_ship_5"
-	)
-
-/obj/effect/overmap/visitable/ship/iac_rescue_ship/New()
-	designation = "[pick("Angitia", "Eir", "Vejovis", "Dharti", "Serket", "He Xiangu", "Sirona", "Ixtlilton", "Boris Yegorov", "Simi", "Aleksandra Hro'makar", "Assistance", "Helping Hand", "Free Aid", "Safe Haven", "Grace", "Compassion", "Relief")]"
-	..()
-
-/obj/effect/shuttle_landmark/iac_rescue_ship/nav1
-	name = "IAC Rescue Ship - Port Side"
-	landmark_tag = "nav_iac_rescue_ship_1"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/iac_rescue_ship/nav2
-	name = "IAC Rescue Ship - Port Airlock"
-	landmark_tag = "nav_iac_rescue_ship_2"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-	
-/obj/effect/shuttle_landmark/iac_rescue_ship/nav3
-	name = "IAC Rescue Ship - Starboard Side"
-	landmark_tag = "nav_iac_rescue_ship_3"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-	
-/obj/effect/shuttle_landmark/iac_rescue_ship/nav4
-	name = "IAC Rescue Ship - Aft Side"
-	landmark_tag = "nav_iac_rescue_ship_4"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-	
-/obj/effect/shuttle_landmark/iac_rescue_ship/nav5
-	name = "IAC Rescue Ship - Fore Side"
-	landmark_tag = "nav_iac_rescue_ship_5"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/iac_rescue_ship/transit
-	name = "In transit"
-	landmark_tag = "nav_transit_iac_rescue_ship"
-	base_turf = /turf/space/transit/north
-
-//shuttle stuff
-/obj/effect/overmap/visitable/ship/landable/iac_shuttle
-	name = "IAC Ambulance Shuttle"
-	class = "IAV"
-	designation = "Heka"
-	desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to a Interstellar Aid Corps vessel."
-	shuttle = "IAC Ambulance Shuttle"
-	max_speed = 1/(3 SECONDS)
-	burn_delay = 2 SECONDS
-	vessel_mass = 3000 //very inefficient pod
-	fore_dir = NORTH
-	vessel_size = SHIP_SIZE_TINY
-
-/obj/machinery/computer/shuttle_control/explore/iac_shuttle
-	name = "shuttle control console"
-	shuttle_tag = "IAC Ambulance Shuttle"
-	req_access = list(access_iac_rescue_ship)
-
-/datum/shuttle/autodock/overmap/iac_shuttle
-	name = "IAC Ambulance Shuttle"
-	move_time = 20
-	shuttle_area = list(/area/shuttle/iac_shuttle)
-	current_location = "nav_hangar_iac"
-
-	landmark_transition = "nav_transit_iac_shuttle"
-
-	range = 1
-	fuel_consumption = 2
-	logging_home_tag = "nav_hangar_iac"
-
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/iac_shuttle/hangar
-	name = "IAC Ambulance Shuttle Hangar"
-	landmark_tag = "nav_hangar_iac"
-
-	docking_controller = "iac_shuttle_dock"
-
-	base_area = /area/ship/iac_rescue_ship/hangar
-	base_turf = /turf/simulated/floor/plating
-	movable_flags = MOVABLE_FLAG_EFFECTMOVE
-
-/obj/effect/shuttle_landmark/iac_shuttle/transit
-	name = "In transit"
-	landmark_tag = "nav_transit_iac_shuttle"
-
-	base_turf = /turf/space/transit/north
+/datum/map_template/ruin/away_site/iac_rescue_ship
+	name = "IAC Rescue Ship"
+	description = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a much older and more widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies."
+	suffix = "ships/iac/iac_rescue_ship.dmm"
+	sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL)
+	spawn_weight = 1
+	spawn_cost = 1
+	id = "iac_rescue_ship"
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/iac_shuttle)
+
+
+/decl/submap_archetype/iac_rescue_ship
+	map = "IAC Rescue Ship"
+	descriptor = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a much older and more widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies."
+
+//areas
+/area/ship/iac_rescue_ship
+	name = "IAC Rescue Ship"
+	requires_power = TRUE
+	
+/area/ship/iac_rescue_ship/bridge
+	name = "IAC Rescue Ship Bridge"
+	
+/area/ship/iac_rescue_ship/hangar
+	name = "IAC Rescue Ship Hangar"
+	
+/area/ship/iac_rescue_ship/starboardengine
+	name = "IAC Rescue Ship Starboard Engine"
+	
+/area/ship/iac_rescue_ship/portengine
+	name = "IAC Rescue Ship Port Engine"
+	
+/area/ship/iac_rescue_ship/bathroom
+	name = "IAC Rescue Ship Bathroom"
+	
+/area/ship/iac_rescue_ship/mainstorage
+	name = "IAC Rescue Ship Main Storage"
+	
+/area/ship/iac_rescue_ship/medical
+	name = "IAC Rescue Ship Medical"
+	
+/area/ship/iac_rescue_ship/surgery
+	name = "IAC Rescue Ship Surgery Room"
+
+/area/ship/iac_rescue_ship/pharmacy
+	name = "IAC Rescue Ship Pharmacy"
+	
+/area/ship/iac_rescue_ship/dorms
+	name = "IAC Rescue Ship Dorms"
+	
+/area/ship/iac_rescue_ship/coord
+	name = "IAC Rescue Ship Coordinator's Office"
+	
+/area/ship/iac_rescue_ship/hallway
+	name = "IAC Rescue Ship Hallway"
+	
+/area/shuttle/iac_shuttle
+	name = "IAC Ambulance Shuttle"
+	icon_state = "shuttle2"
+
+//ship stuff
+
+/obj/effect/overmap/visitable/ship/iac_rescue_ship
+	name = "IAC Rescue Ship"
+	class = "IAV"
+	desc = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies."
+	icon_state = "ship"
+	moving_state = "ship_moving"
+	max_speed = 1/(2 SECONDS)
+	burn_delay = 1 SECONDS
+	vessel_mass = 5000
+	fore_dir = SOUTH
+	vessel_size = SHIP_SIZE_SMALL
+	initial_restricted_waypoints = list(
+		"IAC Ambulance Shuttle" = list("nav_hangar_iac")
+	)
+
+	initial_generic_waypoints = list(
+		"nav_iac_rescue_ship_1",
+		"nav_iac_rescue_ship_2",
+		"nav_iac_rescue_ship_3",
+		"nav_iac_rescue_ship_4",
+		"nav_iac_rescue_ship_5"
+	)
+
+/obj/effect/overmap/visitable/ship/iac_rescue_ship/New()
+	designation = "[pick("Angitia", "Eir", "Vejovis", "Dharti", "Serket", "He Xiangu", "Sirona", "Ixtlilton", "Boris Yegorov", "Simi", "Aleksandra Hro'makar", "Assistance", "Helping Hand", "Free Aid", "Safe Haven", "Grace", "Compassion", "Relief")]"
+	..()
+
+/obj/effect/shuttle_landmark/iac_rescue_ship/nav1
+	name = "IAC Rescue Ship - Port Side"
+	landmark_tag = "nav_iac_rescue_ship_1"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/iac_rescue_ship/nav2
+	name = "IAC Rescue Ship - Port Airlock"
+	landmark_tag = "nav_iac_rescue_ship_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
+	
+/obj/effect/shuttle_landmark/iac_rescue_ship/nav3
+	name = "IAC Rescue Ship - Starboard Side"
+	landmark_tag = "nav_iac_rescue_ship_3"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
+	
+/obj/effect/shuttle_landmark/iac_rescue_ship/nav4
+	name = "IAC Rescue Ship - Aft Side"
+	landmark_tag = "nav_iac_rescue_ship_4"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
+	
+/obj/effect/shuttle_landmark/iac_rescue_ship/nav5
+	name = "IAC Rescue Ship - Fore Side"
+	landmark_tag = "nav_iac_rescue_ship_5"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/iac_rescue_ship/transit
+	name = "In transit"
+	landmark_tag = "nav_transit_iac_rescue_ship"
+	base_turf = /turf/space/transit/north
+
+//shuttle stuff
+/obj/effect/overmap/visitable/ship/landable/iac_shuttle
+	name = "IAC Ambulance Shuttle"
+	class = "IAV"
+	designation = "Heka"
+	desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to a Interstellar Aid Corps vessel."
+	shuttle = "IAC Ambulance Shuttle"
+	max_speed = 1/(3 SECONDS)
+	burn_delay = 2 SECONDS
+	vessel_mass = 3000 //very inefficient pod
+	fore_dir = NORTH
+	vessel_size = SHIP_SIZE_TINY
+
+/obj/machinery/computer/shuttle_control/explore/iac_shuttle
+	name = "shuttle control console"
+	shuttle_tag = "IAC Ambulance Shuttle"
+	req_access = list(access_iac_rescue_ship)
+
+/datum/shuttle/autodock/overmap/iac_shuttle
+	name = "IAC Ambulance Shuttle"
+	move_time = 20
+	shuttle_area = list(/area/shuttle/iac_shuttle)
+	current_location = "nav_hangar_iac"
+
+	landmark_transition = "nav_transit_iac_shuttle"
+
+	range = 1
+	fuel_consumption = 2
+	logging_home_tag = "nav_hangar_iac"
+
+	defer_initialisation = TRUE
+
+/obj/effect/shuttle_landmark/iac_shuttle/hangar
+	name = "IAC Ambulance Shuttle Hangar"
+	landmark_tag = "nav_hangar_iac"
+
+	docking_controller = "iac_shuttle_dock"
+
+	base_area = /area/ship/iac_rescue_ship/hangar
+	base_turf = /turf/simulated/floor/plating
+	movable_flags = MOVABLE_FLAG_EFFECTMOVE
+
+/obj/effect/shuttle_landmark/iac_shuttle/transit
+	name = "In transit"
+	landmark_tag = "nav_transit_iac_shuttle"
+
+	base_turf = /turf/space/transit/north
diff --git a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm
index a099d690d46..f55d11a2d30 100644
--- a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm
+++ b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm
@@ -1,115 +1,115 @@
-//iac volunteers
-
-/datum/ghostspawner/human/iac_volunteer
-	short_name = "iac_volunteer"
-	name = "IAC Volunteer"
-	desc = "Crew the IAC Rescue Ship. Help those in need and respond to medical emergencies or distress calls. Try to raise funds and donations while staying out of trouble."
-	tags = list("External")
-
-	spawnpoints = list("iac_volunteer")
-	max_count = 2
-
-	outfit = /datum/outfit/admin/freighter_crew
-	possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER)
-	allow_appearance_change = APPEARANCE_PLASTICSURGERY
-
-	assigned_role = "IAC Volunteer"
-	special_role = "IAC Volunteer"
-	respawn_flag = null
-
-
-/datum/outfit/admin/iac_volunteer
-	name = "IAC Volunteer"
-
-	uniform = /obj/item/clothing/under/rank/iacjumpsuit
-	shoes = /obj/item/clothing/shoes/iac
-	back = /obj/item/storage/backpack/satchel
-	accessory = /obj/item/clothing/accessory/armband/iac
-
-	id = /obj/item/card/id/iac_rescue_ship
-
-	l_ear = /obj/item/device/radio/headset/ship
-
-	backpack_contents = list(/obj/item/storage/box/survival = 1)
-	species_shoes = list(
-		SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless,
-		SPECIES_TAJARA = /obj/item/clothing/shoes/workboots/toeless,
-		SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless,
-		SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless,
-		SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/workboots/toeless,
-		SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless
-	)
-
-/datum/outfit/admin/iac_volunteer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	. = ..()
-	if(isvaurca(H))
-		H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask)
-		var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE]
-		H.internal = preserve
-		H.internals.icon_state = "internal1"
-		H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack)
-	if(isoffworlder(H))
-		H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack)
-
-/datum/outfit/admin/iac_volunteer/get_id_access()
-	return list(access_iac_rescue_ship, access_external_airlocks)
-
-/datum/ghostspawner/human/iac_volunteer/technician
-	short_name = "iac_technician"
-	name = "IAC Technician"
-	desc = "Crew the IAC Rescue Ship. Act as one of the ship's engineering or medical personnel. Help those in need and respond to medical emergencies or distress calls. Try to raise funds and donations while staying out of trouble."
-
-	spawnpoints = list("iac_coordinator")
-	max_count = 2
-
-	outfit = /datum/outfit/admin/iac_volunteer/technician
-	possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
-	allow_appearance_change = APPEARANCE_PLASTICSURGERY
-
-	assigned_role = "IAC Coordinator"
-	special_role = "IAC Coordinator"
-
-
-/datum/outfit/admin/iac_volunteer/technician
-	name = "IAC Coordinator"
-
-	suit= /obj/item/clothing/suit/storage/hazardvest/iac
-
-	species_shoes = list(
-		SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless/grey,
-		SPECIES_TAJARA = /obj/item/clothing/shoes/workboots/toeless/grey,
-		SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless/grey,
-		SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless/grey
-	)
-
-/datum/ghostspawner/human/iac_volunteer/coordinator
-	short_name = "iac_coordinator"
-	name = "IAC Coordinator"
-	desc = "Captain the IAC Rescue Ship. Act as the ship's chief doctor. Train your volunteers. Help those in need and respond to medical emergencies or distress calls. Try to raise funds and donations while staying out of trouble."
-
-	spawnpoints = list("iac_coordinator")
-	max_count = 1
-
-	outfit = /datum/outfit/admin/iac_volunteer/coordinator
-	possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
-	allow_appearance_change = APPEARANCE_PLASTICSURGERY
-
-	assigned_role = "IAC Coordinator"
-	special_role = "IAC Coordinator"
-
-
-/datum/outfit/admin/iac_volunteer/coordinator
-	name = "IAC Coordinator"
-
-	suit= /obj/item/clothing/suit/storage/toggle/labcoat/iac
-
-	species_shoes = list(
-		SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless/grey,
-		SPECIES_TAJARA = /obj/item/clothing/shoes/workboots/toeless/grey,
-		SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless/grey,
-		SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless/grey
-	)
-
-/obj/item/card/id/iac_rescue_ship
-	name = "iac ship id"
-	access = list(access_iac_rescue_ship, access_external_airlocks)
+//iac volunteers
+
+/datum/ghostspawner/human/iac_volunteer
+	short_name = "iac_volunteer"
+	name = "IAC Volunteer"
+	desc = "Crew the IAC Rescue Ship. Help those in need and respond to medical emergencies or distress calls. Try to raise funds and donations while staying out of trouble."
+	tags = list("External")
+
+	spawnpoints = list("iac_volunteer")
+	max_count = 2
+
+	outfit = /datum/outfit/admin/freighter_crew
+	possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER)
+	allow_appearance_change = APPEARANCE_PLASTICSURGERY
+
+	assigned_role = "IAC Volunteer"
+	special_role = "IAC Volunteer"
+	respawn_flag = null
+
+
+/datum/outfit/admin/iac_volunteer
+	name = "IAC Volunteer"
+
+	uniform = /obj/item/clothing/under/rank/iacjumpsuit
+	shoes = /obj/item/clothing/shoes/iac
+	back = /obj/item/storage/backpack/satchel
+	accessory = /obj/item/clothing/accessory/armband/iac
+
+	id = /obj/item/card/id/iac_rescue_ship
+
+	l_ear = /obj/item/device/radio/headset/ship
+
+	backpack_contents = list(/obj/item/storage/box/survival = 1)
+	species_shoes = list(
+		SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless,
+		SPECIES_TAJARA = /obj/item/clothing/shoes/workboots/toeless,
+		SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless,
+		SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless,
+		SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/workboots/toeless,
+		SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless
+	)
+
+/datum/outfit/admin/iac_volunteer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	. = ..()
+	if(isvaurca(H))
+		H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask)
+		var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE]
+		H.internal = preserve
+		H.internals.icon_state = "internal1"
+		H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack)
+	if(isoffworlder(H))
+		H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack)
+
+/datum/outfit/admin/iac_volunteer/get_id_access()
+	return list(access_iac_rescue_ship, access_external_airlocks)
+
+/datum/ghostspawner/human/iac_volunteer/technician
+	short_name = "iac_technician"
+	name = "IAC Technician"
+	desc = "Crew the IAC Rescue Ship. Act as one of the ship's engineering or medical personnel. Help those in need and respond to medical emergencies or distress calls. Try to raise funds and donations while staying out of trouble."
+
+	spawnpoints = list("iac_coordinator")
+	max_count = 2
+
+	outfit = /datum/outfit/admin/iac_volunteer/technician
+	possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
+	allow_appearance_change = APPEARANCE_PLASTICSURGERY
+
+	assigned_role = "IAC Coordinator"
+	special_role = "IAC Coordinator"
+
+
+/datum/outfit/admin/iac_volunteer/technician
+	name = "IAC Coordinator"
+
+	suit= /obj/item/clothing/suit/storage/hazardvest/iac
+
+	species_shoes = list(
+		SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless/grey,
+		SPECIES_TAJARA = /obj/item/clothing/shoes/workboots/toeless/grey,
+		SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless/grey,
+		SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless/grey
+	)
+
+/datum/ghostspawner/human/iac_volunteer/coordinator
+	short_name = "iac_coordinator"
+	name = "IAC Coordinator"
+	desc = "Captain the IAC Rescue Ship. Act as the ship's chief doctor. Train your volunteers. Help those in need and respond to medical emergencies or distress calls. Try to raise funds and donations while staying out of trouble."
+
+	spawnpoints = list("iac_coordinator")
+	max_count = 1
+
+	outfit = /datum/outfit/admin/iac_volunteer/coordinator
+	possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
+	allow_appearance_change = APPEARANCE_PLASTICSURGERY
+
+	assigned_role = "IAC Coordinator"
+	special_role = "IAC Coordinator"
+
+
+/datum/outfit/admin/iac_volunteer/coordinator
+	name = "IAC Coordinator"
+
+	suit= /obj/item/clothing/suit/storage/toggle/labcoat/iac
+
+	species_shoes = list(
+		SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless/grey,
+		SPECIES_TAJARA = /obj/item/clothing/shoes/workboots/toeless/grey,
+		SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless/grey,
+		SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless/grey
+	)
+
+/obj/item/card/id/iac_rescue_ship
+	name = "iac ship id"
+	access = list(access_iac_rescue_ship, access_external_airlocks)