MAP: Hearer's Hand Salvage Vessel (#1637)

maps/sierra/loadout/loadout_pda.dm

@@ -50,7 +50,7 @@
 	..()
 	var/wcomp = list()
 	slot = slot_wear_id
-	wcomp["black"]                   = /obj/item/modular_computer/pda/wrist/
+	wcomp["black"]                   = /obj/item/modular_computer/pda/wrist
 	wcomp["lightgrey"]               = /obj/item/modular_computer/pda/wrist/grey
 	wcomp["black-red (sec)"]         = /obj/item/modular_computer/pda/wrist/security
 	wcomp["brown (sup)"]             = /obj/item/modular_computer/pda/wrist/cargo

maps/sierra/loadout/loadout_tactical.dm

@@ -115,8 +115,8 @@
 	atags["NTSF tag"] = /obj/item/clothing/accessory/armor_tag/nt
 	atags["PCRC tag"] = /obj/item/clothing/accessory/armor_tag/pcrc
 	atags["SAARE tag"] = /obj/item/clothing/accessory/armor_tag/saare
-//	atags["SCP tag"] = /obj/item/clothing/accessory/armor_tag/scp
-//	atags["ZPCI tag"] = /obj/item/clothing/accessory/armor_tag/zpci
+	atags["SCP tag"] = /obj/item/clothing/accessory/armor_tag/scp
+	atags["ZPCI tag"] = /obj/item/clothing/accessory/armor_tag/zpci
 	gear_tweaks += new/datum/gear_tweak/path(atags)
 
 /datum/gear/tactical/press_tag

maps/sierra/sierra.dm

@@ -178,7 +178,7 @@
 	#include "../../mods/_maps/liberia/_map_liberia.dme"
 	#include "../../mods/_maps/sentinel/_map_sentinel.dme"
 	#include "../../mods/_maps/farfleet/_map_farfleet.dme"
-	#include "../../mods/_maps/miningpirate/_map_miningpirate.dme"
+	#include "../../mods/_maps/hand/_map_hand.dme"
 
 	#include "../../mods/antagonists/_antagonists.dme"
 	#include "../../mods/bluespace_kitty/_bluespace_kitty.dme"
@@ -206,6 +206,7 @@
 
 	#include "../../packs/factions/iccgn/_pack.dm"
 	#include "../../packs/factions/scga/_pack.dm"
+	#include "../../packs/factions/fa/_pack.dm"
 	#include "../../packs/infinity/_pack.dm"
 	#include "../../packs/deepmaint/_pack.dm"
 

mods/_maps/hand/_map_hand.dm

@@ -0,0 +1,3 @@
+/singleton/modpack/map_hand
+	name = "Корабль с пси-культистами на борту"
+	desc = "Авейка, включающая в себя старый корабль корпоративных старателей, теперь ставший базой операций для ячейки пси-культа."

mods/_maps/hand/_map_hand.dme

@@ -0,0 +1,12 @@
+#ifndef MODPACK_MAP_HAND
+#define MODPACK_MAP_HAND
+
+#include "_map_hand.dm"
+#include "code/hand.dm"
+#include "code/hand_areas.dm"
+#include "code/hand_crew.dm"
+#include "code/hand_items.dm"
+#include "code/hand_shuttles.dm"
+#include "code/hand_structures.dm"
+
+#endif

mods/_maps/hand/code/hand.dm

