Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Offstation Spawns for Visitors, on Nebula #6921

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
9 changes: 9 additions & 0 deletions code/game/landmarks/spawnpoint/tradeport.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@
/obj/landmark/spawnpoint/latejoin/tradeport
name = "Tradeport Latejoin"
faction = JOB_FACTION_TRADEPORT

/obj/landmark/spawnpoint/job/trader/visitor
name = "Nebula visitor"
job_path = /datum/role/job/station/assistant
latejoin = TRUE
latejoin_override = TRUE

/obj/landmark/spawnpoint/latejoin/tradeport/visitor
name = "Visitor Tradeport Latejoin"
34 changes: 33 additions & 1 deletion code/modules/jobs/job_types/station/civillian/assistant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
"Visitor" = /datum/prototype/struct/alt_title/visitor,
"Server" = /datum/prototype/struct/alt_title/server,
"Morale Officer" = /datum/prototype/struct/alt_title/morale_officer,
"Assistant" = /datum/prototype/struct/alt_title/assistant
"Assistant" = /datum/prototype/struct/alt_title/assistant,
"Contractor" = /datum/prototype/struct/alt_title/contractor,
"Freelancer" = /datum/prototype/struct/alt_title/freelancer,
"Frontier Colonist" = /datum/prototype/struct/alt_title/colonist,
"Tourist" = /datum/prototype/struct/alt_title/tourist
)

/datum/role/job/station/assistant/get_access()
Expand All @@ -42,6 +46,22 @@
title = "Assistant"
title_outfit = /datum/outfit/job/station/assistant

/datum/prototype/struct/alt_title/contractor
title = "Contractor"
title_outfit = /datum/outfit/job/station/assistant/contractor

/datum/prototype/struct/alt_title/freelancer
title = "Freelancer"
title_outfit = /datum/outfit/job/station/assistant/freelancer

/datum/prototype/struct/alt_title/colonist
title = "Frontier Colonist"
title_outfit = /datum/outfit/job/station/assistant/colonist

/datum/prototype/struct/alt_title/tourist
title = "Tourist"
title_outfit = /datum/outfit/job/station/assistant/tourist

/datum/outfit/job/station/assistant
name = OUTFIT_JOB_NAME(USELESS_JOB)
id_type = /obj/item/card/id/assistant
Expand Down Expand Up @@ -83,3 +103,15 @@
name = OUTFIT_JOB_NAME("Server")
uniform = /obj/item/clothing/under/waiter
l_ear = /obj/item/radio/headset/headset_service

/datum/outfit/job/station/assistant/contractor
id_pda_assignment = "Contractor"

/datum/outfit/job/station/assistant/freelancer
id_pda_assignment = "Freelancer"

/datum/outfit/job/station/assistant/colonist
id_pda_assignment = "Colonist"

/datum/outfit/job/station/assistant/tourist
id_pda_assignment = "Tourist"
17 changes: 17 additions & 0 deletions code/modules/maps/overmap/space/trade_station/trade_station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,23 @@
announce_channel = "Trade"
on_store_name = "Beruang Trading Corp Storage"

/datum/spawnpoint/trade/visitor
display_name = "Nebula Visitor Arrival"
restrict_job = list("Visitor", "Contractor", "Independant", "Frontier Colonis", "Tourist")
announce_channel = "Trade"

/obj/machinery/cryopod/robot/door/gateway/trade/visitor
name = "Trade public teleporter"
desc = "The short-range teleporter you might've came in from. You could leave easily using this."
icon = 'icons/obj/machines/teleporter.dmi'
icon_state = "pad_idle"
announce_channel = "Trade"
base_icon_state = "pad"
occupied_icon_state = "pad_active"
on_store_message = "has departed via short-range teleport."
on_enter_occupant_message = "The teleporter activates, and you step into the swirling portal."
spawnpoint_type = /datum/spawnpoint/trade/visitor

// Their shuttle

// Shuttle landmarks. Need to be removed at some point and generic waypoints used
Expand Down
28 changes: 19 additions & 9 deletions maps/rift/levels/rift-10-west_plains.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,12 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/steel_dirty/lythios43c,
/area/rift/surfacebase/outside/west)
"fi" = (
/obj/effect/shuttle_landmark/automatic{
base_turf = /turf/simulated/floor/outdoors/snow/lythios43c
},
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/west)
"fj" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
Expand Down Expand Up @@ -7096,6 +7102,10 @@
},
/turf/simulated/floor,
/area/rnd/outpost/anomaly_lab/storage)
"Hf" = (
/obj/tether_away_spawner/lythios_animals,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/exterior/bunker)
"Hg" = (
/obj/structure/cable/heavyduty{
icon_state = "0-8"
Expand Down Expand Up @@ -19002,7 +19012,7 @@ PP
PP
PP
sv
sv
cL
sv
sv
sv
Expand Down Expand Up @@ -20167,7 +20177,7 @@ PP
PP
PP
sv
cL
sv
sv
sv
sv
Expand Down Expand Up @@ -20559,7 +20569,7 @@ sv
sv
sv
sv
sv
fi
sv
sv
sv
Expand Down Expand Up @@ -22121,7 +22131,7 @@ sv
sv
sv
sv
sv
fi
sv
sv
sv
Expand Down Expand Up @@ -22296,7 +22306,7 @@ PP
sv
sv
sv
sv
cL
sv
sv
sv
Expand Down Expand Up @@ -23474,7 +23484,7 @@ sv
sv
sv
sv
cL
sv
sv
sv
sv
Expand Down Expand Up @@ -26180,15 +26190,15 @@ nz
nz
nz
nz
nz
Hf
nz
YE
sv
sv
sv
sv
sv
sv
fi
sv
sv
sv
Expand Down Expand Up @@ -29094,7 +29104,7 @@ sv
sv
sv
sv
sv
cL
sv
sv
sv
Expand Down
Loading
Loading