The DPRA enters the scene: the Hailstorm Ship (#15567)

aurorastation.dme

@@ -3085,6 +3085,7 @@
 #include "code\modules\vehicles\pussywagon.dm"
 #include "code\modules\vehicles\train.dm"
 #include "code\modules\vehicles\vehicle.dm"
+#include "code\modules\vehicles\wasp_torpedo.dm"
 #include "code\modules\ventcrawl\ventcrawl.dm"
 #include "code\modules\ventcrawl\ventcrawl_atmospherics.dm"
 #include "code\modules\ventcrawl\ventcrawl_verb.dm"
@@ -3207,6 +3208,9 @@
 #include "maps\away\ships\dionae\diona_serz_ship\diona_serz_ship_ghostroles.dm"
 #include "maps\away\ships\dominia\dominian_corvette.dm"
 #include "maps\away\ships\dominia\dominian_corvette_ghostroles.dm"
+#include "maps\away\ships\dpra\hailstorm\hailstorm_areas.dm"
+#include "maps\away\ships\dpra\hailstorm\hailstorm_ghostroles.dm"
+#include "maps\away\ships\dpra\hailstorm\hailstorm_ship.dm"
 #include "maps\away\ships\einstein\ee_spy_ship.dm"
 #include "maps\away\ships\einstein\ee_spy_ship_ghostroles.dm"
 #include "maps\away\ships\elyra\elyra_strike_craft.dm"

code/game/jobs/access_datum.dm

@@ -637,4 +637,9 @@ var/const/access_kataphract_knight = 114
 /var/const/access_nka = 213
 /datum/access/access_nka
 	id = access_nka
+	access_type = ACCESS_TYPE_CENTCOM
+
+/var/const/access_dpra = 214
+/datum/access/access_dpra
+	id = access_dpra
 	access_type = ACCESS_TYPE_CENTCOM

code/modules/clothing/head/xenos/tajara.dm

@@ -79,6 +79,12 @@
 	icon_state = "alaberetalt"
 	item_state = "alaberetalt"
 
+/obj/item/clothing/head/beret/tajaran/pvsm
+	name = "people's volunteer spacer militia beret"
+	desc = "A beret issued to people's volunteer spacer militia."
+	icon_state = "alaberetalt"
+	item_state = "alaberetalt"
+
 /obj/item/clothing/head/beret/tajaran/nka
 	name = "new kingdom naval beret"
 	desc = "A formal black beret with a blue band. This is worn by NKA naval servicemen and crewmen such as the Imperial Marines."
@@ -175,4 +181,19 @@
 	name = "her majesty's mercantile flotilla captain cap"
 	desc = "A cap worn by the captain of the New Kingdom's space merchant navy. A fancier version of the sailor cap."
 	icon_state = "nka_merchant_navy_captain_hat"
-	item_state = "nka_merchant_navy_captain_hat"
+	item_state = "nka_merchant_navy_captain_hat"
+
+/obj/item/clothing/head/tajaran/ala_officer
+	name = "adhomai liberation army officer hat"
+	desc = "A cap issued to adhomai liberation army officers."
+	icon_state = "ala-officer_hat"
+	item_state = "ala-officer_hat"
+
+/obj/item/clothing/head/tajaran/ala_wraps
+	name = "adhomai liberation army face wraps"
+	desc = "Face wraps used by soldier and guerilla forces of the adhomai liberation army."
+	icon_state = "ala-grunt-wraps-hood"
+	item_state = "ala-grunt-wraps-hood"
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
+	body_parts_covered = HEAD|FACE|EYES
+	species_restricted = list(BODYTYPE_TAJARA)

code/modules/clothing/spacesuits/void/alien.dm

@@ -201,6 +201,44 @@
 	species_restricted = list(BODYTYPE_TAJARA)
 	refittable = FALSE
 
+/obj/item/clothing/suit/space/void/dpra
+	name = "people's volunteer spacer militia voidsuit"
+	desc = "A refitted, sturdy voidsuit created from corporate models acquired during the liberation of Gaka'zaal. These armored models are issued to the People's volunteer spacer militia."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "DPRA_voidsuit"
+	item_state = "DPRA_voidsuit"
+	contained_sprite = TRUE
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_PISTOL,
+		energy = ARMOR_ENERGY_MINOR,
+		bomb = ARMOR_BOMB_PADDED,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_RESISTANT
+	)
+	species_restricted = list(BODYTYPE_TAJARA)
+	refittable = FALSE
+
+/obj/item/clothing/head/helmet/space/void/dpra
+	name = "people's volunteer spacer militia voidsuit helmet"
+	desc = "A refitted, sturdy voidsuit created from corporate models acquired during the liberation of Gaka'zaal. These armored models are issued to the People's volunteer spacer militia."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "DPRA_voidsuit_helmet"
+	item_state = "DPRA_voidsuit_helmet"
+	contained_sprite = TRUE
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_PISTOL,
+		energy = ARMOR_ENERGY_MINOR,
+		bomb = ARMOR_BOMB_PADDED,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_RESISTANT
+	)
+	species_restricted = list(BODYTYPE_TAJARA)
+	refittable = FALSE
+
 /obj/item/clothing/head/helmet/space/void/unathi_pirate
 	name = "unathi raider helmet"
 	desc = "A cheap but effective helmet made to fit with a larger combat assembly."

