Merge remote-tracking branch 'origin/master' into TGUI-4

2020-08-04 09:31:34 +08:00
parent b30607b759 ec9f0d8919
commit 454baea55f
94 changed files with 5367 additions and 4268 deletions
@@ -377,7 +377,6 @@
 	log_combat(user, target, "shoved", "into [src] (disposal bin)")
 	return TRUE

-
 /obj/machinery/disposal/bin/flush()
 	..()
 	full_pressure = FALSE