@@ -0,0 +1,79 @@
+	///////////
+	//OVERMAP//
+	///////////
+
+/obj/overmap/visitable/ship/hand
+	name = "Salvage Vessel"
+	desc = "Hyena-class salvage vessel used by countless independent prospectors and corporates alike"
+	color = "#40e200"
+	fore_dir = NORTH
+	vessel_mass = 3000
+	known_ships = list(
+		/obj/overmap/visitable/ship/landable/graysontug/hand_one,
+		/obj/overmap/visitable/ship/landable/graysontug/hand_two,
+		/obj/overmap/visitable/ship/landable/pod_hand_one,
+		/obj/overmap/visitable/ship/landable/pod_hand_two
+		)
+	vessel_size = SHIP_SIZE_SMALL
+
+	initial_generic_waypoints = list(
+		"nav_hand_1",
+		"nav_hand_2",
+		"nav_hand_3",
+		"nav_hand_4"
+	)
+
+	initial_restricted_waypoints = list(
+		"Hyena GM Tug-1" = list("nav_handtugone_start"),
+		"Hyena GM Tug-2" = list("nav_handtugtwo_start"),
+		"EE S-class 18-24-1" = list("nav_handpodone_start"),
+		"EE S-class 18-24-2" = list("nav_handpodtwo_start")
+	)
+
+
+#define HAND_SHIP_PREFIX pick("FTU Freeman", "SFV Adrian", "NTV Calhoun", "HIV-T Tapir", "GrM Carrion", "SAV Kilo", "EE T-class 36-78")
+/obj/overmap/visitable/ship/hand/New()
+	name = "[HAND_SHIP_PREFIX], \a [name]"
+	for(var/area/ship/hand/A)
+		A.name = "\improper [name] - [A.name]"
+		GLOB.using_map.area_purity_test_exempt_areas += A.type
+	..()
+#undef HAND_SHIP_PREFIX
+
+
+/datum/map_template/ruin/away_site/hand
+	name = "Salvage Vessel (FAV)"
+	id = "awaysite_hand_ship"
+	description = "Hyena-class salvage vessel."
+	prefix = "mods/_maps/hand/maps/"
+	suffixes = list("hand-1.dmm", "hand-2.dmm")
+	spawn_cost = 0.5
+	player_cost = 7
+	spawn_weight = 1
+	shuttles_to_initialise = list(
+		/datum/shuttle/autodock/overmap/graysontug/hand_one,
+		/datum/shuttle/autodock/overmap/graysontug/hand_two,
+		/datum/shuttle/autodock/overmap/pod_hand_one,
+		/datum/shuttle/autodock/overmap/pod_hand_two
+		)
+
+
+/obj/shuttle_landmark/nav_hand/nav1
+	name = "hand Ship Fore"
+	landmark_tag = "nav_hand_1"
+
+/obj/shuttle_landmark/nav_hand/nav2
+	name = "hand Ship Aft"
+	landmark_tag = "nav_hand_2"
+
+/obj/shuttle_landmark/nav_hand/nav3
+	name = "hand Ship Port"
+	landmark_tag = "nav_hand_3"
+
+/obj/shuttle_landmark/nav_hand/nav4
+	name = "hand Ship Starboard"
+	landmark_tag = "nav_hand_4"
+
+/obj/submap_landmark/joinable_submap/hand
+	name = "FA Salvage Vessel"
+	archetype = /singleton/submap_archetype/away_hand

mods/_maps/hand/code/hand_areas.dm