code/modules/clothing/under/xenos/tajara.dm

@@ -50,7 +50,7 @@
 	desc = "A military uniform used by the forces of the People's Republic of Adhomai orbital fleet."
 	icon_state = "cosmonaut"
 	item_state = "cosmonaut"
-	desc_extended = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
+	desc_extended = "The People's Republic of Adhomai enjoys having the first militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
 	protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
 	contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
 	ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
@@ -294,4 +294,54 @@
 	name = "her majesty's mercantile flotilla captain uniform"
 	desc = "An uniform used by the captain of the New Kingdom's merchant space ships. Not as fancy as the ones used in the Royal Navy."
 	icon_state = "nka_merchant_captain"
-	item_state = "nka_merchant_captain"
+	item_state = "nka_merchant_captain"
+
+/obj/item/clothing/under/tajaran/pvsm
+	name = "people's volunteer spacer militia uniform"
+	desc = "A military uniform used by the forces of the People's Volunteer Spacer Militia."
+	icon_state = "pvsm_crewman"
+	item_state = "pvsm_crewman"
+	desc_extended = "Having only recently claimed a space-positioned base alongside Gaka'zaal, the DPRA lacks any sort of trained force when it comes to orbital defense. Not wanting to \
+	rely purely on mercenaries due to the expenses and their scant loyalty, a militia was organized. Members of the Spacer Militia come from a variety of backgrounds: some coming back \
+	after being employed by mega-corporations; others from asteroid belts; some soldiers from Adhomai; and more from the Free Gakal'Zaal Station itself, having worked on it as maintenance."
+	starting_accessories = (/obj/item/clothing/accessory/storage/bayonet)
+	siemens_coefficient = 0.5
+	armor = list(
+		melee = ARMOR_MELEE_SMALL,
+		bullet = ARMOR_BALLISTIC_MINOR)
+
+/obj/item/clothing/under/tajaran/pvsm/captain
+	name = "people's volunteer spacer militia captain uniform"
+	desc = "A military uniform used by the captains of the People's Volunteer Spacer Militia."
+	icon_state = "pvsm_captain"
+	item_state = "pvsm_captain"
+
+/obj/item/clothing/under/tajaran/ala
+	name = "adhomai liberation army uniform"
+	desc = "A military uniform issued to soldiers of the adhomai liberation army."
+	icon_state = "ala-soldier-civ"
+	item_state = "ala-soldier-civ"
+	starting_accessories = list(/obj/item/clothing/accessory/storage/bayonet)
+	siemens_coefficient = 0.7
+	armor = list(
+		melee = ARMOR_MELEE_SMALL,
+		bullet = ARMOR_BALLISTIC_MINOR)
+
+/obj/item/clothing/under/tajaran/ala/wraps
+	icon_state = "ala-grunt-wraps"
+	item_state = "ala-grunt-wraps"
+
+/obj/item/clothing/under/tajaran/ala/black
+	icon_state = "ala-soldat"
+	item_state = "ala-soldat"
+
+/obj/item/clothing/under/tajaran/ala/black/dress
+	name = "adhomai liberation army dress uniform"
+	icon_state = "ala-soldatdress"
+	item_state = "ala-soldatdress"
+
+/obj/item/clothing/under/tajaran/ala/black/officer
+	name = "adhomai liberation army officer uniform"
+	desc = "A military uniform issued to officers of the adhomai liberation army."
+	icon_state = "ala-officer"
+	item_state = "ala-officer"

