Merge branch 'master' into HeadCorgi

This commit is contained in:
lolman360
2019-11-17 12:24:04 +11:00
committed by GitHub
1884 changed files with 45460 additions and 148028 deletions
+6
View File
@@ -362,6 +362,12 @@
. = TRUE
ui.soft_update_fields()
/obj/machinery/disposal/bin/alt_attack_hand(mob/user)
if(can_interact(usr))
flush = !flush
update_icon()
return TRUE
return FALSE
/obj/machinery/disposal/bin/hitby(atom/movable/AM)
if(isitem(AM) && AM.CanEnterDisposals())