From af4080e23f46b92b68453cb2373299691eae2d6d Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Sat, 6 Apr 2024 18:33:10 +1300 Subject: [PATCH 1/2] Dropship Crew Maintanence Arc --- code/game/jobs/job/command/auxiliary/crew_chief.dm | 3 ++- code/game/machinery/doors/multi_tile.dm | 4 ++-- strings/marinetips.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index 0770bcd60ffa..2608d8847966 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -10,7 +10,8 @@ entry_message_body = "Your job is to assist the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot." AddTimelock(/datum/job/command/crew_chief, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 5 HOURS, + JOB_MEDIC_ROLES = 1 HOURS )) /obj/effect/landmark/start/crew_chief diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 0de099801b49..1e7fcbf40155 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -262,14 +262,14 @@ var/datum/door_controller/single/control = linked_dropship.door_control.door_controllers[direction] if (control.status != SHUTTLE_DOOR_BROKEN) return ..() - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI) && !skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED)) to_chat(user, SPAN_WARNING("You don't seem to understand how to restore a remote connection to [src].")) return if(user.action_busy) return to_chat(user, SPAN_WARNING("You begin to restore the remote connection to [src].")) - if(!do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD)) + if(!do_after(user, (skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI) ? 5 SECONDS : 8 SECONDS), INTERRUPT_ALL, BUSY_ICON_BUILD)) to_chat(user, SPAN_WARNING("You fail to restore a remote connection to [src].")) return unlock(TRUE) diff --git a/strings/marinetips.txt b/strings/marinetips.txt index d461c764fb34..979355559bcc 100644 --- a/strings/marinetips.txt +++ b/strings/marinetips.txt @@ -101,3 +101,4 @@ The nuclear ordnance requires BOTH communication towers to be actively held to d ARES will periodically report the amount of available tech points on Command Channel. The quick wield keys generally prioritize wieldable gear going from left to right on your inventory bar. Orbital Bombardment warheads respect roofing and hive core protection. They won't hit inside of protected areas. +The Queen can unbolt and break dropship doors by prying them open, even if they are unlocked. Pilots, Dropship Crew Hhiefs, Engineers and Synths can repair these doors with a multitool. From 8f04aad9c9432c45003e82fcf33a5eeb0ebad424 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:16:01 +1300 Subject: [PATCH 2/2] Fixes spelling error Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- strings/marinetips.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/marinetips.txt b/strings/marinetips.txt index 979355559bcc..253860e1eddd 100644 --- a/strings/marinetips.txt +++ b/strings/marinetips.txt @@ -101,4 +101,4 @@ The nuclear ordnance requires BOTH communication towers to be actively held to d ARES will periodically report the amount of available tech points on Command Channel. The quick wield keys generally prioritize wieldable gear going from left to right on your inventory bar. Orbital Bombardment warheads respect roofing and hive core protection. They won't hit inside of protected areas. -The Queen can unbolt and break dropship doors by prying them open, even if they are unlocked. Pilots, Dropship Crew Hhiefs, Engineers and Synths can repair these doors with a multitool. +The Queen can unbolt and break dropship doors by prying them open, even if they are unlocked. Pilots, Dropship Crew Chiefs, Engineers and Synths can repair these doors with a multitool.