mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Merge pull request #15433 from AffectedArc07/initialized-shuttles
Initialized /obj/docking_port
This commit is contained in:
@@ -309,8 +309,8 @@
|
||||
width = 3
|
||||
height = 4
|
||||
|
||||
/obj/docking_port/mobile/pod/New()
|
||||
..()
|
||||
/obj/docking_port/mobile/pod/Initialize(mapload)
|
||||
. = ..()
|
||||
if(id == "pod")
|
||||
WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")
|
||||
|
||||
|
||||
@@ -168,8 +168,8 @@
|
||||
|
||||
/obj/docking_port/stationary/register()
|
||||
if(!SSshuttle)
|
||||
throw EXCEPTION("docking port [src] could not initialize.")
|
||||
return 0
|
||||
stack_trace("Docking port [src] could not initialize. SSshuttle doesnt exist!")
|
||||
return FALSE
|
||||
|
||||
SSshuttle.stationary += src
|
||||
if(!id)
|
||||
@@ -229,9 +229,8 @@
|
||||
var/obj/docking_port/stationary/destination
|
||||
var/obj/docking_port/stationary/previous
|
||||
|
||||
/obj/docking_port/mobile/New()
|
||||
..()
|
||||
|
||||
/obj/docking_port/mobile/Initialize(mapload)
|
||||
. = ..()
|
||||
var/area/A = get_area(src)
|
||||
if(istype(A, /area/shuttle))
|
||||
areaInstance = A
|
||||
@@ -245,7 +244,6 @@
|
||||
highlight("#0f0")
|
||||
#endif
|
||||
|
||||
/obj/docking_port/mobile/Initialize()
|
||||
if(!timid)
|
||||
register()
|
||||
shuttle_areas = list()
|
||||
@@ -255,12 +253,10 @@
|
||||
var/area/cur_area = curT.loc
|
||||
if(istype(cur_area, areaInstance))
|
||||
shuttle_areas[cur_area] = TRUE
|
||||
..()
|
||||
|
||||
/obj/docking_port/mobile/register()
|
||||
if(!SSshuttle)
|
||||
throw EXCEPTION("docking port [src] could not initialize.")
|
||||
return 0
|
||||
CRASH("Docking port [src] could not initialize. SSshuttle doesnt exist!")
|
||||
|
||||
SSshuttle.mobile += src
|
||||
|
||||
@@ -322,7 +318,7 @@
|
||||
else
|
||||
var/msg = "check_dock(): shuttle [src] cannot dock at [S], error: [status]"
|
||||
message_admins(msg)
|
||||
throw EXCEPTION(msg)
|
||||
stack_trace(msg)
|
||||
return FALSE
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user