diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 70742a9e785..727c9a67d65 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -105,6 +105,15 @@ won't update every console in existence) but it's more of a hassle to do. Also, break SyncRDevices() +/obj/machinery/computer/rdconsole/Destroy() + if(linked_destroy != null) + linked_destroy.linked_console = null + if(linked_lathe != null) + linked_lathe.linked_console = null + if(linked_imprinter != null) + linked_imprinter.linked_console = null + return ..() + /obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) //Loading a disk into it. if(istype(D, /obj/item/weapon/disk)) diff --git a/html/changelogs/aleksix-rnd_console_fix.yml b/html/changelogs/aleksix-rnd_console_fix.yml new file mode 100644 index 00000000000..9b1b75785ce --- /dev/null +++ b/html/changelogs/aleksix-rnd_console_fix.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: aleksix + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "RnD console now properly disconnects from machines when it's destroyed/dismantled"