code/modules/effects/ion_trail_follow.dm

@@ -1,10 +1,12 @@
 /datum/effect_system/ion_trail
 	var/turf/old_location
+	var/fade_icon = "ion_fade"
+	var/ion_trails_type = /obj/effect/effect/ion_trails
 
 /datum/effect_system/ion_trail/New(atom/source_atom)
 	if (source_atom)
 		bind(source_atom)
-	
+
 	..(FALSE)
 
 /datum/effect_system/ion_trail/process()
@@ -16,12 +18,12 @@
 
 	if (old_location != location)
 		if (location.is_hole)	// openspace or space.
-			var/obj/effect/effect/ion_trails/I = new(old_location)
+			var/obj/effect/effect/ion_trails/I = new ion_trails_type(old_location)
 			if (holder)
 				I.set_dir(holder.dir)
-
-			flick("ion_fade", I)
-			I.icon_state = "blank"
+			if(fade_icon)
+				flick(fade_icon, I)
+				I.icon_state = "blank"
 			animate(I, alpha = 0, time = 18, easing = SINE_EASING | EASE_IN)
 			QDEL_IN(I, 20)
 
@@ -38,7 +40,15 @@
 	old_location = null
 	return ..()
 
+/datum/effect_system/ion_trail/explosion
+	fade_icon = null
+	ion_trails_type = /obj/effect/effect/ion_trails/explosion
+
 /obj/effect/effect/ion_trails
 	name = "ion trails"
 	icon_state = "ion_trails"
 	anchored = TRUE
+
+/obj/effect/effect/ion_trails/explosion
+	name = "combustion trails"
+	icon_state = "explosion_particle"

code/modules/projectiles/ammunition/boxes.dm

@@ -412,6 +412,9 @@
 	icon_state = "battlerifle_mag"
 	multiple_sprites = 0
 
+/obj/item/ammo_magazine/c762/dpra
+	icon_state = "mrrazhak_mag"
+
 /obj/item/ammo_magazine/boltaction
 	name = "ammo clip (7.62mm)"
 	icon_state = "762"

code/modules/projectiles/guns/projectile/automatic.dm

@@ -447,15 +447,15 @@
 
 /obj/item/gun/projectile/automatic/rifle/adhomian
 	name = "adhomian automatic rifle"
-	desc = "The Tsarrayut'yan rifle is a select-fire, crew-served automatic rifle producted by the People's Republic of Adhomai."
+	desc = "The Tsarrayut'yan rifle is a select-fire automatic rifle producted by the People's Republic of Adhomai."
 	icon = 'icons/obj/guns/tsarrayut.dmi'
 	icon_state = "tsarrayut"
 	item_state = "tsarrayut"
 	contained_sprite = TRUE
 
-	desc_extended = "People's Republic military hardware is the most advanced among the Tajaran nations. Laser weapons, alongside simple ballistic guns, are used by high ranking soldiers or \
-	special operatives. The majority of military is still equipped with simple bolt action rifles, that are being slowly replaced by the Tsarrayut'yan rifle; a select-fire, crew-served \
-	automatic rifle. Regardless of advances in the small arms field, artillery is the Republican army's main weapon and pride."
+	desc_extended = "Unlike the other Adhomian factions, the Hadiist military has fully adopted automatic weapons. Their service rifle is the Tsarrayut'yan rifle, a select-fire, \
+	automatic rifle. Laser weapons are usually used by high-ranking soldiers or special operatives. Regardless of advances in the small arms field, artillery is the Republican army’s \
+	main weapon and pride."
 
 	load_method = SINGLE_CASING|SPEEDLOADER
 
@@ -473,6 +473,38 @@
 	knife_x_offset = 23
 	knife_y_offset = 14
 
