Skip to content

Commit

Permalink
Unathi Trawler (#18828)
Browse files Browse the repository at this point in the history
Adds a new civilian unathi ship, intended to fly into shoals to harvest
carp.


![image](https://github.com/Aurorastation/Aurora.3/assets/21273394/2b452ab6-9e57-4755-ad10-e07143f916c0)
  • Loading branch information
EJDenton authored May 12, 2024
1 parent 53f3be0 commit cf72230
Show file tree
Hide file tree
Showing 11 changed files with 72,686 additions and 0 deletions.
4 changes: 4 additions & 0 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3864,6 +3864,10 @@
#include "maps\away\ships\golden_deep\golden_deep.dm"
#include "maps\away\ships\golden_deep\golden_deep_areas.dm"
#include "maps\away\ships\golden_deep\golden_deep_ghostroles.dm"
#include "maps\away\ships\hegemony\fishing_trawler\fishing_league_trawler.dm"
#include "maps\away\ships\hegemony\fishing_trawler\fishing_league_trawler_areas.dm"
#include "maps\away\ships\hegemony\fishing_trawler\fishing_league_trawler_ghostroles.dm"
#include "maps\away\ships\hegemony\fishing_trawler\fishing_league_trawler_landmarks.dm"
#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_corvette.dm"
#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_corvette_areas.dm"
#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_ghostroles.dm"
Expand Down
4 changes: 4 additions & 0 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -799,3 +799,7 @@
/datum/access/guest_room_10
id = ACCESS_GUEST_ROOM_10
desc = "Guest Room 10"

#define ACCESS_FISHING_LEAGUE 241
id = ACCESS_FISHING_LEAGUE
desc = "General Fishing Trawler Access"
6 changes: 6 additions & 0 deletions code/game/objects/items/weapons/traps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -835,3 +835,9 @@
to_chat(usr, SPAN_NOTICE("You begin carving the message inside the trap..."))
if(do_after(usr, 10 SECONDS))
src.message = strip_html_readd_newlines(added_message)

/obj/item/trap/punji/deployed
deployed = TRUE
anchored = TRUE
icon_state = "punji1"

13 changes: 13 additions & 0 deletions code/game/objects/structures/flags_banners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,19 @@
/obj/structure/sign/flag/ouerea/old/large/west/Initialize(mapload)
. = ..(mapload, WEST)

/obj/item/flag/fishingleague
name = "\improper Fishing League flag"
desc = "The standard of the Fishing League guild."
flag_path = "fishingleague"
flag_structure = /obj/structure/sign/flag/fishingleague

/obj/structure/sign/flag/fishingleague
name = "\improper Fishing League flag"
desc = "The standard of the Fishing League guild."
icon_state = "fishingleague"
flag_path = "fishingleague"
flag_item = /obj/item/flag/fishingleague

// Nralakk

/obj/item/flag/nralakk
Expand Down
58 changes: 58 additions & 0 deletions html/changelogs/evandorf-unathitrawler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Evandorf

# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds a new civilian unathi ship, intended to fly into shoals to harvest carp."
Binary file modified icons/obj/structure/flags.dmi
Binary file not shown.
98 changes: 98 additions & 0 deletions maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/datum/map_template/ruin/away_site/fishing_trawler
name = "Fishing League Trawler"
description = "A freighter sponsored by the Fishing league has been augmented with sharpened pylons designed to harvest carp shoals."

prefix = "ships/hegemony/fishing_trawler/"
suffixes = list("fishing_league_trawler.dmm")

sectors = list(SECTOR_BADLANDS)
spawn_weight_sector_dependent = list(SECTOR_UUEOAESA = 3)
spawn_weight = 1
ship_cost = 1
id = "fishing_trawler"

unit_test_groups = list(2)
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/fishing_trawler)

/singleton/submap_archetype/fishing_trawler
map = "Fishing League Trawler"
descriptor = "A freighter sponsored by the Fishing league has been augmented with sharpened pylons designed to harvest carp shoals."

//Ship
/obj/effect/overmap/visitable/ship/fishing_trawler
name = "Fishing League Trawler"
class = "IHGV"
desc = "The Azkrazal-class freighter is a common civilian design from the Izweski Hegemony's shipbuilding guilds, designed in collaberation with Hephaestus Industries. They are mostly found in the possession of Unathi guilds, as well as the occasional smuggler or pirate fleet."
icon_state = "tramp"
moving_state = "tramp_moving"
colors = list("#F06553")
designer = "Hephaestus Industries, Izweski Hegemonic Naval Guilds"
volume = "54 meters length, 54 meters beam/width, 18 meters vertical height"
drive = "Low-Speed Warp Acceleration FTL Drive"
weapons = "Not apparent, fore of ship shows extensive catwalk and lattice network designed for piercing carp"
sizeclass = "Azkrazal-class cargo freighter"
shiptype = "Long-term shipping utilities"
scanimage = "unathi_freighter2.png"
max_speed = 1/(2 SECONDS)
burn_delay = 1
vessel_mass = 5000
vessel_size = SHIP_SIZE_SMALL
fore_dir = SOUTH

invisible_until_ghostrole_spawn = TRUE

initial_restricted_waypoints = list(
"Fishing League Shuttle" = list("fishing_trawler_shuttle")
)
initial_generic_waypoints = list(
"fishing_trawler_fore",
"fishing_trawler_aft",
"fishing_trawler_port",
"fishing_trawler_starboard",
"fishing_trawler_port_dock",
"fishing_trawler_starboard_dock",
"fishing_trawler_aux_dock"
)

/obj/effect/overmap/visitable/ship/fishing_trawler/New()
designation = "[pick("Hegemon's Bounty", "Fisher's Reach", "Fisher's Net", "Kasavakh Rising" , "Violet Scale" , "Feast Bringer")]"
..()


//Shuttle

/obj/effect/overmap/visitable/ship/landable/fishing_trawler_shuttle
name = "Fishing League Shuttle"
class = "IHGV"
desc = "An Otzek class transportation shuttle, manufactured in the Izweski Hegemony. This simply designed transport shuttle is designed to reliably haul goods and is cheap and easy to maintain."
shuttle = "Fishing League Shuttle"
icon_state = "shuttle"
moving_state = "shuttle_moving"
colors = list("#F06553")
designation = "Shrieker"
max_speed = 1/(3 SECONDS)
burn_delay = 2 SECONDS
vessel_mass = 3000
fore_dir = WEST
vessel_size = SHIP_SIZE_TINY
designer = "Hephaestus Industries, Izweski Hegemonic Naval Guilds"
volume = "10 meters length, 9 meters width, 6 meters vertical height"
weapons = "No Apparent Weapons"
sizeclass = "Merchant Transport Shuttlecraft"

/obj/machinery/computer/shuttle_control/explore/terminal/fishing_trawler
name = "shuttle control console"
shuttle_tag = "Fishing League Shuttle"
req_access = list(ACCESS_FISHING_LEAGUE)

/datum/shuttle/autodock/overmap/fishing_trawler
name = "Fishing League Shuttle"
move_time = 20
shuttle_area = list(/area/shuttle/fishing_trawler)
dock_target = "trawler_shuttle_airlock"
current_location = "fishing_trawler_shuttle"
landmark_transition = "fishing_trawler_transit"
range = 1
fuel_consumption = 2
logging_home_tag = "fishing_trawler_shuttle"
defer_initialisation = TRUE
Loading

0 comments on commit cf72230

Please sign in to comment.