Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

This commit is contained in:
Artur
2020-07-09 22:14:20 +03:00
31 changed files with 1145 additions and 846 deletions
@@ -268,6 +268,7 @@ obj/machinery/portable_atmospherics/canister/welder_act(mob/living/user, obj/ite
/obj/machinery/portable_atmospherics/canister/obj_break(damage_flag)
if((stat & BROKEN) || (flags_1 & NODECONSTRUCT_1))
return
stat |= BROKEN
canister_break()
/obj/machinery/portable_atmospherics/canister/proc/canister_break()