cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a Tajaran Smuggler Ship (#14683)

Browse Source
This commit is contained in:
Alberyk
2022-10-13 19:59:20 +02:00
committed by GitHub
parent 85168c4d97
commit a72d9ad97e
10 changed files with 67406 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aurorastation.dme
+2
View File
@@ -3171,6 +3171,8 @@
#include "maps\away\ships\elyra_ship_ghostroles.dm"
#include "maps\away\ships\sol.dm"
#include "maps\away\ships\sol_ship_ghostroles.dm"
#include "maps\away\ships\tajaran_smuggler.dm"
#include "maps\away\ships\tajaran_smuggler_ghostroles.dm"
#include "maps\away\ships\tirakqi_freighter.dm"
#include "maps\away\ships\tirakqi_freighter_ghostroles.dm"
#include "maps\away\ships\wildcard.dm"
code/game/objects/items/weapons/material/knives.dm
+9
View File
@@ -69,6 +69,15 @@
item_state = "knife"
applies_material_colour = 0
/obj/item/material/knife/raskariim
name = "adhomian ritual dagger"
desc = "An adhomian knife used in occult rituals."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "raskariim_dagger"
item_state = "raskariim_dagger"
contained_sprite = TRUE
applies_material_colour = FALSE
/obj/item/material/knife/bayonet
name = "bayonet"
desc = "A sharp military knife, can be attached to a rifle."
code/modules/clothing/gloves/xeno/tajara.dm
+24
View File
@@ -61,3 +61,27 @@
desc_fluff = "The quality of life for an urban dweller in Nal'tor, or any other major city, can vary considerably according to the Tajara's occupation, education and standing \
with the Party. The average worker that labours in the industrial suburbs, can expect an honest living to be made, and a modest lifestyle to be led. The majority of the city labourers \
work in government run factories and spaceports, with stable but strict work hours and schedule the Hadii regime boasts of its fairness to the worker."
/obj/item/clothing/gloves/tajaran_gauntlets
name = "adhomian gauntlets"
desc = "A pair of armored gauntlets made for Tajaran use."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "armored_arms"
item_state = "armored_arms"
contained_sprite = TRUE
species_restricted = list(BODYTYPE_TAJARA)
body_parts_covered = ARMS|HANDS
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
punch_force = 5
clipped = TRUE
drop_sound = 'sound/items/drop/toolbox.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
code/modules/clothing/shoes/xeno/tajara.dm
+19 -1
View File
@@ -180,4 +180,22 @@
item_state = "fancy_shoes"
body_parts_covered = FEET
species_restricted = list(BODYTYPE_TAJARA)
contained_sprite = TRUE
contained_sprite = TRUE
/obj/item/clothing/shoes/tajara/armored
name = "adhomian armored boots"
icon = 'icons/obj/tajara_items.dmi'
desc = "A pair of armored adhomian boots."
icon_state = "armored_legs"
item_state = "armored_legs"
contained_sprite = TRUE
body_parts_covered = FEET|LEGS
species_restricted = list(BODYTYPE_TAJARA)
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
html/changelogs/alberyk-tajsmuggler.yml
+6
View File
@@ -0,0 +1,6 @@
author: Alberyk, Kyres1
delete-after: True
changes:
- rscadd: "Added a Tajaran smuggler ship."
icons/obj/cult.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 39 KiB

icons/obj/tajara_items.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 112 KiB

maps/away/ships/tajaran_smuggler.dm
+104
View File
@@ -0,0 +1,104 @@
datum/map_template/ruin/away_site/tajaran_smuggler
name = "Adhomian Freighter"
description = "Built with reliability in mind, the Zhsram Freighter is one of the most common Adhomian designs. This vessel is cheap and has a sizeable cargo storage. It is frequently used by Tajaran traders and smugglers."
suffix = "ships/tajaran_smuggler.dmm"
sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL)
spawn_weight = 1
spawn_cost = 1
id = "tajaran_smuggler"
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tajaran_smuggler_shuttle)
/decl/submap_archetype/tajaran_smuggler
map = "Adhomian Freighter"
descriptor = "Built with reliability in mind, the Zhsram Freighter is one of the most common Adhomian designs. This vessel is cheap and has a sizeable cargo hold. It is commonly used by Tajaran traders and smugglers."
//areas
/area/ship/tajaran_smuggler
name = "Adhomian Freighter"
/area/shuttle/tajaran_smuggler
name = "Adhomian Freight Shuttle"
icon_state = "shuttle2"
//ship stuff
/obj/effect/overmap/visitable/ship/tajaran_smuggler
name = "Adhomian Freighter"
class = "ACV"
desc = "Built with reliability in mind, the Zhsram Freighter is one of the most common Adhomian designs. This vessel is cheap and has a sizeable cargo storage. It is frequently used by Tajaran traders and smugglers."
icon_state = "shuttle"
moving_state = "shuttle_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(
"Adhomian Freight Shuttle" = list("nav_tajaran_smuggler_shuttle")
)
initial_generic_waypoints = list(
"nav_tajaran_smuggler_1",
"nav_tajaran_smuggler_2"
)
/obj/effect/overmap/visitable/ship/tajaran_smuggler/New()
designation = "[pick("Brave Ha'rron", "Trickster Farwa", "Legal and Safe Cargo", "Adhomian Trader", "Minharrzka", "Rredouane's Chosen", "Adhomai's Pride")]"
..()
/obj/effect/shuttle_landmark/tajaran_smuggler/nav1
name = "Adhomian Freighter - Port Side"
landmark_tag = "nav_tajaran_smuggler_1"
base_turf = /turf/space/dynamic
base_area = /area/space
/obj/effect/shuttle_landmark/tajaran_smuggler/nav2
name = "Adhomian Freighter - Port Airlock"
landmark_tag = "nav_tajaran_smuggler_2"
base_turf = /turf/space/dynamic
base_area = /area/space
/obj/effect/shuttle_landmark/tajaran_smuggler/transit
name = "In transit"
landmark_tag = "nav_transit_tajaran_smuggler"
base_turf = /turf/space/transit/south
//shuttle stuff
/obj/effect/overmap/visitable/ship/landable/tajaran_smuggler_shuttle
name = "Adhomian Freight Shuttle"
desc = "An inefficient and rustic looking shuttle. This one's transponder identifies it as belonging to an independent freighter."
shuttle = "Adhomian Freight 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/tajaran_smuggler_shuttle
name = "shuttle control console"
shuttle_tag = "Adhomian Freight Shuttle"
/datum/shuttle/autodock/overmap/tajaran_smuggler_shuttle
name = "Adhomian Freight Shuttle"
move_time = 20
shuttle_area = list(/area/shuttle/tajaran_smuggler)
current_location = "nav_tajaran_smuggler_shuttle"
landmark_transition = "nav_transit_tajaran_smuggler_shuttle"
range = 1
fuel_consumption = 2
logging_home_tag = "nav_tajaran_smuggler_shuttle"
defer_initialisation = TRUE
/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/hangar
name = "Adhomian Freight Shuttle Hangar"
landmark_tag = "nav_tajaran_smuggler_shuttle"
docking_controller = "tajaran_smuggler_shuttle_dock"
base_area = /area/ship/tajaran_smuggler
base_turf = /turf/simulated/floor/plating
movable_flags = MOVABLE_FLAG_EFFECTMOVE
/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/transit
name = "In transit"
landmark_tag = "nav_transit_tajaran_smuggler_shuttle"
base_turf = /turf/space/transit/south
maps/away/ships/tajaran_smuggler.dmm
+67152
View File
File diff suppressed because it is too large Load Diff
maps/away/ships/tajaran_smuggler_ghostroles.dm
+90
View File
@@ -0,0 +1,90 @@
//tajaran smuggler ship
/datum/ghostspawner/human/tajaran_smuggler
short_name = "tajaran_smuggler"
name = "Tajaran Smuggler"
desc = "Crew a Tajaran smuggling ship. Try to sell some of your illegally-acquired goods and make a profit."
tags = list("External")
spawnpoints = list("tajaran_smuggler")
max_count = 2
outfit = /datum/outfit/admin/tajaran_smuggler
possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN)
allow_appearance_change = APPEARANCE_PLASTICSURGERY
uses_species_whitelist = FALSE
assigned_role = "Tajaran Smuggler"
special_role = "Tajaran Smuggler"
respawn_flag = null
/datum/outfit/admin/tajaran_smuggler
name = "Tajaran Smuggler"
uniform = list(
/obj/item/clothing/under/tajaran,
/obj/item/clothing/under/tajaran/summer,
/obj/item/clothing/under/pants/tajaran,
/obj/item/clothing/under/syndicate/tracksuit,
/obj/item/clothing/under/tajaran/mechanic
)
head = list(/obj/item/clothing/head/fedora/grey,
/obj/item/clothing/head/buckethat,
/obj/item/clothing/head/that,
/obj/item/clothing/head/tajaran/fur,
/obj/item/clothing/head/bandana/red,
/obj/item/clothing/head/bandana/colorable/random
)
shoes = list(
/obj/item/clothing/shoes/tajara/footwraps,
/obj/item/clothing/shoes/tajara/jackboots,
/obj/item/clothing/shoes/tajara/workboots,
/obj/item/clothing/shoes/tajara/workboots/adhomian_boots
)
back = list(
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/duffel
)
id = null
l_ear = /obj/item/device/radio/headset/ship
backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 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
)
/datum/ghostspawner/human/tajaran_smuggler/captain
short_name = "tajaran_smuggler_captain"
name = "Tajaran Smuggler Captain"
desc = "Captain the Adhomian smuggling ship. Try to make a profit from selling your goods."
spawnpoints = list("tajaran_smuggler_captain")
max_count = 1
outfit = /datum/outfit/admin/freighter_crew/captain
uses_species_whitelist = TRUE
assigned_role = "Tajaran Smuggler Captain"
special_role = "Tajaran Smuggler Captain"
/datum/outfit/admin/tajaran_smuggler/captain
name = "Tajaran Smuggler Captain"
uniform = /obj/item/clothing/under/syndicate
head = /obj/item/clothing/head/padded