From e8ece6b6ce0e52300fec5ff848e3560992557ade Mon Sep 17 00:00:00 2001 From: norsvenska <73006946+norsvenska@users.noreply.github.com> Date: Sun, 30 Apr 2023 01:30:10 -0500 Subject: [PATCH] Shuttle loan fix (#75020) ## About The Pull Request shuttle_loan_datum.dm had two entries for the department_resupply variation. One of those is the Syndicate hijacking event, and the other is the resupply. This fixes that so those two events don't conflict with each other. ## Why It's Good For The Game It removes a problem with the code, and makes it so that admins can force either the syndicate hijacking or the resupply ## Changelog :cl: fix: Shuttle Loan event's resupply and hijacking have been separated into two different datums /:cl: Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> --- code/modules/events/shuttle_loan/shuttle_loan_datum.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm index 9055376b9a6..1b2a38e30d5 100644 --- a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm +++ b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm @@ -76,13 +76,13 @@ var/decal = pick(/obj/effect/decal/cleanable/food/flour, /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/oil) new decal(pick_n_take(empty_shuttle_turfs)) -/datum/shuttle_loan_situation/department_resupply +/datum/shuttle_loan_situation/syndiehijacking sender = "CentCom Counterintelligence" announcement_text = "The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache." shuttle_transit_text = "Syndicate hijack team incoming." logging_desc = "Syndicate boarding party" -/datum/shuttle_loan_situation/department_resupply/spawn_items(list/spawn_list, list/empty_shuttle_turfs) +/datum/shuttle_loan_situation/syndiehijacking/spawn_items(list/spawn_list, list/empty_shuttle_turfs) var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/imports/specialops] pack.generate(pick_n_take(empty_shuttle_turfs))