cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	.gitignore
#	vorestation.dme
This commit is contained in:
Kelshark
2017-02-18 09:40:18 -05:00
parent 7d97537d95 ca6366fe70
commit 8df7fcd10a
117 changed files with 3371 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/configuration.dm
View File

@@ -190,7 +190,7 @@ var/list/gamemode_cache = list()
var/list/admin_levels= list(2) // Defines which Z-levels which are for admin functionality, for example including such areas as Central Command and the Syndicate Shuttle
var/list/contact_levels = list(1, 5) // Defines which Z-levels which, for example, a Code Red announcement may affect
var/list/player_levels = list(1, 3, 4, 5, 6) // Defines all Z-levels a character can typically reach
var/list/sealed_levels = list() // Defines levels that do not allow random transit at the edges.
var/list/sealed_levels = list(7) // Defines levels that do not allow random transit at the edges.
// Event settings
var/expected_round_length = 3 * 60 * 60 * 10 // 3 hours

17
code/controllers/shuttle_controller.dm
View File

@@ -397,5 +397,20 @@ var/global/datum/shuttle_controller/shuttle_controller
AM.move_time = 60
AM.warmup_time = 8
shuttles["AwayMission"] = AM
//VOREStation Add End - Away-mission shuttle
///////////////////////////////////////////////
//VOREStation Add - Belter Shuttle
shuttle = new/datum/shuttle/ferry()
shuttle.location = 0
shuttle.warmup_time = 6
shuttle.area_station = locate(/area/shuttle/belter/station)
shuttle.area_offsite = locate(/area/shuttle/belter/belt/zone1)
shuttle.area_transition = locate(/area/shuttle/belter/transit)
shuttle.docking_controller_tag = "belter_docking"
shuttle.dock_target_station = "belter_nodocking" //Fake tags to prevent the shuttle from opening doors.
shuttle.dock_target_offsite = "belter_nodocking"
shuttle.transit_direction = EAST
shuttle.move_time = 60 + rand(10,40)
process_shuttles += shuttle
shuttles["Belter"] = shuttle
//VOREStation Add End - Belter Shuttle