cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shuttle loan fix (#75020)

Browse Source 
## 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

🆑
fix: Shuttle Loan event's resupply and hijacking have been separated
into two different datums
/🆑

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
This commit is contained in:
norsvenska
2023-04-29 23:30:10 -07:00
committed by GitHub
co-authored by tattle
parent 80cfc0b422
commit e8ece6b6ce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/shuttle_loan/shuttle_loan_datum.dm
+2 -2
View File
@@ -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))