cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

The 515 MegaPR early downport (#7783)

Browse Source 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
Cadyn
2024-02-27 11:17:32 -08:00
committed by GitHub
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/overmap/disperser/disperser_console.dm
View File

@@ -55,9 +55,9 @@
middle = M
back = B
if(is_valid_setup())
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))
RegisterSignal(F, COMSIG_OBSERVER_DESTROYED, PROC_REF(release_links))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(release_links))
RegisterSignal(B, COMSIG_OBSERVER_DESTROYED, 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_REF(release_links))
GLOB.destroyed_event.unregister(middle, src, PROC_REF(release_links))
GLOB.destroyed_event.unregister(back, src, PROC_REF(release_links))
UnregisterSignal(front, COMSIG_OBSERVER_DESTROYED)
UnregisterSignal(middle, COMSIG_OBSERVER_DESTROYED)
UnregisterSignal(back, COMSIG_OBSERVER_DESTROYED)
front = null
middle = null
back = null

4
code/modules/overmap/ships/computers/ship.dm
View File

@@ -77,7 +77,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
L.looking_elsewhere = 1
L.handle_vision()
user.set_viewsize(world.view + extra_view)
GLOB.moved_event.register(user, src, /obj/machinery/computer/ship/proc/unlook)
RegisterSignal(user, COMSIG_OBSERVER_MOVED, /obj/machinery/computer/ship/proc/unlook, override = TRUE) //This needs override or else it will spam runtimes because it is called repeatedly.
// TODO GLOB.stat_set_event.register(user, src, /obj/machinery/computer/ship/proc/unlook)
LAZYDISTINCTADD(viewers, WEAKREF(user))
@@ -90,7 +90,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
L.looking_elsewhere = 0
L.handle_vision()
user.set_viewsize() // reset to default
GLOB.moved_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook)
UnregisterSignal(user, COMSIG_OBSERVER_MOVED)
// TODO GLOB.stat_set_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook)
LAZYREMOVE(viewers, WEAKREF(user))

18
code/modules/overmap/ships/landable.dm
View File

@@ -10,8 +10,8 @@
icon_state = "shuttle_nosprite"
/obj/effect/overmap/visitable/ship/landable/Destroy()
GLOB.shuttle_pre_move_event.unregister(SSshuttles.shuttles[shuttle], src)
GLOB.shuttle_moved_event.unregister(SSshuttles.shuttles[shuttle], src)
UnregisterSignal(SSshuttles.shuttles[shuttle], COMSIG_OBSERVER_SHUTTLE_PRE_MOVE)
UnregisterSignal(SSshuttles.shuttles[shuttle], COMSIG_OBSERVER_SHUTTLE_MOVED)
return ..()
/obj/effect/overmap/visitable/ship/landable/can_burn()
@@ -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_REF(pre_shuttle_jump))
GLOB.shuttle_moved_event.register(shuttle_datum, src, PROC_REF(on_shuttle_jump))
RegisterSignal(shuttle_datum, COMSIG_OBSERVER_SHUTTLE_PRE_MOVE, PROC_REF(pre_shuttle_jump))
RegisterSignal(shuttle_datum, COMSIG_OBSERVER_SHUTTLE_MOVED, PROC_REF(on_shuttle_jump))
on_landing(landmark, shuttle_datum.current_location) // We "land" at round start to properly place ourselves on the overmap.
@@ -123,11 +123,11 @@
core_landmark = master
name = _name
landmark_tag = master.shuttle_name + _name
GLOB.destroyed_event.register(master, src, /datum/proc/qdel_self)
RegisterSignal(master, COMSIG_OBSERVER_DESTROYED, /datum/proc/qdel_self)
. = ..()
/obj/effect/shuttle_landmark/visiting_shuttle/Destroy()
GLOB.destroyed_event.unregister(core_landmark, src)
UnregisterSignal(core_landmark, COMSIG_OBSERVER_DESTROYED)
LAZYREMOVE(core_landmark.visitors, src)
core_landmark = null
. = ..()
@@ -144,11 +144,11 @@
/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_REF(shuttle_left))
RegisterSignal(shuttle, COMSIG_OBSERVER_SHUTTLE_MOVED, 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)
GLOB.shuttle_moved_event.unregister(shuttle, src)
UnregisterSignal(shuttle, COMSIG_OBSERVER_SHUTTLE_MOVED)
LAZYREMOVE(core_landmark.visitors, src)
//
@@ -160,7 +160,7 @@
return
if(into == landmark)
setup_overmap_location() // They're coming boys, better actually exist!
GLOB.shuttle_pre_move_event.unregister(SSshuttles.shuttles[shuttle], src)
UnregisterSignal(SSshuttles.shuttles[shuttle], COMSIG_OBSERVER_SHUTTLE_PRE_MOVE)
/obj/effect/overmap/visitable/ship/landable/proc/on_shuttle_jump(datum/shuttle/given_shuttle, obj/effect/shuttle_landmark/from, obj/effect/shuttle_landmark/into)
if(given_shuttle != SSshuttles.shuttles[shuttle])