cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes events. (#15665)

Browse Source
This commit is contained in:
Matt Atlas
2023-01-27 17:49:28 +01:00
committed by GitHub
parent 9155f54276
commit 06b2707463
30 changed files with 117 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/overmap/events/event.dm
View File

@@ -126,13 +126,13 @@
if(!active_hazards.len)
hazard_by_turf -= T
entered_event.unregister(T, src, /singleton/overmap_event_handler/proc/on_turf_entered)
exited_event.unregister(T, src, /singleton/overmap_event_handler/proc/on_turf_exited)
entered_event.unregister(T, src, PROC_REF(on_turf_entered))
exited_event.unregister(T, src, PROC_REF(on_turf_exited))
else
hazard_by_turf |= T
hazard_by_turf[T] = active_hazards
entered_event.register(T, src,/singleton/overmap_event_handler/proc/on_turf_entered)
exited_event.register(T, src, /singleton/overmap_event_handler/proc/on_turf_exited)
entered_event.register(T, src, PROC_REF(on_turf_entered))
exited_event.register(T, src, PROC_REF(on_turf_exited))
for(var/obj/effect/overmap/visitable/ship/ship in T)
var/list/active_ship_events = ship_events[ship]

8
code/modules/overmap/exoplanets/exoplanet.dm
View File

@@ -125,8 +125,8 @@
var/mob_type = pick(repopulate_types)
var/mob/S = new mob_type(T)
animals += S
death_event.register(S, src, /obj/effect/overmap/visitable/sector/exoplanet/proc/remove_animal)
destroyed_event.register(S, src, /obj/effect/overmap/visitable/sector/exoplanet/proc/remove_animal)
death_event.register(S, src, PROC_REF(remove_animal))
destroyed_event.register(S, src, PROC_REF(remove_animal))
adapt_animal(S)
if(animals.len >= max_animal_count)
repopulating = 0
@@ -205,8 +205,8 @@
for(var/mob/living/simple_animal/A in living_mob_list)
if(A.z in map_z)
animals += A
death_event.register(A, src, /obj/effect/overmap/visitable/sector/exoplanet/proc/remove_animal)
destroyed_event.register(A, src, /obj/effect/overmap/visitable/sector/exoplanet/proc/remove_animal)
death_event.register(A, src, PROC_REF(remove_animal))
destroyed_event.register(A, src, PROC_REF(remove_animal))
max_animal_count = animals.len
for(var/type in random_map.fauna_types)
mobs_to_tolerate[type] = TRUE

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

@@ -52,9 +52,9 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
user.reset_view(linked)
if(user.client)
user.client.view = world.view + extra_view
moved_event.register(user, src, /obj/machinery/computer/ship/proc/unlook)
moved_event.register(user, src, PROC_REF(unlook))
if(user.eyeobj)
moved_event.register(user.eyeobj, src, /obj/machinery/computer/ship/proc/unlook)
moved_event.register(user.eyeobj, src, PROC_REF(unlook))
LAZYDISTINCTADD(viewers, WEAKREF(user))
/obj/machinery/computer/ship/proc/unlook(var/mob/user)
@@ -71,11 +71,11 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
c.pixel_x = 0
c.pixel_y = 0
moved_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook)
moved_event.unregister(user, src, PROC_REF(unlook))
if(isEye(user)) // If we're an AI eye, the computer has our AI mob in its viewers list not the eye mob
var/mob/abstract/eye/E = user
moved_event.unregister(E.owner, src, /obj/machinery/computer/ship/proc/unlook)
moved_event.unregister(E.owner, src, PROC_REF(unlook))
LAZYREMOVE(viewers, WEAKREF(E.owner))
LAZYREMOVE(viewers, WEAKREF(user))

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

@@ -96,7 +96,7 @@
core_landmark = master
name = _name
landmark_tag = master.shuttle_name + _name
destroyed_event.register(master, src, /proc/qdel)
destroyed_event.register(master, src, GLOBAL_PROC_REF(qdel))
. = ..()
/obj/effect/shuttle_landmark/visiting_shuttle/Destroy()