+/obj/item/gun/projectile/automatic/rifle/dpra
+	name = "adhomian assault rifle"
+	desc = "The Mrrazhak Model-1 is the newest Al'mariist automatic rifle. The Mrrazhak is notorious for its simple and reliable design; it can be fabricated and assembled without the \
+	need of a specialized industry or a highly trained workforce."
+	icon = 'icons/obj/guns/mrrazhak.dmi'
+	icon_state = "mrrazhak"
+	item_state = "mrrazhak"
+
+	can_bayonet = TRUE
+	knife_x_offset = 22
+	knife_y_offset = 13
+
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
+	fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg'
+
+	is_wieldable = TRUE
+
+	can_bayonet = TRUE
+
+
+	magazine_type = /obj/item/ammo_magazine/c762/dpra
+	allowed_magazines = list(/obj/item/ammo_magazine/c762/dpra)
+
+/obj/item/gun/projectile/automatic/rifle/dpra/update_icon()
+	..()
+	if(ammo_magazine)
+		icon_state = "mrrazhak"
+		item_state = "mrrazhak"
+	else
+		icon_state = "mrrazhak_nomag"
+		item_state = "mrrazhak_nomag"
+
 /obj/item/gun/projectile/automatic/tommygun
 	name = "submachine gun"
 	desc = "An adhomian made submachine gun. Uses .45 rounds."

code/modules/vehicles/bike.dm

@@ -26,14 +26,15 @@
 	var/storage_type = /obj/item/storage/toolbox/bike_storage
 	var/obj/item/storage/storage_compartment
 	var/datum/effect_system/ion_trail/ion
+	var/ion_type = /datum/effect_system/ion_trail
 	var/kickstand = TRUE
 	var/can_hover = TRUE
 
 /obj/vehicle/bike/setup_vehicle()
 	..()
-	ion = new(src)
+	ion = new ion_type(src)
 	turn_off()
-	add_overlay(image('icons/obj/bike.dmi', "[icon_state]_off_overlay", MOB_LAYER + 1))
+	add_overlay(image(icon, "[icon_state]_off_overlay", MOB_LAYER + 1))
 	icon_state = "[bike_icon]_off"
 	if(storage_type)
 		storage_compartment = new storage_type(src)
@@ -178,10 +179,10 @@
 	cut_overlays()
 
 	if(on)
-		add_overlay(image('icons/obj/bike.dmi', "[bike_icon]_on_overlay", MOB_LAYER + 1))
+		add_overlay(image(icon, "[bike_icon]_on_overlay", MOB_LAYER + 1))
 		icon_state = "[bike_icon]_on"
 	else
-		add_overlay(image('icons/obj/bike.dmi', "[bike_icon]_off_overlay", MOB_LAYER + 1))
+		add_overlay(image(icon, "[bike_icon]_off_overlay", MOB_LAYER + 1))
 		icon_state = "[bike_icon]_off"
 
 	..()
@@ -194,6 +195,9 @@
 
 /obj/vehicle/bike/Collide(var/atom/movable/AM)
 	. = ..()
+	collide_act(AM)
+
+/obj/vehicle/bike/proc/collide_act(var/atom/movable/AM)
 	var/mob/living/M
 	if(!buckled)
 		return

code/modules/vehicles/wasp_torpedo.dm

