Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-13 00:39:20 -07:00
parent 6a8a606f97 358fe3d2e0
commit eca0e0f2dc
481 changed files with 10666 additions and 9059 deletions
@@ -37,7 +37,7 @@
 		structureclimber.visible_message("<span class='warning'>[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].</span>")

 /obj/structure/ui_act(action, params)
-	..()
+	. = ..()
 	add_fingerprint(usr)

 /obj/structure/MouseDrop_T(atom/movable/O, mob/user)