cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes

Browse Source 
Conflicts:
	code/game/supplyshuttle.dm
This commit is contained in:
mwerezak
2014-06-23 11:09:14 -04:00
committed by ZomgPonies
parent 59f1cc3b0a
commit d8c02c7b6e
4 changed files with 76 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+1 -1
View File
@@ -927,7 +927,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Admin"
set name = "Call Shuttle"
if ((!( ticker ) || emergency_shuttle.location()))
if ((!( ticker ) || !emergency_shuttle.location()))
return
if(!check_rights(R_ADMIN)) return
code/modules/shuttles/shuttle.dm
+27
View File
@@ -124,6 +124,33 @@ var/global/list/shuttles
shuttles = list()
var/datum/shuttle/ferry/shuttle
// Escape shuttle and pods
shuttle = new/datum/shuttle/ferry/emergency()
shuttle.location = 1
shuttle.warmup_time = 10
shuttle.area_offsite = locate(/area/shuttle/escape/centcom)
shuttle.area_station = locate(/area/shuttle/escape/station)
shuttle.area_transition = locate(/area/shuttle/escape/transit)
shuttle.travel_time = SHUTTLE_TRANSIT_DURATION
//shuttle.docking_controller_tag = "supply_shuttle"
//shuttle.dock_target_station = "cargo_bay"
shuttles["Escape"] = shuttle
emergency_shuttle.shuttle = shuttle
emergency_shuttle.setup_pods()
// Supply shuttle
shuttle = new/datum/shuttle/ferry/supply()
shuttle.location = 1
shuttle.warmup_time = 10
shuttle.area_offsite = locate(/area/supply/dock)
shuttle.area_station = locate(/area/supply/station)
shuttle.docking_controller_tag = "supply_shuttle"
shuttle.dock_target_station = "cargo_bay"
shuttles["Supply"] = shuttle
supply_controller.shuttle = shuttle
// Admin shuttles.
shuttle = new()