@@ -0,0 +1,109 @@
+/obj/vehicle/bike/wasp_torpedo
+	name = "wasp torpedo"
+	desc = "A manned torpedo used by the Al'mariist space forces."
+	icon = 'icons/obj/wasp_torpedo.dmi'
+	icon_state = "torpedo_off"
+
+	desc_info = "Click-drag yourself onto the torpedo to climb onto it.<br>\
+		- CTRL-click the torpedo to toggle the engine.<br>\
+		- ALT-click to toggle the kickstand which prevents movement by driving and dragging.<br>\
+		- Click the resist button or type \"resist\" in the command bar at the bottom of your screen to get off the torpedo.<br>\
+		- CTRL-SHIFT-click to cause it to charge and detonate on impact."
+
+	health = 300
+	maxhealth = 300
+
+	fire_dam_coeff = 0.5
+	brute_dam_coeff = 0.4
+
+	mob_offset_y = 1
+
+	bike_icon = "torpedo"
+	dir = EAST
+
+	land_speed = 3
+	space_speed = 1
+
+	storage_type = null
+
+	pixel_y = -16
+	pixel_x = -16
+
+	ion_type = /datum/effect_system/ion_trail/explosion
+
+	var/primmed = FALSE
+
+/obj/item/mesmetron/Destroy()
+	STOP_PROCESSING(SSfast_process, src)
+	. = ..()
+
+/obj/vehicle/bike/wasp_torpedo/collide_act(var/atom/movable/AM)
+	if(!AM.density)
+		return
+	if(!primmed)
+		return
+
+	torpedo_explosion()
+
+/obj/vehicle/bike/wasp_torpedo/proc/torpedo_explosion()
+	STOP_PROCESSING(SSfast_process, src)
+	primmed = FALSE
+	if(prob(25) && buckled) //has a chance of being thrown off when it explodes
+		if(ishuman(buckled))
+			var/mob/living/carbon/human/C = buckled
+			C.visible_message(SPAN_DANGER ("\The [C] is thrown off from \the [src]!"))
+			unload(C)
+			C.throw_at(get_edge_target_turf(loc, loc.dir), 5, 1)
+			C.apply_effect(2, WEAKEN)
+	if(buckled)
+		unload(buckled)
+		if(ishuman(buckled))
+			var/mob/living/carbon/human/V = buckled
+			V.apply_effect(2, WEAKEN)
+	explosion(loc, 1, 2, 4, 8)
+	visible_message(SPAN_DANGER ("\The [src] detonates!"))
+	qdel(src)
+
+/obj/vehicle/bike/wasp_torpedo/proc/prime(var/mob/user)
+	if(primmed)
+		if(user)
+			to_chat(src, SPAN_WARNING("The priming button is jammed. There is no turning back now."))
+		return
+	if(!on)
+		turn_on()
+	kickstand = FALSE
+	visible_message(SPAN_DANGER ("\The [src] begins to beep omnisouly before charging!"))
+	playsound(get_turf(src), 'sound/items/countdown.ogg', 75, 1, -3)
+	primmed = TRUE
+	land_speed = 1
+	space_speed = 1
+	START_PROCESSING(SSprocessing, src)
+
+/obj/vehicle/bike/wasp_torpedo/CtrlShiftClick(var/mob/user)
+	prime(user)
+
+/obj/vehicle/bike/wasp_torpedo/process()
+	if(!primmed)
+		return
+	Move(get_step(src, dir))
+
+/obj/vehicle/bike/wasp_torpedo/turn_off()
+	if(primmed)
+		return
+	..()
+
+/obj/vehicle/bike/wasp_torpedo/bullet_act(var/obj/item/projectile/Proj)
+	if(Proj.get_structure_damage())
+		if(prob(10))
+			torpedo_explosion()
+	..()
+
+/obj/vehicle/bike/wasp_torpedo/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			torpedo_explosion()
+			return
+		if(2.0)
+			if(prob(50))
+				torpedo_explosion()
+	..()

html/changelogs/alberyk-dpraship.yml

@@ -0,0 +1,6 @@
+author: Alberyk, Atteria, Canon35, Wowzewow (Wezzy), CaptainGecko
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a new ship: the DPRA Hailstorm."

maps/away/ships/dpra/hailstorm/hailstorm_areas.dm

@@ -0,0 +1,52 @@
+/area/hailstorm_ship
+	name = "Hailstorm Ship"
+	icon_state = "bluenew"
+	requires_power = TRUE
+	dynamic_lighting = TRUE
+	no_light_control = FALSE
+	base_turf = /turf/space
+	flags = RAD_SHIELDED
+
+/area/hailstorm_ship/bridge
+	name = "Hailstorm Ship Bridge"
+	icon_state = "bridge"
+
+/area/hailstorm_ship/crew
+	name = "Hailstorm Ship Crew Section"
+	icon_state = "bar"
+
+/area/hailstorm_ship/gun_deck
+	name = "Hailstorm Ship Gun Deck"
+	icon_state = "Tactical"
+
+/area/hailstorm_ship/gun_deck/second
+	name = "Hailstorm Ship Secondary Gun Deck"
+	icon_state = "zta"
+
+/area/hailstorm_ship/eva
+	name = "Hailstorm Ship EVA Storage"
+	icon_state = "medbay"
+
+/area/hailstorm_ship/engineering
+	name = "Hailstorm Ship Engineering"
+	icon_state = "engineering"
+
+/area/hailstorm_ship/atmospherics
+	name = "Hailstorm Ship Atmospherics"
+	icon_state = "engineering"
+
+/area/hailstorm_ship/engine
+	name = "Hailstorm Ship Engine"
+	icon_state = "engine"
+
+/area/hailstorm_ship/armory
+	name = "Hailstorm Ship Armory"
+	icon_state = "armory"
+
+/area/hailstorm_ship/barracks
+	name = "Headmaster Barracks"
+	icon_state = "crew_quarters"
+
+/area/shuttle/hailstorm_shuttle
+	name = "\improper Hailstorm Shuttle"
+	requires_power = TRUE

