mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-30 16:47:34 +01:00
Merge pull request #6900 from VOREStation/vplk-sssupply
Converted old supply_controller to SSsupply
This commit is contained in:
@@ -61,17 +61,17 @@
|
||||
if(flags & SHUTTLE_FLAGS_PROCESS)
|
||||
SSshuttles.process_shuttles += src
|
||||
if(flags & SHUTTLE_FLAGS_SUPPLY)
|
||||
if(supply_controller.shuttle)
|
||||
if(SSsupply.shuttle)
|
||||
CRASH("A supply shuttle is already defined.")
|
||||
supply_controller.shuttle = src
|
||||
SSsupply.shuttle = src
|
||||
|
||||
/datum/shuttle/Destroy()
|
||||
current_location = null
|
||||
SSshuttles.shuttles -= src.name
|
||||
SSshuttles.process_shuttles -= src
|
||||
SSshuttles.shuttle_logs -= src
|
||||
if(supply_controller.shuttle == src)
|
||||
supply_controller.shuttle = null
|
||||
if(SSsupply.shuttle == src)
|
||||
SSsupply.shuttle = null
|
||||
. = ..()
|
||||
|
||||
// This creates a graphical warning to where the shuttle is about to land, in approximately five seconds.
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
return
|
||||
|
||||
if (!at_station()) //at centcom
|
||||
supply_controller.buy()
|
||||
SSsupply.buy()
|
||||
|
||||
//We pretend it's a long_jump by making the shuttle stay at centcom for the "in-transit" period.
|
||||
var/obj/effect/shuttle_landmark/away_waypoint = get_location_waypoint(away_location)
|
||||
@@ -42,7 +42,7 @@
|
||||
attempt_move(away_waypoint)
|
||||
|
||||
//wait ETA here.
|
||||
arrive_time = world.time + supply_controller.movetime
|
||||
arrive_time = world.time + SSsupply.movetime
|
||||
while (world.time <= arrive_time)
|
||||
sleep(5)
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
make_sounds(HYPERSPACE_END)
|
||||
|
||||
if (!at_station()) //at centcom
|
||||
supply_controller.sell()
|
||||
SSsupply.sell()
|
||||
|
||||
// returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms
|
||||
/datum/shuttle/autodock/ferry/supply/proc/forbidden_atoms_check()
|
||||
@@ -65,7 +65,7 @@
|
||||
return 0 //if badmins want to send mobs or a nuke on the supply shuttle from centcom we don't care
|
||||
|
||||
for(var/area/A in shuttle_area)
|
||||
if(supply_controller.forbidden_atoms_check(A))
|
||||
if(SSsupply.forbidden_atoms_check(A))
|
||||
return 1
|
||||
|
||||
/datum/shuttle/autodock/ferry/supply/proc/at_station()
|
||||
|
||||
Reference in New Issue
Block a user