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

[MIRROR] Fixes the arena shuttle (#691)

Browse Source 
* Fixes the arena shuttle (#53458)

This splits the actual arena of the arena shuttle into its own map file that is loaded onto it's own z-level. The old method of including a non-shuttle area in the shuttle map file doesn't work with the current shuttle loader. It also fixes shuttles being loaded twice when purchased which created problems with landmarks being left behind in the reserved z-level.

* Fixes the arena shuttle

Co-authored-by: YPOQ <30683121+YPOQ@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-09 08:11:25 +02:00
committed by GitHub
co-authored by YPOQ
parent 26c56dd75c
commit f1db1e6668
5 changed files with 2635 additions and 2355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/shuttles.dm
+13
View File
@@ -244,12 +244,25 @@
description = "The crew must pass through an otherworldy arena to board this shuttle. Expect massive casualties. The source of the Bloody Signal must be tracked down and eliminated to unlock this shuttle."
admin_notes = "RIP AND TEAR."
credit_cost = 10000
/// Whether the arena z-level has been created
var/arena_loaded = FALSE
/datum/map_template/shuttle/emergency/arena/prerequisites_met()
if(SHUTTLE_UNLOCK_BUBBLEGUM in SSshuttle.shuttle_purchase_requirements_met)
return TRUE
return FALSE
/datum/map_template/shuttle/emergency/arena/post_load(obj/docking_port/mobile/M)
. = ..()
if(!arena_loaded)
arena_loaded = TRUE
var/datum/map_template/arena/arena_template = new()
arena_template.load_new_z()
/datum/map_template/arena
name = "The Arena"
mappath = "_maps/templates/the_arena.dmm"
/datum/map_template/shuttle/emergency/birdboat
suffix = "birdboat"
name = "Birdboat Station Emergency Shuttle"