@@ -0,0 +1,164 @@
+/area/ship/hand
+	name = "\improper Salvage Vessel"
+	icon_state = "shuttle2"
+	req_access = list(access_away_hand)
+	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
+
+/area/ship/hand/crew
+	name = "Cryo Storage"
+	icon_state = "cryo"
+
+/area/ship/hand/crew/miner_one
+	name = "Prospectors Dormintories - One"
+	icon_state = "crew_quarters"
+
+/area/ship/hand/crew/miner_two
+	name = "Prospectors Dormintories - Two"
+	icon_state = "crew_quarters"
+
+/area/ship/hand/crew/miner_three
+	name = "Prospectors Dormintories - Three"
+	icon_state = "crew_quarters"
+
+/area/ship/hand/crew/miner_four
+	name = "Prospectors Dormintories - Four"
+	icon_state = "crew_quarters"
+
+
+/area/ship/hand/crew/hallway/lower
+	name = "\improper Lower Hallway - Center"
+
+/area/ship/hand/crew/hallway/lower/fore
+	name = "\improper Lower Hallway - Fore"
+	icon_state = "hallF"
+
+/area/ship/hand/crew/hallway/lower/aft
+	name = "\improper Lower Hallway - Aft"
+	icon_state = "hallA"
+
+/area/ship/hand/crew/hallway/upper
+	name = "\improper Upper Hallway - Center"
+
+/area/ship/hand/crew/hallway/upper/fore
+	name = "\improper Upper Hallway - Fore"
+	icon_state = "hallF"
+
+/area/ship/hand/crew/hallway/upper/aft
+	name = "\improper Upper Hallway - Aft"
+	icon_state = "hallA"
+
+/area/ship/hand/crew/kitchen
+	name = "\improper Galley"
+	icon_state = "kitchen"
+	req_access = list(access_away_hand)
+
+/area/ship/hand/crew/hydro
+	name = "Hydroponics"
+	icon_state = "hydro"
+
+
+/area/ship/hand/crew/bar
+	name = "\improper Canteen"
+	icon_state = "bar"
+
+
+/area/ship/hand/crew/toilet
+	name = "\improper Head"
+	icon_state = "locker"
+
+
+/area/ship/hand/cargo
+	name = "Cargo Hold"
+	icon_state = "quartstorage"
+
+/area/ship/hand/cargo/maints
+	name = "Maintenance Storage"
+
+/area/ship/hand/cargo/emergency_armory
+	name = "Emergency Armory"
+	icon_state = "locker"
+
+/area/ship/hand/engineering/hallway
+	name = "\improper Engineering Hallway"
+	icon_state = "green"
+	req_access = list(access_away_hand)
+
+/area/ship/hand/engineering/port
+	name = "\improper Engineering Equipment"
+	icon_state = "green"
+	req_access = list(access_away_hand)
+
+/area/ship/hand/engineering/starboard
+	name = "\improper Engineering Equipment"
+	icon_state = "green"
+	req_access = list(access_away_hand)
+
+/area/ship/hand/engineering/storage
+	name = "\improper Engineering Storage"
+	icon_state = "green"
+	req_access = list(access_away_hand)
+
+
+/area/ship/hand/maintenance/solarport
+	name = "Solar Maintenance - Port"
+	icon_state = "SolarcontrolP"
+
+/area/ship/hand/maintenance/solarstarboard
+	name = "Solar Maintenance - Starboard"
+	icon_state = "SolarcontrolS"
+
+
+/area/ship/hand/medbay
+	name = "\improper Medical Bay"
+	icon_state = "medbay"
+	req_access = list(access_away_hand)
+
+/area/ship/hand/medbay/storage
+	name = "\improper Medical Bay Lobby"
+	icon_state = "medbay"
+	req_access = list(access_away_hand)
+
+
+
+#define HAND_ENG_AMBIENCE list('sound/ambience/ambiatm1.ogg')
+/area/ship/hand/maintenance/atmos
+	name = "\improper Atmospherics Comparment"
+	icon_state = "atmos"
+	ambience = HAND_ENG_AMBIENCE
+	req_access = list(access_away_hand)
+
+/area/ship/hand/maintenance/atmos/fuel
+	name = "\improper Fuel Comparment"
+
+/area/ship/hand/maintenance/engine
+	icon_state = "engine"
+	ambience = HAND_ENG_AMBIENCE
+	req_access = list(access_away_hand)
+
+/area/ship/hand/maintenance/engine/port
+	name = "\improper Port Thruster"
+
+/area/ship/hand/maintenance/engine/starboard
+	name = "\improper Starboard Thruster"
+
+#undef HAND_ENG_AMBIENCE
+
+
+/area/ship/hand/command
+	name = "\improper Flight Officers Quarters"
+	icon_state = "bridge"
+	req_access = list(access_away_hand_captain)
+
+/area/ship/hand/command/medic
+	name = "\improper Senior Staff Quarters"
+	icon_state = "bridge"
+	req_access = list(access_away_hand_med)
+
+/area/ship/hand/command/bridge
+	name = "\improper Bridge"
+	icon_state = "bridge"
+
+/area/ship/hand/airlock
+	name = "\improper External Airlock"
+	icon_state = "entry_1"
+	req_access = list(access_away_hand)