Merge branch 'master' into TGUIs_Nexties

2020-01-30 20:46:20 +02:00
parent db36a90e35 55a0e4e55d
commit 83ce84cdc4
418 changed files with 3862 additions and 4206 deletions
--- a/code/modules/modular_computers/computers/item/computer_damage.dm
+++ b/code/modules/modular_computers/computers/item/computer_damage.dm
@@ -23,6 +23,8 @@
 		new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
 		for(var/C in all_components)
 			var/obj/item/computer_hardware/H = all_components[C]
+			if(QDELETED(H))
+				return
 			uninstall_component(H)
 			H.forceMove(newloc)
 			if(prob(25))