maps/away/ships/dpra/hailstorm/hailstorm_ghostroles.dm

@@ -0,0 +1,91 @@
+/datum/ghostspawner/human/hailstorm_crew
+	short_name = "hailstorm_crew"
+	name = "Hailstorm Ship Crew"
+	desc = "Crew a People's Volunteer Spacer Militia ship."
+	tags = list("External")
+
+	spawnpoints = list("hailstorm_crew")
+	max_count = 3
+	uses_species_whitelist = FALSE
+
+	outfit = /datum/outfit/admin/hailstorm_crew
+	possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN)
+	allow_appearance_change = APPEARANCE_PLASTICSURGERY
+	respawn_flag = null
+
+	assigned_role = "Hailstorm Ship Crew"
+	special_role = "Hailstorm Ship Crew"
+	extra_languages = list(LANGUAGE_SIIK_MAAS)
+
+
+/datum/outfit/admin/hailstorm_crew
+	name = "People's Volunteer Spacer Militia Crew"
+
+	id = /obj/item/card/id
+	shoes = /obj/item/clothing/shoes/tajara/jackboots
+
+	uniform = /obj/item/clothing/under/tajaran/pvsm
+	l_ear = /obj/item/device/radio/headset/ship
+
+	back = /obj/item/storage/backpack/rucksack
+	belt = /obj/item/storage/belt/military
+
+	r_pocket = /obj/item/storage/wallet/random
+
+/datum/outfit/admin/hailstorm_crew/get_id_access()
+	return list(access_dpra, access_external_airlocks)
+
+/datum/ghostspawner/human/hailstorm_crew/captain
+	short_name = "hailstorm_captain"
+	name = "Hailstorm Ship Captain"
+	desc = "Command a People's Volunteer Spacer Militia ship."
+	tags = list("External")
+
+	spawnpoints = list("hailstorm_captain")
+	max_count = 1
+
+	outfit = /datum/outfit/admin/hailstorm_crew/captain
+	possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
+
+	assigned_role = "Hailstorm Ship Captain"
+	special_role = "Hailstorm Ship Captain"
+	extra_languages = list(LANGUAGE_SIIK_MAAS)
+
+/datum/outfit/admin/hailstorm_crew/captain
+	name = "People's Volunteer Spacer Militia Captain"
+
+	head = /obj/item/clothing/head/beret/tajaran/pvsm
+
+	uniform = /obj/item/clothing/under/tajaran/pvsm/captain
+	accessory = /obj/item/clothing/accessory/holster/hip
+	accessory_contents = list(/obj/item/gun/projectile/silenced = 1)
+
+/datum/ghostspawner/human/hailstorm_crew/advisor
+	short_name = "hailstorm_advisor"
+	name = "Hailstorm ALA Advisor"
+	desc = "Help train and guide the crew of the Hailstorm as an advisor from the Adhomai Liberation Army."
+	tags = list("External")
+
+	spawnpoints = list("hailstorm_advisor")
+	max_count = 1
+	uses_species_whitelist = TRUE
+
+	outfit = /datum/outfit/admin/hailstorm_crew/advisor
+	possible_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI)
+
+	assigned_role = "Hailstorm Ship ALA Advisor"
+	special_role = "Hailstorm Ship ALA Advisor"
+	extra_languages = list(LANGUAGE_SIIK_MAAS)
+
+/datum/outfit/admin/hailstorm_crew/advisor
+	name = "People's Volunteer Spacer Militia ALA Advisor"
+
+	head = /obj/item/clothing/head/tajaran/ala_officer
+
+	uniform = /obj/item/clothing/under/tajaran/ala/black/officer
+	accessory = /obj/item/clothing/accessory/storage/bandolier
+	accessory_contents = list(/obj/item/ammo_casing/shotgun = 5,
+							/obj/item/ammo_casing/shotgun/pellet = 5)
+
+	belt = /obj/item/gun/projectile/shotgun/foldable
+	backpack_contents = list(/obj/item/gun/projectile/silenced = 1)

maps/away/ships/dpra/hailstorm/hailstorm_ship.dm

