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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

QM is excluded from command-excluded objectives #82941

Merged
merged 1 commit into from Apr 30, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 26 additions & 4 deletions code/game/gamemodes/objective_items.dm
Expand Up @@ -236,7 +236,8 @@
JOB_HEAD_OF_SECURITY,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER
JOB_CHIEF_MEDICAL_OFFICER,
JOB_QUARTERMASTER,
)
exists_on_map = TRUE
difficulty = 3
Expand Down Expand Up @@ -279,7 +280,8 @@
JOB_HEAD_OF_SECURITY,
JOB_HEAD_OF_PERSONNEL,
JOB_CHIEF_ENGINEER,
JOB_CHIEF_MEDICAL_OFFICER
JOB_CHIEF_MEDICAL_OFFICER,
JOB_QUARTERMASTER,
)
exists_on_map = TRUE
difficulty = 4
Expand Down Expand Up @@ -629,7 +631,15 @@
/datum/objective_item/steal/traitor/rpd
name = "rapid pipe dispenser"
targetitem = /obj/item/pipe_dispenser
excludefromjob = list(JOB_ATMOSPHERIC_TECHNICIAN, JOB_STATION_ENGINEER, JOB_CHIEF_ENGINEER, JOB_SCIENTIST, JOB_RESEARCH_DIRECTOR, JOB_GENETICIST, JOB_ROBOTICIST)
excludefromjob = list(
JOB_ATMOSPHERIC_TECHNICIAN,
JOB_STATION_ENGINEER,
JOB_CHIEF_ENGINEER,
JOB_SCIENTIST,
JOB_RESEARCH_DIRECTOR,
JOB_GENETICIST,
JOB_ROBOTICIST,
)
item_owner = list(JOB_CHIEF_ENGINEER)
exists_on_map = TRUE
difficulty = 1
Expand All @@ -641,7 +651,19 @@
/datum/objective_item/steal/traitor/donut_box
name = "a box of prized donuts"
targetitem = /obj/item/storage/fancy/donut_box
excludefromjob = list(JOB_CAPTAIN, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_LAWYER, JOB_DETECTIVE)
excludefromjob = list(
JOB_CAPTAIN,
JOB_CHIEF_ENGINEER,
JOB_HEAD_OF_PERSONNEL,
JOB_HEAD_OF_SECURITY,
JOB_QUARTERMASTER,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_RESEARCH_DIRECTOR,
JOB_SECURITY_OFFICER,
JOB_WARDEN,
JOB_LAWYER,
JOB_DETECTIVE,
)
exists_on_map = TRUE
difficulty = 1
steal_hint = "Everyone has a box of donuts - you may most commonly find them on the Bridge, within Security, or in any department's break room."
Expand Down