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

This commit is contained in:
silicons
2020-07-29 11:53:59 -07:00
15 changed files with 99 additions and 50 deletions
@@ -176,6 +176,7 @@
/obj/machinery/power/rad_collector/analyzer_act(mob/living/user, obj/item/I)
if(loaded_tank)
loaded_tank.analyzer_act(user, I)
return TRUE
/obj/machinery/power/rad_collector/examine(mob/user)
. = ..()