diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index a8a8b90d5e..c26903f1dc 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -196,6 +196,38 @@ title = "Monk" +////////////////////////////////// +// Pilot +////////////////////////////////// + +/datum/job/pilot + title = "Pilot" + flag = PILOT + departments = list(DEPARTMENT_CIVILIAN) + department_flag = CIVILIAN + faction = "Station" + total_positions = 5 + spawn_positions = 5 + supervisors = "the Head of Personnel" + selection_color = "#515151" + economic_modifier = 5 + minimal_player_age = 3 + pto_type = PTO_CIVILIAN + access = list(access_pilot) + minimal_access = list(access_pilot) + outfit_type = /decl/hierarchy/outfit/job/pilot + job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System." + alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman) + +/datum/alt_title/co_pilot + title = "Co-Pilot" + title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" + +/datum/alt_title/navigator + title = "Navigator" + +/datum/alt_title/helmsman + title = "Helmsman" ////////////////////////////////// // Entertainer diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index f201406fbc..80b32adb37 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -55,37 +55,6 @@ /datum/alt_title/exploration_manager title = "Exploration Manager" - -/datum/job/pilot - title = "Pilot" - flag = PILOT - departments = list(DEPARTMENT_CIVILIAN) - department_flag = CIVILIAN - faction = "Station" - total_positions = 5 - spawn_positions = 5 - supervisors = "the Head of Personnel" - selection_color = "#515151" - economic_modifier = 5 - minimal_player_age = 3 - pto_type = PTO_EXPLORATION - access = list(access_pilot) - minimal_access = list(access_pilot) - outfit_type = /decl/hierarchy/outfit/job/pilot - job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System." - alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman) - -/datum/alt_title/co_pilot - title = "Co-Pilot" - title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" - -/datum/alt_title/navigator - title = "Navigator" - -/datum/alt_title/helmsman - title = "Helmsman" - - /datum/job/explorer title = "Explorer" flag = EXPLORER diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index e428ddfc54..dc5a811a0e 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -945,7 +945,7 @@ else searching = FALSE - if(world.time - last_message <= 1 SECOND) + if(world.time - last_message <= 15 SECONDS) return if(user.a_intent == I_HELP) user.visible_message("\The [user] hugs [src]!","You hug [src]!") diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm index 84ee6acda3..4e3ba7a5ff 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellardelight/stellar_delight1.dmm @@ -13030,6 +13030,7 @@ /obj/machinery/door/airlock/angled_bay/standard/color{ dir = 8; door_color = "#ffffff"; + id_tag = "m-ex-room"; name = "Exam Room"; req_access = list(5); stripe_color = "#5a96bb" @@ -16583,6 +16584,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "m-ex-room"; + name = "Exam Room Lock"; + pixel_x = -30; + pixel_y = -8; + specialfunctions = 4 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) "Js" = ( diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index 6fcffa8ca6..7c63099c4b 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -1276,7 +1276,8 @@ /area/stellardelight/deck3/aft) "eP" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/angled_bay/standard/color/common{ + dir = 4; name = "Holodeck" }, /turf/simulated/floor/tiled/steel_ridged, diff --git a/maps/stellardelight/stellar_delight_telecomms.dm b/maps/stellardelight/stellar_delight_telecomms.dm index 7b36a00971..7ddefa3365 100644 --- a/maps/stellardelight/stellar_delight_telecomms.dm +++ b/maps/stellardelight/stellar_delight_telecomms.dm @@ -5,6 +5,7 @@ // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. /obj/machinery/telecomms/relay/preset/station id = "SD Relay" + listening_level = 9 autolinkers = list("sd_relay") // #### Hub #### diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index baaff3fb76..9adb24aed1 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -5,6 +5,7 @@ // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. /obj/machinery/telecomms/relay/preset/station id = "Tether Relay" + listening_level = 9 autolinkers = list("tether_relay") // #### Hub ####