mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
More 515 Compatibility
This commit is contained in:
committed by
CHOMPStation2
parent
3129a35fe2
commit
2281afdf24
@@ -55,9 +55,9 @@
|
||||
middle = M
|
||||
back = B
|
||||
if(is_valid_setup())
|
||||
GLOB.destroyed_event.register(F, src, .proc/release_links)
|
||||
GLOB.destroyed_event.register(M, src, .proc/release_links)
|
||||
GLOB.destroyed_event.register(B, src, .proc/release_links)
|
||||
GLOB.destroyed_event.register(F, src, PROC_REF(release_links))
|
||||
GLOB.destroyed_event.register(M, src, PROC_REF(release_links))
|
||||
GLOB.destroyed_event.register(B, src, PROC_REF(release_links))
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
@@ -69,9 +69,9 @@
|
||||
return FALSE
|
||||
|
||||
/obj/machinery/computer/ship/disperser/proc/release_links()
|
||||
GLOB.destroyed_event.unregister(front, src, .proc/release_links)
|
||||
GLOB.destroyed_event.unregister(middle, src, .proc/release_links)
|
||||
GLOB.destroyed_event.unregister(back, src, .proc/release_links)
|
||||
GLOB.destroyed_event.unregister(front, src, PROC_REF(release_links))
|
||||
GLOB.destroyed_event.unregister(middle, src, PROC_REF(release_links))
|
||||
GLOB.destroyed_event.unregister(back, src, PROC_REF(release_links))
|
||||
front = null
|
||||
middle = null
|
||||
back = null
|
||||
@@ -207,4 +207,4 @@
|
||||
. = TRUE
|
||||
|
||||
if(. && !issilicon(usr))
|
||||
playsound(src, "terminal_type", 50, 1)
|
||||
playsound(src, "terminal_type", 50, 1)
|
||||
|
||||
@@ -268,7 +268,7 @@
|
||||
I.appearance_flags = KEEP_APART|RESET_TRANSFORM|RESET_COLOR
|
||||
add_overlay(I)
|
||||
|
||||
addtimer(CALLBACK(src, .proc/distress_update), 5 MINUTES)
|
||||
addtimer(CALLBACK(src, PROC_REF(distress_update)), 5 MINUTES)
|
||||
return TRUE
|
||||
|
||||
/obj/effect/overmap/visitable/proc/get_distress_info()
|
||||
|
||||
@@ -71,8 +71,8 @@
|
||||
if(istype(shuttle_datum,/datum/shuttle/autodock/overmap))
|
||||
var/datum/shuttle/autodock/overmap/oms = shuttle_datum
|
||||
oms.myship = src
|
||||
GLOB.shuttle_pre_move_event.register(shuttle_datum, src, .proc/pre_shuttle_jump)
|
||||
GLOB.shuttle_moved_event.register(shuttle_datum, src, .proc/on_shuttle_jump)
|
||||
GLOB.shuttle_pre_move_event.register(shuttle_datum, src, PROC_REF(pre_shuttle_jump))
|
||||
GLOB.shuttle_moved_event.register(shuttle_datum, src, PROC_REF(on_shuttle_jump))
|
||||
on_landing(landmark, shuttle_datum.current_location) // We "land" at round start to properly place ourselves on the overmap.
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
|
||||
/obj/effect/shuttle_landmark/visiting_shuttle/shuttle_arrived(datum/shuttle/shuttle)
|
||||
LAZYSET(core_landmark.visitors, src, shuttle)
|
||||
GLOB.shuttle_moved_event.register(shuttle, src, .proc/shuttle_left)
|
||||
GLOB.shuttle_moved_event.register(shuttle, src, PROC_REF(shuttle_left))
|
||||
|
||||
/obj/effect/shuttle_landmark/visiting_shuttle/proc/shuttle_left(datum/shuttle/shuttle, obj/effect/shuttle_landmark/old_landmark, obj/effect/shuttle_landmark/new_landmark)
|
||||
if(old_landmark == src)
|
||||
@@ -206,4 +206,4 @@
|
||||
if(SHIP_STATUS_TRANSIT)
|
||||
return "Maneuvering under secondary thrust."
|
||||
if(SHIP_STATUS_OVERMAP)
|
||||
return "In open space."
|
||||
return "In open space."
|
||||
|
||||
Reference in New Issue
Block a user