Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix a few easy to spot hard deletes #2580

Merged
merged 1 commit into from
Dec 10, 2023
Merged

fix a few easy to spot hard deletes #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/game/machinery/computer/crew.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
ui = new(user, src, "CrewConsole")
ui.open()

/datum/crewmonitor/ui_close(mob/user)
ui_sources -= user
return ..()

/datum/crewmonitor/proc/show(mob/M, source)
ui_sources[M] = source
ui_interact(M)
Expand Down
8 changes: 7 additions & 1 deletion code/modules/mob/living/silicon/ai/ai.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@

for (var/obj/machinery/camera/C in lit_cameras)
C.set_light(0)
lit_cameras = list()
lit_cameras = list()

return

Expand All @@ -737,9 +737,15 @@
for (var/obj/machinery/camera/C in remove)
lit_cameras -= C //Removed from list before turning off the light so that it doesn't check the AI looking away.
C.Togglelight(0)
UnregisterSignal(C, COMSIG_PARENT_QDELETING, PROC_REF(camera_deleted))
for (var/obj/machinery/camera/C in add)
C.Togglelight(1)
lit_cameras |= C
RegisterSignal(C, COMSIG_PARENT_QDELETING, PROC_REF(camera_deleted))

/mob/living/silicon/ai/proc/camera_deleted(obj/machinery/camera/camera)
SIGNAL_HANDLER
lit_cameras -= camera

/mob/living/silicon/ai/proc/control_integrated_radio()
set name = "Transceiver Settings"
Expand Down
1 change: 1 addition & 0 deletions code/modules/overmap/ships/controlled_ship_datum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
. = ..()
SSovermap.controlled_ships -= src
helms.Cut()
QDEL_LIST(missions)
LAZYCLEARLIST(owner_candidates)
if(!QDELETED(shuttle_port))
shuttle_port.current_ship = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/scooter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
/obj/vehicle/ridden/scooter/skateboard/Destroy()
if(sparks)
QDEL_NULL(sparks)
. = ..()
return ..()

/obj/vehicle/ridden/scooter/skateboard/relaymove(mob/living/user, direction)
if (grinding || world.time < next_crash)
Expand Down