mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 20:11:04 +01:00
Ire of the Betrayed - The Hiskyn Revanchist Ship (#18550)
* brothers, do we ball? * testing testing * we actually fucking ball dude * fluff * names * hiskyn flag * addresses some requested changes * few more requested changes * shuttle & thruster fixes
This commit is contained in:
RustingWithYou
+8
-5
@@ -3651,11 +3651,6 @@
|
||||
#include "maps\away\away_site\tajara\scrapper\scrapper_ghostroles.dm"
|
||||
#include "maps\away\away_site\tajara\taj_safehouse\tajara_safehouse.dm"
|
||||
#include "maps\away\away_site\tajara\taj_safehouse\tajara_safehouse_ghostroles.dm"
|
||||
#include "maps\away\away_site\unathi_pirate\izharshan\unathi_pirate_izharshan.dm"
|
||||
#include "maps\away\away_site\unathi_pirate\izharshan\unathi_pirate_izharshan_ghostroles.dm"
|
||||
#include "maps\away\away_site\unathi_pirate\tarwa\unathi_pirate_tarwa.dm"
|
||||
#include "maps\away\away_site\unathi_pirate\tarwa\unathi_pirate_tarwa_areas.dm"
|
||||
#include "maps\away\away_site\unathi_pirate\tarwa\unathi_pirate_tarwa_ghostroles.dm"
|
||||
#include "maps\away\away_site\wrecked_nt_ship\wrecked_nt_ship.dm"
|
||||
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette.dm"
|
||||
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_areas.dm"
|
||||
@@ -3777,6 +3772,14 @@
|
||||
#include "maps\away\ships\tramp_freighter\tramp_freighter.dm"
|
||||
#include "maps\away\ships\tramp_freighter\tramp_freighter_areas.dm"
|
||||
#include "maps\away\ships\tramp_freighter\tramp_freighter_ghostroles.dm"
|
||||
#include "maps\away\ships\unathi_pirate\hiskyn\unathi_pirate_hiskyn.dm"
|
||||
#include "maps\away\ships\unathi_pirate\hiskyn\unathi_pirate_hiskyn_areas.dm"
|
||||
#include "maps\away\ships\unathi_pirate\hiskyn\unathi_pirate_hiskyn_ghostroles.dm"
|
||||
#include "maps\away\ships\unathi_pirate\izharshan\unathi_pirate_izharshan.dm"
|
||||
#include "maps\away\ships\unathi_pirate\izharshan\unathi_pirate_izharshan_ghostroles.dm"
|
||||
#include "maps\away\ships\unathi_pirate\tarwa\unathi_pirate_tarwa.dm"
|
||||
#include "maps\away\ships\unathi_pirate\tarwa\unathi_pirate_tarwa_areas.dm"
|
||||
#include "maps\away\ships\unathi_pirate\tarwa\unathi_pirate_tarwa_ghostroles.dm"
|
||||
#include "maps\away\ships\wildlands_militia\militia_ship.dm"
|
||||
#include "maps\away\ships\wildlands_militia\militia_ship_ghostroles.dm"
|
||||
#include "maps\away\ships\yacht\yacht.dm"
|
||||
|
||||
@@ -3187,3 +3187,22 @@
|
||||
|
||||
/obj/structure/sign/flag/venus/large/west/Initialize(mapload)
|
||||
. = ..(mapload, WEST)
|
||||
|
||||
//Hiskyn
|
||||
/obj/item/flag/hiskyn
|
||||
name = "\improper Hiskyn's Revanchists flag"
|
||||
desc = "This crimson and black banner depicts an Unathi skull with a thin-bladed knife hanging above it. Anyone familiar with the pirate fleets of the southern Spur would recognise it as the banner of Hiskyn's Revanchists."
|
||||
desc_extended = "The Hiskyn clan was once part of the clan Kazhkz, prior to their oaths of fealty to the Empire of Dominia. The Kazhkz-Han'san fleet split over the schism, with those who refused to bend their knees to a human power taking the name of Hiskyn. This fleet is known to target Dominian vessels with a vengeance, and particularly vessels carrying Dominian Unathi, whom they bear a deep hatred for."
|
||||
flag_path = "hiskyn"
|
||||
flag_structure = /obj/structure/sign/flag/hiskyn
|
||||
|
||||
/obj/structure/sign/flag/hiskyn
|
||||
name = "\improper Hiskyn's Revanchists flag"
|
||||
desc = "This crimson and black banner depicts an Unathi skull with a thin-bladed knife hanging above it. Anyone familiar with the pirate fleets of the southern Spur would recognise it as the banner of Hiskyn's Revanchists."
|
||||
desc_extended = "The Hiskyn clan was once part of the clan Kazhkz, prior to their oaths of fealty to the Empire of Dominia. The Kazhkz-Han'san fleet split over the schism, with those who refused to bend their knees to a human power taking the name of Hiskyn. This fleet is known to target Dominian vessels with a vengeance, and particularly vessels carrying Dominian Unathi, whom they bear a deep hatred for."
|
||||
flag_path = "hiskyn"
|
||||
icon_state = "hiskyn"
|
||||
flag_item = /obj/item/flag/hiskyn
|
||||
|
||||
/obj/structure/sign/flag/hiskyn/unmovable
|
||||
unmovable = TRUE
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
################################
|
||||
# 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: RustingWithYou
|
||||
|
||||
# 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: "Adds a Hiskyn Revanchist pirate ship."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 93 KiB |
@@ -0,0 +1,150 @@
|
||||
/datum/map_template/ruin/away_site/hiskyn
|
||||
name = "Hiskyn Revanchists Ship"
|
||||
description = "Ship with pirate lizards."
|
||||
suffixes = list("ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm")
|
||||
sectors = list(SECTOR_BADLANDS, SECTOR_GAKAL)
|
||||
spawn_weight = 1
|
||||
ship_cost = 1
|
||||
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/hiskyn_shuttle)
|
||||
id = "hiskyn_revanchists"
|
||||
|
||||
unit_test_groups = list(2)
|
||||
|
||||
/singleton/submap_archetype/hiskyn
|
||||
map = "Hiskyn Revanchists Ship"
|
||||
descriptor = "Ship with pirate lizards."
|
||||
|
||||
//Overmap object
|
||||
/obj/effect/overmap/visitable/ship/hiskyn
|
||||
name = "Hiskyn Revanchist Ship"
|
||||
desc = "An Obrirava-class tanker, commonly used for transport of Helium-3 and other valuable gases by the Empire of Dominia. This one appears to have been heavily modified, with most of its fuel tanks seemingly removed and replaced based on initial scans."
|
||||
class = "ICV"
|
||||
icon_state = "freighter"
|
||||
moving_state = "freighter_moving"
|
||||
colors = list("#9c0101")
|
||||
max_speed = 1/(2 SECONDS)
|
||||
burn_delay = 1 SECONDS
|
||||
vessel_mass = 5000
|
||||
fore_dir = SOUTH
|
||||
vessel_size = SHIP_SIZE_SMALL
|
||||
designer = "Zhurong Naval Arsenal, Empire of Dominia"
|
||||
volume = "65 meters length, 25 meters beam/width, 18 meters vertical height"
|
||||
drive = "Low-Speed Warp Acceleration FTL Drive"
|
||||
weapons = "Dual wingtip-mounted heavy ballistic, starboard obscured flight craft bay"
|
||||
sizeclass = "Modified Obrirava-class tanker"
|
||||
shiptype = "Unknown"
|
||||
initial_restricted_waypoints = list(
|
||||
"Hiskyn Revanchist Shuttle" = list("nav_dock_hiskyn")
|
||||
)
|
||||
initial_generic_waypoints = list(
|
||||
"nav_hiskyn_fore",
|
||||
"nav_hiskyn_port",
|
||||
"nav_hiskyn_starboard",
|
||||
"nav_hiskyn_aft",
|
||||
"nav_hiskyn_fore_port",
|
||||
"nav_hiskyn_aft_starboard",
|
||||
"nav_hiskyn_fore_starboard",
|
||||
"nav_hiskyn_aft_port"
|
||||
)
|
||||
invisible_until_ghostrole_spawn = TRUE
|
||||
|
||||
/obj/effect/overmap/visitable/ship/hiskyn/New()
|
||||
designation = "[pick("Red-Taloned Vengeance", "Fer'is' Fury", "Storms of Ha'zana", "Knees Unbent", "Seryo's Honor", "Traveller Returning", "Roaring Skrazi", "Heartseeker", "Winds of Travakh", "Charging Eskazal", "No Surrender", "Red Reprisal", "Retribution Incarnadine", "Betrayer's Bane", "Eye for an Eye", "Vengeful Dagger")]"
|
||||
..()
|
||||
|
||||
//Navpoints
|
||||
/obj/effect/shuttle_landmark/hiskyn/fore
|
||||
name = "Fore"
|
||||
landmark_tag = "nav_hiskyn_fore"
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn/port
|
||||
name = "Port"
|
||||
landmark_tag = "nav_hiskyn_port"
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn/starboard
|
||||
name = "Starboard"
|
||||
landmark_tag = "nav_hiskyn_starboard"
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn/aft
|
||||
name = "Aft"
|
||||
landmark_tag = "nav_hiskyn_aft"
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn/dock/fore_port
|
||||
name = "Fore Port Dock"
|
||||
landmark_tag = "nav_hiskyn_fore_port"
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn/dock/aft_starboard
|
||||
name = "Aft Starboard Dock"
|
||||
landmark_tag = "nav_hiskyn_aft_starboard"
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn/dock/fore_starboard
|
||||
name = "Fore Starboard Dock"
|
||||
landmark_tag = "nav_hiskyn_fore_starboard"
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn/dock/aft_port
|
||||
name = "Aft Port Dock"
|
||||
landmark_tag = "nav_hiskyn_aft_port"
|
||||
|
||||
//Shuttle stuff
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/hiskyn_shuttle
|
||||
name = "Hiskyn Revanchist Shuttle"
|
||||
class = "ICV"
|
||||
designation = "Stalker"
|
||||
desc = "A heavily modified Yupmi-class transport shuttle, a common cargo transport in the Dominian Imperial Fleet."
|
||||
icon_state = "shuttle"
|
||||
moving_state = "shuttle_moving"
|
||||
colors = list("#9c0101")
|
||||
shuttle = "Hiskyn Revanchist Shuttle"
|
||||
sizeclass = "Yupmi-class shuttle"
|
||||
max_speed = 1/(3 SECONDS)
|
||||
burn_delay = 2 SECONDS
|
||||
vessel_mass = 3000 //very inefficient pod
|
||||
fore_dir = SOUTH
|
||||
vessel_size = SHIP_SIZE_TINY
|
||||
|
||||
/obj/machinery/computer/shuttle_control/explore/hiskyn_shuttle
|
||||
name = "shuttle control console"
|
||||
shuttle_tag = "Hiskyn Revanchist Shuttle"
|
||||
req_access = list(ACCESS_UNATHI_PIRATE)
|
||||
|
||||
/datum/shuttle/autodock/overmap/hiskyn_shuttle
|
||||
name = "Hiskyn Revanchist Shuttle"
|
||||
move_time = 20
|
||||
shuttle_area = list(/area/shuttle/hiskyn_revanchists)
|
||||
current_location = "nav_dock_hiskyn"
|
||||
landmark_transition = "nav_transit_hiskyn"
|
||||
dock_target = "airlock_hiskyn_shuttle"
|
||||
range = 1
|
||||
fuel_consumption = 2
|
||||
logging_home_tag = "nav_dock_hiskyn"
|
||||
defer_initialisation = TRUE
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn_shuttle/dock
|
||||
name = "Primary Docking Port"
|
||||
landmark_tag = "nav_dock_hiskyn"
|
||||
docking_controller = "hiskyn_shuttle_dock"
|
||||
movable_flags = MOVABLE_FLAG_EFFECTMOVE
|
||||
|
||||
/obj/effect/shuttle_landmark/hiskyn_shuttle/transit
|
||||
name = "In transit"
|
||||
landmark_tag = "nav_transit_hiskyn"
|
||||
base_turf = /turf/space/transit/north
|
||||
|
||||
/obj/item/clothing/under/unathi/hiskyn
|
||||
color = "#231f1c"
|
||||
accent_color = "#710a0a"
|
||||
|
||||
/obj/item/clothing/suit/storage/toggle/asymmetriccoat/hiskyn
|
||||
color = "#231f1c"
|
||||
|
||||
/obj/item/paper/fluff/hiskyn
|
||||
name = "KEEP OUT!"
|
||||
info = "How many times I gotta warn you tailwags about going through a man's stash! Next time I'm putting a landmine in this damned thing!"
|
||||
|
||||
/obj/item/paper/fluff/hiskyn/Initialize()
|
||||
. = ..()
|
||||
var/languagetext = "\[lang=o\]"
|
||||
languagetext += "[info]\[/lang\]"
|
||||
info = parsepencode(languagetext)
|
||||
icon_state = "paper_words"
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,77 @@
|
||||
/area/hiskyn_ship
|
||||
name = "Revanchist Ship"
|
||||
icon_state = "bluenew"
|
||||
requires_power = TRUE
|
||||
dynamic_lighting = TRUE
|
||||
no_light_control = FALSE
|
||||
base_turf = /turf/space
|
||||
area_flags = AREA_FLAG_RAD_SHIELDED
|
||||
|
||||
/area/hiskyn_ship/bridge
|
||||
name = "Revanchist Ship - Bridge"
|
||||
icon_state = "bridge"
|
||||
|
||||
/area/hiskyn_ship/hallf
|
||||
name = "Revanchist Ship - Fore Hall"
|
||||
icon_state = "hallF"
|
||||
|
||||
/area/hiskyn_ship/hallc
|
||||
name = "Revanchist Ship - Main Hall"
|
||||
icon_state = "hallC"
|
||||
|
||||
/area/hiskyn_ship/blaster
|
||||
name = "Revanchist Ship - Repurposed Dominian Fighter"
|
||||
icon_state = "thunder"
|
||||
|
||||
/area/hiskyn_ship/francisca
|
||||
name = "Revanchist Ship - Francisca Rotary Cannon"
|
||||
icon_state = "Tactical"
|
||||
|
||||
/area/hiskyn_ship/crew
|
||||
name = "Revanchist Ship - Crew Quarters"
|
||||
icon_state = "crew_quarters"
|
||||
|
||||
/area/hiskyn_ship/captain
|
||||
name = "Revanchist Ship - Captain's Quarters"
|
||||
icon_state = "captain"
|
||||
|
||||
/area/hiskyn_ship/bathroom
|
||||
name = "Revanchist Ship - Head"
|
||||
icon_state = "toilet"
|
||||
|
||||
/area/hiskyn_ship/cargobay
|
||||
name = "Revanchist Ship - Repurposed Orion Shuttle"
|
||||
icon_state = "quartloading"
|
||||
|
||||
/area/hiskyn_ship/trophy
|
||||
name = "Revanchist Ship - Trophy Room"
|
||||
icon_state = "storage"
|
||||
|
||||
/area/hiskyn_ship/medbay
|
||||
name = "Revanchist Ship - Infirmary"
|
||||
icon_state = "medbay"
|
||||
|
||||
/area/hiskyn_ship/cic
|
||||
name = "Revanchist Ship - Battle Bridge"
|
||||
icon_state = "bridge"
|
||||
|
||||
/area/hiskyn_ship/engineering
|
||||
name = "Revanchist Ship - Engineering"
|
||||
icon_state = "engineering"
|
||||
|
||||
/area/hiskyn_ship/thrustp
|
||||
name = "Revanchist Ship - Port Nacelle"
|
||||
icon_state = "engine"
|
||||
|
||||
/area/hiskyn_ship/thrusts
|
||||
name = "Revanchist Ship - Starboard Nacelle"
|
||||
icon_state = "engine"
|
||||
|
||||
/area/hiskyn_ship/armory
|
||||
name = "Revanchist Ship - Armory"
|
||||
icon_state = "armory"
|
||||
|
||||
//Shuttle
|
||||
/area/shuttle/hiskyn_revanchists
|
||||
name = "Revanchist Shuttle"
|
||||
requires_power = TRUE
|
||||
@@ -0,0 +1,55 @@
|
||||
/datum/ghostspawner/human/hiskyn
|
||||
short_name = "hiskyn"
|
||||
name = "Hiskyn's Revanchist Crewman"
|
||||
desc = "Serve aboard a ship of the pirate fleet Hiskyn's Revanchists - former Kazhkz-Han'san Unathi who refused to join the Empire of Dominia. Obey your captain, defend your ship and crew, and keep an eye out for opportunities to shed some Kazhkz-Han'san blood! NOT AN ANTAGONIST! Do not act as such."
|
||||
tags = list("External")
|
||||
welcome_message = "You are a pirate of Hiskyn's Revanchists, a fleet of former Kazhkz and Han'san Unathi who refused to join the Empire of Dominia. Obey your captain, search for opportunities to raid and plunder, and remember your fleet's deep hatred for Dominian Unathi. Though you are a pirate, remember that you are not an antagonist and should not be attacking the SCCV Horizon directly without a very good reason - though the Spark, Intrepid, Canary and any other ghostroles you might encounter are fair game."
|
||||
|
||||
spawnpoints = list("hiskyn")
|
||||
max_count = 4
|
||||
|
||||
outfit = /datum/outfit/admin/hiskyn_pirate
|
||||
possible_species = list(SPECIES_UNATHI)
|
||||
allow_appearance_change = APPEARANCE_PLASTICSURGERY
|
||||
|
||||
assigned_role = "Hiskyn Crewman"
|
||||
special_role = "Hiskyn Crewman"
|
||||
respawn_flag = null
|
||||
extra_languages = list(LANGUAGE_AZAZIBA)
|
||||
|
||||
uses_species_whitelist = FALSE
|
||||
|
||||
/datum/ghostspawner/human/hiskyn/captain
|
||||
short_name = "hiskyn_captain"
|
||||
name = "Hiskyn's Revanchist Captain"
|
||||
desc = "Command a ship of Hiskyn's Revanchists - lead your crew to plunder, glory, and revenge on the Kazhkz-Han'san traitors and their new human masters. NOT AN ANTAGONIST! Do not act as such."
|
||||
max_count = 1
|
||||
uses_species_whitelist = TRUE
|
||||
|
||||
spawnpoints = list("hiskyn_captain")
|
||||
|
||||
outfit = /datum/outfit/admin/hiskyn_pirate/captain
|
||||
|
||||
|
||||
assigned_role = "Hiskyn Captain"
|
||||
special_role = "Hiskyn Captain"
|
||||
|
||||
/datum/outfit/admin/hiskyn_pirate
|
||||
name = "Hiskyn Revanchist"
|
||||
uniform = /obj/item/clothing/under/unathi/hiskyn
|
||||
shoes = /obj/item/clothing/shoes/sandals/caligae
|
||||
id = /obj/item/card/id
|
||||
back = /obj/item/storage/backpack/satchel
|
||||
gloves = /obj/item/clothing/gloves/unathi
|
||||
l_ear = /obj/item/device/radio/headset/ship
|
||||
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/survival = 1
|
||||
)
|
||||
|
||||
/datum/outfit/admin/hiskyn_pirate/get_id_access()
|
||||
return list(ACCESS_UNATHI_PIRATE, ACCESS_EXTERNAL_AIRLOCKS)
|
||||
|
||||
/datum/outfit/admin/hiskyn_pirate/captain
|
||||
gloves = /obj/item/clothing/gloves/black_leather/unathi
|
||||
suit = /obj/item/clothing/suit/storage/toggle/asymmetriccoat/hiskyn
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
name = "empty sector"
|
||||
id = "unathi_pirate"
|
||||
description = "An empty sector."
|
||||
suffixes = list("away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm")
|
||||
suffixes = list("ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm")
|
||||
spawn_weight = 1
|
||||
ship_cost = 1
|
||||
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/unathi_pirate_izharshan)
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
/datum/map_template/ruin/away_site/tarwa
|
||||
name = "Tarwa Conglomerate Ship"
|
||||
description = "Ship with pirate lizards, pirate plants"
|
||||
suffixes = list("away_site/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm")
|
||||
suffixes = list("ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm")
|
||||
sectors = list(SECTOR_BADLANDS, SECTOR_GAKAL, SECTOR_LIGHTS_EDGE, SECTOR_WEEPING_STARS)
|
||||
spawn_weight = 1
|
||||
ship_cost = 1
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
unit_test_groups = list(2)
|
||||
|
||||
/singleton/submap_archetype/tramp_freighter
|
||||
/singleton/submap_archetype/tarwa_conglomerate
|
||||
map = "Tarwa Conglomerate Ship"
|
||||
descriptor = "Ship with pirate lizards, pirate plants"
|
||||
|
||||
Reference in New Issue
Block a user