Skip to content

Commit

Permalink
Merge pull request #4815 from MistakeNot4892/scav/tradeship
Browse files Browse the repository at this point in the history
Small items backported from ScavStation tradeship.
out-of-phaze authored Jan 28, 2025
2 parents 0bd0461 + 4214524 commit bf5f9b0
Showing 3 changed files with 21 additions and 1 deletion.
Binary file modified maps/tradeship/hud.dmi
Binary file not shown.
20 changes: 20 additions & 0 deletions maps/tradeship/jobs/civilian.dm
Original file line number Diff line number Diff line change
@@ -8,3 +8,23 @@
"Passenger"
)
event_categories = list(ASSIGNMENT_GARDENER, ASSIGNMENT_JANITOR)

/datum/job/tradeship_helmsman
title = "Helmsman"
hud_icon = 'maps/tradeship/hud.dmi'
total_positions = 1
spawn_positions = 1
supervisors = "the Captain, so don't mess up!"
outfit_type = /decl/outfit/job/tradeship/hand
min_skill = list(
SKILL_LITERACY = SKILL_ADEPT,
SKILL_PILOT = SKILL_ADEPT
)
max_skill = list(
SKILL_PILOT = SKILL_MAX
)
skill_points = 10
department_types = list(/decl/department/civilian)
economic_power = 1
access = list(access_bridge)
minimal_access = list(access_bridge)
2 changes: 1 addition & 1 deletion maps/tradeship/tradeship_shuttles.dm
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
/datum/shuttle/autodock/overmap/rescue
name = "Rescue Shuttle"
shuttle_area = /area/ship/trade/shuttle/rescue
dock_target = "rescue_shuttle"
dock_target = "tradeship_rescue_shuttle"
current_location = "nav_tradeship_starboard_dock_rescue"

//In case multiple shuttles can dock at a location,

0 comments on commit bf5f9b0

Please sign in to comment.