@@ -0,0 +1,103 @@
+/datum/map_template/ruin/away_site/hailstorm_ship
+	name = "Hailstorm Ship"
+	id = "hailstorm_ship"
+	description = "A People's Volunteer Spacer Militia ship."
+	suffixes = list("ships/dpra/hailstorm/hailstorm_ship.dmm")
+	ship_cost = 1
+	spawn_weight = 1
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/hailstorm_shuttle)
+	sectors = list(SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_GAKAL)
+
+/singleton/submap_archetype/hailstorm_ship
+	map = "Hailstorm Ship"
+	descriptor = "A skipjack armed with multiple mass-driver weapons designed for patrolling and brief engagements. When used for patrols, the Hailstorm is loaded with supplies to last weeks on its own; its crew is specifically trained to be as frugal as possible while aboard."
+
+/obj/effect/overmap/visitable/ship/hailstorm_ship
+	name = "Hailstorm Ship"
+	desc = "A skipjack armed with multiple mass-driver weapons designed for patrolling and brief engagements. When used for patrols, the Hailstorm is loaded with supplies to last weeks on its own; its crew is specifically trained to be as frugal as possible while aboard."
+	class = "DPRAMV" //Democratic People's Republic of Adhomai Vessel
+	icon_state = "ship"
+	moving_state = "ship_moving"
+	vessel_mass = 10000
+	max_speed = 1/(2 SECONDS)
+	fore_dir = NORTH
+	vessel_size = SHIP_SIZE_SMALL
+	initial_generic_waypoints = list(
+		"nav_hailstorm_ship_1",
+		"nav_hailstorm_ship_2",
+		"nav_hailstorm_ship_3",
+		"nav_hailstorm_ship_4"
+	)
+	initial_restricted_waypoints = list(
+		"Spacer Militia Shuttle" = list("nav_hailstorm_shuttle")
+	)
+
+/obj/effect/overmap/visitable/ship/hailstorm_ship/New()
+	designation = "[pick("Al'mari", "Champion of the Tajara", "Nated's Revenge", "Mata'ke's Blade", "Star Guerilla", "Dreams of Freedom", "Al'mariist Comet", "Adhomai's Liberator")]"
+	..()
+
+/obj/effect/shuttle_landmark/hailstorm_ship
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav1
+	name = "Hailstorm Ship Navpoint #1"
+	landmark_tag = "nav_hailstorm_ship_1"
+
+/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav2
+	name = "Hailstorm Ship Navpoint #2"
+	landmark_tag = "nav_hailstorm_ship_2"
+
+/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav3
+	name = "Hailstorm Ship Navpoint #3"
+	landmark_tag = "nav_hailstorm_ship_3"
+
+/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav4
+	name = "Hailstorm Ship Navpoint #4"
+	landmark_tag = "nav_hailstorm_ship_4"
+
+
+//shuttle
+/obj/effect/overmap/visitable/ship/landable/hailstorm_shuttle
+	name = "Spacer Militia Shuttle"
+	desc = "A simple and reliable shuttle design used by the Spacer Militia Shuttle."
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	class = "DPRAMV"
+	designation = "Yve'kha"
+	shuttle = "Spacer Militia 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/hailstorm_shuttle
+	name = "shuttle control console"
+	shuttle_tag = "Spacer Militia Shuttle"
+
+
+/datum/shuttle/autodock/overmap/hailstorm_shuttle
+	name = "Spacer Militia Shuttle"
+	move_time = 20
+	shuttle_area = list(/area/shuttle/hailstorm_shuttle)
+	current_location = "nav_hailstorm_shuttle"
+	landmark_transition = "nav_transit_hailstorm_shuttle"
+	dock_target = "hailstorm_shuttle"
+	range = 1
+	fuel_consumption = 2
+	logging_home_tag = "nav_hailstorm_shuttle"
+	defer_initialisation = TRUE
+
+/obj/effect/shuttle_landmark/hailstorm_shuttle/hangar
+	name = "Spacer Militia Shuttle Hangar"
+	landmark_tag = "nav_hailstorm_shuttle"
+	docking_controller = "hailstorm_shuttle_dock"
+	base_area = /area/space
+	base_turf = /turf/space
+	movable_flags = MOVABLE_FLAG_EFFECTMOVE
+
+/obj/effect/shuttle_landmark/hailstorm_shuttle/transit
+	name = "In transit"
+	landmark_tag = "nav_transit_hailstorm_shuttle"
+	base_turf = /turf/space/transit/north