Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

This commit is contained in:
LetterN
2021-11-21 10:34:14 +08:00
213 changed files with 86534 additions and 1331 deletions
@@ -140,7 +140,7 @@
// Stronger explosions cause serious damage to internal components
// Minor explosions are mostly mitigitated by casing.
/obj/machinery/modular_computer/ex_act(severity)
/obj/machinery/modular_computer/ex_act(severity, target, origin)
if(cpu)
return cpu.ex_act(severity)