Merge branch 'master' into revenant_TK

2021-01-20 18:27:11 +02:00
parent 16e0b85b44 1057721d2a
commit 66979e2364
414 changed files with 6097 additions and 2811 deletions
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -62,6 +62,7 @@
 		master.update_icon()

 /obj/item/assembly_holder/Crossed(atom/movable/AM as mob|obj)
+	. = ..()
 	if(a_left)
 		a_left.Crossed(AM)
 	if(a_right)